Tree-sitter rolling fixes, 1.127 edition #1240
Conversation
| @@ -2,7 +2,7 @@ const fs = require('fs'); | |||
| const path = require('path'); | |||
| const Grim = require('grim'); | |||
| const dedent = require('dedent'); | |||
| const Parser = require('./web-tree-sitter'); | |||
There was a problem hiding this comment.
web-tree-sitter used to have a single export — the Parser object — and hang a small number of other classes off of it (like Parser.Language). This made no sense. Now Language (and many other classes) are available to import directly.
| @@ -299,7 +299,7 @@ module.exports = class WASMTreeSitterGrammar { | |||
| if (!language) { return null; } | |||
| let query = this.queryCache.get(queryType); | |||
| if (!query) { | |||
| query = language.query(this[queryType]); | |||
| query = new Query(language, this[queryType]); | |||
There was a problem hiding this comment.
Query instantiation has moved to a constructor. The old Language::query method would still have worked, but it's deprecated, so we might as well convert it now and avoid warnings in the console.
| @@ -1,4 +1,4 @@ | |||
| const Parser = require('./web-tree-sitter'); | |||
| const { Node, Parser } = require('./web-tree-sitter'); | |||
There was a problem hiding this comment.
We add a property and a method to Node for backward compatibility. We previously were unable to get a reference to Node.prototype until the first time we had an instance of a Node, so we had to apply the patch awkwardly at an arbitrary point in the parsing lifecycle.
Now that we can import Node directly, our lives are easier; we can do the patch immediately after import.
| ## TEMPORARY: Fix incompatible syntax | ||
|
|
||
| Technically, the new build process for `web-tree-sitter` generates some syntax that’s incompatible with Pulsar running on Electron 12/Node 14. [Static initialization blocks](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes/Static_initialization_blocks) are a syntactic enhancement that doesn’t arrive until Node v16.11.0, but they’re easy to convert to a more broadly compatible syntax. | ||
|
|
||
| Find a block that looks like this: | ||
|
|
||
| ```js | ||
| // src/lookahead_iterator.ts | ||
| var LookaheadIterator = class { | ||
| static { | ||
| __name(this, "LookaheadIterator"); | ||
| } | ||
| // … | ||
| }; | ||
| ``` | ||
|
|
||
| It’s lucky for us that the entire `static {` block can simply be removed without anything breaking; it’s mainly for friendlier stack traces. But we can go further and simply move it below the class declaration: | ||
|
|
||
| ```js | ||
| // src/lookahead_iterator.ts | ||
| var LookaheadIterator = class { | ||
| // … | ||
| }; | ||
| __name(LookaheadIterator, "LookaheadIterator"); | ||
| ``` | ||
|
|
||
| This needs to be done in about a half-dozen places. | ||
|
|
||
| Once we upgrade to a more recent version of Electron, this step won’t be necessary. |
There was a problem hiding this comment.
I'd been beta-testing the rewritten web-tree-sitter so I could confirm for @amaanq that it still worked in Pulsar, since we're probably the highest-profile consumers of web-tree-sitter right now. Lazily and foolishly, I only tested in PulsarNext — or else I'd have caught this syntactic addition that Pulsar-on-Electron-12 does not support.
We're very lucky that it appears to be the only thing that's incompatible with Node 14, and that it's ultimately very easy to rewrite. Once we actually upgrade our version of Electron, we can skip this part.
This is a big upgrade! `web-tree-sitter` has been rewritten in TypeScript and has made some backwards-incompatible changes to its exports — all of which are good things. I've also updated the instructions for generating the `web-tree-sitter` bundle.
* Make function parameters spanning multiple lines fold properly * Make `try`/`except` clauses fold properly, with `try` folding only up to the first `except` * Add `folding-spec.js` to test these cases and others and guard them against regressions Also fix a silly mistake in an indentation query. Fixes #1216.
savetheclocktower
force-pushed
the
tree-sitter-1-127
branch
from
06c4804 to
37e49d9
Compare
First commit is a monumental one: Upgrade to
web-tree-sitterv0.25.3.This is a big upgrade!
web-tree-sitterhas been rewritten in TypeScript and has made some backwards-incompatible changes to its exports — but the changes make sense, so it's OK.Tree-sitter also bumped its
ABI, so we had to keep up or else risk being unable to support parsers generated with newertree-sitter-cliversions.I've also updated the instructions for generating the
web-tree-sitterbundle, since the process has changed again.