Update a few stragglers for the query property renaming

pulsar-edit · Aug 9, 2024 · 6846b9c · 6846b9c
1 parent 11e2f75
commit 6846b9c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/packages/symbol-provider-tree-sitter/lib/tree-sitter-provider.js b/packages/symbol-provider-tree-sitter/lib/tree-sitter-provider.js
@@ -1,6 +1,10 @@
 const CaptureOrganizer = require('./capture-organizer');
 const { Emitter } = require('atom');
 
+function layerHasTagsQuery(layer) {
+  return layer.queries?.tagsQuery ?? layer.tagsQuery;
+}
+
 class TreeSitterProvider {
   constructor() {
     this.packageName = 'symbol-provider-tree-sitter';
@@ -37,7 +41,7 @@ class TreeSitterProvider {
     }
 
     // This provider needs at least one layer to have a tags query.
-    let layers = languageMode.getAllLanguageLayers(l => !!l.tagsQuery);
+    let layers = languageMode.getAllLanguageLayers(layerHasTagsQuery);
     if (layers.length === 0) {
       return false;
     }
@@ -64,13 +68,14 @@ class TreeSitterProvider {
     // The symbols-view package might've cancelled us in the interim.
     if (signal.aborted) return null;
 
-    let layers = languageMode.getAllLanguageLayers(l => !!l.tagsQuery);
+    let layers = languageMode.getAllLanguageLayers(layerHasTagsQuery);
     if (layers.length === 0) return null;
 
     for (let layer of layers) {
       let extent = layer.getExtent();
 
-      let captures = layer.tagsQuery.captures(
+      let tagsQuery = layer.queries?.tagsQuery ?? layer.tagsQuery;
+      let captures = tagsQuery.captures(
         layer.tree.rootNode,
         extent.start,
         extent.end

diff --git a/src/wasm-tree-sitter-language-mode.js b/src/wasm-tree-sitter-language-mode.js
@@ -3290,7 +3290,7 @@ class LanguageLayer {
           // propagate errors.
           //
           // TODO: Warning?
-          grammar.highlightsQuery = grammar.setQueryForTest(
+          grammar.setQueryForTest(
             'highlightsQuery',
             `; (placeholder)`
           );
@@ -3753,8 +3753,8 @@ class LanguageLayer {
   }
 
   getLocalReferencesAtPoint(point) {
-    if (!this.localsQuery) { return []; }
-    let captures = this.localsQuery.captures(
+    if (!this.queries.localsQuery) { return []; }
+    let captures = this.queries.localsQuery.captures(
       this.tree.rootNode,
       point,
       point + 1
@@ -3777,15 +3777,15 @@ class LanguageLayer {
   // EXPERIMENTAL: Given a local reference node, tries to find the node that
   // defines it.
   findDefinitionForLocalReference(node, captures = null) {
-    if (!this.localsQuery) { return []; }
+    if (!this.queries.localsQuery) { return []; }
     let name = node.text;
     if (!name) { return []; }
     let localRange = rangeForNode(node);
     let globalScope = this.tree.rootNode;
 
     if (!captures) {
       captures = this.groupLocalsCaptures(
-        this.localsQuery.captures(
+        this.queries.localsQuery.captures(
           globalScope,
           globalScope.startPosition,
           globalScope.endPosition