From 23b90f4727ffa53908fb217489bca0c479173bc3 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 10:37:14 +0200 Subject: [PATCH 01/14] Updated facet definitions --- .../scopeSupportFacetInfos.ts | 109 +++++++++++++++--- .../scopeSupportFacets.types.ts | 33 ++++-- 2 files changed, 121 insertions(+), 21 deletions(-) diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts index 43d3c062cd..e320938702 100644 --- a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts +++ b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts @@ -282,33 +282,114 @@ export const scopeSupportFacetInfos: Record< isIteration: true, }, - "argumentList.actual": { - description: "A list of arguments in a function call", + "argumentList.actual.empty": { + description: "An empty list of arguments in a function call", scopeType: "argumentList", + insertionDelimiterHint: '""', }, - "argumentList.actual.method": { - description: "A list of arguments in a class method call", + "argumentList.actual.singleLine": { + description: "A single line list of arguments in a function call", scopeType: "argumentList", + insertionDelimiterHint: '", "', }, - "argumentList.actual.constructor": { - description: "A list of arguments in a constructor call", + "argumentList.actual.multiLine": { + description: "A multi line list of arguments in a function call", scopeType: "argumentList", + insertionDelimiterHint: '",\n"', }, - "argumentList.formal": { - description: "A list of parameters in a function declaration", + "argumentList.actual.method.empty": { + description: "An empty list of arguments in a class method call", scopeType: "argumentList", + insertionDelimiterHint: '""', }, - "argumentList.formal.method": { - description: "A list of parameters in a class method declaration", + "argumentList.actual.method.singleLine": { + description: "A single line list of arguments in a class method call", scopeType: "argumentList", + insertionDelimiterHint: '", "', }, - "argumentList.formal.constructor": { - description: "A list of parameters in a constructor declaration", + "argumentList.actual.method.multiLine": { + description: "A multi line list of arguments in a class method call", scopeType: "argumentList", + insertionDelimiterHint: '",\n"', }, - "argumentList.formal.lambda": { - description: "A list of parameters in a lambda declaration", + "argumentList.actual.constructor.empty": { + description: "An empty list of arguments in a constructor call", scopeType: "argumentList", + insertionDelimiterHint: '""', + }, + "argumentList.actual.constructor.singleLine": { + description: "A single line list of arguments in a constructor call", + scopeType: "argumentList", + insertionDelimiterHint: '", "', + }, + "argumentList.actual.constructor.multiLine": { + description: "A multi line list of arguments in a constructor call", + scopeType: "argumentList", + insertionDelimiterHint: '",\n"', + }, + + "argumentList.formal.empty": { + description: "An empty list of parameters in a function declaration", + scopeType: "argumentList", + insertionDelimiterHint: '""', + }, + "argumentList.formal.singleLine": { + description: "A single line list of parameters in a function declaration", + scopeType: "argumentList", + insertionDelimiterHint: '", "', + }, + "argumentList.formal.multiLine": { + description: "A multi line list of parameters in a function declaration", + scopeType: "argumentList", + insertionDelimiterHint: '",\n"', + }, + "argumentList.formal.lambda.empty": { + description: "An empty list of parameters in a lambda declaration", + scopeType: "argumentList", + insertionDelimiterHint: '""', + }, + "argumentList.formal.lambda.singleLine": { + description: "A single line list of parameters in a lambda declaration", + scopeType: "argumentList", + insertionDelimiterHint: '", "', + }, + "argumentList.formal.lambda.multiLine": { + description: "A multi line list of parameters in a lambda declaration", + scopeType: "argumentList", + insertionDelimiterHint: '",\n"', + }, + "argumentList.formal.method.empty": { + description: "An empty list of parameters in a class method declaration", + scopeType: "argumentList", + insertionDelimiterHint: '""', + }, + "argumentList.formal.method.singleLine": { + description: + "A single line list of parameters in a class method declaration", + scopeType: "argumentList", + insertionDelimiterHint: '", "', + }, + "argumentList.formal.method.multiLine": { + description: + "A multi line list of parameters in a class method declaration", + scopeType: "argumentList", + insertionDelimiterHint: '",\n"', + }, + "argumentList.formal.constructor.empty": { + description: "An empty list of parameters in a constructor declaration", + scopeType: "argumentList", + insertionDelimiterHint: '""', + }, + "argumentList.formal.constructor.singleLine": { + description: + "A single line list of parameters in a constructor declaration", + scopeType: "argumentList", + insertionDelimiterHint: '", "', + }, + "argumentList.formal.constructor.multiLine": { + description: "A multi line list of parameters in a constructor declaration", + scopeType: "argumentList", + insertionDelimiterHint: '",\n"', }, "comment.line": { diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts index 514c8d9794..c189dc2ca3 100644 --- a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts +++ b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts @@ -63,6 +63,7 @@ export const scopeSupportFacets = [ "argument.actual.method.iteration", "argument.actual.constructor", "argument.actual.constructor.iteration", + "argument.formal", "argument.formal.iteration", "argument.formal.method", @@ -72,13 +73,28 @@ export const scopeSupportFacets = [ "argument.formal.lambda", "argument.formal.lambda.iteration", - "argumentList.actual", - "argumentList.actual.method", - "argumentList.actual.constructor", - "argumentList.formal", - "argumentList.formal.method", - "argumentList.formal.constructor", - "argumentList.formal.lambda", + "argumentList.actual.empty", + "argumentList.actual.singleLine", + "argumentList.actual.multiLine", + "argumentList.actual.method.empty", + "argumentList.actual.method.singleLine", + "argumentList.actual.method.multiLine", + "argumentList.actual.constructor.empty", + "argumentList.actual.constructor.singleLine", + "argumentList.actual.constructor.multiLine", + + "argumentList.formal.empty", + "argumentList.formal.singleLine", + "argumentList.formal.multiLine", + "argumentList.formal.lambda.empty", + "argumentList.formal.lambda.singleLine", + "argumentList.formal.lambda.multiLine", + "argumentList.formal.method.empty", + "argumentList.formal.method.singleLine", + "argumentList.formal.method.multiLine", + "argumentList.formal.constructor.empty", + "argumentList.formal.constructor.singleLine", + "argumentList.formal.constructor.multiLine", "comment.line", "comment.block", @@ -210,6 +226,9 @@ export interface ScopeSupportFacetInfo { readonly description: string; readonly scopeType: SimpleScopeTypeType | ScopeType; readonly isIteration?: boolean; + readonly domainHint?: string; + readonly removalHint?: string; + readonly insertionDelimiterHint?: string; } export enum ScopeSupportFacetLevel { From c91bbfab746b39fa1bfaba8745918ea4a7225442 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 11:13:30 +0200 Subject: [PATCH 02/14] Update scope support] --- .../common/src/scopeSupportFacets/csharp.ts | 29 +++++++++++++---- packages/common/src/scopeSupportFacets/css.ts | 16 +++++++--- .../common/src/scopeSupportFacets/html.ts | 25 ++++++++++++--- .../common/src/scopeSupportFacets/java.ts | 26 ++++++++++++--- .../src/scopeSupportFacets/javascript.ts | 25 ++++++++++++--- .../common/src/scopeSupportFacets/json.ts | 25 ++++++++++++--- .../common/src/scopeSupportFacets/markdown.ts | 25 ++++++++++++--- .../common/src/scopeSupportFacets/python.ts | 25 ++++++++++++--- packages/common/src/scopeSupportFacets/r.ts | 26 +++++++++++++-- packages/common/src/scopeSupportFacets/scm.ts | 32 +++++++++++++++---- .../common/src/scopeSupportFacets/talon.ts | 26 ++++++++++++--- packages/common/src/scopeSupportFacets/xml.ts | 25 ++++++++++++--- .../common/src/scopeSupportFacets/yaml.ts | 25 ++++++++++++--- 13 files changed, 273 insertions(+), 57 deletions(-) diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts index 29754f67fa..bc4055e7d2 100644 --- a/packages/common/src/scopeSupportFacets/csharp.ts +++ b/packages/common/src/scopeSupportFacets/csharp.ts @@ -71,13 +71,28 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = { "key.mapPair": supported, "key.mapPair.iteration": supported, - "argumentList.actual": supported, - "argumentList.actual.constructor": supported, - "argumentList.actual.method": supported, - "argumentList.formal": supported, - "argumentList.formal.lambda": supported, - "argumentList.formal.constructor": supported, - "argumentList.formal.method": supported, + "argumentList.actual.empty": supported, + "argumentList.actual.singleLine": supported, + "argumentList.actual.multiLine": supported, + "argumentList.actual.method.empty": supported, + "argumentList.actual.method.singleLine": supported, + "argumentList.actual.method.multiLine": supported, + "argumentList.actual.constructor.empty": supported, + "argumentList.actual.constructor.singleLine": supported, + "argumentList.actual.constructor.multiLine": supported, + + "argumentList.formal.empty": supported, + "argumentList.formal.singleLine": supported, + "argumentList.formal.multiLine": supported, + "argumentList.formal.lambda.empty": supported, + "argumentList.formal.lambda.singleLine": supported, + "argumentList.formal.lambda.multiLine": supported, + "argumentList.formal.method.empty": supported, + "argumentList.formal.method.singleLine": supported, + "argumentList.formal.method.multiLine": supported, + "argumentList.formal.constructor.empty": supported, + "argumentList.formal.constructor.singleLine": supported, + "argumentList.formal.constructor.multiLine": supported, "argument.actual": supported, "argument.actual.iteration": supported, diff --git a/packages/common/src/scopeSupportFacets/css.ts b/packages/common/src/scopeSupportFacets/css.ts index fcfab62bc4..7284c2536d 100644 --- a/packages/common/src/scopeSupportFacets/css.ts +++ b/packages/common/src/scopeSupportFacets/css.ts @@ -48,10 +48,18 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.formal": notApplicable, - "argumentList.formal.method": notApplicable, - "argumentList.formal.constructor": notApplicable, - "argumentList.formal.lambda": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "argumentList.formal.lambda.empty": notApplicable, + "argumentList.formal.lambda.singleLine": notApplicable, + "argumentList.formal.lambda.multiLine": notApplicable, + "argumentList.formal.method.empty": notApplicable, + "argumentList.formal.method.singleLine": notApplicable, + "argumentList.formal.method.multiLine": notApplicable, + "argumentList.formal.constructor.empty": notApplicable, + "argumentList.formal.constructor.singleLine": notApplicable, + "argumentList.formal.constructor.multiLine": notApplicable, attribute: notApplicable, "branch.if.iteration": notApplicable, "branch.if": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/html.ts b/packages/common/src/scopeSupportFacets/html.ts index e2f403e84c..010990d29c 100644 --- a/packages/common/src/scopeSupportFacets/html.ts +++ b/packages/common/src/scopeSupportFacets/html.ts @@ -34,10 +34,27 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.formal": notApplicable, - "argumentList.formal.method": notApplicable, - "argumentList.formal.constructor": notApplicable, - "argumentList.formal.lambda": notApplicable, + "argumentList.actual.empty": notApplicable, + "argumentList.actual.singleLine": notApplicable, + "argumentList.actual.multiLine": notApplicable, + "argumentList.actual.method.empty": notApplicable, + "argumentList.actual.method.singleLine": notApplicable, + "argumentList.actual.method.multiLine": notApplicable, + "argumentList.actual.constructor.empty": notApplicable, + "argumentList.actual.constructor.singleLine": notApplicable, + "argumentList.actual.constructor.multiLine": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "argumentList.formal.lambda.empty": notApplicable, + "argumentList.formal.lambda.singleLine": notApplicable, + "argumentList.formal.lambda.multiLine": notApplicable, + "argumentList.formal.method.empty": notApplicable, + "argumentList.formal.method.singleLine": notApplicable, + "argumentList.formal.method.multiLine": notApplicable, + "argumentList.formal.constructor.empty": notApplicable, + "argumentList.formal.constructor.singleLine": notApplicable, + "argumentList.formal.constructor.multiLine": notApplicable, "branch.if.iteration": notApplicable, "branch.if": notApplicable, "branch.loop": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/java.ts b/packages/common/src/scopeSupportFacets/java.ts index e444156853..eb56bdefcb 100644 --- a/packages/common/src/scopeSupportFacets/java.ts +++ b/packages/common/src/scopeSupportFacets/java.ts @@ -22,9 +22,27 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.lambda": supported, "argument.formal.lambda.iteration": supported, - "argumentList.formal.method": supported, - "argumentList.formal.constructor": supported, - "argumentList.formal.lambda": supported, + "argumentList.actual.empty": supported, + "argumentList.actual.singleLine": supported, + "argumentList.actual.multiLine": supported, + "argumentList.actual.method.empty": supported, + "argumentList.actual.method.singleLine": supported, + "argumentList.actual.method.multiLine": supported, + "argumentList.actual.constructor.empty": supported, + "argumentList.actual.constructor.singleLine": supported, + "argumentList.actual.constructor.multiLine": supported, + "argumentList.formal.empty": supported, + "argumentList.formal.singleLine": supported, + "argumentList.formal.multiLine": supported, + "argumentList.formal.lambda.empty": supported, + "argumentList.formal.lambda.singleLine": supported, + "argumentList.formal.lambda.multiLine": supported, + "argumentList.formal.method.empty": supported, + "argumentList.formal.method.singleLine": supported, + "argumentList.formal.method.multiLine": supported, + "argumentList.formal.constructor.empty": supported, + "argumentList.formal.constructor.singleLine": supported, + "argumentList.formal.constructor.multiLine": supported, "collectionItem.unenclosed": supported, "collectionItem.unenclosed.iteration": supported, @@ -145,8 +163,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal": notApplicable, "argument.formal.iteration": notApplicable, - "argumentList.formal": notApplicable, - "name.assignment.pattern": notApplicable, "name.argument.actual": notApplicable, "name.argument.actual.iteration": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/javascript.ts b/packages/common/src/scopeSupportFacets/javascript.ts index 203a5db9d6..74cef5dd4b 100644 --- a/packages/common/src/scopeSupportFacets/javascript.ts +++ b/packages/common/src/scopeSupportFacets/javascript.ts @@ -68,10 +68,27 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.lambda": supported, "argument.formal.lambda.iteration": supported, - "argumentList.formal": supported, - "argumentList.formal.method": supported, - "argumentList.formal.constructor": supported, - "argumentList.formal.lambda": supported, + "argumentList.actual.empty": supported, + "argumentList.actual.singleLine": supported, + "argumentList.actual.multiLine": supported, + "argumentList.actual.method.empty": supported, + "argumentList.actual.method.singleLine": supported, + "argumentList.actual.method.multiLine": supported, + "argumentList.actual.constructor.empty": supported, + "argumentList.actual.constructor.singleLine": supported, + "argumentList.actual.constructor.multiLine": supported, + "argumentList.formal.empty": supported, + "argumentList.formal.singleLine": supported, + "argumentList.formal.multiLine": supported, + "argumentList.formal.lambda.empty": supported, + "argumentList.formal.lambda.singleLine": supported, + "argumentList.formal.lambda.multiLine": supported, + "argumentList.formal.method.empty": supported, + "argumentList.formal.method.singleLine": supported, + "argumentList.formal.method.multiLine": supported, + "argumentList.formal.constructor.empty": supported, + "argumentList.formal.constructor.singleLine": supported, + "argumentList.formal.constructor.multiLine": supported, "comment.line": supported, "comment.block": supported, diff --git a/packages/common/src/scopeSupportFacets/json.ts b/packages/common/src/scopeSupportFacets/json.ts index 258519a628..2f3bdd55d0 100644 --- a/packages/common/src/scopeSupportFacets/json.ts +++ b/packages/common/src/scopeSupportFacets/json.ts @@ -38,10 +38,27 @@ export const jsonScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.formal": notApplicable, - "argumentList.formal.method": notApplicable, - "argumentList.formal.constructor": notApplicable, - "argumentList.formal.lambda": notApplicable, + "argumentList.actual.empty": notApplicable, + "argumentList.actual.singleLine": notApplicable, + "argumentList.actual.multiLine": notApplicable, + "argumentList.actual.method.empty": notApplicable, + "argumentList.actual.method.singleLine": notApplicable, + "argumentList.actual.method.multiLine": notApplicable, + "argumentList.actual.constructor.empty": notApplicable, + "argumentList.actual.constructor.singleLine": notApplicable, + "argumentList.actual.constructor.multiLine": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "argumentList.formal.lambda.empty": notApplicable, + "argumentList.formal.lambda.singleLine": notApplicable, + "argumentList.formal.lambda.multiLine": notApplicable, + "argumentList.formal.method.empty": notApplicable, + "argumentList.formal.method.singleLine": notApplicable, + "argumentList.formal.method.multiLine": notApplicable, + "argumentList.formal.constructor.empty": notApplicable, + "argumentList.formal.constructor.singleLine": notApplicable, + "argumentList.formal.constructor.multiLine": notApplicable, attribute: notApplicable, "branch.if": notApplicable, "branch.if.iteration": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/markdown.ts b/packages/common/src/scopeSupportFacets/markdown.ts index 7dc7078e73..b597435271 100644 --- a/packages/common/src/scopeSupportFacets/markdown.ts +++ b/packages/common/src/scopeSupportFacets/markdown.ts @@ -34,10 +34,27 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.formal": notApplicable, - "argumentList.formal.method": notApplicable, - "argumentList.formal.constructor": notApplicable, - "argumentList.formal.lambda": notApplicable, + "argumentList.actual.empty": notApplicable, + "argumentList.actual.singleLine": notApplicable, + "argumentList.actual.multiLine": notApplicable, + "argumentList.actual.method.empty": notApplicable, + "argumentList.actual.method.singleLine": notApplicable, + "argumentList.actual.method.multiLine": notApplicable, + "argumentList.actual.constructor.empty": notApplicable, + "argumentList.actual.constructor.singleLine": notApplicable, + "argumentList.actual.constructor.multiLine": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "argumentList.formal.lambda.empty": notApplicable, + "argumentList.formal.lambda.singleLine": notApplicable, + "argumentList.formal.lambda.multiLine": notApplicable, + "argumentList.formal.method.empty": notApplicable, + "argumentList.formal.method.singleLine": notApplicable, + "argumentList.formal.method.multiLine": notApplicable, + "argumentList.formal.constructor.empty": notApplicable, + "argumentList.formal.constructor.singleLine": notApplicable, + "argumentList.formal.constructor.multiLine": notApplicable, attribute: notApplicable, "branch.if": notApplicable, "branch.if.iteration": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts index 80bf1e6f6b..3a08657e3c 100644 --- a/packages/common/src/scopeSupportFacets/python.ts +++ b/packages/common/src/scopeSupportFacets/python.ts @@ -90,10 +90,27 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.lambda": supported, "argument.formal.lambda.iteration": supported, - "argumentList.formal": supported, - "argumentList.formal.method": supported, - "argumentList.formal.constructor": supported, - "argumentList.formal.lambda": supported, + "argumentList.actual.empty": supported, + "argumentList.actual.singleLine": supported, + "argumentList.actual.multiLine": supported, + "argumentList.actual.method.empty": supported, + "argumentList.actual.method.singleLine": supported, + "argumentList.actual.method.multiLine": supported, + "argumentList.actual.constructor.empty": supported, + "argumentList.actual.constructor.singleLine": supported, + "argumentList.actual.constructor.multiLine": supported, + "argumentList.formal.empty": supported, + "argumentList.formal.singleLine": supported, + "argumentList.formal.multiLine": supported, + "argumentList.formal.lambda.empty": supported, + "argumentList.formal.lambda.singleLine": supported, + "argumentList.formal.lambda.multiLine": supported, + "argumentList.formal.method.empty": supported, + "argumentList.formal.method.singleLine": supported, + "argumentList.formal.method.multiLine": supported, + "argumentList.formal.constructor.empty": supported, + "argumentList.formal.constructor.singleLine": supported, + "argumentList.formal.constructor.multiLine": supported, "collectionItem.unenclosed": supported, "collectionItem.unenclosed.iteration": supported, diff --git a/packages/common/src/scopeSupportFacets/r.ts b/packages/common/src/scopeSupportFacets/r.ts index 273ace97f4..56a93d4ed9 100644 --- a/packages/common/src/scopeSupportFacets/r.ts +++ b/packages/common/src/scopeSupportFacets/r.ts @@ -7,9 +7,29 @@ export const rScopeSupport: LanguageScopeSupportFacetMap = { anonymousFunction: supported, "argument.actual": supported, "argument.formal": supported, - "argumentList.formal": supported, - "argument.actual.iteration": supported, - "argument.formal.iteration": supported, + + "argumentList.actual.empty": supported, + "argumentList.actual.singleLine": supported, + "argumentList.actual.multiLine": supported, + "argumentList.actual.method.empty": supported, + "argumentList.actual.method.singleLine": supported, + "argumentList.actual.method.multiLine": supported, + "argumentList.actual.constructor.empty": supported, + "argumentList.actual.constructor.singleLine": supported, + "argumentList.actual.constructor.multiLine": supported, + "argumentList.formal.empty": supported, + "argumentList.formal.singleLine": supported, + "argumentList.formal.multiLine": supported, + "argumentList.formal.lambda.empty": supported, + "argumentList.formal.lambda.singleLine": supported, + "argumentList.formal.lambda.multiLine": supported, + "argumentList.formal.method.empty": supported, + "argumentList.formal.method.singleLine": supported, + "argumentList.formal.method.multiLine": supported, + "argumentList.formal.constructor.empty": supported, + "argumentList.formal.constructor.singleLine": supported, + "argumentList.formal.constructor.multiLine": supported, + "comment.line": supported, functionCall: supported, functionCallee: supported, diff --git a/packages/common/src/scopeSupportFacets/scm.ts b/packages/common/src/scopeSupportFacets/scm.ts index 4c2913a82a..50fb2ca773 100644 --- a/packages/common/src/scopeSupportFacets/scm.ts +++ b/packages/common/src/scopeSupportFacets/scm.ts @@ -5,16 +5,28 @@ const { supported, notApplicable } = ScopeSupportFacetLevel; export const scmScopeSupport: LanguageScopeSupportFacetMap = { statement: supported, + list: supported, "argument.actual": supported, "argument.actual.iteration": supported, - "comment.line": supported, + + "argumentList.actual.empty": supported, + "argumentList.actual.singleLine": supported, + "argumentList.actual.multiLine": supported, + "argumentList.actual.method.empty": supported, + "argumentList.actual.method.singleLine": supported, + "argumentList.actual.method.multiLine": supported, + "argumentList.actual.constructor.empty": supported, + "argumentList.actual.constructor.singleLine": supported, + "argumentList.actual.constructor.multiLine": supported, + functionCall: supported, functionCallee: supported, + "string.singleLine": supported, + "comment.line": supported, "textFragment.comment.line": supported, "textFragment.string.singleLine": supported, - list: supported, // Not applicable @@ -31,10 +43,18 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.formal": notApplicable, - "argumentList.formal.method": notApplicable, - "argumentList.formal.constructor": notApplicable, - "argumentList.formal.lambda": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "argumentList.formal.lambda.empty": notApplicable, + "argumentList.formal.lambda.singleLine": notApplicable, + "argumentList.formal.lambda.multiLine": notApplicable, + "argumentList.formal.method.empty": notApplicable, + "argumentList.formal.method.singleLine": notApplicable, + "argumentList.formal.method.multiLine": notApplicable, + "argumentList.formal.constructor.empty": notApplicable, + "argumentList.formal.constructor.singleLine": notApplicable, + "argumentList.formal.constructor.multiLine": notApplicable, attribute: notApplicable, "branch.if": notApplicable, "branch.if.iteration": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/talon.ts b/packages/common/src/scopeSupportFacets/talon.ts index ccaceafafe..3e15a16167 100644 --- a/packages/common/src/scopeSupportFacets/talon.ts +++ b/packages/common/src/scopeSupportFacets/talon.ts @@ -7,6 +7,16 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = { "argument.actual.iteration": supported, "argument.actual": supported, + "argumentList.actual.empty": supported, + "argumentList.actual.singleLine": supported, + "argumentList.actual.multiLine": supported, + "argumentList.actual.method.empty": supported, + "argumentList.actual.method.singleLine": supported, + "argumentList.actual.method.multiLine": supported, + "argumentList.actual.constructor.empty": supported, + "argumentList.actual.constructor.singleLine": supported, + "argumentList.actual.constructor.multiLine": supported, + "comment.line": supported, "interior.command": supported, @@ -49,10 +59,18 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.formal": notApplicable, - "argumentList.formal.method": notApplicable, - "argumentList.formal.constructor": notApplicable, - "argumentList.formal.lambda": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "argumentList.formal.lambda.empty": notApplicable, + "argumentList.formal.lambda.singleLine": notApplicable, + "argumentList.formal.lambda.multiLine": notApplicable, + "argumentList.formal.method.empty": notApplicable, + "argumentList.formal.method.singleLine": notApplicable, + "argumentList.formal.method.multiLine": notApplicable, + "argumentList.formal.constructor.empty": notApplicable, + "argumentList.formal.constructor.singleLine": notApplicable, + "argumentList.formal.constructor.multiLine": notApplicable, attribute: notApplicable, "branch.if": notApplicable, "branch.if.iteration": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/xml.ts b/packages/common/src/scopeSupportFacets/xml.ts index 5830eb01aa..7243743a9d 100644 --- a/packages/common/src/scopeSupportFacets/xml.ts +++ b/packages/common/src/scopeSupportFacets/xml.ts @@ -35,10 +35,27 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.formal": notApplicable, - "argumentList.formal.method": notApplicable, - "argumentList.formal.constructor": notApplicable, - "argumentList.formal.lambda": notApplicable, + "argumentList.actual.empty": notApplicable, + "argumentList.actual.singleLine": notApplicable, + "argumentList.actual.multiLine": notApplicable, + "argumentList.actual.method.empty": notApplicable, + "argumentList.actual.method.singleLine": notApplicable, + "argumentList.actual.method.multiLine": notApplicable, + "argumentList.actual.constructor.empty": notApplicable, + "argumentList.actual.constructor.singleLine": notApplicable, + "argumentList.actual.constructor.multiLine": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "argumentList.formal.lambda.empty": notApplicable, + "argumentList.formal.lambda.singleLine": notApplicable, + "argumentList.formal.lambda.multiLine": notApplicable, + "argumentList.formal.method.empty": notApplicable, + "argumentList.formal.method.singleLine": notApplicable, + "argumentList.formal.method.multiLine": notApplicable, + "argumentList.formal.constructor.empty": notApplicable, + "argumentList.formal.constructor.singleLine": notApplicable, + "argumentList.formal.constructor.multiLine": notApplicable, "branch.if": notApplicable, "branch.if.iteration": notApplicable, "branch.loop": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/yaml.ts b/packages/common/src/scopeSupportFacets/yaml.ts index 3cb6011bc3..c869b9bd71 100644 --- a/packages/common/src/scopeSupportFacets/yaml.ts +++ b/packages/common/src/scopeSupportFacets/yaml.ts @@ -44,10 +44,27 @@ export const yamlScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.formal": notApplicable, - "argumentList.formal.method": notApplicable, - "argumentList.formal.constructor": notApplicable, - "argumentList.formal.lambda": notApplicable, + "argumentList.actual.empty": notApplicable, + "argumentList.actual.singleLine": notApplicable, + "argumentList.actual.multiLine": notApplicable, + "argumentList.actual.method.empty": notApplicable, + "argumentList.actual.method.singleLine": notApplicable, + "argumentList.actual.method.multiLine": notApplicable, + "argumentList.actual.constructor.empty": notApplicable, + "argumentList.actual.constructor.singleLine": notApplicable, + "argumentList.actual.constructor.multiLine": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "argumentList.formal.lambda.empty": notApplicable, + "argumentList.formal.lambda.singleLine": notApplicable, + "argumentList.formal.lambda.multiLine": notApplicable, + "argumentList.formal.method.empty": notApplicable, + "argumentList.formal.method.singleLine": notApplicable, + "argumentList.formal.method.multiLine": notApplicable, + "argumentList.formal.constructor.empty": notApplicable, + "argumentList.formal.constructor.singleLine": notApplicable, + "argumentList.formal.constructor.multiLine": notApplicable, attribute: notApplicable, "branch.if": notApplicable, "branch.if.iteration": notApplicable, From ab6cfa56522f1e4208df90970d1e901f95efc1a7 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 11:25:09 +0200 Subject: [PATCH 03/14] Update csharp argument list scope fixtures --- ...rgumentList.actual.constructor.empty.scope} | 0 ...entList.actual.constructor.multiLine.scope} | 0 ...ntList.actual.constructor.singleLine.scope} | 0 .../argumentList.actual.empty.scope} | 0 .../argumentList.actual.method.empty.scope} | 0 ...argumentList.actual.method.multiLine.scope} | 0 ...rgumentList.actual.method.singleLine.scope} | 0 .../argumentList.actual.multiLine.scope} | 0 .../argumentList.actual.singleLine.scope} | 0 ...rgumentList.formal.constructor.empty.scope} | 0 ...mentList.formal.constructor.multiLine.scope | 18 ++++++++++++++++++ ...ntList.formal.constructor.singleLine.scope} | 0 .../argumentList.formal.empty.scope} | 0 .../argumentList.formal.lambda.empty.scope} | 0 .../argumentList.formal.lambda.multiLine.scope | 16 ++++++++++++++++ ...rgumentList.formal.lambda.singleLine.scope} | 0 .../argumentList.formal.method.empty.scope} | 0 .../argumentList.formal.method.multiLine.scope | 18 ++++++++++++++++++ ...rgumentList.formal.method.singleLine.scope} | 0 .../argumentList.formal.multiLine.scope} | 0 .../argumentList.formal.singleLine.scope} | 0 21 files changed, 52 insertions(+) rename data/fixtures/scopes/csharp/{argumentList.actual.constructor.scope => argumentList/argumentList.actual.constructor.empty.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.actual.constructor3.scope => argumentList/argumentList.actual.constructor.multiLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.actual.constructor2.scope => argumentList/argumentList.actual.constructor.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.actual.scope => argumentList/argumentList.actual.empty.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.actual.method.scope => argumentList/argumentList.actual.method.empty.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.actual.method3.scope => argumentList/argumentList.actual.method.multiLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.actual.method2.scope => argumentList/argumentList.actual.method.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.actual3.scope => argumentList/argumentList.actual.multiLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.actual2.scope => argumentList/argumentList.actual.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.formal.constructor.scope => argumentList/argumentList.formal.constructor.empty.scope} (100%) create mode 100644 data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope rename data/fixtures/scopes/csharp/{argumentList.formal.constructor2.scope => argumentList/argumentList.formal.constructor.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.formal.scope => argumentList/argumentList.formal.empty.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.formal.lambda.scope => argumentList/argumentList.formal.lambda.empty.scope} (100%) create mode 100644 data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope rename data/fixtures/scopes/csharp/{argumentList.formal.lambda2.scope => argumentList/argumentList.formal.lambda.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.formal.method.scope => argumentList/argumentList.formal.method.empty.scope} (100%) create mode 100644 data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope rename data/fixtures/scopes/csharp/{argumentList.formal.method2.scope => argumentList/argumentList.formal.method.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.formal3.scope => argumentList/argumentList.formal.multiLine.scope} (100%) rename data/fixtures/scopes/csharp/{argumentList.formal2.scope => argumentList/argumentList.formal.singleLine.scope} (100%) diff --git a/data/fixtures/scopes/csharp/argumentList.actual.constructor.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.empty.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual.constructor.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.empty.scope diff --git a/data/fixtures/scopes/csharp/argumentList.actual.constructor3.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.multiLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual.constructor3.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.multiLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.actual.constructor2.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual.constructor2.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.actual.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.empty.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.empty.scope diff --git a/data/fixtures/scopes/csharp/argumentList.actual.method.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.empty.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual.method.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.empty.scope diff --git a/data/fixtures/scopes/csharp/argumentList.actual.method3.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual.method3.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.multiLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.actual.method2.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual.method2.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.actual3.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.multiLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual3.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.multiLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.actual2.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.actual2.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.actual.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.formal.constructor.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.empty.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal.constructor.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.empty.scope diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope new file mode 100644 index 0000000000..9316698760 --- /dev/null +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope @@ -0,0 +1,18 @@ +class MyClass { + MyClass( + int a, + int b + ) {} +} +--- + +[Content] = +[Removal] = 1:12-1:24 + >------------< +1| MyClass(int a, int b) {} + +[Domain] = 1:4-1:28 + >------------------------< +1| MyClass(int a, int b) {} + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList.formal.constructor2.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal.constructor2.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.formal.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.empty.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.empty.scope diff --git a/data/fixtures/scopes/csharp/argumentList.formal.lambda.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.empty.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal.lambda.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.empty.scope diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope new file mode 100644 index 0000000000..f5228641ba --- /dev/null +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope @@ -0,0 +1,16 @@ +( + a, + b +) => {}; +--- + +[Content] = +[Removal] = 0:1-0:5 + >----< +0| (a, b) => {}; + +[Domain] = 0:0-0:12 + >------------< +0| (a, b) => {}; + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList.formal.lambda2.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal.lambda2.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.formal.method.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.empty.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal.method.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.empty.scope diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope new file mode 100644 index 0000000000..f695a63055 --- /dev/null +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope @@ -0,0 +1,18 @@ +class MyClass { + void foo( + int a, + int b + ) {} +} +--- + +[Content] = +[Removal] = 1:13-1:25 + >------------< +1| void foo(int a, int b) {} + +[Domain] = 1:4-1:29 + >-------------------------< +1| void foo(int a, int b) {} + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList.formal.method2.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal.method2.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.formal3.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.multiLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal3.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.multiLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList.formal2.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argumentList.formal2.scope rename to data/fixtures/scopes/csharp/argumentList/argumentList.formal.singleLine.scope From 1b115aa3c374a61e520027741377ef07e76fe69d Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 13:43:41 +0200 Subject: [PATCH 04/14] Java and javascript --- ...entList.formal.constructor.multiLine.scope | 22 +++++++++++------ ...argumentList.formal.lambda.multiLine.scope | 22 +++++++++++------ ...argumentList.formal.method.multiLine.scope | 22 +++++++++++------ ...rgumentList.actual.constructor.empty.scope | 13 ++++++++++ ...entList.actual.constructor.multiLine.scope | 24 +++++++++++++++++++ ...ntList.actual.constructor.singleLine.scope | 13 ++++++++++ .../argumentList.actual.empty.scope | 13 ++++++++++ .../argumentList.actual.method.empty.scope | 13 ++++++++++ ...argumentList.actual.method.multiLine.scope | 24 +++++++++++++++++++ ...rgumentList.actual.method.singleLine.scope | 13 ++++++++++ .../argumentList.actual.multiLine.scope | 24 +++++++++++++++++++ .../argumentList.actual.singleLine.scope | 13 ++++++++++ ...gumentList.formal.constructor.empty.scope} | 0 ...ntList.formal.constructor.multiLine.scope} | 0 ...tList.formal.constructor.singleLine.scope} | 0 .../argumentList.formal.lambda.empty.scope} | 0 ...rgumentList.formal.lambda.multiLine.scope} | 0 ...gumentList.formal.lambda.singleLine.scope} | 0 .../argumentList.formal.method.empty.scope} | 0 ...rgumentList.formal.method.multiLine.scope} | 0 ...gumentList.formal.method.singleLine.scope} | 0 ...rgument.actual.constructor.iteration.scope | 4 ++-- .../argument.actual.iteration.scope | 4 ++-- .../argument.actual.method.iteration.scope | 4 ++-- ...rgumentList.actual.constructor.empty.scope | 13 ++++++++++ ...entList.actual.constructor.multiLine.scope | 24 +++++++++++++++++++ ...ntList.actual.constructor.singleLine.scope | 13 ++++++++++ .../argumentList.actual.empty.scope | 13 ++++++++++ .../argumentList.actual.method.empty.scope | 13 ++++++++++ ...argumentList.actual.method.multiLine.scope | 24 +++++++++++++++++++ ...rgumentList.actual.method.singleLine.scope | 13 ++++++++++ .../argumentList.actual.multiLine.scope | 24 +++++++++++++++++++ .../argumentList.actual.singleLine.scope | 13 ++++++++++ ...gumentList.formal.constructor.empty.scope} | 0 ...ntList.formal.constructor.multiLine.scope} | 0 ...tList.formal.constructor.singleLine.scope} | 0 .../argumentList.formal.empty.scope} | 0 .../argumentList.formal.lambda.empty.scope} | 0 .../argumentList.formal.lambda.empty2.scope} | 0 ...rgumentList.formal.lambda.multiLine.scope} | 0 ...gumentList.formal.lambda.multiLine2.scope} | 0 ...gumentList.formal.lambda.singleLine.scope} | 0 ...umentList.formal.lambda.singleLine2.scope} | 0 .../argumentList.formal.method.empty.scope} | 0 ...rgumentList.formal.method.multiLine.scope} | 0 ...gumentList.formal.method.singleLine.scope} | 0 .../argumentList.formal.multiLine.scope} | 0 .../argumentList.formal.singleLine.scope} | 0 .../common/src/scopeSupportFacets/java.ts | 7 +++--- queries/java.scm | 13 ++++++---- queries/javascript.core.scm | 9 +++---- 51 files changed, 369 insertions(+), 38 deletions(-) create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.empty.scope create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.multiLine.scope create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.singleLine.scope create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.empty.scope create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.method.empty.scope create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.method.multiLine.scope create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.method.singleLine.scope create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.multiLine.scope create mode 100644 data/fixtures/scopes/java/argumentList/argumentList.actual.singleLine.scope rename data/fixtures/scopes/java/{argumentList.formal.constructor3.scope => argumentList/argumentList.formal.constructor.empty.scope} (100%) rename data/fixtures/scopes/java/{argumentList.formal.constructor2.scope => argumentList/argumentList.formal.constructor.multiLine.scope} (100%) rename data/fixtures/scopes/java/{argumentList.formal.constructor.scope => argumentList/argumentList.formal.constructor.singleLine.scope} (100%) rename data/fixtures/scopes/java/{argumentList.formal.lambda3.scope => argumentList/argumentList.formal.lambda.empty.scope} (100%) rename data/fixtures/scopes/java/{argumentList.formal.lambda2.scope => argumentList/argumentList.formal.lambda.multiLine.scope} (100%) rename data/fixtures/scopes/java/{argumentList.formal.lambda.scope => argumentList/argumentList.formal.lambda.singleLine.scope} (100%) rename data/fixtures/scopes/java/{argumentList.formal.method3.scope => argumentList/argumentList.formal.method.empty.scope} (100%) rename data/fixtures/scopes/java/{argumentList.formal.method2.scope => argumentList/argumentList.formal.method.multiLine.scope} (100%) rename data/fixtures/scopes/java/{argumentList.formal.method.scope => argumentList/argumentList.formal.method.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.empty.scope create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.multiLine.scope create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.singleLine.scope create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.empty.scope create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.empty.scope create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.multiLine.scope create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.singleLine.scope create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.multiLine.scope create mode 100644 data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.singleLine.scope rename data/fixtures/scopes/javascript.core/{argumentList.formal.constructor3.scope => argumentList/argumentList.formal.constructor.empty.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.constructor2.scope => argumentList/argumentList.formal.constructor.multiLine.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.constructor.scope => argumentList/argumentList.formal.constructor.singleLine.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal3.scope => argumentList/argumentList.formal.empty.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.lambda3.scope => argumentList/argumentList.formal.lambda.empty.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.lambda6.scope => argumentList/argumentList.formal.lambda.empty2.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.lambda2.scope => argumentList/argumentList.formal.lambda.multiLine.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.lambda5.scope => argumentList/argumentList.formal.lambda.multiLine2.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.lambda.scope => argumentList/argumentList.formal.lambda.singleLine.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.lambda4.scope => argumentList/argumentList.formal.lambda.singleLine2.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.method3.scope => argumentList/argumentList.formal.method.empty.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.method2.scope => argumentList/argumentList.formal.method.multiLine.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.method.scope => argumentList/argumentList.formal.method.singleLine.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal2.scope => argumentList/argumentList.formal.multiLine.scope} (100%) rename data/fixtures/scopes/javascript.core/{argumentList.formal.scope => argumentList/argumentList.formal.singleLine.scope} (100%) diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope index 9316698760..0d16acac0b 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope @@ -7,12 +7,20 @@ class MyClass { --- [Content] = -[Removal] = 1:12-1:24 - >------------< -1| MyClass(int a, int b) {} +[Removal] = 1:12-4:4 + > +1| MyClass( +2| int a, +3| int b +4| ) {} + ----< -[Domain] = 1:4-1:28 - >------------------------< -1| MyClass(int a, int b) {} +[Domain] = 1:4-4:8 + >-------- +1| MyClass( +2| int a, +3| int b +4| ) {} + --------< -[Insertion delimiter] = ", " +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope index f5228641ba..d49b9d39f7 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope @@ -5,12 +5,20 @@ --- [Content] = -[Removal] = 0:1-0:5 - >----< -0| (a, b) => {}; +[Removal] = 0:1-3:0 + > +0| ( +1| a, +2| b +3| ) => {}; + < -[Domain] = 0:0-0:12 - >------------< -0| (a, b) => {}; +[Domain] = 0:0-3:7 + >- +0| ( +1| a, +2| b +3| ) => {}; + -------< -[Insertion delimiter] = ", " +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope index f695a63055..3f002736d6 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope @@ -7,12 +7,20 @@ class MyClass { --- [Content] = -[Removal] = 1:13-1:25 - >------------< -1| void foo(int a, int b) {} +[Removal] = 1:13-4:4 + > +1| void foo( +2| int a, +3| int b +4| ) {} + ----< -[Domain] = 1:4-1:29 - >-------------------------< -1| void foo(int a, int b) {} +[Domain] = 1:4-4:8 + >--------- +1| void foo( +2| int a, +3| int b +4| ) {} + --------< -[Insertion delimiter] = ", " +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.empty.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.empty.scope new file mode 100644 index 0000000000..728f90d07c --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.empty.scope @@ -0,0 +1,13 @@ +new Foo(); +--- + +[Content] = +[Removal] = 0:8-0:8 + >< +0| new Foo(); + +[Domain] = 0:0-0:9 + >---------< +0| new Foo(); + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.multiLine.scope new file mode 100644 index 0000000000..bbcff2f43c --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.multiLine.scope @@ -0,0 +1,24 @@ +new Foo( + a, + b +); +--- + +[Content] = +[Removal] = 0:8-3:0 + > +0| new Foo( +1| a, +2| b +3| ); + < + +[Domain] = 0:0-3:1 + >-------- +0| new Foo( +1| a, +2| b +3| ); + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.singleLine.scope new file mode 100644 index 0000000000..cc99871ad1 --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.singleLine.scope @@ -0,0 +1,13 @@ +new Foo(a); +--- + +[Content] = +[Removal] = 0:8-0:9 + >-< +0| new Foo(a); + +[Domain] = 0:0-0:10 + >----------< +0| new Foo(a); + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.empty.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.empty.scope new file mode 100644 index 0000000000..539138bcb6 --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.empty.scope @@ -0,0 +1,13 @@ +foo(); +--- + +[Content] = +[Removal] = 0:4-0:4 + >< +0| foo(); + +[Domain] = 0:0-0:5 + >-----< +0| foo(); + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.method.empty.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.empty.scope new file mode 100644 index 0000000000..91d34a15d7 --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.empty.scope @@ -0,0 +1,13 @@ +foo.bar(); +--- + +[Content] = +[Removal] = 0:8-0:8 + >< +0| foo.bar(); + +[Domain] = 0:0-0:9 + >---------< +0| foo.bar(); + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.multiLine.scope new file mode 100644 index 0000000000..26a8b9f4aa --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.multiLine.scope @@ -0,0 +1,24 @@ +foo.bar( + a, + b +); +--- + +[Content] = +[Removal] = 0:8-3:0 + > +0| foo.bar( +1| a, +2| b +3| ); + < + +[Domain] = 0:0-3:1 + >-------- +0| foo.bar( +1| a, +2| b +3| ); + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.singleLine.scope new file mode 100644 index 0000000000..fca4f6a060 --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.singleLine.scope @@ -0,0 +1,13 @@ +foo.bar(a); +--- + +[Content] = +[Removal] = 0:8-0:9 + >-< +0| foo.bar(a); + +[Domain] = 0:0-0:10 + >----------< +0| foo.bar(a); + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.multiLine.scope new file mode 100644 index 0000000000..dcf3825591 --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.multiLine.scope @@ -0,0 +1,24 @@ +foo( + a, + b +); +--- + +[Content] = +[Removal] = 0:4-3:0 + > +0| foo( +1| a, +2| b +3| ); + < + +[Domain] = 0:0-3:1 + >---- +0| foo( +1| a, +2| b +3| ); + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.singleLine.scope new file mode 100644 index 0000000000..d2ca17e1a0 --- /dev/null +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.singleLine.scope @@ -0,0 +1,13 @@ +foo(a); +--- + +[Content] = +[Removal] = 0:4-0:5 + >-< +0| foo(a); + +[Domain] = 0:0-0:6 + >------< +0| foo(a); + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList.formal.constructor3.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.empty.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.constructor3.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.empty.scope diff --git a/data/fixtures/scopes/java/argumentList.formal.constructor2.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.constructor2.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope diff --git a/data/fixtures/scopes/java/argumentList.formal.constructor.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.constructor.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope diff --git a/data/fixtures/scopes/java/argumentList.formal.lambda3.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.empty.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.lambda3.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.empty.scope diff --git a/data/fixtures/scopes/java/argumentList.formal.lambda2.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.multiLine.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.lambda2.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.multiLine.scope diff --git a/data/fixtures/scopes/java/argumentList.formal.lambda.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.singleLine.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.lambda.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.singleLine.scope diff --git a/data/fixtures/scopes/java/argumentList.formal.method3.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.empty.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.method3.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.method.empty.scope diff --git a/data/fixtures/scopes/java/argumentList.formal.method2.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.method2.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope diff --git a/data/fixtures/scopes/java/argumentList.formal.method.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/java/argumentList.formal.method.scope rename to data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope index f03c77cbb8..f0667a92ee 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope @@ -1,8 +1,8 @@ new Aaa(bbb, ccc) --- -[Range] = 0:8-0:16 - >--------< +[Range] = 0:8-0:17 + >---------< 0| new Aaa(bbb, ccc) [Domain] = 0:0-0:17 diff --git a/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope index bfb1ec05fd..95e5eef29c 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope @@ -1,8 +1,8 @@ aaa(bbb, ccc); --- -[Range] = 0:4-0:12 - >--------< +[Range] = 0:4-0:13 + >---------< 0| aaa(bbb, ccc); [Domain] = 0:0-0:13 diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope index cb8b7e5f1f..a0b4a28395 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope @@ -1,8 +1,8 @@ aaa.bbb(ccc, ddd); --- -[Range] = 0:8-0:16 - >--------< +[Range] = 0:8-0:17 + >---------< 0| aaa.bbb(ccc, ddd); [Domain] = 0:0-0:17 diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.empty.scope new file mode 100644 index 0000000000..728f90d07c --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.empty.scope @@ -0,0 +1,13 @@ +new Foo(); +--- + +[Content] = +[Removal] = 0:8-0:8 + >< +0| new Foo(); + +[Domain] = 0:0-0:9 + >---------< +0| new Foo(); + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.multiLine.scope new file mode 100644 index 0000000000..bbcff2f43c --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.multiLine.scope @@ -0,0 +1,24 @@ +new Foo( + a, + b +); +--- + +[Content] = +[Removal] = 0:8-3:0 + > +0| new Foo( +1| a, +2| b +3| ); + < + +[Domain] = 0:0-3:1 + >-------- +0| new Foo( +1| a, +2| b +3| ); + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.singleLine.scope new file mode 100644 index 0000000000..cc99871ad1 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.singleLine.scope @@ -0,0 +1,13 @@ +new Foo(a); +--- + +[Content] = +[Removal] = 0:8-0:9 + >-< +0| new Foo(a); + +[Domain] = 0:0-0:10 + >----------< +0| new Foo(a); + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.empty.scope new file mode 100644 index 0000000000..539138bcb6 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.empty.scope @@ -0,0 +1,13 @@ +foo(); +--- + +[Content] = +[Removal] = 0:4-0:4 + >< +0| foo(); + +[Domain] = 0:0-0:5 + >-----< +0| foo(); + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.empty.scope new file mode 100644 index 0000000000..91d34a15d7 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.empty.scope @@ -0,0 +1,13 @@ +foo.bar(); +--- + +[Content] = +[Removal] = 0:8-0:8 + >< +0| foo.bar(); + +[Domain] = 0:0-0:9 + >---------< +0| foo.bar(); + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.multiLine.scope new file mode 100644 index 0000000000..26a8b9f4aa --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.multiLine.scope @@ -0,0 +1,24 @@ +foo.bar( + a, + b +); +--- + +[Content] = +[Removal] = 0:8-3:0 + > +0| foo.bar( +1| a, +2| b +3| ); + < + +[Domain] = 0:0-3:1 + >-------- +0| foo.bar( +1| a, +2| b +3| ); + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.singleLine.scope new file mode 100644 index 0000000000..fca4f6a060 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.singleLine.scope @@ -0,0 +1,13 @@ +foo.bar(a); +--- + +[Content] = +[Removal] = 0:8-0:9 + >-< +0| foo.bar(a); + +[Domain] = 0:0-0:10 + >----------< +0| foo.bar(a); + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.multiLine.scope new file mode 100644 index 0000000000..dcf3825591 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.multiLine.scope @@ -0,0 +1,24 @@ +foo( + a, + b +); +--- + +[Content] = +[Removal] = 0:4-3:0 + > +0| foo( +1| a, +2| b +3| ); + < + +[Domain] = 0:0-3:1 + >---- +0| foo( +1| a, +2| b +3| ); + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.singleLine.scope new file mode 100644 index 0000000000..d2ca17e1a0 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.singleLine.scope @@ -0,0 +1,13 @@ +foo(a); +--- + +[Content] = +[Removal] = 0:4-0:5 + >-< +0| foo(a); + +[Domain] = 0:0-0:6 + >------< +0| foo(a); + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.constructor3.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.constructor3.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.constructor2.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.constructor2.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.constructor.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.constructor.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal3.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.empty.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal3.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.empty.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.lambda3.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.lambda3.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.lambda6.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty2.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.lambda6.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty2.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.lambda2.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.lambda2.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.lambda5.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.lambda5.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.lambda.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.lambda.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.lambda4.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine2.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.lambda4.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine2.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.method3.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.method3.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.method2.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.method2.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.method.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.method.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal2.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.multiLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal2.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.multiLine.scope diff --git a/data/fixtures/scopes/javascript.core/argumentList.formal.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.singleLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argumentList.formal.scope rename to data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.singleLine.scope diff --git a/packages/common/src/scopeSupportFacets/java.ts b/packages/common/src/scopeSupportFacets/java.ts index eb56bdefcb..6f22ce47b1 100644 --- a/packages/common/src/scopeSupportFacets/java.ts +++ b/packages/common/src/scopeSupportFacets/java.ts @@ -31,9 +31,6 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = { "argumentList.actual.constructor.empty": supported, "argumentList.actual.constructor.singleLine": supported, "argumentList.actual.constructor.multiLine": supported, - "argumentList.formal.empty": supported, - "argumentList.formal.singleLine": supported, - "argumentList.formal.multiLine": supported, "argumentList.formal.lambda.empty": supported, "argumentList.formal.lambda.singleLine": supported, "argumentList.formal.lambda.multiLine": supported, @@ -163,6 +160,10 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal": notApplicable, "argument.formal.iteration": notApplicable, + "argumentList.formal.empty": notApplicable, + "argumentList.formal.singleLine": notApplicable, + "argumentList.formal.multiLine": notApplicable, + "name.assignment.pattern": notApplicable, "name.argument.actual": notApplicable, "name.argument.actual.iteration": notApplicable, diff --git a/queries/java.scm b/queries/java.scm index 5fae385b9d..7631df343e 100644 --- a/queries/java.scm +++ b/queries/java.scm @@ -529,6 +529,8 @@ (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n") ) +;;!! foo(int a) {}; +;;! ^^^^^ (_ parameters: (_ "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf @@ -537,12 +539,15 @@ (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n") ) @argumentList.domain @argumentOrParameter.iteration.domain +;;!! foo(1); +;;! ^ (_ (argument_list - "(" @argumentOrParameter.iteration.start.endOf - ")" @argumentOrParameter.iteration.end.startOf - ) -) @argumentOrParameter.iteration.domain + "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf + ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf + ) @_dummy + (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n") +) @argumentList.domain @argumentOrParameter.iteration.domain ;;!! try (PrintWriter writer = create()) { } ;;! ^^^^^^^^^^^ ^^^^^ ^^^^^^^^ diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm index 2d016e475e..76a6e1e450 100644 --- a/queries/javascript.core.scm +++ b/queries/javascript.core.scm @@ -796,10 +796,11 @@ (_ (arguments - "(" @argumentOrParameter.iteration.start.endOf - ")" @argumentOrParameter.iteration.end.startOf - ) -) @argumentOrParameter.iteration.domain + "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf + ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf + ) @_dummy + (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n") +) @argumentList.domain @argumentOrParameter.iteration.domain operator: [ "<" From dc89700d3182f84b4180fd99722234ad3acf4caf Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 14:02:17 +0200 Subject: [PATCH 05/14] Updates scopes --- ...entList.actual.constructor.multiLine.scope | 12 +++++------ ...ntList.actual.constructor.singleLine.scope | 14 ++++++------- ...argumentList.actual.method.multiLine.scope | 12 +++++------ ...rgumentList.actual.method.singleLine.scope | 14 ++++++------- .../argumentList.actual.multiLine.scope | 12 +++++------ .../argumentList.actual.singleLine.scope | 14 ++++++------- ...entList.formal.constructor.multiLine.scope | 12 +++++------ ...ntList.formal.constructor.singleLine.scope | 14 ++++++------- ...argumentList.formal.lambda.multiLine.scope | 12 +++++------ ...rgumentList.formal.lambda.singleLine.scope | 14 ++++++------- ...argumentList.formal.method.multiLine.scope | 12 +++++------ ...rgumentList.formal.method.singleLine.scope | 14 ++++++------- .../argumentList.formal.multiLine.scope | 12 +++++------ .../argumentList.formal.singleLine.scope | 14 ++++++------- ...entList.actual.constructor.multiLine.scope | 12 +++++------ ...ntList.actual.constructor.singleLine.scope | 14 ++++++------- ...argumentList.actual.method.multiLine.scope | 12 +++++------ ...rgumentList.actual.method.singleLine.scope | 14 ++++++------- .../argumentList.actual.multiLine.scope | 12 +++++------ .../argumentList.actual.singleLine.scope | 14 ++++++------- ...entList.formal.constructor.multiLine.scope | 12 +++++------ ...ntList.formal.constructor.singleLine.scope | 14 ++++++------- ...argumentList.formal.method.multiLine.scope | 12 +++++------ ...rgumentList.formal.method.singleLine.scope | 14 ++++++------- ...rgument.actual.constructor.iteration.scope | 6 +++--- .../argument.actual.iteration.scope | 6 +++--- .../argument.actual.method.iteration.scope | 6 +++--- ...entList.actual.constructor.multiLine.scope | 12 +++++------ ...ntList.actual.constructor.singleLine.scope | 14 ++++++------- ...argumentList.actual.method.multiLine.scope | 12 +++++------ ...rgumentList.actual.method.singleLine.scope | 14 ++++++------- .../argumentList.actual.multiLine.scope | 12 +++++------ .../argumentList.actual.singleLine.scope | 14 ++++++------- .../python/argumentList.formal.lambda.scope | 20 ------------------- .../scopes/python/argumentList.formal.scope | 16 --------------- ...gumentList.formal.constructor.empty.scope} | 0 ...ntList.formal.constructor.multiLine.scope} | 0 ...tList.formal.constructor.singleLine.scope} | 0 .../argumentList.formal.empty.scope} | 0 .../argumentList.formal.lambda.empty.scope} | 0 ...rgumentList.formal.lambda.singleLine.scope | 20 +++++++++++++++++++ .../argumentList.formal.method.empty.scope} | 0 ...rgumentList.formal.method.multiLine.scope} | 0 ...gumentList.formal.method.singleLine.scope} | 0 .../argumentList.formal.multiLine.scope} | 12 +++++------ .../argumentList.formal.singleLine.scope | 16 +++++++++++++++ 46 files changed, 246 insertions(+), 246 deletions(-) delete mode 100644 data/fixtures/scopes/python/argumentList.formal.lambda.scope delete mode 100644 data/fixtures/scopes/python/argumentList.formal.scope rename data/fixtures/scopes/python/{argumentList.formal.constructor3.scope => argumentList/argumentList.formal.constructor.empty.scope} (100%) rename data/fixtures/scopes/python/{argumentList.formal.constructor2.scope => argumentList/argumentList.formal.constructor.multiLine.scope} (100%) rename data/fixtures/scopes/python/{argumentList.formal.constructor.scope => argumentList/argumentList.formal.constructor.singleLine.scope} (100%) rename data/fixtures/scopes/python/{argumentList.formal3.scope => argumentList/argumentList.formal.empty.scope} (100%) rename data/fixtures/scopes/python/{argumentList.formal.lambda2.scope => argumentList/argumentList.formal.lambda.empty.scope} (100%) create mode 100644 data/fixtures/scopes/python/argumentList/argumentList.formal.lambda.singleLine.scope rename data/fixtures/scopes/python/{argumentList.formal.method3.scope => argumentList/argumentList.formal.method.empty.scope} (100%) rename data/fixtures/scopes/python/{argumentList.formal.method2.scope => argumentList/argumentList.formal.method.multiLine.scope} (100%) rename data/fixtures/scopes/python/{argumentList.formal.method.scope => argumentList/argumentList.formal.method.singleLine.scope} (100%) rename data/fixtures/scopes/python/{argumentList.formal2.scope => argumentList/argumentList.formal.multiLine.scope} (67%) create mode 100644 data/fixtures/scopes/python/argumentList/argumentList.formal.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.multiLine.scope index bbcff2f43c..1e75197cb8 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.multiLine.scope @@ -1,6 +1,6 @@ new Foo( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ new Foo( [Removal] = 0:8-3:0 > 0| new Foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >-------- 0| new Foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.singleLine.scope index 3ba72064f0..b9964e4f92 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.constructor.singleLine.scope @@ -1,13 +1,13 @@ -new Foo(a, b); +new Foo(aaa, bbb); --- [Content] = -[Removal] = 0:8-0:12 - >----< -0| new Foo(a, b); +[Removal] = 0:8-0:16 + >--------< +0| new Foo(aaa, bbb); -[Domain] = 0:0-0:13 - >-------------< -0| new Foo(a, b); +[Domain] = 0:0-0:17 + >-----------------< +0| new Foo(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.multiLine.scope index 26a8b9f4aa..11b4a17bb1 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.multiLine.scope @@ -1,6 +1,6 @@ foo.bar( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ foo.bar( [Removal] = 0:8-3:0 > 0| foo.bar( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >-------- 0| foo.bar( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.singleLine.scope index c4b50f6f84..9a937e7bf7 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.method.singleLine.scope @@ -1,13 +1,13 @@ -foo.bar(a, b); +foo.bar(aaa, bbb); --- [Content] = -[Removal] = 0:8-0:12 - >----< -0| foo.bar(a, b); +[Removal] = 0:8-0:16 + >--------< +0| foo.bar(aaa, bbb); -[Domain] = 0:0-0:13 - >-------------< -0| foo.bar(a, b); +[Domain] = 0:0-0:17 + >-----------------< +0| foo.bar(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.multiLine.scope index dcf3825591..52ce5e54b4 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.multiLine.scope @@ -1,6 +1,6 @@ foo( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ foo( [Removal] = 0:4-3:0 > 0| foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >---- 0| foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.singleLine.scope index 8193f0939f..d649112ab5 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.actual.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.actual.singleLine.scope @@ -1,13 +1,13 @@ -foo(a, b); +foo(aaa, bbb); --- [Content] = -[Removal] = 0:4-0:8 - >----< -0| foo(a, b); +[Removal] = 0:4-0:12 + >--------< +0| foo(aaa, bbb); -[Domain] = 0:0-0:9 - >---------< -0| foo(a, b); +[Domain] = 0:0-0:13 + >-------------< +0| foo(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope index 0d16acac0b..f6f61f1d52 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope @@ -1,7 +1,7 @@ class MyClass { MyClass( - int a, - int b + int aaa, + int bbb ) {} } --- @@ -10,16 +10,16 @@ class MyClass { [Removal] = 1:12-4:4 > 1| MyClass( -2| int a, -3| int b +2| int aaa, +3| int bbb 4| ) {} ----< [Domain] = 1:4-4:8 >-------- 1| MyClass( -2| int a, -3| int b +2| int aaa, +3| int bbb 4| ) {} --------< diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope index a7cd679f0f..ba318a7b14 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope @@ -1,15 +1,15 @@ class MyClass { - MyClass(int a, int b) {} + MyClass(int aaa, int bbb) {} } --- [Content] = -[Removal] = 1:12-1:24 - >------------< -1| MyClass(int a, int b) {} +[Removal] = 1:12-1:28 + >----------------< +1| MyClass(int aaa, int bbb) {} -[Domain] = 1:4-1:28 - >------------------------< -1| MyClass(int a, int b) {} +[Domain] = 1:4-1:32 + >----------------------------< +1| MyClass(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope index d49b9d39f7..a078e7ba52 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.multiLine.scope @@ -1,6 +1,6 @@ ( - a, - b + aaa, + bbb ) => {}; --- @@ -8,16 +8,16 @@ [Removal] = 0:1-3:0 > 0| ( -1| a, -2| b +1| aaa, +2| bbb 3| ) => {}; < [Domain] = 0:0-3:7 >- 0| ( -1| a, -2| b +1| aaa, +2| bbb 3| ) => {}; -------< diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.singleLine.scope index 15ab235883..5264a592f3 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.lambda.singleLine.scope @@ -1,13 +1,13 @@ -(a, b) => {}; +(aaa, bbb) => {}; --- [Content] = -[Removal] = 0:1-0:5 - >----< -0| (a, b) => {}; +[Removal] = 0:1-0:9 + >--------< +0| (aaa, bbb) => {}; -[Domain] = 0:0-0:12 - >------------< -0| (a, b) => {}; +[Domain] = 0:0-0:16 + >----------------< +0| (aaa, bbb) => {}; [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope index 3f002736d6..f4d2f4ebcf 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope @@ -1,7 +1,7 @@ class MyClass { void foo( - int a, - int b + int aaa, + int bbb ) {} } --- @@ -10,16 +10,16 @@ class MyClass { [Removal] = 1:13-4:4 > 1| void foo( -2| int a, -3| int b +2| int aaa, +3| int bbb 4| ) {} ----< [Domain] = 1:4-4:8 >--------- 1| void foo( -2| int a, -3| int b +2| int aaa, +3| int bbb 4| ) {} --------< diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope index 254cf01189..35af67a9ce 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope @@ -1,15 +1,15 @@ class MyClass { - void foo(int a, int b) {} + void foo(int aaa, int bbb) {} } --- [Content] = -[Removal] = 1:13-1:25 - >------------< -1| void foo(int a, int b) {} +[Removal] = 1:13-1:29 + >----------------< +1| void foo(int aaa, int bbb) {} -[Domain] = 1:4-1:29 - >-------------------------< -1| void foo(int a, int b) {} +[Domain] = 1:4-1:33 + >-----------------------------< +1| void foo(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.multiLine.scope index 500c0ba6b2..2b09682567 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.multiLine.scope @@ -1,6 +1,6 @@ void foo( - a, - b + aaa, + bbb ) {} --- @@ -8,16 +8,16 @@ void foo( [Removal] = 0:9-3:0 > 0| void foo( -1| a, -2| b +1| aaa, +2| bbb 3| ) {} < [Domain] = 0:0-3:4 >--------- 0| void foo( -1| a, -2| b +1| aaa, +2| bbb 3| ) {} ----< diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.singleLine.scope index d5220fc1a1..165a51acda 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.singleLine.scope @@ -1,13 +1,13 @@ -void foo(a, b) {} +void foo(aaa, bbb) {} --- [Content] = -[Removal] = 0:9-0:13 - >----< -0| void foo(a, b) {} +[Removal] = 0:9-0:17 + >--------< +0| void foo(aaa, bbb) {} -[Domain] = 0:0-0:17 - >-----------------< -0| void foo(a, b) {} +[Domain] = 0:0-0:21 + >---------------------< +0| void foo(aaa, bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.multiLine.scope index bbcff2f43c..1e75197cb8 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.multiLine.scope @@ -1,6 +1,6 @@ new Foo( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ new Foo( [Removal] = 0:8-3:0 > 0| new Foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >-------- 0| new Foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.singleLine.scope index cc99871ad1..b9964e4f92 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.singleLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.constructor.singleLine.scope @@ -1,13 +1,13 @@ -new Foo(a); +new Foo(aaa, bbb); --- [Content] = -[Removal] = 0:8-0:9 - >-< -0| new Foo(a); +[Removal] = 0:8-0:16 + >--------< +0| new Foo(aaa, bbb); -[Domain] = 0:0-0:10 - >----------< -0| new Foo(a); +[Domain] = 0:0-0:17 + >-----------------< +0| new Foo(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.multiLine.scope index 26a8b9f4aa..11b4a17bb1 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.actual.method.multiLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.multiLine.scope @@ -1,6 +1,6 @@ foo.bar( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ foo.bar( [Removal] = 0:8-3:0 > 0| foo.bar( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >-------- 0| foo.bar( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.singleLine.scope index fca4f6a060..9a937e7bf7 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.actual.method.singleLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.method.singleLine.scope @@ -1,13 +1,13 @@ -foo.bar(a); +foo.bar(aaa, bbb); --- [Content] = -[Removal] = 0:8-0:9 - >-< -0| foo.bar(a); +[Removal] = 0:8-0:16 + >--------< +0| foo.bar(aaa, bbb); -[Domain] = 0:0-0:10 - >----------< -0| foo.bar(a); +[Domain] = 0:0-0:17 + >-----------------< +0| foo.bar(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.multiLine.scope index dcf3825591..52ce5e54b4 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.actual.multiLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.multiLine.scope @@ -1,6 +1,6 @@ foo( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ foo( [Removal] = 0:4-3:0 > 0| foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >---- 0| foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/java/argumentList/argumentList.actual.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.actual.singleLine.scope index d2ca17e1a0..d649112ab5 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.actual.singleLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.actual.singleLine.scope @@ -1,13 +1,13 @@ -foo(a); +foo(aaa, bbb); --- [Content] = -[Removal] = 0:4-0:5 - >-< -0| foo(a); +[Removal] = 0:4-0:12 + >--------< +0| foo(aaa, bbb); -[Domain] = 0:0-0:6 - >------< -0| foo(a); +[Domain] = 0:0-0:13 + >-------------< +0| foo(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope index 835d5eb47e..7a54ce0cca 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope @@ -1,7 +1,7 @@ public class MyClass { public MyClass( - String name, - int age + int aaa, + int bbb ) {} } --- @@ -10,16 +10,16 @@ public class MyClass { [Removal] = 1:19-4:4 > 1| public MyClass( -2| String name, -3| int age +2| int aaa, +3| int bbb 4| ) {} ----< [Domain] = 1:4-4:8 >--------------- 1| public MyClass( -2| String name, -3| int age +2| int aaa, +3| int bbb 4| ) {} --------< diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope index 8ecf6205b1..123c220e8a 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope @@ -1,15 +1,15 @@ public class MyClass { - public MyClass(String name, int age) {} + public MyClass(String aaa, int bbb) {} } --- [Content] = -[Removal] = 1:19-1:39 - >--------------------< -1| public MyClass(String name, int age) {} +[Removal] = 1:19-1:38 + >-------------------< +1| public MyClass(String aaa, int bbb) {} -[Domain] = 1:4-1:43 - >---------------------------------------< -1| public MyClass(String name, int age) {} +[Domain] = 1:4-1:42 + >--------------------------------------< +1| public MyClass(String aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope index 5df05519c9..9da0856aa5 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope @@ -1,7 +1,7 @@ public class MyClass { public void foo( - String name, - int age + int aaa, + int bbb ) {} } --- @@ -10,16 +10,16 @@ public class MyClass { [Removal] = 1:20-4:4 > 1| public void foo( -2| String name, -3| int age +2| int aaa, +3| int bbb 4| ) {} ----< [Domain] = 1:4-4:8 >---------------- 1| public void foo( -2| String name, -3| int age +2| int aaa, +3| int bbb 4| ) {} --------< diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope index 4fdc540857..150a8b0535 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope @@ -1,15 +1,15 @@ public class MyClass { - public void foo(String name, int age) {} + public void foo(int aaa, int bbb) {} } --- [Content] = -[Removal] = 1:20-1:40 - >--------------------< -1| public void foo(String name, int age) {} +[Removal] = 1:20-1:36 + >----------------< +1| public void foo(int aaa, int bbb) {} -[Domain] = 1:4-1:44 - >----------------------------------------< -1| public void foo(String name, int age) {} +[Domain] = 1:4-1:40 + >------------------------------------< +1| public void foo(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope index f0667a92ee..fd1493b583 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope @@ -1,8 +1,8 @@ -new Aaa(bbb, ccc) +new Foo(aaa, bbb) --- -[Range] = 0:8-0:17 - >---------< +[Range] = 0:8-0:16 + >--------< 0| new Aaa(bbb, ccc) [Domain] = 0:0-0:17 diff --git a/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope index 95e5eef29c..86b12c3896 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope @@ -1,8 +1,8 @@ -aaa(bbb, ccc); +foo(aaa, bbb); --- -[Range] = 0:4-0:13 - >---------< +[Range] = 0:4-0:12 + >--------< 0| aaa(bbb, ccc); [Domain] = 0:0-0:13 diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope index a0b4a28395..bdb1b4c5f6 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope @@ -1,8 +1,8 @@ -aaa.bbb(ccc, ddd); +foo.bar(aaa, bbb); --- -[Range] = 0:8-0:17 - >---------< +[Range] = 0:8-0:16 + >--------< 0| aaa.bbb(ccc, ddd); [Domain] = 0:0-0:17 diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.multiLine.scope index bbcff2f43c..1e75197cb8 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.multiLine.scope @@ -1,6 +1,6 @@ new Foo( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ new Foo( [Removal] = 0:8-3:0 > 0| new Foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >-------- 0| new Foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.singleLine.scope index cc99871ad1..b9964e4f92 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.constructor.singleLine.scope @@ -1,13 +1,13 @@ -new Foo(a); +new Foo(aaa, bbb); --- [Content] = -[Removal] = 0:8-0:9 - >-< -0| new Foo(a); +[Removal] = 0:8-0:16 + >--------< +0| new Foo(aaa, bbb); -[Domain] = 0:0-0:10 - >----------< -0| new Foo(a); +[Domain] = 0:0-0:17 + >-----------------< +0| new Foo(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.multiLine.scope index 26a8b9f4aa..11b4a17bb1 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.multiLine.scope @@ -1,6 +1,6 @@ foo.bar( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ foo.bar( [Removal] = 0:8-3:0 > 0| foo.bar( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >-------- 0| foo.bar( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.singleLine.scope index fca4f6a060..9a937e7bf7 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.method.singleLine.scope @@ -1,13 +1,13 @@ -foo.bar(a); +foo.bar(aaa, bbb); --- [Content] = -[Removal] = 0:8-0:9 - >-< -0| foo.bar(a); +[Removal] = 0:8-0:16 + >--------< +0| foo.bar(aaa, bbb); -[Domain] = 0:0-0:10 - >----------< -0| foo.bar(a); +[Domain] = 0:0-0:17 + >-----------------< +0| foo.bar(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.multiLine.scope index dcf3825591..52ce5e54b4 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.multiLine.scope @@ -1,6 +1,6 @@ foo( - a, - b + aaa, + bbb ); --- @@ -8,16 +8,16 @@ foo( [Removal] = 0:4-3:0 > 0| foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); < [Domain] = 0:0-3:1 >---- 0| foo( -1| a, -2| b +1| aaa, +2| bbb 3| ); -< diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.singleLine.scope index d2ca17e1a0..d649112ab5 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.actual.singleLine.scope @@ -1,13 +1,13 @@ -foo(a); +foo(aaa, bbb); --- [Content] = -[Removal] = 0:4-0:5 - >-< -0| foo(a); +[Removal] = 0:4-0:12 + >--------< +0| foo(aaa, bbb); -[Domain] = 0:0-0:6 - >------< -0| foo(a); +[Domain] = 0:0-0:13 + >-------------< +0| foo(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argumentList.formal.lambda.scope b/data/fixtures/scopes/python/argumentList.formal.lambda.scope deleted file mode 100644 index d00cbcf3f0..0000000000 --- a/data/fixtures/scopes/python/argumentList.formal.lambda.scope +++ /dev/null @@ -1,20 +0,0 @@ -lambda a, b: pass ---- - -[Content] = 0:7-0:11 - >----< -0| lambda a, b: pass - -[Removal] = 0:6-0:11 - >-----< -0| lambda a, b: pass - -[Leading delimiter] = 0:6-0:7 - >-< -0| lambda a, b: pass - -[Domain] = 0:0-0:17 - >-----------------< -0| lambda a, b: pass - -[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argumentList.formal.scope b/data/fixtures/scopes/python/argumentList.formal.scope deleted file mode 100644 index 689577d9ac..0000000000 --- a/data/fixtures/scopes/python/argumentList.formal.scope +++ /dev/null @@ -1,16 +0,0 @@ -def for(name: str, value: int): - pass ---- - -[Content] = -[Removal] = 0:8-0:29 - >---------------------< -0| def for(name: str, value: int): - -[Domain] = 0:0-1:8 - >------------------------------- -0| def for(name: str, value: int): -1| pass - --------< - -[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argumentList.formal.constructor3.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.constructor.empty.scope similarity index 100% rename from data/fixtures/scopes/python/argumentList.formal.constructor3.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.constructor.empty.scope diff --git a/data/fixtures/scopes/python/argumentList.formal.constructor2.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.constructor.multiLine.scope similarity index 100% rename from data/fixtures/scopes/python/argumentList.formal.constructor2.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.constructor.multiLine.scope diff --git a/data/fixtures/scopes/python/argumentList.formal.constructor.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/python/argumentList.formal.constructor.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.constructor.singleLine.scope diff --git a/data/fixtures/scopes/python/argumentList.formal3.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.empty.scope similarity index 100% rename from data/fixtures/scopes/python/argumentList.formal3.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.empty.scope diff --git a/data/fixtures/scopes/python/argumentList.formal.lambda2.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.lambda.empty.scope similarity index 100% rename from data/fixtures/scopes/python/argumentList.formal.lambda2.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.lambda.empty.scope diff --git a/data/fixtures/scopes/python/argumentList/argumentList.formal.lambda.singleLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.lambda.singleLine.scope new file mode 100644 index 0000000000..81735d95d0 --- /dev/null +++ b/data/fixtures/scopes/python/argumentList/argumentList.formal.lambda.singleLine.scope @@ -0,0 +1,20 @@ +lambda aaa, bbb: pass +--- + +[Content] = 0:7-0:15 + >--------< +0| lambda aaa, bbb: pass + +[Removal] = 0:6-0:15 + >---------< +0| lambda aaa, bbb: pass + +[Leading delimiter] = 0:6-0:7 + >-< +0| lambda aaa, bbb: pass + +[Domain] = 0:0-0:21 + >---------------------< +0| lambda aaa, bbb: pass + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argumentList.formal.method3.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.method.empty.scope similarity index 100% rename from data/fixtures/scopes/python/argumentList.formal.method3.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.method.empty.scope diff --git a/data/fixtures/scopes/python/argumentList.formal.method2.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/python/argumentList.formal.method2.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.method.multiLine.scope diff --git a/data/fixtures/scopes/python/argumentList.formal.method.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/python/argumentList.formal.method.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.method.singleLine.scope diff --git a/data/fixtures/scopes/python/argumentList.formal2.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.multiLine.scope similarity index 67% rename from data/fixtures/scopes/python/argumentList.formal2.scope rename to data/fixtures/scopes/python/argumentList/argumentList.formal.multiLine.scope index 34dce296ee..57c31fa7b9 100644 --- a/data/fixtures/scopes/python/argumentList.formal2.scope +++ b/data/fixtures/scopes/python/argumentList/argumentList.formal.multiLine.scope @@ -1,6 +1,6 @@ def foo( - aaa, - bbb, + aaa: str, + bbb: int, ): pass --- @@ -9,16 +9,16 @@ def foo( [Removal] = 0:8-3:0 > 0| def foo( -1| aaa, -2| bbb, +1| aaa: str, +2| bbb: int, 3| ): < [Domain] = 0:0-4:8 >-------- 0| def foo( -1| aaa, -2| bbb, +1| aaa: str, +2| bbb: int, 3| ): 4| pass --------< diff --git a/data/fixtures/scopes/python/argumentList/argumentList.formal.singleLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.singleLine.scope new file mode 100644 index 0000000000..a0140576dc --- /dev/null +++ b/data/fixtures/scopes/python/argumentList/argumentList.formal.singleLine.scope @@ -0,0 +1,16 @@ +def for(aaa: str, bbb: int): + pass +--- + +[Content] = +[Removal] = 0:8-0:26 + >------------------< +0| def for(aaa: str, bbb: int): + +[Domain] = 0:0-1:8 + >---------------------------- +0| def for(aaa: str, bbb: int): +1| pass + --------< + +[Insertion delimiter] = ", " From 9e426270ad5990dddaf91b1ca2290505c18d9491 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 14:13:51 +0200 Subject: [PATCH 06/14] python --- ...rgumentList.actual.constructor.empty.scope | 13 ++++++++++ ...entList.actual.constructor.multiLine.scope | 24 +++++++++++++++++++ ...ntList.actual.constructor.singleLine.scope | 13 ++++++++++ .../python/argumentList.actual.empty.scope | 13 ++++++++++ .../argumentList.actual.method.empty.scope | 13 ++++++++++ ...argumentList.actual.method.multiLine.scope | 24 +++++++++++++++++++ ...rgumentList.actual.method.singleLine.scope | 13 ++++++++++ .../argumentList.actual.multiLine.scope | 24 +++++++++++++++++++ .../argumentList.actual.singleLine.scope | 13 ++++++++++ .../common/src/scopeSupportFacets/python.ts | 2 +- queries/python.scm | 8 +++++++ 11 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 data/fixtures/scopes/python/argumentList.actual.constructor.empty.scope create mode 100644 data/fixtures/scopes/python/argumentList.actual.constructor.multiLine.scope create mode 100644 data/fixtures/scopes/python/argumentList.actual.constructor.singleLine.scope create mode 100644 data/fixtures/scopes/python/argumentList.actual.empty.scope create mode 100644 data/fixtures/scopes/python/argumentList.actual.method.empty.scope create mode 100644 data/fixtures/scopes/python/argumentList.actual.method.multiLine.scope create mode 100644 data/fixtures/scopes/python/argumentList.actual.method.singleLine.scope create mode 100644 data/fixtures/scopes/python/argumentList.actual.multiLine.scope create mode 100644 data/fixtures/scopes/python/argumentList.actual.singleLine.scope diff --git a/data/fixtures/scopes/python/argumentList.actual.constructor.empty.scope b/data/fixtures/scopes/python/argumentList.actual.constructor.empty.scope new file mode 100644 index 0000000000..58e2245d03 --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.constructor.empty.scope @@ -0,0 +1,13 @@ +Foo() +--- + +[Content] = +[Removal] = 0:4-0:4 + >< +0| Foo() + +[Domain] = 0:0-0:5 + >-----< +0| Foo() + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/python/argumentList.actual.constructor.multiLine.scope b/data/fixtures/scopes/python/argumentList.actual.constructor.multiLine.scope new file mode 100644 index 0000000000..619899cf0e --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.constructor.multiLine.scope @@ -0,0 +1,24 @@ +Foo( + aaa, + bbb +) +--- + +[Content] = +[Removal] = 0:4-3:0 + > +0| Foo( +1| aaa, +2| bbb +3| ) + < + +[Domain] = 0:0-3:1 + >---- +0| Foo( +1| aaa, +2| bbb +3| ) + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/python/argumentList.actual.constructor.singleLine.scope b/data/fixtures/scopes/python/argumentList.actual.constructor.singleLine.scope new file mode 100644 index 0000000000..77680199f4 --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.constructor.singleLine.scope @@ -0,0 +1,13 @@ +Foo(aaa, bbb) +--- + +[Content] = +[Removal] = 0:4-0:12 + >--------< +0| Foo(aaa, bbb) + +[Domain] = 0:0-0:13 + >-------------< +0| Foo(aaa, bbb) + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argumentList.actual.empty.scope b/data/fixtures/scopes/python/argumentList.actual.empty.scope new file mode 100644 index 0000000000..947915ef96 --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.empty.scope @@ -0,0 +1,13 @@ +foo() +--- + +[Content] = +[Removal] = 0:4-0:4 + >< +0| foo() + +[Domain] = 0:0-0:5 + >-----< +0| foo() + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/python/argumentList.actual.method.empty.scope b/data/fixtures/scopes/python/argumentList.actual.method.empty.scope new file mode 100644 index 0000000000..ed61422204 --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.method.empty.scope @@ -0,0 +1,13 @@ +foo.bar() +--- + +[Content] = +[Removal] = 0:8-0:8 + >< +0| foo.bar() + +[Domain] = 0:0-0:9 + >---------< +0| foo.bar() + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/python/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/python/argumentList.actual.method.multiLine.scope new file mode 100644 index 0000000000..7ce467aedb --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.method.multiLine.scope @@ -0,0 +1,24 @@ +foo.bar( + aaa, + bbb +) +--- + +[Content] = +[Removal] = 0:8-3:0 + > +0| foo.bar( +1| aaa, +2| bbb +3| ) + < + +[Domain] = 0:0-3:1 + >-------- +0| foo.bar( +1| aaa, +2| bbb +3| ) + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/python/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/python/argumentList.actual.method.singleLine.scope new file mode 100644 index 0000000000..69cf068256 --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.method.singleLine.scope @@ -0,0 +1,13 @@ +foo.bar(aaa, bbb) +--- + +[Content] = +[Removal] = 0:8-0:16 + >--------< +0| foo.bar(aaa, bbb) + +[Domain] = 0:0-0:17 + >-----------------< +0| foo.bar(aaa, bbb) + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argumentList.actual.multiLine.scope b/data/fixtures/scopes/python/argumentList.actual.multiLine.scope new file mode 100644 index 0000000000..b297b5b686 --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.multiLine.scope @@ -0,0 +1,24 @@ +foo( + aaa, + bbb +) +--- + +[Content] = +[Removal] = 0:4-3:0 + > +0| foo( +1| aaa, +2| bbb +3| ) + < + +[Domain] = 0:0-3:1 + >---- +0| foo( +1| aaa, +2| bbb +3| ) + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/python/argumentList.actual.singleLine.scope b/data/fixtures/scopes/python/argumentList.actual.singleLine.scope new file mode 100644 index 0000000000..f0de18dd5d --- /dev/null +++ b/data/fixtures/scopes/python/argumentList.actual.singleLine.scope @@ -0,0 +1,13 @@ +foo(aaa, bbb) +--- + +[Content] = +[Removal] = 0:4-0:12 + >--------< +0| foo(aaa, bbb) + +[Domain] = 0:0-0:13 + >-------------< +0| foo(aaa, bbb) + +[Insertion delimiter] = ", " diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts index 3a08657e3c..e99ff5eb3b 100644 --- a/packages/common/src/scopeSupportFacets/python.ts +++ b/packages/common/src/scopeSupportFacets/python.ts @@ -104,7 +104,6 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = { "argumentList.formal.multiLine": supported, "argumentList.formal.lambda.empty": supported, "argumentList.formal.lambda.singleLine": supported, - "argumentList.formal.lambda.multiLine": supported, "argumentList.formal.method.empty": supported, "argumentList.formal.method.singleLine": supported, "argumentList.formal.method.multiLine": supported, @@ -180,6 +179,7 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable + "argumentList.formal.lambda.multiLine": notApplicable, "class.iteration.block": notApplicable, "className.iteration.block": notApplicable, "comment.block": notApplicable, diff --git a/queries/python.scm b/queries/python.scm index 3783d2d2a9..cd35a88345 100644 --- a/queries/python.scm +++ b/queries/python.scm @@ -726,6 +726,14 @@ ) @name.iteration.domain @value.iteration.domain ) @argumentOrParameter.iteration.domain +(_ + (argument_list + "(" @argumentList.start.endOf + ")" @argumentList.end.startOf + ) @_dummy + (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n") +) @argumentList.domain + (call (generator_expression "(" @argumentOrParameter.iteration.start.endOf From ff6f8563cc03621ffda4bc73daee48db09354fdd Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 14:26:24 +0200 Subject: [PATCH 07/14] scm --- .../scm/argument.actual.iteration.scope | 14 +++--- .../fixtures/scopes/scm/argument.actual.scope | 44 +++++++++---------- .../scm/argumentList.actual.empty.scope | 13 ++++++ .../scm/argumentList.actual.multiLine.scope | 32 ++++++++++++++ .../scm/argumentList.actual.singleLine.scope | 20 +++++++++ packages/common/src/scopeSupportFacets/scm.ts | 12 ++--- .../queryPredicateOperators.ts | 8 ++-- queries/python.scm | 12 ++--- queries/scm.scm | 9 ++-- 9 files changed, 115 insertions(+), 49 deletions(-) create mode 100644 data/fixtures/scopes/scm/argumentList.actual.empty.scope create mode 100644 data/fixtures/scopes/scm/argumentList.actual.multiLine.scope create mode 100644 data/fixtures/scopes/scm/argumentList.actual.singleLine.scope diff --git a/data/fixtures/scopes/scm/argument.actual.iteration.scope b/data/fixtures/scopes/scm/argument.actual.iteration.scope index 6c7217cc2b..3c98fddf20 100644 --- a/data/fixtures/scopes/scm/argument.actual.iteration.scope +++ b/data/fixtures/scopes/scm/argument.actual.iteration.scope @@ -1,10 +1,10 @@ -(#not-parent-type? @statement variable_declaration) +(#foo? @aaa bbb) --- -[Range] = 0:19-0:50 - >-------------------------------< -0| (#not-parent-type? @statement variable_declaration) +[Range] = 0:7-0:15 + >--------< +0| (#foo? @aaa bbb) -[Domain] = 0:0-0:51 - >---------------------------------------------------< -0| (#not-parent-type? @statement variable_declaration) +[Domain] = 0:0-0:16 + >----------------< +0| (#foo? @aaa bbb) diff --git a/data/fixtures/scopes/scm/argument.actual.scope b/data/fixtures/scopes/scm/argument.actual.scope index 294ac53f40..802cf1f7a2 100644 --- a/data/fixtures/scopes/scm/argument.actual.scope +++ b/data/fixtures/scopes/scm/argument.actual.scope @@ -1,37 +1,37 @@ -(#not-parent-type? @statement variable_declaration) +(#foo? @aaa bbb) --- [#1 Content] = -[#1 Domain] = 0:19-0:29 - >----------< -0| (#not-parent-type? @statement variable_declaration) +[#1 Domain] = 0:7-0:11 + >----< +0| (#foo? @aaa bbb) -[#1 Removal] = 0:19-0:30 - >-----------< -0| (#not-parent-type? @statement variable_declaration) +[#1 Removal] = 0:7-0:12 + >-----< +0| (#foo? @aaa bbb) -[#1 Leading delimiter] = 0:18-0:19 - >-< -0| (#not-parent-type? @statement variable_declaration) +[#1 Leading delimiter] = 0:6-0:7 + >-< +0| (#foo? @aaa bbb) -[#1 Trailing delimiter] = 0:29-0:30 - >-< -0| (#not-parent-type? @statement variable_declaration) +[#1 Trailing delimiter] = 0:11-0:12 + >-< +0| (#foo? @aaa bbb) [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Domain] = 0:30-0:50 - >--------------------< -0| (#not-parent-type? @statement variable_declaration) +[#2 Domain] = 0:12-0:15 + >---< +0| (#foo? @aaa bbb) -[#2 Removal] = 0:29-0:50 - >---------------------< -0| (#not-parent-type? @statement variable_declaration) +[#2 Removal] = 0:11-0:15 + >----< +0| (#foo? @aaa bbb) -[#2 Leading delimiter] = 0:29-0:30 - >-< -0| (#not-parent-type? @statement variable_declaration) +[#2 Leading delimiter] = 0:11-0:12 + >-< +0| (#foo? @aaa bbb) [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scm/argumentList.actual.empty.scope b/data/fixtures/scopes/scm/argumentList.actual.empty.scope new file mode 100644 index 0000000000..78471b5ae0 --- /dev/null +++ b/data/fixtures/scopes/scm/argumentList.actual.empty.scope @@ -0,0 +1,13 @@ +(#foo?) +--- + +[Content] = +[Removal] = 0:6-0:6 + >< +0| (#foo?) + +[Domain] = 0:0-0:7 + >-------< +0| (#foo?) + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scm/argumentList.actual.multiLine.scope b/data/fixtures/scopes/scm/argumentList.actual.multiLine.scope new file mode 100644 index 0000000000..4d20f0a3ab --- /dev/null +++ b/data/fixtures/scopes/scm/argumentList.actual.multiLine.scope @@ -0,0 +1,32 @@ +(#foo? + @aaa + bbb +) +--- + +[Content] = 1:4-2:7 + >---- +1| @aaa +2| bbb + -------< + +[Removal] = 1:0-3:0 + >-------- +1| @aaa +2| bbb +3| ) + < + +[Leading delimiter] = 1:0-1:4 + >----< +1| @aaa + +[Domain] = 0:0-3:1 + >------ +0| (#foo? +1| @aaa +2| bbb +3| ) + -< + +[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/scm/argumentList.actual.singleLine.scope b/data/fixtures/scopes/scm/argumentList.actual.singleLine.scope new file mode 100644 index 0000000000..5def395bfa --- /dev/null +++ b/data/fixtures/scopes/scm/argumentList.actual.singleLine.scope @@ -0,0 +1,20 @@ +(#foo? @aaa bbb) +--- + +[Content] = 0:7-0:15 + >--------< +0| (#foo? @aaa bbb) + +[Removal] = 0:6-0:15 + >---------< +0| (#foo? @aaa bbb) + +[Leading delimiter] = 0:6-0:7 + >-< +0| (#foo? @aaa bbb) + +[Domain] = 0:0-0:16 + >----------------< +0| (#foo? @aaa bbb) + +[Insertion delimiter] = " " diff --git a/packages/common/src/scopeSupportFacets/scm.ts b/packages/common/src/scopeSupportFacets/scm.ts index 50fb2ca773..3eabe723d0 100644 --- a/packages/common/src/scopeSupportFacets/scm.ts +++ b/packages/common/src/scopeSupportFacets/scm.ts @@ -13,12 +13,6 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = { "argumentList.actual.empty": supported, "argumentList.actual.singleLine": supported, "argumentList.actual.multiLine": supported, - "argumentList.actual.method.empty": supported, - "argumentList.actual.method.singleLine": supported, - "argumentList.actual.method.multiLine": supported, - "argumentList.actual.constructor.empty": supported, - "argumentList.actual.constructor.singleLine": supported, - "argumentList.actual.constructor.multiLine": supported, functionCall: supported, functionCallee: supported, @@ -43,6 +37,12 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, + "argumentList.actual.method.empty": notApplicable, + "argumentList.actual.method.singleLine": notApplicable, + "argumentList.actual.method.multiLine": notApplicable, + "argumentList.actual.constructor.empty": notApplicable, + "argumentList.actual.constructor.singleLine": notApplicable, + "argumentList.actual.constructor.multiLine": notApplicable, "argumentList.formal.empty": notApplicable, "argumentList.formal.singleLine": notApplicable, "argumentList.formal.multiLine": notApplicable, diff --git a/packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts b/packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts index 6359b3c998..73c2f1a104 100644 --- a/packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts +++ b/packages/cursorless-engine/src/languages/TreeSitterQuery/queryPredicateOperators.ts @@ -261,14 +261,16 @@ class DocumentRange extends QueryPredicateOperator { */ class AllowMultiple extends QueryPredicateOperator { name = "allow-multiple!" as const; - schema = z.tuple([q.node]); + schema = z.tuple([q.node]).rest(q.node); protected allowMissingNode(): boolean { return true; } - run(nodeInfo: MutableQueryCapture) { - nodeInfo.allowMultiple = true; + run(...nodeInfos: MutableQueryCapture[]) { + for (const nodeInfo of nodeInfos) { + nodeInfo.allowMultiple = true; + } return true; } diff --git a/queries/python.scm b/queries/python.scm index cd35a88345..0570d45ea4 100644 --- a/queries/python.scm +++ b/queries/python.scm @@ -203,8 +203,7 @@ ) ) @_.domain (#not-type? @value "as_pattern") - (#allow-multiple! @value) - (#allow-multiple! @name) + (#allow-multiple! @value @name) ) ;;!! with aaa: @@ -224,8 +223,7 @@ ) (#not-type? @value "as_pattern") (#has-multiple-children-of-type? @_with_clause "with_item") - (#allow-multiple! @value) - (#allow-multiple! @name) + (#allow-multiple! @value @name) ) ;;!! with aaa as bbb: @@ -243,8 +241,7 @@ ) ) ) @_.domain - (#allow-multiple! @value) - (#allow-multiple! @name) + (#allow-multiple! @value @name) ) ;;!! with aaa as ccc, bbb: @@ -262,8 +259,7 @@ ) @_with_clause ) (#has-multiple-children-of-type? @_with_clause "with_item") - (#allow-multiple! @value) - (#allow-multiple! @name) + (#allow-multiple! @value @name) ) (with_statement diff --git a/queries/scm.scm b/queries/scm.scm index 73da970f22..a7fb91f240 100644 --- a/queries/scm.scm +++ b/queries/scm.scm @@ -43,9 +43,12 @@ ) ) -(predicate - (parameters) @argumentOrParameter.iteration -) @argumentOrParameter.iteration.domain +( + (predicate + (parameters) @argumentList @argumentOrParameter.iteration + ) @argumentList.domain @argumentOrParameter.iteration.domain + (#single-or-multi-line-delimiter! @argumentList @argumentList.domain " " "\n") +) ;;!! (aaa) @bbb ;;! ^^^ From 1da37fddb20637019894727b1805a1e30f74d3f7 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 14:44:59 +0200 Subject: [PATCH 08/14] r --- .../scopes/r/argumentList.formal.scope | 13 ---------- .../scopes/r/argumentList.formal2.scope | 13 ---------- .../scopes/r/argumentList.formal4.scope | 13 ---------- .../argumentList.actual.empty.scope | 13 ++++++++++ .../argumentList.actual.method.empty.scope | 13 ++++++++++ ...argumentList.actual.method.multiLine.scope | 24 +++++++++++++++++++ ...rgumentList.actual.method.singleLine.scope | 13 ++++++++++ .../argumentList.actual.multiLine.scope | 24 +++++++++++++++++++ .../argumentList.actual.singleLine.scope | 13 ++++++++++ .../argumentList.formal.empty.scope | 13 ++++++++++ .../argumentList.formal.lambda.empty.scope | 13 ++++++++++ ...argumentList.formal.lambda.multiLine.scope | 24 +++++++++++++++++++ ...rgumentList.formal.lambda.singleLine.scope | 13 ++++++++++ .../argumentList.formal.multiLine.scope} | 12 +++++----- .../argumentList.formal.singleLine.scope | 13 ++++++++++ packages/common/src/scopeSupportFacets/r.ts | 11 ++------- 16 files changed, 184 insertions(+), 54 deletions(-) delete mode 100644 data/fixtures/scopes/r/argumentList.formal.scope delete mode 100644 data/fixtures/scopes/r/argumentList.formal2.scope delete mode 100644 data/fixtures/scopes/r/argumentList.formal4.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.actual.empty.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.actual.method.empty.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.actual.method.multiLine.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.actual.method.singleLine.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.actual.multiLine.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.actual.singleLine.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.formal.empty.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.empty.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.singleLine.scope rename data/fixtures/scopes/r/{argumentList.formal3.scope => argumentList/argumentList.formal.multiLine.scope} (77%) create mode 100644 data/fixtures/scopes/r/argumentList/argumentList.formal.singleLine.scope diff --git a/data/fixtures/scopes/r/argumentList.formal.scope b/data/fixtures/scopes/r/argumentList.formal.scope deleted file mode 100644 index a55b49dcf5..0000000000 --- a/data/fixtures/scopes/r/argumentList.formal.scope +++ /dev/null @@ -1,13 +0,0 @@ -abc <- function(x, y){ } ---- - -[Content] = -[Removal] = 0:16-0:20 - >----< -0| abc <- function(x, y){ } - -[Domain] = 0:0-0:24 - >------------------------< -0| abc <- function(x, y){ } - -[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argumentList.formal2.scope b/data/fixtures/scopes/r/argumentList.formal2.scope deleted file mode 100644 index c0d8725dee..0000000000 --- a/data/fixtures/scopes/r/argumentList.formal2.scope +++ /dev/null @@ -1,13 +0,0 @@ -abc <- function(){ } ---- - -[Content] = -[Removal] = 0:16-0:16 - >< -0| abc <- function(){ } - -[Domain] = 0:0-0:20 - >--------------------< -0| abc <- function(){ } - -[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/r/argumentList.formal4.scope b/data/fixtures/scopes/r/argumentList.formal4.scope deleted file mode 100644 index 645eaf49a0..0000000000 --- a/data/fixtures/scopes/r/argumentList.formal4.scope +++ /dev/null @@ -1,13 +0,0 @@ -function(x, y){ } ---- - -[Content] = -[Removal] = 0:9-0:13 - >----< -0| function(x, y){ } - -[Domain] = 0:0-0:17 - >-----------------< -0| function(x, y){ } - -[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argumentList/argumentList.actual.empty.scope b/data/fixtures/scopes/r/argumentList/argumentList.actual.empty.scope new file mode 100644 index 0000000000..947915ef96 --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.actual.empty.scope @@ -0,0 +1,13 @@ +foo() +--- + +[Content] = +[Removal] = 0:4-0:4 + >< +0| foo() + +[Domain] = 0:0-0:5 + >-----< +0| foo() + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.actual.method.empty.scope b/data/fixtures/scopes/r/argumentList/argumentList.actual.method.empty.scope new file mode 100644 index 0000000000..ed61422204 --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.actual.method.empty.scope @@ -0,0 +1,13 @@ +foo.bar() +--- + +[Content] = +[Removal] = 0:8-0:8 + >< +0| foo.bar() + +[Domain] = 0:0-0:9 + >---------< +0| foo.bar() + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.actual.method.multiLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.actual.method.multiLine.scope new file mode 100644 index 0000000000..7ce467aedb --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.actual.method.multiLine.scope @@ -0,0 +1,24 @@ +foo.bar( + aaa, + bbb +) +--- + +[Content] = +[Removal] = 0:8-3:0 + > +0| foo.bar( +1| aaa, +2| bbb +3| ) + < + +[Domain] = 0:0-3:1 + >-------- +0| foo.bar( +1| aaa, +2| bbb +3| ) + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.actual.method.singleLine.scope new file mode 100644 index 0000000000..69cf068256 --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.actual.method.singleLine.scope @@ -0,0 +1,13 @@ +foo.bar(aaa, bbb) +--- + +[Content] = +[Removal] = 0:8-0:16 + >--------< +0| foo.bar(aaa, bbb) + +[Domain] = 0:0-0:17 + >-----------------< +0| foo.bar(aaa, bbb) + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argumentList/argumentList.actual.multiLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.actual.multiLine.scope new file mode 100644 index 0000000000..b297b5b686 --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.actual.multiLine.scope @@ -0,0 +1,24 @@ +foo( + aaa, + bbb +) +--- + +[Content] = +[Removal] = 0:4-3:0 + > +0| foo( +1| aaa, +2| bbb +3| ) + < + +[Domain] = 0:0-3:1 + >---- +0| foo( +1| aaa, +2| bbb +3| ) + -< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.actual.singleLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.actual.singleLine.scope new file mode 100644 index 0000000000..f0de18dd5d --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.actual.singleLine.scope @@ -0,0 +1,13 @@ +foo(aaa, bbb) +--- + +[Content] = +[Removal] = 0:4-0:12 + >--------< +0| foo(aaa, bbb) + +[Domain] = 0:0-0:13 + >-------------< +0| foo(aaa, bbb) + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.empty.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.empty.scope new file mode 100644 index 0000000000..b4f4ae643a --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.empty.scope @@ -0,0 +1,13 @@ +abc <- function() { } +--- + +[Content] = +[Removal] = 0:16-0:16 + >< +0| abc <- function() { } + +[Domain] = 0:0-0:21 + >---------------------< +0| abc <- function() { } + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.empty.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.empty.scope new file mode 100644 index 0000000000..355a4e9306 --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.empty.scope @@ -0,0 +1,13 @@ +function() { } +--- + +[Content] = +[Removal] = 0:9-0:9 + >< +0| function() { } + +[Domain] = 0:0-0:14 + >--------------< +0| function() { } + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope new file mode 100644 index 0000000000..c92432b568 --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope @@ -0,0 +1,24 @@ +function( + aaa, + bbb +) { } +--- + +[Content] = +[Removal] = 0:9-3:0 + > +0| function( +1| aaa, +2| bbb +3| ) { } + < + +[Domain] = 0:0-3:5 + >--------- +0| function( +1| aaa, +2| bbb +3| ) { } + -----< + +[Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.singleLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.singleLine.scope new file mode 100644 index 0000000000..3ba0a4b729 --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.singleLine.scope @@ -0,0 +1,13 @@ +function(aaa, bbb) { } +--- + +[Content] = +[Removal] = 0:9-0:17 + >--------< +0| function(aaa, bbb) { } + +[Domain] = 0:0-0:22 + >----------------------< +0| function(aaa, bbb) { } + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argumentList.formal3.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.multiLine.scope similarity index 77% rename from data/fixtures/scopes/r/argumentList.formal3.scope rename to data/fixtures/scopes/r/argumentList/argumentList.formal.multiLine.scope index 2d5f7e7f3b..3ef33ca2f3 100644 --- a/data/fixtures/scopes/r/argumentList.formal3.scope +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.multiLine.scope @@ -1,6 +1,6 @@ abc <- function( - x, - y + aaa, + bbb ){ } --- @@ -9,16 +9,16 @@ abc <- function( [Removal] = 0:16-3:0 > 0| abc <- function( -1| x, -2| y +1| aaa, +2| bbb 3| ){ < [Domain] = 0:0-4:1 >---------------- 0| abc <- function( -1| x, -2| y +1| aaa, +2| bbb 3| ){ 4| } -< diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.singleLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.singleLine.scope new file mode 100644 index 0000000000..fde348053b --- /dev/null +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.singleLine.scope @@ -0,0 +1,13 @@ +abc <- function(aaa, bbb) { } +--- + +[Content] = +[Removal] = 0:16-0:24 + >--------< +0| abc <- function(aaa, bbb) { } + +[Domain] = 0:0-0:29 + >-----------------------------< +0| abc <- function(aaa, bbb) { } + +[Insertion delimiter] = ", " diff --git a/packages/common/src/scopeSupportFacets/r.ts b/packages/common/src/scopeSupportFacets/r.ts index 56a93d4ed9..d6b6f64318 100644 --- a/packages/common/src/scopeSupportFacets/r.ts +++ b/packages/common/src/scopeSupportFacets/r.ts @@ -6,7 +6,9 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel; export const rScopeSupport: LanguageScopeSupportFacetMap = { anonymousFunction: supported, "argument.actual": supported, + "argument.actual.iteration": supported, "argument.formal": supported, + "argument.formal.iteration": supported, "argumentList.actual.empty": supported, "argumentList.actual.singleLine": supported, @@ -14,21 +16,12 @@ export const rScopeSupport: LanguageScopeSupportFacetMap = { "argumentList.actual.method.empty": supported, "argumentList.actual.method.singleLine": supported, "argumentList.actual.method.multiLine": supported, - "argumentList.actual.constructor.empty": supported, - "argumentList.actual.constructor.singleLine": supported, - "argumentList.actual.constructor.multiLine": supported, "argumentList.formal.empty": supported, "argumentList.formal.singleLine": supported, "argumentList.formal.multiLine": supported, "argumentList.formal.lambda.empty": supported, "argumentList.formal.lambda.singleLine": supported, "argumentList.formal.lambda.multiLine": supported, - "argumentList.formal.method.empty": supported, - "argumentList.formal.method.singleLine": supported, - "argumentList.formal.method.multiLine": supported, - "argumentList.formal.constructor.empty": supported, - "argumentList.formal.constructor.singleLine": supported, - "argumentList.formal.constructor.multiLine": supported, "comment.line": supported, functionCall: supported, From 63719f605c7f6d30b281b5adc87e44adb09b3a99 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 14:58:24 +0200 Subject: [PATCH 09/14] talon --- .../talon/argumentList.actual.empty.scope | 13 ++++++++ .../argumentList.actual.method.empty.scope | 13 ++++++++ ...rgumentList.actual.method.singleLine.scope | 13 ++++++++ .../argumentList.actual.singleLine.scope | 13 ++++++++ .../argumentList.actual.singleLine2.scope | 13 ++++++++ .../argumentList.actual.singleLine3.scope | 13 ++++++++ .../common/src/scopeSupportFacets/talon.ts | 10 +++--- queries/talon.scm | 32 +++++++++++-------- 8 files changed, 101 insertions(+), 19 deletions(-) create mode 100644 data/fixtures/scopes/talon/argumentList.actual.empty.scope create mode 100644 data/fixtures/scopes/talon/argumentList.actual.method.empty.scope create mode 100644 data/fixtures/scopes/talon/argumentList.actual.method.singleLine.scope create mode 100644 data/fixtures/scopes/talon/argumentList.actual.singleLine.scope create mode 100644 data/fixtures/scopes/talon/argumentList.actual.singleLine2.scope create mode 100644 data/fixtures/scopes/talon/argumentList.actual.singleLine3.scope diff --git a/data/fixtures/scopes/talon/argumentList.actual.empty.scope b/data/fixtures/scopes/talon/argumentList.actual.empty.scope new file mode 100644 index 0000000000..70a9d7299b --- /dev/null +++ b/data/fixtures/scopes/talon/argumentList.actual.empty.scope @@ -0,0 +1,13 @@ +command: foo() +--- + +[Content] = +[Removal] = 0:13-0:13 + >< +0| command: foo() + +[Domain] = 0:9-0:14 + >-----< +0| command: foo() + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/talon/argumentList.actual.method.empty.scope b/data/fixtures/scopes/talon/argumentList.actual.method.empty.scope new file mode 100644 index 0000000000..e72965bde8 --- /dev/null +++ b/data/fixtures/scopes/talon/argumentList.actual.method.empty.scope @@ -0,0 +1,13 @@ +command: user.foo() +--- + +[Content] = +[Removal] = 0:18-0:18 + >< +0| command: user.foo() + +[Domain] = 0:9-0:19 + >----------< +0| command: user.foo() + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/talon/argumentList.actual.method.singleLine.scope b/data/fixtures/scopes/talon/argumentList.actual.method.singleLine.scope new file mode 100644 index 0000000000..a207ef158f --- /dev/null +++ b/data/fixtures/scopes/talon/argumentList.actual.method.singleLine.scope @@ -0,0 +1,13 @@ +command: user.foo(aaa, bbb) +--- + +[Content] = +[Removal] = 0:18-0:26 + >--------< +0| command: user.foo(aaa, bbb) + +[Domain] = 0:9-0:27 + >------------------< +0| command: user.foo(aaa, bbb) + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/talon/argumentList.actual.singleLine.scope b/data/fixtures/scopes/talon/argumentList.actual.singleLine.scope new file mode 100644 index 0000000000..27673f9f3f --- /dev/null +++ b/data/fixtures/scopes/talon/argumentList.actual.singleLine.scope @@ -0,0 +1,13 @@ +command: foo(aaa, bbb) +--- + +[Content] = +[Removal] = 0:13-0:21 + >--------< +0| command: foo(aaa, bbb) + +[Domain] = 0:9-0:22 + >-------------< +0| command: foo(aaa, bbb) + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/talon/argumentList.actual.singleLine2.scope b/data/fixtures/scopes/talon/argumentList.actual.singleLine2.scope new file mode 100644 index 0000000000..4fca57979e --- /dev/null +++ b/data/fixtures/scopes/talon/argumentList.actual.singleLine2.scope @@ -0,0 +1,13 @@ +command: key(enter) +--- + +[Content] = +[Removal] = 0:13-0:18 + >-----< +0| command: key(enter) + +[Domain] = 0:9-0:19 + >----------< +0| command: key(enter) + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/argumentList.actual.singleLine3.scope b/data/fixtures/scopes/talon/argumentList.actual.singleLine3.scope new file mode 100644 index 0000000000..d1f822054c --- /dev/null +++ b/data/fixtures/scopes/talon/argumentList.actual.singleLine3.scope @@ -0,0 +1,13 @@ +command: sleep(100ms) +--- + +[Content] = +[Removal] = 0:15-0:20 + >-----< +0| command: sleep(100ms) + +[Domain] = 0:9-0:21 + >------------< +0| command: sleep(100ms) + +[Insertion delimiter] = " " diff --git a/packages/common/src/scopeSupportFacets/talon.ts b/packages/common/src/scopeSupportFacets/talon.ts index 3e15a16167..a03aeef37f 100644 --- a/packages/common/src/scopeSupportFacets/talon.ts +++ b/packages/common/src/scopeSupportFacets/talon.ts @@ -9,13 +9,8 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = { "argumentList.actual.empty": supported, "argumentList.actual.singleLine": supported, - "argumentList.actual.multiLine": supported, "argumentList.actual.method.empty": supported, "argumentList.actual.method.singleLine": supported, - "argumentList.actual.method.multiLine": supported, - "argumentList.actual.constructor.empty": supported, - "argumentList.actual.constructor.singleLine": supported, - "argumentList.actual.constructor.multiLine": supported, "comment.line": supported, @@ -59,6 +54,11 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, + "argumentList.actual.constructor.empty": supported, + "argumentList.actual.constructor.singleLine": supported, + "argumentList.actual.constructor.multiLine": supported, + "argumentList.actual.multiLine": notApplicable, + "argumentList.actual.method.multiLine": notApplicable, "argumentList.formal.empty": notApplicable, "argumentList.formal.singleLine": notApplicable, "argumentList.formal.multiLine": notApplicable, diff --git a/queries/talon.scm b/queries/talon.scm index 524fb64435..5f793f9aad 100644 --- a/queries/talon.scm +++ b/queries/talon.scm @@ -157,11 +157,20 @@ ;;!! key(enter) ;;! ^^^^^ (key_action - arguments: (_) @argumentOrParameter -) + (implicit_string) @argumentOrParameter @argumentList +) @argumentList.domain + +;;!! key(enter) +;;! ^^^^^ +(_ + (implicit_string) @argumentOrParameter.iteration +) @argumentOrParameter.iteration.domain + +;;!! sleep(100ms) +;;! ^^^^^ (sleep_action - arguments: (_) @argumentOrParameter -) + (implicit_string) @argumentOrParameter @argumentList +) @argumentList.domain ;;!! print("hello", "world") ;;! ^^^^^^^ ^^^^^^^ @@ -178,16 +187,11 @@ (_ (argument_list - "(" @argumentOrParameter.iteration.start.endOf - ")" @argumentOrParameter.iteration.end.startOf - ) -) @argumentOrParameter.iteration.domain - -;;!! key(enter) -;;! ^^^^^ -(_ - arguments: (implicit_string) @argumentOrParameter.iteration -) @argumentOrParameter.iteration.domain + "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf + ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf + ) @_dummy + (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n") +) @argumentList.domain @argumentOrParameter.iteration.domain ;;!! # foo ;;! ^^^^^ From 1a8d57fea9e4f7e504e6665b4712d73c93d1f740 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 14:59:41 +0200 Subject: [PATCH 10/14] cleanup --- packages/common/src/scopeSupportFacets/talon.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/common/src/scopeSupportFacets/talon.ts b/packages/common/src/scopeSupportFacets/talon.ts index a03aeef37f..08684f491f 100644 --- a/packages/common/src/scopeSupportFacets/talon.ts +++ b/packages/common/src/scopeSupportFacets/talon.ts @@ -54,9 +54,9 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal.method.iteration": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, - "argumentList.actual.constructor.empty": supported, - "argumentList.actual.constructor.singleLine": supported, - "argumentList.actual.constructor.multiLine": supported, + "argumentList.actual.constructor.empty": notApplicable, + "argumentList.actual.constructor.singleLine": notApplicable, + "argumentList.actual.constructor.multiLine": notApplicable, "argumentList.actual.multiLine": notApplicable, "argumentList.actual.method.multiLine": notApplicable, "argumentList.formal.empty": notApplicable, From 510ec90387b9cff5bf052a2fda1c62e6aebe9e2b Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 15:08:10 +0200 Subject: [PATCH 11/14] css --- .../scopes/css/argumentList.actual.empty.scope | 15 +++++++++++++++ .../css/argumentList.actual.singleLine.scope | 15 +++++++++++++++ packages/common/src/scopeSupportFacets/css.ts | 10 ++++++++++ queries/css.scm | 9 +++++---- 4 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 data/fixtures/scopes/css/argumentList.actual.empty.scope create mode 100644 data/fixtures/scopes/css/argumentList.actual.singleLine.scope diff --git a/data/fixtures/scopes/css/argumentList.actual.empty.scope b/data/fixtures/scopes/css/argumentList.actual.empty.scope new file mode 100644 index 0000000000..fefbd1fdfd --- /dev/null +++ b/data/fixtures/scopes/css/argumentList.actual.empty.scope @@ -0,0 +1,15 @@ +* { + width: calc(); +} +--- + +[Content] = +[Removal] = 1:14-1:14 + >< +1| width: calc(); + +[Domain] = 1:9-1:15 + >------< +1| width: calc(); + +[Insertion delimiter] = "" diff --git a/data/fixtures/scopes/css/argumentList.actual.singleLine.scope b/data/fixtures/scopes/css/argumentList.actual.singleLine.scope new file mode 100644 index 0000000000..0d64ba94cc --- /dev/null +++ b/data/fixtures/scopes/css/argumentList.actual.singleLine.scope @@ -0,0 +1,15 @@ +* { + width: calc(100% - 50px); +} +--- + +[Content] = +[Removal] = 1:14-1:25 + >-----------< +1| width: calc(100% - 50px); + +[Domain] = 1:9-1:26 + >-----------------< +1| width: calc(100% - 50px); + +[Insertion delimiter] = ", " diff --git a/packages/common/src/scopeSupportFacets/css.ts b/packages/common/src/scopeSupportFacets/css.ts index 7284c2536d..50dee083e0 100644 --- a/packages/common/src/scopeSupportFacets/css.ts +++ b/packages/common/src/scopeSupportFacets/css.ts @@ -15,6 +15,9 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = { "argument.actual": supported, "argument.actual.iteration": supported, + "argumentList.actual.empty": supported, + "argumentList.actual.singleLine": supported, + "name.iteration.document": supported, "name.iteration.block": supported, @@ -48,6 +51,13 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = { "argument.formal": notApplicable, "argument.formal.lambda": notApplicable, "argument.formal.lambda.iteration": notApplicable, + "argumentList.actual.multiLine": notApplicable, + "argumentList.actual.method.empty": notApplicable, + "argumentList.actual.method.singleLine": notApplicable, + "argumentList.actual.method.multiLine": notApplicable, + "argumentList.actual.constructor.empty": notApplicable, + "argumentList.actual.constructor.singleLine": notApplicable, + "argumentList.actual.constructor.multiLine": notApplicable, "argumentList.formal.empty": notApplicable, "argumentList.formal.singleLine": notApplicable, "argumentList.formal.multiLine": notApplicable, diff --git a/queries/css.scm b/queries/css.scm index 062889c917..e81086a206 100644 --- a/queries/css.scm +++ b/queries/css.scm @@ -90,10 +90,11 @@ (_ (arguments - "(" @argumentOrParameter.iteration.start.endOf - ")" @argumentOrParameter.iteration.end.startOf - ) -) @argumentOrParameter.iteration.domain + "(" @argumentList.start.endOf @argumentOrParameter.iteration.start.endOf + ")" @argumentList.end.startOf @argumentOrParameter.iteration.end.startOf + ) @_dummy + (#empty-single-multi-delimiter! @argumentList.start.endOf @_dummy "" ", " ",\n") +) @argumentList.domain @argumentOrParameter.iteration.domain ;; Entire file ( From dc13a1fc3def8fe6b40a5c8c7abbfbb5fdebd0a3 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 15:10:30 +0200 Subject: [PATCH 12/14] xml --- packages/common/src/scopeSupportFacets/xml.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/common/src/scopeSupportFacets/xml.ts b/packages/common/src/scopeSupportFacets/xml.ts index 7243743a9d..7a7f80c565 100644 --- a/packages/common/src/scopeSupportFacets/xml.ts +++ b/packages/common/src/scopeSupportFacets/xml.ts @@ -167,6 +167,8 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = { "type.foreach": notApplicable, "type.interface": notApplicable, "type.return": notApplicable, + "type.resource": notApplicable, + "type.resource.iteration": notApplicable, "type.typeArgument": notApplicable, "type.typeArgument.iteration": notApplicable, "type.variable": notApplicable, From fa06c74798efedbd5d0896682edb608bae44884c Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sat, 31 May 2025 15:27:51 +0200 Subject: [PATCH 13/14] Update --- .../argument.actual.constructor.iteration.scope | 4 ++-- .../scopes/javascript.core/argument.actual.iteration.scope | 4 ++-- .../javascript.core/argument.actual.method.iteration.scope | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope index fd1493b583..170dda3d5e 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.constructor.iteration.scope @@ -3,8 +3,8 @@ new Foo(aaa, bbb) [Range] = 0:8-0:16 >--------< -0| new Aaa(bbb, ccc) +0| new Foo(aaa, bbb) [Domain] = 0:0-0:17 >-----------------< -0| new Aaa(bbb, ccc) +0| new Foo(aaa, bbb) diff --git a/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope index 86b12c3896..c6b7e07196 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.iteration.scope @@ -3,8 +3,8 @@ foo(aaa, bbb); [Range] = 0:4-0:12 >--------< -0| aaa(bbb, ccc); +0| foo(aaa, bbb); [Domain] = 0:0-0:13 >-------------< -0| aaa(bbb, ccc); +0| foo(aaa, bbb); diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope index bdb1b4c5f6..b4fa962af8 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.method.iteration.scope @@ -3,8 +3,8 @@ foo.bar(aaa, bbb); [Range] = 0:8-0:16 >--------< -0| aaa.bbb(ccc, ddd); +0| foo.bar(aaa, bbb); [Domain] = 0:0-0:17 >-----------------< -0| aaa.bbb(ccc, ddd); +0| foo.bar(aaa, bbb); From 467da18ff08c7059d54c34027cddb22ad9440b0f Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sun, 1 Jun 2025 07:51:58 +0200 Subject: [PATCH 14/14] Update description --- .../common/src/scopeSupportFacets/scopeSupportFacetInfos.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts index e320938702..8da6177320 100644 --- a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts +++ b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts @@ -298,17 +298,17 @@ export const scopeSupportFacetInfos: Record< insertionDelimiterHint: '",\n"', }, "argumentList.actual.method.empty": { - description: "An empty list of arguments in a class method call", + description: "An empty list of arguments in a method call", scopeType: "argumentList", insertionDelimiterHint: '""', }, "argumentList.actual.method.singleLine": { - description: "A single line list of arguments in a class method call", + description: "A single line list of arguments in a method call", scopeType: "argumentList", insertionDelimiterHint: '", "', }, "argumentList.actual.method.multiLine": { - description: "A multi line list of arguments in a class method call", + description: "A multi line list of arguments in a method call", scopeType: "argumentList", insertionDelimiterHint: '",\n"', },