Skip to content

Commit 2627a10

Browse files
YusyurivYusyuriv
authored
Move grammar sources into a dedicated directory, fix tree-sitter grammar and query issues (#651)
* refactor: move grammar sources into a dedicated directory * chore: remove unnecessary file * ci: update pnpm-lock.yaml to fix CI * fix: update stale grammar paths * refactor: restructure grammar definitions and update repository links * refactor: add indentation rules for Neovim and Zed * feat: specify filetype and call add_ripple earlier in nvim plugin * feat: implement script to copy Tree-sitter queries for Zed and Neovim * chore: mark intellij plugin package as private in package.json * style: fix grammar.json code style * chore: update tree-sitter parser path in .gitattributes * revert: stop ignoring copied ripple tree-sitter queries * chore: update vscode package script to regenerate textmate grammar
1 parent 0f74e7b commit 2627a10

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+151970
-164130
lines changed

‎.changeset/config.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"@ripple-ts/textmate",
2929
"@ripple-ts/nvim-plugin",
3030
"@ripple-ts/tree-sitter",
31+
"@ripple-ts/intellij-plugin",
3132
"@ripple-ts/vscode-plugin",
3233
"@ripple-ts/sublime-text-plugin",
3334
"@ripple-ts/zed-plugin"

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
packages/tree-sitter/src/parser.c -linguist-detectable
1+
grammars/tree-sitter/src/parser.c -linguist-detectable

‎assets/Ripple.tmbundle/Syntaxes/ripple.tmLanguage‎

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,10 @@
517517
<key>include</key>
518518
<string>#record-literal</string>
519519
</dict>
520+
<dict>
521+
<key>include</key>
522+
<string>#tracked-array-literal</string>
523+
</dict>
520524
<dict>
521525
<key>include</key>
522526
<string>#tracked-map-literal</string>
@@ -4880,7 +4884,7 @@
48804884
<key>name</key>
48814885
<string>meta.for-of-ripple</string>
48824886
<key>match</key>
4883-
<string>\(\s*(let|const|var)\s+([_$[:alpha:]][_$[:alnum:]]*)\s+(of)\s+([^;]+?)\s*;\s*(?:(index)\s+([_$[:alpha:]][_$[:alnum:]]*)(?:\s*;\s*(key)\s+([^)]+?))?|(key)\s+([^)]+?))\s*\)</string>
4887+
<string>\(\s*(?:(let|const|var)\s+)?([_$[:alpha:]][_$[:alnum:]]*)\s+(of)\s+([^;]+?)\s*;\s*(?:(index)\s+([_$[:alpha:]][_$[:alnum:]]*)(?:\s*;\s*(key)\s+([^)]+?))?|(key)\s+([^)]+?))\s*\)</string>
48844888
<key>captures</key>
48854889
<dict>
48864890
<key>1</key>
@@ -6613,6 +6617,10 @@
66136617
<key>include</key>
66146618
<string>#record-literal</string>
66156619
</dict>
6620+
<dict>
6621+
<key>include</key>
6622+
<string>#tracked-array-literal</string>
6623+
</dict>
66166624
<dict>
66176625
<key>include</key>
66186626
<string>#tracked-map-literal</string>
@@ -6745,6 +6753,47 @@
67456753
</dict>
67466754
</array>
67476755
</dict>
6756+
<key>tracked-array-literal</key>
6757+
<dict>
6758+
<key>name</key>
6759+
<string>meta.tracked.array.literal.js</string>
6760+
<key>begin</key>
6761+
<string>(#)(\[)</string>
6762+
<key>beginCaptures</key>
6763+
<dict>
6764+
<key>1</key>
6765+
<dict>
6766+
<key>name</key>
6767+
<string>keyword.control.tracked.js</string>
6768+
</dict>
6769+
<key>2</key>
6770+
<dict>
6771+
<key>name</key>
6772+
<string>meta.brace.square.js</string>
6773+
</dict>
6774+
</dict>
6775+
<key>end</key>
6776+
<string>\]</string>
6777+
<key>endCaptures</key>
6778+
<dict>
6779+
<key>0</key>
6780+
<dict>
6781+
<key>name</key>
6782+
<string>meta.brace.square.js</string>
6783+
</dict>
6784+
</dict>
6785+
<key>patterns</key>
6786+
<array>
6787+
<dict>
6788+
<key>include</key>
6789+
<string>#expression</string>
6790+
</dict>
6791+
<dict>
6792+
<key>include</key>
6793+
<string>#punctuation-comma</string>
6794+
</dict>
6795+
</array>
6796+
</dict>
67486797
<key>tracked-map-literal</key>
67496798
<dict>
67506799
<key>name</key>

packages/intellij-plugin/src/main/resources/Ripple.tmbundle/info.plist renamed to grammars/textmate/info.plist

File renamed without changes.

packages/textmate/ripple.tmLanguage.json renamed to grammars/textmate/ripple.tmLanguage.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,7 +2960,7 @@
29602960
},
29612961
{
29622962
"name": "meta.for-of-ripple",
2963-
"match": "\\(\\s*(let|const|var)\\s+([_$[:alpha:]][_$[:alnum:]]*)\\s+(of)\\s+([^;]+?)\\s*;\\s*(?:(index)\\s+([_$[:alpha:]][_$[:alnum:]]*)(?:\\s*;\\s*(key)\\s+([^)]+?))?|(key)\\s+([^)]+?))\\s*\\)",
2963+
"match": "\\(\\s*(?:(let|const|var)\\s+)?([_$[:alpha:]][_$[:alnum:]]*)\\s+(of)\\s+([^;]+?)\\s*;\\s*(?:(index)\\s+([_$[:alpha:]][_$[:alnum:]]*)(?:\\s*;\\s*(key)\\s+([^)]+?))?|(key)\\s+([^)]+?))\\s*\\)",
29642964
"captures": {
29652965
"1": {
29662966
"name": "storage.type.js"
@@ -7182,5 +7182,6 @@
71827182
}
71837183
]
71847184
}
7185-
}
7185+
},
7186+
"fileTypes": ["ripple"]
71867187
}

packages/tree-sitter/.gitignore renamed to grammars/tree-sitter/.gitignore

File renamed without changes.

packages/tree-sitter/Cargo.toml renamed to grammars/tree-sitter/Cargo.toml

File renamed without changes.

packages/tree-sitter/LICENSE renamed to grammars/tree-sitter/LICENSE

File renamed without changes.

packages/tree-sitter/README.md renamed to grammars/tree-sitter/README.md

File renamed without changes.

packages/tree-sitter/binding.gyp renamed to grammars/tree-sitter/binding.gyp

File renamed without changes.

0 commit comments

Comments
 (0)