Commit graph

3658 commits

Author SHA1 Message Date
Max Brunsfeld
af0ed73f76
Merge branch 'master' into fix/1032 2021-06-29 15:59:15 -07:00
Max Brunsfeld
23433f4826
Merge pull request #1210 from ahlinc/fix/init-config-experience
fix(cli): init-config experience, it shouldn't silently overwrite existing config file
2021-06-29 15:53:36 -07:00
Max Brunsfeld
e7d3b29470
Merge pull request #1180 from CyberShadow/pull-20210618-110411
Pin emscripten/emsdk Docker version
2021-06-29 15:45:24 -07:00
Vladimir Panteleev
b14ea51e3d
Refactor emscripten/emsdk version to a single file 2021-06-29 21:39:12 +00:00
Andrew Hlynskyi
f22d62393b fix(cli): actual Rust binding version in generated Cargo.toml 2021-06-30 00:36:11 +03:00
Andrew Hlynskyi
202a37f1a1 chore(cli): Use DeriveDisplayOrder Clap's setting
To show sub commands in the defined order that looks more accurate
and have more meaning for sub commands use order.
2021-06-27 03:37:56 +03:00
Andrew Hlynskyi
2e2b239c42 fix(cli): Don't silently overwrite existing config file 2021-06-27 03:15:35 +03:00
Max Brunsfeld
2b83500b74
Merge pull request #1208 from CyberShadow/pull-20210626-181203
cli/src/main.rs: Fix panic with empty file list to parse
2021-06-26 12:44:59 -07:00
Vladimir Panteleev
5adf7bdcde
cli/src/main.rs: Fix panic with empty file list to parse
E.g.: tree-sitter parse --paths /dev/null
2021-06-26 18:11:30 +00:00
Vladimir Panteleev
725f3f7f2b
Pin emscripten/emsdk Docker version
Fixes issues caused by incompatible changes in Emscripten since the
time that tree-sitter was built.
2021-06-26 18:07:12 +00:00
Max Brunsfeld
d7746bec99
Merge pull request #1198 from ahlinc/feat/color-and-aliases
feat(cli): colored help and frequent command aliases
2021-06-24 09:12:48 -07:00
Max Brunsfeld
cf8e7bd413
Merge pull request #1199 from dcreager/edit-file
cli: Allow `$` in `tree-sitter parse --edit`
2021-06-24 09:07:38 -07:00
Andrew Hlynskyi
bd0e60240e fix(cli): Change -h -> -H for the highlight subcommand to don't clash with the help flag 2021-06-24 12:09:00 +03:00
Andrew Hlynskyi
650ee94800 fix(cli): disable help subcommand, -h, --help are enough 2021-06-24 12:04:12 +03:00
Andrew Hlynskyi
1220ec3852 feat(cli): Rename web-ui -> playground with fallback alias 2021-06-24 12:04:12 +03:00
Andrew Hlynskyi
80ee33b073 feat(cli): Add short aliases for frequent subcommands 2021-06-24 11:55:50 +03:00
Andrew Hlynskyi
04badf8a8e feat(cli): Enable clap colored help 2021-06-24 11:55:50 +03:00
Max Brunsfeld
f74187981d
Merge pull request #1197 from ahlinc/feat/clap-subcommand
feat(cli): Make more clearer sub command selection
2021-06-23 12:04:17 -07:00
Douglas Creager
71c43a869b Allow $ in tree-sitter parse --edit
You can now specify `$` as the position to apply an edit, signifying the
end of the file.  (That prevents you from having to calculate the size
of the file yourself.)
2021-06-23 10:04:29 -04:00
Andrew Hlynskyi
421815a68d feat(cli): Make more clearer sub command selection 2021-06-23 10:51:55 +03:00
Andrew Hlynskyi
4578e58794 fix(cli): close #1032 - fix repository template url generation in cargo.toml 2021-06-23 01:02:29 +03:00
Max Brunsfeld
0fea8c02ee
Merge pull request #1113 from edg-l/pr-highlight-intoiter
Make HighlightConfiguration::configure use IntoIterator
2021-06-17 10:35:41 -07:00
Edgar Luque
cd9307b597
format 2021-06-17 09:17:13 +02:00
Edgar
652dec950c
use impl instead of intoiterator 2021-06-16 19:14:46 +02:00
Edgar
005eb12cfe
update readme accordingly 2021-06-16 19:14:45 +02:00
Edgar
9feca80b08
Make HighlightConfiguration::configure use into iterator instead of a Vec<String> 2021-06-16 19:14:45 +02:00
Max Brunsfeld
12207c1f70
Merge pull request #1163 from ahlinc/fix/error-prefix
fix(cli): Don't print 'Error:' prefix
2021-06-14 08:09:29 -07:00
Andrew Hlynskyi
318b00e437 fix(cli): Don't print 'Error:' prefix 2021-06-14 10:46:39 +03:00
Douglas Creager
6ed42747a4
Merge pull request #1157 from dcreager/xdg-config
cli: Extract CLI configuration into separate crate
2021-06-10 15:39:45 -04:00
Douglas Creager
d02636ff53 Update documentation with new config locations 2021-06-10 15:20:05 -04:00
Max Brunsfeld
4d9d7589f8
Merge pull request #1115 from tree-sitter/dependabot/bundler/docs/nokogiri-1.11.4
build(deps): bump nokogiri from 1.10.8 to 1.11.4 in /docs
2021-06-10 11:23:50 -07:00
Douglas Creager
b44270efab cli: Missing config file shouldn't be an error
Just fall back on the default values for each configuration option.
2021-06-10 10:22:20 -04:00
Douglas Creager
e841fcfa1b cli: Extract CLI configuration into separate crate
This patch adds the `tree-sitter-config` crate, which manages
tree-sitter's configuration file.  This new setup allows different
components to define their own serializable configuration types, instead
of having to create a single monolithic configuration type.  But the
configuration itself is still stored in a single JSON file.

Before, the default location for the configuration file was
`~/.tree-sitter/config.json`.  This patch updates the default location
to follow the XDG Base Directory spec (or other relevant platform-
specific spec).  So on Linux, for instance, the new default location is
`~/.config/tree-sitter/config.json`.  We will look in the new location
_first_, and fall back on reading from the legacy location if we can't
find anything.
2021-06-10 10:21:22 -04:00
Douglas Creager
ebae034b0c
Merge pull request #1153 from dcreager/extract-loader
rust: Extract runtime language detection into separate crate
2021-06-10 08:40:31 -04:00
Douglas Creager
66c30648c2 rust: Extract runtime language detection into separate crate
This patch adds a new `tree-sitter-loader` crate, which holds the CLI's
logic for finding and building local grammar definitions at runtime.
This allows other command-line tools to use this logic too!
2021-06-09 17:42:30 -04:00
Douglas Creager
162ce789bc
Merge pull request #1152 from dcreager/anyhow
cli: Use anyhow and thiserror for errors
2021-06-09 17:09:27 -04:00
Douglas Creager
75da247317 cli: Ignore BrokenPipe errors again
With the change to anyhow in the previous commit, we stopped ignoring
BrokenPipe errors.  Now we do again, not as a core part of our error
type, but as part of the `main` functions reaction to any error that
occurs.
2021-06-09 16:17:23 -04:00
Douglas Creager
d2d01e77e3 cli: Use anyhow and thiserror for errors
This patch updates the CLI to use anyhow and thiserror for error
management.  The main feature that our custom `Error` type was providing
was a _list_ of messages, which would allow us to annotate "lower-level"
errors with more contextual information.  This is exactly what's
provided by anyhow's `Context` trait.

(This is setup work for a future PR that will pull the `config` and
`loader` modules out into separate crates; by using `anyhow` we wouldn't
have to deal with a circular dependency between with the new crates.)
2021-06-09 16:17:23 -04:00
Max Brunsfeld
9d77561c43
Merge pull request #1150 from ahlinc/fix/panic-on-broken-pipe
Stylistic fix for #1135 - Panic on broken pipe
2021-06-08 11:21:04 -07:00
Andrew Hlynskyi
8bbf27b82b chore(cli): Panic on broken pipe; stylistic fix 2021-06-08 21:04:26 +03:00
Max Brunsfeld
22620dee73
Merge pull request #1135 from ahlinc/fix/panic-on-broken-pipe
fix(cli): Panic on broken pipe
2021-06-07 11:15:37 -07:00
Andrew Hlynskyi
ce2bb561b4 chore(cli): Panic on broken pipe; review fixes 2021-06-07 21:11:49 +03:00
Andrew Hlynskyi
dbdda25224 fix(cli): Panic on broken pipe; use conditional match arm with ErrorKind 2021-06-07 20:22:12 +03:00
Max Brunsfeld
ad8bd3c3f5
Merge pull request #1120 from claudi/cast-printed-pointers
Fix: cast pointers to `void *` when printing
2021-06-07 09:09:54 -07:00
Max Brunsfeld
ac23797686
Merge pull request #1134 from ahlinc/fix/playground-tree-presentation
fix: Cut dangling closing bracket in the playground tree
2021-06-07 09:09:26 -07:00
Max Brunsfeld
b303a488eb
Merge pull request #1145 from jhchabran/master
Update documentation on creating a parser: minor inconsitency on the generated files
2021-06-07 09:04:20 -07:00
Max Brunsfeld
2407eda993
Merge pull request #1146 from ngalaiko/fix-docs-link
docs: fix language ingection section link
2021-06-07 09:04:06 -07:00
Nikita Galaiko
de3600dd75
docs: fix language ingection section link 2021-06-07 16:54:47 +02:00
Jean-Hadrien Chabran
2aa1578f6b Update generated files 2021-06-07 14:33:32 +02:00
Max Brunsfeld
fecc2de515
Merge pull request #1130 from tree-sitter/query-cursor-api
Improve the QueryCursor API
2021-06-02 13:18:50 -07:00