aboutsummaryrefslogtreecommitdiff
path: root/book
diff options
context:
space:
mode:
authorGalen Abell2024-02-11 17:24:20 +0000
committerGitHub2024-02-11 17:24:20 +0000
commit581a1ebf5d327c1128fe6c283578e8f36a4b5fb5 (patch)
tree52cea1829f5e5cdf54280eaf631e7ae17feae39f /book
parentd570c29ce37ffbb46a9c49708c31dfd81daa27cf (diff)
Add glob file type support (#8006)
* Replace FileType::Suffix with FileType::Glob Suffix is rather limited and cannot be used to match files which have semantic meaning based on location + file type (for example, Github Action workflow files). This patch adds support for a Glob FileType to replace Suffix, which encompasses the existing behavior & adds additional file matching functionality. Globs are standard Unix-style path globs, which are matched against the absolute path of the file. If the configured glob for a language is a relative glob (that is, it isn't an absolute path or already starts with a glob pattern), a glob pattern will be prepended to allow matching relative paths from any directory. The order of file type matching is also updated to first match on globs and then on extension. This is necessary as most cases where glob-matching is useful will have already been matched by an extension if glob matching is done last. * Convert file-types suffixes to globs * Use globs for filename matching Trying to match the file-type raw strings against both filename and extension leads to files with the same name as the extension having the incorrect syntax. * Match dockerfiles with suffixes It's common practice to add a suffix to dockerfiles based on their context, e.g. `Dockerfile.dev`, `Dockerfile.prod`, etc. * Make env filetype matching more generic Match on `.env` or any `.env.*` files. * Update docs * Use GlobSet to match all file type globs at once * Update todo.txt glob patterns * Consolidate language Configuration and Loader creation This is a refactor that improves the error handling for creating the `helix_core::syntax::Loader` from the default and user language configuration. * Fix integration tests * Add additional starlark file-type glob --------- Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
Diffstat (limited to 'book')
-rw-r--r--book/src/languages.md28
1 files changed, 15 insertions, 13 deletions
diff --git a/book/src/languages.md b/book/src/languages.md
index 944ebf09..7e49a603 100644
--- a/book/src/languages.md
+++ b/book/src/languages.md
@@ -78,24 +78,26 @@ from the above section. `file-types` is a list of strings or tables, for
example:
```toml
-file-types = ["Makefile", "toml", { suffix = ".git/config" }]
+file-types = ["toml", { glob = "Makefile" }, { glob = ".git/config" }, { glob = ".github/workflows/*.yaml" } ]
```
When determining a language configuration to use, Helix searches the file-types
with the following priorities:
-1. Exact match: if the filename of a file is an exact match of a string in a
- `file-types` list, that language wins. In the example above, `"Makefile"`
- will match against `Makefile` files.
-2. Extension: if there are no exact matches, any `file-types` string that
- matches the file extension of a given file wins. In the example above, the
- `"toml"` matches files like `Cargo.toml` or `languages.toml`.
-3. Suffix: if there are still no matches, any values in `suffix` tables
- are checked against the full path of the given file. In the example above,
- the `{ suffix = ".git/config" }` would match against any `config` files
- in `.git` directories. Note: `/` is used as the directory separator but is
- replaced at runtime with the appropriate path separator for the operating
- system, so this rule would match against `.git\config` files on Windows.
+1. Glob: values in `glob` tables are checked against the full path of the given
+ file. Globs are standard Unix-style path globs (e.g. the kind you use in Shell)
+ and can be used to match paths for a specific prefix, suffix, directory, etc.
+ In the above example, the `{ glob = "Makefile" }` config would match files
+ with the name `Makefile`, the `{ glob = ".git/config" }` config would match
+ `config` files in `.git` directories, and the `{ glob = ".github/workflows/*.yaml" }`
+ config would match any `yaml` files in `.github/workflow` directories. Note
+ that globs should always use the Unix path separator `/` even on Windows systems;
+ the matcher will automatically take the machine-specific separators into account.
+ If the glob isn't an absolute path or doesn't already start with a glob prefix,
+ `*/` will automatically be added to ensure it matches for any subdirectory.
+2. Extension: if there are no glob matches, any `file-types` string that matches
+ the file extension of a given file wins. In the example above, the `"toml"`
+ config matches files like `Cargo.toml` or `languages.toml`.
## Language Server configuration