Skip to content

Commit ac0829b

Browse files
ikatyangikatyang
committed
chore: upgrade to [email protected]
1 parent da1c6e1 commit ac0829b

File tree

20 files changed

+2696
-1899
lines changed

20 files changed

+2696
-1899
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
/build
22
/node_modules
3-
/tree-sitter

‎.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "tree-sitter"]
2+
path = tree-sitter
3+
url = https://github.com/ikatyang/tree-sitter
4+
branch = 0.16.7-custom

‎docs/assets/tree-sitter-playground-0.15.9/LICENSE renamed to ‎docs/assets/tree-sitter-playground-0.16.7/LICENSE

File renamed without changes.

‎docs/assets/tree-sitter-playground-0.15.9/playground.js renamed to ‎docs/assets/tree-sitter-playground-0.16.7/playground.js

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,13 @@ let tree;
103103
}
104104

105105
async function handleCodeChange(editor, changes) {
106-
const newText = codeEditor.getValue() + '\n';
106+
const newText = codeEditor.getValue();
107+
const edits = tree && changes && changes.map(treeEditForEditorChange);
107108

108109
const start = performance.now();
109-
if (tree && changes) {
110-
for (const change of changes) {
111-
tree.edit(treeEditForEditorChange(change));
110+
if (edits) {
111+
for (const edit of edits) {
112+
tree.edit(edit);
112113
}
113114
}
114115
const newTree = parser.parse(newText, tree);
@@ -419,11 +420,19 @@ let tree;
419420
return COLORS_BY_INDEX[id % COLORS_BY_INDEX.length];
420421
}
421422

423+
function getLocalStorageItem(key) {
424+
return localStorage.getItem(`${document.title}:${key}`);
425+
}
426+
427+
function setLocalStorageItem(key, value) {
428+
localStorage.setItem(`${document.title}:${key}`, value);
429+
}
430+
422431
function loadState() {
423-
const language = localStorage.getItem("language");
424-
const sourceCode = localStorage.getItem("sourceCode");
425-
const query = localStorage.getItem("query");
426-
const queryEnabled = localStorage.getItem("queryEnabled");
432+
const language = getLocalStorageItem("language");
433+
const sourceCode = getLocalStorageItem("sourceCode");
434+
const query = getLocalStorageItem("query");
435+
const queryEnabled = getLocalStorageItem("queryEnabled");
427436
if (language != null && sourceCode != null && query != null) {
428437
queryInput.value = query;
429438
codeInput.value = sourceCode;
@@ -433,14 +442,14 @@ let tree;
433442
}
434443

435444
function saveState() {
436-
localStorage.setItem("language", languageSelect.value);
437-
localStorage.setItem("sourceCode", codeEditor.getValue());
445+
setLocalStorageItem("language", languageSelect.value);
446+
setLocalStorageItem("sourceCode", codeEditor.getValue());
438447
saveQueryState();
439448
}
440449

441450
function saveQueryState() {
442-
localStorage.setItem("queryEnabled", queryCheckbox.checked);
443-
localStorage.setItem("query", queryEditor.getValue());
451+
setLocalStorageItem("queryEnabled", queryCheckbox.checked);
452+
setLocalStorageItem("query", queryEditor.getValue());
444453
}
445454

446455
function debounce(func, wait, immediate) {

‎docs/assets/tree-sitter-playground-0.15.9/style.css renamed to ‎docs/assets/tree-sitter-playground-0.16.7/style.css

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

‎docs/assets/tree-sitter-vue-0.1.0/tree-sitter-vue.wasm

-15.9 KB
Binary file not shown.

‎docs/assets/web-tree-sitter-0.15.9/tree-sitter.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/assets/web-tree-sitter-0.15.9/tree-sitter.wasm

-317 KB
Binary file not shown.

‎docs/assets/web-tree-sitter-0.15.9/LICENSE renamed to ‎docs/assets/web-tree-sitter-0.16.7/LICENSE

File renamed without changes.

‎docs/assets/web-tree-sitter-0.16.7/tree-sitter.js

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

‎docs/assets/web-tree-sitter-0.16.7/tree-sitter.wasm

213 KB
Binary file not shown.

‎docs/index.html

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
7-
<link rel="stylesheet" href="assets/tree-sitter-playground-0.15.9/style.css" media="screen" type="text/css">
7+
<link rel="stylesheet" href="assets/tree-sitter-playground-0.16.7/style.css" media="screen" type="text/css">
88
<title>Tree-sitter Vue Playground</title>
99
</head>
1010

@@ -62,17 +62,23 @@ <h4>Tree</h4>
6262
<script src="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.45.0/codemirror.min.js"></script>
6363

6464
<script>LANGUAGE_BASE_URL = "assets/tree-sitter-vue-0.1.0";</script>
65-
<script src="assets/web-tree-sitter-0.15.9/tree-sitter.js"></script>
65+
<script src="assets/web-tree-sitter-0.16.7/tree-sitter.js"></script>
6666

6767
<script src="https://cdnjs.cloudflare.com/ajax/libs/clusterize.js/0.18.0/clusterize.min.js"></script>
68-
<script src="assets/tree-sitter-playground-0.15.9/playground.js"></script>
68+
<script src="assets/tree-sitter-playground-0.16.7/playground.js"></script>
6969

7070
<script>
71-
(codeExample => {
71+
((codeExample, queryExample) => {
7272
const handle = setInterval(() => {
7373
const $codeEditor = document.querySelector('.CodeMirror');
74-
if ($codeEditor) {
74+
const $queryEditor = document.querySelector('#query-container .CodeMirror');
75+
const $queryCheckbox = document.querySelector('#query-checkbox');
76+
if ($codeEditor && $queryEditor) {
7577
$codeEditor.CodeMirror.setValue(codeExample);
78+
if (queryExample) {
79+
$queryEditor.CodeMirror.setValue(queryExample);
80+
if (!$queryCheckbox.checked) $queryCheckbox.click();
81+
}
7682
clearInterval(handle);
7783
}
7884
}, 500);
@@ -99,8 +105,7 @@ <h4>Tree</h4>
99105
font-size: 2em;
100106
text-align: center;
101107
}
102-
</style>
103-
`);
108+
</style>`, ``);
104109
</script>
105110

106111
</main>

‎grammar.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ module.exports = grammar({
149149
seq(
150150
$.directive_name,
151151
optional(seq(
152-
prec(1, token.immediate(":")),
152+
token.immediate(prec(1, ":")),
153153
choice($.directive_argument, $.directive_dynamic_argument),
154154
)),
155155
),
@@ -161,16 +161,16 @@ module.exports = grammar({
161161
optional($.directive_modifiers),
162162
optional(seq("=", choice($.attribute_value, $.quoted_attribute_value))),
163163
),
164-
directive_name: $ => prec(1, token(/v-[^<>'"=/\s:.]+/)),
165-
directive_shorthand: $ => prec(1, token(choice(":", "@", "#"))),
164+
directive_name: $ => token(prec(1, /v-[^<>'"=/\s:.]+/)),
165+
directive_shorthand: $ => token(prec(1, choice(":", "@", "#"))),
166166
directive_argument: $ => token.immediate(/[^<>"'/=\s.]+/),
167167
directive_dynamic_argument: $ => seq(
168-
prec(1, token.immediate("[")),
168+
token.immediate(prec(1, "[")),
169169
optional($.directive_dynamic_argument_value),
170170
token.immediate("]"),
171171
),
172172
directive_dynamic_argument_value: $ => token.immediate(/[^<>"'/=\s\]]+/),
173-
directive_modifiers: $ => repeat1(seq(prec(1, token.immediate(".")), $.directive_modifier)),
173+
directive_modifiers: $ => repeat1(seq(token.immediate(prec(1, ".")), $.directive_modifier)),
174174
directive_modifier: $ => token.immediate(/[^<>"'/=\s.]+/),
175175
},
176176
});

‎scripts/generate-playground.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module.exports = {
1919
}
2020
}
2121
}
22-
<\\/script>
22+
</script>
2323
2424
<style scoped>
2525
p {

‎scripts/setup-tree-sitter.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
git clone https://github.com/ikatyang/tree-sitter --branch 0.15.9-custom --depth 1
2-
cd tree-sitter
31
git submodule update --init
2+
cd tree-sitter
43
./script/build-wasm
54
cargo build --release

‎src/grammar.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)