From d011f9d8edc06ea6136f3ae094246ff06a555376 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Mon, 4 Oct 2021 23:12:50 +0300 Subject: [PATCH 1/3] Install the exact version instead of range ^version means install any version that is compatible with the range. This means npm can even install tree-sitter-javascript version 0.15 since in semver 0.15 should be compatible with 0.19. tree-sitter seems to have broken semver. 0.15 is not compatible with 0.19 --- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5270a65..d65f541 100644 --- a/package-lock.json +++ b/package-lock.json @@ -171,19 +171,19 @@ "dev": true }, "tree-sitter-embedded-template": { - "version": "0.15.2", - "resolved": "https://registry.npmjs.org/tree-sitter-embedded-template/-/tree-sitter-embedded-template-0.15.2.tgz", - "integrity": "sha512-DHT4KAzFbtj/5XhSZWCkf7LP1SYIi4gSSOZHVH9SqEv1DIc9rSmgNO3rzIyMoRclusLoL2susmokL/hYkj56+A==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/tree-sitter-embedded-template/-/tree-sitter-embedded-template-0.19.0.tgz", + "integrity": "sha512-J80/G0xRHlIxv0gNfvW8zHMZeD9nqnSKV4nMB5t0RAW/W/nM5io/gojk0ppWuWKMuyYNs3KKXIqP0i43jVkdkQ==", "requires": { - "nan": "^2.0.0" + "nan": "^2.14.0" } }, "tree-sitter-html": { - "version": "0.15.1", - "resolved": "https://registry.npmjs.org/tree-sitter-html/-/tree-sitter-html-0.15.1.tgz", - "integrity": "sha512-hf1dTxB6OIlDk+mkxLaHC1boKUxmnp0qxt8nApZZ6zf3VWj5FeYlWv93GX5+gLL3NkLAjaUKGZGFXpR+wE97Jg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/tree-sitter-html/-/tree-sitter-html-0.19.0.tgz", + "integrity": "sha512-xH6XGSBWzb4oU/aG6gouMRQKsd96iKuy0zboUqo3wcIWrA++q9a7CmQTSeIINiSfOXjT2ZLJciXFDgAh6h04Bw==", "requires": { - "nan": "^2.10.0" + "nan": "^2.14.0" } }, "wordwrap": { diff --git a/package.json b/package.json index 789924c..f180a64 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ }, "dependencies": { "atom-grammar-test": "^0.6.3", - "tree-sitter-embedded-template": "^0.15.2", - "tree-sitter-html": "^0.15.0" + "tree-sitter-embedded-template": "0.19.0", + "tree-sitter-html": "0.19.0" }, "devDependencies": { "coffeelint": "^1.10.1", From a77aa2f4a871546f4237c2985e689fffda92bd3e Mon Sep 17 00:00:00 2001 From: sadick254 Date: Thu, 7 Oct 2021 18:00:51 +0300 Subject: [PATCH 2/3] Remove ubuntu test --- .github/workflows/main.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 80b99d1..40bbf8a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -10,17 +10,13 @@ jobs: strategy: matrix: os: [ubuntu-latest, macos-latest, windows-latest] - channel: [stable, beta] + channel: [stable, beta, nightly] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v1 - uses: UziTech/action-setup-atom@v2 with: version: ${{ matrix.channel }} - - name: Install windows-build-tools - if: ${{ matrix.os == 'windows-latest' }} - run: | - npm i windows-build-tools@4.0.0 - name: Install dependencies run: apm install - name: Run tests From bf8097064abcbd152e580d55c14858783e66e998 Mon Sep 17 00:00:00 2001 From: sadick254 Date: Thu, 7 Oct 2021 18:36:21 +0300 Subject: [PATCH 3/3] Test --- spec/tree-sitter-spec.js | 6 ++++++ test.html | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 test.html diff --git a/spec/tree-sitter-spec.js b/spec/tree-sitter-spec.js index df13e18..e5255ea 100644 --- a/spec/tree-sitter-spec.js +++ b/spec/tree-sitter-spec.js @@ -20,6 +20,12 @@ describe('Tree-sitter HTML grammar', () => { `) + grammar = atom.grammars.grammarForScopeName('text.html.basic') + + lines = grammar.tokenizeLines(editor.getText()) + + expect(lines).toBe([]) + // Tag punctuation. expect(editor.scopeDescriptorForBufferPosition([0, 0]).toString()).toBe( '.text.html.basic .source.html .punctuation.definition.tag.begin' diff --git a/test.html b/test.html new file mode 100644 index 0000000..5892bc0 --- /dev/null +++ b/test.html @@ -0,0 +1,7 @@ + + + + + + +