diff --git a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCall.constructor.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCall.constructor.scope index b5f6696325..0b3173665f 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCall.constructor.scope +++ b/packages/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 index 548f29af7c..dcad1f87d9 100644 --- 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/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCallee.constructor.scope b/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCallee.constructor.scope index 25db1b06e9..a68bbf2531 100644 --- a/packages/cursorless-vscode-e2e/src/suite/fixtures/scopes/javascript/functionCallee.constructor.scope +++ b/packages/cursorless-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 index ddeaa63b6b..920f077880 100644 --- 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 index 759045b145..c07dd0a0df 100644 --- 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 {} ;;! ^^^^^^^^^^^^