Changes for tree-sitter 0.21

data/fixtures/scopes/php/textFragment.string.singleLine.scope

@@ -0,0 +1,51 @@
+<?php
+    "aaa";
+    'aaa';
+    `aaa`;
+    "aaa $bbb ccc"
+    `aaa $bbb ccc`;
+---
+
+[#1 Content] =
+[#1 Removal] =
+[#1 Domain] = 1:5-1:8
+       >---<
+1|     "aaa";
+
+[#1 Insertion delimiter] = " "
+
+
+[#2 Content] =
+[#2 Removal] =
+[#2 Domain] = 2:5-2:8
+       >---<
+2|     'aaa';
+
+[#2 Insertion delimiter] = " "
+
+
+[#3 Content] =
+[#3 Removal] =
+[#3 Domain] = 3:5-3:8
+       >---<
+3|     `aaa`;
+
+[#3 Insertion delimiter] = " "
+
+
+[#4 Content] =
+[#4 Removal] =
+[#4 Domain] = 4:5-4:17
+       >------------<
+4|     "aaa $bbb ccc"
+
+[#4 Insertion delimiter] = " "
+
+
+[#5 Content] =
+[#5 Removal] =
+[#5 Domain] = 5:5-5:17
+       >------------<
+5|     `aaa $bbb ccc`;
+
+[#5 Insertion delimiter] = " "

data/fixtures/scopes/typescript.core/type.cast2.scope

@@ -0,0 +1,20 @@
+aaa as const
+---
+
+[Content] = 0:7-0:12
+         >-----<
+0| aaa as const
+
+[Removal] = 0:3-0:12
+     >---------<
+0| aaa as const
+
+[Leading delimiter] = 0:3-0:7
+     >----<
+0| aaa as const
+
+[Domain] = 0:0-0:12
+  >------------<
+0| aaa as const
+
+[Insertion delimiter] = " "

packages/common/src/scopeSupportFacets/php.ts

@@ -11,4 +11,5 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
 export const phpScopeSupport: LanguageScopeSupportFacetMap = {
   "comment.line": supported,
   "comment.block": supported,
+  "textFragment.string.singleLine": supported,
 };

packages/cursorless-engine/src/actions/ShowParseTree.ts

@@ -116,6 +116,6 @@ function parseCursor(
 }
 
 function getFieldName(cursor: TreeCursor): string {
-  const field = cursor.currentFieldName();
+  const field = cursor.currentFieldName;
   return field != null ? `${field}: ` : "";
 }

packages/cursorless-engine/src/core/Debug.ts

@@ -101,7 +101,7 @@ export class Debug {
     cursor: TreeCursor,
     index: number,
   ) {
-    const field = cursor.currentFieldName();
+    const field = cursor.currentFieldName;
     const fieldText = field != null ? `${field}: ` : "";
     const indent = " ".repeat(index);
     const nodeIsLast = index === nodes.length - 1;
@@ -133,7 +133,7 @@ export class Debug {
 
   private cursorGoToChildWithId(cursor: TreeCursor, id: number): boolean {
     cursor.gotoFirstChild();
-    while (cursor.currentNode().id !== id) {
+    while (cursor.currentNode.id !== id) {
       if (!cursor.gotoNextSibling()) {
         return false;
       }

packages/cursorless-engine/src/languages/LanguageDefinition.ts

@@ -52,6 +52,10 @@ export class LanguageDefinition {
       return undefined;
     }
 
+    if (!(await treeSitter.loadLanguage(languageId))) {
+      return undefined;
+    }
+
     const rawQuery = treeSitter
       .getLanguage(languageId)!
       .query(rawLanguageQueryString);

packages/cursorless-engine/src/languages/TreeSitterQuery/TreeSitterQuery.ts

@@ -67,11 +67,10 @@ export class TreeSitterQuery {
     end?: Position,
   ): QueryMatch[] {
     return this.query
-      .matches(
-        this.treeSitter.getTree(document).rootNode,
-        start == null ? undefined : positionToPoint(start),
-        end == null ? undefined : positionToPoint(end),
-      )
+      .matches(this.treeSitter.getTree(document).rootNode, {
+        startPosition: start == null ? undefined : positionToPoint(start),
+        endPosition: end == null ? undefined : positionToPoint(end),
+      })
       .map(
         ({ pattern, captures }): MutableQueryMatch => ({
           patternIdx: pattern,

packages/cursorless-engine/src/languages/latex.ts

@@ -108,7 +108,7 @@ function extendToNamedSiblingIfExists(
   let endIndex = node.endIndex;
   const sibling = node.nextNamedSibling;
 
-  if (sibling != null && sibling.isNamed()) {
+  if (sibling != null && sibling.isNamed) {
     endIndex = sibling.endIndex;
   }
 

packages/cursorless-engine/src/languages/ruby.ts

@@ -92,15 +92,21 @@ const EXPRESSION_TYPES = [
 ];
 
 const EXPRESSION_STATEMENT_PARENT_TYPES = [
+  "begin_block",
   "begin",
+  "block_body",
   "block",
-  "do",
+  "body_statement",
   "do_block",
+  "do",
   "else",
+  "end_block",
   "ensure",
   "heredoc_beginning",
+  "interpolation",
   "lambda",
   "method",
+  "parenthesized_statements",
   "program",
   "singleton_class",
   "singleton_method",

packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/delimiterMaps.ts

@@ -44,6 +44,14 @@ const delimiterToTextOverrides: Record<string, Partial<DelimiterMap>> = {
       ['"', "]]"],
     ],
   },
+
+  python: {
+    // FIXME: We technically can't distinguish between single and double quotes
+    // now, but we'll revisit all this; see
+    // https://github.com/cursorless-dev/cursorless/issues/1812#issuecomment-1691493746
+    singleQuotes: ["string_start", "string_end"],
+    doubleQuotes: ["string_start", "string_end"],
+  },
 };
 
 export const leftToRightMap: Record<string, string> = Object.fromEntries(

packages/cursorless-engine/src/processTargets/modifiers/surroundingPair/findSurroundingPairParseTreeBased.ts

@@ -183,7 +183,7 @@ function findSurroundingPairContainedInNode(
    */
   const possibleDelimiterNodes = node
     .descendantsOfType(individualDelimiters.map(({ text }) => text))
-    .filter((node) => !(node.text === "" && node.hasError()));
+    .filter((node) => !(node.text === "" && node.hasError));
 
   /**
    * A list of all delimiter occurrences, generated from the delimiter nodes.

packages/cursorless-engine/src/util/treeSitterUtils.ts

@@ -27,8 +27,8 @@ export function getChildNodesForFieldName(
   let hasNext = true;
 
   while (hasNext) {
-    if (treeCursor.currentFieldName() === fieldName) {
-      ret.push(treeCursor.currentNode());
+    if (treeCursor.currentFieldName === fieldName) {
+      ret.push(treeCursor.currentNode);
     }
 
     hasNext = treeCursor.gotoNextSibling();

queries/cpp.scm

@@ -35,20 +35,19 @@
 (function_definition
   declarator: (_
     declarator: (_
-      namespace: (_) @className
+      scope: (_) @className
     )
   )
 ) @_.domain
 
 (lambda_expression) @anonymousFunction
-(attribute) @attribute
+(attribute_declaration) @attribute
 
 ;; >  curl https://raw.githubusercontent.com/tree-sitter/tree-sitter-cpp/master/src/node-types.json | jq '[.[] | select(.type == "_type_specifier") | .subtypes[].type]'
 [
   (auto)
   (decltype)
   (dependent_type)
-  (scoped_type_identifier)
   (template_type)
 ] @type