Add function and class name scopes

cursorless-dev · Jul 6, 2021 · 3a79d5d · 3a79d5d
1 parent 9c3b2f1
commit 3a79d5d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/src/Types.ts b/src/Types.ts
@@ -47,6 +47,7 @@ export type ScopeType =
   | "argumentOrParameter"
   | "arrowFunction"
   | "class"
+  | "className"
   | "comment"
   | "dictionary"
   | "functionCall"

diff --git a/src/languages/json.ts b/src/languages/json.ts
@@ -25,6 +25,7 @@ const nodeMatchers: Record<ScopeType, NodeMatcher> = {
   ...getPojoMatchers(["object"], ["array"], isValue),
   ifStatement: notSupported,
   class: notSupported,
+  className: notSupported,
   statement: notSupported,
   arrowFunction: notSupported,
   functionCall: notSupported,

diff --git a/src/languages/python.ts b/src/languages/python.ts
@@ -2,6 +2,7 @@ import { SyntaxNode } from "web-tree-sitter";
 import { getPojoMatchers } from "./getPojoMatchers";
 import {
   cascadingMatcher,
+  composedMatcher,
   matcher,
   notSupported,
   typeMatcher,
@@ -149,7 +150,14 @@ const nodeMatchers: Record<ScopeType, NodeMatcher> = {
     matcher(getNameNode),
     matcher((node) => (node.type === "assignment" ? getLeftNode(node) : null))
   ),
-  functionName: notSupported,
+  functionName: composedMatcher([
+    possiblyDecoratedDefinition("function_definition"),
+    getNameNode,
+  ]),
+  className: composedMatcher([
+    possiblyDecoratedDefinition("class_definition"),
+    getNameNode,
+  ]),
   arrowFunction: typeMatcher("lambda"),
   functionCall: typeMatcher("call"),
   argumentOrParameter: matcher(

diff --git a/src/languages/typescript.ts b/src/languages/typescript.ts
@@ -163,6 +163,10 @@ const nodeMatchers: Record<ScopeType, NodeMatcher> = {
     composedMatcher([findClassPropertyArrowFunction, getNameNode]),
     composedMatcher([findNamedArrowFunction, getNameNode])
   ),
+  className: composedMatcher([
+    possiblyExportedDeclaration("class_declaration", "class"),
+    getNameNode,
+  ]),
   type: cascadingMatcher(
     // Typed parameters, properties, and functions
     matcher(findTypeNode, selectWithLeadingDelimiter),