pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-09-11 11:15:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove the requirement for a grammar to have a highlightsQuery

Browse Source
This commit is contained in:
Andrew Dupont 2024-01-13 20:08:07 -08:00
parent fbc2c822ad
commit 6069a59804
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/language-php/grammars/modern-tree-sitter-php.cson
View File

@ -8,7 +8,6 @@ injectionRegex: '^(internal-php)$'
treeSitter:
parserSource: 'github:tree-sitter/tree-sitter-php#594b8bad093abe739c3d2a2cae5abae33c5fb23d'
# TODO: See if we can make an “empty” Tree-sitter parser. We don't need this
# layer to do any of its own parsing work.
grammar: 'tree-sitter/tree-sitter-php.wasm'
# TODO: This shouldn't be necessary. Investigate why a `highlightsQuery` is
# still required.
highlightsQuery: 'tree-sitter/queries/empty.scm'

4
src/wasm-tree-sitter-grammar.js
View File

@ -146,10 +146,6 @@ module.exports = class WASMTreeSitterGrammar {
}
async loadQueryFiles(grammarPath, queryPaths) {
if (!('highlightsQuery' in queryPaths)) {
throw new Error(`Highlights query must be present`);
}
if (this._loadQueryFilesPromise) {
return this._loadQueryFilesPromise;
}

22
src/wasm-tree-sitter-language-mode.js
View File

@ -2949,22 +2949,14 @@ class LanguageLayer {
// off this promise. We can `await this.languageLoaded` later on.
this.languageLoaded = this.grammar.getLanguage().then(language => {
this.language = language;
// TODO: Currently, we require a highlights query, but we might want to
// rethink this. There are use cases for treating the root layer merely
// as a way to delegate to injections, in which case syntax highlighting
// wouldn't be needed.
return this.grammar.getQuery('highlightsQuery').then(highlightsQuery => {
this.highlightsQuery = highlightsQuery;
}).catch(() => {
throw new GrammarLoadError(grammar, 'highlightsQuery');
});
}).then(() => {
// All other queries are optional. Regular expression language layers,
// for instance, don't really have a need for any of these.
let otherQueries = ['foldsQuery', 'indentsQuery', 'localsQuery', 'tagsQuery'];
// All queries are optional. Regular expression language layers, for
// instance, don't really have a need for any queries other than
// `highlightsQuery`, and some kinds of layers don't even need
// `highlightsQuery`.
let queries = ['highlightsQuery', 'foldsQuery', 'indentsQuery', 'localsQuery', 'tagsQuery'];
let promises = [];
for (let queryType of otherQueries) {
for (let queryType of queries) {
if (grammar[queryType]) {
let promise = this.grammar.getQuery(queryType).then(query => {
this[queryType] = query;
@ -4110,7 +4102,7 @@ class NodeRangeSet {
}
}
getNodeSpec (node, getChildren) {
getNodeSpec(node, getChildren) {
let { startIndex, endIndex, startPosition, endPosition, id } = node;
let result = { startIndex, endIndex, startPosition, endPosition, id };
if (node.children && getChildren) {