Commit Graph

14 Commits (3f2bd7770e9cdbb57c139ef950e2d63ccf8ac674)

Author SHA1 Message Date
Michael Davis 2c7f770aa9
Only merge top-level array when merging `languages.toml` (#2215)
* Revert "Revert "override nested arrays when merging TOML (#2145)""

This reverts commit 35d2693630.

* flip top-level table merging flag
3 years ago
Blaž Hrastnik 35d2693630
Revert "override nested arrays when merging TOML (#2145)"
Looks like there's some follow-up issues

This reverts commit c8cfd0b1a0.
3 years ago
Michael Davis c8cfd0b1a0
override nested arrays when merging TOML (#2145)
We merge the elements of arrays for the top-level array. For
`languages.toml`, this is the array of languages. For any nested
arrays, we simply take the `right` array as-is instead of using
the union of `left` and `right`.

closes #1000
3 years ago
Ben Lee-Cohen 2bddec02e7
Fixing (in two ways) a small typo (#2156) 3 years ago
Kirawi c2a40d9d52
Add support for local language configuration (#1249)
* add local configuration

* move config loading to Application::new

* simplify find_root_impl
3 years ago
Michael Davis b03421a8c0
remove hardcoded '/' from grammar source path (#1986) 3 years ago
Marcin Puc f2dd3d4469
Avoid using the format ident Rust feature (#1881) 3 years ago
Michael Davis c6bd105484
fix enum definition for use-grammars selections (#1818)
See https://github.com/helix-editor/helix/discussions/1817

It looks like we need the enums to have the `only`/`except` fields in order
to deserialize correctly.
3 years ago
Michael Davis 98851d1594
remove stray 'println!' from grammar building function (#1785) 3 years ago
Michael Davis 7044d7d804 rename '--fetch/build-grammars' flags into '--grammar fetch/build'
The old flags were a bit long. --grammar is also aliased to -g to make
it even easier.
3 years ago
Michael Davis 6fcab90d16 only fetch git-sourced grammars
This is a bit of a micro-optimization: in the current setup we waste
a thread in the pool for a local grammar only to println! a message
saying we're skipping fetching because it's a local grammar.
3 years ago
Skyler Hawthorne a229f405cc shallow clone 3 years ago
Skyler Hawthorne 31b7596f09 fix context in error 3 years ago
Michael Davis 4fc991fdec migrate grammar fetching/building code into helix-loader crate
This is a rather large refactor that moves most of the code for
loading, fetching, and building grammars into a new helix-loader
module. This works well with the [[grammars]] syntax for
languages.toml defined earlier: we only have to depend on the types
for GrammarConfiguration in helix-loader and can leave all the
[[language]] entries for helix-core.
3 years ago