Revert call domain

cursorless-dev · Dec 13, 2023 · 96eb2ea · 96eb2ea
1 parent ef3b29b
commit 96eb2ea
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 33 deletions.
diff --git a/...cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCall.constructor.scope b/...cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCall.constructor.scope
@@ -2,12 +2,9 @@ new Foo.bar(0);
 ---
 
 [Content] =
-[Removal] = 0:0-0:14
+[Removal] =
+[Domain] = 0:0-0:14
 0| new Foo.bar(0);
   >--------------<
 
-[Domain] = 0:0-0:15
-0| new Foo.bar(0);
-  >---------------<
-
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCall.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCall.scope
@@ -2,12 +2,9 @@ foo.bar(0);
 ---
 
 [Content] =
-[Removal] = 0:0-0:10
+[Removal] =
+[Domain] = 0:0-0:10
 0| foo.bar(0);
   >----------<
 
-[Domain] = 0:0-0:11
-0| foo.bar(0);
-  >-----------<
-
 [Insertion delimiter] = " "
diff --git a/...rsorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCallee.constructor.scope b/...rsorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCallee.constructor.scope
@@ -6,8 +6,8 @@ new Foo.bar(0);
 0| new Foo.bar(0);
   >-----------<
 
-[Domain] = 0:0-0:15
+[Domain] = 0:0-0:14
 0| new Foo.bar(0);
-  >---------------<
+  >--------------<
 
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCallee.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCallee.scope
@@ -6,8 +6,8 @@ foo.bar(0);
 0| foo.bar(0);
   >-------<
 
-[Domain] = 0:0-0:11
+[Domain] = 0:0-0:10
 0| foo.bar(0);
-  >-----------<
+  >----------<
 
 [Insertion delimiter] = " "
diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm
@@ -480,33 +480,24 @@
 ;;!  ^^^^^
 ;;!! new Foo()
 ;;!  ^^^^^^^^^
-(
-  [
-    (call_expression)
-    (new_expression)
-  ] @functionCall @_.domain.start
-  ";"? @_.domain.end
-)
+[
+  (call_expression)
+  (new_expression)
+] @functionCall @_.domain.start
 
 ;;!! foo();
 ;;!  ^^^
 ;;!  ------
-(
-  (call_expression
-    function: (_) @functionCallee
-  ) @_.domain.start
-  ";"? @_.domain.end
-)
+(call_expression
+  function: (_) @functionCallee
+) @_.domain.start
 
 ;;!! new Foo();
 ;;!  ^^^^^^^
 ;;!  ----------
-(
-  (new_expression
-    (arguments) @functionCallee.end.startOf
-  ) @functionCallee.start.startOf @_.domain.start
-  ";"? @_.domain.end
-)
+(new_expression
+  (arguments) @functionCallee.end.startOf
+) @functionCallee.start.startOf @_.domain.start
 
 ;;!! class Foo {}
 ;;!  ^^^^^^^^^^^^