andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Use same name used in config files for langs in docs

Browse Source
This commit is contained in:
Gokul Soumya 2021-12-07 21:27:21 +05:30 committed by Blaž Hrastnik
parent 70c989e122
commit d08bdfa838
5 changed files with 40 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
book/src/generated/lang-support.md
View File

@ -1,41 +1,41 @@
| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP | | Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
| --- | --- | --- | --- | --- | | --- | --- | --- | --- | --- |
| Bash | ✓ | | | `bash-language-server` | | bash | ✓ | | | `bash-language-server` |
| C | ✓ | | | `clangd` | | c | ✓ | | | `clangd` |
| C# | ✓ | | | | | c-sharp | ✓ | | | |
| CMake | ✓ | | | `cmake-language-server` | | cmake | ✓ | | | `cmake-language-server` |
| C++ | ✓ | | | `clangd` | | cpp | ✓ | | | `clangd` |
| CSS | ✓ | | | | | css | ✓ | | | |
| Elixir | ✓ | | | `elixir-ls` | | elixir | ✓ | | | `elixir-ls` |
| GLSL | ✓ | | ✓ | | | glsl | ✓ | | ✓ | |
| Go | ✓ | ✓ | ✓ | `gopls` | | go | ✓ | ✓ | ✓ | `gopls` |
| HTML | ✓ | | | | | html | ✓ | | | |
| Java | ✓ | | | | | java | ✓ | | | |
| JavaScript | ✓ | | ✓ | | | javascript | ✓ | | ✓ | |
| JSON | ✓ | | ✓ | | | json | ✓ | | ✓ | |
| Julia | ✓ | | | `julia` | | julia | ✓ | | | `julia` |
| LaTeX | ✓ | | | | | latex | ✓ | | | |
| Ledger | ✓ | | | | | ledger | ✓ | | | |
| LLVM | ✓ | | | | | llvm | ✓ | | | |
| Lua | ✓ | | ✓ | | | lua | ✓ | | ✓ | |
| Mint | | | | `mint` | | mint | | | | `mint` |
| Nix | ✓ | | ✓ | `rnix-lsp` | | nix | ✓ | | ✓ | `rnix-lsp` |
| OCaml | ✓ | | ✓ | | | ocaml | ✓ | | ✓ | |
| OCaml-Interface | ✓ | | | | | ocaml-interface | ✓ | | | |
| Perl | ✓ | ✓ | | | | perl | ✓ | ✓ | | |
| PHP | ✓ | | ✓ | | | php | ✓ | | ✓ | |
| Prolog | | | | `swipl` | | prolog | | | | `swipl` |
| Protobuf | ✓ | | ✓ | | | protobuf | ✓ | | ✓ | |
| Python | ✓ | ✓ | ✓ | `pylsp` | | python | ✓ | ✓ | ✓ | `pylsp` |
| Racket | | | | `racket` | | racket | | | | `racket` |
| Ruby | ✓ | | | `solargraph` | | ruby | ✓ | | | `solargraph` |
| Rust | ✓ | ✓ | ✓ | `rust-analyzer` | | rust | ✓ | ✓ | ✓ | `rust-analyzer` |
| Svelte | ✓ | | ✓ | `svelteserver` | | svelte | ✓ | | ✓ | `svelteserver` |
| TOML | ✓ | | | | | toml | ✓ | | | |
| TSQ | ✓ | | | | | tsq | ✓ | | | |
| TSX | ✓ | | | `typescript-language-server` | | tsx | ✓ | | | `typescript-language-server` |
| TypeScript | ✓ | | ✓ | `typescript-language-server` | | typescript | ✓ | | ✓ | `typescript-language-server` |
| Vue | ✓ | | | | | vue | ✓ | | | |
| WGSL | ✓ | | | | | wgsl | ✓ | | | |
| YAML | ✓ | | ✓ | | | yaml | ✓ | | ✓ | |
| Zig | ✓ | | ✓ | `zls` | | zig | ✓ | | ✓ | `zls` |

1
helix-core/src/indent.rs
View File

@ -452,7 +452,6 @@ pub fn change<I>(document: &Document, changes: I) -> Self
file_types: vec!["rs".to_string()], file_types: vec!["rs".to_string()],
shebangs: vec![], shebangs: vec![],
language_id: "Rust".to_string(), language_id: "Rust".to_string(),
display_name: "Rust".to_string(),
highlight_config: OnceCell::new(), highlight_config: OnceCell::new(),
config: None, config: None,
// //

1
helix-core/src/syntax.rs
View File

@ -51,7 +51,6 @@ pub struct Configuration {
pub struct LanguageConfiguration { pub struct LanguageConfiguration {
#[serde(rename = "name")] #[serde(rename = "name")]
pub language_id: String, // c-sharp, rust pub language_id: String, // c-sharp, rust
pub display_name: String, // C#, Rust
pub scope: String, // source.rust pub scope: String, // source.rust
pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc> pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
#[serde(default)] #[serde(default)]

41
languages.toml
View File

@ -1,6 +1,5 @@
[[language]] [[language]]
name = "rust" name = "rust"
display-name = "Rust"
scope = "source.rust" scope = "source.rust"
injection-regex = "rust" injection-regex = "rust"
file-types = ["rs"] file-types = ["rs"]
@ -15,7 +14,6 @@ procMacro = { enable = false }
[[language]] [[language]]
name = "toml" name = "toml"
display-name = "TOML"
scope = "source.toml" scope = "source.toml"
injection-regex = "toml" injection-regex = "toml"
file-types = ["toml"] file-types = ["toml"]
@ -26,7 +24,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "protobuf" name = "protobuf"
display-name = "Protobuf"
scope = "source.proto" scope = "source.proto"
injection-regex = "protobuf" injection-regex = "protobuf"
file-types = ["proto"] file-types = ["proto"]
@ -37,7 +34,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "elixir" name = "elixir"
display-name = "Elixir"
scope = "source.elixir" scope = "source.elixir"
injection-regex = "elixir" injection-regex = "elixir"
file-types = ["ex", "exs"] file-types = ["ex", "exs"]
@ -50,7 +46,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "mint" name = "mint"
display-name = "Mint"
scope = "source.mint" scope = "source.mint"
injection-regex = "mint" injection-regex = "mint"
file-types = ["mint"] file-types = ["mint"]
@ -63,7 +58,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "json" name = "json"
display-name = "JSON"
scope = "source.json" scope = "source.json"
injection-regex = "json" injection-regex = "json"
file-types = ["json"] file-types = ["json"]
@ -73,7 +67,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "c" name = "c"
display-name = "C"
scope = "source.c" scope = "source.c"
injection-regex = "c" injection-regex = "c"
file-types = ["c"] # TODO: ["h"] file-types = ["c"] # TODO: ["h"]
@ -85,7 +78,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "cpp" name = "cpp"
display-name = "C++"
scope = "source.cpp" scope = "source.cpp"
injection-regex = "cpp" injection-regex = "cpp"
file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"] file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
@ -97,7 +89,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "c-sharp" name = "c-sharp"
display-name = "C#"
scope = "source.csharp" scope = "source.csharp"
injection-regex = "c-?sharp" injection-regex = "c-?sharp"
file-types = ["cs"] file-types = ["cs"]
@ -108,7 +99,6 @@ indent = { tab-width = 4, unit = "\t" }
[[language]] [[language]]
name = "go" name = "go"
display-name = "Go"
scope = "source.go" scope = "source.go"
injection-regex = "go" injection-regex = "go"
file-types = ["go"] file-types = ["go"]
@ -122,7 +112,6 @@ indent = { tab-width = 4, unit = "\t" }
[[language]] [[language]]
name = "javascript" name = "javascript"
display-name = "JavaScript"
scope = "source.js" scope = "source.js"
injection-regex = "^(js|javascript)$" injection-regex = "^(js|javascript)$"
file-types = ["js", "mjs"] file-types = ["js", "mjs"]
@ -135,7 +124,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "typescript" name = "typescript"
display-name = "TypeScript"
scope = "source.ts" scope = "source.ts"
injection-regex = "^(ts|typescript)$" injection-regex = "^(ts|typescript)$"
file-types = ["ts"] file-types = ["ts"]
@ -148,7 +136,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "tsx" name = "tsx"
display-name = "TSX"
scope = "source.tsx" scope = "source.tsx"
injection-regex = "^(tsx)$" # |typescript injection-regex = "^(tsx)$" # |typescript
file-types = ["tsx"] file-types = ["tsx"]
@ -160,7 +147,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "css" name = "css"
display-name = "CSS"
scope = "source.css" scope = "source.css"
injection-regex = "css" injection-regex = "css"
file-types = ["css"] file-types = ["css"]
@ -170,7 +156,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "html" name = "html"
display-name = "HTML"
scope = "text.html.basic" scope = "text.html.basic"
injection-regex = "html" injection-regex = "html"
file-types = ["html"] file-types = ["html"]
@ -180,7 +165,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "python" name = "python"
display-name = "Python"
scope = "source.python" scope = "source.python"
injection-regex = "python" injection-regex = "python"
file-types = ["py"] file-types = ["py"]
@ -194,7 +178,6 @@ indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "nix" name = "nix"
display-name = "Nix"
scope = "source.nix" scope = "source.nix"
injection-regex = "nix" injection-regex = "nix"
file-types = ["nix"] file-types = ["nix"]
@ -207,7 +190,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "ruby" name = "ruby"
display-name = "Ruby"
scope = "source.ruby" scope = "source.ruby"
injection-regex = "ruby" injection-regex = "ruby"
file-types = ["rb"] file-types = ["rb"]
@ -220,7 +202,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "bash" name = "bash"
display-name = "Bash"
scope = "source.bash" scope = "source.bash"
injection-regex = "bash" injection-regex = "bash"
file-types = ["sh", "bash"] file-types = ["sh", "bash"]
@ -233,7 +214,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "php" name = "php"
display-name = "PHP"
scope = "source.php" scope = "source.php"
injection-regex = "php" injection-regex = "php"
file-types = ["php"] file-types = ["php"]
@ -244,7 +224,6 @@ indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "latex" name = "latex"
display-name = "LaTeX"
scope = "source.tex" scope = "source.tex"
injection-regex = "tex" injection-regex = "tex"
file-types = ["tex"] file-types = ["tex"]
@ -255,7 +234,6 @@ indent = { tab-width = 4, unit = "\t" }
[[language]] [[language]]
name = "julia" name = "julia"
display-name = "Julia"
scope = "source.julia" scope = "source.julia"
injection-regex = "julia" injection-regex = "julia"
file-types = ["jl"] file-types = ["jl"]
@ -271,7 +249,6 @@ language-server = { command = "julia", args = [
using Pkg; using Pkg;
import StaticLint; import StaticLint;
env_path = dirname(Pkg.Types.Context().env.project_file); env_path = dirname(Pkg.Types.Context().env.project_file);
server = LanguageServer.LanguageServerInstance(stdin, stdout, env_path, ""); server = LanguageServer.LanguageServerInstance(stdin, stdout, env_path, "");
server.runlinter = true; server.runlinter = true;
run(server); run(server);
@ -281,7 +258,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "java" name = "java"
display-name = "Java"
scope = "source.java" scope = "source.java"
injection-regex = "java" injection-regex = "java"
file-types = ["java"] file-types = ["java"]
@ -290,7 +266,6 @@ indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "ledger" name = "ledger"
display-name = "Ledger"
scope = "source.ledger" scope = "source.ledger"
injection-regex = "ledger" injection-regex = "ledger"
file-types = ["ldg", "ledger", "journal"] file-types = ["ldg", "ledger", "journal"]
@ -300,7 +275,6 @@ indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "ocaml" name = "ocaml"
display-name = "OCaml"
scope = "source.ocaml" scope = "source.ocaml"
injection-regex = "ocaml" injection-regex = "ocaml"
file-types = ["ml"] file-types = ["ml"]
@ -311,7 +285,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "ocaml-interface" name = "ocaml-interface"
display-name = "OCaml-Interface"
scope = "source.ocaml.interface" scope = "source.ocaml.interface"
file-types = ["mli"] file-types = ["mli"]
shebangs = [] shebangs = []
@ -321,7 +294,6 @@ indent = { tab-width = 2, unit = " "}
[[language]] [[language]]
name = "lua" name = "lua"
display-name = "Lua"
scope = "source.lua" scope = "source.lua"
file-types = ["lua"] file-types = ["lua"]
shebangs = ["lua"] shebangs = ["lua"]
@ -331,7 +303,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "svelte" name = "svelte"
display-name = "Svelte"
scope = "source.svelte" scope = "source.svelte"
injection-regex = "svelte" injection-regex = "svelte"
file-types = ["svelte"] file-types = ["svelte"]
@ -342,7 +313,6 @@ language-server = { command = "svelteserver", args = ["--stdio"] }
[[language]] [[language]]
name = "vue" name = "vue"
display-name = "Vue"
scope = "source.vue" scope = "source.vue"
injection-regex = "vue" injection-regex = "vue"
file-types = ["vue"] file-types = ["vue"]
@ -351,7 +321,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "yaml" name = "yaml"
display-name = "YAML"
scope = "source.yaml" scope = "source.yaml"
file-types = ["yml", "yaml"] file-types = ["yml", "yaml"]
roots = [] roots = []
@ -360,7 +329,6 @@ indent = { tab-width = 2, unit = " " }
# [[language]] # [[language]]
# name = "haskell" # name = "haskell"
# display-name = "Haskell"
# scope = "source.haskell" # scope = "source.haskell"
# injection-regex = "haskell" # injection-regex = "haskell"
# file-types = ["hs"] # file-types = ["hs"]
@ -371,7 +339,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "zig" name = "zig"
display-name = "Zig"
scope = "source.zig" scope = "source.zig"
injection-regex = "zig" injection-regex = "zig"
file-types = ["zig"] file-types = ["zig"]
@ -384,7 +351,6 @@ indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "prolog" name = "prolog"
display-name = "Prolog"
scope = "source.prolog" scope = "source.prolog"
roots = [] roots = []
file-types = ["pl", "prolog"] file-types = ["pl", "prolog"]
@ -398,7 +364,6 @@ language-server = { command = "swipl", args = [
[[language]] [[language]]
name = "tsq" name = "tsq"
display-name = "TSQ"
scope = "source.tsq" scope = "source.tsq"
file-types = ["scm"] file-types = ["scm"]
roots = [] roots = []
@ -407,7 +372,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "cmake" name = "cmake"
display-name = "CMake"
scope = "source.cmake" scope = "source.cmake"
file-types = ["cmake", "CMakeLists.txt"] file-types = ["cmake", "CMakeLists.txt"]
roots = [] roots = []
@ -417,7 +381,6 @@ language-server = { command = "cmake-language-server" }
[[language]] [[language]]
name = "glsl" name = "glsl"
display-name = "GLSL"
scope = "source.glsl" scope = "source.glsl"
file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ] file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
roots = [] roots = []
@ -426,7 +389,6 @@ indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "perl" name = "perl"
display-name = "Perl"
scope = "source.perl" scope = "source.perl"
file-types = ["pl", "pm"] file-types = ["pl", "pm"]
shebangs = ["perl"] shebangs = ["perl"]
@ -436,7 +398,6 @@ indent = { tab-width = 2, unit = " " }
[[language]] [[language]]
name = "racket" name = "racket"
display-name = "Racket"
scope = "source.rkt" scope = "source.rkt"
roots = [] roots = []
file-types = ["rkt"] file-types = ["rkt"]
@ -446,7 +407,6 @@ language-server = { command = "racket", args = ["-l", "racket-langserver"] }
[[language]] [[language]]
name = "wgsl" name = "wgsl"
display-name = "WGSL"
scope = "source.wgsl" scope = "source.wgsl"
file-types = ["wgsl"] file-types = ["wgsl"]
roots = [] roots = []
@ -455,7 +415,6 @@ indent = { tab-width = 4, unit = " " }
[[language]] [[language]]
name = "llvm" name = "llvm"
display-name = "LLVM"
scope = "source.llvm" scope = "source.llvm"
roots = [] roots = []
file-types = ["ll"] file-types = ["ll"]

2
xtask/src/main.rs
View File

@ -184,7 +184,7 @@ pub fn lang_features() -> Result<String, DynError> {
.iter() .iter()
.find(|l| l.language_id == lang) .find(|l| l.language_id == lang)
.unwrap(); // lang comes from config .unwrap(); // lang comes from config
row.push(lc.display_name.clone()); row.push(lc.language_id.clone());
for (_feat, support_list) in &ts_features_to_langs { for (_feat, support_list) in &ts_features_to_langs {
row.push( row.push(