migrate Go func, func name, and lambda to treesitter

data/playground/go/funcs.go

@@ -0,0 +1,29 @@
+package p
+
+func plainOldFunction() {
+	go func() {
+		// anonymous function
+	}()
+	_ = func() string {
+		return "x"
+	}
+}
+
+func genericFunction[T int | int64](x T) T {
+	if x == 0 {
+		panic("zero")
+	}
+	return x
+}
+
+func (a A) method() {
+	defer func() {
+		recover()
+	}()
+	[]func(){
+		func() { panic(0) },
+		func() { panic(1) },
+	}[a[0].(int)]()
+}
+
+func stub() string

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

@@ -14,16 +14,13 @@ const nodeMatchers: Partial<
   ifStatement: "if_statement",
   functionCall: ["call_expression", "composite_literal"],
   functionCallee: ["call_expression[function]", "composite_literal[type]"],
-  namedFunction: ["function_declaration", "method_declaration"],
   type: [
     "pointer_type",
     "qualified_type",
     "type_identifier",
     "function_declaration[result]",
     "method_declaration[result]",
   ],
-  functionName: ["function_declaration[name]", "method_declaration[name]"],
-  anonymousFunction: "func_literal",
   condition: conditionMatcher("*[condition]"),
   argumentOrParameter: cascadingMatcher(
     argumentMatcher("argument_list", "parameter_list"),

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkBat.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk bat
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+      mark: {type: decoratedSymbol, symbolColor: default, character: b}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "func f() {\n\t// body\n}"
+  selections:
+    - anchor: {line: 2, character: 1}
+      active: {line: 2, character: 1}
+  marks:
+    default.b:
+      start: {line: 1, character: 4}
+      end: {line: 1, character: 8}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkBat2.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk bat
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+      mark: {type: decoratedSymbol, symbolColor: default, character: b}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "func (t T) f() {\n\t// body\n}"
+  selections:
+    - anchor: {line: 2, character: 1}
+      active: {line: 2, character: 1}
+  marks:
+    default.b:
+      start: {line: 1, character: 4}
+      end: {line: 1, character: 8}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkFine.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk fine
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+      mark: {type: decoratedSymbol, symbolColor: default, character: f}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "func f() {\n\t// body\n}"
+  selections:
+    - anchor: {line: 2, character: 1}
+      active: {line: 2, character: 1}
+  marks:
+    default.f:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 4}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkFine2.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk fine
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+      mark: {type: decoratedSymbol, symbolColor: default, character: f}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "func (t T) f() {\n\t// body\n}"
+  selections:
+    - anchor: {line: 2, character: 1}
+      active: {line: 2, character: 1}
+  marks:
+    default.f:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 4}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkFine3.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk fine
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+      mark: {type: decoratedSymbol, symbolColor: default, character: f}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: func g()
+  selections:
+    - anchor: {line: 0, character: 8}
+      active: {line: 0, character: 8}
+  marks:
+    default.f:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 4}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkGust.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk gust
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: namedFunction}
+      mark: {type: decoratedSymbol, symbolColor: default, character: g}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: func g()
+  selections:
+    - anchor: {line: 0, character: 8}
+      active: {line: 0, character: 8}
+  marks:
+    default.g:
+      start: {line: 0, character: 5}
+      end: {line: 0, character: 6}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkNameBat.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk name bat
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionName}
+      mark: {type: decoratedSymbol, symbolColor: default, character: b}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "func f() {\n\t// body\n}"
+  selections:
+    - anchor: {line: 2, character: 1}
+      active: {line: 2, character: 1}
+  marks:
+    default.b:
+      start: {line: 1, character: 4}
+      end: {line: 1, character: 8}
+finalState:
+  documentContents: "func () {\n\t// body\n}"
+  selections:
+    - anchor: {line: 0, character: 5}
+      active: {line: 0, character: 5}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkNameBat2.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk name bat
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionName}
+      mark: {type: decoratedSymbol, symbolColor: default, character: b}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: "func (t T) f() {\n\t// body\n}"
+  selections:
+    - anchor: {line: 2, character: 1}
+      active: {line: 2, character: 1}
+  marks:
+    default.b:
+      start: {line: 1, character: 4}
+      end: {line: 1, character: 8}
+finalState:
+  documentContents: "func (t T) () {\n\t// body\n}"
+  selections:
+    - anchor: {line: 0, character: 11}
+      active: {line: 0, character: 11}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeFunkNameFine.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change funk name fine
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: functionName}
+      mark: {type: decoratedSymbol, symbolColor: default, character: f}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: func g()
+  selections:
+    - anchor: {line: 0, character: 8}
+      active: {line: 0, character: 8}
+  marks:
+    default.f:
+      start: {line: 0, character: 0}
+      end: {line: 0, character: 4}
+finalState:
+  documentContents: func ()
+  selections:
+    - anchor: {line: 0, character: 5}
+      active: {line: 0, character: 5}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeLambdaFine.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change lambda fine
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: anonymousFunction}
+      mark: {type: decoratedSymbol, symbolColor: default, character: f}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: _ = func() { /* stuff */ }
+  selections:
+    - anchor: {line: 0, character: 26}
+      active: {line: 0, character: 26}
+  marks:
+    default.f:
+      start: {line: 0, character: 4}
+      end: {line: 0, character: 8}
+finalState:
+  documentContents: "_ = "
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/go/changeLambdaSun.yml

@@ -0,0 +1,27 @@
+languageId: go
+command:
+  version: 6
+  spokenForm: change lambda sun
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: anonymousFunction}
+      mark: {type: decoratedSymbol, symbolColor: default, character: s}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: _ = func() { /* stuff */ }
+  selections:
+    - anchor: {line: 0, character: 26}
+      active: {line: 0, character: 26}
+  marks:
+    default.s:
+      start: {line: 0, character: 16}
+      end: {line: 0, character: 21}
+finalState:
+  documentContents: "_ = "
+  selections:
+    - anchor: {line: 0, character: 4}
+      active: {line: 0, character: 4}

queries/go.scm

@@ -182,3 +182,26 @@
   ) @list @map
   (#not-parent-type? @list composite_literal)
 )
+
+;; Functions
+
+;; function declaration, generic function declaration, function stub
+;; func foo() {}
+;; func foo[]() {}
+;; func foo()
+(function_declaration
+  name: (_) @functionName
+  body: (_)? @namedFunction.interior
+) @namedFunction @functionName.domain
+
+;; method declaration
+;; func (X) foo() {}
+(method_declaration
+  name: (_) @functionName
+  body: (_) @namedFunction.interior
+) @namedFunction @functionName.domain
+
+;; func literal
+(func_literal
+  body: (_) @namedFunction.interior
+) @anonymousFunction