git.iko.soy/helix
on master help sign in
Use same name used in config files for langs in docs
commitd08bdfa838098769afc59146b62f9d613d4a7ff4 authorGokul Soumya <gokulps15@gmail.com> dateTue 7 Dec 2021, 21:27 (5 years ago) parent70c989e
5 files changed+40−83
compare with master
unifiedsplit
book/src/generated/lang-support.md+39−39 helix-core/src/indent.rs−1 helix-core/src/syntax.rs−1 languages.toml−41 xtask/src/main.rs+1−1
book/src/generated/lang-support.md+39−39
@@ -1,41 +1,41 @@
11| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
22| --- | --- | --- | --- | --- |
3−| Bash | ✓ | | | `bash-language-server` |
4−| C | ✓ | | | `clangd` |
5−| C# | ✓ | | | |
6−| CMake | ✓ | | | `cmake-language-server` |
7−| C++ | ✓ | | | `clangd` |
8−| CSS | ✓ | | | |
9−| Elixir | ✓ | | | `elixir-ls` |
10−| GLSL | ✓ | | ✓ | |
11−| Go | ✓ | ✓ | ✓ | `gopls` |
12−| HTML | ✓ | | | |
13−| Java | ✓ | | | |
14−| JavaScript | ✓ | | ✓ | |
15−| JSON | ✓ | | ✓ | |
16−| Julia | ✓ | | | `julia` |
17−| LaTeX | ✓ | | | |
18−| Ledger | ✓ | | | |
19−| LLVM | ✓ | | | |
20−| Lua | ✓ | | ✓ | |
21−| Mint | | | | `mint` |
22−| Nix | ✓ | | ✓ | `rnix-lsp` |
23−| OCaml | ✓ | | ✓ | |
24−| OCaml-Interface | ✓ | | | |
25−| Perl | ✓ | ✓ | | |
26−| PHP | ✓ | | ✓ | |
27−| Prolog | | | | `swipl` |
28−| Protobuf | ✓ | | ✓ | |
29−| Python | ✓ | ✓ | ✓ | `pylsp` |
30−| Racket | | | | `racket` |
31−| Ruby | ✓ | | | `solargraph` |
32−| Rust | ✓ | ✓ | ✓ | `rust-analyzer` |
33−| Svelte | ✓ | | ✓ | `svelteserver` |
34−| TOML | ✓ | | | |
35−| TSQ | ✓ | | | |
36−| TSX | ✓ | | | `typescript-language-server` |
37−| TypeScript | ✓ | | ✓ | `typescript-language-server` |
38−| Vue | ✓ | | | |
39−| WGSL | ✓ | | | |
40−| YAML | ✓ | | ✓ | |
41−| Zig | ✓ | | ✓ | `zls` |
3+| bash | ✓ | | | `bash-language-server` |
4+| c | ✓ | | | `clangd` |
5+| c-sharp | ✓ | | | |
6+| cmake | ✓ | | | `cmake-language-server` |
7+| cpp | ✓ | | | `clangd` |
8+| css | ✓ | | | |
9+| elixir | ✓ | | | `elixir-ls` |
10+| glsl | ✓ | | ✓ | |
11+| go | ✓ | ✓ | ✓ | `gopls` |
12+| html | ✓ | | | |
13+| java | ✓ | | | |
14+| javascript | ✓ | | ✓ | |
15+| json | ✓ | | ✓ | |
16+| julia | ✓ | | | `julia` |
17+| latex | ✓ | | | |
18+| ledger | ✓ | | | |
19+| llvm | ✓ | | | |
20+| lua | ✓ | | ✓ | |
21+| mint | | | | `mint` |
22+| nix | ✓ | | ✓ | `rnix-lsp` |
23+| ocaml | ✓ | | ✓ | |
24+| ocaml-interface | ✓ | | | |
25+| perl | ✓ | ✓ | | |
26+| php | ✓ | | ✓ | |
27+| prolog | | | | `swipl` |
28+| protobuf | ✓ | | ✓ | |
29+| python | ✓ | ✓ | ✓ | `pylsp` |
30+| racket | | | | `racket` |
31+| ruby | ✓ | | | `solargraph` |
32+| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
33+| svelte | ✓ | | ✓ | `svelteserver` |
34+| toml | ✓ | | | |
35+| tsq | ✓ | | | |
36+| tsx | ✓ | | | `typescript-language-server` |
37+| typescript | ✓ | | ✓ | `typescript-language-server` |
38+| vue | ✓ | | | |
39+| wgsl | ✓ | | | |
40+| yaml | ✓ | | ✓ | |
41+| zig | ✓ | | ✓ | `zls` |
helix-core/src/indent.rs−1
@@ -452,7 +452,6 @@ where
452452 file_types: vec!["rs".to_string()],
453453 shebangs: vec![],
454454 language_id: "Rust".to_string(),
455− display_name: "Rust".to_string(),
456455 highlight_config: OnceCell::new(),
457456 config: None,
458457 //
helix-core/src/syntax.rs−1
@@ -51,7 +51,6 @@ pub struct Configuration {
5151pub struct LanguageConfiguration {
5252 #[serde(rename = "name")]
5353 pub language_id: String, // c-sharp, rust
54− pub display_name: String, // C#, Rust
5554 pub scope: String, // source.rust
5655 pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
5756 #[serde(default)]
languages.toml−41
@@ -1,6 +1,5 @@
11[[language]]
22name = "rust"
3−display-name = "Rust"
43scope = "source.rust"
54injection-regex = "rust"
65file-types = ["rs"]
@@ -15,7 +14,6 @@ procMacro = { enable = false }
1514
1615[[language]]
1716name = "toml"
18−display-name = "TOML"
1917scope = "source.toml"
2018injection-regex = "toml"
2119file-types = ["toml"]
@@ -26,7 +24,6 @@ indent = { tab-width = 2, unit = " " }
2624
2725[[language]]
2826name = "protobuf"
29−display-name = "Protobuf"
3027scope = "source.proto"
3128injection-regex = "protobuf"
3229file-types = ["proto"]
@@ -37,7 +34,6 @@ indent = { tab-width = 2, unit = " " }
3734
3835[[language]]
3936name = "elixir"
40−display-name = "Elixir"
4137scope = "source.elixir"
4238injection-regex = "elixir"
4339file-types = ["ex", "exs"]
@@ -50,7 +46,6 @@ indent = { tab-width = 2, unit = " " }
5046
5147[[language]]
5248name = "mint"
53−display-name = "Mint"
5449scope = "source.mint"
5550injection-regex = "mint"
5651file-types = ["mint"]
@@ -63,7 +58,6 @@ indent = { tab-width = 2, unit = " " }
6358
6459[[language]]
6560name = "json"
66−display-name = "JSON"
6761scope = "source.json"
6862injection-regex = "json"
6963file-types = ["json"]
@@ -73,7 +67,6 @@ indent = { tab-width = 2, unit = " " }
7367
7468[[language]]
7569name = "c"
76−display-name = "C"
7770scope = "source.c"
7871injection-regex = "c"
7972file-types = ["c"] # TODO: ["h"]
@@ -85,7 +78,6 @@ indent = { tab-width = 2, unit = " " }
8578
8679[[language]]
8780name = "cpp"
88−display-name = "C++"
8981scope = "source.cpp"
9082injection-regex = "cpp"
9183file-types = ["cc", "hh", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino"]
@@ -97,7 +89,6 @@ indent = { tab-width = 2, unit = " " }
9789
9890[[language]]
9991name = "c-sharp"
100−display-name = "C#"
10192scope = "source.csharp"
10293injection-regex = "c-?sharp"
10394file-types = ["cs"]
@@ -108,7 +99,6 @@ indent = { tab-width = 4, unit = "\t" }
10899
109100[[language]]
110101name = "go"
111−display-name = "Go"
112102scope = "source.go"
113103injection-regex = "go"
114104file-types = ["go"]
@@ -122,7 +112,6 @@ indent = { tab-width = 4, unit = "\t" }
122112
123113[[language]]
124114name = "javascript"
125−display-name = "JavaScript"
126115scope = "source.js"
127116injection-regex = "^(js|javascript)$"
128117file-types = ["js", "mjs"]
@@ -135,7 +124,6 @@ indent = { tab-width = 2, unit = " " }
135124
136125[[language]]
137126name = "typescript"
138−display-name = "TypeScript"
139127scope = "source.ts"
140128injection-regex = "^(ts|typescript)$"
141129file-types = ["ts"]
@@ -148,7 +136,6 @@ indent = { tab-width = 2, unit = " " }
148136
149137[[language]]
150138name = "tsx"
151−display-name = "TSX"
152139scope = "source.tsx"
153140injection-regex = "^(tsx)$" # |typescript
154141file-types = ["tsx"]
@@ -160,7 +147,6 @@ indent = { tab-width = 2, unit = " " }
160147
161148[[language]]
162149name = "css"
163−display-name = "CSS"
164150scope = "source.css"
165151injection-regex = "css"
166152file-types = ["css"]
@@ -170,7 +156,6 @@ indent = { tab-width = 2, unit = " " }
170156
171157[[language]]
172158name = "html"
173−display-name = "HTML"
174159scope = "text.html.basic"
175160injection-regex = "html"
176161file-types = ["html"]
@@ -180,7 +165,6 @@ indent = { tab-width = 2, unit = " " }
180165
181166[[language]]
182167name = "python"
183−display-name = "Python"
184168scope = "source.python"
185169injection-regex = "python"
186170file-types = ["py"]
@@ -194,7 +178,6 @@ indent = { tab-width = 4, unit = " " }
194178
195179[[language]]
196180name = "nix"
197−display-name = "Nix"
198181scope = "source.nix"
199182injection-regex = "nix"
200183file-types = ["nix"]
@@ -207,7 +190,6 @@ indent = { tab-width = 2, unit = " " }
207190
208191[[language]]
209192name = "ruby"
210−display-name = "Ruby"
211193scope = "source.ruby"
212194injection-regex = "ruby"
213195file-types = ["rb"]
@@ -220,7 +202,6 @@ indent = { tab-width = 2, unit = " " }
220202
221203[[language]]
222204name = "bash"
223−display-name = "Bash"
224205scope = "source.bash"
225206injection-regex = "bash"
226207file-types = ["sh", "bash"]
@@ -233,7 +214,6 @@ indent = { tab-width = 2, unit = " " }
233214
234215[[language]]
235216name = "php"
236−display-name = "PHP"
237217scope = "source.php"
238218injection-regex = "php"
239219file-types = ["php"]
@@ -244,7 +224,6 @@ indent = { tab-width = 4, unit = " " }
244224
245225[[language]]
246226name = "latex"
247−display-name = "LaTeX"
248227scope = "source.tex"
249228injection-regex = "tex"
250229file-types = ["tex"]
@@ -255,7 +234,6 @@ indent = { tab-width = 4, unit = "\t" }
255234
256235[[language]]
257236name = "julia"
258−display-name = "Julia"
259237scope = "source.julia"
260238injection-regex = "julia"
261239file-types = ["jl"]
@@ -271,7 +249,6 @@ language-server = { command = "julia", args = [
271249 using Pkg;
272250 import StaticLint;
273251 env_path = dirname(Pkg.Types.Context().env.project_file);
274−
275252 server = LanguageServer.LanguageServerInstance(stdin, stdout, env_path, "");
276253 server.runlinter = true;
277254 run(server);
@@ -281,7 +258,6 @@ indent = { tab-width = 2, unit = " " }
281258
282259[[language]]
283260name = "java"
284−display-name = "Java"
285261scope = "source.java"
286262injection-regex = "java"
287263file-types = ["java"]
@@ -290,7 +266,6 @@ indent = { tab-width = 4, unit = " " }
290266
291267[[language]]
292268name = "ledger"
293−display-name = "Ledger"
294269scope = "source.ledger"
295270injection-regex = "ledger"
296271file-types = ["ldg", "ledger", "journal"]
@@ -300,7 +275,6 @@ indent = { tab-width = 4, unit = " " }
300275
301276[[language]]
302277name = "ocaml"
303−display-name = "OCaml"
304278scope = "source.ocaml"
305279injection-regex = "ocaml"
306280file-types = ["ml"]
@@ -311,7 +285,6 @@ indent = { tab-width = 2, unit = " " }
311285
312286[[language]]
313287name = "ocaml-interface"
314−display-name = "OCaml-Interface"
315288scope = "source.ocaml.interface"
316289file-types = ["mli"]
317290shebangs = []
@@ -321,7 +294,6 @@ indent = { tab-width = 2, unit = " "}
321294
322295[[language]]
323296name = "lua"
324−display-name = "Lua"
325297scope = "source.lua"
326298file-types = ["lua"]
327299shebangs = ["lua"]
@@ -331,7 +303,6 @@ indent = { tab-width = 2, unit = " " }
331303
332304[[language]]
333305name = "svelte"
334−display-name = "Svelte"
335306scope = "source.svelte"
336307injection-regex = "svelte"
337308file-types = ["svelte"]
@@ -342,7 +313,6 @@ language-server = { command = "svelteserver", args = ["--stdio"] }
342313
343314[[language]]
344315name = "vue"
345−display-name = "Vue"
346316scope = "source.vue"
347317injection-regex = "vue"
348318file-types = ["vue"]
@@ -351,7 +321,6 @@ indent = { tab-width = 2, unit = " " }
351321
352322[[language]]
353323name = "yaml"
354−display-name = "YAML"
355324scope = "source.yaml"
356325file-types = ["yml", "yaml"]
357326roots = []
@@ -360,7 +329,6 @@ indent = { tab-width = 2, unit = " " }
360329
361330# [[language]]
362331# name = "haskell"
363−# display-name = "Haskell"
364332# scope = "source.haskell"
365333# injection-regex = "haskell"
366334# file-types = ["hs"]
@@ -371,7 +339,6 @@ indent = { tab-width = 2, unit = " " }
371339
372340[[language]]
373341name = "zig"
374−display-name = "Zig"
375342scope = "source.zig"
376343injection-regex = "zig"
377344file-types = ["zig"]
@@ -384,7 +351,6 @@ indent = { tab-width = 4, unit = " " }
384351
385352[[language]]
386353name = "prolog"
387−display-name = "Prolog"
388354scope = "source.prolog"
389355roots = []
390356file-types = ["pl", "prolog"]
@@ -398,7 +364,6 @@ language-server = { command = "swipl", args = [
398364
399365[[language]]
400366name = "tsq"
401−display-name = "TSQ"
402367scope = "source.tsq"
403368file-types = ["scm"]
404369roots = []
@@ -407,7 +372,6 @@ indent = { tab-width = 2, unit = " " }
407372
408373[[language]]
409374name = "cmake"
410−display-name = "CMake"
411375scope = "source.cmake"
412376file-types = ["cmake", "CMakeLists.txt"]
413377roots = []
@@ -417,7 +381,6 @@ language-server = { command = "cmake-language-server" }
417381
418382[[language]]
419383name = "glsl"
420−display-name = "GLSL"
421384scope = "source.glsl"
422385file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
423386roots = []
@@ -426,7 +389,6 @@ indent = { tab-width = 4, unit = " " }
426389
427390[[language]]
428391name = "perl"
429−display-name = "Perl"
430392scope = "source.perl"
431393file-types = ["pl", "pm"]
432394shebangs = ["perl"]
@@ -436,7 +398,6 @@ indent = { tab-width = 2, unit = " " }
436398
437399[[language]]
438400name = "racket"
439−display-name = "Racket"
440401scope = "source.rkt"
441402roots = []
442403file-types = ["rkt"]
@@ -446,7 +407,6 @@ language-server = { command = "racket", args = ["-l", "racket-langserver"] }
446407
447408[[language]]
448409name = "wgsl"
449−display-name = "WGSL"
450410scope = "source.wgsl"
451411file-types = ["wgsl"]
452412roots = []
@@ -455,7 +415,6 @@ indent = { tab-width = 4, unit = " " }
455415
456416[[language]]
457417name = "llvm"
458−display-name = "LLVM"
459418scope = "source.llvm"
460419roots = []
461420file-types = ["ll"]
xtask/src/main.rs+1−1
@@ -184,7 +184,7 @@ pub mod md_gen {
184184 .iter()
185185 .find(|l| l.language_id == lang)
186186 .unwrap(); // lang comes from config
187− row.push(lc.display_name.clone());
187+ row.push(lc.language_id.clone());
188188
189189 for (_feat, support_list) in &ts_features_to_langs {
190190 row.push(