Skip to content

Merge next into main #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 113 commits into from
Jun 12, 2024
Merged

Merge next into main #121

merged 113 commits into from
Jun 12, 2024

Conversation

DavisVaughan
Copy link
Member

No description provided.

kevinushey added 30 commits June 12, 2024 14:32
@kevinushey @DavisVaughan
ignore wasm
26c96e3
@kevinushey @DavisVaughan
don't lint grammar.js
b94fb85
@kevinushey @DavisVaughan
editorconfig
f33d74d
@kevinushey @DavisVaughan
update tree-sitter
7b89029
@kevinushey @DavisVaughan
re-generate parser
3a9f5e2
@kevinushey @DavisVaughan
notes
d3b91c6
@kevinushey @DavisVaughan
WIP
485bfe0
@kevinushey @DavisVaughan
don't include generated files
f5798b2
@kevinushey @DavisVaughan
update .gitignore
3546c77
@kevinushey @DavisVaughan
use external scanner for handling newlines
1d8f3d6
@kevinushey @DavisVaughan
[WIP]
104586a
@kevinushey @DavisVaughan
precedence for calls
37420fc
@kevinushey @DavisVaughan
fixups
141d76b
@kevinushey @DavisVaughan
[WIP]
46483bb
@kevinushey @DavisVaughan
[WIP]
67acead
@kevinushey @DavisVaughan
test
cc77494
@kevinushey @DavisVaughan
start adding highlight rules
40fec70
@kevinushey @DavisVaughan
ensure brackets are highlighted
1fee9ac
@kevinushey @DavisVaughan
include common pipe operators
fd35c84
@kevinushey @DavisVaughan
stop ignoring parser files
eeaae4c
@kevinushey @DavisVaughan
make sure scanner is compiled for cargo build
e72a0b7
@kevinushey @DavisVaughan
tweaks
4a56768
@kevinushey @DavisVaughan
bring back precedence assoc
dfc4d79
@kevinushey @DavisVaughan
provide field names
7ef8b70
@kevinushey @DavisVaughan
allow newlines after parameter list
60aa6c7
@kevinushey @DavisVaughan
rebuild grammar
fba4a33
@kevinushey @DavisVaughan
fix typo
86652ac
@kevinushey @DavisVaughan
bump version
dd7dbf9
@kevinushey @DavisVaughan
handle '.__' in identifiers
ddec655
@kevinushey @DavisVaughan
give function body node a name
063b1cd
@DavisVaughan
Perform recommended Cargo.toml updates
8947b50
@DavisVaughan
Go ahead and do upcoming .gitattributes fix
270d99b
@DavisVaughan
Perform recommended package.json updates
23b3ca9
@DavisVaughan
Tweak set of linguist-generated bindings folders
1ecdec8
@DavisVaughan
Ignore R artifacts
efa97a8 
These don't matter if you use `devtools::check()` as that runs in a temp directory, but not everyone does that.
@DavisVaughan
Require R >= 4.3.0 for C11 everywhere
2abadb0 
See also DavisVaughan/r-tree-sitter#6
@DavisVaughan
Add shebang in case you don't use load_all() or command line Rscript
d6a4c31
@DavisVaughan
Use 0.20.1.9000 as the dev version to reflect the grammar version
241a76e
@DavisVaughan
Use R >=4.3.0 in GitHub checks
1ba5dbe
@DavisVaughan
Simpler linguist-generated exclusion rule
2498e0c
@DavisVaughan
Switch to alloc.h for ts_malloc() and ts_free() (#105)
49484a2
@DavisVaughan
Port over testthat tests (#106)
bc8919d 
* Port over tests from DavisVaughan/r-tree-sitter#3

* One more set of skips
@DavisVaughan
Add escape_sequence and string_content nodes (#108)
9d1a68f 
* Add `string_content` and `escape_sequence` nodes

* Add `escape_sequence` highlighting

* Add more tree-sitter tests for escapes

* Exclude `\8` and `\9`

* Add more informative R tests
@DavisVaughan
Document our official state on keywords (#109)
bc0754a 
* Document our official state on keywords

Must be a `?Reserved` word specially handled by R's parser. This means we are removing `return` as a keyword, and downstream consumers can highlight this specially if they want.

* Add `return` back in as a special exception to the `?Reserved` rule
@DavisVaughan
Add "open" and "close" fields for delimiters (#110)
db6e633
@DavisVaughan
Allow _ as the leading character of an identifier (#111)
fe1686a
@DavisVaughan
Turn on whitespace and newline settings
23f66e1
@DavisVaughan
Add tests for float-like integers (#113)
9bf5a47
@DavisVaughan
Inline _identifier and _quoted_identifier (#112)
53f479a 
* Inline `_identifier` and `_quoted_identifier`

To workaround a tree-sitter bug

* Use PR

* Commit `strings.md` snapshot changes

* Point to `main`
@DavisVaughan
Full review of highlights.scm plus tests (#115)
67ab09a
@DavisVaughan
Add self to authors and update emails
440eda9
@DavisVaughan
Pull in new workflow file for tree-sitter test (#116)
6b1bc16
@DavisVaughan
Restructure scanner.c as a series of exclusive if statements (#117)
47b30d2
@DavisVaughan
Fix precedence of dot_dot_i rule (#118)
63ee9b1 
* Trim whitespace

* Fix precedence of `dot_dot_i` rule
@DavisVaughan
Remove unmatched_delimiter (#92)
1370be1 
* Remove `unmatched_delimiter`

* Add more motivating tests for no `unmatched_delimiter`

* Rerun with updated treesitter package and grammar

* Tweak outdated comment
@DavisVaughan
Tweak some comments
e684051
@DavisVaughan
Add open and close fields everywhere appropriate (#119)
a71cfb0 
To make it easier to grab these nodes by name, rather than by index
@DavisVaughan
Update snaps with fixed field name function (#120)
558736d 
* Update snaps with fixed field name function

* Point at PR

* Merged
@DavisVaughan DavisVaughan merged commit f8a3b66 into main Jun 12, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@DavisVaughan @kevinushey @lionel-