git.iko.soy/helix
on master help sign in
Remove the path specifier.
commitc1e5733b02e4ba39b82d7b330fab0b2ded2220f2 authorBlaž Hrastnik <blaz@mxxn.io> dateFri 9 Apr 2021, 17:42 (6 years ago) parent61872de
3 files changed+3−15
compare with master
unifiedsplit
helix-core/src/indent.rs−1 helix-core/src/syntax.rs+3−1 languages.toml−13
helix-core/src/indent.rs−1
@@ -304,7 +304,6 @@ where
304304 language_id: Lang::Rust,
305305 highlight_config: OnceCell::new(),
306306 //
307− path: "../helix-syntax/languages/tree-sitter-rust".into(),
308307 roots: vec![],
309308 language_server: None,
310309 indent: Some(IndentationConfiguration {
helix-core/src/syntax.rs+3−1
@@ -27,7 +27,7 @@ pub struct LanguageConfiguration {
2727 pub file_types: Vec<String>, // filename ends_with? <Gemfile, rb, etc>
2828 pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
2929
30− pub path: PathBuf,
30+ // pub path: PathBuf,
3131 // root_path for tree-sitter (^)
3232
3333 // content_regex
@@ -104,6 +104,8 @@ impl LanguageConfiguration {
104104 let language = get_language_name(self.language_id).to_ascii_lowercase();
105105
106106 let highlights_query = read_query(&language, "highlights.scm");
107+ // always highlight syntax errors
108+ // highlights_query += "\n(ERROR) @error";
107109
108110 let injections_query = read_query(&language, "injections.scm");
109111
languages.toml−13
@@ -4,7 +4,6 @@ scope = "source.rust"
44injection-regex = "rust"
55file-types = ["rs"]
66roots = []
7−path = "../helix-syntax/languages/tree-sitter-rust"
87
98language-server = { command = "rust-analyzer" }
109indent = { tab-width = 4, unit = " " }
@@ -15,7 +14,6 @@ scope = "source.toml"
1514injection-regex = "toml"
1615file-types = ["toml"]
1716roots = []
18−path = "../helix-syntax/languages/tree-sitter-toml"
1917
2018indent = { tab-width = 2, unit = " " }
2119
@@ -25,7 +23,6 @@ scope = "source.json"
2523injection-regex = "json"
2624file-types = ["json"]
2725roots = []
28−path = "../helix-syntax/languages/tree-sitter-json"
2926
3027indent = { tab-width = 2, unit = " " }
3128
@@ -35,7 +32,6 @@ scope = "source.c"
3532injection-regex = "c"
3633file-types = ["c"] # TODO: ["h"]
3734roots = []
38−path = "../helix-syntax/languages/tree-sitter-c"
3935
4036indent = { tab-width = 2, unit = " " }
4137
@@ -45,7 +41,6 @@ scope = "source.cpp"
4541injection-regex = "cpp"
4642file-types = ["cc", "cpp", "hpp", "h"]
4743roots = []
48−path = "../helix-syntax/languages/tree-sitter-cpp" # TODO: also C highlights
4944
5045indent = { tab-width = 2, unit = " " }
5146
@@ -55,7 +50,6 @@ scope = "source.go"
5550injection-regex = "go"
5651file-types = ["go"]
5752roots = ["Gopkg.toml", "go.mod"]
58−path = "../helix-syntax/languages/tree-sitter-go"
5953
6054language-server = { command = "gopls" }
6155# TODO: gopls needs utf-8 offsets
@@ -67,7 +61,6 @@ scope = "source.js"
6761injection-regex = "^(js|javascript)$"
6862file-types = ["js"]
6963roots = []
70−path = "../helix-syntax/languages/tree-sitter-javascript"
7164# TODO: highlights-jsx, highlights-params
7265
7366indent = { tab-width = 2, unit = " " }
@@ -78,7 +71,6 @@ scope = "source.css"
7871injection-regex = "css"
7972file-types = ["css"]
8073roots = []
81−path = "../helix-syntax/languages/tree-sitter-css"
8274
8375indent = { tab-width = 2, unit = " " }
8476
@@ -88,7 +80,6 @@ scope = "text.html.basic"
8880injection-regex = "html"
8981file-types = ["html"]
9082roots = []
91−path = "../helix-syntax/languages/tree-sitter-html"
9283
9384indent = { tab-width = 2, unit = " " }
9485
@@ -98,7 +89,6 @@ scope = "source.python"
9889injection-regex = "python"
9990file-types = ["py"]
10091roots = []
101−path = "../helix-syntax/languages/tree-sitter-python"
10292
10393language-server = { command = "pyls" }
10494# TODO: pyls needs utf-8 offsets
@@ -110,7 +100,6 @@ scope = "source.ruby"
110100injection-regex = "ruby"
111101file-types = ["rb"]
112102roots = []
113−path = "../helix-syntax/languages/tree-sitter-ruby"
114103
115104language-server = { command = "solargraph", args = ["stdio"] }
116105indent = { tab-width = 2, unit = " " }
@@ -121,7 +110,6 @@ scope = "source.bash"
121110injection-regex = "bash"
122111file-types = ["sh", "bash"]
123112roots = []
124−path = "../helix-syntax/languages/tree-sitter-bash"
125113
126114language-server = { command = "bash-language-server", args = ["start"] }
127115indent = { tab-width = 2, unit = " " }
@@ -132,6 +120,5 @@ scope = "source.php"
132120injection-regex = "php"
133121file-types = ["php"]
134122roots = []
135−path = "../helix-syntax/languages/tree-sitter-php"
136123
137124indent = { tab-width = 2, unit = " " }