From 937a5b834b38c9c5c97393882ba17088355de33c Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Tue, 1 Jul 2025 14:44:38 +0200 Subject: [PATCH 1/5] Added argument single line and multiline facets --- ...=> argument.actual.method.multiLine.scope} | 0 ...> argument.actual.method.singleLine.scope} | 0 ....scope => argument.actual.multiLine.scope} | 0 ...scope => argument.actual.singleLine.scope} | 0 ....scope => argument.formal.multiLine.scope} | 0 ...scope => argument.formal.singleLine.scope} | 0 ...rgument.actual.constructor.multiLine.scope | 36 ++++++++++ ...ument.actual.constructor.singleLine.scope} | 0 ...rgument.formal.constructor.multiLine.scope | 38 ++++++++++ ...ument.formal.constructor.singleLine.scope} | 0 .../argument.formal.lambda.multiLine.scope | 36 ++++++++++ ...> argument.formal.lambda.singleLine.scope} | 0 .../argument.formal.method.multiLine.scope | 38 ++++++++++ ...> argument.formal.method.singleLine.scope} | 0 ...gument.actual.constructor.multiLine.scope} | 0 ...ument.actual.constructor.singleLine.scope} | 0 ...=> argument.actual.method.multiLine.scope} | 0 ...> argument.actual.method.singleLine.scope} | 0 .../csharp/argument.actual.multiLine.scope | 36 ++++++++++ ...scope => argument.actual.singleLine.scope} | 2 +- ...gument.formal.constructor.multiLine.scope} | 0 ...ument.formal.constructor.singleLine.scope} | 0 .../argument.formal.lambda.multiLine.scope | 36 ++++++++++ ...> argument.formal.lambda.singleLine.scope} | 0 ...=> argument.formal.method.multiLine.scope} | 0 ...> argument.formal.method.singleLine.scope} | 0 .../csharp/argument.formal.multiLine.scope | 5 ++ ...scope => argument.formal.singleLine.scope} | 0 ...scope => argument.actual.singleLine.scope} | 0 ...cope => argument.actual.singleLine2.scope} | 0 ...cope => argument.actual.singleLine3.scope} | 0 ...cope => argument.actual.singleLine4.scope} | 0 ...rgument.actual.constructor.multiLine.scope | 36 ++++++++++ ...ument.actual.constructor.singleLine.scope} | 2 +- .../argument.actual.method.multiLine.scope | 36 ++++++++++ ...> argument.actual.method.singleLine.scope} | 2 +- ....scope => argument.actual.multiLine.scope} | 4 +- ...scope => argument.actual.singleLine.scope} | 2 +- ...gument.formal.constructor.multiLine.scope} | 0 ...ument.formal.constructor.singleLine.scope} | 0 ...=> argument.formal.lambda.multiLine.scope} | 0 ...> argument.formal.lambda.singleLine.scope} | 0 ...=> argument.formal.method.multiLine.scope} | 0 ...> argument.formal.method.singleLine.scope} | 0 ...rgument.actual.constructor.multiLine.scope | 36 ++++++++++ ...ument.actual.constructor.singleLine.scope} | 2 +- .../argument.actual.method.multiLine.scope | 36 ++++++++++ ...> argument.actual.method.singleLine.scope} | 2 +- .../argument.actual.multiLine.scope | 36 ++++++++++ ...scope => argument.actual.singleLine.scope} | 8 +-- ...rgument.formal.constructor.multiLine.scope | 38 ++++++++++ ...ument.formal.constructor.singleLine.scope} | 4 +- ...=> argument.formal.lambda.multiLine.scope} | 0 .../argument.formal.lambda.singleLine.scope | 41 +++++++++++ ... argument.formal.lambda.singleLine2.scope} | 0 .../argument.formal.lambda3.scope | 33 --------- .../argument.formal.method.multiLine.scope | 38 ++++++++++ ...> argument.formal.method.singleLine.scope} | 4 +- .../argument.formal.multiLine.scope | 36 ++++++++++ ...scope => argument.formal.singleLine.scope} | 2 +- ...rgument.actual.constructor.multiLine.scope | 37 ++++++++++ ...ument.actual.constructor.singleLine.scope} | 2 +- .../argument.actual.method.multiLine.scope | 37 ++++++++++ ...> argument.actual.method.singleLine.scope} | 2 +- .../php/argument.actual.multiLine.scope | 37 ++++++++++ ...scope => argument.actual.singleLine.scope} | 2 +- ...rgument.formal.constructor.multiLine.scope | 16 +++++ ...ument.formal.constructor.singleLine.scope} | 4 +- .../argument.formal.method.multiLine.scope | 39 ++++++++++ ...> argument.formal.method.singleLine.scope} | 2 +- .../php/argument.formal.multiLine.scope | 37 ++++++++++ ...scope => argument.formal.singleLine.scope} | 2 +- ...rgument.actual.constructor.multiLine.scope | 36 ++++++++++ ...ument.actual.constructor.singleLine.scope} | 2 +- .../argument.actual.method.multiLine.scope | 36 ++++++++++ ...> argument.actual.method.singleLine.scope} | 2 +- .../python/argument.actual.multiLine.scope | 36 ++++++++++ ...scope => argument.actual.singleLine.scope} | 2 +- ...cope => argument.actual.singleLine2.scope} | 0 ...cope => argument.actual.singleLine3.scope} | 0 ...cope => argument.actual.singleLine4.scope} | 0 ...gument.formal.constructor.multiLine.scope} | 0 ...ument.formal.constructor.singleLine.scope} | 0 ...> argument.formal.lambda.singleLine.scope} | 0 ...=> argument.formal.method.multiLine.scope} | 0 ...> argument.formal.method.singleLine.scope} | 0 ....scope => argument.formal.multiLine.scope} | 0 ...scope => argument.formal.singleLine.scope} | 0 ....scope => argument.actual.multiLine.scope} | 4 +- ...scope => argument.actual.singleLine.scope} | 0 ...cope => argument.actual.singleLine2.scope} | 0 ...cope => argument.actual.singleLine3.scope} | 0 ...cope => argument.actual.singleLine4.scope} | 0 .../scopes/r/argument.formal.multiLine.scope | 36 ++++++++++ ...scope => argument.formal.singleLine.scope} | 0 .../ruby/argument.actual.multiLine.scope | 36 ++++++++++ .../ruby/argument.actual.multiLine2.scope | 36 ++++++++++ ...scope => argument.actual.singleLine.scope} | 0 ...cope => argument.actual.singleLine2.scope} | 0 .../ruby/argument.formal.multiLine.scope | 36 ++++++++++ ...scope => argument.formal.singleLine.scope} | 0 .../scala/argument.actual.multiLine.scope | 36 ++++++++++ ...scope => argument.actual.singleLine.scope} | 0 .../scala/argument.formal.multiLine.scope | 36 ++++++++++ .../scala/argument.formal.multiLine2.scope | 36 ++++++++++ ...scope => argument.formal.singleLine.scope} | 0 ...cope => argument.formal.singleLine2.scope} | 0 .../scm/argument.actual.multiLine.scope | 40 +++++++++++ ...scope => argument.actual.singleLine.scope} | 0 .../scss/argument.actual.multiLine.scope | 36 ++++++++++ ...scope => argument.actual.singleLine.scope} | 0 ...scope => argument.actual.singleLine.scope} | 0 ...cope => argument.actual.singleLine2.scope} | 0 ...cope => argument.actual.singleLine3.scope} | 0 packages/common/src/scopeSupportFacets/c.ts | 21 ++++-- packages/common/src/scopeSupportFacets/cpp.ts | 12 ++-- .../common/src/scopeSupportFacets/csharp.ts | 21 ++++-- packages/common/src/scopeSupportFacets/css.ts | 21 ++++-- .../common/src/scopeSupportFacets/html.ts | 21 ++++-- .../common/src/scopeSupportFacets/java.ts | 21 ++++-- .../src/scopeSupportFacets/javascript.ts | 21 ++++-- .../common/src/scopeSupportFacets/json.ts | 21 ++++-- .../common/src/scopeSupportFacets/markdown.ts | 21 ++++-- packages/common/src/scopeSupportFacets/php.ts | 18 +++-- .../common/src/scopeSupportFacets/python.ts | 21 ++++-- packages/common/src/scopeSupportFacets/r.ts | 6 +- .../common/src/scopeSupportFacets/ruby.ts | 6 +- .../common/src/scopeSupportFacets/scala.ts | 6 +- packages/common/src/scopeSupportFacets/scm.ts | 21 ++++-- .../scopeSupportFacetInfos.ts | 71 +++++++++++++++---- .../scopeSupportFacets.types.ts | 27 ++++--- .../common/src/scopeSupportFacets/scss.ts | 2 + .../common/src/scopeSupportFacets/talon.ts | 21 ++++-- packages/common/src/scopeSupportFacets/xml.ts | 21 ++++-- .../common/src/scopeSupportFacets/yaml.ts | 21 ++++-- 135 files changed, 1515 insertions(+), 194 deletions(-) rename data/fixtures/scopes/c/{argument.actual.method2.scope => argument.actual.method.multiLine.scope} (100%) rename data/fixtures/scopes/c/{argument.actual.method.scope => argument.actual.method.singleLine.scope} (100%) rename data/fixtures/scopes/c/{argument.actual2.scope => argument.actual.multiLine.scope} (100%) rename data/fixtures/scopes/c/{argument.actual.scope => argument.actual.singleLine.scope} (100%) rename data/fixtures/scopes/c/{argument.formal2.scope => argument.formal.multiLine.scope} (100%) rename data/fixtures/scopes/c/{argument.formal.scope => argument.formal.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope rename data/fixtures/scopes/cpp/{argument.actual.constructor.scope => argument.actual.constructor.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope rename data/fixtures/scopes/cpp/{argument.formal.constructor.scope => argument.formal.constructor.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope rename data/fixtures/scopes/cpp/{argument.formal.lambda.scope => argument.formal.lambda.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope rename data/fixtures/scopes/cpp/{argument.formal.method.scope => argument.formal.method.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argument.actual.constructor2.scope => argument.actual.constructor.multiLine.scope} (100%) rename data/fixtures/scopes/csharp/{argument.actual.constructor.scope => argument.actual.constructor.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argument.actual.method2.scope => argument.actual.method.multiLine.scope} (100%) rename data/fixtures/scopes/csharp/{argument.actual.method.scope => argument.actual.method.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/csharp/argument.actual.multiLine.scope rename data/fixtures/scopes/csharp/{argument.actual.scope => argument.actual.singleLine.scope} (96%) rename data/fixtures/scopes/csharp/{argument.formal.constructor2.scope => argument.formal.constructor.multiLine.scope} (100%) rename data/fixtures/scopes/csharp/{argument.formal.constructor.scope => argument.formal.constructor.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope rename data/fixtures/scopes/csharp/{argument.formal.lambda.scope => argument.formal.lambda.singleLine.scope} (100%) rename data/fixtures/scopes/csharp/{argument.formal.method2.scope => argument.formal.method.multiLine.scope} (100%) rename data/fixtures/scopes/csharp/{argument.formal.method.scope => argument.formal.method.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/csharp/argument.formal.multiLine.scope rename data/fixtures/scopes/csharp/{argument.formal.scope => argument.formal.singleLine.scope} (100%) rename data/fixtures/scopes/css/{argument.actual.scope => argument.actual.singleLine.scope} (100%) rename data/fixtures/scopes/css/{argument.actual2.scope => argument.actual.singleLine2.scope} (100%) rename data/fixtures/scopes/css/{argument.actual3.scope => argument.actual.singleLine3.scope} (100%) rename data/fixtures/scopes/css/{argument.actual4.scope => argument.actual.singleLine4.scope} (100%) create mode 100644 data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope rename data/fixtures/scopes/java/{argument.actual.constructor.scope => argument.actual.constructor.singleLine.scope} (96%) create mode 100644 data/fixtures/scopes/java/argument.actual.method.multiLine.scope rename data/fixtures/scopes/java/{argument.actual.method.scope => argument.actual.method.singleLine.scope} (96%) rename data/fixtures/scopes/java/{argument.actual2.scope => argument.actual.multiLine.scope} (96%) rename data/fixtures/scopes/java/{argument.actual.scope => argument.actual.singleLine.scope} (96%) rename data/fixtures/scopes/java/{argument.formal.constructor2.scope => argument.formal.constructor.multiLine.scope} (100%) rename data/fixtures/scopes/java/{argument.formal.constructor.scope => argument.formal.constructor.singleLine.scope} (100%) rename data/fixtures/scopes/java/{argument.formal.lambda2.scope => argument.formal.lambda.multiLine.scope} (100%) rename data/fixtures/scopes/java/{argument.formal.lambda.scope => argument.formal.lambda.singleLine.scope} (100%) rename data/fixtures/scopes/java/{argument.formal.method2.scope => argument.formal.method.multiLine.scope} (100%) rename data/fixtures/scopes/java/{argument.formal.method.scope => argument.formal.method.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope rename data/fixtures/scopes/javascript.core/{argument.actual.constructor.scope => argument.actual.constructor.singleLine.scope} (96%) create mode 100644 data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope rename data/fixtures/scopes/javascript.core/{argument.actual.method.scope => argument.actual.method.singleLine.scope} (96%) create mode 100644 data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope rename data/fixtures/scopes/javascript.core/{argument.actual.scope => argument.actual.singleLine.scope} (85%) create mode 100644 data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope rename data/fixtures/scopes/javascript.core/{argument.formal.constructor.scope => argument.formal.constructor.singleLine.scope} (93%) rename data/fixtures/scopes/javascript.core/{argument.formal.lambda.scope => argument.formal.lambda.multiLine.scope} (100%) create mode 100644 data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope rename data/fixtures/scopes/javascript.core/{argument.formal.lambda2.scope => argument.formal.lambda.singleLine2.scope} (100%) delete mode 100644 data/fixtures/scopes/javascript.core/argument.formal.lambda3.scope create mode 100644 data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope rename data/fixtures/scopes/javascript.core/{argument.formal.method.scope => argument.formal.method.singleLine.scope} (93%) create mode 100644 data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope rename data/fixtures/scopes/javascript.core/{argument.formal.scope => argument.formal.singleLine.scope} (95%) create mode 100644 data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope rename data/fixtures/scopes/php/{argument.actual.constructor.scope => argument.actual.constructor.singleLine.scope} (96%) create mode 100644 data/fixtures/scopes/php/argument.actual.method.multiLine.scope rename data/fixtures/scopes/php/{argument.actual.method.scope => argument.actual.method.singleLine.scope} (96%) create mode 100644 data/fixtures/scopes/php/argument.actual.multiLine.scope rename data/fixtures/scopes/php/{argument.actual.scope => argument.actual.singleLine.scope} (96%) create mode 100644 data/fixtures/scopes/php/argument.formal.constructor.multiLine.scope rename data/fixtures/scopes/php/{argument.formal.constructor.scope => argument.formal.constructor.singleLine.scope} (71%) create mode 100644 data/fixtures/scopes/php/argument.formal.method.multiLine.scope rename data/fixtures/scopes/php/{argument.formal.method.scope => argument.formal.method.singleLine.scope} (94%) create mode 100644 data/fixtures/scopes/php/argument.formal.multiLine.scope rename data/fixtures/scopes/php/{argument.formal.scope => argument.formal.singleLine.scope} (94%) create mode 100644 data/fixtures/scopes/python/argument.actual.constructor.multiLine.scope rename data/fixtures/scopes/python/{argument.actual.constructor.scope => argument.actual.constructor.singleLine.scope} (97%) create mode 100644 data/fixtures/scopes/python/argument.actual.method.multiLine.scope rename data/fixtures/scopes/python/{argument.actual.method.scope => argument.actual.method.singleLine.scope} (96%) create mode 100644 data/fixtures/scopes/python/argument.actual.multiLine.scope rename data/fixtures/scopes/python/{argument.actual.scope => argument.actual.singleLine.scope} (97%) rename data/fixtures/scopes/python/{argument.actual2.scope => argument.actual.singleLine2.scope} (100%) rename data/fixtures/scopes/python/{argument.actual3.scope => argument.actual.singleLine3.scope} (100%) rename data/fixtures/scopes/python/{argument.actual4.scope => argument.actual.singleLine4.scope} (100%) rename data/fixtures/scopes/python/{argument.formal.constructor2.scope => argument.formal.constructor.multiLine.scope} (100%) rename data/fixtures/scopes/python/{argument.formal.constructor.scope => argument.formal.constructor.singleLine.scope} (100%) rename data/fixtures/scopes/python/{argument.formal.lambda.scope => argument.formal.lambda.singleLine.scope} (100%) rename data/fixtures/scopes/python/{argument.formal.method2.scope => argument.formal.method.multiLine.scope} (100%) rename data/fixtures/scopes/python/{argument.formal.method.scope => argument.formal.method.singleLine.scope} (100%) rename data/fixtures/scopes/python/{argument.formal2.scope => argument.formal.multiLine.scope} (100%) rename data/fixtures/scopes/python/{argument.formal.scope => argument.formal.singleLine.scope} (100%) rename data/fixtures/scopes/r/{argument.actual5.scope => argument.actual.multiLine.scope} (96%) rename data/fixtures/scopes/r/{argument.actual.scope => argument.actual.singleLine.scope} (100%) rename data/fixtures/scopes/r/{argument.actual2.scope => argument.actual.singleLine2.scope} (100%) rename data/fixtures/scopes/r/{argument.actual3.scope => argument.actual.singleLine3.scope} (100%) rename data/fixtures/scopes/r/{argument.actual4.scope => argument.actual.singleLine4.scope} (100%) create mode 100644 data/fixtures/scopes/r/argument.formal.multiLine.scope rename data/fixtures/scopes/r/{argument.formal.scope => argument.formal.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/ruby/argument.actual.multiLine.scope create mode 100644 data/fixtures/scopes/ruby/argument.actual.multiLine2.scope rename data/fixtures/scopes/ruby/{argument.actual.scope => argument.actual.singleLine.scope} (100%) rename data/fixtures/scopes/ruby/{argument.actual2.scope => argument.actual.singleLine2.scope} (100%) create mode 100644 data/fixtures/scopes/ruby/argument.formal.multiLine.scope rename data/fixtures/scopes/ruby/{argument.formal.scope => argument.formal.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/scala/argument.actual.multiLine.scope rename data/fixtures/scopes/scala/{argument.actual.scope => argument.actual.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/scala/argument.formal.multiLine.scope create mode 100644 data/fixtures/scopes/scala/argument.formal.multiLine2.scope rename data/fixtures/scopes/scala/{argument.formal.scope => argument.formal.singleLine.scope} (100%) rename data/fixtures/scopes/scala/{argument.formal2.scope => argument.formal.singleLine2.scope} (100%) create mode 100644 data/fixtures/scopes/scm/argument.actual.multiLine.scope rename data/fixtures/scopes/scm/{argument.actual.scope => argument.actual.singleLine.scope} (100%) create mode 100644 data/fixtures/scopes/scss/argument.actual.multiLine.scope rename data/fixtures/scopes/scss/{argument.actual.scope => argument.actual.singleLine.scope} (100%) rename data/fixtures/scopes/talon/{argument.actual.scope => argument.actual.singleLine.scope} (100%) rename data/fixtures/scopes/talon/{argument.actual2.scope => argument.actual.singleLine2.scope} (100%) rename data/fixtures/scopes/talon/{argument.actual3.scope => argument.actual.singleLine3.scope} (100%) diff --git a/data/fixtures/scopes/c/argument.actual.method2.scope b/data/fixtures/scopes/c/argument.actual.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/c/argument.actual.method2.scope rename to data/fixtures/scopes/c/argument.actual.method.multiLine.scope diff --git a/data/fixtures/scopes/c/argument.actual.method.scope b/data/fixtures/scopes/c/argument.actual.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/c/argument.actual.method.scope rename to data/fixtures/scopes/c/argument.actual.method.singleLine.scope diff --git a/data/fixtures/scopes/c/argument.actual2.scope b/data/fixtures/scopes/c/argument.actual.multiLine.scope similarity index 100% rename from data/fixtures/scopes/c/argument.actual2.scope rename to data/fixtures/scopes/c/argument.actual.multiLine.scope diff --git a/data/fixtures/scopes/c/argument.actual.scope b/data/fixtures/scopes/c/argument.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/c/argument.actual.scope rename to data/fixtures/scopes/c/argument.actual.singleLine.scope diff --git a/data/fixtures/scopes/c/argument.formal2.scope b/data/fixtures/scopes/c/argument.formal.multiLine.scope similarity index 100% rename from data/fixtures/scopes/c/argument.formal2.scope rename to data/fixtures/scopes/c/argument.formal.multiLine.scope diff --git a/data/fixtures/scopes/c/argument.formal.scope b/data/fixtures/scopes/c/argument.formal.singleLine.scope similarity index 100% rename from data/fixtures/scopes/c/argument.formal.scope rename to data/fixtures/scopes/c/argument.formal.singleLine.scope diff --git a/data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope new file mode 100644 index 0000000000..3bacb191b7 --- /dev/null +++ b/data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope @@ -0,0 +1,36 @@ +new Foo( + aaa, + bbb +); +--- + +[#1 Content] = +[#1 Domain] = 0:8-0:11 + >---< +0| new Foo(aaa, bbb); + +[#1 Removal] = 0:8-0:13 + >-----< +0| new Foo(aaa, bbb); + +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| new Foo(aaa, bbb); + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:13-0:16 + >---< +0| new Foo(aaa, bbb); + +[#2 Removal] = 0:11-0:16 + >-----< +0| new Foo(aaa, bbb); + +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| new Foo(aaa, bbb); + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/cpp/argument.actual.constructor.scope b/data/fixtures/scopes/cpp/argument.actual.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/cpp/argument.actual.constructor.scope rename to data/fixtures/scopes/cpp/argument.actual.constructor.singleLine.scope diff --git a/data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope new file mode 100644 index 0000000000..8889594549 --- /dev/null +++ b/data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope @@ -0,0 +1,38 @@ +class Foo { + Foo( + int aaa, + int bbb + ) {} +} +--- + +[#1 Content] = +[#1 Domain] = 1:8-1:15 + >-------< +1| Foo(int aaa, int bbb) {} + +[#1 Removal] = 1:8-1:17 + >---------< +1| Foo(int aaa, int bbb) {} + +[#1 Trailing delimiter] = 1:15-1:17 + >--< +1| Foo(int aaa, int bbb) {} + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 1:17-1:24 + >-------< +1| Foo(int aaa, int bbb) {} + +[#2 Removal] = 1:15-1:24 + >---------< +1| Foo(int aaa, int bbb) {} + +[#2 Leading delimiter] = 1:15-1:17 + >--< +1| Foo(int aaa, int bbb) {} + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/cpp/argument.formal.constructor.scope b/data/fixtures/scopes/cpp/argument.formal.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/cpp/argument.formal.constructor.scope rename to data/fixtures/scopes/cpp/argument.formal.constructor.singleLine.scope diff --git a/data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope new file mode 100644 index 0000000000..9d16d085bc --- /dev/null +++ b/data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope @@ -0,0 +1,36 @@ +[]( + int aaa, + int bbb +) {} +--- + +[#1 Content] = +[#1 Domain] = 0:3-0:10 + >-------< +0| [](int aaa, int bbb) {} + +[#1 Removal] = 0:3-0:12 + >---------< +0| [](int aaa, int bbb) {} + +[#1 Trailing delimiter] = 0:10-0:12 + >--< +0| [](int aaa, int bbb) {} + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:12-0:19 + >-------< +0| [](int aaa, int bbb) {} + +[#2 Removal] = 0:10-0:19 + >---------< +0| [](int aaa, int bbb) {} + +[#2 Leading delimiter] = 0:10-0:12 + >--< +0| [](int aaa, int bbb) {} + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/cpp/argument.formal.lambda.scope b/data/fixtures/scopes/cpp/argument.formal.lambda.singleLine.scope similarity index 100% rename from data/fixtures/scopes/cpp/argument.formal.lambda.scope rename to data/fixtures/scopes/cpp/argument.formal.lambda.singleLine.scope diff --git a/data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope b/data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope new file mode 100644 index 0000000000..2fc1a156a1 --- /dev/null +++ b/data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope @@ -0,0 +1,38 @@ +class Foo { + void bar( + int aaa, + int bbb + ) {} +} +--- + +[#1 Content] = +[#1 Domain] = 1:13-1:20 + >-------< +1| void bar(int aaa, int bbb) {} + +[#1 Removal] = 1:13-1:22 + >---------< +1| void bar(int aaa, int bbb) {} + +[#1 Trailing delimiter] = 1:20-1:22 + >--< +1| void bar(int aaa, int bbb) {} + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 1:22-1:29 + >-------< +1| void bar(int aaa, int bbb) {} + +[#2 Removal] = 1:20-1:29 + >---------< +1| void bar(int aaa, int bbb) {} + +[#2 Leading delimiter] = 1:20-1:22 + >--< +1| void bar(int aaa, int bbb) {} + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/cpp/argument.formal.method.scope b/data/fixtures/scopes/cpp/argument.formal.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/cpp/argument.formal.method.scope rename to data/fixtures/scopes/cpp/argument.formal.method.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argument.actual.constructor2.scope b/data/fixtures/scopes/csharp/argument.actual.constructor.multiLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.actual.constructor2.scope rename to data/fixtures/scopes/csharp/argument.actual.constructor.multiLine.scope diff --git a/data/fixtures/scopes/csharp/argument.actual.constructor.scope b/data/fixtures/scopes/csharp/argument.actual.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.actual.constructor.scope rename to data/fixtures/scopes/csharp/argument.actual.constructor.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argument.actual.method2.scope b/data/fixtures/scopes/csharp/argument.actual.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.actual.method2.scope rename to data/fixtures/scopes/csharp/argument.actual.method.multiLine.scope diff --git a/data/fixtures/scopes/csharp/argument.actual.method.scope b/data/fixtures/scopes/csharp/argument.actual.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.actual.method.scope rename to data/fixtures/scopes/csharp/argument.actual.method.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argument.actual.multiLine.scope b/data/fixtures/scopes/csharp/argument.actual.multiLine.scope new file mode 100644 index 0000000000..4b6f2a2e48 --- /dev/null +++ b/data/fixtures/scopes/csharp/argument.actual.multiLine.scope @@ -0,0 +1,36 @@ +Foo( + aaa, + bbb +); +--- + +[#1 Content] = +[#1 Domain] = 0:4-0:5 + >-< +0| Foo(5, "bar"); + +[#1 Removal] = 0:4-0:7 + >---< +0| Foo(5, "bar"); + +[#1 Trailing delimiter] = 0:5-0:7 + >--< +0| Foo(5, "bar"); + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:7-0:12 + >-----< +0| Foo(5, "bar"); + +[#2 Removal] = 0:5-0:12 + >-------< +0| Foo(5, "bar"); + +[#2 Leading delimiter] = 0:5-0:7 + >--< +0| Foo(5, "bar"); + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argument.actual.scope b/data/fixtures/scopes/csharp/argument.actual.singleLine.scope similarity index 96% rename from data/fixtures/scopes/csharp/argument.actual.scope rename to data/fixtures/scopes/csharp/argument.actual.singleLine.scope index d479831819..5006d55eba 100644 --- a/data/fixtures/scopes/csharp/argument.actual.scope +++ b/data/fixtures/scopes/csharp/argument.actual.singleLine.scope @@ -1,4 +1,4 @@ -Foo(5, "bar"); +Foo(aaa, bbb); --- [#1 Content] = diff --git a/data/fixtures/scopes/csharp/argument.formal.constructor2.scope b/data/fixtures/scopes/csharp/argument.formal.constructor.multiLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.formal.constructor2.scope rename to data/fixtures/scopes/csharp/argument.formal.constructor.multiLine.scope diff --git a/data/fixtures/scopes/csharp/argument.formal.constructor.scope b/data/fixtures/scopes/csharp/argument.formal.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.formal.constructor.scope rename to data/fixtures/scopes/csharp/argument.formal.constructor.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope new file mode 100644 index 0000000000..3cc10d2760 --- /dev/null +++ b/data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope @@ -0,0 +1,36 @@ +( + a, + b +) => {} +--- + +[#1 Content] = +[#1 Domain] = 0:1-0:2 + >-< +0| (a, b) => {} + +[#1 Removal] = 0:1-0:4 + >---< +0| (a, b) => {} + +[#1 Trailing delimiter] = 0:2-0:4 + >--< +0| (a, b) => {} + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:4-0:5 + >-< +0| (a, b) => {} + +[#2 Removal] = 0:2-0:5 + >---< +0| (a, b) => {} + +[#2 Leading delimiter] = 0:2-0:4 + >--< +0| (a, b) => {} + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argument.formal.lambda.scope b/data/fixtures/scopes/csharp/argument.formal.lambda.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.formal.lambda.scope rename to data/fixtures/scopes/csharp/argument.formal.lambda.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argument.formal.method2.scope b/data/fixtures/scopes/csharp/argument.formal.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.formal.method2.scope rename to data/fixtures/scopes/csharp/argument.formal.method.multiLine.scope diff --git a/data/fixtures/scopes/csharp/argument.formal.method.scope b/data/fixtures/scopes/csharp/argument.formal.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.formal.method.scope rename to data/fixtures/scopes/csharp/argument.formal.method.singleLine.scope diff --git a/data/fixtures/scopes/csharp/argument.formal.multiLine.scope b/data/fixtures/scopes/csharp/argument.formal.multiLine.scope new file mode 100644 index 0000000000..ae7def66a0 --- /dev/null +++ b/data/fixtures/scopes/csharp/argument.formal.multiLine.scope @@ -0,0 +1,5 @@ +void Foo( + String name, + int value +) {} +--- diff --git a/data/fixtures/scopes/csharp/argument.formal.scope b/data/fixtures/scopes/csharp/argument.formal.singleLine.scope similarity index 100% rename from data/fixtures/scopes/csharp/argument.formal.scope rename to data/fixtures/scopes/csharp/argument.formal.singleLine.scope diff --git a/data/fixtures/scopes/css/argument.actual.scope b/data/fixtures/scopes/css/argument.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/css/argument.actual.scope rename to data/fixtures/scopes/css/argument.actual.singleLine.scope diff --git a/data/fixtures/scopes/css/argument.actual2.scope b/data/fixtures/scopes/css/argument.actual.singleLine2.scope similarity index 100% rename from data/fixtures/scopes/css/argument.actual2.scope rename to data/fixtures/scopes/css/argument.actual.singleLine2.scope diff --git a/data/fixtures/scopes/css/argument.actual3.scope b/data/fixtures/scopes/css/argument.actual.singleLine3.scope similarity index 100% rename from data/fixtures/scopes/css/argument.actual3.scope rename to data/fixtures/scopes/css/argument.actual.singleLine3.scope diff --git a/data/fixtures/scopes/css/argument.actual4.scope b/data/fixtures/scopes/css/argument.actual.singleLine4.scope similarity index 100% rename from data/fixtures/scopes/css/argument.actual4.scope rename to data/fixtures/scopes/css/argument.actual.singleLine4.scope diff --git a/data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope new file mode 100644 index 0000000000..2656634bad --- /dev/null +++ b/data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope @@ -0,0 +1,36 @@ +new Foo( + aaa, + bbb +); +--- + +[#1 Content] = +[#1 Domain] = 0:8-0:11 + >---< +0| new Foo(123, 456); + +[#1 Removal] = 0:8-0:13 + >-----< +0| new Foo(123, 456); + +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| new Foo(123, 456); + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:13-0:16 + >---< +0| new Foo(123, 456); + +[#2 Removal] = 0:11-0:16 + >-----< +0| new Foo(123, 456); + +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| new Foo(123, 456); + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argument.actual.constructor.scope b/data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope similarity index 96% rename from data/fixtures/scopes/java/argument.actual.constructor.scope rename to data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope index 7f54786c3b..6200d9ea69 100644 --- a/data/fixtures/scopes/java/argument.actual.constructor.scope +++ b/data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope @@ -1,4 +1,4 @@ -new Foo(123, 456); +new Foo(aaa, bbb); --- [#1 Content] = diff --git a/data/fixtures/scopes/java/argument.actual.method.multiLine.scope b/data/fixtures/scopes/java/argument.actual.method.multiLine.scope new file mode 100644 index 0000000000..c243f844c4 --- /dev/null +++ b/data/fixtures/scopes/java/argument.actual.method.multiLine.scope @@ -0,0 +1,36 @@ +foo.bar( + aaa, + bbb +); +--- + +[#1 Content] = +[#1 Domain] = 0:8-0:11 + >---< +0| foo.bar(123, 456); + +[#1 Removal] = 0:8-0:13 + >-----< +0| foo.bar(123, 456); + +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| foo.bar(123, 456); + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:13-0:16 + >---< +0| foo.bar(123, 456); + +[#2 Removal] = 0:11-0:16 + >-----< +0| foo.bar(123, 456); + +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| foo.bar(123, 456); + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argument.actual.method.scope b/data/fixtures/scopes/java/argument.actual.method.singleLine.scope similarity index 96% rename from data/fixtures/scopes/java/argument.actual.method.scope rename to data/fixtures/scopes/java/argument.actual.method.singleLine.scope index 6501846622..614e2ce9a9 100644 --- a/data/fixtures/scopes/java/argument.actual.method.scope +++ b/data/fixtures/scopes/java/argument.actual.method.singleLine.scope @@ -1,4 +1,4 @@ -foo.bar(123, 456); +foo.bar(aaa, bbb); --- [#1 Content] = diff --git a/data/fixtures/scopes/java/argument.actual2.scope b/data/fixtures/scopes/java/argument.actual.multiLine.scope similarity index 96% rename from data/fixtures/scopes/java/argument.actual2.scope rename to data/fixtures/scopes/java/argument.actual.multiLine.scope index 06f23abf58..fbfc6dc54e 100644 --- a/data/fixtures/scopes/java/argument.actual2.scope +++ b/data/fixtures/scopes/java/argument.actual.multiLine.scope @@ -1,6 +1,6 @@ myFunk( - 5, - "hello" + aaa, + bbb ); --- diff --git a/data/fixtures/scopes/java/argument.actual.scope b/data/fixtures/scopes/java/argument.actual.singleLine.scope similarity index 96% rename from data/fixtures/scopes/java/argument.actual.scope rename to data/fixtures/scopes/java/argument.actual.singleLine.scope index 6aaf843db2..5ff3cb2b44 100644 --- a/data/fixtures/scopes/java/argument.actual.scope +++ b/data/fixtures/scopes/java/argument.actual.singleLine.scope @@ -1,4 +1,4 @@ -myFunk(5, "hello"); +myFunk(aaa, bbb); --- [#1 Content] = diff --git a/data/fixtures/scopes/java/argument.formal.constructor2.scope b/data/fixtures/scopes/java/argument.formal.constructor.multiLine.scope similarity index 100% rename from data/fixtures/scopes/java/argument.formal.constructor2.scope rename to data/fixtures/scopes/java/argument.formal.constructor.multiLine.scope diff --git a/data/fixtures/scopes/java/argument.formal.constructor.scope b/data/fixtures/scopes/java/argument.formal.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/java/argument.formal.constructor.scope rename to data/fixtures/scopes/java/argument.formal.constructor.singleLine.scope diff --git a/data/fixtures/scopes/java/argument.formal.lambda2.scope b/data/fixtures/scopes/java/argument.formal.lambda.multiLine.scope similarity index 100% rename from data/fixtures/scopes/java/argument.formal.lambda2.scope rename to data/fixtures/scopes/java/argument.formal.lambda.multiLine.scope diff --git a/data/fixtures/scopes/java/argument.formal.lambda.scope b/data/fixtures/scopes/java/argument.formal.lambda.singleLine.scope similarity index 100% rename from data/fixtures/scopes/java/argument.formal.lambda.scope rename to data/fixtures/scopes/java/argument.formal.lambda.singleLine.scope diff --git a/data/fixtures/scopes/java/argument.formal.method2.scope b/data/fixtures/scopes/java/argument.formal.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/java/argument.formal.method2.scope rename to data/fixtures/scopes/java/argument.formal.method.multiLine.scope diff --git a/data/fixtures/scopes/java/argument.formal.method.scope b/data/fixtures/scopes/java/argument.formal.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/java/argument.formal.method.scope rename to data/fixtures/scopes/java/argument.formal.method.singleLine.scope diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope new file mode 100644 index 0000000000..b936fd5d42 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope @@ -0,0 +1,36 @@ +new Foo( + aaa, + bbb +) +--- + +[#1 Content] = +[#1 Domain] = 0:8-0:11 + >---< +0| new Aaa(bbb, ccc) + +[#1 Removal] = 0:8-0:13 + >-----< +0| new Aaa(bbb, ccc) + +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| new Aaa(bbb, ccc) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:13-0:16 + >---< +0| new Aaa(bbb, ccc) + +[#2 Removal] = 0:11-0:16 + >-----< +0| new Aaa(bbb, ccc) + +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| new Aaa(bbb, ccc) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.scope b/data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope similarity index 96% rename from data/fixtures/scopes/javascript.core/argument.actual.constructor.scope rename to data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope index 26a4ee06ce..cb5ea1df83 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.constructor.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope @@ -1,4 +1,4 @@ -new Aaa(bbb, ccc) +new Foo(aaa, bbb) --- [#1 Content] = diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope new file mode 100644 index 0000000000..35949dabde --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope @@ -0,0 +1,36 @@ +foo.bar( + aaa, + bbb +); +--- + +[#1 Content] = +[#1 Domain] = 0:8-0:11 + >---< +0| aaa.bbb(ccc, ddd); + +[#1 Removal] = 0:8-0:13 + >-----< +0| aaa.bbb(ccc, ddd); + +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| aaa.bbb(ccc, ddd); + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:13-0:16 + >---< +0| aaa.bbb(ccc, ddd); + +[#2 Removal] = 0:11-0:16 + >-----< +0| aaa.bbb(ccc, ddd); + +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| aaa.bbb(ccc, ddd); + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.scope b/data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope similarity index 96% rename from data/fixtures/scopes/javascript.core/argument.actual.method.scope rename to data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope index 311d5a07a8..317ea13373 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.method.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope @@ -1,4 +1,4 @@ -aaa.bbb(ccc, ddd); +foo.bar(aaa, bbb); --- [#1 Content] = diff --git a/data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope new file mode 100644 index 0000000000..5309b01f5a --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope @@ -0,0 +1,36 @@ +foo( + aaa, + bbb +); +--- + +[#1 Content] = +[#1 Domain] = 0:4-0:7 + >---< +0| (bbb, ccc); + +[#1 Removal] = 0:4-0:9 + >-----< +0| (bbb, ccc); + +[#1 Trailing delimiter] = 0:7-0:9 + >--< +0| (bbb, ccc); + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:9-0:12 + >---< +0| aaa(bbb, ccc); + +[#2 Removal] = 0:7-0:12 + >-----< +0| aaa(bbb, ccc); + +[#2 Leading delimiter] = 0:7-0:9 + >--< +0| aaa(bbb, ccc); + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.actual.scope b/data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope similarity index 85% rename from data/fixtures/scopes/javascript.core/argument.actual.scope rename to data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope index 6ca533c744..7d0a03e8c9 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope @@ -1,18 +1,18 @@ -aaa(bbb, ccc); +foo(aaa, bbb); --- [#1 Content] = [#1 Domain] = 0:4-0:7 >---< -0| aaa(bbb, ccc); +0| (bbb, ccc); [#1 Removal] = 0:4-0:9 >-----< -0| aaa(bbb, ccc); +0| (bbb, ccc); [#1 Trailing delimiter] = 0:7-0:9 >--< -0| aaa(bbb, ccc); +0| (bbb, ccc); [#1 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope new file mode 100644 index 0000000000..abd14b5f13 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope @@ -0,0 +1,38 @@ +class Foo { + constructor( + aaa, + bbb + ) {} +} +--- + +[#1 Content] = +[#1 Domain] = 1:14-1:17 + >---< +1| constructor(aaa, bbb) { } + +[#1 Removal] = 1:14-1:19 + >-----< +1| constructor(aaa, bbb) { } + +[#1 Trailing delimiter] = 1:17-1:19 + >--< +1| constructor(aaa, bbb) { } + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 1:19-1:22 + >---< +1| constructor(aaa, bbb) { } + +[#2 Removal] = 1:17-1:22 + >-----< +1| constructor(aaa, bbb) { } + +[#2 Leading delimiter] = 1:17-1:19 + >--< +1| constructor(aaa, bbb) { } + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.constructor.scope b/data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope similarity index 93% rename from data/fixtures/scopes/javascript.core/argument.formal.constructor.scope rename to data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope index a24c2e7c4a..eb4ee3b289 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.constructor.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope @@ -1,5 +1,5 @@ -class MyClass { - constructor(aaa, bbb) { } +class Foo { + constructor(aaa, bbb) {} } --- diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda.scope b/data/fixtures/scopes/javascript.core/argument.formal.lambda.multiLine.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argument.formal.lambda.scope rename to data/fixtures/scopes/javascript.core/argument.formal.lambda.multiLine.scope diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope new file mode 100644 index 0000000000..455f74ad2c --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope @@ -0,0 +1,41 @@ +(aaa, bbb) => { } +--- + +[#1 Content] = +[#1 Domain] = 1:2-1:5 + >---< +1| aaa, + +[#1 Removal] = 1:2-2:2 + >---- +1| aaa, +2| bbb + --< + +[#1 Trailing delimiter] = 1:5-2:2 + >- +1| aaa, +2| bbb + --< + +[#1 Insertion delimiter] = ",\n" + + +[#2 Content] = +[#2 Domain] = 2:2-2:5 + >---< +2| bbb + +[#2 Removal] = 1:5-2:5 + >- +1| aaa, +2| bbb + -----< + +[#2 Leading delimiter] = 1:5-2:2 + >- +1| aaa, +2| bbb + --< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda2.scope b/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine2.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/argument.formal.lambda2.scope rename to data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine2.scope diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda3.scope b/data/fixtures/scopes/javascript.core/argument.formal.lambda3.scope deleted file mode 100644 index 1fdc4be718..0000000000 --- a/data/fixtures/scopes/javascript.core/argument.formal.lambda3.scope +++ /dev/null @@ -1,33 +0,0 @@ -function (aaa, bbb) { } ---- - -[#1 Content] = -[#1 Domain] = 0:10-0:13 - >---< -0| function (aaa, bbb) { } - -[#1 Removal] = 0:10-0:15 - >-----< -0| function (aaa, bbb) { } - -[#1 Trailing delimiter] = 0:13-0:15 - >--< -0| function (aaa, bbb) { } - -[#1 Insertion delimiter] = ", " - - -[#2 Content] = -[#2 Domain] = 0:15-0:18 - >---< -0| function (aaa, bbb) { } - -[#2 Removal] = 0:13-0:18 - >-----< -0| function (aaa, bbb) { } - -[#2 Leading delimiter] = 0:13-0:15 - >--< -0| function (aaa, bbb) { } - -[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope new file mode 100644 index 0000000000..5efbb1a40a --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope @@ -0,0 +1,38 @@ +class Foo { + bar( + aaa, + bbb + ) {} +} +--- + +[#1 Content] = +[#1 Domain] = 1:9-1:12 + >---< +1| myFunk(aaa, bbb) { } + +[#1 Removal] = 1:9-1:14 + >-----< +1| myFunk(aaa, bbb) { } + +[#1 Trailing delimiter] = 1:12-1:14 + >--< +1| myFunk(aaa, bbb) { } + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 1:14-1:17 + >---< +1| myFunk(aaa, bbb) { } + +[#2 Removal] = 1:12-1:17 + >-----< +1| myFunk(aaa, bbb) { } + +[#2 Leading delimiter] = 1:12-1:14 + >--< +1| myFunk(aaa, bbb) { } + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.method.scope b/data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope similarity index 93% rename from data/fixtures/scopes/javascript.core/argument.formal.method.scope rename to data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope index 31d3832e6c..212c19ab05 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.method.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope @@ -1,5 +1,5 @@ -class MyClass { - myFunk(aaa, bbb) { } +class Foo { + bar(aaa, bbb) {} } --- diff --git a/data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope new file mode 100644 index 0000000000..3b217eee20 --- /dev/null +++ b/data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope @@ -0,0 +1,36 @@ +function foo( + aaa, + bbb +) {} +--- + +[#1 Content] = +[#1 Domain] = 0:16-0:19 + >---< +0| function myFunk(aaa, bbb) { } + +[#1 Removal] = 0:16-0:21 + >-----< +0| function myFunk(aaa, bbb) { } + +[#1 Trailing delimiter] = 0:19-0:21 + >--< +0| function myFunk(aaa, bbb) { } + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:21-0:24 + >---< +0| function myFunk(aaa, bbb) { } + +[#2 Removal] = 0:19-0:24 + >-----< +0| function myFunk(aaa, bbb) { } + +[#2 Leading delimiter] = 0:19-0:21 + >--< +0| function myFunk(aaa, bbb) { } + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.scope b/data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope similarity index 95% rename from data/fixtures/scopes/javascript.core/argument.formal.scope rename to data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope index 5c391af1fb..4f71414da1 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope @@ -1,4 +1,4 @@ -function myFunk(aaa, bbb) { } +function foo(aaa, bbb) {} --- [#1 Content] = diff --git a/data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope new file mode 100644 index 0000000000..00f21eb728 --- /dev/null +++ b/data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope @@ -0,0 +1,37 @@ +-< +1| new MyClass(2, "foo") + +[#1 Removal] = 1:12-1:15 + >---< +1| new MyClass(2, "foo") + +[#1 Trailing delimiter] = 1:13-1:15 + >--< +1| new MyClass(2, "foo") + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 1:15-1:20 + >-----< +1| new MyClass(2, "foo") + +[#2 Removal] = 1:13-1:20 + >-------< +1| new MyClass(2, "foo") + +[#2 Leading delimiter] = 1:13-1:15 + >--< +1| new MyClass(2, "foo") + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.actual.constructor.scope b/data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope similarity index 96% rename from data/fixtures/scopes/php/argument.actual.constructor.scope rename to data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope index 5d422359c7..ad87e4f7c1 100644 --- a/data/fixtures/scopes/php/argument.actual.constructor.scope +++ b/data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope @@ -1,5 +1,5 @@ -< +1| obj.myFunc(2, "foo") + +[#1 Removal] = 1:11-1:14 + >---< +1| obj.myFunc(2, "foo") + +[#1 Trailing delimiter] = 1:12-1:14 + >--< +1| obj.myFunc(2, "foo") + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 1:14-1:19 + >-----< +1| obj.myFunc(2, "foo") + +[#2 Removal] = 1:12-1:19 + >-------< +1| obj.myFunc(2, "foo") + +[#2 Leading delimiter] = 1:12-1:14 + >--< +1| obj.myFunc(2, "foo") + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.actual.method.scope b/data/fixtures/scopes/php/argument.actual.method.singleLine.scope similarity index 96% rename from data/fixtures/scopes/php/argument.actual.method.scope rename to data/fixtures/scopes/php/argument.actual.method.singleLine.scope index d76db6ea88..6705256d79 100644 --- a/data/fixtures/scopes/php/argument.actual.method.scope +++ b/data/fixtures/scopes/php/argument.actual.method.singleLine.scope @@ -1,5 +1,5 @@ -< +1| myFunc(2, "foo") + +[#1 Removal] = 1:7-1:10 + >---< +1| myFunc(2, "foo") + +[#1 Trailing delimiter] = 1:8-1:10 + >--< +1| myFunc(2, "foo") + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 1:10-1:15 + >-----< +1| myFunc(2, "foo") + +[#2 Removal] = 1:8-1:15 + >-------< +1| myFunc(2, "foo") + +[#2 Leading delimiter] = 1:8-1:10 + >--< +1| myFunc(2, "foo") + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.actual.scope b/data/fixtures/scopes/php/argument.actual.singleLine.scope similarity index 96% rename from data/fixtures/scopes/php/argument.actual.scope rename to data/fixtures/scopes/php/argument.actual.singleLine.scope index 4f589773d8..ee153043d5 100644 --- a/data/fixtures/scopes/php/argument.actual.scope +++ b/data/fixtures/scopes/php/argument.actual.singleLine.scope @@ -1,5 +1,5 @@ ------------< +2| function __construct(string $name) { + +[Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.formal.constructor.scope b/data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope similarity index 71% rename from data/fixtures/scopes/php/argument.formal.constructor.scope rename to data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope index f91021f4a9..c05657ebe1 100644 --- a/data/fixtures/scopes/php/argument.formal.constructor.scope +++ b/data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope @@ -1,8 +1,6 @@ name = $name; - } + function __construct(string $name, number $value) {} } --- diff --git a/data/fixtures/scopes/php/argument.formal.method.multiLine.scope b/data/fixtures/scopes/php/argument.formal.method.multiLine.scope new file mode 100644 index 0000000000..a3eb4aae6c --- /dev/null +++ b/data/fixtures/scopes/php/argument.formal.method.multiLine.scope @@ -0,0 +1,39 @@ +------< +2| function myFunc($value, string $name) { } + +[#1 Removal] = 2:20-2:28 + >--------< +2| function myFunc($value, string $name) { } + +[#1 Trailing delimiter] = 2:26-2:28 + >--< +2| function myFunc($value, string $name) { } + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 2:28-2:40 + >------------< +2| function myFunc($value, string $name) { } + +[#2 Removal] = 2:26-2:40 + >--------------< +2| function myFunc($value, string $name) { } + +[#2 Leading delimiter] = 2:26-2:28 + >--< +2| function myFunc($value, string $name) { } + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.formal.method.scope b/data/fixtures/scopes/php/argument.formal.method.singleLine.scope similarity index 94% rename from data/fixtures/scopes/php/argument.formal.method.scope rename to data/fixtures/scopes/php/argument.formal.method.singleLine.scope index 990172e193..dada35c5a1 100644 --- a/data/fixtures/scopes/php/argument.formal.method.scope +++ b/data/fixtures/scopes/php/argument.formal.method.singleLine.scope @@ -1,6 +1,6 @@ ------< +1| function myFunc($value, string $name) { } + +[#1 Removal] = 1:16-1:24 + >--------< +1| function myFunc($value, string $name) { } + +[#1 Trailing delimiter] = 1:22-1:24 + >--< +1| function myFunc($value, string $name) { } + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 1:24-1:36 + >------------< +1| function myFunc($value, string $name) { } + +[#2 Removal] = 1:22-1:36 + >--------------< +1| function myFunc($value, string $name) { } + +[#2 Leading delimiter] = 1:22-1:24 + >--< +1| function myFunc($value, string $name) { } + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.formal.scope b/data/fixtures/scopes/php/argument.formal.singleLine.scope similarity index 94% rename from data/fixtures/scopes/php/argument.formal.scope rename to data/fixtures/scopes/php/argument.formal.singleLine.scope index cf92e5ef3f..2e03974889 100644 --- a/data/fixtures/scopes/php/argument.formal.scope +++ b/data/fixtures/scopes/php/argument.formal.singleLine.scope @@ -1,5 +1,5 @@ ---< +0| Foo(123, 456) + +[#1 Removal] = 0:4-0:9 + >-----< +0| Foo(123, 456) + +[#1 Trailing delimiter] = 0:7-0:9 + >--< +0| Foo(123, 456) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:9-0:12 + >---< +0| Foo(123, 456) + +[#2 Removal] = 0:7-0:12 + >-----< +0| Foo(123, 456) + +[#2 Leading delimiter] = 0:7-0:9 + >--< +0| Foo(123, 456) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument.actual.constructor.scope b/data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope similarity index 97% rename from data/fixtures/scopes/python/argument.actual.constructor.scope rename to data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope index bc45979233..1806b06cca 100644 --- a/data/fixtures/scopes/python/argument.actual.constructor.scope +++ b/data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope @@ -1,4 +1,4 @@ -Foo(123, 456) +Foo(aaa, bbb) --- [#1 Content] = diff --git a/data/fixtures/scopes/python/argument.actual.method.multiLine.scope b/data/fixtures/scopes/python/argument.actual.method.multiLine.scope new file mode 100644 index 0000000000..abf31bc70c --- /dev/null +++ b/data/fixtures/scopes/python/argument.actual.method.multiLine.scope @@ -0,0 +1,36 @@ +foo.bar( + aaa, + bbb +) +--- + +[#1 Content] = +[#1 Domain] = 0:8-0:11 + >---< +0| foo.bar(123, 456) + +[#1 Removal] = 0:8-0:13 + >-----< +0| foo.bar(123, 456) + +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| foo.bar(123, 456) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:13-0:16 + >---< +0| foo.bar(123, 456) + +[#2 Removal] = 0:11-0:16 + >-----< +0| foo.bar(123, 456) + +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| foo.bar(123, 456) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument.actual.method.scope b/data/fixtures/scopes/python/argument.actual.method.singleLine.scope similarity index 96% rename from data/fixtures/scopes/python/argument.actual.method.scope rename to data/fixtures/scopes/python/argument.actual.method.singleLine.scope index 22d95df89f..b7620617e0 100644 --- a/data/fixtures/scopes/python/argument.actual.method.scope +++ b/data/fixtures/scopes/python/argument.actual.method.singleLine.scope @@ -1,4 +1,4 @@ -foo.bar(123, 456) +foo.bar(aaa, bbb) --- [#1 Content] = diff --git a/data/fixtures/scopes/python/argument.actual.multiLine.scope b/data/fixtures/scopes/python/argument.actual.multiLine.scope new file mode 100644 index 0000000000..633fa82030 --- /dev/null +++ b/data/fixtures/scopes/python/argument.actual.multiLine.scope @@ -0,0 +1,36 @@ +foo( + aaa, + bbb +) +--- + +[#1 Content] = +[#1 Domain] = 0:4-0:9 + >-----< +0| foo("bar", 1) + +[#1 Removal] = 0:4-0:11 + >-------< +0| foo("bar", 1) + +[#1 Trailing delimiter] = 0:9-0:11 + >--< +0| foo("bar", 1) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:11-0:12 + >-< +0| foo("bar", 1) + +[#2 Removal] = 0:9-0:12 + >---< +0| foo("bar", 1) + +[#2 Leading delimiter] = 0:9-0:11 + >--< +0| foo("bar", 1) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument.actual.scope b/data/fixtures/scopes/python/argument.actual.singleLine.scope similarity index 97% rename from data/fixtures/scopes/python/argument.actual.scope rename to data/fixtures/scopes/python/argument.actual.singleLine.scope index db4ed8da78..f2c1a4bf15 100644 --- a/data/fixtures/scopes/python/argument.actual.scope +++ b/data/fixtures/scopes/python/argument.actual.singleLine.scope @@ -1,4 +1,4 @@ -foo("bar", 1) +foo(aaa, bbb) --- [#1 Content] = diff --git a/data/fixtures/scopes/python/argument.actual2.scope b/data/fixtures/scopes/python/argument.actual.singleLine2.scope similarity index 100% rename from data/fixtures/scopes/python/argument.actual2.scope rename to data/fixtures/scopes/python/argument.actual.singleLine2.scope diff --git a/data/fixtures/scopes/python/argument.actual3.scope b/data/fixtures/scopes/python/argument.actual.singleLine3.scope similarity index 100% rename from data/fixtures/scopes/python/argument.actual3.scope rename to data/fixtures/scopes/python/argument.actual.singleLine3.scope diff --git a/data/fixtures/scopes/python/argument.actual4.scope b/data/fixtures/scopes/python/argument.actual.singleLine4.scope similarity index 100% rename from data/fixtures/scopes/python/argument.actual4.scope rename to data/fixtures/scopes/python/argument.actual.singleLine4.scope diff --git a/data/fixtures/scopes/python/argument.formal.constructor2.scope b/data/fixtures/scopes/python/argument.formal.constructor.multiLine.scope similarity index 100% rename from data/fixtures/scopes/python/argument.formal.constructor2.scope rename to data/fixtures/scopes/python/argument.formal.constructor.multiLine.scope diff --git a/data/fixtures/scopes/python/argument.formal.constructor.scope b/data/fixtures/scopes/python/argument.formal.constructor.singleLine.scope similarity index 100% rename from data/fixtures/scopes/python/argument.formal.constructor.scope rename to data/fixtures/scopes/python/argument.formal.constructor.singleLine.scope diff --git a/data/fixtures/scopes/python/argument.formal.lambda.scope b/data/fixtures/scopes/python/argument.formal.lambda.singleLine.scope similarity index 100% rename from data/fixtures/scopes/python/argument.formal.lambda.scope rename to data/fixtures/scopes/python/argument.formal.lambda.singleLine.scope diff --git a/data/fixtures/scopes/python/argument.formal.method2.scope b/data/fixtures/scopes/python/argument.formal.method.multiLine.scope similarity index 100% rename from data/fixtures/scopes/python/argument.formal.method2.scope rename to data/fixtures/scopes/python/argument.formal.method.multiLine.scope diff --git a/data/fixtures/scopes/python/argument.formal.method.scope b/data/fixtures/scopes/python/argument.formal.method.singleLine.scope similarity index 100% rename from data/fixtures/scopes/python/argument.formal.method.scope rename to data/fixtures/scopes/python/argument.formal.method.singleLine.scope diff --git a/data/fixtures/scopes/python/argument.formal2.scope b/data/fixtures/scopes/python/argument.formal.multiLine.scope similarity index 100% rename from data/fixtures/scopes/python/argument.formal2.scope rename to data/fixtures/scopes/python/argument.formal.multiLine.scope diff --git a/data/fixtures/scopes/python/argument.formal.scope b/data/fixtures/scopes/python/argument.formal.singleLine.scope similarity index 100% rename from data/fixtures/scopes/python/argument.formal.scope rename to data/fixtures/scopes/python/argument.formal.singleLine.scope diff --git a/data/fixtures/scopes/r/argument.actual5.scope b/data/fixtures/scopes/r/argument.actual.multiLine.scope similarity index 96% rename from data/fixtures/scopes/r/argument.actual5.scope rename to data/fixtures/scopes/r/argument.actual.multiLine.scope index bf5bfbef8d..bcdcefc303 100644 --- a/data/fixtures/scopes/r/argument.actual5.scope +++ b/data/fixtures/scopes/r/argument.actual.multiLine.scope @@ -1,6 +1,6 @@ foo( - x, - y + x, + y ) --- diff --git a/data/fixtures/scopes/r/argument.actual.scope b/data/fixtures/scopes/r/argument.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/r/argument.actual.scope rename to data/fixtures/scopes/r/argument.actual.singleLine.scope diff --git a/data/fixtures/scopes/r/argument.actual2.scope b/data/fixtures/scopes/r/argument.actual.singleLine2.scope similarity index 100% rename from data/fixtures/scopes/r/argument.actual2.scope rename to data/fixtures/scopes/r/argument.actual.singleLine2.scope diff --git a/data/fixtures/scopes/r/argument.actual3.scope b/data/fixtures/scopes/r/argument.actual.singleLine3.scope similarity index 100% rename from data/fixtures/scopes/r/argument.actual3.scope rename to data/fixtures/scopes/r/argument.actual.singleLine3.scope diff --git a/data/fixtures/scopes/r/argument.actual4.scope b/data/fixtures/scopes/r/argument.actual.singleLine4.scope similarity index 100% rename from data/fixtures/scopes/r/argument.actual4.scope rename to data/fixtures/scopes/r/argument.actual.singleLine4.scope diff --git a/data/fixtures/scopes/r/argument.formal.multiLine.scope b/data/fixtures/scopes/r/argument.formal.multiLine.scope new file mode 100644 index 0000000000..a6da251ce2 --- /dev/null +++ b/data/fixtures/scopes/r/argument.formal.multiLine.scope @@ -0,0 +1,36 @@ +abc <- function( + x, + y +){ } +--- + +[#1 Content] = +[#1 Domain] = 0:16-0:17 + >-< +0| abc <- function(x, y){ } + +[#1 Removal] = 0:16-0:19 + >---< +0| abc <- function(x, y){ } + +[#1 Trailing delimiter] = 0:17-0:19 + >--< +0| abc <- function(x, y){ } + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:19-0:20 + >-< +0| abc <- function(x, y){ } + +[#2 Removal] = 0:17-0:20 + >---< +0| abc <- function(x, y){ } + +[#2 Leading delimiter] = 0:17-0:19 + >--< +0| abc <- function(x, y){ } + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argument.formal.scope b/data/fixtures/scopes/r/argument.formal.singleLine.scope similarity index 100% rename from data/fixtures/scopes/r/argument.formal.scope rename to data/fixtures/scopes/r/argument.formal.singleLine.scope diff --git a/data/fixtures/scopes/ruby/argument.actual.multiLine.scope b/data/fixtures/scopes/ruby/argument.actual.multiLine.scope new file mode 100644 index 0000000000..dee2687ecc --- /dev/null +++ b/data/fixtures/scopes/ruby/argument.actual.multiLine.scope @@ -0,0 +1,36 @@ +foo( + aaa, + bbb +) +--- + +[#1 Content] = +[#1 Domain] = 0:4-0:7 + >---< +0| foo(aaa, bbb) + +[#1 Removal] = 0:4-0:9 + >-----< +0| foo(aaa, bbb) + +[#1 Trailing delimiter] = 0:7-0:9 + >--< +0| foo(aaa, bbb) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:9-0:12 + >---< +0| foo(aaa, bbb) + +[#2 Removal] = 0:7-0:12 + >-----< +0| foo(aaa, bbb) + +[#2 Leading delimiter] = 0:7-0:9 + >--< +0| foo(aaa, bbb) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/ruby/argument.actual.multiLine2.scope b/data/fixtures/scopes/ruby/argument.actual.multiLine2.scope new file mode 100644 index 0000000000..5e7816dbb2 --- /dev/null +++ b/data/fixtures/scopes/ruby/argument.actual.multiLine2.scope @@ -0,0 +1,36 @@ +foo{ | + aaa, + bbb +| } +--- + +[#1 Content] = +[#1 Domain] = 0:6-0:9 + >---< +0| foo{ |aaa, bbb| } + +[#1 Removal] = 0:6-0:11 + >-----< +0| foo{ |aaa, bbb| } + +[#1 Trailing delimiter] = 0:9-0:11 + >--< +0| foo{ |aaa, bbb| } + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:11-0:14 + >---< +0| foo{ |aaa, bbb| } + +[#2 Removal] = 0:9-0:14 + >-----< +0| foo{ |aaa, bbb| } + +[#2 Leading delimiter] = 0:9-0:11 + >--< +0| foo{ |aaa, bbb| } + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/ruby/argument.actual.scope b/data/fixtures/scopes/ruby/argument.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/ruby/argument.actual.scope rename to data/fixtures/scopes/ruby/argument.actual.singleLine.scope diff --git a/data/fixtures/scopes/ruby/argument.actual2.scope b/data/fixtures/scopes/ruby/argument.actual.singleLine2.scope similarity index 100% rename from data/fixtures/scopes/ruby/argument.actual2.scope rename to data/fixtures/scopes/ruby/argument.actual.singleLine2.scope diff --git a/data/fixtures/scopes/ruby/argument.formal.multiLine.scope b/data/fixtures/scopes/ruby/argument.formal.multiLine.scope new file mode 100644 index 0000000000..f133c1204c --- /dev/null +++ b/data/fixtures/scopes/ruby/argument.formal.multiLine.scope @@ -0,0 +1,36 @@ +def foo( + aaa, + bbb +) +--- + +[#1 Content] = +[#1 Domain] = 0:8-0:11 + >---< +0| def foo(aaa, bbb) + +[#1 Removal] = 0:8-0:13 + >-----< +0| def foo(aaa, bbb) + +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| def foo(aaa, bbb) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:13-0:16 + >---< +0| def foo(aaa, bbb) + +[#2 Removal] = 0:11-0:16 + >-----< +0| def foo(aaa, bbb) + +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| def foo(aaa, bbb) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/ruby/argument.formal.scope b/data/fixtures/scopes/ruby/argument.formal.singleLine.scope similarity index 100% rename from data/fixtures/scopes/ruby/argument.formal.scope rename to data/fixtures/scopes/ruby/argument.formal.singleLine.scope diff --git a/data/fixtures/scopes/scala/argument.actual.multiLine.scope b/data/fixtures/scopes/scala/argument.actual.multiLine.scope new file mode 100644 index 0000000000..dee2687ecc --- /dev/null +++ b/data/fixtures/scopes/scala/argument.actual.multiLine.scope @@ -0,0 +1,36 @@ +foo( + aaa, + bbb +) +--- + +[#1 Content] = +[#1 Domain] = 0:4-0:7 + >---< +0| foo(aaa, bbb) + +[#1 Removal] = 0:4-0:9 + >-----< +0| foo(aaa, bbb) + +[#1 Trailing delimiter] = 0:7-0:9 + >--< +0| foo(aaa, bbb) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:9-0:12 + >---< +0| foo(aaa, bbb) + +[#2 Removal] = 0:7-0:12 + >-----< +0| foo(aaa, bbb) + +[#2 Leading delimiter] = 0:7-0:9 + >--< +0| foo(aaa, bbb) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/scala/argument.actual.scope b/data/fixtures/scopes/scala/argument.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/scala/argument.actual.scope rename to data/fixtures/scopes/scala/argument.actual.singleLine.scope diff --git a/data/fixtures/scopes/scala/argument.formal.multiLine.scope b/data/fixtures/scopes/scala/argument.formal.multiLine.scope new file mode 100644 index 0000000000..03e5583f3a --- /dev/null +++ b/data/fixtures/scopes/scala/argument.formal.multiLine.scope @@ -0,0 +1,36 @@ +def foo( + aaa: Int, + bbb: Int +) = x +--- + +[#1 Content] = +[#1 Domain] = 0:8-0:16 + >--------< +0| def foo(aaa: Int, bbb: Int) = x + +[#1 Removal] = 0:8-0:18 + >----------< +0| def foo(aaa: Int, bbb: Int) = x + +[#1 Trailing delimiter] = 0:16-0:18 + >--< +0| def foo(aaa: Int, bbb: Int) = x + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:18-0:26 + >--------< +0| def foo(aaa: Int, bbb: Int) = x + +[#2 Removal] = 0:16-0:26 + >----------< +0| def foo(aaa: Int, bbb: Int) = x + +[#2 Leading delimiter] = 0:16-0:18 + >--< +0| def foo(aaa: Int, bbb: Int) = x + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/scala/argument.formal.multiLine2.scope b/data/fixtures/scopes/scala/argument.formal.multiLine2.scope new file mode 100644 index 0000000000..b6feeda0df --- /dev/null +++ b/data/fixtures/scopes/scala/argument.formal.multiLine2.scope @@ -0,0 +1,36 @@ +class Foo( + aaa: Int, + bbb: Int +) {} +--- + +[#1 Content] = +[#1 Domain] = 0:10-0:18 + >--------< +0| class Foo(aaa: Int, bbb: Int) {} + +[#1 Removal] = 0:10-0:20 + >----------< +0| class Foo(aaa: Int, bbb: Int) {} + +[#1 Trailing delimiter] = 0:18-0:20 + >--< +0| class Foo(aaa: Int, bbb: Int) {} + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:20-0:28 + >--------< +0| class Foo(aaa: Int, bbb: Int) {} + +[#2 Removal] = 0:18-0:28 + >----------< +0| class Foo(aaa: Int, bbb: Int) {} + +[#2 Leading delimiter] = 0:18-0:20 + >--< +0| class Foo(aaa: Int, bbb: Int) {} + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/scala/argument.formal.scope b/data/fixtures/scopes/scala/argument.formal.singleLine.scope similarity index 100% rename from data/fixtures/scopes/scala/argument.formal.scope rename to data/fixtures/scopes/scala/argument.formal.singleLine.scope diff --git a/data/fixtures/scopes/scala/argument.formal2.scope b/data/fixtures/scopes/scala/argument.formal.singleLine2.scope similarity index 100% rename from data/fixtures/scopes/scala/argument.formal2.scope rename to data/fixtures/scopes/scala/argument.formal.singleLine2.scope diff --git a/data/fixtures/scopes/scm/argument.actual.multiLine.scope b/data/fixtures/scopes/scm/argument.actual.multiLine.scope new file mode 100644 index 0000000000..8287d20752 --- /dev/null +++ b/data/fixtures/scopes/scm/argument.actual.multiLine.scope @@ -0,0 +1,40 @@ +(#foo? + @aaa + bbb +) +--- + +[#1 Content] = +[#1 Domain] = 0:7-0:11 + >----< +0| (#foo? @aaa bbb) + +[#1 Removal] = 0:7-0:12 + >-----< +0| (#foo? @aaa bbb) + +[#1 Leading delimiter] = 0:6-0:7 + >-< +0| (#foo? @aaa bbb) + +[#1 Trailing delimiter] = 0:11-0:12 + >-< +0| (#foo? @aaa bbb) + +[#1 Insertion delimiter] = " " + + +[#2 Content] = +[#2 Domain] = 0:12-0:15 + >---< +0| (#foo? @aaa bbb) + +[#2 Removal] = 0:11-0:15 + >----< +0| (#foo? @aaa bbb) + +[#2 Leading delimiter] = 0:11-0:12 + >-< +0| (#foo? @aaa bbb) + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scm/argument.actual.scope b/data/fixtures/scopes/scm/argument.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/scm/argument.actual.scope rename to data/fixtures/scopes/scm/argument.actual.singleLine.scope diff --git a/data/fixtures/scopes/scss/argument.actual.multiLine.scope b/data/fixtures/scopes/scss/argument.actual.multiLine.scope new file mode 100644 index 0000000000..474dfae7fd --- /dev/null +++ b/data/fixtures/scopes/scss/argument.actual.multiLine.scope @@ -0,0 +1,36 @@ +@mixin replace-text( + $image, + $color: red +) {} +--- + +[#1 Content] = +[#1 Domain] = 0:20-0:26 + >------< +0| @mixin replace-text($image, $color: red) {} + +[#1 Removal] = 0:20-0:28 + >--------< +0| @mixin replace-text($image, $color: red) {} + +[#1 Trailing delimiter] = 0:26-0:28 + >--< +0| @mixin replace-text($image, $color: red) {} + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:28-0:39 + >-----------< +0| @mixin replace-text($image, $color: red) {} + +[#2 Removal] = 0:26-0:39 + >-------------< +0| @mixin replace-text($image, $color: red) {} + +[#2 Leading delimiter] = 0:26-0:28 + >--< +0| @mixin replace-text($image, $color: red) {} + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/scss/argument.actual.scope b/data/fixtures/scopes/scss/argument.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/scss/argument.actual.scope rename to data/fixtures/scopes/scss/argument.actual.singleLine.scope diff --git a/data/fixtures/scopes/talon/argument.actual.scope b/data/fixtures/scopes/talon/argument.actual.singleLine.scope similarity index 100% rename from data/fixtures/scopes/talon/argument.actual.scope rename to data/fixtures/scopes/talon/argument.actual.singleLine.scope diff --git a/data/fixtures/scopes/talon/argument.actual2.scope b/data/fixtures/scopes/talon/argument.actual.singleLine2.scope similarity index 100% rename from data/fixtures/scopes/talon/argument.actual2.scope rename to data/fixtures/scopes/talon/argument.actual.singleLine2.scope diff --git a/data/fixtures/scopes/talon/argument.actual3.scope b/data/fixtures/scopes/talon/argument.actual.singleLine3.scope similarity index 100% rename from data/fixtures/scopes/talon/argument.actual3.scope rename to data/fixtures/scopes/talon/argument.actual.singleLine3.scope diff --git a/packages/common/src/scopeSupportFacets/c.ts b/packages/common/src/scopeSupportFacets/c.ts index 83c701e737..948e64854f 100644 --- a/packages/common/src/scopeSupportFacets/c.ts +++ b/packages/common/src/scopeSupportFacets/c.ts @@ -31,11 +31,14 @@ export const cCoreScopeSupport: LanguageScopeSupportFacetMap = { functionCall: supported, functionCallee: supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, - "argument.actual.method": supported, + "argument.actual.method.singleLine": supported, + "argument.actual.method.multiLine": supported, "argument.actual.method.iteration": supported, - "argument.formal": supported, + "argument.formal.singleLine": supported, + "argument.formal.multiLine": supported, "argument.formal.iteration": supported, "argumentList.actual.empty": supported, @@ -212,7 +215,8 @@ export const cScopeSupport: LanguageScopeSupportFacetMap = { // Lambda "argument.formal.lambda.iteration": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argumentList.formal.lambda.empty": notApplicable, "argumentList.formal.lambda.multiLine": notApplicable, "argumentList.formal.lambda.singleLine": notApplicable, @@ -223,9 +227,11 @@ export const cScopeSupport: LanguageScopeSupportFacetMap = { // Constructor "argument.actual.constructor.iteration": notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argumentList.actual.constructor.empty": notApplicable, "argumentList.actual.constructor.multiLine": notApplicable, "argumentList.actual.constructor.singleLine": notApplicable, @@ -247,7 +253,8 @@ export const cScopeSupport: LanguageScopeSupportFacetMap = { // Method "argument.formal.method.iteration": notApplicable, - "argument.formal.method": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, "argumentList.formal.method.empty": notApplicable, "argumentList.formal.method.multiLine": notApplicable, "argumentList.formal.method.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/cpp.ts b/packages/common/src/scopeSupportFacets/cpp.ts index 66f765a7db..2fffcdc879 100644 --- a/packages/common/src/scopeSupportFacets/cpp.ts +++ b/packages/common/src/scopeSupportFacets/cpp.ts @@ -13,13 +13,17 @@ export const cppScopeSupport: LanguageScopeSupportFacetMap = { "branch.try": supported, "branch.try.iteration": supported, - "argument.actual.constructor": supported, + "argument.actual.constructor.singleLine": supported, + "argument.actual.constructor.multiLine": supported, "argument.actual.constructor.iteration": supported, - "argument.formal.method": supported, + "argument.formal.method.singleLine": supported, + "argument.formal.method.multiLine": supported, "argument.formal.method.iteration": supported, - "argument.formal.constructor": supported, + "argument.formal.constructor.singleLine": supported, + "argument.formal.constructor.multiLine": supported, "argument.formal.constructor.iteration": supported, - "argument.formal.lambda": supported, + "argument.formal.lambda.singleLine": supported, + "argument.formal.lambda.multiLine": supported, "argument.formal.lambda.iteration": supported, "argumentList.actual.constructor.empty": supported, diff --git a/packages/common/src/scopeSupportFacets/csharp.ts b/packages/common/src/scopeSupportFacets/csharp.ts index 032ba1c351..d8bf3063e8 100644 --- a/packages/common/src/scopeSupportFacets/csharp.ts +++ b/packages/common/src/scopeSupportFacets/csharp.ts @@ -139,19 +139,26 @@ export const csharpScopeSupport: LanguageScopeSupportFacetMap = { "argumentList.formal.constructor.singleLine": supported, "argumentList.formal.constructor.multiLine": supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, - "argument.actual.constructor": supported, + "argument.actual.constructor.singleLine": supported, + "argument.actual.constructor.multiLine": supported, "argument.actual.constructor.iteration": supported, - "argument.actual.method": supported, + "argument.actual.method.singleLine": supported, + "argument.actual.method.multiLine": supported, "argument.actual.method.iteration": supported, - "argument.formal": supported, + "argument.formal.singleLine": supported, + "argument.formal.multiLine": supported, "argument.formal.iteration": supported, - "argument.formal.lambda": supported, + "argument.formal.lambda.singleLine": supported, + "argument.formal.lambda.multiLine": supported, "argument.formal.lambda.iteration": supported, - "argument.formal.constructor": supported, + "argument.formal.constructor.singleLine": supported, + "argument.formal.constructor.multiLine": supported, "argument.formal.constructor.iteration": supported, - "argument.formal.method": supported, + "argument.formal.method.singleLine": supported, + "argument.formal.method.multiLine": supported, "argument.formal.method.iteration": supported, ifStatement: supported, diff --git a/packages/common/src/scopeSupportFacets/css.ts b/packages/common/src/scopeSupportFacets/css.ts index bcfa197536..bf21d3f18c 100644 --- a/packages/common/src/scopeSupportFacets/css.ts +++ b/packages/common/src/scopeSupportFacets/css.ts @@ -12,7 +12,7 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = { functionCall: supported, functionCallee: supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, "argument.actual.iteration": supported, "argumentList.actual.empty": supported, @@ -43,17 +43,24 @@ export const cssScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable anonymousFunction: notApplicable, + "argument.actual.multiLine": notApplicable, "argument.actual.constructor.iteration": notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.actual.method.iteration": notApplicable, - "argument.actual.method": notApplicable, + "argument.actual.method.singleLine": notApplicable, + "argument.actual.method.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argument.formal.iteration": notApplicable, "argument.formal.method.iteration": notApplicable, - "argument.formal.method": notApplicable, - "argument.formal": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argument.formal.lambda.iteration": notApplicable, "argumentList.actual.method.empty": notApplicable, "argumentList.actual.method.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/html.ts b/packages/common/src/scopeSupportFacets/html.ts index 77482b5036..1ff7390462 100644 --- a/packages/common/src/scopeSupportFacets/html.ts +++ b/packages/common/src/scopeSupportFacets/html.ts @@ -21,18 +21,25 @@ export const htmlScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable "argument.actual.constructor.iteration": notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.actual.iteration": notApplicable, "argument.actual.method.iteration": notApplicable, - "argument.actual.method": notApplicable, - "argument.actual": notApplicable, + "argument.actual.method.singleLine": notApplicable, + "argument.actual.method.multiLine": notApplicable, + "argument.actual.singleLine": notApplicable, + "argument.actual.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argument.formal.iteration": notApplicable, "argument.formal.method.iteration": notApplicable, - "argument.formal.method": notApplicable, - "argument.formal": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argument.formal.lambda.iteration": notApplicable, "argumentList.actual.empty": notApplicable, "argumentList.actual.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/java.ts b/packages/common/src/scopeSupportFacets/java.ts index dd90c3e0bc..64c1af6030 100644 --- a/packages/common/src/scopeSupportFacets/java.ts +++ b/packages/common/src/scopeSupportFacets/java.ts @@ -9,17 +9,23 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = { list: supported, switchStatementSubject: supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, - "argument.actual.constructor": supported, + "argument.actual.constructor.singleLine": supported, + "argument.actual.constructor.multiLine": supported, "argument.actual.constructor.iteration": supported, - "argument.actual.method": supported, + "argument.actual.method.singleLine": supported, + "argument.actual.method.multiLine": supported, "argument.actual.method.iteration": supported, - "argument.formal.constructor": supported, + "argument.formal.constructor.singleLine": supported, + "argument.formal.constructor.multiLine": supported, "argument.formal.constructor.iteration": supported, - "argument.formal.method": supported, + "argument.formal.method.singleLine": supported, + "argument.formal.method.multiLine": supported, "argument.formal.method.iteration": supported, - "argument.formal.lambda": supported, + "argument.formal.lambda.singleLine": supported, + "argument.formal.lambda.multiLine": supported, "argument.formal.lambda.iteration": supported, "argumentList.actual.empty": supported, @@ -176,7 +182,8 @@ export const javaScopeSupport: LanguageScopeSupportFacetMap = { functionName: notApplicable, "functionName.iteration.document": notApplicable, "functionName.iteration.block": notApplicable, - "argument.formal": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, "argument.formal.iteration": notApplicable, "argumentList.formal.empty": notApplicable, "argumentList.formal.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/javascript.ts b/packages/common/src/scopeSupportFacets/javascript.ts index 9219c2b186..124c2b2d47 100644 --- a/packages/common/src/scopeSupportFacets/javascript.ts +++ b/packages/common/src/scopeSupportFacets/javascript.ts @@ -53,19 +53,26 @@ export const javascriptCoreScopeSupport: LanguageScopeSupportFacetMap = { functionCallee: supported, "functionCallee.constructor": supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, - "argument.actual.method": supported, + "argument.actual.method.singleLine": supported, + "argument.actual.method.multiLine": supported, "argument.actual.method.iteration": supported, - "argument.actual.constructor": supported, + "argument.actual.constructor.singleLine": supported, + "argument.actual.constructor.multiLine": supported, "argument.actual.constructor.iteration": supported, - "argument.formal": supported, + "argument.formal.singleLine": supported, + "argument.formal.multiLine": supported, "argument.formal.iteration": supported, - "argument.formal.method": supported, + "argument.formal.method.singleLine": supported, + "argument.formal.method.multiLine": supported, "argument.formal.method.iteration": supported, - "argument.formal.constructor": supported, + "argument.formal.constructor.singleLine": supported, + "argument.formal.constructor.multiLine": supported, "argument.formal.constructor.iteration": supported, - "argument.formal.lambda": supported, + "argument.formal.lambda.singleLine": supported, + "argument.formal.lambda.multiLine": supported, "argument.formal.lambda.iteration": supported, "argumentList.actual.empty": supported, diff --git a/packages/common/src/scopeSupportFacets/json.ts b/packages/common/src/scopeSupportFacets/json.ts index aaed01ff58..9c35f04bbe 100644 --- a/packages/common/src/scopeSupportFacets/json.ts +++ b/packages/common/src/scopeSupportFacets/json.ts @@ -24,19 +24,26 @@ export const jsonScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable anonymousFunction: notApplicable, - "argument.actual": notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.singleLine": notApplicable, + "argument.actual.multiLine": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.actual.constructor.iteration": notApplicable, "argument.actual.iteration": notApplicable, - "argument.actual.method": notApplicable, + "argument.actual.method.singleLine": notApplicable, + "argument.actual.method.multiLine": notApplicable, "argument.actual.method.iteration": notApplicable, - "argument.formal": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, "argument.formal.iteration": notApplicable, - "argument.formal.method": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, "argument.formal.method.iteration": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argument.formal.lambda.iteration": notApplicable, "argumentList.actual.empty": notApplicable, "argumentList.actual.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/markdown.ts b/packages/common/src/scopeSupportFacets/markdown.ts index 3091947945..d4c7971395 100644 --- a/packages/common/src/scopeSupportFacets/markdown.ts +++ b/packages/common/src/scopeSupportFacets/markdown.ts @@ -20,19 +20,26 @@ export const markdownScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable anonymousFunction: notApplicable, - "argument.actual": notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.singleLine": notApplicable, + "argument.actual.multiLine": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.actual.constructor.iteration": notApplicable, "argument.actual.iteration": notApplicable, - "argument.actual.method": notApplicable, + "argument.actual.method.singleLine": notApplicable, + "argument.actual.method.multiLine": notApplicable, "argument.actual.method.iteration": notApplicable, - "argument.formal": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, "argument.formal.iteration": notApplicable, - "argument.formal.method": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, "argument.formal.method.iteration": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argument.formal.lambda.iteration": notApplicable, "argumentList.actual.empty": notApplicable, "argumentList.actual.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/php.ts b/packages/common/src/scopeSupportFacets/php.ts index e47bb1cd12..b04ef918ff 100644 --- a/packages/common/src/scopeSupportFacets/php.ts +++ b/packages/common/src/scopeSupportFacets/php.ts @@ -9,18 +9,24 @@ export const phpScopeSupport: LanguageScopeSupportFacetMap = { "comment.block": supported, "textFragment.string.singleLine": supported, - "argument.formal": supported, + "argument.formal.singleLine": supported, + "argument.formal.multiLine": supported, "argument.formal.iteration": supported, - "argument.formal.constructor": supported, + "argument.formal.constructor.singleLine": supported, + "argument.formal.constructor.multiLine": supported, "argument.formal.constructor.iteration": supported, - "argument.formal.method": supported, + "argument.formal.method.singleLine": supported, + "argument.formal.method.multiLine": supported, "argument.formal.method.iteration": supported, - "argument.actual.constructor": supported, + "argument.actual.constructor.singleLine": supported, + "argument.actual.constructor.multiLine": supported, "argument.actual.constructor.iteration": supported, - "argument.actual.method": supported, + "argument.actual.method.singleLine": supported, + "argument.actual.method.multiLine": supported, "argument.actual.method.iteration": supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, "name.variable": supported, diff --git a/packages/common/src/scopeSupportFacets/python.ts b/packages/common/src/scopeSupportFacets/python.ts index 2d289e1e48..21e27c385e 100644 --- a/packages/common/src/scopeSupportFacets/python.ts +++ b/packages/common/src/scopeSupportFacets/python.ts @@ -81,19 +81,25 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = { "functionName.method": supported, "functionName.method.iteration.class": supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, - "argument.formal": supported, + "argument.formal.singleLine": supported, + "argument.formal.multiLine": supported, "argument.formal.iteration": supported, - "argument.actual.constructor": supported, + "argument.actual.constructor.singleLine": supported, + "argument.actual.constructor.multiLine": supported, "argument.actual.constructor.iteration": supported, - "argument.actual.method": supported, + "argument.actual.method.singleLine": supported, + "argument.actual.method.multiLine": supported, "argument.actual.method.iteration": supported, - "argument.formal.constructor": supported, + "argument.formal.constructor.singleLine": supported, + "argument.formal.constructor.multiLine": supported, "argument.formal.constructor.iteration": supported, - "argument.formal.method": supported, + "argument.formal.method.singleLine": supported, + "argument.formal.method.multiLine": supported, "argument.formal.method.iteration": supported, - "argument.formal.lambda": supported, + "argument.formal.lambda.singleLine": supported, "argument.formal.lambda.iteration": supported, "argumentList.actual.empty": supported, @@ -246,6 +252,7 @@ export const pythonScopeSupport: LanguageScopeSupportFacetMap = { // Multiline lambda "argumentList.formal.lambda.multiLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "interior.lambda.block": notApplicable, // Block comments diff --git a/packages/common/src/scopeSupportFacets/r.ts b/packages/common/src/scopeSupportFacets/r.ts index ddf6671e9d..d39df1a3c4 100644 --- a/packages/common/src/scopeSupportFacets/r.ts +++ b/packages/common/src/scopeSupportFacets/r.ts @@ -5,9 +5,11 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel; export const rScopeSupport: LanguageScopeSupportFacetMap = { anonymousFunction: supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, - "argument.formal": supported, + "argument.formal.singleLine": supported, + "argument.formal.multiLine": supported, "argument.formal.iteration": supported, "argumentList.actual.empty": supported, diff --git a/packages/common/src/scopeSupportFacets/ruby.ts b/packages/common/src/scopeSupportFacets/ruby.ts index 05fdded957..baaccbb11f 100644 --- a/packages/common/src/scopeSupportFacets/ruby.ts +++ b/packages/common/src/scopeSupportFacets/ruby.ts @@ -9,9 +9,11 @@ export const rubyScopeSupport: LanguageScopeSupportFacetMap = { "comment.block": supported, disqualifyDelimiter: supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, - "argument.formal": supported, + "argument.formal.singleLine": supported, + "argument.formal.multiLine": supported, "argument.formal.iteration": supported, "argumentList.actual.empty": supported, diff --git a/packages/common/src/scopeSupportFacets/scala.ts b/packages/common/src/scopeSupportFacets/scala.ts index 0b4ec56e63..21d4a4a122 100644 --- a/packages/common/src/scopeSupportFacets/scala.ts +++ b/packages/common/src/scopeSupportFacets/scala.ts @@ -8,9 +8,11 @@ export const scalaScopeSupport: LanguageScopeSupportFacetMap = { ifStatement: supported, disqualifyDelimiter: supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, - "argument.formal": supported, + "argument.formal.singleLine": supported, + "argument.formal.multiLine": supported, "argument.formal.iteration": supported, "argumentList.actual.empty": supported, diff --git a/packages/common/src/scopeSupportFacets/scm.ts b/packages/common/src/scopeSupportFacets/scm.ts index 7162985e74..b49728c9c7 100644 --- a/packages/common/src/scopeSupportFacets/scm.ts +++ b/packages/common/src/scopeSupportFacets/scm.ts @@ -7,7 +7,8 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = { statement: supported, list: supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, + "argument.actual.multiLine": supported, "argument.actual.iteration": supported, "argumentList.actual.empty": supported, @@ -25,17 +26,23 @@ export const scmScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable anonymousFunction: notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.actual.constructor.iteration": notApplicable, - "argument.actual.method": notApplicable, + "argument.actual.method.singleLine": notApplicable, + "argument.actual.method.multiLine": notApplicable, "argument.actual.method.iteration": notApplicable, - "argument.formal": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, "argument.formal.iteration": notApplicable, - "argument.formal.method": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, "argument.formal.method.iteration": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argument.formal.lambda.iteration": notApplicable, "argumentList.actual.method.empty": notApplicable, "argumentList.actual.method.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts index 1b17ed781b..aab8d5c0a5 100644 --- a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts +++ b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts @@ -217,9 +217,15 @@ export const scopeSupportFacetInfos: Record< scopeType: "functionCallee", }, - "argument.actual": { - description: "An argument/parameter in a function call", + "argument.actual.singleLine": { + description: "A single line argument/parameter in a function call", scopeType: "argumentOrParameter", + insertionDelimiterHint: '", "', + }, + "argument.actual.multiLine": { + description: "A multiline argument/parameter in a function call", + scopeType: "argumentOrParameter", + insertionDelimiterHint: '",\n"', }, "argument.actual.iteration": { description: @@ -227,9 +233,15 @@ export const scopeSupportFacetInfos: Record< scopeType: "argumentOrParameter", isIteration: true, }, - "argument.actual.method": { - description: "An argument/parameter in a method call", + "argument.actual.method.singleLine": { + description: "A single line argument/parameter in a method call", scopeType: "argumentOrParameter", + insertionDelimiterHint: '", "', + }, + "argument.actual.method.multiLine": { + description: "A multi line argument/parameter in a method call", + scopeType: "argumentOrParameter", + insertionDelimiterHint: '",\n"', }, "argument.actual.method.iteration": { description: @@ -237,9 +249,15 @@ export const scopeSupportFacetInfos: Record< scopeType: "argumentOrParameter", isIteration: true, }, - "argument.actual.constructor": { - description: "An argument/parameter in a constructor call", + "argument.actual.constructor.singleLine": { + description: "A single line argument/parameter in a constructor call", scopeType: "argumentOrParameter", + insertionDelimiterHint: '", "', + }, + "argument.actual.constructor.multiLine": { + description: "A multi line argument/parameter in a constructor call", + scopeType: "argumentOrParameter", + insertionDelimiterHint: '",\n"', }, "argument.actual.constructor.iteration": { description: @@ -247,9 +265,16 @@ export const scopeSupportFacetInfos: Record< scopeType: "argumentOrParameter", isIteration: true, }, - "argument.formal": { - description: "A parameter in a function declaration", + + "argument.formal.singleLine": { + description: "A single line parameter in a function declaration", scopeType: "argumentOrParameter", + insertionDelimiterHint: '", "', + }, + "argument.formal.multiLine": { + description: "A multi line parameter in a function declaration", + scopeType: "argumentOrParameter", + insertionDelimiterHint: '",\n"', }, "argument.formal.iteration": { description: @@ -257,9 +282,15 @@ export const scopeSupportFacetInfos: Record< scopeType: "argumentOrParameter", isIteration: true, }, - "argument.formal.method": { - description: "A parameter in a class method declaration", + "argument.formal.method.singleLine": { + description: "A single line parameter in a class method declaration", scopeType: "argumentOrParameter", + insertionDelimiterHint: '", "', + }, + "argument.formal.method.multiLine": { + description: "A multi line parameter in a class method declaration", + scopeType: "argumentOrParameter", + insertionDelimiterHint: '",\n"', }, "argument.formal.method.iteration": { description: @@ -267,9 +298,15 @@ export const scopeSupportFacetInfos: Record< scopeType: "argumentOrParameter", isIteration: true, }, - "argument.formal.constructor": { - description: "A parameter in a constructor declaration", + "argument.formal.constructor.singleLine": { + description: "A single line parameter in a constructor declaration", + scopeType: "argumentOrParameter", + insertionDelimiterHint: '", "', + }, + "argument.formal.constructor.multiLine": { + description: "A multi line parameter in a constructor declaration", scopeType: "argumentOrParameter", + insertionDelimiterHint: '",\n"', }, "argument.formal.constructor.iteration": { description: @@ -277,9 +314,15 @@ export const scopeSupportFacetInfos: Record< scopeType: "argumentOrParameter", isIteration: true, }, - "argument.formal.lambda": { - description: "A parameter in a lambda declaration", + "argument.formal.lambda.singleLine": { + description: "A single line parameter in a lambda declaration", scopeType: "argumentOrParameter", + insertionDelimiterHint: '", "', + }, + "argument.formal.lambda.multiLine": { + description: "A multi line parameter in a lambda declaration", + scopeType: "argumentOrParameter", + insertionDelimiterHint: '",\n"', }, "argument.formal.lambda.iteration": { description: diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts index adcac37621..608c2e2680 100644 --- a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts +++ b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts @@ -62,20 +62,27 @@ export const scopeSupportFacets = [ "functionCallee", "functionCallee.constructor", - "argument.actual", + "argument.actual.singleLine", + "argument.actual.multiLine", "argument.actual.iteration", - "argument.actual.method", + "argument.actual.method.singleLine", + "argument.actual.method.multiLine", "argument.actual.method.iteration", - "argument.actual.constructor", + "argument.actual.constructor.singleLine", + "argument.actual.constructor.multiLine", "argument.actual.constructor.iteration", - "argument.formal", + "argument.formal.singleLine", + "argument.formal.multiLine", "argument.formal.iteration", - "argument.formal.method", + "argument.formal.method.singleLine", + "argument.formal.method.multiLine", "argument.formal.method.iteration", - "argument.formal.constructor", + "argument.formal.constructor.singleLine", + "argument.formal.constructor.multiLine", "argument.formal.constructor.iteration", - "argument.formal.lambda", + "argument.formal.lambda.singleLine", + "argument.formal.lambda.multiLine", "argument.formal.lambda.iteration", "argumentList.actual.empty", @@ -91,15 +98,15 @@ export const scopeSupportFacets = [ "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", + "argumentList.formal.lambda.empty", + "argumentList.formal.lambda.singleLine", + "argumentList.formal.lambda.multiLine", "comment.line", "comment.block", diff --git a/packages/common/src/scopeSupportFacets/scss.ts b/packages/common/src/scopeSupportFacets/scss.ts index 03b0bde1b2..b125c07aaf 100644 --- a/packages/common/src/scopeSupportFacets/scss.ts +++ b/packages/common/src/scopeSupportFacets/scss.ts @@ -34,4 +34,6 @@ export const scssScopeSupport: LanguageScopeSupportFacetMap = { "interior.if": supported, "interior.function": supported, + + "argument.actual.multiLine": supported, }; diff --git a/packages/common/src/scopeSupportFacets/talon.ts b/packages/common/src/scopeSupportFacets/talon.ts index 72817336a8..c20adeea91 100644 --- a/packages/common/src/scopeSupportFacets/talon.ts +++ b/packages/common/src/scopeSupportFacets/talon.ts @@ -5,7 +5,7 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel; export const talonScopeSupport: LanguageScopeSupportFacetMap = { "argument.actual.iteration": supported, - "argument.actual": supported, + "argument.actual.singleLine": supported, "argumentList.actual.empty": supported, "argumentList.actual.singleLine": supported, @@ -46,17 +46,24 @@ export const talonScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable anonymousFunction: notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.multiLine": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.actual.constructor.iteration": notApplicable, - "argument.actual.method": notApplicable, + "argument.actual.method.singleLine": notApplicable, + "argument.actual.method.multiLine": notApplicable, "argument.actual.method.iteration": notApplicable, - "argument.formal": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, "argument.formal.iteration": notApplicable, - "argument.formal.method": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, "argument.formal.method.iteration": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argument.formal.lambda.iteration": notApplicable, "argumentList.actual.constructor.empty": notApplicable, "argumentList.actual.constructor.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/xml.ts b/packages/common/src/scopeSupportFacets/xml.ts index 27ecfb9596..fb725263e2 100644 --- a/packages/common/src/scopeSupportFacets/xml.ts +++ b/packages/common/src/scopeSupportFacets/xml.ts @@ -21,19 +21,26 @@ export const xmlScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable anonymousFunction: notApplicable, - "argument.actual": notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.singleLine": notApplicable, + "argument.actual.multiLine": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.actual.constructor.iteration": notApplicable, "argument.actual.iteration": notApplicable, - "argument.actual.method": notApplicable, + "argument.actual.method.singleLine": notApplicable, + "argument.actual.method.multiLine": notApplicable, "argument.actual.method.iteration": notApplicable, - "argument.formal": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, "argument.formal.iteration": notApplicable, - "argument.formal.method": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, "argument.formal.method.iteration": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argument.formal.lambda.iteration": notApplicable, "argumentList.actual.empty": notApplicable, "argumentList.actual.singleLine": notApplicable, diff --git a/packages/common/src/scopeSupportFacets/yaml.ts b/packages/common/src/scopeSupportFacets/yaml.ts index 87ef865b72..168946be81 100644 --- a/packages/common/src/scopeSupportFacets/yaml.ts +++ b/packages/common/src/scopeSupportFacets/yaml.ts @@ -30,19 +30,26 @@ export const yamlScopeSupport: LanguageScopeSupportFacetMap = { // Not applicable anonymousFunction: notApplicable, - "argument.actual": notApplicable, - "argument.actual.constructor": notApplicable, + "argument.actual.singleLine": notApplicable, + "argument.actual.multiLine": notApplicable, + "argument.actual.constructor.singleLine": notApplicable, + "argument.actual.constructor.multiLine": notApplicable, "argument.actual.constructor.iteration": notApplicable, "argument.actual.iteration": notApplicable, - "argument.actual.method": notApplicable, + "argument.actual.method.singleLine": notApplicable, + "argument.actual.method.multiLine": notApplicable, "argument.actual.method.iteration": notApplicable, - "argument.formal": notApplicable, - "argument.formal.constructor": notApplicable, + "argument.formal.singleLine": notApplicable, + "argument.formal.multiLine": notApplicable, + "argument.formal.constructor.singleLine": notApplicable, + "argument.formal.constructor.multiLine": notApplicable, "argument.formal.constructor.iteration": notApplicable, "argument.formal.iteration": notApplicable, - "argument.formal.method": notApplicable, + "argument.formal.method.singleLine": notApplicable, + "argument.formal.method.multiLine": notApplicable, "argument.formal.method.iteration": notApplicable, - "argument.formal.lambda": notApplicable, + "argument.formal.lambda.singleLine": notApplicable, + "argument.formal.lambda.multiLine": notApplicable, "argument.formal.lambda.iteration": notApplicable, "argumentList.actual.empty": notApplicable, "argumentList.actual.singleLine": notApplicable, From b947bcaae449fd023b09d5da571d73051b73857c Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Tue, 1 Jul 2025 15:21:40 +0200 Subject: [PATCH 2/5] Tests updated --- ...rgument.actual.constructor.multiLine.scope | 54 ++++++++++------- ...rgument.formal.constructor.multiLine.scope | 46 ++++++++------ .../argument.formal.lambda.multiLine.scope | 54 ++++++++++------- .../argument.formal.method.multiLine.scope | 54 ++++++++++------- .../csharp/argument.actual.multiLine.scope | 48 ++++++++------- .../csharp/argument.actual.singleLine.scope | 36 +++++------ .../argument.formal.lambda.multiLine.scope | 46 ++++++++------ .../csharp/argument.formal.multiLine.scope | 39 ++++++++++++ ...rgument.actual.constructor.multiLine.scope | 54 ++++++++++------- ...gument.actual.constructor.singleLine.scope | 12 ++-- .../argument.actual.method.multiLine.scope | 54 ++++++++++------- .../argument.actual.method.singleLine.scope | 12 ++-- .../java/argument.actual.multiLine.scope | 48 +++++++-------- .../java/argument.actual.singleLine.scope | 36 +++++------ ...rgument.actual.constructor.multiLine.scope | 54 ++++++++++------- ...gument.actual.constructor.singleLine.scope | 12 ++-- .../argument.actual.method.multiLine.scope | 54 ++++++++++------- .../argument.actual.method.singleLine.scope | 12 ++-- .../argument.actual.multiLine.scope | 46 ++++++++------ .../argument.actual.singleLine.scope | 12 ++-- ...rgument.formal.constructor.multiLine.scope | 54 ++++++++++------- ...gument.formal.constructor.singleLine.scope | 12 ++-- .../argument.formal.lambda.singleLine.scope | 54 +++++++---------- .../argument.formal.method.multiLine.scope | 54 ++++++++++------- .../argument.formal.method.singleLine.scope | 36 +++++------ .../argument.formal.multiLine.scope | 54 ++++++++++------- .../argument.formal.singleLine.scope | 36 +++++------ ...rgument.actual.constructor.multiLine.scope | 54 ++++++++++------- ...gument.actual.constructor.singleLine.scope | 36 +++++------ .../argument.actual.method.multiLine.scope | 54 ++++++++++------- .../argument.actual.method.singleLine.scope | 36 +++++------ .../php/argument.actual.multiLine.scope | 54 ++++++++++------- .../php/argument.actual.singleLine.scope | 36 +++++------ ...rgument.formal.constructor.multiLine.scope | 43 +++++++++++-- ...gument.formal.constructor.singleLine.scope | 33 ++++++++-- .../argument.formal.method.multiLine.scope | 54 ++++++++++------- .../argument.formal.method.singleLine.scope | 12 ++-- .../php/argument.formal.multiLine.scope | 54 ++++++++++------- .../php/argument.formal.singleLine.scope | 12 ++-- ...rgument.actual.constructor.multiLine.scope | 46 ++++++++------ ...gument.actual.constructor.singleLine.scope | 12 ++-- .../argument.actual.method.multiLine.scope | 54 ++++++++++------- .../argument.actual.method.singleLine.scope | 12 ++-- .../python/argument.actual.multiLine.scope | 54 ++++++++++------- .../python/argument.actual.singleLine.scope | 36 +++++------ .../scopes/r/argument.actual.multiLine.scope | 60 +++++++++---------- .../scopes/r/argument.formal.multiLine.scope | 54 ++++++++++------- .../ruby/argument.actual.multiLine.scope | 46 ++++++++------ .../ruby/argument.actual.multiLine2.scope | 54 ++++++++++------- .../ruby/argument.formal.multiLine.scope | 54 ++++++++++------- .../scala/argument.actual.multiLine.scope | 46 ++++++++------ .../scala/argument.formal.multiLine.scope | 54 ++++++++++------- .../scala/argument.formal.multiLine2.scope | 54 ++++++++++------- 53 files changed, 1257 insertions(+), 940 deletions(-) diff --git a/data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope index 3bacb191b7..d9817d4b7c 100644 --- a/data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/cpp/argument.actual.constructor.multiLine.scope @@ -5,32 +5,40 @@ new Foo( --- [#1 Content] = -[#1 Domain] = 0:8-0:11 - >---< -0| new Foo(aaa, bbb); +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:8-0:13 - >-----< -0| new Foo(aaa, bbb); +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:11-0:13 - >--< -0| new Foo(aaa, bbb); +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:13-0:16 - >---< -0| new Foo(aaa, bbb); - -[#2 Removal] = 0:11-0:16 - >-----< -0| new Foo(aaa, bbb); - -[#2 Leading delimiter] = 0:11-0:13 - >--< -0| new Foo(aaa, bbb); - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope index 8889594549..5b45d96711 100644 --- a/data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/cpp/argument.formal.constructor.multiLine.scope @@ -7,32 +7,40 @@ class Foo { --- [#1 Content] = -[#1 Domain] = 1:8-1:15 +[#1 Domain] = 2:8-2:15 >-------< -1| Foo(int aaa, int bbb) {} +2| int aaa, -[#1 Removal] = 1:8-1:17 - >---------< -1| Foo(int aaa, int bbb) {} +[#1 Removal] = 2:8-3:8 + >-------- +2| int aaa, +3| int bbb + --------< -[#1 Trailing delimiter] = 1:15-1:17 - >--< -1| Foo(int aaa, int bbb) {} +[#1 Trailing delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb + --------< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:17-1:24 - >-------< -1| Foo(int aaa, int bbb) {} +[#2 Domain] = 3:8-3:15 + >-------< +3| int bbb -[#2 Removal] = 1:15-1:24 - >---------< -1| Foo(int aaa, int bbb) {} +[#2 Removal] = 2:15-3:15 + >- +2| int aaa, +3| int bbb + ---------------< -[#2 Leading delimiter] = 1:15-1:17 - >--< -1| Foo(int aaa, int bbb) {} +[#2 Leading delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb + --------< -[#2 Insertion delimiter] = ", " +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope index 9d16d085bc..3fb614193e 100644 --- a/data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/cpp/argument.formal.lambda.multiLine.scope @@ -5,32 +5,40 @@ --- [#1 Content] = -[#1 Domain] = 0:3-0:10 - >-------< -0| [](int aaa, int bbb) {} +[#1 Domain] = 1:4-1:11 + >-------< +1| int aaa, -[#1 Removal] = 0:3-0:12 - >---------< -0| [](int aaa, int bbb) {} +[#1 Removal] = 1:4-2:4 + >-------- +1| int aaa, +2| int bbb + ----< -[#1 Trailing delimiter] = 0:10-0:12 - >--< -0| [](int aaa, int bbb) {} +[#1 Trailing delimiter] = 1:11-2:4 + >- +1| int aaa, +2| int bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:12-0:19 - >-------< -0| [](int aaa, int bbb) {} - -[#2 Removal] = 0:10-0:19 - >---------< -0| [](int aaa, int bbb) {} - -[#2 Leading delimiter] = 0:10-0:12 - >--< -0| [](int aaa, int bbb) {} - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:11 + >-------< +2| int bbb + +[#2 Removal] = 1:11-2:11 + >- +1| int aaa, +2| int bbb + -----------< + +[#2 Leading delimiter] = 1:11-2:4 + >- +1| int aaa, +2| int bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope b/data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope index 2fc1a156a1..71a62d0f04 100644 --- a/data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope +++ b/data/fixtures/scopes/cpp/argument.formal.method.multiLine.scope @@ -7,32 +7,40 @@ class Foo { --- [#1 Content] = -[#1 Domain] = 1:13-1:20 - >-------< -1| void bar(int aaa, int bbb) {} +[#1 Domain] = 2:8-2:15 + >-------< +2| int aaa, -[#1 Removal] = 1:13-1:22 - >---------< -1| void bar(int aaa, int bbb) {} +[#1 Removal] = 2:8-3:8 + >-------- +2| int aaa, +3| int bbb + --------< -[#1 Trailing delimiter] = 1:20-1:22 - >--< -1| void bar(int aaa, int bbb) {} +[#1 Trailing delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb + --------< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:22-1:29 - >-------< -1| void bar(int aaa, int bbb) {} - -[#2 Removal] = 1:20-1:29 - >---------< -1| void bar(int aaa, int bbb) {} - -[#2 Leading delimiter] = 1:20-1:22 - >--< -1| void bar(int aaa, int bbb) {} - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 3:8-3:15 + >-------< +3| int bbb + +[#2 Removal] = 2:15-3:15 + >- +2| int aaa, +3| int bbb + ---------------< + +[#2 Leading delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb + --------< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/csharp/argument.actual.multiLine.scope b/data/fixtures/scopes/csharp/argument.actual.multiLine.scope index 4b6f2a2e48..db3455bf74 100644 --- a/data/fixtures/scopes/csharp/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument.actual.multiLine.scope @@ -5,32 +5,40 @@ Foo( --- [#1 Content] = -[#1 Domain] = 0:4-0:5 - >-< -0| Foo(5, "bar"); - -[#1 Removal] = 0:4-0:7 +[#1 Domain] = 1:4-1:7 >---< -0| Foo(5, "bar"); +1| aaa, + +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:5-0:7 - >--< -0| Foo(5, "bar"); +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:7-0:12 - >-----< -0| Foo(5, "bar"); +[#2 Domain] = 2:4-2:7 + >---< +2| bbb -[#2 Removal] = 0:5-0:12 - >-------< -0| Foo(5, "bar"); +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< -[#2 Leading delimiter] = 0:5-0:7 - >--< -0| Foo(5, "bar"); +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#2 Insertion delimiter] = ", " +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/csharp/argument.actual.singleLine.scope b/data/fixtures/scopes/csharp/argument.actual.singleLine.scope index 5006d55eba..68a1ddd039 100644 --- a/data/fixtures/scopes/csharp/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/csharp/argument.actual.singleLine.scope @@ -2,32 +2,32 @@ Foo(aaa, bbb); --- [#1 Content] = -[#1 Domain] = 0:4-0:5 - >-< -0| Foo(5, "bar"); - -[#1 Removal] = 0:4-0:7 +[#1 Domain] = 0:4-0:7 >---< -0| Foo(5, "bar"); +0| Foo(aaa, bbb); + +[#1 Removal] = 0:4-0:9 + >-----< +0| Foo(aaa, bbb); -[#1 Trailing delimiter] = 0:5-0:7 - >--< -0| Foo(5, "bar"); +[#1 Trailing delimiter] = 0:7-0:9 + >--< +0| Foo(aaa, bbb); [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:7-0:12 - >-----< -0| Foo(5, "bar"); +[#2 Domain] = 0:9-0:12 + >---< +0| Foo(aaa, bbb); -[#2 Removal] = 0:5-0:12 - >-------< -0| Foo(5, "bar"); +[#2 Removal] = 0:7-0:12 + >-----< +0| Foo(aaa, bbb); -[#2 Leading delimiter] = 0:5-0:7 - >--< -0| Foo(5, "bar"); +[#2 Leading delimiter] = 0:7-0:9 + >--< +0| Foo(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope index 3cc10d2760..2134e15c7d 100644 --- a/data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument.formal.lambda.multiLine.scope @@ -5,32 +5,40 @@ --- [#1 Content] = -[#1 Domain] = 0:1-0:2 - >-< -0| (a, b) => {} +[#1 Domain] = 1:4-1:5 + >-< +1| a, -[#1 Removal] = 0:1-0:4 - >---< -0| (a, b) => {} +[#1 Removal] = 1:4-2:4 + >-- +1| a, +2| b + ----< -[#1 Trailing delimiter] = 0:2-0:4 - >--< -0| (a, b) => {} +[#1 Trailing delimiter] = 1:5-2:4 + >- +1| a, +2| b + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:4-0:5 +[#2 Domain] = 2:4-2:5 >-< -0| (a, b) => {} +2| b -[#2 Removal] = 0:2-0:5 - >---< -0| (a, b) => {} +[#2 Removal] = 1:5-2:5 + >- +1| a, +2| b + -----< -[#2 Leading delimiter] = 0:2-0:4 - >--< -0| (a, b) => {} +[#2 Leading delimiter] = 1:5-2:4 + >- +1| a, +2| b + ----< -[#2 Insertion delimiter] = ", " +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/csharp/argument.formal.multiLine.scope b/data/fixtures/scopes/csharp/argument.formal.multiLine.scope index ae7def66a0..fa5abb3481 100644 --- a/data/fixtures/scopes/csharp/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument.formal.multiLine.scope @@ -3,3 +3,42 @@ void Foo( int value ) {} --- + +[#1 Content] = +[#1 Domain] = 1:4-1:15 + >-----------< +1| String name, + +[#1 Removal] = 1:4-2:4 + >------------ +1| String name, +2| int value + ----< + +[#1 Trailing delimiter] = 1:15-2:4 + >- +1| String name, +2| int value + ----< + +[#1 Insertion delimiter] = ",\n" + + +[#2 Content] = +[#2 Domain] = 2:4-2:13 + >---------< +2| int value + +[#2 Removal] = 1:15-2:13 + >- +1| String name, +2| int value + -------------< + +[#2 Leading delimiter] = 1:15-2:4 + >- +1| String name, +2| int value + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope index 2656634bad..d9817d4b7c 100644 --- a/data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/java/argument.actual.constructor.multiLine.scope @@ -5,32 +5,40 @@ new Foo( --- [#1 Content] = -[#1 Domain] = 0:8-0:11 - >---< -0| new Foo(123, 456); +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:8-0:13 - >-----< -0| new Foo(123, 456); +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:11-0:13 - >--< -0| new Foo(123, 456); +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:13-0:16 - >---< -0| new Foo(123, 456); - -[#2 Removal] = 0:11-0:16 - >-----< -0| new Foo(123, 456); - -[#2 Leading delimiter] = 0:11-0:13 - >--< -0| new Foo(123, 456); - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope index 6200d9ea69..afee36448c 100644 --- a/data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope +++ b/data/fixtures/scopes/java/argument.actual.constructor.singleLine.scope @@ -4,15 +4,15 @@ new Foo(aaa, bbb); [#1 Content] = [#1 Domain] = 0:8-0:11 >---< -0| new Foo(123, 456); +0| new Foo(aaa, bbb); [#1 Removal] = 0:8-0:13 >-----< -0| new Foo(123, 456); +0| new Foo(aaa, bbb); [#1 Trailing delimiter] = 0:11-0:13 >--< -0| new Foo(123, 456); +0| new Foo(aaa, bbb); [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ new Foo(aaa, bbb); [#2 Content] = [#2 Domain] = 0:13-0:16 >---< -0| new Foo(123, 456); +0| new Foo(aaa, bbb); [#2 Removal] = 0:11-0:16 >-----< -0| new Foo(123, 456); +0| new Foo(aaa, bbb); [#2 Leading delimiter] = 0:11-0:13 >--< -0| new Foo(123, 456); +0| new Foo(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argument.actual.method.multiLine.scope b/data/fixtures/scopes/java/argument.actual.method.multiLine.scope index c243f844c4..f75aaa48de 100644 --- a/data/fixtures/scopes/java/argument.actual.method.multiLine.scope +++ b/data/fixtures/scopes/java/argument.actual.method.multiLine.scope @@ -5,32 +5,40 @@ foo.bar( --- [#1 Content] = -[#1 Domain] = 0:8-0:11 - >---< -0| foo.bar(123, 456); +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:8-0:13 - >-----< -0| foo.bar(123, 456); +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:11-0:13 - >--< -0| foo.bar(123, 456); +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:13-0:16 - >---< -0| foo.bar(123, 456); - -[#2 Removal] = 0:11-0:16 - >-----< -0| foo.bar(123, 456); - -[#2 Leading delimiter] = 0:11-0:13 - >--< -0| foo.bar(123, 456); - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argument.actual.method.singleLine.scope b/data/fixtures/scopes/java/argument.actual.method.singleLine.scope index 614e2ce9a9..46548a2c6c 100644 --- a/data/fixtures/scopes/java/argument.actual.method.singleLine.scope +++ b/data/fixtures/scopes/java/argument.actual.method.singleLine.scope @@ -4,15 +4,15 @@ foo.bar(aaa, bbb); [#1 Content] = [#1 Domain] = 0:8-0:11 >---< -0| foo.bar(123, 456); +0| foo.bar(aaa, bbb); [#1 Removal] = 0:8-0:13 >-----< -0| foo.bar(123, 456); +0| foo.bar(aaa, bbb); [#1 Trailing delimiter] = 0:11-0:13 >--< -0| foo.bar(123, 456); +0| foo.bar(aaa, bbb); [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ foo.bar(aaa, bbb); [#2 Content] = [#2 Domain] = 0:13-0:16 >---< -0| foo.bar(123, 456); +0| foo.bar(aaa, bbb); [#2 Removal] = 0:11-0:16 >-----< -0| foo.bar(123, 456); +0| foo.bar(aaa, bbb); [#2 Leading delimiter] = 0:11-0:13 >--< -0| foo.bar(123, 456); +0| foo.bar(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argument.actual.multiLine.scope b/data/fixtures/scopes/java/argument.actual.multiLine.scope index fbfc6dc54e..0e6191c19d 100644 --- a/data/fixtures/scopes/java/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/java/argument.actual.multiLine.scope @@ -5,40 +5,40 @@ myFunk( --- [#1 Content] = -[#1 Domain] = 1:4-1:5 - >-< -1| 5, +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, [#1 Removal] = 1:4-2:4 - >-- -1| 5, -2| "hello" + >---- +1| aaa, +2| bbb ----< -[#1 Trailing delimiter] = 1:5-2:4 - >- -1| 5, -2| "hello" +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 2:4-2:11 - >-------< -2| "hello" - -[#2 Removal] = 1:5-2:11 - >- -1| 5, -2| "hello" - -----------< - -[#2 Leading delimiter] = 1:5-2:4 - >- -1| 5, -2| "hello" +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb ----< [#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argument.actual.singleLine.scope b/data/fixtures/scopes/java/argument.actual.singleLine.scope index 5ff3cb2b44..50bbd7820a 100644 --- a/data/fixtures/scopes/java/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/java/argument.actual.singleLine.scope @@ -2,32 +2,32 @@ myFunk(aaa, bbb); --- [#1 Content] = -[#1 Domain] = 0:7-0:8 - >-< -0| myFunk(5, "hello"); - -[#1 Removal] = 0:7-0:10 +[#1 Domain] = 0:7-0:10 >---< -0| myFunk(5, "hello"); +0| myFunk(aaa, bbb); + +[#1 Removal] = 0:7-0:12 + >-----< +0| myFunk(aaa, bbb); -[#1 Trailing delimiter] = 0:8-0:10 - >--< -0| myFunk(5, "hello"); +[#1 Trailing delimiter] = 0:10-0:12 + >--< +0| myFunk(aaa, bbb); [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:10-0:17 - >-------< -0| myFunk(5, "hello"); +[#2 Domain] = 0:12-0:15 + >---< +0| myFunk(aaa, bbb); -[#2 Removal] = 0:8-0:17 - >---------< -0| myFunk(5, "hello"); +[#2 Removal] = 0:10-0:15 + >-----< +0| myFunk(aaa, bbb); -[#2 Leading delimiter] = 0:8-0:10 - >--< -0| myFunk(5, "hello"); +[#2 Leading delimiter] = 0:10-0:12 + >--< +0| myFunk(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope index b936fd5d42..13e7d39932 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.constructor.multiLine.scope @@ -5,32 +5,40 @@ new Foo( --- [#1 Content] = -[#1 Domain] = 0:8-0:11 - >---< -0| new Aaa(bbb, ccc) +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:8-0:13 - >-----< -0| new Aaa(bbb, ccc) +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:11-0:13 - >--< -0| new Aaa(bbb, ccc) +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:13-0:16 - >---< -0| new Aaa(bbb, ccc) - -[#2 Removal] = 0:11-0:16 - >-----< -0| new Aaa(bbb, ccc) - -[#2 Leading delimiter] = 0:11-0:13 - >--< -0| new Aaa(bbb, ccc) - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope index cb5ea1df83..aa86bb983f 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.constructor.singleLine.scope @@ -4,15 +4,15 @@ new Foo(aaa, bbb) [#1 Content] = [#1 Domain] = 0:8-0:11 >---< -0| new Aaa(bbb, ccc) +0| new Foo(aaa, bbb) [#1 Removal] = 0:8-0:13 >-----< -0| new Aaa(bbb, ccc) +0| new Foo(aaa, bbb) [#1 Trailing delimiter] = 0:11-0:13 >--< -0| new Aaa(bbb, ccc) +0| new Foo(aaa, bbb) [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ new Foo(aaa, bbb) [#2 Content] = [#2 Domain] = 0:13-0:16 >---< -0| new Aaa(bbb, ccc) +0| new Foo(aaa, bbb) [#2 Removal] = 0:11-0:16 >-----< -0| new Aaa(bbb, ccc) +0| new Foo(aaa, bbb) [#2 Leading delimiter] = 0:11-0:13 >--< -0| new Aaa(bbb, ccc) +0| new Foo(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope index 35949dabde..f75aaa48de 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.method.multiLine.scope @@ -5,32 +5,40 @@ foo.bar( --- [#1 Content] = -[#1 Domain] = 0:8-0:11 - >---< -0| aaa.bbb(ccc, ddd); +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:8-0:13 - >-----< -0| aaa.bbb(ccc, ddd); +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:11-0:13 - >--< -0| aaa.bbb(ccc, ddd); +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:13-0:16 - >---< -0| aaa.bbb(ccc, ddd); - -[#2 Removal] = 0:11-0:16 - >-----< -0| aaa.bbb(ccc, ddd); - -[#2 Leading delimiter] = 0:11-0:13 - >--< -0| aaa.bbb(ccc, ddd); - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope index 317ea13373..46548a2c6c 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.method.singleLine.scope @@ -4,15 +4,15 @@ foo.bar(aaa, bbb); [#1 Content] = [#1 Domain] = 0:8-0:11 >---< -0| aaa.bbb(ccc, ddd); +0| foo.bar(aaa, bbb); [#1 Removal] = 0:8-0:13 >-----< -0| aaa.bbb(ccc, ddd); +0| foo.bar(aaa, bbb); [#1 Trailing delimiter] = 0:11-0:13 >--< -0| aaa.bbb(ccc, ddd); +0| foo.bar(aaa, bbb); [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ foo.bar(aaa, bbb); [#2 Content] = [#2 Domain] = 0:13-0:16 >---< -0| aaa.bbb(ccc, ddd); +0| foo.bar(aaa, bbb); [#2 Removal] = 0:11-0:16 >-----< -0| aaa.bbb(ccc, ddd); +0| foo.bar(aaa, bbb); [#2 Leading delimiter] = 0:11-0:13 >--< -0| aaa.bbb(ccc, ddd); +0| foo.bar(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope index 5309b01f5a..6f7ea31f22 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.multiLine.scope @@ -5,32 +5,40 @@ foo( --- [#1 Content] = -[#1 Domain] = 0:4-0:7 +[#1 Domain] = 1:4-1:7 >---< -0| (bbb, ccc); +1| aaa, -[#1 Removal] = 0:4-0:9 - >-----< -0| (bbb, ccc); +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:7-0:9 - >--< -0| (bbb, ccc); +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:9-0:12 - >---< -0| aaa(bbb, ccc); +[#2 Domain] = 2:4-2:7 + >---< +2| bbb -[#2 Removal] = 0:7-0:12 - >-----< -0| aaa(bbb, ccc); +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< -[#2 Leading delimiter] = 0:7-0:9 - >--< -0| aaa(bbb, ccc); +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#2 Insertion delimiter] = ", " +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope b/data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope index 7d0a03e8c9..2e62d177c3 100644 --- a/data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.actual.singleLine.scope @@ -4,15 +4,15 @@ foo(aaa, bbb); [#1 Content] = [#1 Domain] = 0:4-0:7 >---< -0| (bbb, ccc); +0| foo(aaa, bbb); [#1 Removal] = 0:4-0:9 >-----< -0| (bbb, ccc); +0| foo(aaa, bbb); [#1 Trailing delimiter] = 0:7-0:9 >--< -0| (bbb, ccc); +0| foo(aaa, bbb); [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ foo(aaa, bbb); [#2 Content] = [#2 Domain] = 0:9-0:12 >---< -0| aaa(bbb, ccc); +0| foo(aaa, bbb); [#2 Removal] = 0:7-0:12 >-----< -0| aaa(bbb, ccc); +0| foo(aaa, bbb); [#2 Leading delimiter] = 0:7-0:9 >--< -0| aaa(bbb, ccc); +0| foo(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope index abd14b5f13..216da7a765 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.constructor.multiLine.scope @@ -7,32 +7,40 @@ class Foo { --- [#1 Content] = -[#1 Domain] = 1:14-1:17 - >---< -1| constructor(aaa, bbb) { } +[#1 Domain] = 2:4-2:7 + >---< +2| aaa, -[#1 Removal] = 1:14-1:19 - >-----< -1| constructor(aaa, bbb) { } +[#1 Removal] = 2:4-3:4 + >---- +2| aaa, +3| bbb + ----< -[#1 Trailing delimiter] = 1:17-1:19 - >--< -1| constructor(aaa, bbb) { } +[#1 Trailing delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:19-1:22 - >---< -1| constructor(aaa, bbb) { } - -[#2 Removal] = 1:17-1:22 - >-----< -1| constructor(aaa, bbb) { } - -[#2 Leading delimiter] = 1:17-1:19 - >--< -1| constructor(aaa, bbb) { } - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 3:4-3:7 + >---< +3| bbb + +[#2 Removal] = 2:7-3:7 + >- +2| aaa, +3| bbb + -------< + +[#2 Leading delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope index eb4ee3b289..369b0ece61 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.constructor.singleLine.scope @@ -6,15 +6,15 @@ class Foo { [#1 Content] = [#1 Domain] = 1:14-1:17 >---< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} [#1 Removal] = 1:14-1:19 >-----< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} [#1 Trailing delimiter] = 1:17-1:19 >--< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} [#1 Insertion delimiter] = ", " @@ -22,14 +22,14 @@ class Foo { [#2 Content] = [#2 Domain] = 1:19-1:22 >---< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} [#2 Removal] = 1:17-1:22 >-----< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} [#2 Leading delimiter] = 1:17-1:19 >--< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope index 455f74ad2c..b6b49f57b3 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.lambda.singleLine.scope @@ -2,40 +2,32 @@ --- [#1 Content] = -[#1 Domain] = 1:2-1:5 - >---< -1| aaa, +[#1 Domain] = 0:1-0:4 + >---< +0| (aaa, bbb) => { } -[#1 Removal] = 1:2-2:2 - >---- -1| aaa, -2| bbb - --< +[#1 Removal] = 0:1-0:6 + >-----< +0| (aaa, bbb) => { } -[#1 Trailing delimiter] = 1:5-2:2 - >- -1| aaa, -2| bbb - --< +[#1 Trailing delimiter] = 0:4-0:6 + >--< +0| (aaa, bbb) => { } -[#1 Insertion delimiter] = ",\n" +[#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 2:2-2:5 - >---< -2| bbb - -[#2 Removal] = 1:5-2:5 - >- -1| aaa, -2| bbb - -----< - -[#2 Leading delimiter] = 1:5-2:2 - >- -1| aaa, -2| bbb - --< - -[#2 Insertion delimiter] = ",\n" +[#2 Domain] = 0:6-0:9 + >---< +0| (aaa, bbb) => { } + +[#2 Removal] = 0:4-0:9 + >-----< +0| (aaa, bbb) => { } + +[#2 Leading delimiter] = 0:4-0:6 + >--< +0| (aaa, bbb) => { } + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope index 5efbb1a40a..bc3e86ba74 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.method.multiLine.scope @@ -7,32 +7,40 @@ class Foo { --- [#1 Content] = -[#1 Domain] = 1:9-1:12 - >---< -1| myFunk(aaa, bbb) { } +[#1 Domain] = 2:4-2:7 + >---< +2| aaa, -[#1 Removal] = 1:9-1:14 - >-----< -1| myFunk(aaa, bbb) { } +[#1 Removal] = 2:4-3:4 + >---- +2| aaa, +3| bbb + ----< -[#1 Trailing delimiter] = 1:12-1:14 - >--< -1| myFunk(aaa, bbb) { } +[#1 Trailing delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:14-1:17 - >---< -1| myFunk(aaa, bbb) { } - -[#2 Removal] = 1:12-1:17 - >-----< -1| myFunk(aaa, bbb) { } - -[#2 Leading delimiter] = 1:12-1:14 - >--< -1| myFunk(aaa, bbb) { } - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 3:4-3:7 + >---< +3| bbb + +[#2 Removal] = 2:7-3:7 + >- +2| aaa, +3| bbb + -------< + +[#2 Leading delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope index 212c19ab05..31ecb7368d 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.method.singleLine.scope @@ -4,32 +4,32 @@ class Foo { --- [#1 Content] = -[#1 Domain] = 1:9-1:12 - >---< -1| myFunk(aaa, bbb) { } +[#1 Domain] = 1:6-1:9 + >---< +1| bar(aaa, bbb) {} -[#1 Removal] = 1:9-1:14 - >-----< -1| myFunk(aaa, bbb) { } +[#1 Removal] = 1:6-1:11 + >-----< +1| bar(aaa, bbb) {} -[#1 Trailing delimiter] = 1:12-1:14 - >--< -1| myFunk(aaa, bbb) { } +[#1 Trailing delimiter] = 1:9-1:11 + >--< +1| bar(aaa, bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:14-1:17 - >---< -1| myFunk(aaa, bbb) { } +[#2 Domain] = 1:11-1:14 + >---< +1| bar(aaa, bbb) {} -[#2 Removal] = 1:12-1:17 - >-----< -1| myFunk(aaa, bbb) { } +[#2 Removal] = 1:9-1:14 + >-----< +1| bar(aaa, bbb) {} -[#2 Leading delimiter] = 1:12-1:14 - >--< -1| myFunk(aaa, bbb) { } +[#2 Leading delimiter] = 1:9-1:11 + >--< +1| bar(aaa, bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope index 3b217eee20..d969d562ad 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.multiLine.scope @@ -5,32 +5,40 @@ function foo( --- [#1 Content] = -[#1 Domain] = 0:16-0:19 - >---< -0| function myFunk(aaa, bbb) { } +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:16-0:21 - >-----< -0| function myFunk(aaa, bbb) { } +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:19-0:21 - >--< -0| function myFunk(aaa, bbb) { } +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:21-0:24 - >---< -0| function myFunk(aaa, bbb) { } - -[#2 Removal] = 0:19-0:24 - >-----< -0| function myFunk(aaa, bbb) { } - -[#2 Leading delimiter] = 0:19-0:21 - >--< -0| function myFunk(aaa, bbb) { } - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope b/data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope index 4f71414da1..faaed758e9 100644 --- a/data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argument.formal.singleLine.scope @@ -2,32 +2,32 @@ function foo(aaa, bbb) {} --- [#1 Content] = -[#1 Domain] = 0:16-0:19 - >---< -0| function myFunk(aaa, bbb) { } +[#1 Domain] = 0:13-0:16 + >---< +0| function foo(aaa, bbb) {} -[#1 Removal] = 0:16-0:21 - >-----< -0| function myFunk(aaa, bbb) { } +[#1 Removal] = 0:13-0:18 + >-----< +0| function foo(aaa, bbb) {} -[#1 Trailing delimiter] = 0:19-0:21 - >--< -0| function myFunk(aaa, bbb) { } +[#1 Trailing delimiter] = 0:16-0:18 + >--< +0| function foo(aaa, bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:21-0:24 - >---< -0| function myFunk(aaa, bbb) { } +[#2 Domain] = 0:18-0:21 + >---< +0| function foo(aaa, bbb) {} -[#2 Removal] = 0:19-0:24 - >-----< -0| function myFunk(aaa, bbb) { } +[#2 Removal] = 0:16-0:21 + >-----< +0| function foo(aaa, bbb) {} -[#2 Leading delimiter] = 0:19-0:21 - >--< -0| function myFunk(aaa, bbb) { } +[#2 Leading delimiter] = 0:16-0:18 + >--< +0| function foo(aaa, bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope index 00f21eb728..b8ee5447fd 100644 --- a/data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/php/argument.actual.constructor.multiLine.scope @@ -6,32 +6,40 @@ new MyClass( --- [#1 Content] = -[#1 Domain] = 1:12-1:13 - >-< -1| new MyClass(2, "foo") +[#1 Domain] = 2:4-2:7 + >---< +2| aaa, -[#1 Removal] = 1:12-1:15 - >---< -1| new MyClass(2, "foo") +[#1 Removal] = 2:4-3:4 + >---- +2| aaa, +3| bbb + ----< -[#1 Trailing delimiter] = 1:13-1:15 - >--< -1| new MyClass(2, "foo") +[#1 Trailing delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:15-1:20 - >-----< -1| new MyClass(2, "foo") - -[#2 Removal] = 1:13-1:20 - >-------< -1| new MyClass(2, "foo") - -[#2 Leading delimiter] = 1:13-1:15 - >--< -1| new MyClass(2, "foo") - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 3:4-3:7 + >---< +3| bbb + +[#2 Removal] = 2:7-3:7 + >- +2| aaa, +3| bbb + -------< + +[#2 Leading delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope index ad87e4f7c1..c7cd3e77bf 100644 --- a/data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope +++ b/data/fixtures/scopes/php/argument.actual.constructor.singleLine.scope @@ -3,32 +3,32 @@ new MyClass(aaa, bbb) --- [#1 Content] = -[#1 Domain] = 1:12-1:13 - >-< -1| new MyClass(2, "foo") - -[#1 Removal] = 1:12-1:15 +[#1 Domain] = 1:12-1:15 >---< -1| new MyClass(2, "foo") +1| new MyClass(aaa, bbb) + +[#1 Removal] = 1:12-1:17 + >-----< +1| new MyClass(aaa, bbb) -[#1 Trailing delimiter] = 1:13-1:15 - >--< -1| new MyClass(2, "foo") +[#1 Trailing delimiter] = 1:15-1:17 + >--< +1| new MyClass(aaa, bbb) [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:15-1:20 - >-----< -1| new MyClass(2, "foo") +[#2 Domain] = 1:17-1:20 + >---< +1| new MyClass(aaa, bbb) -[#2 Removal] = 1:13-1:20 - >-------< -1| new MyClass(2, "foo") +[#2 Removal] = 1:15-1:20 + >-----< +1| new MyClass(aaa, bbb) -[#2 Leading delimiter] = 1:13-1:15 - >--< -1| new MyClass(2, "foo") +[#2 Leading delimiter] = 1:15-1:17 + >--< +1| new MyClass(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.actual.method.multiLine.scope b/data/fixtures/scopes/php/argument.actual.method.multiLine.scope index 2e2428dde0..fc384251ae 100644 --- a/data/fixtures/scopes/php/argument.actual.method.multiLine.scope +++ b/data/fixtures/scopes/php/argument.actual.method.multiLine.scope @@ -6,32 +6,40 @@ foo.bar( --- [#1 Content] = -[#1 Domain] = 1:11-1:12 - >-< -1| obj.myFunc(2, "foo") +[#1 Domain] = 2:4-2:7 + >---< +2| aaa, -[#1 Removal] = 1:11-1:14 - >---< -1| obj.myFunc(2, "foo") +[#1 Removal] = 2:4-3:4 + >---- +2| aaa, +3| bbb + ----< -[#1 Trailing delimiter] = 1:12-1:14 - >--< -1| obj.myFunc(2, "foo") +[#1 Trailing delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:14-1:19 - >-----< -1| obj.myFunc(2, "foo") - -[#2 Removal] = 1:12-1:19 - >-------< -1| obj.myFunc(2, "foo") - -[#2 Leading delimiter] = 1:12-1:14 - >--< -1| obj.myFunc(2, "foo") - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 3:4-3:7 + >---< +3| bbb + +[#2 Removal] = 2:7-3:7 + >- +2| aaa, +3| bbb + -------< + +[#2 Leading delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument.actual.method.singleLine.scope b/data/fixtures/scopes/php/argument.actual.method.singleLine.scope index 6705256d79..3de01a720c 100644 --- a/data/fixtures/scopes/php/argument.actual.method.singleLine.scope +++ b/data/fixtures/scopes/php/argument.actual.method.singleLine.scope @@ -3,32 +3,32 @@ foo.bar(aaa, bbb) --- [#1 Content] = -[#1 Domain] = 1:11-1:12 - >-< -1| obj.myFunc(2, "foo") +[#1 Domain] = 1:8-1:11 + >---< +1| foo.bar(aaa, bbb) -[#1 Removal] = 1:11-1:14 - >---< -1| obj.myFunc(2, "foo") +[#1 Removal] = 1:8-1:13 + >-----< +1| foo.bar(aaa, bbb) -[#1 Trailing delimiter] = 1:12-1:14 - >--< -1| obj.myFunc(2, "foo") +[#1 Trailing delimiter] = 1:11-1:13 + >--< +1| foo.bar(aaa, bbb) [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:14-1:19 - >-----< -1| obj.myFunc(2, "foo") +[#2 Domain] = 1:13-1:16 + >---< +1| foo.bar(aaa, bbb) -[#2 Removal] = 1:12-1:19 - >-------< -1| obj.myFunc(2, "foo") +[#2 Removal] = 1:11-1:16 + >-----< +1| foo.bar(aaa, bbb) -[#2 Leading delimiter] = 1:12-1:14 - >--< -1| obj.myFunc(2, "foo") +[#2 Leading delimiter] = 1:11-1:13 + >--< +1| foo.bar(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.actual.multiLine.scope b/data/fixtures/scopes/php/argument.actual.multiLine.scope index 8dca45923c..666ae399eb 100644 --- a/data/fixtures/scopes/php/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/php/argument.actual.multiLine.scope @@ -6,32 +6,40 @@ foo( --- [#1 Content] = -[#1 Domain] = 1:7-1:8 - >-< -1| myFunc(2, "foo") +[#1 Domain] = 2:4-2:7 + >---< +2| aaa, -[#1 Removal] = 1:7-1:10 - >---< -1| myFunc(2, "foo") +[#1 Removal] = 2:4-3:4 + >---- +2| aaa, +3| bbb + ----< -[#1 Trailing delimiter] = 1:8-1:10 - >--< -1| myFunc(2, "foo") +[#1 Trailing delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:10-1:15 - >-----< -1| myFunc(2, "foo") - -[#2 Removal] = 1:8-1:15 - >-------< -1| myFunc(2, "foo") - -[#2 Leading delimiter] = 1:8-1:10 - >--< -1| myFunc(2, "foo") - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 3:4-3:7 + >---< +3| bbb + +[#2 Removal] = 2:7-3:7 + >- +2| aaa, +3| bbb + -------< + +[#2 Leading delimiter] = 2:7-3:4 + >- +2| aaa, +3| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument.actual.singleLine.scope b/data/fixtures/scopes/php/argument.actual.singleLine.scope index ee153043d5..b573365956 100644 --- a/data/fixtures/scopes/php/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/php/argument.actual.singleLine.scope @@ -3,32 +3,32 @@ foo(aaa, bbb) --- [#1 Content] = -[#1 Domain] = 1:7-1:8 - >-< -1| myFunc(2, "foo") +[#1 Domain] = 1:4-1:7 + >---< +1| foo(aaa, bbb) -[#1 Removal] = 1:7-1:10 - >---< -1| myFunc(2, "foo") +[#1 Removal] = 1:4-1:9 + >-----< +1| foo(aaa, bbb) -[#1 Trailing delimiter] = 1:8-1:10 - >--< -1| myFunc(2, "foo") +[#1 Trailing delimiter] = 1:7-1:9 + >--< +1| foo(aaa, bbb) [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:10-1:15 - >-----< -1| myFunc(2, "foo") +[#2 Domain] = 1:9-1:12 + >---< +1| foo(aaa, bbb) -[#2 Removal] = 1:8-1:15 - >-------< -1| myFunc(2, "foo") +[#2 Removal] = 1:7-1:12 + >-----< +1| foo(aaa, bbb) -[#2 Leading delimiter] = 1:8-1:10 - >--< -1| myFunc(2, "foo") +[#2 Leading delimiter] = 1:7-1:9 + >--< +1| foo(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/php/argument.formal.constructor.multiLine.scope index 8a9eb31173..4a98df1b43 100644 --- a/data/fixtures/scopes/php/argument.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/php/argument.formal.constructor.multiLine.scope @@ -7,10 +7,41 @@ class MyClass { } --- -[Content] = -[Removal] = -[Domain] = 2:25-2:37 - >------------< -2| function __construct(string $name) { +[#1 Content] = +[#1 Domain] = 3:8-3:20 + >------------< +3| string $name, -[Insertion delimiter] = ", " +[#1 Removal] = 3:8-4:8 + >------------- +3| string $name, +4| number $value + --------< + +[#1 Trailing delimiter] = 3:20-4:8 + >- +3| string $name, +4| number $value + --------< + +[#1 Insertion delimiter] = ",\n" + + +[#2 Content] = +[#2 Domain] = 4:8-4:21 + >-------------< +4| number $value + +[#2 Removal] = 3:20-4:21 + >- +3| string $name, +4| number $value + ---------------------< + +[#2 Leading delimiter] = 3:20-4:8 + >- +3| string $name, +4| number $value + --------< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope index c05657ebe1..df809d40b5 100644 --- a/data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/php/argument.formal.constructor.singleLine.scope @@ -4,10 +4,33 @@ class MyClass { } --- -[Content] = -[Removal] = -[Domain] = 2:25-2:37 +[#1 Content] = +[#1 Domain] = 2:25-2:37 >------------< -2| function __construct(string $name) { +2| function __construct(string $name, number $value) {} -[Insertion delimiter] = ", " +[#1 Removal] = 2:25-2:39 + >--------------< +2| function __construct(string $name, number $value) {} + +[#1 Trailing delimiter] = 2:37-2:39 + >--< +2| function __construct(string $name, number $value) {} + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 2:39-2:52 + >-------------< +2| function __construct(string $name, number $value) {} + +[#2 Removal] = 2:37-2:52 + >---------------< +2| function __construct(string $name, number $value) {} + +[#2 Leading delimiter] = 2:37-2:39 + >--< +2| function __construct(string $name, number $value) {} + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.formal.method.multiLine.scope b/data/fixtures/scopes/php/argument.formal.method.multiLine.scope index a3eb4aae6c..8eff694657 100644 --- a/data/fixtures/scopes/php/argument.formal.method.multiLine.scope +++ b/data/fixtures/scopes/php/argument.formal.method.multiLine.scope @@ -8,32 +8,40 @@ class MyClass { --- [#1 Content] = -[#1 Domain] = 2:20-2:26 - >------< -2| function myFunc($value, string $name) { } +[#1 Domain] = 3:8-3:14 + >------< +3| $value, -[#1 Removal] = 2:20-2:28 - >--------< -2| function myFunc($value, string $name) { } +[#1 Removal] = 3:8-4:8 + >------- +3| $value, +4| string $name + --------< -[#1 Trailing delimiter] = 2:26-2:28 - >--< -2| function myFunc($value, string $name) { } +[#1 Trailing delimiter] = 3:14-4:8 + >- +3| $value, +4| string $name + --------< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 2:28-2:40 - >------------< -2| function myFunc($value, string $name) { } - -[#2 Removal] = 2:26-2:40 - >--------------< -2| function myFunc($value, string $name) { } - -[#2 Leading delimiter] = 2:26-2:28 - >--< -2| function myFunc($value, string $name) { } - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 4:8-4:20 + >------------< +4| string $name + +[#2 Removal] = 3:14-4:20 + >- +3| $value, +4| string $name + --------------------< + +[#2 Leading delimiter] = 3:14-4:8 + >- +3| $value, +4| string $name + --------< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument.formal.method.singleLine.scope b/data/fixtures/scopes/php/argument.formal.method.singleLine.scope index dada35c5a1..de6e400ca2 100644 --- a/data/fixtures/scopes/php/argument.formal.method.singleLine.scope +++ b/data/fixtures/scopes/php/argument.formal.method.singleLine.scope @@ -7,15 +7,15 @@ class MyClass { [#1 Content] = [#1 Domain] = 2:20-2:26 >------< -2| function myFunc($value, string $name) { } +2| function myFunc($value, string $name) {} [#1 Removal] = 2:20-2:28 >--------< -2| function myFunc($value, string $name) { } +2| function myFunc($value, string $name) {} [#1 Trailing delimiter] = 2:26-2:28 >--< -2| function myFunc($value, string $name) { } +2| function myFunc($value, string $name) {} [#1 Insertion delimiter] = ", " @@ -23,14 +23,14 @@ class MyClass { [#2 Content] = [#2 Domain] = 2:28-2:40 >------------< -2| function myFunc($value, string $name) { } +2| function myFunc($value, string $name) {} [#2 Removal] = 2:26-2:40 >--------------< -2| function myFunc($value, string $name) { } +2| function myFunc($value, string $name) {} [#2 Leading delimiter] = 2:26-2:28 >--< -2| function myFunc($value, string $name) { } +2| function myFunc($value, string $name) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument.formal.multiLine.scope b/data/fixtures/scopes/php/argument.formal.multiLine.scope index 788f72a436..acb3d3210e 100644 --- a/data/fixtures/scopes/php/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/php/argument.formal.multiLine.scope @@ -6,32 +6,40 @@ function myFunc( --- [#1 Content] = -[#1 Domain] = 1:16-1:22 - >------< -1| function myFunc($value, string $name) { } +[#1 Domain] = 2:4-2:10 + >------< +2| $value, -[#1 Removal] = 1:16-1:24 - >--------< -1| function myFunc($value, string $name) { } +[#1 Removal] = 2:4-3:4 + >------- +2| $value, +3| string $name + ----< -[#1 Trailing delimiter] = 1:22-1:24 - >--< -1| function myFunc($value, string $name) { } +[#1 Trailing delimiter] = 2:10-3:4 + >- +2| $value, +3| string $name + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:24-1:36 - >------------< -1| function myFunc($value, string $name) { } - -[#2 Removal] = 1:22-1:36 - >--------------< -1| function myFunc($value, string $name) { } - -[#2 Leading delimiter] = 1:22-1:24 - >--< -1| function myFunc($value, string $name) { } - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 3:4-3:16 + >------------< +3| string $name + +[#2 Removal] = 2:10-3:16 + >- +2| $value, +3| string $name + ----------------< + +[#2 Leading delimiter] = 2:10-3:4 + >- +2| $value, +3| string $name + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument.formal.singleLine.scope b/data/fixtures/scopes/php/argument.formal.singleLine.scope index 2e03974889..e608773f35 100644 --- a/data/fixtures/scopes/php/argument.formal.singleLine.scope +++ b/data/fixtures/scopes/php/argument.formal.singleLine.scope @@ -5,15 +5,15 @@ function myFunc($value, string $name) {} [#1 Content] = [#1 Domain] = 1:16-1:22 >------< -1| function myFunc($value, string $name) { } +1| function myFunc($value, string $name) {} [#1 Removal] = 1:16-1:24 >--------< -1| function myFunc($value, string $name) { } +1| function myFunc($value, string $name) {} [#1 Trailing delimiter] = 1:22-1:24 >--< -1| function myFunc($value, string $name) { } +1| function myFunc($value, string $name) {} [#1 Insertion delimiter] = ", " @@ -21,14 +21,14 @@ function myFunc($value, string $name) {} [#2 Content] = [#2 Domain] = 1:24-1:36 >------------< -1| function myFunc($value, string $name) { } +1| function myFunc($value, string $name) {} [#2 Removal] = 1:22-1:36 >--------------< -1| function myFunc($value, string $name) { } +1| function myFunc($value, string $name) {} [#2 Leading delimiter] = 1:22-1:24 >--< -1| function myFunc($value, string $name) { } +1| function myFunc($value, string $name) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/python/argument.actual.constructor.multiLine.scope index 09cba34f08..cc80c0d324 100644 --- a/data/fixtures/scopes/python/argument.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/python/argument.actual.constructor.multiLine.scope @@ -5,32 +5,40 @@ Foo( --- [#1 Content] = -[#1 Domain] = 0:4-0:7 +[#1 Domain] = 1:4-1:7 >---< -0| Foo(123, 456) +1| aaa, -[#1 Removal] = 0:4-0:9 - >-----< -0| Foo(123, 456) +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:7-0:9 - >--< -0| Foo(123, 456) +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:9-0:12 - >---< -0| Foo(123, 456) +[#2 Domain] = 2:4-2:7 + >---< +2| bbb -[#2 Removal] = 0:7-0:12 - >-----< -0| Foo(123, 456) +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< -[#2 Leading delimiter] = 0:7-0:9 - >--< -0| Foo(123, 456) +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#2 Insertion delimiter] = ", " +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope index 1806b06cca..6adf6fe178 100644 --- a/data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope +++ b/data/fixtures/scopes/python/argument.actual.constructor.singleLine.scope @@ -4,15 +4,15 @@ Foo(aaa, bbb) [#1 Content] = [#1 Domain] = 0:4-0:7 >---< -0| Foo(123, 456) +0| Foo(aaa, bbb) [#1 Removal] = 0:4-0:9 >-----< -0| Foo(123, 456) +0| Foo(aaa, bbb) [#1 Trailing delimiter] = 0:7-0:9 >--< -0| Foo(123, 456) +0| Foo(aaa, bbb) [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ Foo(aaa, bbb) [#2 Content] = [#2 Domain] = 0:9-0:12 >---< -0| Foo(123, 456) +0| Foo(aaa, bbb) [#2 Removal] = 0:7-0:12 >-----< -0| Foo(123, 456) +0| Foo(aaa, bbb) [#2 Leading delimiter] = 0:7-0:9 >--< -0| Foo(123, 456) +0| Foo(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument.actual.method.multiLine.scope b/data/fixtures/scopes/python/argument.actual.method.multiLine.scope index abf31bc70c..7dace79cea 100644 --- a/data/fixtures/scopes/python/argument.actual.method.multiLine.scope +++ b/data/fixtures/scopes/python/argument.actual.method.multiLine.scope @@ -5,32 +5,40 @@ foo.bar( --- [#1 Content] = -[#1 Domain] = 0:8-0:11 - >---< -0| foo.bar(123, 456) +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:8-0:13 - >-----< -0| foo.bar(123, 456) +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:11-0:13 - >--< -0| foo.bar(123, 456) +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:13-0:16 - >---< -0| foo.bar(123, 456) - -[#2 Removal] = 0:11-0:16 - >-----< -0| foo.bar(123, 456) - -[#2 Leading delimiter] = 0:11-0:13 - >--< -0| foo.bar(123, 456) - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/python/argument.actual.method.singleLine.scope b/data/fixtures/scopes/python/argument.actual.method.singleLine.scope index b7620617e0..d22bd33706 100644 --- a/data/fixtures/scopes/python/argument.actual.method.singleLine.scope +++ b/data/fixtures/scopes/python/argument.actual.method.singleLine.scope @@ -4,15 +4,15 @@ foo.bar(aaa, bbb) [#1 Content] = [#1 Domain] = 0:8-0:11 >---< -0| foo.bar(123, 456) +0| foo.bar(aaa, bbb) [#1 Removal] = 0:8-0:13 >-----< -0| foo.bar(123, 456) +0| foo.bar(aaa, bbb) [#1 Trailing delimiter] = 0:11-0:13 >--< -0| foo.bar(123, 456) +0| foo.bar(aaa, bbb) [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ foo.bar(aaa, bbb) [#2 Content] = [#2 Domain] = 0:13-0:16 >---< -0| foo.bar(123, 456) +0| foo.bar(aaa, bbb) [#2 Removal] = 0:11-0:16 >-----< -0| foo.bar(123, 456) +0| foo.bar(aaa, bbb) [#2 Leading delimiter] = 0:11-0:13 >--< -0| foo.bar(123, 456) +0| foo.bar(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument.actual.multiLine.scope b/data/fixtures/scopes/python/argument.actual.multiLine.scope index 633fa82030..5ad321caa7 100644 --- a/data/fixtures/scopes/python/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/python/argument.actual.multiLine.scope @@ -5,32 +5,40 @@ foo( --- [#1 Content] = -[#1 Domain] = 0:4-0:9 - >-----< -0| foo("bar", 1) +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:4-0:11 - >-------< -0| foo("bar", 1) +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:9-0:11 - >--< -0| foo("bar", 1) +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:11-0:12 - >-< -0| foo("bar", 1) - -[#2 Removal] = 0:9-0:12 - >---< -0| foo("bar", 1) - -[#2 Leading delimiter] = 0:9-0:11 - >--< -0| foo("bar", 1) - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/python/argument.actual.singleLine.scope b/data/fixtures/scopes/python/argument.actual.singleLine.scope index f2c1a4bf15..b1a9403ff3 100644 --- a/data/fixtures/scopes/python/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/python/argument.actual.singleLine.scope @@ -2,32 +2,32 @@ foo(aaa, bbb) --- [#1 Content] = -[#1 Domain] = 0:4-0:9 - >-----< -0| foo("bar", 1) +[#1 Domain] = 0:4-0:7 + >---< +0| foo(aaa, bbb) -[#1 Removal] = 0:4-0:11 - >-------< -0| foo("bar", 1) +[#1 Removal] = 0:4-0:9 + >-----< +0| foo(aaa, bbb) -[#1 Trailing delimiter] = 0:9-0:11 - >--< -0| foo("bar", 1) +[#1 Trailing delimiter] = 0:7-0:9 + >--< +0| foo(aaa, bbb) [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:11-0:12 - >-< -0| foo("bar", 1) - -[#2 Removal] = 0:9-0:12 +[#2 Domain] = 0:9-0:12 >---< -0| foo("bar", 1) +0| foo(aaa, bbb) + +[#2 Removal] = 0:7-0:12 + >-----< +0| foo(aaa, bbb) -[#2 Leading delimiter] = 0:9-0:11 - >--< -0| foo("bar", 1) +[#2 Leading delimiter] = 0:7-0:9 + >--< +0| foo(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argument.actual.multiLine.scope b/data/fixtures/scopes/r/argument.actual.multiLine.scope index bcdcefc303..021b530ce8 100644 --- a/data/fixtures/scopes/r/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/r/argument.actual.multiLine.scope @@ -6,40 +6,40 @@ foo( --- [#1 Content] = -[#1 Domain] = 1:7-1:8 - >-< -1| x, - -[#1 Removal] = 1:7-2:7 - >-- -1| x, -2| y - -------< - -[#1 Trailing delimiter] = 1:8-2:7 - >- -1| x, -2| y - -------< +[#1 Domain] = 1:4-1:5 + >-< +1| x, + +[#1 Removal] = 1:4-2:4 + >-- +1| x, +2| y + ----< + +[#1 Trailing delimiter] = 1:5-2:4 + >- +1| x, +2| y + ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 2:7-2:8 - >-< -2| y - -[#2 Removal] = 1:8-2:8 - >- -1| x, -2| y - --------< - -[#2 Leading delimiter] = 1:8-2:7 - >- -1| x, -2| y - -------< +[#2 Domain] = 2:4-2:5 + >-< +2| y + +[#2 Removal] = 1:5-2:5 + >- +1| x, +2| y + -----< + +[#2 Leading delimiter] = 1:5-2:4 + >- +1| x, +2| y + ----< [#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/r/argument.formal.multiLine.scope b/data/fixtures/scopes/r/argument.formal.multiLine.scope index a6da251ce2..972534acf7 100644 --- a/data/fixtures/scopes/r/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/r/argument.formal.multiLine.scope @@ -5,32 +5,40 @@ abc <- function( --- [#1 Content] = -[#1 Domain] = 0:16-0:17 - >-< -0| abc <- function(x, y){ } +[#1 Domain] = 1:4-1:5 + >-< +1| x, -[#1 Removal] = 0:16-0:19 - >---< -0| abc <- function(x, y){ } +[#1 Removal] = 1:4-2:4 + >-- +1| x, +2| y + ----< -[#1 Trailing delimiter] = 0:17-0:19 - >--< -0| abc <- function(x, y){ } +[#1 Trailing delimiter] = 1:5-2:4 + >- +1| x, +2| y + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:19-0:20 - >-< -0| abc <- function(x, y){ } - -[#2 Removal] = 0:17-0:20 - >---< -0| abc <- function(x, y){ } - -[#2 Leading delimiter] = 0:17-0:19 - >--< -0| abc <- function(x, y){ } - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:5 + >-< +2| y + +[#2 Removal] = 1:5-2:5 + >- +1| x, +2| y + -----< + +[#2 Leading delimiter] = 1:5-2:4 + >- +1| x, +2| y + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/ruby/argument.actual.multiLine.scope b/data/fixtures/scopes/ruby/argument.actual.multiLine.scope index dee2687ecc..5ad321caa7 100644 --- a/data/fixtures/scopes/ruby/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/ruby/argument.actual.multiLine.scope @@ -5,32 +5,40 @@ foo( --- [#1 Content] = -[#1 Domain] = 0:4-0:7 +[#1 Domain] = 1:4-1:7 >---< -0| foo(aaa, bbb) +1| aaa, -[#1 Removal] = 0:4-0:9 - >-----< -0| foo(aaa, bbb) +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:7-0:9 - >--< -0| foo(aaa, bbb) +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:9-0:12 - >---< -0| foo(aaa, bbb) +[#2 Domain] = 2:4-2:7 + >---< +2| bbb -[#2 Removal] = 0:7-0:12 - >-----< -0| foo(aaa, bbb) +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< -[#2 Leading delimiter] = 0:7-0:9 - >--< -0| foo(aaa, bbb) +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#2 Insertion delimiter] = ", " +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/ruby/argument.actual.multiLine2.scope b/data/fixtures/scopes/ruby/argument.actual.multiLine2.scope index 5e7816dbb2..e967d43eb2 100644 --- a/data/fixtures/scopes/ruby/argument.actual.multiLine2.scope +++ b/data/fixtures/scopes/ruby/argument.actual.multiLine2.scope @@ -5,32 +5,40 @@ foo{ | --- [#1 Content] = -[#1 Domain] = 0:6-0:9 - >---< -0| foo{ |aaa, bbb| } +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:6-0:11 - >-----< -0| foo{ |aaa, bbb| } +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:9-0:11 - >--< -0| foo{ |aaa, bbb| } +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:11-0:14 - >---< -0| foo{ |aaa, bbb| } - -[#2 Removal] = 0:9-0:14 - >-----< -0| foo{ |aaa, bbb| } - -[#2 Leading delimiter] = 0:9-0:11 - >--< -0| foo{ |aaa, bbb| } - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/ruby/argument.formal.multiLine.scope b/data/fixtures/scopes/ruby/argument.formal.multiLine.scope index f133c1204c..6c757c9c3e 100644 --- a/data/fixtures/scopes/ruby/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/ruby/argument.formal.multiLine.scope @@ -5,32 +5,40 @@ def foo( --- [#1 Content] = -[#1 Domain] = 0:8-0:11 - >---< -0| def foo(aaa, bbb) +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, -[#1 Removal] = 0:8-0:13 - >-----< -0| def foo(aaa, bbb) +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:11-0:13 - >--< -0| def foo(aaa, bbb) +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:13-0:16 - >---< -0| def foo(aaa, bbb) - -[#2 Removal] = 0:11-0:16 - >-----< -0| def foo(aaa, bbb) - -[#2 Leading delimiter] = 0:11-0:13 - >--< -0| def foo(aaa, bbb) - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:7 + >---< +2| bbb + +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< + +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/scala/argument.actual.multiLine.scope b/data/fixtures/scopes/scala/argument.actual.multiLine.scope index dee2687ecc..5ad321caa7 100644 --- a/data/fixtures/scopes/scala/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/scala/argument.actual.multiLine.scope @@ -5,32 +5,40 @@ foo( --- [#1 Content] = -[#1 Domain] = 0:4-0:7 +[#1 Domain] = 1:4-1:7 >---< -0| foo(aaa, bbb) +1| aaa, -[#1 Removal] = 0:4-0:9 - >-----< -0| foo(aaa, bbb) +[#1 Removal] = 1:4-2:4 + >---- +1| aaa, +2| bbb + ----< -[#1 Trailing delimiter] = 0:7-0:9 - >--< -0| foo(aaa, bbb) +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:9-0:12 - >---< -0| foo(aaa, bbb) +[#2 Domain] = 2:4-2:7 + >---< +2| bbb -[#2 Removal] = 0:7-0:12 - >-----< -0| foo(aaa, bbb) +[#2 Removal] = 1:7-2:7 + >- +1| aaa, +2| bbb + -------< -[#2 Leading delimiter] = 0:7-0:9 - >--< -0| foo(aaa, bbb) +[#2 Leading delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb + ----< -[#2 Insertion delimiter] = ", " +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/scala/argument.formal.multiLine.scope b/data/fixtures/scopes/scala/argument.formal.multiLine.scope index 03e5583f3a..65344519d9 100644 --- a/data/fixtures/scopes/scala/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/scala/argument.formal.multiLine.scope @@ -5,32 +5,40 @@ def foo( --- [#1 Content] = -[#1 Domain] = 0:8-0:16 - >--------< -0| def foo(aaa: Int, bbb: Int) = x +[#1 Domain] = 1:4-1:12 + >--------< +1| aaa: Int, -[#1 Removal] = 0:8-0:18 - >----------< -0| def foo(aaa: Int, bbb: Int) = x +[#1 Removal] = 1:4-2:4 + >--------- +1| aaa: Int, +2| bbb: Int + ----< -[#1 Trailing delimiter] = 0:16-0:18 - >--< -0| def foo(aaa: Int, bbb: Int) = x +[#1 Trailing delimiter] = 1:12-2:4 + >- +1| aaa: Int, +2| bbb: Int + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:18-0:26 - >--------< -0| def foo(aaa: Int, bbb: Int) = x - -[#2 Removal] = 0:16-0:26 - >----------< -0| def foo(aaa: Int, bbb: Int) = x - -[#2 Leading delimiter] = 0:16-0:18 - >--< -0| def foo(aaa: Int, bbb: Int) = x - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:12 + >--------< +2| bbb: Int + +[#2 Removal] = 1:12-2:12 + >- +1| aaa: Int, +2| bbb: Int + ------------< + +[#2 Leading delimiter] = 1:12-2:4 + >- +1| aaa: Int, +2| bbb: Int + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/scala/argument.formal.multiLine2.scope b/data/fixtures/scopes/scala/argument.formal.multiLine2.scope index b6feeda0df..81e45e5c26 100644 --- a/data/fixtures/scopes/scala/argument.formal.multiLine2.scope +++ b/data/fixtures/scopes/scala/argument.formal.multiLine2.scope @@ -5,32 +5,40 @@ class Foo( --- [#1 Content] = -[#1 Domain] = 0:10-0:18 - >--------< -0| class Foo(aaa: Int, bbb: Int) {} +[#1 Domain] = 1:4-1:12 + >--------< +1| aaa: Int, -[#1 Removal] = 0:10-0:20 - >----------< -0| class Foo(aaa: Int, bbb: Int) {} +[#1 Removal] = 1:4-2:4 + >--------- +1| aaa: Int, +2| bbb: Int + ----< -[#1 Trailing delimiter] = 0:18-0:20 - >--< -0| class Foo(aaa: Int, bbb: Int) {} +[#1 Trailing delimiter] = 1:12-2:4 + >- +1| aaa: Int, +2| bbb: Int + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:20-0:28 - >--------< -0| class Foo(aaa: Int, bbb: Int) {} - -[#2 Removal] = 0:18-0:28 - >----------< -0| class Foo(aaa: Int, bbb: Int) {} - -[#2 Leading delimiter] = 0:18-0:20 - >--< -0| class Foo(aaa: Int, bbb: Int) {} - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:12 + >--------< +2| bbb: Int + +[#2 Removal] = 1:12-2:12 + >- +1| aaa: Int, +2| bbb: Int + ------------< + +[#2 Leading delimiter] = 1:12-2:4 + >- +1| aaa: Int, +2| bbb: Int + ----< + +[#2 Insertion delimiter] = ",\n" From 74c13ab26e6a809ed322f9f8eadc2b008d7c54c6 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Tue, 1 Jul 2025 21:18:00 +0200 Subject: [PATCH 3/5] scm scss --- .../scm/argument.actual.multiLine.scope | 48 ++++++++--------- .../scss/argument.actual.multiLine.scope | 54 +++++++++++-------- .../scss/name.argument.formal.iteration.scope | 7 +-- .../value.argument.formal.iteration.scope | 7 +-- queries/scm.scm | 5 +- queries/scss.scm | 6 +-- 6 files changed, 65 insertions(+), 62 deletions(-) diff --git a/data/fixtures/scopes/scm/argument.actual.multiLine.scope b/data/fixtures/scopes/scm/argument.actual.multiLine.scope index 8287d20752..72af30d95b 100644 --- a/data/fixtures/scopes/scm/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/scm/argument.actual.multiLine.scope @@ -5,36 +5,36 @@ --- [#1 Content] = -[#1 Domain] = 0:7-0:11 - >----< -0| (#foo? @aaa bbb) +[#1 Domain] = 1:4-1:8 + >----< +1| @aaa -[#1 Removal] = 0:7-0:12 - >-----< -0| (#foo? @aaa bbb) +[#1 Removal] = 1:0-2:0 + >-------- +1| @aaa +2| bbb + < -[#1 Leading delimiter] = 0:6-0:7 - >-< -0| (#foo? @aaa bbb) +[#1 Leading delimiter] = 1:0-1:4 + >----< +1| @aaa -[#1 Trailing delimiter] = 0:11-0:12 - >-< -0| (#foo? @aaa bbb) - -[#1 Insertion delimiter] = " " +[#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 0:12-0:15 - >---< -0| (#foo? @aaa bbb) +[#2 Domain] = 2:4-2:7 + >---< +2| bbb -[#2 Removal] = 0:11-0:15 - >----< -0| (#foo? @aaa bbb) +[#2 Removal] = 2:0-3:0 + >------- +2| bbb +3| ) + < -[#2 Leading delimiter] = 0:11-0:12 - >-< -0| (#foo? @aaa bbb) +[#2 Leading delimiter] = 2:0-2:4 + >----< +2| bbb -[#2 Insertion delimiter] = " " +[#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/scss/argument.actual.multiLine.scope b/data/fixtures/scopes/scss/argument.actual.multiLine.scope index 474dfae7fd..0e409a9ba7 100644 --- a/data/fixtures/scopes/scss/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/scss/argument.actual.multiLine.scope @@ -5,32 +5,40 @@ --- [#1 Content] = -[#1 Domain] = 0:20-0:26 - >------< -0| @mixin replace-text($image, $color: red) {} +[#1 Domain] = 1:4-1:10 + >------< +1| $image, -[#1 Removal] = 0:20-0:28 - >--------< -0| @mixin replace-text($image, $color: red) {} +[#1 Removal] = 1:4-2:4 + >------- +1| $image, +2| $color: red + ----< -[#1 Trailing delimiter] = 0:26-0:28 - >--< -0| @mixin replace-text($image, $color: red) {} +[#1 Trailing delimiter] = 1:10-2:4 + >- +1| $image, +2| $color: red + ----< -[#1 Insertion delimiter] = ", " +[#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 0:28-0:39 - >-----------< -0| @mixin replace-text($image, $color: red) {} - -[#2 Removal] = 0:26-0:39 - >-------------< -0| @mixin replace-text($image, $color: red) {} - -[#2 Leading delimiter] = 0:26-0:28 - >--< -0| @mixin replace-text($image, $color: red) {} - -[#2 Insertion delimiter] = ", " +[#2 Domain] = 2:4-2:15 + >-----------< +2| $color: red + +[#2 Removal] = 1:10-2:15 + >- +1| $image, +2| $color: red + ---------------< + +[#2 Leading delimiter] = 1:10-2:4 + >- +1| $image, +2| $color: red + ----< + +[#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/scss/name.argument.formal.iteration.scope b/data/fixtures/scopes/scss/name.argument.formal.iteration.scope index cb850e1273..a0203e0214 100644 --- a/data/fixtures/scopes/scss/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/scss/name.argument.formal.iteration.scope @@ -7,10 +7,7 @@ 0| @mixin replace-text($image, $color: red) {} -[#2 Range] = 0:20-0:39 +[#2 Range] = +[#2 Domain] = 0:20-0:39 >-------------------< 0| @mixin replace-text($image, $color: red) {} - -[#2 Domain] = 0:19-0:40 - >---------------------< -0| @mixin replace-text($image, $color: red) {} diff --git a/data/fixtures/scopes/scss/value.argument.formal.iteration.scope b/data/fixtures/scopes/scss/value.argument.formal.iteration.scope index cb850e1273..a0203e0214 100644 --- a/data/fixtures/scopes/scss/value.argument.formal.iteration.scope +++ b/data/fixtures/scopes/scss/value.argument.formal.iteration.scope @@ -7,10 +7,7 @@ 0| @mixin replace-text($image, $color: red) {} -[#2 Range] = 0:20-0:39 +[#2 Range] = +[#2 Domain] = 0:20-0:39 >-------------------< 0| @mixin replace-text($image, $color: red) {} - -[#2 Domain] = 0:19-0:40 - >---------------------< -0| @mixin replace-text($image, $color: red) {} diff --git a/queries/scm.scm b/queries/scm.scm index e4c56b35aa..4f5c6cc973 100644 --- a/queries/scm.scm +++ b/queries/scm.scm @@ -40,7 +40,8 @@ (predicate (parameters (_) @argumentOrParameter - ) + ) @_dummy + (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy " " "\n") ) ;;!! (#aaa? @bbb "ccc") @@ -49,7 +50,7 @@ (predicate (parameters) @argumentList @argumentOrParameter.iteration ) @argumentList.domain @argumentOrParameter.iteration.domain - (#single-or-multi-line-delimiter! @argumentList @argumentList.domain " " "\n") + (#single-or-multi-line-delimiter! @argumentList @argumentList " " "\n") ) ;;!! (aaa) @bbb diff --git a/queries/scss.scm b/queries/scss.scm index 31d5225515..db3c4ddd50 100644 --- a/queries/scss.scm +++ b/queries/scss.scm @@ -97,8 +97,8 @@ (_) @argumentOrParameter . (_)? @_.trailing.startOf - ) - (#insertion-delimiter! @argumentOrParameter ", ") + ) @_dummy + (#single-or-multi-line-delimiter! @argumentOrParameter @_dummy ", " ",\n") ) (_ @@ -111,7 +111,7 @@ (parameters "(" @name.iteration.start.endOf @value.iteration.start.endOf ")" @name.iteration.end.startOf @value.iteration.end.startOf -) @name.iteration.domain @value.iteration.domain +) ;;!! foo($foo: 123) ;;! ^^^^ ^^^ From 21141ebb0584a9cb31a0a4f6a392000df7ee395c Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Wed, 2 Jul 2025 10:52:01 +0200 Subject: [PATCH 4/5] java tests --- .../scopes/java/anonymousFunction.scope | 4 +- .../scopes/java/anonymousFunction2.scope | 13 ++---- ...rgument.actual.constructor.iteration.scope | 6 +-- .../java/argument.actual.iteration.scope | 14 +++--- .../argument.actual.method.iteration.scope | 6 +-- .../java/argument.actual.multiLine.scope | 2 +- .../java/argument.actual.singleLine.scope | 38 +++++++-------- ...rgument.formal.constructor.iteration.scope | 16 +++---- ...rgument.formal.constructor.multiLine.scope | 46 +++++++++---------- ...gument.formal.constructor.singleLine.scope | 40 ++++++++-------- .../argument.formal.lambda.iteration.scope | 10 ++-- .../argument.formal.lambda.multiLine.scope | 2 +- .../argument.formal.lambda.singleLine.scope | 14 +++--- .../argument.formal.method.iteration.scope | 16 +++---- .../argument.formal.method.multiLine.scope | 46 +++++++++---------- .../argument.formal.method.singleLine.scope | 40 ++++++++-------- 16 files changed, 154 insertions(+), 159 deletions(-) diff --git a/data/fixtures/scopes/java/anonymousFunction.scope b/data/fixtures/scopes/java/anonymousFunction.scope index 7e34880d05..7b67e0a019 100644 --- a/data/fixtures/scopes/java/anonymousFunction.scope +++ b/data/fixtures/scopes/java/anonymousFunction.scope @@ -1,10 +1,10 @@ -() -> 2; +() -> 0; --- [Content] = [Removal] = [Domain] = 0:0-0:7 >-------< -0| () -> 2; +0| () -> 0; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/anonymousFunction2.scope b/data/fixtures/scopes/java/anonymousFunction2.scope index 62fcb08eff..8d87d11a99 100644 --- a/data/fixtures/scopes/java/anonymousFunction2.scope +++ b/data/fixtures/scopes/java/anonymousFunction2.scope @@ -1,15 +1,10 @@ -(value) -> { - return value; -}; +() -> {}; --- [Content] = [Removal] = -[Domain] = 0:0-2:1 - >------------ -0| (value) -> { -1| return value; -2| }; - -< +[Domain] = 0:0-0:8 + >--------< +0| () -> {}; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/java/argument.actual.constructor.iteration.scope index db95ab13b4..13be0a78c1 100644 --- a/data/fixtures/scopes/java/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/java/argument.actual.constructor.iteration.scope @@ -1,10 +1,10 @@ -new Foo(123, 456); +new Foo(aaa, bbb); --- [Range] = 0:8-0:16 >--------< -0| new Foo(123, 456); +0| new Foo(aaa, bbb); [Domain] = 0:0-0:17 >-----------------< -0| new Foo(123, 456); +0| new Foo(aaa, bbb); diff --git a/data/fixtures/scopes/java/argument.actual.iteration.scope b/data/fixtures/scopes/java/argument.actual.iteration.scope index e08a363fef..c6b7e07196 100644 --- a/data/fixtures/scopes/java/argument.actual.iteration.scope +++ b/data/fixtures/scopes/java/argument.actual.iteration.scope @@ -1,10 +1,10 @@ -myFunk(5, "hello"); +foo(aaa, bbb); --- -[Range] = 0:7-0:17 - >----------< -0| myFunk(5, "hello"); +[Range] = 0:4-0:12 + >--------< +0| foo(aaa, bbb); -[Domain] = 0:0-0:18 - >------------------< -0| myFunk(5, "hello"); +[Domain] = 0:0-0:13 + >-------------< +0| foo(aaa, bbb); diff --git a/data/fixtures/scopes/java/argument.actual.method.iteration.scope b/data/fixtures/scopes/java/argument.actual.method.iteration.scope index df1bbc9480..b4fa962af8 100644 --- a/data/fixtures/scopes/java/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/java/argument.actual.method.iteration.scope @@ -1,10 +1,10 @@ -foo.bar(123, 456); +foo.bar(aaa, bbb); --- [Range] = 0:8-0:16 >--------< -0| foo.bar(123, 456); +0| foo.bar(aaa, bbb); [Domain] = 0:0-0:17 >-----------------< -0| foo.bar(123, 456); +0| foo.bar(aaa, bbb); diff --git a/data/fixtures/scopes/java/argument.actual.multiLine.scope b/data/fixtures/scopes/java/argument.actual.multiLine.scope index 0e6191c19d..6f7ea31f22 100644 --- a/data/fixtures/scopes/java/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/java/argument.actual.multiLine.scope @@ -1,4 +1,4 @@ -myFunk( +foo( aaa, bbb ); diff --git a/data/fixtures/scopes/java/argument.actual.singleLine.scope b/data/fixtures/scopes/java/argument.actual.singleLine.scope index 50bbd7820a..2e62d177c3 100644 --- a/data/fixtures/scopes/java/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/java/argument.actual.singleLine.scope @@ -1,33 +1,33 @@ -myFunk(aaa, bbb); +foo(aaa, bbb); --- [#1 Content] = -[#1 Domain] = 0:7-0:10 - >---< -0| myFunk(aaa, bbb); +[#1 Domain] = 0:4-0:7 + >---< +0| foo(aaa, bbb); -[#1 Removal] = 0:7-0:12 - >-----< -0| myFunk(aaa, bbb); +[#1 Removal] = 0:4-0:9 + >-----< +0| foo(aaa, bbb); -[#1 Trailing delimiter] = 0:10-0:12 - >--< -0| myFunk(aaa, bbb); +[#1 Trailing delimiter] = 0:7-0:9 + >--< +0| foo(aaa, bbb); [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:12-0:15 - >---< -0| myFunk(aaa, bbb); +[#2 Domain] = 0:9-0:12 + >---< +0| foo(aaa, bbb); -[#2 Removal] = 0:10-0:15 - >-----< -0| myFunk(aaa, bbb); +[#2 Removal] = 0:7-0:12 + >-----< +0| foo(aaa, bbb); -[#2 Leading delimiter] = 0:10-0:12 - >--< -0| myFunk(aaa, bbb); +[#2 Leading delimiter] = 0:7-0:9 + >--< +0| foo(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/java/argument.formal.constructor.iteration.scope index d060457e02..d5deb37214 100644 --- a/data/fixtures/scopes/java/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/java/argument.formal.constructor.iteration.scope @@ -1,12 +1,12 @@ -public class MyClass { - public MyClass(String name, int age) {} +public class Foo { + public Foo(int aaa, int bbb) {} } --- -[Range] = 1:19-1:39 - >--------------------< -1| public MyClass(String name, int age) {} +[Range] = 1:15-1:31 + >----------------< +1| public Foo(int aaa, int bbb) {} -[Domain] = 1:4-1:43 - >---------------------------------------< -1| public MyClass(String name, int age) {} +[Domain] = 1:4-1:35 + >-------------------------------< +1| public Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/java/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/java/argument.formal.constructor.multiLine.scope index 274cf2d097..36f1bbbb25 100644 --- a/data/fixtures/scopes/java/argument.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/java/argument.formal.constructor.multiLine.scope @@ -1,26 +1,26 @@ -public class MyClass { - public MyClass( - String name, - int age +public class Foo { + public Foo( + int aaa, + int bbb ) {} } --- [#1 Content] = -[#1 Domain] = 2:8-2:19 - >-----------< -2| String name, +[#1 Domain] = 2:8-2:15 + >-------< +2| int aaa, [#1 Removal] = 2:8-3:8 - >------------ -2| String name, -3| int age + >-------- +2| int aaa, +3| int bbb --------< -[#1 Trailing delimiter] = 2:19-3:8 - >- -2| String name, -3| int age +[#1 Trailing delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb --------< [#1 Insertion delimiter] = ",\n" @@ -29,18 +29,18 @@ public class MyClass { [#2 Content] = [#2 Domain] = 3:8-3:15 >-------< -3| int age +3| int bbb -[#2 Removal] = 2:19-3:15 - >- -2| String name, -3| int age +[#2 Removal] = 2:15-3:15 + >- +2| int aaa, +3| int bbb ---------------< -[#2 Leading delimiter] = 2:19-3:8 - >- -2| String name, -3| int age +[#2 Leading delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb --------< [#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/java/argument.formal.constructor.singleLine.scope index 7f0b1de10b..4134b9aa12 100644 --- a/data/fixtures/scopes/java/argument.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/java/argument.formal.constructor.singleLine.scope @@ -1,35 +1,35 @@ -public class MyClass { - public MyClass(String name, int age) {} +public class Foo { + public Foo(int aaa, int bbb) {} } --- [#1 Content] = -[#1 Domain] = 1:19-1:30 - >-----------< -1| public MyClass(String name, int age) {} +[#1 Domain] = 1:15-1:22 + >-------< +1| public Foo(int aaa, int bbb) {} -[#1 Removal] = 1:19-1:32 - >-------------< -1| public MyClass(String name, int age) {} +[#1 Removal] = 1:15-1:24 + >---------< +1| public Foo(int aaa, int bbb) {} -[#1 Trailing delimiter] = 1:30-1:32 - >--< -1| public MyClass(String name, int age) {} +[#1 Trailing delimiter] = 1:22-1:24 + >--< +1| public Foo(int aaa, int bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:32-1:39 - >-------< -1| public MyClass(String name, int age) {} +[#2 Domain] = 1:24-1:31 + >-------< +1| public Foo(int aaa, int bbb) {} -[#2 Removal] = 1:30-1:39 - >---------< -1| public MyClass(String name, int age) {} +[#2 Removal] = 1:22-1:31 + >---------< +1| public Foo(int aaa, int bbb) {} -[#2 Leading delimiter] = 1:30-1:32 - >--< -1| public MyClass(String name, int age) {} +[#2 Leading delimiter] = 1:22-1:24 + >--< +1| public Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/java/argument.formal.lambda.iteration.scope index 0459cda209..2dd31f2c28 100644 --- a/data/fixtures/scopes/java/argument.formal.lambda.iteration.scope +++ b/data/fixtures/scopes/java/argument.formal.lambda.iteration.scope @@ -1,10 +1,10 @@ -(aaa, bbb) -> { }; +(aaa, bbb) -> {}; --- [Range] = 0:1-0:9 >--------< -0| (aaa, bbb) -> { }; +0| (aaa, bbb) -> {}; -[Domain] = 0:0-0:17 - >-----------------< -0| (aaa, bbb) -> { }; +[Domain] = 0:0-0:16 + >----------------< +0| (aaa, bbb) -> {}; diff --git a/data/fixtures/scopes/java/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/java/argument.formal.lambda.multiLine.scope index 4057c29da4..9a132a7cb5 100644 --- a/data/fixtures/scopes/java/argument.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/java/argument.formal.lambda.multiLine.scope @@ -1,7 +1,7 @@ ( aaa, bbb -) -> { }; +) -> {}; --- [#1 Content] = diff --git a/data/fixtures/scopes/java/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/java/argument.formal.lambda.singleLine.scope index 01a0159cf9..2bbdb16049 100644 --- a/data/fixtures/scopes/java/argument.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/java/argument.formal.lambda.singleLine.scope @@ -1,18 +1,18 @@ -(aaa, bbb) -> { }; +(aaa, bbb) -> {}; --- [#1 Content] = [#1 Domain] = 0:1-0:4 >---< -0| (aaa, bbb) -> { }; +0| (aaa, bbb) -> {}; [#1 Removal] = 0:1-0:6 >-----< -0| (aaa, bbb) -> { }; +0| (aaa, bbb) -> {}; [#1 Trailing delimiter] = 0:4-0:6 >--< -0| (aaa, bbb) -> { }; +0| (aaa, bbb) -> {}; [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ [#2 Content] = [#2 Domain] = 0:6-0:9 >---< -0| (aaa, bbb) -> { }; +0| (aaa, bbb) -> {}; [#2 Removal] = 0:4-0:9 >-----< -0| (aaa, bbb) -> { }; +0| (aaa, bbb) -> {}; [#2 Leading delimiter] = 0:4-0:6 >--< -0| (aaa, bbb) -> { }; +0| (aaa, bbb) -> {}; [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argument.formal.method.iteration.scope b/data/fixtures/scopes/java/argument.formal.method.iteration.scope index 5f3e142d2a..8dd68093d0 100644 --- a/data/fixtures/scopes/java/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/java/argument.formal.method.iteration.scope @@ -1,12 +1,12 @@ -public class MyClass { - public void foo(String name, int age) {} +public class Foo { + public void bar(int aaa, int bbb) {} } --- -[Range] = 1:20-1:40 - >--------------------< -1| public void foo(String name, int age) {} +[Range] = 1:20-1:36 + >----------------< +1| public void bar(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 bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/java/argument.formal.method.multiLine.scope b/data/fixtures/scopes/java/argument.formal.method.multiLine.scope index 9251481a17..c6ddf961b9 100644 --- a/data/fixtures/scopes/java/argument.formal.method.multiLine.scope +++ b/data/fixtures/scopes/java/argument.formal.method.multiLine.scope @@ -1,26 +1,26 @@ -public class MyClass { - public void foo( - String name, - int age +public class Foo { + public void bar( + int aaa, + int bbb ) {} } --- [#1 Content] = -[#1 Domain] = 2:8-2:19 - >-----------< -2| String name, +[#1 Domain] = 2:8-2:15 + >-------< +2| int aaa, [#1 Removal] = 2:8-3:8 - >------------ -2| String name, -3| int age + >-------- +2| int aaa, +3| int bbb --------< -[#1 Trailing delimiter] = 2:19-3:8 - >- -2| String name, -3| int age +[#1 Trailing delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb --------< [#1 Insertion delimiter] = ",\n" @@ -29,18 +29,18 @@ public class MyClass { [#2 Content] = [#2 Domain] = 3:8-3:15 >-------< -3| int age +3| int bbb -[#2 Removal] = 2:19-3:15 - >- -2| String name, -3| int age +[#2 Removal] = 2:15-3:15 + >- +2| int aaa, +3| int bbb ---------------< -[#2 Leading delimiter] = 2:19-3:8 - >- -2| String name, -3| int age +[#2 Leading delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb --------< [#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argument.formal.method.singleLine.scope b/data/fixtures/scopes/java/argument.formal.method.singleLine.scope index a67504d3d3..ce0d42f7d2 100644 --- a/data/fixtures/scopes/java/argument.formal.method.singleLine.scope +++ b/data/fixtures/scopes/java/argument.formal.method.singleLine.scope @@ -1,35 +1,35 @@ -public class MyClass { - public void foo(String name, int age) {} +public class Foo { + public void bar(int aaa, int bbb) {} } --- [#1 Content] = -[#1 Domain] = 1:20-1:31 - >-----------< -1| public void foo(String name, int age) {} +[#1 Domain] = 1:20-1:27 + >-------< +1| public void bar(int aaa, int bbb) {} -[#1 Removal] = 1:20-1:33 - >-------------< -1| public void foo(String name, int age) {} +[#1 Removal] = 1:20-1:29 + >---------< +1| public void bar(int aaa, int bbb) {} -[#1 Trailing delimiter] = 1:31-1:33 - >--< -1| public void foo(String name, int age) {} +[#1 Trailing delimiter] = 1:27-1:29 + >--< +1| public void bar(int aaa, int bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:33-1:40 - >-------< -1| public void foo(String name, int age) {} +[#2 Domain] = 1:29-1:36 + >-------< +1| public void bar(int aaa, int bbb) {} -[#2 Removal] = 1:31-1:40 - >---------< -1| public void foo(String name, int age) {} +[#2 Removal] = 1:27-1:36 + >---------< +1| public void bar(int aaa, int bbb) {} -[#2 Leading delimiter] = 1:31-1:33 - >--< -1| public void foo(String name, int age) {} +[#2 Leading delimiter] = 1:27-1:29 + >--< +1| public void bar(int aaa, int bbb) {} [#2 Insertion delimiter] = ", " From 0a873cf4f2ceeb714c96fe27679f1a861da434bc Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Wed, 2 Jul 2025 11:13:58 +0200 Subject: [PATCH 5/5] Up dit --- packages/common/src/scopeSupportFacets/scss.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/common/src/scopeSupportFacets/scss.ts b/packages/common/src/scopeSupportFacets/scss.ts index b125c07aaf..41b333de1c 100644 --- a/packages/common/src/scopeSupportFacets/scss.ts +++ b/packages/common/src/scopeSupportFacets/scss.ts @@ -35,5 +35,6 @@ export const scssScopeSupport: LanguageScopeSupportFacetMap = { "interior.if": supported, "interior.function": supported, + "argument.actual.singleLine": supported, "argument.actual.multiLine": supported, };