Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Update tree-sitter@0.20 #25443

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update tree-sitter@0.20 #25443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c60494
feat: Clarify error for incompatible tree-sitter languages
claytonrcarter May 5, 2022
48b9924
chore: Update tree-sitter
claytonrcarter May 5, 2022
3e5cb23
chore: Update tree-sitter languages
claytonrcarter May 5, 2022
68f4ab6
chore(FIXME): Include PENDING tree-sitter language updates
claytonrcarter May 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
node_modules
/vendor/
/out/
packages_temporary
15 changes: 15 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[submodule "packages_temporary/language-html"]
path = packages_temporary/language-html
url = https://github.com/icecream17/language-html.git
[submodule "packages_temporary/language-json"]
path = packages_temporary/language-json
url = https://github.com/icecream17/language-json.git
[submodule "packages_temporary/language-python"]
path = packages_temporary/language-python
url = https://github.com/claytonrcarter/language-python.git
[submodule "packages_temporary/language-shellscript"]
path = packages_temporary/language-shellscript
url = https://github.com/claytonrcarter/language-shellscript.git
[submodule "packages_temporary/language-typescript"]
path = packages_temporary/language-typescript
url = https://github.com/claytonrcarter/language-typescript.git
265 changes: 141 additions & 124 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,38 +81,38 @@
"jasmine-tagged": "^1.1.4",
"key-path-helpers": "^0.4.0",
"keybinding-resolver": "https://www.atom.io/api/packages/keybinding-resolver/versions/0.39.1/tarball",
"language-c": "https://www.atom.io/api/packages/language-c/versions/0.60.19/tarball",
"language-c": "https://www.atom.io/api/packages/language-c/versions/0.60.20/tarball",
"language-clojure": "https://www.atom.io/api/packages/language-clojure/versions/0.22.8/tarball",
"language-coffee-script": "https://www.atom.io/api/packages/language-coffee-script/versions/0.50.0/tarball",
"language-csharp": "https://www.atom.io/api/packages/language-csharp/versions/1.1.0/tarball",
"language-css": "https://www.atom.io/api/packages/language-css/versions/0.45.1/tarball",
"language-gfm": "https://www.atom.io/api/packages/language-gfm/versions/0.90.8/tarball",
"language-git": "https://www.atom.io/api/packages/language-git/versions/0.19.1/tarball",
"language-go": "https://www.atom.io/api/packages/language-go/versions/0.47.2/tarball",
"language-html": "https://www.atom.io/api/packages/language-html/versions/0.53.1/tarball",
"language-go": "https://www.atom.io/api/packages/language-go/versions/0.47.3/tarball",
"language-html": "file:packages_temporary/language-html",
"language-hyperlink": "https://www.atom.io/api/packages/language-hyperlink/versions/0.17.1/tarball",
"language-java": "https://www.atom.io/api/packages/language-java/versions/0.32.1/tarball",
"language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.134.1/tarball",
"language-json": "https://www.atom.io/api/packages/language-json/versions/1.0.5/tarball",
"language-javascript": "https://www.atom.io/api/packages/language-javascript/versions/0.134.2/tarball",
"language-json": "file:packages_temporary/language-json",
"language-less": "https://www.atom.io/api/packages/language-less/versions/0.34.3/tarball",
"language-make": "https://www.atom.io/api/packages/language-make/versions/0.23.0/tarball",
"language-mustache": "https://www.atom.io/api/packages/language-mustache/versions/0.14.5/tarball",
"language-objective-c": "https://www.atom.io/api/packages/language-objective-c/versions/0.16.0/tarball",
"language-perl": "https://www.atom.io/api/packages/language-perl/versions/0.38.1/tarball",
"language-php": "https://www.atom.io/api/packages/language-php/versions/0.48.1/tarball",
"language-property-list": "https://www.atom.io/api/packages/language-property-list/versions/0.9.1/tarball",
"language-python": "https://www.atom.io/api/packages/language-python/versions/0.53.6/tarball",
"language-python": "file:packages_temporary/language-python",
"language-ruby": "https://www.atom.io/api/packages/language-ruby/versions/0.73.0/tarball",
"language-ruby-on-rails": "https://www.atom.io/api/packages/language-ruby-on-rails/versions/0.25.3/tarball",
"language-rust-bundled": "file:packages/language-rust-bundled",
"language-sass": "https://www.atom.io/api/packages/language-sass/versions/0.62.1/tarball",
"language-shellscript": "https://www.atom.io/api/packages/language-shellscript/versions/0.28.2/tarball",
"language-shellscript": "file:packages_temporary/language-shellscript",
"language-source": "https://www.atom.io/api/packages/language-source/versions/0.9.0/tarball",
"language-sql": "https://www.atom.io/api/packages/language-sql/versions/0.25.10/tarball",
"language-text": "https://www.atom.io/api/packages/language-text/versions/0.7.4/tarball",
"language-todo": "https://www.atom.io/api/packages/language-todo/versions/0.29.4/tarball",
"language-toml": "https://www.atom.io/api/packages/language-toml/versions/0.20.0/tarball",
"language-typescript": "https://www.atom.io/api/packages/language-typescript/versions/0.6.3/tarball",
"language-typescript": "file:packages_temporary/language-typescript",
"language-xml": "https://www.atom.io/api/packages/language-xml/versions/0.35.3/tarball",
"language-yaml": "https://www.atom.io/api/packages/language-yaml/versions/0.32.0/tarball",
"less-cache": "1.1.0",
Expand Down Expand Up @@ -161,7 +161,7 @@
"temp": "0.9.2",
"text-buffer": "^13.18.5",
"timecop": "https://www.atom.io/api/packages/timecop/versions/0.36.2/tarball",
"tree-sitter": "git+https://github.com/DeeDeeG/node-tree-sitter.git#bb298eaae66e0c4f11908cb6209f3e141884e88e",
"tree-sitter": "^0.20.0",
"tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.229.1/tarball",
"typescript-simple": "8.0.6",
"update-package-dependencies": "file:./packages/update-package-dependencies",
Expand Down Expand Up @@ -232,38 +232,38 @@
"welcome": "file:./packages/welcome",
"whitespace": "0.37.8",
"wrap-guide": "0.41.0",
"language-c": "0.60.19",
"language-c": "0.60.20",
"language-clojure": "0.22.8",
"language-coffee-script": "0.50.0",
"language-csharp": "1.1.0",
"language-css": "0.45.1",
"language-gfm": "0.90.8",
"language-git": "0.19.1",
"language-go": "0.47.2",
"language-html": "0.53.1",
"language-go": "0.47.3",
"language-html": "file:./packages_temporary/language-html",
"language-hyperlink": "0.17.1",
"language-java": "0.32.1",
"language-javascript": "0.134.1",
"language-json": "1.0.5",
"language-javascript": "0.134.2",
"language-json": "file:./packages_temporary/language-json",
"language-less": "0.34.3",
"language-make": "0.23.0",
"language-mustache": "0.14.5",
"language-objective-c": "0.16.0",
"language-perl": "0.38.1",
"language-php": "0.48.1",
"language-property-list": "0.9.1",
"language-python": "0.53.6",
"language-python": "file:./packages_temporary/language-python",
"language-ruby": "0.73.0",
"language-ruby-on-rails": "0.25.3",
"language-rust-bundled": "file:./packages/language-rust-bundled",
"language-sass": "0.62.1",
"language-shellscript": "0.28.2",
"language-shellscript": "file:./packages_temporary/language-shellscript",
"language-source": "0.9.0",
"language-sql": "0.25.10",
"language-text": "0.7.4",
"language-todo": "0.29.4",
"language-toml": "0.20.0",
"language-typescript": "0.6.3",
"language-typescript": "file:./packages_temporary/language-typescript",
"language-xml": "0.35.3",
"language-yaml": "0.32.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/language-rust-bundled/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"repository": "https://github.com/atom/atom",
"license": "MIT",
"dependencies": {
"tree-sitter-rust": "^0.17.0"
"tree-sitter-rust": "^0.20.1"
},
"engines": {
"atom": ">=1.0.0 <2.0.0"
Expand Down
1 change: 1 addition & 0 deletions packages_temporary/language-html
Open in desktop
Submodule language-html added at ba7bfe
1 change: 1 addition & 0 deletions packages_temporary/language-json
Open in desktop
Submodule language-json added at 78d9a2
1 change: 1 addition & 0 deletions packages_temporary/language-python
Open in desktop
Submodule language-python added at 7414db
1 change: 1 addition & 0 deletions packages_temporary/language-shellscript
Open in desktop
Submodule language-shellscript added at 06d012
1 change: 1 addition & 0 deletions packages_temporary/language-typescript
Open in desktop
Submodule language-typescript added at ae7c2c
4 changes: 4 additions & 0 deletions script/vsts/platforms/templates/preparation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ steps:
- script: npm install --global npm@6.14.8
displayName: Update npm

# This is a common build step and is only needed until all tree-sitter languages have been updated
- script: git submodule update --init
displayName: Update submodules (temporary build step)

# Windows Specific
- task: UsePythonVersion@0
inputs:
Expand Down
16 changes: 15 additions & 1 deletion src/tree-sitter-language-mode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,21 @@ class TreeSitterLanguageMode {

parse(language, oldTree, ranges) {
const parser = PARSER_POOL.pop() || new Parser();
parser.setLanguage(language);

try {
parser.setLanguage(language);
} catch (e) {
if (e instanceof RangeError) {
e.message = e.message.replace(
'Incompatible language version.',
`Incompatible tree-sitter language version for language: ${
language.name
}.`
);
}
throw e;
}

const result = parser.parseTextBuffer(this.buffer.buffer, oldTree, {
syncTimeoutMicros: this.syncTimeoutMicros,
includedRanges: ranges
Expand Down