Skip to content

Commit d708649

Browse files
authored
fix(func/grammar): accept < and > as part of identifier (#70)
Fixes #60
1 parent 1065a0e commit d708649

File tree

6 files changed

+35
-33
lines changed

6 files changed

+35
-33
lines changed

editors/code/src/languages/func-language-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"increaseIndentPattern": "^(.*\\{[^}\"']*|.*\\([^\\)\"']*|.*\\[[^\\]\"']*)$",
2626
"decreaseIndentPattern": "^\\s*[\\}\\]\\)]"
2727
},
28-
"wordPattern": "`[^`]+`|[A-Za-z_$:][^\\s+\\-*\\/%,.;(){}\\[\\]=<>|\\^~]*",
28+
"wordPattern": "`[^`]+`|[A-Za-z_$:][^\\s+\\-*\\/%,.;(){}\\[\\]=|\\^~]*",
2929
"onEnterRules": [
3030
{
3131
"beforeText": "^\\s*;;;.*$",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"test:grammars:tolk": "cd ./server/src/languages/tolk/tree-sitter-tolk/ && tree-sitter test",
5353
"test:grammars:fift": "cd ./server/src/languages/fift/tree-sitter-fift/ && tree-sitter test",
5454
"test:grammars:tlb": "cd ./server/src/languages/tlb/tree-sitter-tlb/ && tree-sitter test",
55-
"play:grammars:func": "cd ./server/src/languages/func/tree-sitter-func/ && tree-sitter build --wasm && tree-sitter playground",
55+
"play:grammars:func": "cd ./server/src/languages/func/tree-sitter-func/ && tree-sitter generate && tree-sitter build --wasm && tree-sitter playground",
5656
"parse:grammars:func": "cd ./server/src/languages/func/tree-sitter-func/ && tree-sitter parse -D --open-log main.fc",
5757
"test:e2e": "yarn test:e2e:tolk",
5858
"test:e2e:compile": "tsc -p ./server/src/e2e/tsconfig.json",

server/src/languages/func/tree-sitter-func/grammar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ const FUNC_GRAMMAR = {
382382
slice_string_literal: _ => /"[^"]*"[sa]/,
383383

384384
// actually, FunC identifiers are much more flexible
385-
identifier: _ => /`[^`]+`|[a-zA-Z0-9_\$%][^\s\+\-\*\/%,\.;\(\)\{\}\[\]=<>\|\^\~]*/,
385+
identifier: _ => /`[^`]+`|[a-zA-Z0-9_\$%][^\s\+\-\*\/%,\.;\(\)\{\}\[\]=\|\^\~]*/,
386386
underscore: _ => "_",
387387

388388
// multiline_comment: $ => seq('{-', repeat(choice(/./, $.multiline_comment)), '-}'),

server/src/languages/func/tree-sitter-func/src/grammar.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/src/languages/func/tree-sitter-func/src/parser.c

Lines changed: 31 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
138 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)