fixes

cursorless-dev · Jan 19, 2024 · b90eb03 · b90eb03
1 parent 215e1ab
commit b90eb03
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 85 deletions.
diff --git a/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckName2.yml b/...es/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/shellscript/chuckName2.yml
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/shellscript/name.assignment.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/shellscript/name.assignment.scope
@@ -0,0 +1,2 @@
+local local_var="hello"
+---
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/shellscript/name.assignment2.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/shellscript/name.assignment2.scope
@@ -0,0 +1,2 @@
+declare local_var="hello"
+---
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/shellscript/name.assignment3.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/shellscript/name.assignment3.scope
@@ -0,0 +1,2 @@
+local local_var
+---
diff --git a/queries/shellscript.scm b/queries/shellscript.scm
@@ -267,82 +267,45 @@
 ;; Names, values, and types
 ;;
 
-;;!! foo="bar"
-;;!  ^^^
-;;!  xxxx
-;;!  ---------
+;;!! for ((i = 1; i <= 5; i++)); do
+;;!        ^
+;;!        xxxx
+;;!        -----
 (
   (variable_assignment
-    name: (_) @name @_.trailing.start.startOf
-    .
-    "=" @_.trailing.end.endOf
+    name: (_) @name @value.leading.endOf
+    value: (_) @value @name.trailing.startOf
   ) @dummy @_.domain
   (#not-parent-type? @dummy declaration_command)
 )
 
-;;!! for ((i = 1; i <= 5; i++)); do
-;;!        ^
-;;!        xxxx
-;;!        -----
-(variable_assignment
-  !name
-  (variable_name) @name @_.trailing.start.startOf
-  "="
-  (_) @_.trailing.end.startOf
-) @_.domain
-
 ;;!! local foo="bar"
 ;;!        ^^^
 ;;!  xxxxxxxxxx
 ;;!  ---------------
 (declaration_command
-  "local" @_.domain.start.startOf @_.trailing.start.startOf
   (variable_assignment
     name: (_) @name
-    .
-    "=" @_.trailing.end.endOf
-  ) @_.domain.end.endOf
-)
-
-;;!! foo="bar"
-;;!      ^^^^^
-;;!     xxxxxx
-;;!  ---------
-(
-  (variable_assignment
-    "=" @value.leading.start.startOf
-    .
-    value: (_) @value @value.leading.end.endOf
-  ) @dummy @_.domain
-  (#not-parent-type? @dummy declaration_command)
-)
+    value: (_) @_.removal.end.startOf
+  )
+) @_.domain @_.removal.start.startOf
 
 ;;!! local foo="bar"
-;;!            ^^^^^
-;;!           xxxxxx
+;;!        ^^^
+;;!  xxxxxxxxxx
 ;;!  ---------------
 (declaration_command
-  "local" @_.domain.start.startOf
   (variable_assignment
-    "=" @value.leading.start.startOf
-    .
-    value: (_) @value @value.leading.end.endOf
-  ) @_.domain.end.endOf
-)
+    name: (_) @_.leading.endOf
+    value: (_) @value
+  )
+) @_.domain
 
-;;!! for ((i = 1; i <= 5; i++)); do
-;;!            ^
-;;!         xxxx
-;;!        -----
-(
-  (variable_assignment
-    !name
-    !value
-    (_) @_.leading.start.endOf
-    "="
-    .
-    (_) @value @_.leading.end.endOf
-  ) @_.domain
-)
+;;!! local foo
+;;!        ^^^
+;;!  ---------
+(declaration_command
+  (variable_name) @name
+) @_.domain
 
 (regex) @regularExpression @textFragment