on master help sign in
Allow using path suffixes to associate language file-types (#2455)

* feat(syntax): add strategy to associate file to language through pattern File path will match if it ends with any of the file types provided in the config. Also used this feature to add support for the .git/config and .ssh/config files * Add /etc/ssh/ssh_config to languages.toml * cargo xtask docgen * Update languages.md * Update languages.md * Update book/src/languages.md Co-authored-by: Ivan Tham <pickfire@riseup.net> * Update book/src/languages.md Co-authored-by: Ivan Tham <pickfire@riseup.net> Co-authored-by: Ivan Tham <pickfire@riseup.net>

commitd801a6693c3d475b3942f705d3ef48d7966bdf65 authormidnightexigent <36641328+midnightexigent@users.noreply.github.com> dateThu 20 Oct 2022, 14:13 (4 years ago) parent78c0cdc
3 files changed+15−3
book/src/languages.md+1−1 helix-core/src/syntax.rs+13−1 languages.toml+1−1
book/src/languages.md+1−1
@@ -50,7 +50,7 @@ These configuration keys are available:
5050| `name` | The name of the language |
5151| `scope` | A string like `source.js` that identifies the language. Currently, we strive to match the scope names used by popular TextMate grammars and by the Linguist library. Usually `source.<name>` or `text.<name>` in case of markup languages |
5252| `injection-regex` | regex pattern that will be tested against a language name in order to determine whether this language should be used for a potential [language injection][treesitter-language-injection] site. |
53−| `file-types` | The filetypes of the language, for example `["yml", "yaml"]`. Extensions and full file names are supported. |
53+| `file-types` | The filetypes of the language, for example `["yml", "yaml"]`. This attempts to match by exact file name (`.zshrc`), then by file extension (`toml`), then by path suffix (`.git/config`). |
5454| `shebangs` | The interpreters from the shebang line, for example `["sh", "bash"]` |
5555| `roots` | A set of marker files to look for when trying to find the workspace root. For example `Cargo.lock`, `yarn.lock` |
5656| `auto-format` | Whether to autoformat this language when saving |
helix-core/src/syntax.rs+13−1
@@ -471,9 +471,10 @@ impl Loader {
471471
472472 for file_type in &config.file_types {
473473 // entry().or_insert(Vec::new).push(language_id);
474+ let file_type = file_type.replace('/', &std::path::MAIN_SEPARATOR.to_string());
474475 loader
475476 .language_config_ids_by_file_type
476− .insert(file_type.clone(), language_id);
477+ .insert(file_type, language_id);
477478 }
478479 for shebang in &config.shebangs {
479480 loader
@@ -498,6 +499,17 @@ impl Loader {
498499 path.extension()
499500 .and_then(|extension| extension.to_str())
500501 .and_then(|extension| self.language_config_ids_by_file_type.get(extension))
502+ })
503+ .or_else(|| {
504+ self.language_config_ids_by_file_type
505+ .iter()
506+ .find_map(|(file_type, id)| {
507+ if path.to_str()?.ends_with(file_type) {
508+ Some(id)
509+ } else {
510+ None
511+ }
512+ })
501513 });
502514
503515 configuration_id.and_then(|&id| self.language_configs.get(id).cloned())
languages.toml+1−1
@@ -1054,7 +1054,7 @@ name = "git-config"
10541054scope = "source.gitconfig"
10551055roots = []
10561056# TODO: allow specifying file-types as a regex so we can read directory names (e.g. `.git/config`)
1057−file-types = [".gitmodules", ".gitconfig"]
1057+file-types = [".gitmodules", ".gitconfig", ".git/config", ".config/git/config"]
10581058injection-regex = "git-config"
10591059comment-token = "#"
10601060indent = { tab-width = 4, unit = "\t" }