git.iko.soy/helix
on master help sign in
Use same name used in config files for langs in docs
d08bdfaGokul Soumya
book/src/generated/lang-support.md+39−39
compare with master
unifiedsplit
@@ -1,41 +1,41 @@
1| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
1| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
2| --- | --- | --- | --- | --- |
2| --- | --- | --- | --- | --- |
3−| Bash | ✓ | | | `bash-language-server` |
3+| bash | ✓ | | | `bash-language-server` |
4−| C | ✓ | | | `clangd` |
4+| c | ✓ | | | `clangd` |
5−| C# | ✓ | | | |
5+| c-sharp | ✓ | | | |
6−| CMake | ✓ | | | `cmake-language-server` |
6+| cmake | ✓ | | | `cmake-language-server` |
7−| C++ | ✓ | | | `clangd` |
7+| cpp | ✓ | | | `clangd` |
8−| CSS | ✓ | | | |
8+| css | ✓ | | | |
9−| Elixir | ✓ | | | `elixir-ls` |
9+| elixir | ✓ | | | `elixir-ls` |
10−| GLSL | ✓ | | ✓ | |
10+| glsl | ✓ | | ✓ | |
11−| Go | ✓ | ✓ | ✓ | `gopls` |
11+| go | ✓ | ✓ | ✓ | `gopls` |
12−| HTML | ✓ | | | |
12+| html | ✓ | | | |
13−| Java | ✓ | | | |
13+| java | ✓ | | | |
14−| JavaScript | ✓ | | ✓ | |
14+| javascript | ✓ | | ✓ | |
15−| JSON | ✓ | | ✓ | |
15+| json | ✓ | | ✓ | |
16−| Julia | ✓ | | | `julia` |
16+| julia | ✓ | | | `julia` |
17−| LaTeX | ✓ | | | |
17+| latex | ✓ | | | |
18−| Ledger | ✓ | | | |
18+| ledger | ✓ | | | |
19−| LLVM | ✓ | | | |
19+| llvm | ✓ | | | |
20−| Lua | ✓ | | ✓ | |
20+| lua | ✓ | | ✓ | |
21−| Mint | | | | `mint` |
21+| mint | | | | `mint` |
22−| Nix | ✓ | | ✓ | `rnix-lsp` |
22+| nix | ✓ | | ✓ | `rnix-lsp` |
23−| OCaml | ✓ | | ✓ | |
23+| ocaml | ✓ | | ✓ | |
24−| OCaml-Interface | ✓ | | | |
24+| ocaml-interface | ✓ | | | |
25−| Perl | ✓ | ✓ | | |
25+| perl | ✓ | ✓ | | |
26−| PHP | ✓ | | ✓ | |
26+| php | ✓ | | ✓ | |
27−| Prolog | | | | `swipl` |
27+| prolog | | | | `swipl` |
28−| Protobuf | ✓ | | ✓ | |
28+| protobuf | ✓ | | ✓ | |
29−| Python | ✓ | ✓ | ✓ | `pylsp` |
29+| python | ✓ | ✓ | ✓ | `pylsp` |
30−| Racket | | | | `racket` |
30+| racket | | | | `racket` |
31−| Ruby | ✓ | | | `solargraph` |
31+| ruby | ✓ | | | `solargraph` |
32−| Rust | ✓ | ✓ | ✓ | `rust-analyzer` |
32+| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
33−| Svelte | ✓ | | ✓ | `svelteserver` |
33+| svelte | ✓ | | ✓ | `svelteserver` |
34−| TOML | ✓ | | | |
34+| toml | ✓ | | | |
35−| TSQ | ✓ | | | |
35+| tsq | ✓ | | | |
36−| TSX | ✓ | | | `typescript-language-server` |
36+| tsx | ✓ | | | `typescript-language-server` |
37−| TypeScript | ✓ | | ✓ | `typescript-language-server` |
37+| typescript | ✓ | | ✓ | `typescript-language-server` |
38−| Vue | ✓ | | | |
38+| vue | ✓ | | | |
39−| WGSL | ✓ | | | |
39+| wgsl | ✓ | | | |
40−| YAML | ✓ | | ✓ | |
40+| yaml | ✓ | | ✓ | |
41−| Zig | ✓ | | ✓ | `zls` |
41+| zig | ✓ | | ✓ | `zls` |
helix-core/src/indent.rs−1
@@ -452,7 +452,6 @@ where
452 file_types: vec!["rs".to_string()],
452 file_types: vec!["rs".to_string()],
453 shebangs: vec![],
453 shebangs: vec![],
454 language_id: "Rust".to_string(),
454 language_id: "Rust".to_string(),
455− display_name: "Rust".to_string(),
456 highlight_config: OnceCell::new(),
455 highlight_config: OnceCell::new(),
457 config: None,
456 config: None,
458 //
457 //
helix-core/src/syntax.rs−1
@@ -51,7 +51,6 @@ pub struct Configuration {
51pub struct LanguageConfiguration {
51pub struct LanguageConfiguration {
52 #[serde(rename = "name")]
52 #[serde(rename = "name")]
53 pub language_id: String, // c-sharp, rust
53 pub language_id: String, // c-sharp, rust
54− pub display_name: String, // C#, Rust
55 pub scope: String, // source.rust
54 pub scope: String, // source.rust
56 pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
55 pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
57 #[serde(default)]
56 #[serde(default)]
languages.toml−41
@@ -1,6 +1,5 @@
1[[language]]
1[[language]]
2name = "rust"
2name = "rust"
3−display-name = "Rust"
4scope = "source.rust"
3scope = "source.rust"
5injection-regex = "rust"
4injection-regex = "rust"
6file-types = ["rs"]
5file-types = ["rs"]
@@ -15,7 +14,6 @@ procMacro = { enable = false }
15
14
16[[language]]
15[[language]]
17name = "toml"
16name = "toml"
18−display-name = "TOML"
19scope = "source.toml"
17scope = "source.toml"
20injection-regex = "toml"
18injection-regex = "toml"
21file-types = ["toml"]
19file-types = ["toml"]
@@ -26,7 +24,6 @@ indent = { tab-width = 2, unit = " " }
26
24
27[[language]]
25[[language]]
28name = "protobuf"
26name = "protobuf"
29−display-name = "Protobuf"
30scope = "source.proto"
27scope = "source.proto"
31injection-regex = "protobuf"
28injection-regex = "protobuf"
32file-types = ["proto"]
29file-types = ["proto"]
@@ -37,7 +34,6 @@ indent = { tab-width = 2, unit = " " }
37
34
38[[language]]
35[[language]]
39name = "elixir"
36name = "elixir"
40−display-name = "Elixir"
41scope = "source.elixir"
37scope = "source.elixir"
42injection-regex = "elixir"
38injection-regex = "elixir"
43file-types = ["ex", "exs"]
39file-types = ["ex", "exs"]
@@ -50,7 +46,6 @@ indent = { tab-width = 2, unit = " " }
50
46
51[[language]]
47[[language]]
52name = "mint"
48name = "mint"
53−display-name = "Mint"
54scope = "source.mint"
49scope = "source.mint"
55injection-regex = "mint"
50injection-regex = "mint"
56file-types = ["mint"]
51file-types = ["mint"]
@@ -63,7 +58,6 @@ indent = { tab-width = 2, unit = " " }
63
58
64[[language]]
59[[language]]
65name = "json"
60name = "json"
66−display-name = "JSON"
67scope = "source.json"
61scope = "source.json"
68injection-regex = "json"
62injection-regex = "json"
69file-types = ["json"]
63file-types = ["json"]
@@ -73,7 +67,6 @@ indent = { tab-width = 2, unit = " " }
73
67
74[[language]]
68[[language]]
75name = "c"
69name = "c"
76−display-name = "C"
77scope = "source.c"
70scope = "source.c"
78injection-regex = "c"
71injection-regex = "c"
79file-types = ["c"] # TODO: ["h"]
72file-types = ["c"] # TODO: ["h"]
@@ -85,7 +78,6 @@ indent = { tab-width = 2, unit = " " }
85
78
86[[language]]
79[[language]]
87name = "cpp"
80name = "cpp"
88−display-name = "C++"
89scope = "source.cpp"
81scope = "source.cpp"
90injection-regex = "cpp"
82injection-regex = "cpp"
91file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
83file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
@@ -97,7 +89,6 @@ indent = { tab-width = 2, unit = " " }
97
89
98[[language]]
90[[language]]
99name = "c-sharp"
91name = "c-sharp"
100−display-name = "C#"
101scope = "source.csharp"
92scope = "source.csharp"
102injection-regex = "c-?sharp"
93injection-regex = "c-?sharp"
103file-types = ["cs"]
94file-types = ["cs"]
@@ -108,7 +99,6 @@ indent = { tab-width = 4, unit = "\t" }
108
99
109[[language]]
100[[language]]
110name = "go"
101name = "go"
111−display-name = "Go"
112scope = "source.go"
102scope = "source.go"
113injection-regex = "go"
103injection-regex = "go"
114file-types = ["go"]
104file-types = ["go"]
@@ -122,7 +112,6 @@ indent = { tab-width = 4, unit = "\t" }
122
112
123[[language]]
113[[language]]
124name = "javascript"
114name = "javascript"
125−display-name = "JavaScript"
126scope = "source.js"
115scope = "source.js"
127injection-regex = "^(js|javascript)$"
116injection-regex = "^(js|javascript)$"
128file-types = ["js", "mjs"]
117file-types = ["js", "mjs"]
@@ -135,7 +124,6 @@ indent = { tab-width = 2, unit = " " }
135
124
136[[language]]
125[[language]]
137name = "typescript"
126name = "typescript"
138−display-name = "TypeScript"
139scope = "source.ts"
127scope = "source.ts"
140injection-regex = "^(ts|typescript)$"
128injection-regex = "^(ts|typescript)$"
141file-types = ["ts"]
129file-types = ["ts"]
@@ -148,7 +136,6 @@ indent = { tab-width = 2, unit = " " }
148
136
149[[language]]
137[[language]]
150name = "tsx"
138name = "tsx"
151−display-name = "TSX"
152scope = "source.tsx"
139scope = "source.tsx"
153injection-regex = "^(tsx)$" # |typescript
140injection-regex = "^(tsx)$" # |typescript
154file-types = ["tsx"]
141file-types = ["tsx"]
@@ -160,7 +147,6 @@ indent = { tab-width = 2, unit = " " }
160
147
161[[language]]
148[[language]]
162name = "css"
149name = "css"
163−display-name = "CSS"
164scope = "source.css"
150scope = "source.css"
165injection-regex = "css"
151injection-regex = "css"
166file-types = ["css"]
152file-types = ["css"]
@@ -170,7 +156,6 @@ indent = { tab-width = 2, unit = " " }
170
156
171[[language]]
157[[language]]
172name = "html"
158name = "html"
173−display-name = "HTML"
174scope = "text.html.basic"
159scope = "text.html.basic"
175injection-regex = "html"
160injection-regex = "html"
176file-types = ["html"]
161file-types = ["html"]
@@ -180,7 +165,6 @@ indent = { tab-width = 2, unit = " " }
180
165
181[[language]]
166[[language]]
182name = "python"
167name = "python"
183−display-name = "Python"
184scope = "source.python"
168scope = "source.python"
185injection-regex = "python"
169injection-regex = "python"
186file-types = ["py"]
170file-types = ["py"]
@@ -194,7 +178,6 @@ indent = { tab-width = 4, unit = " " }
194
178
195[[language]]
179[[language]]
196name = "nix"
180name = "nix"
197−display-name = "Nix"
198scope = "source.nix"
181scope = "source.nix"
199injection-regex = "nix"
182injection-regex = "nix"
200file-types = ["nix"]
183file-types = ["nix"]
@@ -207,7 +190,6 @@ indent = { tab-width = 2, unit = " " }
207
190
208[[language]]
191[[language]]
209name = "ruby"
192name = "ruby"
210−display-name = "Ruby"
211scope = "source.ruby"
193scope = "source.ruby"
212injection-regex = "ruby"
194injection-regex = "ruby"
213file-types = ["rb"]
195file-types = ["rb"]
@@ -220,7 +202,6 @@ indent = { tab-width = 2, unit = " " }
220
202
221[[language]]
203[[language]]
222name = "bash"
204name = "bash"
223−display-name = "Bash"
224scope = "source.bash"
205scope = "source.bash"
225injection-regex = "bash"
206injection-regex = "bash"
226file-types = ["sh", "bash"]
207file-types = ["sh", "bash"]
@@ -233,7 +214,6 @@ indent = { tab-width = 2, unit = " " }
233
214
234[[language]]
215[[language]]
235name = "php"
216name = "php"
236−display-name = "PHP"
237scope = "source.php"
217scope = "source.php"
238injection-regex = "php"
218injection-regex = "php"
239file-types = ["php"]
219file-types = ["php"]
@@ -244,7 +224,6 @@ indent = { tab-width = 4, unit = " " }
244
224
245[[language]]
225[[language]]
246name = "latex"
226name = "latex"
247−display-name = "LaTeX"
248scope = "source.tex"
227scope = "source.tex"
249injection-regex = "tex"
228injection-regex = "tex"
250file-types = ["tex"]
229file-types = ["tex"]
@@ -255,7 +234,6 @@ indent = { tab-width = 4, unit = "\t" }
255
234
256[[language]]
235[[language]]
257name = "julia"
236name = "julia"
258−display-name = "Julia"
259scope = "source.julia"
237scope = "source.julia"
260injection-regex = "julia"
238injection-regex = "julia"
261file-types = ["jl"]
239file-types = ["jl"]
@@ -271,7 +249,6 @@ language-server = { command = "julia", args = [
271 using Pkg;
249 using Pkg;
272 import StaticLint;
250 import StaticLint;
273 env_path = dirname(Pkg.Types.Context().env.project_file);
251 env_path = dirname(Pkg.Types.Context().env.project_file);
274−
275 server = LanguageServer.LanguageServerInstance(stdin, stdout, env_path, "");
252 server = LanguageServer.LanguageServerInstance(stdin, stdout, env_path, "");
276 server.runlinter = true;
253 server.runlinter = true;
277 run(server);
254 run(server);
@@ -281,7 +258,6 @@ indent = { tab-width = 2, unit = " " }
281
258
282[[language]]
259[[language]]
283name = "java"
260name = "java"
284−display-name = "Java"
285scope = "source.java"
261scope = "source.java"
286injection-regex = "java"
262injection-regex = "java"
287file-types = ["java"]
263file-types = ["java"]
@@ -290,7 +266,6 @@ indent = { tab-width = 4, unit = " " }
290
266
291[[language]]
267[[language]]
292name = "ledger"
268name = "ledger"
293−display-name = "Ledger"
294scope = "source.ledger"
269scope = "source.ledger"
295injection-regex = "ledger"
270injection-regex = "ledger"
296file-types = ["ldg", "ledger", "journal"]
271file-types = ["ldg", "ledger", "journal"]
@@ -300,7 +275,6 @@ indent = { tab-width = 4, unit = " " }
300
275
301[[language]]
276[[language]]
302name = "ocaml"
277name = "ocaml"
303−display-name = "OCaml"
304scope = "source.ocaml"
278scope = "source.ocaml"
305injection-regex = "ocaml"
279injection-regex = "ocaml"
306file-types = ["ml"]
280file-types = ["ml"]
@@ -311,7 +285,6 @@ indent = { tab-width = 2, unit = " " }
311
285
312[[language]]
286[[language]]
313name = "ocaml-interface"
287name = "ocaml-interface"
314−display-name = "OCaml-Interface"
315scope = "source.ocaml.interface"
288scope = "source.ocaml.interface"
316file-types = ["mli"]
289file-types = ["mli"]
317shebangs = []
290shebangs = []
@@ -321,7 +294,6 @@ indent = { tab-width = 2, unit = " "}
321
294
322[[language]]
295[[language]]
323name = "lua"
296name = "lua"
324−display-name = "Lua"
325scope = "source.lua"
297scope = "source.lua"
326file-types = ["lua"]
298file-types = ["lua"]
327shebangs = ["lua"]
299shebangs = ["lua"]
@@ -331,7 +303,6 @@ indent = { tab-width = 2, unit = " " }
331
303
332[[language]]
304[[language]]
333name = "svelte"
305name = "svelte"
334−display-name = "Svelte"
335scope = "source.svelte"
306scope = "source.svelte"
336injection-regex = "svelte"
307injection-regex = "svelte"
337file-types = ["svelte"]
308file-types = ["svelte"]
@@ -342,7 +313,6 @@ language-server = { command = "svelteserver", args = ["--stdio"] }
342
313
343[[language]]
314[[language]]
344name = "vue"
315name = "vue"
345−display-name = "Vue"
346scope = "source.vue"
316scope = "source.vue"
347injection-regex = "vue"
317injection-regex = "vue"
348file-types = ["vue"]
318file-types = ["vue"]
@@ -351,7 +321,6 @@ indent = { tab-width = 2, unit = " " }
351
321
352[[language]]
322[[language]]
353name = "yaml"
323name = "yaml"
354−display-name = "YAML"
355scope = "source.yaml"
324scope = "source.yaml"
356file-types = ["yml", "yaml"]
325file-types = ["yml", "yaml"]
357roots = []
326roots = []
@@ -360,7 +329,6 @@ indent = { tab-width = 2, unit = " " }
360
329
361# [[language]]
330# [[language]]
362# name = "haskell"
331# name = "haskell"
363−# display-name = "Haskell"
364# scope = "source.haskell"
332# scope = "source.haskell"
365# injection-regex = "haskell"
333# injection-regex = "haskell"
366# file-types = ["hs"]
334# file-types = ["hs"]
@@ -371,7 +339,6 @@ indent = { tab-width = 2, unit = " " }
371
339
372[[language]]
340[[language]]
373name = "zig"
341name = "zig"
374−display-name = "Zig"
375scope = "source.zig"
342scope = "source.zig"
376injection-regex = "zig"
343injection-regex = "zig"
377file-types = ["zig"]
344file-types = ["zig"]
@@ -384,7 +351,6 @@ indent = { tab-width = 4, unit = " " }
384
351
385[[language]]
352[[language]]
386name = "prolog"
353name = "prolog"
387−display-name = "Prolog"
388scope = "source.prolog"
354scope = "source.prolog"
389roots = []
355roots = []
390file-types = ["pl", "prolog"]
356file-types = ["pl", "prolog"]
@@ -398,7 +364,6 @@ language-server = { command = "swipl", args = [
398
364
399[[language]]
365[[language]]
400name = "tsq"
366name = "tsq"
401−display-name = "TSQ"
402scope = "source.tsq"
367scope = "source.tsq"
403file-types = ["scm"]
368file-types = ["scm"]
404roots = []
369roots = []
@@ -407,7 +372,6 @@ indent = { tab-width = 2, unit = " " }
407
372
408[[language]]
373[[language]]
409name = "cmake"
374name = "cmake"
410−display-name = "CMake"
411scope = "source.cmake"
375scope = "source.cmake"
412file-types = ["cmake", "CMakeLists.txt"]
376file-types = ["cmake", "CMakeLists.txt"]
413roots = []
377roots = []
@@ -417,7 +381,6 @@ language-server = { command = "cmake-language-server" }
417
381
418[[language]]
382[[language]]
419name = "glsl"
383name = "glsl"
420−display-name = "GLSL"
421scope = "source.glsl"
384scope = "source.glsl"
422file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
385file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
423roots = []
386roots = []
@@ -426,7 +389,6 @@ indent = { tab-width = 4, unit = " " }
426
389
427[[language]]
390[[language]]
428name = "perl"
391name = "perl"
429−display-name = "Perl"
430scope = "source.perl"
392scope = "source.perl"
431file-types = ["pl", "pm"]
393file-types = ["pl", "pm"]
432shebangs = ["perl"]
394shebangs = ["perl"]
@@ -436,7 +398,6 @@ indent = { tab-width = 2, unit = " " }
436
398
437[[language]]
399[[language]]
438name = "racket"
400name = "racket"
439−display-name = "Racket"
440scope = "source.rkt"
401scope = "source.rkt"
441roots = []
402roots = []
442file-types = ["rkt"]
403file-types = ["rkt"]
@@ -446,7 +407,6 @@ language-server = { command = "racket", args = ["-l", "racket-langserver"] }
446
407
447[[language]]
408[[language]]
448name = "wgsl"
409name = "wgsl"
449−display-name = "WGSL"
450scope = "source.wgsl"
410scope = "source.wgsl"
451file-types = ["wgsl"]
411file-types = ["wgsl"]
452roots = []
412roots = []
@@ -455,7 +415,6 @@ indent = { tab-width = 4, unit = " " }
455
415
456[[language]]
416[[language]]
457name = "llvm"
417name = "llvm"
458−display-name = "LLVM"
459scope = "source.llvm"
418scope = "source.llvm"
460roots = []
419roots = []
461file-types = ["ll"]
420file-types = ["ll"]
xtask/src/main.rs+1−1
@@ -184,7 +184,7 @@ pub mod md_gen {
184 .iter()
184 .iter()
185 .find(|l| l.language_id == lang)
185 .find(|l| l.language_id == lang)
186 .unwrap(); // lang comes from config
186 .unwrap(); // lang comes from config
187− row.push(lc.display_name.clone());
187+ row.push(lc.language_id.clone());
188
188
189 for (_feat, support_list) in &ts_features_to_langs {
189 for (_feat, support_list) in &ts_features_to_langs {
190 row.push(
190 row.push(