diff --git a/data/fixtures/recorded/languages/cpp/takeAttribute.yml b/data/fixtures/recorded/languages/cpp/clearAttribute.yml similarity index 75% rename from data/fixtures/recorded/languages/cpp/takeAttribute.yml rename to data/fixtures/recorded/languages/cpp/clearAttribute.yml index 0b4e69897f..88cd9fa0d9 100644 --- a/data/fixtures/recorded/languages/cpp/takeAttribute.yml +++ b/data/fixtures/recorded/languages/cpp/clearAttribute.yml @@ -1,9 +1,9 @@ languageId: cpp command: version: 6 - spokenForm: take attribute + spokenForm: change attribute action: - name: setSelection + name: clearAndSetSelection target: type: primitive modifiers: @@ -21,9 +21,9 @@ initialState: marks: {} finalState: documentContents: | - [[nodiscard]] + [[]] int f(int a = 1) { } selections: - - anchor: {line: 0, character: 0} - active: {line: 0, character: 13} + - anchor: {line: 0, character: 2} + active: {line: 0, character: 2} diff --git a/data/fixtures/recorded/languages/php/changeFunk3.yml b/data/fixtures/recorded/languages/php/changeFunk3.yml index a67a9916a5..ebc4094c93 100644 --- a/data/fixtures/recorded/languages/php/changeFunk3.yml +++ b/data/fixtures/recorded/languages/php/changeFunk3.yml @@ -22,10 +22,9 @@ initialState: active: {line: 3, character: 0} marks: {} finalState: - documentContents: |- + documentContents: |+ ----------------< -0| foo.bar(int aaa, int bbb); +[Removal] = 0:8-0:16 + >--------< +0| foo.bar(aaa, bbb); -[Domain] = 0:0-0:25 - >-------------------------< -0| foo.bar(int aaa, int bbb); +[Domain] = 0:0-0:17 + >-----------------< +0| foo.bar(aaa, bbb); [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope index 0ffadea6cc..81eca1bb2c 100644 --- a/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope @@ -1,27 +1,10 @@ -switch (value) { - case 0: - break; - default: - break; -} +switch (foo) { } --- -[Content] = 0:16-5:0 - > -0| switch (value) { -1| case 0: -2| break; -3| default: -4| break; -5| } - < +[Content] = 0:14-0:15 + >-< +0| switch (foo) { } -[Domain] = 0:0-5:1 - >---------------- -0| switch (value) { -1| case 0: -2| break; -3| default: -4| break; -5| } - -< +[Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } diff --git a/data/fixtures/scopes/c/branch/branch.switchCase.scope b/data/fixtures/scopes/c/branch/branch.switchCase.scope index 4293cd1503..c67cd2b4cc 100644 --- a/data/fixtures/scopes/c/branch/branch.switchCase.scope +++ b/data/fixtures/scopes/c/branch/branch.switchCase.scope @@ -1,8 +1,7 @@ -switch (value) { +switch (foo) { case 0: break; - default: - break; + default: {} } --- @@ -17,7 +16,7 @@ switch (value) { >----------- 1| case 0: 2| break; -3| default: +3| default: {} < [#1 Leading delimiter] = 1:0-1:4 @@ -28,21 +27,18 @@ switch (value) { [#2 Content] = -[#2 Domain] = 3:4-4:14 - >-------- -3| default: -4| break; - --------------< - -[#2 Removal] = 3:0-5:0 - >------------ -3| default: -4| break; -5| } +[#2 Domain] = 3:4-3:15 + >-----------< +3| default: {} + +[#2 Removal] = 3:0-4:0 + >--------------- +3| default: {} +4| } < [#2 Leading delimiter] = 3:0-3:4 >----< -3| default: +3| default: {} [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/c/class/class4.scope b/data/fixtures/scopes/c/class/class4.scope index f5372dbb21..9a836f7ec7 100644 --- a/data/fixtures/scopes/c/class/class4.scope +++ b/data/fixtures/scopes/c/class/class4.scope @@ -1,10 +1,10 @@ -typedef struct { } Foo; +typedef struct {} Foo; --- [Content] = [Removal] = -[Domain] = 0:0-0:23 - >-----------------------< -0| typedef struct { } Foo; +[Domain] = 0:0-0:22 + >----------------------< +0| typedef struct {} Foo; [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/c/class/class5.scope b/data/fixtures/scopes/c/class/class5.scope index 2d7678d839..93bb3e1403 100644 --- a/data/fixtures/scopes/c/class/class5.scope +++ b/data/fixtures/scopes/c/class/class5.scope @@ -1,10 +1,10 @@ -typedef union { } Foo; +typedef union {} Foo; --- [Content] = [Removal] = -[Domain] = 0:0-0:22 - >----------------------< -0| typedef union { } Foo; +[Domain] = 0:0-0:21 + >---------------------< +0| typedef union {} Foo; [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/c/class/class6.scope b/data/fixtures/scopes/c/class/class6.scope index 08ce54b930..b6d530de0a 100644 --- a/data/fixtures/scopes/c/class/class6.scope +++ b/data/fixtures/scopes/c/class/class6.scope @@ -1,10 +1,10 @@ -typedef enum { } Foo; +typedef enum {} Foo; --- [Content] = [Removal] = -[Domain] = 0:0-0:21 - >---------------------< -0| typedef enum { } Foo; +[Domain] = 0:0-0:20 + >--------------------< +0| typedef enum {} Foo; [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/c/className.scope b/data/fixtures/scopes/c/className.scope deleted file mode 100644 index 80b471eef3..0000000000 --- a/data/fixtures/scopes/c/className.scope +++ /dev/null @@ -1,133 +0,0 @@ -struct aaa { int bbb; }; -union bbb { int ccc; }; -enum ccc { ddd, eee }; - -typedef struct { int fff; } ggg; -typedef union { int hhh; } iii; -typedef enum { jjj, kkk } lll; ---- - -[#1 Content] = 0:7-0:10 - >---< -0| struct aaa { int bbb; }; - -[#1 Removal] = 0:7-0:11 - >----< -0| struct aaa { int bbb; }; - -[#1 Leading delimiter] = 0:6-0:7 - >-< -0| struct aaa { int bbb; }; - -[#1 Trailing delimiter] = 0:10-0:11 - >-< -0| struct aaa { int bbb; }; - -[#1 Domain] = 0:0-0:24 - >------------------------< -0| struct aaa { int bbb; }; - -[#1 Insertion delimiter] = " " - - -[#2 Content] = 1:6-1:9 - >---< -1| union bbb { int ccc; }; - -[#2 Removal] = 1:6-1:10 - >----< -1| union bbb { int ccc; }; - -[#2 Leading delimiter] = 1:5-1:6 - >-< -1| union bbb { int ccc; }; - -[#2 Trailing delimiter] = 1:9-1:10 - >-< -1| union bbb { int ccc; }; - -[#2 Domain] = 1:0-1:23 - >-----------------------< -1| union bbb { int ccc; }; - -[#2 Insertion delimiter] = " " - - -[#3 Content] = 2:5-2:8 - >---< -2| enum ccc { ddd, eee }; - -[#3 Removal] = 2:5-2:9 - >----< -2| enum ccc { ddd, eee }; - -[#3 Leading delimiter] = 2:4-2:5 - >-< -2| enum ccc { ddd, eee }; - -[#3 Trailing delimiter] = 2:8-2:9 - >-< -2| enum ccc { ddd, eee }; - -[#3 Domain] = 2:0-2:22 - >----------------------< -2| enum ccc { ddd, eee }; - -[#3 Insertion delimiter] = " " - - -[#4 Content] = 4:28-4:31 - >---< -4| typedef struct { int fff; } ggg; - -[#4 Removal] = 4:27-4:31 - >----< -4| typedef struct { int fff; } ggg; - -[#4 Leading delimiter] = 4:27-4:28 - >-< -4| typedef struct { int fff; } ggg; - -[#4 Domain] = 4:0-4:32 - >--------------------------------< -4| typedef struct { int fff; } ggg; - -[#4 Insertion delimiter] = " " - - -[#5 Content] = 5:27-5:30 - >---< -5| typedef union { int hhh; } iii; - -[#5 Removal] = 5:26-5:30 - >----< -5| typedef union { int hhh; } iii; - -[#5 Leading delimiter] = 5:26-5:27 - >-< -5| typedef union { int hhh; } iii; - -[#5 Domain] = 5:0-5:31 - >-------------------------------< -5| typedef union { int hhh; } iii; - -[#5 Insertion delimiter] = " " - - -[#6 Content] = 6:26-6:29 - >---< -6| typedef enum { jjj, kkk } lll; - -[#6 Removal] = 6:25-6:29 - >----< -6| typedef enum { jjj, kkk } lll; - -[#6 Leading delimiter] = 6:25-6:26 - >-< -6| typedef enum { jjj, kkk } lll; - -[#6 Domain] = 6:0-6:30 - >------------------------------< -6| typedef enum { jjj, kkk } lll; - -[#6 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/className.iteration.document.scope b/data/fixtures/scopes/c/className/className.iteration.document.scope similarity index 100% rename from data/fixtures/scopes/c/className.iteration.document.scope rename to data/fixtures/scopes/c/className/className.iteration.document.scope diff --git a/data/fixtures/scopes/c/className/className.scope b/data/fixtures/scopes/c/className/className.scope new file mode 100644 index 0000000000..d576a567fe --- /dev/null +++ b/data/fixtures/scopes/c/className/className.scope @@ -0,0 +1,24 @@ +struct Foo {}; +--- + +[Content] = 0:7-0:10 + >---< +0| struct Foo {}; + +[Removal] = 0:7-0:11 + >----< +0| struct Foo {}; + +[Leading delimiter] = 0:6-0:7 + >-< +0| struct Foo {}; + +[Trailing delimiter] = 0:10-0:11 + >-< +0| struct Foo {}; + +[Domain] = 0:0-0:14 + >--------------< +0| struct Foo {}; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/className/className2.scope b/data/fixtures/scopes/c/className/className2.scope new file mode 100644 index 0000000000..5e439659ee --- /dev/null +++ b/data/fixtures/scopes/c/className/className2.scope @@ -0,0 +1,24 @@ +union Foo {}; +--- + +[Content] = 0:6-0:9 + >---< +0| union Foo {}; + +[Removal] = 0:6-0:10 + >----< +0| union Foo {}; + +[Leading delimiter] = 0:5-0:6 + >-< +0| union Foo {}; + +[Trailing delimiter] = 0:9-0:10 + >-< +0| union Foo {}; + +[Domain] = 0:0-0:13 + >-------------< +0| union Foo {}; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/className/className3.scope b/data/fixtures/scopes/c/className/className3.scope new file mode 100644 index 0000000000..cde4791988 --- /dev/null +++ b/data/fixtures/scopes/c/className/className3.scope @@ -0,0 +1,24 @@ +enum Foo {}; +--- + +[Content] = 0:5-0:8 + >---< +0| enum Foo {}; + +[Removal] = 0:5-0:9 + >----< +0| enum Foo {}; + +[Leading delimiter] = 0:4-0:5 + >-< +0| enum Foo {}; + +[Trailing delimiter] = 0:8-0:9 + >-< +0| enum Foo {}; + +[Domain] = 0:0-0:12 + >------------< +0| enum Foo {}; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/className/className4.scope b/data/fixtures/scopes/c/className/className4.scope new file mode 100644 index 0000000000..ff33e6325b --- /dev/null +++ b/data/fixtures/scopes/c/className/className4.scope @@ -0,0 +1,20 @@ +typedef struct {} Foo; +--- + +[Content] = 0:18-0:21 + >---< +0| typedef struct {} Foo; + +[Removal] = 0:17-0:21 + >----< +0| typedef struct {} Foo; + +[Leading delimiter] = 0:17-0:18 + >-< +0| typedef struct {} Foo; + +[Domain] = 0:0-0:22 + >----------------------< +0| typedef struct {} Foo; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/className/className5.scope b/data/fixtures/scopes/c/className/className5.scope new file mode 100644 index 0000000000..881793c827 --- /dev/null +++ b/data/fixtures/scopes/c/className/className5.scope @@ -0,0 +1,20 @@ +typedef union {} Foo; +--- + +[Content] = 0:17-0:20 + >---< +0| typedef union {} Foo; + +[Removal] = 0:16-0:20 + >----< +0| typedef union {} Foo; + +[Leading delimiter] = 0:16-0:17 + >-< +0| typedef union {} Foo; + +[Domain] = 0:0-0:21 + >---------------------< +0| typedef union {} Foo; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/className/className6.scope b/data/fixtures/scopes/c/className/className6.scope new file mode 100644 index 0000000000..bc6aa501ba --- /dev/null +++ b/data/fixtures/scopes/c/className/className6.scope @@ -0,0 +1,20 @@ +typedef enum {} Foo; +--- + +[Content] = 0:16-0:19 + >---< +0| typedef enum {} Foo; + +[Removal] = 0:15-0:19 + >----< +0| typedef enum {} Foo; + +[Leading delimiter] = 0:15-0:16 + >-< +0| typedef enum {} Foo; + +[Domain] = 0:0-0:20 + >--------------------< +0| typedef enum {} Foo; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/comment.block.scope b/data/fixtures/scopes/c/comment.block.scope index 7ff895eb3a..5e8b51111c 100644 --- a/data/fixtures/scopes/c/comment.block.scope +++ b/data/fixtures/scopes/c/comment.block.scope @@ -1,17 +1,10 @@ -/* - the - comment -*/ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-3:2 - >-- -0| /* -1| the -2| comment -3| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/c/comment.line.scope b/data/fixtures/scopes/c/comment.line.scope index 073c153403..7d1477b8a1 100644 --- a/data/fixtures/scopes/c/comment.line.scope +++ b/data/fixtures/scopes/c/comment.line.scope @@ -1,17 +1,10 @@ -int a; // the comment +// Hello world --- [Content] = -[Domain] = 0:7-0:21 - >--------------< -0| int a; // the comment - -[Removal] = 0:6-0:21 - >---------------< -0| int a; // the comment - -[Leading delimiter] = 0:6-0:7 - >-< -0| int a; // the comment +[Removal] = +[Domain] = 0:0-0:14 + >--------------< +0| // Hello world [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/c/condition/condition.for.scope b/data/fixtures/scopes/c/condition/condition.for.scope index 4a0bb6a2d3..ffb884ac10 100644 --- a/data/fixtures/scopes/c/condition/condition.for.scope +++ b/data/fixtures/scopes/c/condition/condition.for.scope @@ -1,20 +1,20 @@ -for (int i = 0; i < size; ++i) {} +for (int i = 0; i < size; i++) {} --- [Content] = 0:16-0:24 >--------< -0| for (int i = 0; i < size; ++i) {} +0| for (int i = 0; i < size; i++) {} [Removal] = 0:15-0:24 >---------< -0| for (int i = 0; i < size; ++i) {} +0| for (int i = 0; i < size; i++) {} [Leading delimiter] = 0:15-0:16 >-< -0| for (int i = 0; i < size; ++i) {} +0| for (int i = 0; i < size; i++) {} [Domain] = 0:0-0:33 >---------------------------------< -0| for (int i = 0; i < size; ++i) {} +0| for (int i = 0; i < size; i++) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope index f654d7ce4f..81eca1bb2c 100644 --- a/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope @@ -1,10 +1,10 @@ -switch (value) { } +switch (foo) { } --- -[Content] = 0:16-0:17 - >-< -0| switch (value) { } +[Content] = 0:14-0:15 + >-< +0| switch (foo) { } -[Domain] = 0:0-0:18 - >------------------< -0| switch (value) { } +[Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } diff --git a/data/fixtures/scopes/c/condition/condition.switchCase.scope b/data/fixtures/scopes/c/condition/condition.switchCase.scope index 529eefb74b..de92f6d536 100644 --- a/data/fixtures/scopes/c/condition/condition.switchCase.scope +++ b/data/fixtures/scopes/c/condition/condition.switchCase.scope @@ -1,25 +1,22 @@ -switch (value) { - case 0: - break; +switch (foo) { + case 0: break; } --- [Content] = 1:9-1:10 >-< -1| case 0: +1| case 0: break; [Removal] = 1:8-1:10 >--< -1| case 0: +1| case 0: break; [Leading delimiter] = 1:8-1:9 >-< -1| case 0: +1| case 0: break; -[Domain] = 1:4-2:14 - >------- -1| case 0: -2| break; - --------------< +[Domain] = 1:4-1:18 + >--------------< +1| case 0: break; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/ifStatement.scope b/data/fixtures/scopes/c/ifStatement.scope index 67460b075d..14f2507621 100644 --- a/data/fixtures/scopes/c/ifStatement.scope +++ b/data/fixtures/scopes/c/ifStatement.scope @@ -1,21 +1,15 @@ -void func() { - if (true) { } -} +if (true) {} +else if (false) {} +else {} --- [Content] = -[Domain] = 1:4-1:17 - >-------------< -1| if (true) { } - -[Removal] = 1:0-2:0 - >----------------- -1| if (true) { } -2| } - < - -[Leading delimiter] = 1:0-1:4 - >----< -1| if (true) { } +[Removal] = +[Domain] = 0:0-2:7 + >------------ +0| if (true) {} +1| else if (false) {} +2| else {} + -------< [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/c/interior/interior.class.scope b/data/fixtures/scopes/c/interior/interior.class.scope index 164ee35df2..8c41d4852e 100644 --- a/data/fixtures/scopes/c/interior/interior.class.scope +++ b/data/fixtures/scopes/c/interior/interior.class.scope @@ -1,31 +1,25 @@ -struct aaa { int bbb; }; +struct Foo { }; --- -[#1 Content] = 0:13-0:21 - >--------< -0| struct aaa { int bbb; }; +[#1 Content] = +[#1 Removal] = 0:12-0:13 + >-< +0| struct Foo { }; -[#1 Removal] = 0:12-0:22 - >----------< -0| struct aaa { int bbb; }; - -[#1 Domain] = 0:0-0:24 - >------------------------< -0| struct aaa { int bbb; }; +[#1 Domain] = 0:0-0:15 + >---------------< +0| struct Foo { }; [#1 Insertion delimiter] = " " -[#2 Content] = 0:13-0:21 - >--------< -0| struct aaa { int bbb; }; - -[#2 Removal] = 0:12-0:22 - >----------< -0| struct aaa { int bbb; }; +[#2 Content] = +[#2 Removal] = 0:12-0:13 + >-< +0| struct Foo { }; -[#2 Domain] = 0:11-0:23 - >------------< -0| struct aaa { int bbb; }; +[#2 Domain] = 0:11-0:14 + >---< +0| struct Foo { }; [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/interior/interior.class2.scope b/data/fixtures/scopes/c/interior/interior.class2.scope index eb42135bfa..26260af569 100644 --- a/data/fixtures/scopes/c/interior/interior.class2.scope +++ b/data/fixtures/scopes/c/interior/interior.class2.scope @@ -1,31 +1,25 @@ -typedef struct { int fff; } ggg; +union Foo { }; --- -[#1 Content] = 0:17-0:25 - >--------< -0| typedef struct { int fff; } ggg; +[#1 Content] = +[#1 Removal] = 0:11-0:12 + >-< +0| union Foo { }; -[#1 Removal] = 0:16-0:26 - >----------< -0| typedef struct { int fff; } ggg; - -[#1 Domain] = 0:0-0:32 - >--------------------------------< -0| typedef struct { int fff; } ggg; +[#1 Domain] = 0:0-0:14 + >--------------< +0| union Foo { }; [#1 Insertion delimiter] = " " -[#2 Content] = 0:17-0:25 - >--------< -0| typedef struct { int fff; } ggg; - -[#2 Removal] = 0:16-0:26 - >----------< -0| typedef struct { int fff; } ggg; +[#2 Content] = +[#2 Removal] = 0:11-0:12 + >-< +0| union Foo { }; -[#2 Domain] = 0:15-0:27 - >------------< -0| typedef struct { int fff; } ggg; +[#2 Domain] = 0:10-0:13 + >---< +0| union Foo { }; [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/interior/interior.class3.scope b/data/fixtures/scopes/c/interior/interior.class3.scope index caf1852f93..eee3cb02c2 100644 --- a/data/fixtures/scopes/c/interior/interior.class3.scope +++ b/data/fixtures/scopes/c/interior/interior.class3.scope @@ -1,31 +1,25 @@ -union bbb { int ccc; }; +typedef struct { } Foo; --- -[#1 Content] = 0:12-0:20 - >--------< -0| union bbb { int ccc; }; - -[#1 Removal] = 0:11-0:21 - >----------< -0| union bbb { int ccc; }; +[#1 Content] = +[#1 Removal] = 0:16-0:17 + >-< +0| typedef struct { } Foo; [#1 Domain] = 0:0-0:23 >-----------------------< -0| union bbb { int ccc; }; +0| typedef struct { } Foo; [#1 Insertion delimiter] = " " -[#2 Content] = 0:12-0:20 - >--------< -0| union bbb { int ccc; }; - -[#2 Removal] = 0:11-0:21 - >----------< -0| union bbb { int ccc; }; +[#2 Content] = +[#2 Removal] = 0:16-0:17 + >-< +0| typedef struct { } Foo; -[#2 Domain] = 0:10-0:22 - >------------< -0| union bbb { int ccc; }; +[#2 Domain] = 0:15-0:18 + >---< +0| typedef struct { } Foo; [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/interior/interior.class4.scope b/data/fixtures/scopes/c/interior/interior.class4.scope index 5cff878228..43c0d1f6de 100644 --- a/data/fixtures/scopes/c/interior/interior.class4.scope +++ b/data/fixtures/scopes/c/interior/interior.class4.scope @@ -1,31 +1,25 @@ -typedef union { int hhh; } iii; +typedef union { } Foo; --- -[#1 Content] = 0:16-0:24 - >--------< -0| typedef union { int hhh; } iii; +[#1 Content] = +[#1 Removal] = 0:15-0:16 + >-< +0| typedef union { } Foo; -[#1 Removal] = 0:15-0:25 - >----------< -0| typedef union { int hhh; } iii; - -[#1 Domain] = 0:0-0:31 - >-------------------------------< -0| typedef union { int hhh; } iii; +[#1 Domain] = 0:0-0:22 + >----------------------< +0| typedef union { } Foo; [#1 Insertion delimiter] = " " -[#2 Content] = 0:16-0:24 - >--------< -0| typedef union { int hhh; } iii; - -[#2 Removal] = 0:15-0:25 - >----------< -0| typedef union { int hhh; } iii; +[#2 Content] = +[#2 Removal] = 0:15-0:16 + >-< +0| typedef union { } Foo; -[#2 Domain] = 0:14-0:26 - >------------< -0| typedef union { int hhh; } iii; +[#2 Domain] = 0:14-0:17 + >---< +0| typedef union { } Foo; [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/interior/interior.function2.scope b/data/fixtures/scopes/c/interior/interior.function2.scope index 4b4ed12560..17dba94f16 100644 --- a/data/fixtures/scopes/c/interior/interior.function2.scope +++ b/data/fixtures/scopes/c/interior/interior.function2.scope @@ -1,37 +1,37 @@ -void NS::foo() { } +void Foo::bar() { } --- [#1 Content] = -[#1 Removal] = 0:16-0:17 - >-< -0| void NS::foo() { } +[#1 Removal] = 0:17-0:18 + >-< +0| void Foo::bar() { } -[#1 Domain] = 0:0-0:18 - >------------------< -0| void NS::foo() { } +[#1 Domain] = 0:0-0:19 + >-------------------< +0| void Foo::bar() { } [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:13-0:13 - >< -0| void NS::foo() { } +[#2 Removal] = 0:14-0:14 + >< +0| void Foo::bar() { } -[#2 Domain] = 0:12-0:14 - >--< -0| void NS::foo() { } +[#2 Domain] = 0:13-0:15 + >--< +0| void Foo::bar() { } [#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 0:16-0:17 - >-< -0| void NS::foo() { } +[#3 Removal] = 0:17-0:18 + >-< +0| void Foo::bar() { } -[#3 Domain] = 0:15-0:18 - >---< -0| void NS::foo() { } +[#3 Domain] = 0:16-0:19 + >---< +0| void Foo::bar() { } [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/interior/interior.switch.scope b/data/fixtures/scopes/c/interior/interior.switch.scope index e2ad168b18..fce2f668fa 100644 --- a/data/fixtures/scopes/c/interior/interior.switch.scope +++ b/data/fixtures/scopes/c/interior/interior.switch.scope @@ -1,37 +1,37 @@ -switch (value) { } +switch (foo) { } --- [#1 Content] = -[#1 Removal] = 0:16-0:17 - >-< -0| switch (value) { } +[#1 Removal] = 0:14-0:15 + >-< +0| switch (foo) { } -[#1 Domain] = 0:0-0:18 - >------------------< -0| switch (value) { } +[#1 Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:8-0:13 - >-----< -0| switch (value) { } +[#2 Removal] = 0:8-0:11 + >---< +0| switch (foo) { } -[#2 Domain] = 0:7-0:14 - >-------< -0| switch (value) { } +[#2 Domain] = 0:7-0:12 + >-----< +0| switch (foo) { } [#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 0:16-0:17 - >-< -0| switch (value) { } +[#3 Removal] = 0:14-0:15 + >-< +0| switch (foo) { } -[#3 Domain] = 0:15-0:18 - >---< -0| switch (value) { } +[#3 Domain] = 0:13-0:16 + >---< +0| switch (foo) { } [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/interior/interior.switchCase.scope b/data/fixtures/scopes/c/interior/interior.switchCase.scope index 58797959fa..79eec9b526 100644 --- a/data/fixtures/scopes/c/interior/interior.switchCase.scope +++ b/data/fixtures/scopes/c/interior/interior.switchCase.scope @@ -1,6 +1,6 @@ -switch (value) { +switch (foo) { case 0: - foo; + bar; break; case 1: { break; @@ -13,7 +13,7 @@ switch (value) { [#1 Content] = 1:4-8:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -22,11 +22,11 @@ switch (value) { 8| break; --------------< -[#1 Removal] = 0:16-9:0 - > -0| switch (value) { +[#1 Removal] = 0:14-9:0 + > +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -37,10 +37,10 @@ switch (value) { < [#1 Domain] = 0:0-9:1 - >---------------- -0| switch (value) { + >-------------- +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -54,13 +54,13 @@ switch (value) { [#2 Content] = -[#2 Removal] = 0:8-0:13 - >-----< -0| switch (value) { +[#2 Removal] = 0:8-0:11 + >---< +0| switch (foo) { -[#2 Domain] = 0:7-0:14 - >-------< -0| switch (value) { +[#2 Domain] = 0:7-0:12 + >-----< +0| switch (foo) { [#2 Insertion delimiter] = " " @@ -68,7 +68,7 @@ switch (value) { [#3 Content] = 1:4-8:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -77,11 +77,11 @@ switch (value) { 8| break; --------------< -[#3 Removal] = 0:16-9:0 - > -0| switch (value) { +[#3 Removal] = 0:14-9:0 + > +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -91,11 +91,11 @@ switch (value) { 9| } < -[#3 Domain] = 0:15-9:1 - >- -0| switch (value) { +[#3 Domain] = 0:13-9:1 + >- +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -111,14 +111,14 @@ switch (value) { [#4 Content] = [#4 Removal] = 2:8-3:14 >---- -2| foo; +2| bar; 3| break; --------------< [#4 Domain] = 1:4-3:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; --------------< diff --git a/data/fixtures/scopes/c/list.scope b/data/fixtures/scopes/c/list.scope index 98c308ef04..a3d684fe54 100644 --- a/data/fixtures/scopes/c/list.scope +++ b/data/fixtures/scopes/c/list.scope @@ -1,17 +1,17 @@ -int foo[3] = {a, 2, 3}; +int foo[2] = {aaa, bbb}; --- [Content] = -[Domain] = 0:13-0:22 - >---------< -0| int foo[3] = {a, 2, 3}; +[Domain] = 0:13-0:23 + >----------< +0| int foo[2] = {aaa, bbb}; -[Removal] = 0:12-0:22 - >----------< -0| int foo[3] = {a, 2, 3}; +[Removal] = 0:12-0:23 + >-----------< +0| int foo[2] = {aaa, bbb}; [Leading delimiter] = 0:12-0:13 >-< -0| int foo[3] = {a, 2, 3}; +0| int foo[2] = {aaa, bbb}; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.argument.formal.iteration.scope b/data/fixtures/scopes/c/name/name.argument.formal.iteration.scope index 7935150f75..43a1ad05e5 100644 --- a/data/fixtures/scopes/c/name/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/c/name/name.argument.formal.iteration.scope @@ -1,13 +1,13 @@ -void aaa(int bbb, int ccc); +void foo(int aaa, int bbb) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:27 - >---------------------------< -0| void aaa(int bbb, int ccc); +[#1 Domain] = 0:0-0:29 + >-----------------------------< +0| void foo(int aaa, int bbb) {} [#2 Content] = [#2 Domain] = 0:9-0:25 >----------------< -0| void aaa(int bbb, int ccc); +0| void foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/c/name/name.argument.formal.iteration2.scope b/data/fixtures/scopes/c/name/name.argument.formal.iteration2.scope index 400afaf133..2dcacae2c0 100644 --- a/data/fixtures/scopes/c/name/name.argument.formal.iteration2.scope +++ b/data/fixtures/scopes/c/name/name.argument.formal.iteration2.scope @@ -1,13 +1,13 @@ -void aaa(int bbb, int ccc) {} +void foo(int aaa, int bbb); --- [#1 Content] = -[#1 Domain] = 0:0-0:29 - >-----------------------------< -0| void aaa(int bbb, int ccc) {} +[#1 Domain] = 0:0-0:27 + >---------------------------< +0| void foo(int aaa, int bbb); [#2 Content] = [#2 Domain] = 0:9-0:25 >----------------< -0| void aaa(int bbb, int ccc) {} +0| void foo(int aaa, int bbb); diff --git a/data/fixtures/scopes/c/name/name.argument.formal.scope b/data/fixtures/scopes/c/name/name.argument.formal.scope index ba49ebcd8e..50784a96ad 100644 --- a/data/fixtures/scopes/c/name/name.argument.formal.scope +++ b/data/fixtures/scopes/c/name/name.argument.formal.scope @@ -1,36 +1,55 @@ -void aaa(int bbb); +void foo(int aaa, int bbb) {} --- [#1 Content] = [#1 Removal] = 0:5-0:8 >---< -0| void aaa(int bbb); +0| void foo(int aaa, int bbb) {} [#1 Leading delimiter] = 0:4-0:5 >-< -0| void aaa(int bbb); +0| void foo(int aaa, int bbb) {} -[#1 Domain] = 0:0-0:18 - >------------------< -0| void aaa(int bbb); +[#1 Domain] = 0:0-0:29 + >-----------------------------< +0| void foo(int aaa, int bbb) {} [#1 Insertion delimiter] = " " [#2 Content] = 0:13-0:16 >---< -0| void aaa(int bbb); +0| void foo(int aaa, int bbb) {} [#2 Removal] = 0:12-0:16 >----< -0| void aaa(int bbb); +0| void foo(int aaa, int bbb) {} [#2 Leading delimiter] = 0:12-0:13 >-< -0| void aaa(int bbb); +0| void foo(int aaa, int bbb) {} [#2 Domain] = 0:9-0:16 >-------< -0| void aaa(int bbb); +0| void foo(int aaa, int bbb) {} [#2 Insertion delimiter] = " " + + +[#3 Content] = 0:22-0:25 + >---< +0| void foo(int aaa, int bbb) {} + +[#3 Removal] = 0:21-0:25 + >----< +0| void foo(int aaa, int bbb) {} + +[#3 Leading delimiter] = 0:21-0:22 + >-< +0| void foo(int aaa, int bbb) {} + +[#3 Domain] = 0:18-0:25 + >-------< +0| void foo(int aaa, int bbb) {} + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.argument.formal2.scope b/data/fixtures/scopes/c/name/name.argument.formal2.scope index 499b395fe0..b50e9ba605 100644 --- a/data/fixtures/scopes/c/name/name.argument.formal2.scope +++ b/data/fixtures/scopes/c/name/name.argument.formal2.scope @@ -1,36 +1,55 @@ -void aaa(int bbb) {} +void foo(int aaa, int bbb); --- [#1 Content] = [#1 Removal] = 0:5-0:8 >---< -0| void aaa(int bbb) {} +0| void foo(int aaa, int bbb); [#1 Leading delimiter] = 0:4-0:5 >-< -0| void aaa(int bbb) {} +0| void foo(int aaa, int bbb); -[#1 Domain] = 0:0-0:20 - >--------------------< -0| void aaa(int bbb) {} +[#1 Domain] = 0:0-0:27 + >---------------------------< +0| void foo(int aaa, int bbb); [#1 Insertion delimiter] = " " [#2 Content] = 0:13-0:16 >---< -0| void aaa(int bbb) {} +0| void foo(int aaa, int bbb); [#2 Removal] = 0:12-0:16 >----< -0| void aaa(int bbb) {} +0| void foo(int aaa, int bbb); [#2 Leading delimiter] = 0:12-0:13 >-< -0| void aaa(int bbb) {} +0| void foo(int aaa, int bbb); [#2 Domain] = 0:9-0:16 >-------< -0| void aaa(int bbb) {} +0| void foo(int aaa, int bbb); [#2 Insertion delimiter] = " " + + +[#3 Content] = 0:22-0:25 + >---< +0| void foo(int aaa, int bbb); + +[#3 Removal] = 0:21-0:25 + >----< +0| void foo(int aaa, int bbb); + +[#3 Leading delimiter] = 0:21-0:22 + >-< +0| void foo(int aaa, int bbb); + +[#3 Domain] = 0:18-0:25 + >-------< +0| void foo(int aaa, int bbb); + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.assignment.scope b/data/fixtures/scopes/c/name/name.assignment.scope index 93ec7ac9eb..d516138753 100644 --- a/data/fixtures/scopes/c/name/name.assignment.scope +++ b/data/fixtures/scopes/c/name/name.assignment.scope @@ -1,20 +1,20 @@ -aaa = 0; +foo = 0; --- [Content] = 0:0-0:3 >---< -0| aaa = 0; +0| foo = 0; [Removal] = 0:0-0:6 >------< -0| aaa = 0; +0| foo = 0; [Trailing delimiter] = 0:3-0:6 >---< -0| aaa = 0; +0| foo = 0; [Domain] = 0:0-0:8 >--------< -0| aaa = 0; +0| foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.assignment2.scope b/data/fixtures/scopes/c/name/name.assignment2.scope index 8d6cc9cbf0..a3321e2022 100644 --- a/data/fixtures/scopes/c/name/name.assignment2.scope +++ b/data/fixtures/scopes/c/name/name.assignment2.scope @@ -1,20 +1,20 @@ -aaa += 0; +foo += 0; --- [Content] = 0:0-0:3 >---< -0| aaa += 0; +0| foo += 0; [Removal] = 0:0-0:7 >-------< -0| aaa += 0; +0| foo += 0; [Trailing delimiter] = 0:3-0:7 >----< -0| aaa += 0; +0| foo += 0; [Domain] = 0:0-0:9 >---------< -0| aaa += 0; +0| foo += 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.class.scope b/data/fixtures/scopes/c/name/name.class.scope index cffaa3122a..d576a567fe 100644 --- a/data/fixtures/scopes/c/name/name.class.scope +++ b/data/fixtures/scopes/c/name/name.class.scope @@ -1,133 +1,24 @@ -struct aaa {}; -union bbb {}; -enum ccc {}; - -typedef struct {} ggg; -typedef union {} iii; -typedef enum {} lll; +struct Foo {}; --- -[#1 Content] = 0:7-0:10 +[Content] = 0:7-0:10 >---< -0| struct aaa {}; +0| struct Foo {}; -[#1 Removal] = 0:7-0:11 +[Removal] = 0:7-0:11 >----< -0| struct aaa {}; +0| struct Foo {}; -[#1 Leading delimiter] = 0:6-0:7 +[Leading delimiter] = 0:6-0:7 >-< -0| struct aaa {}; +0| struct Foo {}; -[#1 Trailing delimiter] = 0:10-0:11 +[Trailing delimiter] = 0:10-0:11 >-< -0| struct aaa {}; +0| struct Foo {}; -[#1 Domain] = 0:0-0:14 +[Domain] = 0:0-0:14 >--------------< -0| struct aaa {}; - -[#1 Insertion delimiter] = " " - - -[#2 Content] = 1:6-1:9 - >---< -1| union bbb {}; - -[#2 Removal] = 1:6-1:10 - >----< -1| union bbb {}; - -[#2 Leading delimiter] = 1:5-1:6 - >-< -1| union bbb {}; - -[#2 Trailing delimiter] = 1:9-1:10 - >-< -1| union bbb {}; - -[#2 Domain] = 1:0-1:13 - >-------------< -1| union bbb {}; - -[#2 Insertion delimiter] = " " - - -[#3 Content] = 2:5-2:8 - >---< -2| enum ccc {}; - -[#3 Removal] = 2:5-2:9 - >----< -2| enum ccc {}; - -[#3 Leading delimiter] = 2:4-2:5 - >-< -2| enum ccc {}; - -[#3 Trailing delimiter] = 2:8-2:9 - >-< -2| enum ccc {}; - -[#3 Domain] = 2:0-2:12 - >------------< -2| enum ccc {}; - -[#3 Insertion delimiter] = " " - - -[#4 Content] = 4:18-4:21 - >---< -4| typedef struct {} ggg; - -[#4 Removal] = 4:17-4:21 - >----< -4| typedef struct {} ggg; - -[#4 Leading delimiter] = 4:17-4:18 - >-< -4| typedef struct {} ggg; - -[#4 Domain] = 4:0-4:22 - >----------------------< -4| typedef struct {} ggg; - -[#4 Insertion delimiter] = " " - - -[#5 Content] = 5:17-5:20 - >---< -5| typedef union {} iii; - -[#5 Removal] = 5:16-5:20 - >----< -5| typedef union {} iii; - -[#5 Leading delimiter] = 5:16-5:17 - >-< -5| typedef union {} iii; - -[#5 Domain] = 5:0-5:21 - >---------------------< -5| typedef union {} iii; - -[#5 Insertion delimiter] = " " - - -[#6 Content] = 6:16-6:19 - >---< -6| typedef enum {} lll; - -[#6 Removal] = 6:15-6:19 - >----< -6| typedef enum {} lll; - -[#6 Leading delimiter] = 6:15-6:16 - >-< -6| typedef enum {} lll; - -[#6 Domain] = 6:0-6:20 - >--------------------< -6| typedef enum {} lll; +0| struct Foo {}; -[#6 Insertion delimiter] = " " +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.class2.scope b/data/fixtures/scopes/c/name/name.class2.scope new file mode 100644 index 0000000000..5e439659ee --- /dev/null +++ b/data/fixtures/scopes/c/name/name.class2.scope @@ -0,0 +1,24 @@ +union Foo {}; +--- + +[Content] = 0:6-0:9 + >---< +0| union Foo {}; + +[Removal] = 0:6-0:10 + >----< +0| union Foo {}; + +[Leading delimiter] = 0:5-0:6 + >-< +0| union Foo {}; + +[Trailing delimiter] = 0:9-0:10 + >-< +0| union Foo {}; + +[Domain] = 0:0-0:13 + >-------------< +0| union Foo {}; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.class3.scope b/data/fixtures/scopes/c/name/name.class3.scope new file mode 100644 index 0000000000..cde4791988 --- /dev/null +++ b/data/fixtures/scopes/c/name/name.class3.scope @@ -0,0 +1,24 @@ +enum Foo {}; +--- + +[Content] = 0:5-0:8 + >---< +0| enum Foo {}; + +[Removal] = 0:5-0:9 + >----< +0| enum Foo {}; + +[Leading delimiter] = 0:4-0:5 + >-< +0| enum Foo {}; + +[Trailing delimiter] = 0:8-0:9 + >-< +0| enum Foo {}; + +[Domain] = 0:0-0:12 + >------------< +0| enum Foo {}; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.class4.scope b/data/fixtures/scopes/c/name/name.class4.scope new file mode 100644 index 0000000000..ff33e6325b --- /dev/null +++ b/data/fixtures/scopes/c/name/name.class4.scope @@ -0,0 +1,20 @@ +typedef struct {} Foo; +--- + +[Content] = 0:18-0:21 + >---< +0| typedef struct {} Foo; + +[Removal] = 0:17-0:21 + >----< +0| typedef struct {} Foo; + +[Leading delimiter] = 0:17-0:18 + >-< +0| typedef struct {} Foo; + +[Domain] = 0:0-0:22 + >----------------------< +0| typedef struct {} Foo; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.class5.scope b/data/fixtures/scopes/c/name/name.class5.scope new file mode 100644 index 0000000000..881793c827 --- /dev/null +++ b/data/fixtures/scopes/c/name/name.class5.scope @@ -0,0 +1,20 @@ +typedef union {} Foo; +--- + +[Content] = 0:17-0:20 + >---< +0| typedef union {} Foo; + +[Removal] = 0:16-0:20 + >----< +0| typedef union {} Foo; + +[Leading delimiter] = 0:16-0:17 + >-< +0| typedef union {} Foo; + +[Domain] = 0:0-0:21 + >---------------------< +0| typedef union {} Foo; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.class6.scope b/data/fixtures/scopes/c/name/name.class6.scope new file mode 100644 index 0000000000..bc6aa501ba --- /dev/null +++ b/data/fixtures/scopes/c/name/name.class6.scope @@ -0,0 +1,20 @@ +typedef enum {} Foo; +--- + +[Content] = 0:16-0:19 + >---< +0| typedef enum {} Foo; + +[Removal] = 0:15-0:19 + >----< +0| typedef enum {} Foo; + +[Leading delimiter] = 0:15-0:16 + >-< +0| typedef enum {} Foo; + +[Domain] = 0:0-0:20 + >--------------------< +0| typedef enum {} Foo; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.field.class.scope b/data/fixtures/scopes/c/name/name.field.class.scope index 5b04f97ffa..6e3ee80426 100644 --- a/data/fixtures/scopes/c/name/name.field.class.scope +++ b/data/fixtures/scopes/c/name/name.field.class.scope @@ -1,20 +1,20 @@ -struct { int bbb; }; +struct { int foo; }; --- [Content] = 0:13-0:16 >---< -0| struct { int bbb; }; +0| struct { int foo; }; [Removal] = 0:12-0:16 >----< -0| struct { int bbb; }; +0| struct { int foo; }; [Leading delimiter] = 0:12-0:13 >-< -0| struct { int bbb; }; +0| struct { int foo; }; [Domain] = 0:9-0:17 >--------< -0| struct { int bbb; }; +0| struct { int foo; }; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.field.class2.scope b/data/fixtures/scopes/c/name/name.field.class2.scope index 5d8020eee2..1e7993f440 100644 --- a/data/fixtures/scopes/c/name/name.field.class2.scope +++ b/data/fixtures/scopes/c/name/name.field.class2.scope @@ -1,20 +1,20 @@ -union { int bbb; }; +union { int foo; }; --- [Content] = 0:12-0:15 >---< -0| union { int bbb; }; +0| union { int foo; }; [Removal] = 0:11-0:15 >----< -0| union { int bbb; }; +0| union { int foo; }; [Leading delimiter] = 0:11-0:12 >-< -0| union { int bbb; }; +0| union { int foo; }; [Domain] = 0:8-0:16 >--------< -0| union { int bbb; }; +0| union { int foo; }; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.field.class3.scope b/data/fixtures/scopes/c/name/name.field.class3.scope deleted file mode 100644 index 2c12779364..0000000000 --- a/data/fixtures/scopes/c/name/name.field.class3.scope +++ /dev/null @@ -1,17 +0,0 @@ -struct { double aaa[3]; }; ---- - -[Content] = -[Removal] = 0:16-0:19 - >---< -0| struct { double aaa[3]; }; - -[Leading delimiter] = 0:15-0:16 - >-< -0| struct { double aaa[3]; }; - -[Domain] = 0:9-0:23 - >--------------< -0| struct { double aaa[3]; }; - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.function.scope b/data/fixtures/scopes/c/name/name.function.scope index 502edc21b0..3f34e8cda7 100644 --- a/data/fixtures/scopes/c/name/name.function.scope +++ b/data/fixtures/scopes/c/name/name.function.scope @@ -1,13 +1,13 @@ -void C::funcName() {} +void Foo::bar() {} --- [Content] = -[Removal] = 0:8-0:16 - >--------< -0| void C::funcName() {} +[Removal] = 0:10-0:13 + >---< +0| void Foo::bar() {} -[Domain] = 0:0-0:21 - >---------------------< -0| void C::funcName() {} +[Domain] = 0:0-0:18 + >------------------< +0| void Foo::bar() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.function2.scope b/data/fixtures/scopes/c/name/name.function2.scope index 9e40ba4f95..fc025efe55 100644 --- a/data/fixtures/scopes/c/name/name.function2.scope +++ b/data/fixtures/scopes/c/name/name.function2.scope @@ -1,13 +1,13 @@ -void C::funcName(); +void Foo::bar(); --- [Content] = -[Removal] = 0:8-0:16 - >--------< -0| void C::funcName(); +[Removal] = 0:10-0:13 + >---< +0| void Foo::bar(); -[Domain] = 0:0-0:19 - >-------------------< -0| void C::funcName(); +[Domain] = 0:0-0:16 + >----------------< +0| void Foo::bar(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.function3.scope b/data/fixtures/scopes/c/name/name.function3.scope index d4efab616e..80cde86ee4 100644 --- a/data/fixtures/scopes/c/name/name.function3.scope +++ b/data/fixtures/scopes/c/name/name.function3.scope @@ -1,17 +1,17 @@ -void aaa() {} +void foo() {} --- [Content] = [Removal] = 0:5-0:8 >---< -0| void aaa() {} +0| void foo() {} [Leading delimiter] = 0:4-0:5 >-< -0| void aaa() {} +0| void foo() {} [Domain] = 0:0-0:13 >-------------< -0| void aaa() {} +0| void foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.function4.scope b/data/fixtures/scopes/c/name/name.function4.scope index 09d348b493..e65f6f8937 100644 --- a/data/fixtures/scopes/c/name/name.function4.scope +++ b/data/fixtures/scopes/c/name/name.function4.scope @@ -1,17 +1,17 @@ -void aaa(); +void foo(); --- [Content] = [Removal] = 0:5-0:8 >---< -0| void aaa(); +0| void foo(); [Leading delimiter] = 0:4-0:5 >-< -0| void aaa(); +0| void foo(); [Domain] = 0:0-0:11 >-----------< -0| void aaa(); +0| void foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/name/name.iteration.class.scope b/data/fixtures/scopes/c/name/name.iteration.class.scope index db6aaa88e6..9ff489340b 100644 --- a/data/fixtures/scopes/c/name/name.iteration.class.scope +++ b/data/fixtures/scopes/c/name/name.iteration.class.scope @@ -1,24 +1,13 @@ struct Foo { }; - -typedef struct { } Bar; --- [#1 Content] = -[#1 Domain] = 0:0-2:23 - >--------------- +[#1 Domain] = 0:0-0:15 + >---------------< 0| struct Foo { }; -1| -2| typedef struct { } Bar; - -----------------------< [#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| struct Foo { }; - - -[#3 Content] = -[#3 Domain] = 2:16-2:17 - >-< -2| typedef struct { } Bar; diff --git a/data/fixtures/scopes/c/name/name.iteration.class2.scope b/data/fixtures/scopes/c/name/name.iteration.class2.scope index 0919e73336..a387250ea5 100644 --- a/data/fixtures/scopes/c/name/name.iteration.class2.scope +++ b/data/fixtures/scopes/c/name/name.iteration.class2.scope @@ -1,24 +1,13 @@ union Foo { }; - -typedef union { } Bar; --- [#1 Content] = -[#1 Domain] = 0:0-2:22 - >-------------- +[#1 Domain] = 0:0-0:14 + >--------------< 0| union Foo { }; -1| -2| typedef union { } Bar; - ----------------------< [#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| union Foo { }; - - -[#3 Content] = -[#3 Domain] = 2:15-2:16 - >-< -2| typedef union { } Bar; diff --git a/data/fixtures/scopes/c/name/name.iteration.class3.scope b/data/fixtures/scopes/c/name/name.iteration.class3.scope new file mode 100644 index 0000000000..41ffe3eec3 --- /dev/null +++ b/data/fixtures/scopes/c/name/name.iteration.class3.scope @@ -0,0 +1,13 @@ +typedef struct { } Foo; +--- + +[#1 Content] = +[#1 Domain] = 0:0-0:23 + >-----------------------< +0| typedef struct { } Foo; + + +[#2 Content] = +[#2 Domain] = 0:16-0:17 + >-< +0| typedef struct { } Foo; diff --git a/data/fixtures/scopes/c/name/name.iteration.class4.scope b/data/fixtures/scopes/c/name/name.iteration.class4.scope new file mode 100644 index 0000000000..a5f7348a1e --- /dev/null +++ b/data/fixtures/scopes/c/name/name.iteration.class4.scope @@ -0,0 +1,13 @@ +typedef union { } Foo; +--- + +[#1 Content] = +[#1 Domain] = 0:0-0:22 + >----------------------< +0| typedef union { } Foo; + + +[#2 Content] = +[#2 Domain] = 0:15-0:16 + >-< +0| typedef union { } Foo; diff --git a/data/fixtures/scopes/c/name/name.variable.scope b/data/fixtures/scopes/c/name/name.variable.scope index 77af13748d..c0828198a5 100644 --- a/data/fixtures/scopes/c/name/name.variable.scope +++ b/data/fixtures/scopes/c/name/name.variable.scope @@ -1,24 +1,24 @@ -int aaa = 0; +int foo = 0; --- [Content] = 0:4-0:7 >---< -0| int aaa = 0; +0| int foo = 0; [Removal] = 0:0-0:10 >----------< -0| int aaa = 0; +0| int foo = 0; [Leading delimiter] = 0:3-0:4 >-< -0| int aaa = 0; +0| int foo = 0; [Trailing delimiter] = 0:7-0:8 >-< -0| int aaa = 0; +0| int foo = 0; [Domain] = 0:0-0:12 >------------< -0| int aaa = 0; +0| int foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/namedFunction.iteration.document.scope b/data/fixtures/scopes/c/namedFunction.iteration.document.scope index 5f7229c80f..3196afd2bb 100644 --- a/data/fixtures/scopes/c/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/c/namedFunction.iteration.document.scope @@ -1,5 +1,5 @@ -void foo() { } +void foo() {} --- @@ -7,6 +7,6 @@ void foo() { } [Domain] = 0:0-2:0 > 0| -1| void foo() { } +1| void foo() {} 2| < diff --git a/data/fixtures/scopes/c/namedFunction.scope b/data/fixtures/scopes/c/namedFunction.scope index bd479b6084..74e8628bdc 100644 --- a/data/fixtures/scopes/c/namedFunction.scope +++ b/data/fixtures/scopes/c/namedFunction.scope @@ -1,10 +1,10 @@ -int f(int a, int b) { } +int foo() {} --- [Content] = [Removal] = -[Domain] = 0:0-0:23 - >-----------------------< -0| int f(int a, int b) { } +[Domain] = 0:0-0:12 + >------------< +0| int foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/c/namedFunction2.scope b/data/fixtures/scopes/c/namedFunction2.scope index ab284f1b7d..d611a7619f 100644 --- a/data/fixtures/scopes/c/namedFunction2.scope +++ b/data/fixtures/scopes/c/namedFunction2.scope @@ -1,10 +1,10 @@ -int f(int a, int b); +int foo(); --- [Content] = [Removal] = -[Domain] = 0:0-0:20 - >--------------------< -0| int f(int a, int b); +[Domain] = 0:0-0:10 + >----------< +0| int foo(); [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/c/statement/statement.class.scope b/data/fixtures/scopes/c/statement/statement.class.scope index f6680edf50..00df5df1b5 100644 --- a/data/fixtures/scopes/c/statement/statement.class.scope +++ b/data/fixtures/scopes/c/statement/statement.class.scope @@ -1,91 +1,10 @@ -struct aaa {}; -union bbb {}; -enum ccc {}; - -typedef struct {} ddd; -typedef union {} eee; -typedef enum {} fff; +struct Foo {}; --- -[#1 Content] = -[#1 Domain] = 0:0-0:14 +[Content] = +[Removal] = +[Domain] = 0:0-0:14 >--------------< -0| struct aaa {}; - -[#1 Removal] = 0:0-1:0 - >-------------- -0| struct aaa {}; -1| union bbb {}; - < - -[#1 Insertion delimiter] = "\n" - - -[#2 Content] = -[#2 Domain] = 1:0-1:13 - >-------------< -1| union bbb {}; - -[#2 Removal] = 1:0-2:0 - >------------- -1| union bbb {}; -2| enum ccc {}; - < - -[#2 Insertion delimiter] = "\n" - - -[#3 Content] = -[#3 Domain] = 2:0-2:12 - >------------< -2| enum ccc {}; - -[#3 Removal] = 2:0-3:0 - >------------ -2| enum ccc {}; -3| - < - -[#3 Insertion delimiter] = "\n" - - -[#4 Content] = -[#4 Domain] = 4:0-4:22 - >----------------------< -4| typedef struct {} ddd; - -[#4 Removal] = 4:0-5:0 - >---------------------- -4| typedef struct {} ddd; -5| typedef union {} eee; - < - -[#4 Insertion delimiter] = "\n" - - -[#5 Content] = -[#5 Domain] = 5:0-5:21 - >---------------------< -5| typedef union {} eee; - -[#5 Removal] = 5:0-6:0 - >--------------------- -5| typedef union {} eee; -6| typedef enum {} fff; - < - -[#5 Insertion delimiter] = "\n" - - -[#6 Content] = -[#6 Domain] = 6:0-6:20 - >--------------------< -6| typedef enum {} fff; - -[#6 Removal] = 5:21-6:20 - > -5| typedef union {} eee; -6| typedef enum {} fff; - --------------------< +0| struct Foo {}; -[#6 Insertion delimiter] = "\n" +[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/r/ifStatement2.scope b/data/fixtures/scopes/c/statement/statement.class2.scope similarity index 75% rename from data/fixtures/scopes/r/ifStatement2.scope rename to data/fixtures/scopes/c/statement/statement.class2.scope index 8a8eb3310f..78c4c5fc56 100644 --- a/data/fixtures/scopes/r/ifStatement2.scope +++ b/data/fixtures/scopes/c/statement/statement.class2.scope @@ -1,10 +1,10 @@ -if(TRUE){ 1 } +union Foo {}; --- [Content] = [Removal] = [Domain] = 0:0-0:13 >-------------< -0| if(TRUE){ 1 } +0| union Foo {}; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/c/statement/statement.class3.scope b/data/fixtures/scopes/c/statement/statement.class3.scope new file mode 100644 index 0000000000..6f1c37aee6 --- /dev/null +++ b/data/fixtures/scopes/c/statement/statement.class3.scope @@ -0,0 +1,10 @@ +typedef struct {} Foo; +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:22 + >----------------------< +0| typedef struct {} Foo; + +[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/c/statement/statement.class4.scope b/data/fixtures/scopes/c/statement/statement.class4.scope new file mode 100644 index 0000000000..2dbdd0b27c --- /dev/null +++ b/data/fixtures/scopes/c/statement/statement.class4.scope @@ -0,0 +1,10 @@ +typedef union {} Foo; +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:21 + >---------------------< +0| typedef union {} Foo; + +[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/c/statement.enum.scope b/data/fixtures/scopes/c/statement/statement.enum.scope similarity index 100% rename from data/fixtures/scopes/c/statement.enum.scope rename to data/fixtures/scopes/c/statement/statement.enum.scope diff --git a/data/fixtures/scopes/c/statement/statement.iteration.class.scope b/data/fixtures/scopes/c/statement/statement.iteration.class.scope index db6aaa88e6..9ff489340b 100644 --- a/data/fixtures/scopes/c/statement/statement.iteration.class.scope +++ b/data/fixtures/scopes/c/statement/statement.iteration.class.scope @@ -1,24 +1,13 @@ struct Foo { }; - -typedef struct { } Bar; --- [#1 Content] = -[#1 Domain] = 0:0-2:23 - >--------------- +[#1 Domain] = 0:0-0:15 + >---------------< 0| struct Foo { }; -1| -2| typedef struct { } Bar; - -----------------------< [#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| struct Foo { }; - - -[#3 Content] = -[#3 Domain] = 2:16-2:17 - >-< -2| typedef struct { } Bar; diff --git a/data/fixtures/scopes/c/statement/statement.iteration.class2.scope b/data/fixtures/scopes/c/statement/statement.iteration.class2.scope index 0919e73336..a387250ea5 100644 --- a/data/fixtures/scopes/c/statement/statement.iteration.class2.scope +++ b/data/fixtures/scopes/c/statement/statement.iteration.class2.scope @@ -1,24 +1,13 @@ union Foo { }; - -typedef union { } Bar; --- [#1 Content] = -[#1 Domain] = 0:0-2:22 - >-------------- +[#1 Domain] = 0:0-0:14 + >--------------< 0| union Foo { }; -1| -2| typedef union { } Bar; - ----------------------< [#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| union Foo { }; - - -[#3 Content] = -[#3 Domain] = 2:15-2:16 - >-< -2| typedef union { } Bar; diff --git a/data/fixtures/scopes/c/statement/statement.iteration.class3.scope b/data/fixtures/scopes/c/statement/statement.iteration.class3.scope new file mode 100644 index 0000000000..41ffe3eec3 --- /dev/null +++ b/data/fixtures/scopes/c/statement/statement.iteration.class3.scope @@ -0,0 +1,13 @@ +typedef struct { } Foo; +--- + +[#1 Content] = +[#1 Domain] = 0:0-0:23 + >-----------------------< +0| typedef struct { } Foo; + + +[#2 Content] = +[#2 Domain] = 0:16-0:17 + >-< +0| typedef struct { } Foo; diff --git a/data/fixtures/scopes/c/statement/statement.iteration.class4.scope b/data/fixtures/scopes/c/statement/statement.iteration.class4.scope new file mode 100644 index 0000000000..a5f7348a1e --- /dev/null +++ b/data/fixtures/scopes/c/statement/statement.iteration.class4.scope @@ -0,0 +1,13 @@ +typedef union { } Foo; +--- + +[#1 Content] = +[#1 Domain] = 0:0-0:22 + >----------------------< +0| typedef union { } Foo; + + +[#2 Content] = +[#2 Domain] = 0:15-0:16 + >-< +0| typedef union { } Foo; diff --git a/data/fixtures/scopes/c/statement/statement.scope b/data/fixtures/scopes/c/statement/statement.scope index fc31001584..be2d642f7d 100644 --- a/data/fixtures/scopes/c/statement/statement.scope +++ b/data/fixtures/scopes/c/statement/statement.scope @@ -1,10 +1,10 @@ -int foo = 2; +int foo = 0; --- [Content] = [Removal] = [Domain] = 0:0-0:12 >------------< -0| int foo = 2; +0| int foo = 0; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/c/string.singleLine.scope b/data/fixtures/scopes/c/string.singleLine.scope index fdad82ffd7..4b26cf31b3 100644 --- a/data/fixtures/scopes/c/string.singleLine.scope +++ b/data/fixtures/scopes/c/string.singleLine.scope @@ -1,17 +1,10 @@ -char* a = "hello world"; +"Hello world" --- [Content] = -[Domain] = 0:10-0:23 - >-------------< -0| char* a = "hello world"; - -[Removal] = 0:9-0:23 - >--------------< -0| char* a = "hello world"; - -[Leading delimiter] = 0:9-0:10 - >-< -0| char* a = "hello world"; +[Removal] = +[Domain] = 0:0-0:13 + >-------------< +0| "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/textFragment.comment.block.scope b/data/fixtures/scopes/c/textFragment.comment.block.scope index b86a9130d1..af33f95d00 100644 --- a/data/fixtures/scopes/c/textFragment.comment.block.scope +++ b/data/fixtures/scopes/c/textFragment.comment.block.scope @@ -1,17 +1,10 @@ -/* - the - comment -*/ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-3:2 - >-- -0| /* -1| the -2| comment -3| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/textFragment.comment.line.scope b/data/fixtures/scopes/c/textFragment.comment.line.scope index db13fb56c4..6758f81490 100644 --- a/data/fixtures/scopes/c/textFragment.comment.line.scope +++ b/data/fixtures/scopes/c/textFragment.comment.line.scope @@ -1,17 +1,10 @@ -int a; // the comment +// Hello world --- [Content] = -[Domain] = 0:7-0:21 - >--------------< -0| int a; // the comment - -[Removal] = 0:6-0:21 - >---------------< -0| int a; // the comment - -[Leading delimiter] = 0:6-0:7 - >-< -0| int a; // the comment +[Removal] = +[Domain] = 0:0-0:14 + >--------------< +0| // Hello world [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/textFragment.string.singleLine.scope b/data/fixtures/scopes/c/textFragment.string.singleLine.scope index 2e1c28a0cf..85dcf5fa7f 100644 --- a/data/fixtures/scopes/c/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/c/textFragment.string.singleLine.scope @@ -1,10 +1,10 @@ -char* a = "hello world"; +"Hello world" --- [Content] = [Removal] = -[Domain] = 0:11-0:22 - >-----------< -0| char* a = "hello world"; +[Domain] = 0:1-0:12 + >-----------< +0| "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/type/type.cast.scope b/data/fixtures/scopes/c/type/type.cast.scope index 74cd6e837c..38a2f1808f 100644 --- a/data/fixtures/scopes/c/type/type.cast.scope +++ b/data/fixtures/scopes/c/type/type.cast.scope @@ -1,16 +1,16 @@ -(int)5.5; +(int)foo; --- [Content] = 0:1-0:4 >---< -0| (int)5.5; +0| (int)foo; [Removal] = 0:0-0:5 >-----< -0| (int)5.5; +0| (int)foo; [Domain] = 0:0-0:8 >--------< -0| (int)5.5; +0| (int)foo; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/type/type.iteration.class.scope b/data/fixtures/scopes/c/type/type.iteration.class.scope index db6aaa88e6..9ff489340b 100644 --- a/data/fixtures/scopes/c/type/type.iteration.class.scope +++ b/data/fixtures/scopes/c/type/type.iteration.class.scope @@ -1,24 +1,13 @@ struct Foo { }; - -typedef struct { } Bar; --- [#1 Content] = -[#1 Domain] = 0:0-2:23 - >--------------- +[#1 Domain] = 0:0-0:15 + >---------------< 0| struct Foo { }; -1| -2| typedef struct { } Bar; - -----------------------< [#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| struct Foo { }; - - -[#3 Content] = -[#3 Domain] = 2:16-2:17 - >-< -2| typedef struct { } Bar; diff --git a/data/fixtures/scopes/c/type/type.iteration.class2.scope b/data/fixtures/scopes/c/type/type.iteration.class2.scope index 0919e73336..a387250ea5 100644 --- a/data/fixtures/scopes/c/type/type.iteration.class2.scope +++ b/data/fixtures/scopes/c/type/type.iteration.class2.scope @@ -1,24 +1,13 @@ union Foo { }; - -typedef union { } Bar; --- [#1 Content] = -[#1 Domain] = 0:0-2:22 - >-------------- +[#1 Domain] = 0:0-0:14 + >--------------< 0| union Foo { }; -1| -2| typedef union { } Bar; - ----------------------< [#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| union Foo { }; - - -[#3 Content] = -[#3 Domain] = 2:15-2:16 - >-< -2| typedef union { } Bar; diff --git a/data/fixtures/scopes/c/type/type.iteration.class3.scope b/data/fixtures/scopes/c/type/type.iteration.class3.scope new file mode 100644 index 0000000000..41ffe3eec3 --- /dev/null +++ b/data/fixtures/scopes/c/type/type.iteration.class3.scope @@ -0,0 +1,13 @@ +typedef struct { } Foo; +--- + +[#1 Content] = +[#1 Domain] = 0:0-0:23 + >-----------------------< +0| typedef struct { } Foo; + + +[#2 Content] = +[#2 Domain] = 0:16-0:17 + >-< +0| typedef struct { } Foo; diff --git a/data/fixtures/scopes/c/type/type.iteration.class4.scope b/data/fixtures/scopes/c/type/type.iteration.class4.scope new file mode 100644 index 0000000000..a5f7348a1e --- /dev/null +++ b/data/fixtures/scopes/c/type/type.iteration.class4.scope @@ -0,0 +1,13 @@ +typedef union { } Foo; +--- + +[#1 Content] = +[#1 Domain] = 0:0-0:22 + >----------------------< +0| typedef union { } Foo; + + +[#2 Content] = +[#2 Domain] = 0:15-0:16 + >-< +0| typedef union { } Foo; diff --git a/data/fixtures/scopes/c/type/type.variable.scope b/data/fixtures/scopes/c/type/type.variable.scope index eae60523e1..192f80ca15 100644 --- a/data/fixtures/scopes/c/type/type.variable.scope +++ b/data/fixtures/scopes/c/type/type.variable.scope @@ -1,20 +1,20 @@ -int foo = 2; +int foo; --- [Content] = 0:0-0:3 >---< -0| int foo = 2; +0| int foo; [Removal] = 0:0-0:4 >----< -0| int foo = 2; +0| int foo; [Trailing delimiter] = 0:3-0:4 >-< -0| int foo = 2; +0| int foo; -[Domain] = 0:0-0:12 - >------------< -0| int foo = 2; +[Domain] = 0:0-0:8 + >--------< +0| int foo; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/type/type.variable2.scope b/data/fixtures/scopes/c/type/type.variable2.scope new file mode 100644 index 0000000000..b3a492d68a --- /dev/null +++ b/data/fixtures/scopes/c/type/type.variable2.scope @@ -0,0 +1,20 @@ +int foo = 0; +--- + +[Content] = 0:0-0:3 + >---< +0| int foo = 0; + +[Removal] = 0:0-0:4 + >----< +0| int foo = 0; + +[Trailing delimiter] = 0:3-0:4 + >-< +0| int foo = 0; + +[Domain] = 0:0-0:12 + >------------< +0| int foo = 0; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/value/value.assignment.scope b/data/fixtures/scopes/c/value/value.assignment.scope index 8748bd1eb7..a614198096 100644 --- a/data/fixtures/scopes/c/value/value.assignment.scope +++ b/data/fixtures/scopes/c/value/value.assignment.scope @@ -1,20 +1,20 @@ -aaa = 0; +foo = 0; --- [Content] = 0:6-0:7 >-< -0| aaa = 0; +0| foo = 0; [Removal] = 0:3-0:7 >----< -0| aaa = 0; +0| foo = 0; [Leading delimiter] = 0:3-0:6 >---< -0| aaa = 0; +0| foo = 0; [Domain] = 0:0-0:8 >--------< -0| aaa = 0; +0| foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/value/value.assignment2.scope b/data/fixtures/scopes/c/value/value.assignment2.scope index 089103fb1a..8dbdfaf55e 100644 --- a/data/fixtures/scopes/c/value/value.assignment2.scope +++ b/data/fixtures/scopes/c/value/value.assignment2.scope @@ -1,20 +1,20 @@ -aaa += 0; +foo += 0; --- [Content] = 0:7-0:8 >-< -0| aaa += 0; +0| foo += 0; [Removal] = 0:3-0:8 >-----< -0| aaa += 0; +0| foo += 0; [Leading delimiter] = 0:3-0:7 >----< -0| aaa += 0; +0| foo += 0; [Domain] = 0:0-0:9 >---------< -0| aaa += 0; +0| foo += 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/value/value.return.scope b/data/fixtures/scopes/c/value/value.return.scope index 87605fdbf8..c363e8f1b7 100644 --- a/data/fixtures/scopes/c/value/value.return.scope +++ b/data/fixtures/scopes/c/value/value.return.scope @@ -1,22 +1,22 @@ int foo() { - return 2; + return 0; } --- [Content] = 1:11-1:12 >-< -1| return 2; +1| return 0; [Removal] = 1:10-1:12 >--< -1| return 2; +1| return 0; [Leading delimiter] = 1:10-1:11 >-< -1| return 2; +1| return 0; [Domain] = 1:4-1:13 >---------< -1| return 2; +1| return 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/c/value.switch.scope b/data/fixtures/scopes/c/value/value.switch.scope similarity index 100% rename from data/fixtures/scopes/c/value.switch.scope rename to data/fixtures/scopes/c/value/value.switch.scope diff --git a/data/fixtures/scopes/c/value/value.variable.scope b/data/fixtures/scopes/c/value/value.variable.scope index 2fd300f504..e9f99d43e1 100644 --- a/data/fixtures/scopes/c/value/value.variable.scope +++ b/data/fixtures/scopes/c/value/value.variable.scope @@ -1,20 +1,20 @@ -int aaa = 0; +int foo = 0; --- [Content] = 0:10-0:11 >-< -0| int aaa = 0; +0| int foo = 0; [Removal] = 0:7-0:11 >----< -0| int aaa = 0; +0| int foo = 0; [Leading delimiter] = 0:7-0:10 >---< -0| int aaa = 0; +0| int foo = 0; [Domain] = 0:0-0:12 >------------< -0| int aaa = 0; +0| int foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/clojure/comment.line.scope b/data/fixtures/scopes/clojure/comment.line.scope index 4a6e1fd6ef..ddbb630645 100644 --- a/data/fixtures/scopes/clojure/comment.line.scope +++ b/data/fixtures/scopes/clojure/comment.line.scope @@ -1,10 +1,10 @@ -;; foo +;; Hello world --- [Content] = [Removal] = -[Domain] = 0:0-0:6 - >------< -0| ;; foo +[Domain] = 0:0-0:14 + >--------------< +0| ;; Hello world [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/cpp/anonymousFunction.scope b/data/fixtures/scopes/cpp/anonymousFunction.scope index 1a47bd00a1..34a003480c 100644 --- a/data/fixtures/scopes/cpp/anonymousFunction.scope +++ b/data/fixtures/scopes/cpp/anonymousFunction.scope @@ -1,5 +1,5 @@ []() { - return 2; + return 0; }; --- @@ -8,7 +8,7 @@ [Domain] = 0:0-2:1 >------ 0| []() { -1| return 2; +1| return 0; 2| }; -< diff --git a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.empty.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.empty.scope index c7f415a0c5..99ce24e01a 100644 --- a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.empty.scope +++ b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.empty.scope @@ -1,15 +1,15 @@ -class MyClass { - MyClass() {} +class Foo { + Foo() {} } --- [Content] = -[Removal] = 1:12-1:12 - >< -1| MyClass() {} +[Removal] = 1:8-1:8 + >< +1| Foo() {} -[Domain] = 1:4-1:16 - >------------< -1| MyClass() {} +[Domain] = 1:4-1:12 + >--------< +1| Foo() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.multiLine.scope index a0153d3643..eeea010f89 100644 --- a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.multiLine.scope @@ -1,5 +1,5 @@ -class MyClass { - MyClass( +class Foo { + Foo( int aaa, int bbb ) {} @@ -12,9 +12,9 @@ class MyClass { 3| int bbb ---------------< -[Removal] = 1:12-4:4 - > -1| MyClass( +[Removal] = 1:8-4:4 + > +1| Foo( 2| int aaa, 3| int bbb 4| ) {} @@ -25,8 +25,8 @@ class MyClass { 2| int aaa, [Domain] = 1:4-4:8 - >-------- -1| MyClass( + >---- +1| Foo( 2| int aaa, 3| int bbb 4| ) {} diff --git a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.singleLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.singleLine.scope index ba318a7b14..a3385a5ff5 100644 --- a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.constructor.singleLine.scope @@ -1,15 +1,15 @@ -class MyClass { - MyClass(int aaa, int bbb) {} +class Foo { + Foo(int aaa, int bbb) {} } --- [Content] = -[Removal] = 1:12-1:28 - >----------------< -1| MyClass(int aaa, int bbb) {} +[Removal] = 1:8-1:24 + >----------------< +1| Foo(int aaa, int bbb) {} -[Domain] = 1:4-1:32 - >----------------------------< -1| MyClass(int aaa, int bbb) {} +[Domain] = 1:4-1:28 + >------------------------< +1| Foo(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.empty.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.empty.scope index 47572da9e3..a9d9cfde55 100644 --- a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.empty.scope +++ b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.empty.scope @@ -1,15 +1,15 @@ -class MyClass { - void foo() {} +class Foo { + void bar() {} } --- [Content] = [Removal] = 1:13-1:13 >< -1| void foo() {} +1| void bar() {} [Domain] = 1:4-1:17 >-------------< -1| void foo() {} +1| void bar() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.multiLine.scope index 9a5c82d2dc..ef611f4d84 100644 --- a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.multiLine.scope +++ b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.multiLine.scope @@ -1,5 +1,5 @@ -class MyClass { - void foo( +class Foo { + void bar( int aaa, int bbb ) {} @@ -14,7 +14,7 @@ class MyClass { [Removal] = 1:13-4:4 > -1| void foo( +1| void bar( 2| int aaa, 3| int bbb 4| ) {} @@ -26,7 +26,7 @@ class MyClass { [Domain] = 1:4-4:8 >--------- -1| void foo( +1| void bar( 2| int aaa, 3| int bbb 4| ) {} diff --git a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.singleLine.scope b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.singleLine.scope index 35af67a9ce..4122d8ecbc 100644 --- a/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.singleLine.scope +++ b/data/fixtures/scopes/cpp/argumentList/argumentList.formal.method.singleLine.scope @@ -1,15 +1,15 @@ -class MyClass { - void foo(int aaa, int bbb) {} +class Foo { + void bar(int aaa, int bbb) {} } --- [Content] = [Removal] = 1:13-1:29 >----------------< -1| void foo(int aaa, int bbb) {} +1| void bar(int aaa, int bbb) {} [Domain] = 1:4-1:33 >-----------------------------< -1| void foo(int aaa, int bbb) {} +1| void bar(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/cpp/attribute.scope b/data/fixtures/scopes/cpp/attribute.scope index 5259414aa5..a40e9c4da7 100644 --- a/data/fixtures/scopes/cpp/attribute.scope +++ b/data/fixtures/scopes/cpp/attribute.scope @@ -1,10 +1,10 @@ -[[attribute]] +[[foo]] --- [Content] = [Removal] = -[Domain] = 0:0-0:13 - >-------------< -0| [[attribute]] +[Domain] = 0:2-0:5 + >---< +0| [[foo]] [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/className2.scope b/data/fixtures/scopes/cpp/className2.scope index 51e59900e5..472693da6f 100644 --- a/data/fixtures/scopes/cpp/className2.scope +++ b/data/fixtures/scopes/cpp/className2.scope @@ -1,20 +1,20 @@ -void Aaa::bbb() {} +void Foo::bar() {} --- [Content] = 0:5-0:8 >---< -0| void Aaa::bbb() {} +0| void Foo::bar() {} [Removal] = 0:4-0:8 >----< -0| void Aaa::bbb() {} +0| void Foo::bar() {} [Leading delimiter] = 0:4-0:5 >-< -0| void Aaa::bbb() {} +0| void Foo::bar() {} [Domain] = 0:0-0:18 >------------------< -0| void Aaa::bbb() {} +0| void Foo::bar() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/functionName.constructor.scope b/data/fixtures/scopes/cpp/functionName.constructor.scope index 1c3ece5c32..1ce29e9861 100644 --- a/data/fixtures/scopes/cpp/functionName.constructor.scope +++ b/data/fixtures/scopes/cpp/functionName.constructor.scope @@ -1,19 +1,19 @@ -class MyClass { - MyClass() {} +class Foo { + Foo() {} } --- [Content] = -[Removal] = 1:4-1:11 - >-------< -1| MyClass() {} +[Removal] = 1:4-1:7 + >---< +1| Foo() {} [Leading delimiter] = 1:0-1:4 >----< -1| MyClass() {} +1| Foo() {} -[Domain] = 1:4-1:16 - >------------< -1| MyClass() {} +[Domain] = 1:4-1:12 + >--------< +1| Foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/functionName.constructor2.scope b/data/fixtures/scopes/cpp/functionName.constructor2.scope index 7702b7757d..847488aca9 100644 --- a/data/fixtures/scopes/cpp/functionName.constructor2.scope +++ b/data/fixtures/scopes/cpp/functionName.constructor2.scope @@ -1,19 +1,19 @@ -class MyClass { - ~MyClass() {} +class Foo { + ~Foo() {} } --- [Content] = -[Removal] = 1:4-1:12 - >--------< -1| ~MyClass() {} +[Removal] = 1:4-1:8 + >----< +1| ~Foo() {} [Leading delimiter] = 1:0-1:4 >----< -1| ~MyClass() {} +1| ~Foo() {} -[Domain] = 1:4-1:17 - >-------------< -1| ~MyClass() {} +[Domain] = 1:4-1:13 + >---------< +1| ~Foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/functionName.method.iteration.class.scope b/data/fixtures/scopes/cpp/functionName.method.iteration.class.scope index 1740bcc7df..a3ec5f3456 100644 --- a/data/fixtures/scopes/cpp/functionName.method.iteration.class.scope +++ b/data/fixtures/scopes/cpp/functionName.method.iteration.class.scope @@ -1,13 +1,13 @@ -class MyClass { } +class Foo { } --- [#1 Content] = -[#1 Domain] = 0:0-0:17 - >-----------------< -0| class MyClass { } +[#1 Domain] = 0:0-0:13 + >-------------< +0| class Foo { } [#2 Content] = -[#2 Domain] = 0:15-0:16 - >-< -0| class MyClass { } +[#2 Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/cpp/functionName.method.scope b/data/fixtures/scopes/cpp/functionName.method.scope index b05dacf718..4988ae8bf1 100644 --- a/data/fixtures/scopes/cpp/functionName.method.scope +++ b/data/fixtures/scopes/cpp/functionName.method.scope @@ -1,19 +1,19 @@ -class MyClass { - void foo() {} +class Foo { + void bar() {} } --- [Content] = [Removal] = 1:9-1:12 >---< -1| void foo() {} +1| void bar() {} [Leading delimiter] = 1:8-1:9 >-< -1| void foo() {} +1| void bar() {} [Domain] = 1:4-1:17 >-------------< -1| void foo() {} +1| void bar() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/ifStatement.scope b/data/fixtures/scopes/cpp/ifStatement.scope deleted file mode 100644 index f98039aae3..0000000000 --- a/data/fixtures/scopes/cpp/ifStatement.scope +++ /dev/null @@ -1,21 +0,0 @@ -void funk() { - if constexpr (true) {} -} ---- - -[Content] = -[Domain] = 1:4-1:26 - >----------------------< -1| if constexpr (true) {} - -[Removal] = 1:0-2:0 - >-------------------------- -1| if constexpr (true) {} -2| } - < - -[Leading delimiter] = 1:0-1:4 - >----< -1| if constexpr (true) {} - -[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/cpp/interior/interior.class.scope b/data/fixtures/scopes/cpp/interior/interior.class.scope index d6791ac419..5390112f29 100644 --- a/data/fixtures/scopes/cpp/interior/interior.class.scope +++ b/data/fixtures/scopes/cpp/interior/interior.class.scope @@ -1,25 +1,25 @@ -class MyClass { } +class Foo { } --- [#1 Content] = -[#1 Removal] = 0:15-0:16 - >-< -0| class MyClass { } +[#1 Removal] = 0:11-0:12 + >-< +0| class Foo { } -[#1 Domain] = 0:0-0:17 - >-----------------< -0| class MyClass { } +[#1 Domain] = 0:0-0:13 + >-------------< +0| class Foo { } [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:15-0:16 - >-< -0| class MyClass { } +[#2 Removal] = 0:11-0:12 + >-< +0| class Foo { } -[#2 Domain] = 0:14-0:17 - >---< -0| class MyClass { } +[#2 Domain] = 0:10-0:13 + >---< +0| class Foo { } [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/interior/interior.constructor.scope b/data/fixtures/scopes/cpp/interior/interior.constructor.scope index 3f20dbf0b9..ff8bba477b 100644 --- a/data/fixtures/scopes/cpp/interior/interior.constructor.scope +++ b/data/fixtures/scopes/cpp/interior/interior.constructor.scope @@ -1,44 +1,44 @@ -class MyClass { - MyClass() { } +class Foo { + Foo() { } } --- -[#1 Content] = 1:4-1:17 - >-------------< -1| MyClass() { } +[#1 Content] = 1:4-1:13 + >---------< +1| Foo() { } -[#1 Removal] = 0:15-2:0 - > -0| class MyClass { -1| MyClass() { } +[#1 Removal] = 0:11-2:0 + > +0| class Foo { +1| Foo() { } 2| } < [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass() { } + >----------- +0| class Foo { +1| Foo() { } 2| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:4-1:17 - >-------------< -1| MyClass() { } +[#2 Content] = 1:4-1:13 + >---------< +1| Foo() { } -[#2 Removal] = 0:15-2:0 - > -0| class MyClass { -1| MyClass() { } +[#2 Removal] = 0:11-2:0 + > +0| class Foo { +1| Foo() { } 2| } < -[#2 Domain] = 0:14-2:1 - >- -0| class MyClass { -1| MyClass() { } +[#2 Domain] = 0:10-2:1 + >- +0| class Foo { +1| Foo() { } 2| } -< @@ -46,36 +46,36 @@ class MyClass { [#3 Content] = -[#3 Removal] = 1:15-1:16 - >-< -1| MyClass() { } +[#3 Removal] = 1:11-1:12 + >-< +1| Foo() { } -[#3 Domain] = 1:4-1:17 - >-------------< -1| MyClass() { } +[#3 Domain] = 1:4-1:13 + >---------< +1| Foo() { } [#3 Insertion delimiter] = " " [#4 Content] = -[#4 Removal] = 1:12-1:12 - >< -1| MyClass() { } +[#4 Removal] = 1:8-1:8 + >< +1| Foo() { } -[#4 Domain] = 1:11-1:13 - >--< -1| MyClass() { } +[#4 Domain] = 1:7-1:9 + >--< +1| Foo() { } [#4 Insertion delimiter] = " " [#5 Content] = -[#5 Removal] = 1:15-1:16 - >-< -1| MyClass() { } +[#5 Removal] = 1:11-1:12 + >-< +1| Foo() { } -[#5 Domain] = 1:14-1:17 - >---< -1| MyClass() { } +[#5 Domain] = 1:10-1:13 + >---< +1| Foo() { } [#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/interior/interior.foreach.scope b/data/fixtures/scopes/cpp/interior/interior.foreach.scope index ca72187b39..4d90296637 100644 --- a/data/fixtures/scopes/cpp/interior/interior.foreach.scope +++ b/data/fixtures/scopes/cpp/interior/interior.foreach.scope @@ -1,37 +1,37 @@ -for (int value : values) { } +for (int v : values) { } --- [#1 Content] = -[#1 Removal] = 0:26-0:27 - >-< -0| for (int value : values) { } +[#1 Removal] = 0:22-0:23 + >-< +0| for (int v : values) { } -[#1 Domain] = 0:0-0:28 - >----------------------------< -0| for (int value : values) { } +[#1 Domain] = 0:0-0:24 + >------------------------< +0| for (int v : values) { } [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:5-0:23 - >------------------< -0| for (int value : values) { } +[#2 Removal] = 0:5-0:19 + >--------------< +0| for (int v : values) { } -[#2 Domain] = 0:4-0:24 - >--------------------< -0| for (int value : values) { } +[#2 Domain] = 0:4-0:20 + >----------------< +0| for (int v : values) { } [#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 0:26-0:27 - >-< -0| for (int value : values) { } +[#3 Removal] = 0:22-0:23 + >-< +0| for (int v : values) { } -[#3 Domain] = 0:25-0:28 - >---< -0| for (int value : values) { } +[#3 Domain] = 0:21-0:24 + >---< +0| for (int v : values) { } [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/interior/interior.lambda.scope b/data/fixtures/scopes/cpp/interior/interior.lambda.scope index f78e3c643c..4334e4c314 100644 --- a/data/fixtures/scopes/cpp/interior/interior.lambda.scope +++ b/data/fixtures/scopes/cpp/interior/interior.lambda.scope @@ -1,37 +1,26 @@ -[]() { - return 2; -}; +[]() { }; --- [#1 Content] = [#1 Removal] = 0:1-0:1 >< -0| []() { +0| []() { }; [#1 Domain] = 0:0-0:2 >--< -0| []() { +0| []() { }; [#1 Insertion delimiter] = " " -[#2 Content] = 1:4-1:13 - >---------< -1| return 2; +[#2 Content] = +[#2 Removal] = 0:6-0:7 + >-< +0| []() { }; -[#2 Removal] = 0:6-2:0 - > -0| []() { -1| return 2; -2| }; - < - -[#2 Domain] = 0:0-2:1 - >------ -0| []() { -1| return 2; -2| }; - -< +[#2 Domain] = 0:0-0:8 + >--------< +0| []() { }; [#2 Insertion delimiter] = " " @@ -39,31 +28,22 @@ [#3 Content] = [#3 Removal] = 0:3-0:3 >< -0| []() { +0| []() { }; [#3 Domain] = 0:2-0:4 >--< -0| []() { +0| []() { }; [#3 Insertion delimiter] = " " -[#4 Content] = 1:4-1:13 - >---------< -1| return 2; - -[#4 Removal] = 0:6-2:0 - > -0| []() { -1| return 2; -2| }; - < +[#4 Content] = +[#4 Removal] = 0:6-0:7 + >-< +0| []() { }; -[#4 Domain] = 0:5-2:1 - >- -0| []() { -1| return 2; -2| }; - -< +[#4 Domain] = 0:5-0:8 + >---< +0| []() { }; [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/interior/interior.method.scope b/data/fixtures/scopes/cpp/interior/interior.method.scope index 126a5a1731..f6ec2af746 100644 --- a/data/fixtures/scopes/cpp/interior/interior.method.scope +++ b/data/fixtures/scopes/cpp/interior/interior.method.scope @@ -1,23 +1,23 @@ -class MyClass { - void foo() { } +class Foo { + void bar() { } } --- [#1 Content] = 1:4-1:18 >--------------< -1| void foo() { } +1| void bar() { } -[#1 Removal] = 0:15-2:0 - > -0| class MyClass { -1| void foo() { } +[#1 Removal] = 0:11-2:0 + > +0| class Foo { +1| void bar() { } 2| } < [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void foo() { } + >----------- +0| class Foo { +1| void bar() { } 2| } -< @@ -26,19 +26,19 @@ class MyClass { [#2 Content] = 1:4-1:18 >--------------< -1| void foo() { } +1| void bar() { } -[#2 Removal] = 0:15-2:0 - > -0| class MyClass { -1| void foo() { } +[#2 Removal] = 0:11-2:0 + > +0| class Foo { +1| void bar() { } 2| } < -[#2 Domain] = 0:14-2:1 - >- -0| class MyClass { -1| void foo() { } +[#2 Domain] = 0:10-2:1 + >- +0| class Foo { +1| void bar() { } 2| } -< @@ -48,11 +48,11 @@ class MyClass { [#3 Content] = [#3 Removal] = 1:16-1:17 >-< -1| void foo() { } +1| void bar() { } [#3 Domain] = 1:4-1:18 >--------------< -1| void foo() { } +1| void bar() { } [#3 Insertion delimiter] = " " @@ -60,11 +60,11 @@ class MyClass { [#4 Content] = [#4 Removal] = 1:13-1:13 >< -1| void foo() { } +1| void bar() { } [#4 Domain] = 1:12-1:14 >--< -1| void foo() { } +1| void bar() { } [#4 Insertion delimiter] = " " @@ -72,10 +72,10 @@ class MyClass { [#5 Content] = [#5 Removal] = 1:16-1:17 >-< -1| void foo() { } +1| void bar() { } [#5 Domain] = 1:15-1:18 >---< -1| void foo() { } +1| void bar() { } [#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.iteration.scope index dc779a0222..6f397b0afd 100644 --- a/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - MyClass(int aaa, int bbb = 2) {} +class Foo { + Foo(int aaa, int bbb = 0) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int aaa, int bbb = 2) {} + >----------- +0| class Foo { +1| Foo(int aaa, int bbb = 0) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| MyClass(int aaa, int bbb = 2) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| Foo(int aaa, int bbb = 0) {} 2| } < [#3 Content] = -[#3 Domain] = 1:12-1:32 - >--------------------< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Domain] = 1:8-1:28 + >--------------------< +1| Foo(int aaa, int bbb = 0) {} diff --git a/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.scope index 04a522de54..5464c1822e 100644 --- a/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.scope +++ b/data/fixtures/scopes/cpp/name/name.argument.formal.constructor.scope @@ -1,28 +1,28 @@ -class MyClass { - MyClass(int aaa, int bbb = 2) {} +class Foo { + Foo(int aaa, int bbb = 0) {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int aaa, int bbb = 2) {} + >----------- +0| class Foo { +1| Foo(int aaa, int bbb = 0) {} 2| } -< @@ -30,58 +30,58 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:4-1:11 - >-------< -1| MyClass(int aaa, int bbb = 2) {} +[#2 Removal] = 1:4-1:7 + >---< +1| Foo(int aaa, int bbb = 0) {} [#2 Leading delimiter] = 1:0-1:4 >----< -1| MyClass(int aaa, int bbb = 2) {} +1| Foo(int aaa, int bbb = 0) {} -[#2 Domain] = 1:4-1:36 - >--------------------------------< -1| MyClass(int aaa, int bbb = 2) {} +[#2 Domain] = 1:4-1:32 + >----------------------------< +1| Foo(int aaa, int bbb = 0) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:16-1:19 - >---< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Content] = 1:12-1:15 + >---< +1| Foo(int aaa, int bbb = 0) {} -[#3 Removal] = 1:15-1:19 - >----< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Removal] = 1:11-1:15 + >----< +1| Foo(int aaa, int bbb = 0) {} -[#3 Leading delimiter] = 1:15-1:16 - >-< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Leading delimiter] = 1:11-1:12 + >-< +1| Foo(int aaa, int bbb = 0) {} -[#3 Domain] = 1:12-1:19 - >-------< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Domain] = 1:8-1:15 + >-------< +1| Foo(int aaa, int bbb = 0) {} [#3 Insertion delimiter] = " " -[#4 Content] = 1:25-1:28 - >---< -1| MyClass(int aaa, int bbb = 2) {} +[#4 Content] = 1:21-1:24 + >---< +1| Foo(int aaa, int bbb = 0) {} -[#4 Removal] = 1:25-1:29 - >----< -1| MyClass(int aaa, int bbb = 2) {} +[#4 Removal] = 1:21-1:25 + >----< +1| Foo(int aaa, int bbb = 0) {} -[#4 Leading delimiter] = 1:24-1:25 - >-< -1| MyClass(int aaa, int bbb = 2) {} +[#4 Leading delimiter] = 1:20-1:21 + >-< +1| Foo(int aaa, int bbb = 0) {} -[#4 Trailing delimiter] = 1:28-1:29 - >-< -1| MyClass(int aaa, int bbb = 2) {} +[#4 Trailing delimiter] = 1:24-1:25 + >-< +1| Foo(int aaa, int bbb = 0) {} -[#4 Domain] = 1:21-1:32 - >-----------< -1| MyClass(int aaa, int bbb = 2) {} +[#4 Domain] = 1:17-1:28 + >-----------< +1| Foo(int aaa, int bbb = 0) {} [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/name/name.argument.formal.iteration.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.iteration.scope index 4599d64443..8fea0c4c3b 100644 --- a/data/fixtures/scopes/cpp/name/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/cpp/name/name.argument.formal.iteration.scope @@ -1,13 +1,13 @@ -void aaa(int bbb = 0, int ccc = 0) {} +void foo(int aaa = 0, int bbb = 1) {} --- [#1 Content] = [#1 Domain] = 0:0-0:37 >-------------------------------------< -0| void aaa(int bbb = 0, int ccc = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} [#2 Content] = [#2 Domain] = 0:9-0:33 >------------------------< -0| void aaa(int bbb = 0, int ccc = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} diff --git a/data/fixtures/scopes/cpp/name/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.method.iteration.scope index 726ca89138..21704974bd 100644 --- a/data/fixtures/scopes/cpp/name/name.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/cpp/name/name.argument.formal.method.iteration.scope @@ -1,22 +1,22 @@ -class MyClass { - void foo(int aaa, int bbb = 2) {} +class Foo { + void bar(int aaa, int bbb = 0) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void foo(int aaa, int bbb = 2) {} + >----------- +0| class Foo { +1| void bar(int aaa, int bbb = 0) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| void foo(int aaa, int bbb = 2) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| void bar(int aaa, int bbb = 0) {} 2| } < @@ -24,4 +24,4 @@ class MyClass { [#3 Content] = [#3 Domain] = 1:13-1:33 >--------------------< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} diff --git a/data/fixtures/scopes/cpp/name/name.argument.formal.method.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.method.scope index 260708002c..d484a85104 100644 --- a/data/fixtures/scopes/cpp/name/name.argument.formal.method.scope +++ b/data/fixtures/scopes/cpp/name/name.argument.formal.method.scope @@ -1,28 +1,28 @@ -class MyClass { - void foo(int aaa, int bbb = 2) {} +class Foo { + void bar(int aaa, int bbb = 0) {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void foo(int aaa, int bbb = 2) {} + >----------- +0| class Foo { +1| void bar(int aaa, int bbb = 0) {} 2| } -< @@ -32,56 +32,56 @@ class MyClass { [#2 Content] = [#2 Removal] = 1:9-1:12 >---< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#2 Leading delimiter] = 1:8-1:9 >-< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#2 Domain] = 1:4-1:37 >---------------------------------< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#2 Insertion delimiter] = " " [#3 Content] = 1:17-1:20 >---< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#3 Removal] = 1:16-1:20 >----< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#3 Leading delimiter] = 1:16-1:17 >-< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#3 Domain] = 1:13-1:20 >-------< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#3 Insertion delimiter] = " " [#4 Content] = 1:26-1:29 >---< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Removal] = 1:26-1:30 >----< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Leading delimiter] = 1:25-1:26 >-< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Trailing delimiter] = 1:29-1:30 >-< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Domain] = 1:22-1:33 >-----------< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/name/name.argument.formal.scope b/data/fixtures/scopes/cpp/name/name.argument.formal.scope index ef898c11d8..e1a7159fd3 100644 --- a/data/fixtures/scopes/cpp/name/name.argument.formal.scope +++ b/data/fixtures/scopes/cpp/name/name.argument.formal.scope @@ -1,40 +1,63 @@ -void aaa(int bbb = 0) {} +void foo(int aaa = 0, int bbb = 1) {} --- [#1 Content] = [#1 Removal] = 0:5-0:8 >---< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} [#1 Leading delimiter] = 0:4-0:5 >-< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} -[#1 Domain] = 0:0-0:24 - >------------------------< -0| void aaa(int bbb = 0) {} +[#1 Domain] = 0:0-0:37 + >-------------------------------------< +0| void foo(int aaa = 0, int bbb = 1) {} [#1 Insertion delimiter] = " " [#2 Content] = 0:13-0:16 >---< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} [#2 Removal] = 0:13-0:17 >----< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} [#2 Leading delimiter] = 0:12-0:13 >-< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} [#2 Trailing delimiter] = 0:16-0:17 >-< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} [#2 Domain] = 0:9-0:20 >-----------< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} [#2 Insertion delimiter] = " " + + +[#3 Content] = 0:26-0:29 + >---< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#3 Removal] = 0:26-0:30 + >----< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#3 Leading delimiter] = 0:25-0:26 + >-< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#3 Trailing delimiter] = 0:29-0:30 + >-< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#3 Domain] = 0:22-0:33 + >-----------< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/name/name.class2.scope b/data/fixtures/scopes/cpp/name/name.class2.scope deleted file mode 100644 index c6442bcc97..0000000000 --- a/data/fixtures/scopes/cpp/name/name.class2.scope +++ /dev/null @@ -1,24 +0,0 @@ -enum class Foo {}; ---- - -[Content] = 0:11-0:14 - >---< -0| enum class Foo {}; - -[Removal] = 0:11-0:15 - >----< -0| enum class Foo {}; - -[Leading delimiter] = 0:10-0:11 - >-< -0| enum class Foo {}; - -[Trailing delimiter] = 0:14-0:15 - >-< -0| enum class Foo {}; - -[Domain] = 0:0-0:18 - >------------------< -0| enum class Foo {}; - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/name/name.constructor.scope b/data/fixtures/scopes/cpp/name/name.constructor.scope index 62614526f6..c067b52eed 100644 --- a/data/fixtures/scopes/cpp/name/name.constructor.scope +++ b/data/fixtures/scopes/cpp/name/name.constructor.scope @@ -1,28 +1,28 @@ -class MyClass { - MyClass() {} +class Foo { + Foo() {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass() {} + >----------- +0| class Foo { +1| Foo() {} 2| } -< @@ -30,16 +30,16 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:4-1:11 - >-------< -1| MyClass() {} +[#2 Removal] = 1:4-1:7 + >---< +1| Foo() {} [#2 Leading delimiter] = 1:0-1:4 >----< -1| MyClass() {} +1| Foo() {} -[#2 Domain] = 1:4-1:16 - >------------< -1| MyClass() {} +[#2 Domain] = 1:4-1:12 + >--------< +1| Foo() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/name/name.constructor2.scope b/data/fixtures/scopes/cpp/name/name.constructor2.scope index 151755da1b..0175b7b121 100644 --- a/data/fixtures/scopes/cpp/name/name.constructor2.scope +++ b/data/fixtures/scopes/cpp/name/name.constructor2.scope @@ -1,28 +1,28 @@ -class MyClass { - ~MyClass() {} +class Foo { + ~Foo() {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| ~MyClass() {} + >----------- +0| class Foo { +1| ~Foo() {} 2| } -< @@ -30,16 +30,16 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:4-1:12 - >--------< -1| ~MyClass() {} +[#2 Removal] = 1:4-1:8 + >----< +1| ~Foo() {} [#2 Leading delimiter] = 1:0-1:4 >----< -1| ~MyClass() {} +1| ~Foo() {} -[#2 Domain] = 1:4-1:17 - >-------------< -1| ~MyClass() {} +[#2 Domain] = 1:4-1:13 + >---------< +1| ~Foo() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/name/name.foreach.scope b/data/fixtures/scopes/cpp/name/name.foreach.scope index 0ecd1b2047..3d192010bd 100644 --- a/data/fixtures/scopes/cpp/name/name.foreach.scope +++ b/data/fixtures/scopes/cpp/name/name.foreach.scope @@ -1,24 +1,24 @@ -for (int value : values) {} +for (int v : values) {} --- -[Content] = 0:9-0:14 - >-----< -0| for (int value : values) {} +[Content] = 0:9-0:10 + >-< +0| for (int v : values) {} -[Removal] = 0:9-0:15 - >------< -0| for (int value : values) {} +[Removal] = 0:9-0:11 + >--< +0| for (int v : values) {} [Leading delimiter] = 0:8-0:9 >-< -0| for (int value : values) {} +0| for (int v : values) {} -[Trailing delimiter] = 0:14-0:15 - >-< -0| for (int value : values) {} +[Trailing delimiter] = 0:10-0:11 + >-< +0| for (int v : values) {} -[Domain] = 0:0-0:27 - >---------------------------< -0| for (int value : values) {} +[Domain] = 0:0-0:23 + >-----------------------< +0| for (int v : values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/name/name.method.scope b/data/fixtures/scopes/cpp/name/name.method.scope index f90b15c7de..f5446e1bea 100644 --- a/data/fixtures/scopes/cpp/name/name.method.scope +++ b/data/fixtures/scopes/cpp/name/name.method.scope @@ -1,27 +1,27 @@ -class MyClass { +class Foo { void foo() {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { + >----------- +0| class Foo { 1| void foo() {} 2| } -< diff --git a/data/fixtures/scopes/cpp/namedFunction.constructor.scope b/data/fixtures/scopes/cpp/namedFunction.constructor.scope index eef4f536f6..9564fe79ea 100644 --- a/data/fixtures/scopes/cpp/namedFunction.constructor.scope +++ b/data/fixtures/scopes/cpp/namedFunction.constructor.scope @@ -1,21 +1,21 @@ -class MyClass { - MyClass() {} +class Foo { + Foo() {} } --- [Content] = -[Domain] = 1:4-1:16 - >------------< -1| MyClass() {} +[Domain] = 1:4-1:12 + >--------< +1| Foo() {} [Removal] = 1:0-2:0 - >---------------- -1| MyClass() {} + >------------ +1| Foo() {} 2| } < [Leading delimiter] = 1:0-1:4 >----< -1| MyClass() {} +1| Foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/cpp/namedFunction.constructor2.scope b/data/fixtures/scopes/cpp/namedFunction.constructor2.scope index 3fb6ef8eb2..86a474f358 100644 --- a/data/fixtures/scopes/cpp/namedFunction.constructor2.scope +++ b/data/fixtures/scopes/cpp/namedFunction.constructor2.scope @@ -1,21 +1,21 @@ -class MyClass { - ~MyClass() {} +class Foo { + ~Foo() {} } --- [Content] = -[Domain] = 1:4-1:17 - >-------------< -1| ~MyClass() {} +[Domain] = 1:4-1:13 + >---------< +1| ~Foo() {} [Removal] = 1:0-2:0 - >----------------- -1| ~MyClass() {} + >------------- +1| ~Foo() {} 2| } < [Leading delimiter] = 1:0-1:4 >----< -1| ~MyClass() {} +1| ~Foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/cpp/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/cpp/namedFunction.method.iteration.class.scope index 1740bcc7df..a3ec5f3456 100644 --- a/data/fixtures/scopes/cpp/namedFunction.method.iteration.class.scope +++ b/data/fixtures/scopes/cpp/namedFunction.method.iteration.class.scope @@ -1,13 +1,13 @@ -class MyClass { } +class Foo { } --- [#1 Content] = -[#1 Domain] = 0:0-0:17 - >-----------------< -0| class MyClass { } +[#1 Domain] = 0:0-0:13 + >-------------< +0| class Foo { } [#2 Content] = -[#2 Domain] = 0:15-0:16 - >-< -0| class MyClass { } +[#2 Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/cpp/namedFunction.method.scope b/data/fixtures/scopes/cpp/namedFunction.method.scope index e19549b047..12d3e4a8d2 100644 --- a/data/fixtures/scopes/cpp/namedFunction.method.scope +++ b/data/fixtures/scopes/cpp/namedFunction.method.scope @@ -1,21 +1,21 @@ -class MyClass { - void foo() {} +class Foo { + void bar() {} } --- [Content] = [Domain] = 1:4-1:17 >-------------< -1| void foo() {} +1| void bar() {} [Removal] = 1:0-2:0 >----------------- -1| void foo() {} +1| void bar() {} 2| } < [Leading delimiter] = 1:0-1:4 >----< -1| void foo() {} +1| void bar() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.iteration.scope index 0387ca369c..38b73085f5 100644 --- a/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - MyClass(int aaa, int bbb) {} +class Foo { + Foo(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int aaa, int bbb) {} + >----------- +0| class Foo { +1| Foo(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| MyClass(int aaa, int bbb) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| Foo(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:12-1:28 - >----------------< -1| MyClass(int aaa, int bbb) {} +[#3 Domain] = 1:8-1:24 + >----------------< +1| Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.scope index 9238e483b2..1f9c278c89 100644 --- a/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.scope +++ b/data/fixtures/scopes/cpp/type/type.argument.formal.constructor.scope @@ -1,57 +1,57 @@ -class MyClass { - MyClass(int aaa, int bbb = 2) {} +class Foo { + Foo(int aaa, int bbb = 0) {} } --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int aaa, int bbb = 2) {} + >----------- +0| class Foo { +1| Foo(int aaa, int bbb = 0) {} 2| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:12-1:15 - >---< -1| MyClass(int aaa, int bbb = 2) {} +[#2 Content] = 1:8-1:11 + >---< +1| Foo(int aaa, int bbb = 0) {} -[#2 Removal] = 1:12-1:16 - >----< -1| MyClass(int aaa, int bbb = 2) {} +[#2 Removal] = 1:8-1:12 + >----< +1| Foo(int aaa, int bbb = 0) {} -[#2 Trailing delimiter] = 1:15-1:16 - >-< -1| MyClass(int aaa, int bbb = 2) {} +[#2 Trailing delimiter] = 1:11-1:12 + >-< +1| Foo(int aaa, int bbb = 0) {} -[#2 Domain] = 1:12-1:19 - >-------< -1| MyClass(int aaa, int bbb = 2) {} +[#2 Domain] = 1:8-1:15 + >-------< +1| Foo(int aaa, int bbb = 0) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:21-1:24 - >---< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Content] = 1:17-1:20 + >---< +1| Foo(int aaa, int bbb = 0) {} -[#3 Removal] = 1:21-1:25 - >----< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Removal] = 1:17-1:21 + >----< +1| Foo(int aaa, int bbb = 0) {} -[#3 Leading delimiter] = 1:20-1:21 - >-< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Leading delimiter] = 1:16-1:17 + >-< +1| Foo(int aaa, int bbb = 0) {} -[#3 Trailing delimiter] = 1:24-1:25 - >-< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Trailing delimiter] = 1:20-1:21 + >-< +1| Foo(int aaa, int bbb = 0) {} -[#3 Domain] = 1:21-1:32 - >-----------< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Domain] = 1:17-1:28 + >-----------< +1| Foo(int aaa, int bbb = 0) {} [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/type/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.method.iteration.scope index d0ca4661ff..888a3caf4a 100644 --- a/data/fixtures/scopes/cpp/type/type.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/cpp/type/type.argument.formal.method.iteration.scope @@ -1,22 +1,22 @@ -class MyClass { - void foo(int aaa, int bbb) {} +class Foo { + void bar(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void foo(int aaa, int bbb) {} + >----------- +0| class Foo { +1| void bar(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| void foo(int aaa, int bbb) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| void bar(int aaa, int bbb) {} 2| } < @@ -24,4 +24,4 @@ class MyClass { [#3 Content] = [#3 Domain] = 1:13-1:29 >----------------< -1| void foo(int aaa, int bbb) {} +1| void bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/cpp/type/type.argument.formal.method.scope b/data/fixtures/scopes/cpp/type/type.argument.formal.method.scope index 7de0f8c8b0..08609f6c00 100644 --- a/data/fixtures/scopes/cpp/type/type.argument.formal.method.scope +++ b/data/fixtures/scopes/cpp/type/type.argument.formal.method.scope @@ -1,14 +1,14 @@ -class MyClass { - void foo(int aaa, int bbb = 2) {} +class Foo { + void bar(int aaa, int bbb = 0) {} } --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void foo(int aaa, int bbb = 2) {} + >----------- +0| class Foo { +1| void bar(int aaa, int bbb = 0) {} 2| } -< @@ -17,64 +17,64 @@ class MyClass { [#2 Content] = 1:4-1:8 >----< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#2 Removal] = 1:4-1:9 >-----< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#2 Leading delimiter] = 1:0-1:4 >----< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#2 Trailing delimiter] = 1:8-1:9 >-< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#2 Domain] = 1:4-1:37 >---------------------------------< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#2 Insertion delimiter] = " " [#3 Content] = 1:13-1:16 >---< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#3 Removal] = 1:13-1:17 >----< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#3 Trailing delimiter] = 1:16-1:17 >-< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#3 Domain] = 1:13-1:20 >-------< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#3 Insertion delimiter] = " " [#4 Content] = 1:22-1:25 >---< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Removal] = 1:22-1:26 >----< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Leading delimiter] = 1:21-1:22 >-< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Trailing delimiter] = 1:25-1:26 >-< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Domain] = 1:22-1:33 >-----------< -1| void foo(int aaa, int bbb = 2) {} +1| void bar(int aaa, int bbb = 0) {} [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.iteration.scope index dc779a0222..44a5a7db1e 100644 --- a/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - MyClass(int aaa, int bbb = 2) {} +class Foo { + Foo(int aaa = 0, int bbb = 1) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int aaa, int bbb = 2) {} + >----------- +0| class Foo { +1| Foo(int aaa = 0, int bbb = 1) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| MyClass(int aaa, int bbb = 2) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| Foo(int aaa = 0, int bbb = 1) {} 2| } < [#3 Content] = -[#3 Domain] = 1:12-1:32 - >--------------------< -1| MyClass(int aaa, int bbb = 2) {} +[#3 Domain] = 1:8-1:32 + >------------------------< +1| Foo(int aaa = 0, int bbb = 1) {} diff --git a/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.scope index e08f4f16db..93360f1fd2 100644 --- a/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.scope +++ b/data/fixtures/scopes/cpp/value/value.argument.formal.constructor.scope @@ -1,22 +1,41 @@ -class MyClass { - MyClass(int aaa, int bbb = 2) {} +class Foo { + Foo(int aaa = 0, int bbb = 1) {} } --- -[Content] = 1:31-1:32 +[#1 Content] = 1:18-1:19 + >-< +1| Foo(int aaa = 0, int bbb = 1) {} + +[#1 Removal] = 1:15-1:19 + >----< +1| Foo(int aaa = 0, int bbb = 1) {} + +[#1 Leading delimiter] = 1:15-1:18 + >---< +1| Foo(int aaa = 0, int bbb = 1) {} + +[#1 Domain] = 1:8-1:19 + >-----------< +1| Foo(int aaa = 0, int bbb = 1) {} + +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:31-1:32 >-< -1| MyClass(int aaa, int bbb = 2) {} +1| Foo(int aaa = 0, int bbb = 1) {} -[Removal] = 1:28-1:32 +[#2 Removal] = 1:28-1:32 >----< -1| MyClass(int aaa, int bbb = 2) {} +1| Foo(int aaa = 0, int bbb = 1) {} -[Leading delimiter] = 1:28-1:31 +[#2 Leading delimiter] = 1:28-1:31 >---< -1| MyClass(int aaa, int bbb = 2) {} +1| Foo(int aaa = 0, int bbb = 1) {} -[Domain] = 1:21-1:32 +[#2 Domain] = 1:21-1:32 >-----------< -1| MyClass(int aaa, int bbb = 2) {} +1| Foo(int aaa = 0, int bbb = 1) {} -[Insertion delimiter] = " " +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/value/value.argument.formal.iteration.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.iteration.scope index 4599d64443..8fea0c4c3b 100644 --- a/data/fixtures/scopes/cpp/value/value.argument.formal.iteration.scope +++ b/data/fixtures/scopes/cpp/value/value.argument.formal.iteration.scope @@ -1,13 +1,13 @@ -void aaa(int bbb = 0, int ccc = 0) {} +void foo(int aaa = 0, int bbb = 1) {} --- [#1 Content] = [#1 Domain] = 0:0-0:37 >-------------------------------------< -0| void aaa(int bbb = 0, int ccc = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} [#2 Content] = [#2 Domain] = 0:9-0:33 >------------------------< -0| void aaa(int bbb = 0, int ccc = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} diff --git a/data/fixtures/scopes/cpp/value/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.method.iteration.scope index 726ca89138..8ef7f2044a 100644 --- a/data/fixtures/scopes/cpp/value/value.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/cpp/value/value.argument.formal.method.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - void foo(int aaa, int bbb = 2) {} +class Foo { + void bar(int aaa = 0, int bbb = 1) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void foo(int aaa, int bbb = 2) {} + >----------- +0| class Foo { +1| void bar(int aaa = 0, int bbb = 1) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| void foo(int aaa, int bbb = 2) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| void bar(int aaa = 0, int bbb = 1) {} 2| } < [#3 Content] = -[#3 Domain] = 1:13-1:33 - >--------------------< -1| void foo(int aaa, int bbb = 2) {} +[#3 Domain] = 1:13-1:37 + >------------------------< +1| void bar(int aaa = 0, int bbb = 1) {} diff --git a/data/fixtures/scopes/cpp/value/value.argument.formal.method.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.method.scope index c9bceab2b3..f158cfc65e 100644 --- a/data/fixtures/scopes/cpp/value/value.argument.formal.method.scope +++ b/data/fixtures/scopes/cpp/value/value.argument.formal.method.scope @@ -1,22 +1,41 @@ -class MyClass { - void foo(int aaa, int bbb = 2) {} +class Foo { + void bar(int aaa = 0, int bbb = 1) {} } --- -[Content] = 1:32-1:33 - >-< -1| void foo(int aaa, int bbb = 2) {} +[#1 Content] = 1:23-1:24 + >-< +1| void bar(int aaa = 0, int bbb = 1) {} -[Removal] = 1:29-1:33 - >----< -1| void foo(int aaa, int bbb = 2) {} +[#1 Removal] = 1:20-1:24 + >----< +1| void bar(int aaa = 0, int bbb = 1) {} -[Leading delimiter] = 1:29-1:32 - >---< -1| void foo(int aaa, int bbb = 2) {} +[#1 Leading delimiter] = 1:20-1:23 + >---< +1| void bar(int aaa = 0, int bbb = 1) {} -[Domain] = 1:22-1:33 - >-----------< -1| void foo(int aaa, int bbb = 2) {} +[#1 Domain] = 1:13-1:24 + >-----------< +1| void bar(int aaa = 0, int bbb = 1) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:36-1:37 + >-< +1| void bar(int aaa = 0, int bbb = 1) {} + +[#2 Removal] = 1:33-1:37 + >----< +1| void bar(int aaa = 0, int bbb = 1) {} + +[#2 Leading delimiter] = 1:33-1:36 + >---< +1| void bar(int aaa = 0, int bbb = 1) {} + +[#2 Domain] = 1:26-1:37 + >-----------< +1| void bar(int aaa = 0, int bbb = 1) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/value/value.argument.formal.scope b/data/fixtures/scopes/cpp/value/value.argument.formal.scope index 4d27d902a3..d2841afcdc 100644 --- a/data/fixtures/scopes/cpp/value/value.argument.formal.scope +++ b/data/fixtures/scopes/cpp/value/value.argument.formal.scope @@ -1,20 +1,39 @@ -void aaa(int bbb = 0) {} +void foo(int aaa = 0, int bbb = 1) {} --- -[Content] = 0:19-0:20 +[#1 Content] = 0:19-0:20 >-< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} -[Removal] = 0:16-0:20 +[#1 Removal] = 0:16-0:20 >----< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} -[Leading delimiter] = 0:16-0:19 +[#1 Leading delimiter] = 0:16-0:19 >---< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} -[Domain] = 0:9-0:20 +[#1 Domain] = 0:9-0:20 >-----------< -0| void aaa(int bbb = 0) {} +0| void foo(int aaa = 0, int bbb = 1) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:32-0:33 + >-< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#2 Removal] = 0:29-0:33 + >----< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#2 Leading delimiter] = 0:29-0:32 + >---< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#2 Domain] = 0:22-0:33 + >-----------< +0| void foo(int aaa = 0, int bbb = 1) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/value/value.foreach.scope b/data/fixtures/scopes/cpp/value/value.foreach.scope index fdfdae58f1..cc97faa412 100644 --- a/data/fixtures/scopes/cpp/value/value.foreach.scope +++ b/data/fixtures/scopes/cpp/value/value.foreach.scope @@ -1,20 +1,20 @@ -for (int value : values) {} +for (int v : values) {} --- -[Content] = 0:17-0:23 - >------< -0| for (int value : values) {} +[Content] = 0:13-0:19 + >------< +0| for (int v : values) {} -[Removal] = 0:16-0:23 - >-------< -0| for (int value : values) {} +[Removal] = 0:12-0:19 + >-------< +0| for (int v : values) {} -[Leading delimiter] = 0:16-0:17 - >-< -0| for (int value : values) {} +[Leading delimiter] = 0:12-0:13 + >-< +0| for (int v : values) {} -[Domain] = 0:0-0:27 - >---------------------------< -0| for (int value : values) {} +[Domain] = 0:0-0:23 + >-----------------------< +0| for (int v : values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/cpp/value.switch.scope b/data/fixtures/scopes/cpp/value/value.switch.scope similarity index 100% rename from data/fixtures/scopes/cpp/value.switch.scope rename to data/fixtures/scopes/cpp/value/value.switch.scope diff --git a/data/fixtures/scopes/csharp/anonymousFunction.scope b/data/fixtures/scopes/csharp/anonymousFunction.scope index e51ac33018..d8674beeec 100644 --- a/data/fixtures/scopes/csharp/anonymousFunction.scope +++ b/data/fixtures/scopes/csharp/anonymousFunction.scope @@ -1,10 +1,10 @@ -foo.bar(param => expression) +() => {}; --- [Content] = [Removal] = -[Domain] = 0:8-0:27 - >-------------------< -0| foo.bar(param => expression) +[Domain] = 0:0-0:8 + >--------< +0| () => {}; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/csharp/anonymousFunction2.scope b/data/fixtures/scopes/csharp/anonymousFunction2.scope index 0762e57020..e67e54a020 100644 --- a/data/fixtures/scopes/csharp/anonymousFunction2.scope +++ b/data/fixtures/scopes/csharp/anonymousFunction2.scope @@ -1,17 +1,10 @@ -Func product = (arg1, arg2) => arg1 * arg2; +() => 0; --- [Content] = -[Domain] = 0:25-0:52 - >---------------------------< -0| Func product = (arg1, arg2) => arg1 * arg2; - -[Removal] = 0:24-0:52 - >----------------------------< -0| Func product = (arg1, arg2) => arg1 * arg2; - -[Leading delimiter] = 0:24-0:25 - >-< -0| Func product = (arg1, arg2) => arg1 * arg2; +[Removal] = +[Domain] = 0:0-0:7 + >-------< +0| () => 0; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/csharp/anonymousFunction3.scope b/data/fixtures/scopes/csharp/anonymousFunction3.scope deleted file mode 100644 index b680663225..0000000000 --- a/data/fixtures/scopes/csharp/anonymousFunction3.scope +++ /dev/null @@ -1,10 +0,0 @@ -(p1, p2) => {} ---- - -[Content] = -[Removal] = -[Domain] = 0:0-0:14 - >--------------< -0| (p1, p2) => {} - -[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/csharp/argument/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.iteration.scope index 327ff3d5c7..6aec551274 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.iteration.scope @@ -1,10 +1,10 @@ -new Foo(a, b); +new Foo(aaa, bbb); --- -[Content] = 0:8-0:12 - >----< -0| new Foo(a, b); +[Content] = 0:8-0:16 + >--------< +0| new Foo(aaa, bbb); -[Domain] = 0:0-0:13 - >-------------< -0| new Foo(a, b); +[Domain] = 0:0-0:17 + >-----------------< +0| new Foo(aaa, bbb); diff --git a/data/fixtures/scopes/csharp/argument/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.multiLine.scope index 83b174809d..d9817d4b7c 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.multiLine.scope @@ -1,44 +1,44 @@ new Foo( - a, - b + aaa, + bbb ); --- [#1 Content] = -[#1 Domain] = 1:4-1:5 - >-< -1| a, +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, [#1 Removal] = 1:4-2:4 - >-- -1| a, -2| b + >---- +1| aaa, +2| bbb ----< -[#1 Trailing delimiter] = 1:5-2:4 - >- -1| a, -2| b +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 2:4-2:5 - >-< -2| b - -[#2 Removal] = 1:5-2:5 - >- -1| a, -2| b - -----< - -[#2 Leading delimiter] = 1:5-2:4 - >- -1| a, -2| b +[#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/csharp/argument/argument.actual.constructor.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.singleLine.scope index adfbef60e8..afee36448c 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.constructor.singleLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.singleLine.scope @@ -1,33 +1,33 @@ -new Foo(a, b); +new Foo(aaa, bbb); --- [#1 Content] = -[#1 Domain] = 0:8-0:9 - >-< -0| new Foo(a, b); - -[#1 Removal] = 0:8-0:11 +[#1 Domain] = 0:8-0:11 >---< -0| new Foo(a, b); +0| new Foo(aaa, bbb); + +[#1 Removal] = 0:8-0:13 + >-----< +0| new Foo(aaa, bbb); -[#1 Trailing delimiter] = 0:9-0:11 - >--< -0| new Foo(a, b); +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| new Foo(aaa, bbb); [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:11-0:12 - >-< -0| new Foo(a, b); +[#2 Domain] = 0:13-0:16 + >---< +0| new Foo(aaa, bbb); -[#2 Removal] = 0:9-0:12 - >---< -0| new Foo(a, b); +[#2 Removal] = 0:11-0:16 + >-----< +0| new Foo(aaa, bbb); -[#2 Leading delimiter] = 0:9-0:11 - >--< -0| new Foo(a, b); +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| new Foo(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope index 962586a45c..3745067d07 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope @@ -1,10 +1,10 @@ -Foo(5, "bar"); +Foo(aaa, bbb); --- [Content] = 0:4-0:12 >--------< -0| Foo(5, "bar"); +0| Foo(aaa, bbb); [Domain] = 0:0-0:13 >-------------< -0| Foo(5, "bar"); +0| Foo(aaa, bbb); diff --git a/data/fixtures/scopes/csharp/argument/argument.actual.method.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.actual.method.iteration.scope index 05a59a271a..7dc906b75a 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.method.iteration.scope @@ -1,10 +1,10 @@ -foo.bar(a, b); +foo.bar(aaa, bbb); --- -[Content] = 0:8-0:12 - >----< -0| foo.bar(a, b); +[Content] = 0:8-0:16 + >--------< +0| foo.bar(aaa, bbb); -[Domain] = 0:0-0:13 - >-------------< -0| foo.bar(a, b); +[Domain] = 0:0-0:17 + >-----------------< +0| foo.bar(aaa, bbb); diff --git a/data/fixtures/scopes/csharp/argument/argument.actual.method.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.method.multiLine.scope index 8ea12dab83..f75aaa48de 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.method.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.method.multiLine.scope @@ -1,44 +1,44 @@ foo.bar( - a, - b + aaa, + bbb ); --- [#1 Content] = -[#1 Domain] = 1:4-1:5 - >-< -1| a, +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, [#1 Removal] = 1:4-2:4 - >-- -1| a, -2| b + >---- +1| aaa, +2| bbb ----< -[#1 Trailing delimiter] = 1:5-2:4 - >- -1| a, -2| b +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 2:4-2:5 - >-< -2| b - -[#2 Removal] = 1:5-2:5 - >- -1| a, -2| b - -----< - -[#2 Leading delimiter] = 1:5-2:4 - >- -1| a, -2| b +[#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/csharp/argument/argument.actual.method.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.actual.method.singleLine.scope index d318cad25e..46548a2c6c 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.method.singleLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.method.singleLine.scope @@ -1,33 +1,33 @@ -foo.bar(a, b); +foo.bar(aaa, bbb); --- [#1 Content] = -[#1 Domain] = 0:8-0:9 - >-< -0| foo.bar(a, b); - -[#1 Removal] = 0:8-0:11 +[#1 Domain] = 0:8-0:11 >---< -0| foo.bar(a, b); +0| foo.bar(aaa, bbb); + +[#1 Removal] = 0:8-0:13 + >-----< +0| foo.bar(aaa, bbb); -[#1 Trailing delimiter] = 0:9-0:11 - >--< -0| foo.bar(a, b); +[#1 Trailing delimiter] = 0:11-0:13 + >--< +0| foo.bar(aaa, bbb); [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:11-0:12 - >-< -0| foo.bar(a, b); +[#2 Domain] = 0:13-0:16 + >---< +0| foo.bar(aaa, bbb); -[#2 Removal] = 0:9-0:12 - >---< -0| foo.bar(a, b); +[#2 Removal] = 0:11-0:16 + >-----< +0| foo.bar(aaa, bbb); -[#2 Leading delimiter] = 0:9-0:11 - >--< -0| foo.bar(a, b); +[#2 Leading delimiter] = 0:11-0:13 + >--< +0| foo.bar(aaa, bbb); [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argument/argument.catch.scope b/data/fixtures/scopes/csharp/argument/argument.catch.scope index a0a0c60d26..1f16672cf6 100644 --- a/data/fixtures/scopes/csharp/argument/argument.catch.scope +++ b/data/fixtures/scopes/csharp/argument/argument.catch.scope @@ -1,21 +1,21 @@ try {} -catch(MyException ex) {} -catch(Exception ex) {} +catch(MyException e) {} +catch(Exception e) {} --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 1:6-1:20 - >--------------< -1| catch(MyException ex) {} +[#1 Domain] = 1:6-1:19 + >-------------< +1| catch(MyException e) {} [#1 Insertion delimiter] = " " [#2 Content] = [#2 Removal] = -[#2 Domain] = 2:6-2:18 - >------------< -2| catch(Exception ex) {} +[#2 Domain] = 2:6-2:17 + >-----------< +2| catch(Exception e) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.iteration.scope index 2b0db14a45..288002981c 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.iteration.scope @@ -1,12 +1,12 @@ -class MyClass { - MyClass(int a, int b) {} +class Foo { + Foo(int aaa, int bbb) {} } --- -[Content] = 1:12-1:24 - >------------< -1| MyClass(int a, int b) {} +[Content] = 1:8-1:24 + >----------------< +1| Foo(int aaa, int bbb) {} [Domain] = 1:4-1:28 >------------------------< -1| MyClass(int a, int b) {} +1| Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.multiLine.scope index f4a46fd108..5b45d96711 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.multiLine.scope @@ -1,46 +1,46 @@ -class MyClass { - MyClass( - int a, - int b +class Foo { + Foo( + int aaa, + int bbb ) {} } --- [#1 Content] = -[#1 Domain] = 2:8-2:13 - >-----< -2| int a, +[#1 Domain] = 2:8-2:15 + >-------< +2| int aaa, [#1 Removal] = 2:8-3:8 - >------ -2| int a, -3| int b + >-------- +2| int aaa, +3| int bbb --------< -[#1 Trailing delimiter] = 2:13-3:8 - >- -2| int a, -3| int b +[#1 Trailing delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb --------< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 3:8-3:13 - >-----< -3| int b - -[#2 Removal] = 2:13-3:13 - >- -2| int a, -3| int b - -------------< - -[#2 Leading delimiter] = 2:13-3:8 - >- -2| int a, -3| int b +[#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/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.singleLine.scope index c00e317d52..18092d00a8 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.singleLine.scope @@ -1,35 +1,35 @@ -class MyClass { - MyClass(int a, int b) {} +class Foo { + Foo(int aaa, int bbb) {} } --- [#1 Content] = -[#1 Domain] = 1:12-1:17 - >-----< -1| MyClass(int a, int b) {} +[#1 Domain] = 1:8-1:15 + >-------< +1| Foo(int aaa, int bbb) {} -[#1 Removal] = 1:12-1:19 - >-------< -1| MyClass(int a, int b) {} +[#1 Removal] = 1:8-1:17 + >---------< +1| Foo(int aaa, int bbb) {} -[#1 Trailing delimiter] = 1:17-1:19 - >--< -1| MyClass(int a, int b) {} +[#1 Trailing delimiter] = 1:15-1:17 + >--< +1| Foo(int aaa, int bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:19-1:24 - >-----< -1| MyClass(int a, int b) {} - -[#2 Removal] = 1:17-1:24 +[#2 Domain] = 1:17-1:24 >-------< -1| MyClass(int a, int b) {} +1| Foo(int aaa, int bbb) {} + +[#2 Removal] = 1:15-1:24 + >---------< +1| Foo(int aaa, int bbb) {} -[#2 Leading delimiter] = 1:17-1:19 - >--< -1| MyClass(int a, int b) {} +[#2 Leading delimiter] = 1:15-1:17 + >--< +1| Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope index 591d813a55..c1ecf788c9 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope @@ -1,10 +1,10 @@ -void Foo(String name, int value) {} +void Foo(int aaa, int bbb) {} --- -[Content] = 0:9-0:31 - >----------------------< -0| void Foo(String name, int value) {} +[Content] = 0:9-0:25 + >----------------< +0| void Foo(int aaa, int bbb) {} -[Domain] = 0:0-0:35 - >-----------------------------------< -0| void Foo(String name, int value) {} +[Domain] = 0:0-0:29 + >-----------------------------< +0| void Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.iteration.scope index 02834b6e30..c77c9f8c25 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.lambda.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.iteration.scope @@ -1,10 +1,10 @@ -(a, b) => {} +(aaa, bbb) => {} --- -[Content] = 0:1-0:5 - >----< -0| (a, b) => {} +[Content] = 0:1-0:9 + >--------< +0| (aaa, bbb) => {} -[Domain] = 0:0-0:12 - >------------< -0| (a, b) => {} +[Domain] = 0:0-0:16 + >----------------< +0| (aaa, bbb) => {} diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.multiLine.scope index 2134e15c7d..2866024743 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.multiLine.scope @@ -1,44 +1,44 @@ ( - a, - b + aaa, + bbb ) => {} --- [#1 Content] = -[#1 Domain] = 1:4-1:5 - >-< -1| a, +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, [#1 Removal] = 1:4-2:4 - >-- -1| a, -2| b + >---- +1| aaa, +2| bbb ----< -[#1 Trailing delimiter] = 1:5-2:4 - >- -1| a, -2| b +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 2:4-2:5 - >-< -2| b - -[#2 Removal] = 1:5-2:5 - >- -1| a, -2| b - -----< - -[#2 Leading delimiter] = 1:5-2:4 - >- -1| a, -2| b +[#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/csharp/argument/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.singleLine.scope index 02a715e97c..0361e604cb 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.singleLine.scope @@ -1,33 +1,33 @@ -(a, b) => {} +(aaa, bbb) => {} --- [#1 Content] = -[#1 Domain] = 0:1-0:2 - >-< -0| (a, b) => {} - -[#1 Removal] = 0:1-0:4 +[#1 Domain] = 0:1-0:4 >---< -0| (a, b) => {} +0| (aaa, bbb) => {} + +[#1 Removal] = 0:1-0:6 + >-----< +0| (aaa, bbb) => {} -[#1 Trailing delimiter] = 0:2-0:4 - >--< -0| (a, b) => {} +[#1 Trailing delimiter] = 0:4-0:6 + >--< +0| (aaa, bbb) => {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:4-0:5 - >-< -0| (a, b) => {} +[#2 Domain] = 0:6-0:9 + >---< +0| (aaa, bbb) => {} -[#2 Removal] = 0:2-0:5 - >---< -0| (a, b) => {} +[#2 Removal] = 0:4-0:9 + >-----< +0| (aaa, bbb) => {} -[#2 Leading delimiter] = 0:2-0:4 - >--< -0| (a, b) => {} +[#2 Leading delimiter] = 0:4-0:6 + >--< +0| (aaa, bbb) => {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.method.iteration.scope index 0b02be8373..5a15c7e7e6 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.method.iteration.scope @@ -1,12 +1,12 @@ -class MyClass { - void foo(int a, int b) {} +class Foo { + void Bar(int aaa, int bbb) {} } --- -[Content] = 1:13-1:25 - >------------< -1| void foo(int a, int b) {} +[Content] = 1:13-1:29 + >----------------< +1| void Bar(int aaa, int bbb) {} -[Domain] = 1:4-1:29 - >-------------------------< -1| void foo(int a, int b) {} +[Domain] = 1:4-1:33 + >-----------------------------< +1| void Bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.method.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.method.multiLine.scope index 7576e55c64..02bd4b8192 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.method.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.method.multiLine.scope @@ -1,46 +1,46 @@ -class MyClass { - void foo( - int a, - int b +class Foo { + void Bar( + int aaa, + int bbb ) {} } --- [#1 Content] = -[#1 Domain] = 2:8-2:13 - >-----< -2| int a, +[#1 Domain] = 2:8-2:15 + >-------< +2| int aaa, [#1 Removal] = 2:8-3:8 - >------ -2| int a, -3| int b + >-------- +2| int aaa, +3| int bbb --------< -[#1 Trailing delimiter] = 2:13-3:8 - >- -2| int a, -3| int b +[#1 Trailing delimiter] = 2:15-3:8 + >- +2| int aaa, +3| int bbb --------< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 3:8-3:13 - >-----< -3| int b - -[#2 Removal] = 2:13-3:13 - >- -2| int a, -3| int b - -------------< - -[#2 Leading delimiter] = 2:13-3:8 - >- -2| int a, -3| int b +[#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/argument.formal.method.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.method.singleLine.scope index f40432e5df..e8c7264b40 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.method.singleLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.method.singleLine.scope @@ -1,35 +1,35 @@ -class MyClass { - void foo(int a, int b) {} +class Foo { + void Bar(int aaa, int bbb) {} } --- [#1 Content] = -[#1 Domain] = 1:13-1:18 - >-----< -1| void foo(int a, int b) {} - -[#1 Removal] = 1:13-1:20 +[#1 Domain] = 1:13-1:20 >-------< -1| void foo(int a, int b) {} +1| void Bar(int aaa, int bbb) {} + +[#1 Removal] = 1:13-1:22 + >---------< +1| void Bar(int aaa, int bbb) {} -[#1 Trailing delimiter] = 1:18-1:20 - >--< -1| void foo(int a, int b) {} +[#1 Trailing delimiter] = 1:20-1:22 + >--< +1| void Bar(int aaa, int bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:20-1:25 - >-----< -1| void foo(int a, int b) {} +[#2 Domain] = 1:22-1:29 + >-------< +1| void Bar(int aaa, int bbb) {} -[#2 Removal] = 1:18-1:25 - >-------< -1| void foo(int a, int b) {} +[#2 Removal] = 1:20-1:29 + >---------< +1| void Bar(int aaa, int bbb) {} -[#2 Leading delimiter] = 1:18-1:20 - >--< -1| void foo(int a, int b) {} +[#2 Leading delimiter] = 1:20-1:22 + >--< +1| void Bar(int aaa, int bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.multiLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.multiLine.scope index fa5abb3481..04eb89f90a 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.multiLine.scope @@ -1,44 +1,44 @@ void Foo( - String name, - int value + int aaa, + int bbb ) {} --- [#1 Content] = -[#1 Domain] = 1:4-1:15 - >-----------< -1| String name, +[#1 Domain] = 1:4-1:11 + >-------< +1| int aaa, [#1 Removal] = 1:4-2:4 - >------------ -1| String name, -2| int value + >-------- +1| int aaa, +2| int bbb ----< -[#1 Trailing delimiter] = 1:15-2:4 - >- -1| String name, -2| int value +[#1 Trailing delimiter] = 1:11-2:4 + >- +1| int aaa, +2| int bbb ----< [#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 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/csharp/argument/argument.formal.singleLine.scope b/data/fixtures/scopes/csharp/argument/argument.formal.singleLine.scope index f056d96213..2bc2625d91 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.singleLine.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.singleLine.scope @@ -1,33 +1,33 @@ -void Foo(String name, int value) {} +void Foo(int aaa, int bbb) {} --- [#1 Content] = -[#1 Domain] = 0:9-0:20 - >-----------< -0| void Foo(String name, int value) {} +[#1 Domain] = 0:9-0:16 + >-------< +0| void Foo(int aaa, int bbb) {} -[#1 Removal] = 0:9-0:22 - >-------------< -0| void Foo(String name, int value) {} +[#1 Removal] = 0:9-0:18 + >---------< +0| void Foo(int aaa, int bbb) {} -[#1 Trailing delimiter] = 0:20-0:22 - >--< -0| void Foo(String name, int value) {} +[#1 Trailing delimiter] = 0:16-0:18 + >--< +0| void Foo(int aaa, int bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:22-0:31 - >---------< -0| void Foo(String name, int value) {} +[#2 Domain] = 0:18-0:25 + >-------< +0| void Foo(int aaa, int bbb) {} -[#2 Removal] = 0:20-0:31 - >-----------< -0| void Foo(String name, int value) {} +[#2 Removal] = 0:16-0:25 + >---------< +0| void Foo(int aaa, int bbb) {} -[#2 Leading delimiter] = 0:20-0:22 - >--< -0| void Foo(String name, int value) {} +[#2 Leading delimiter] = 0:16-0:18 + >--< +0| void Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.empty.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.empty.scope index c7f415a0c5..99ce24e01a 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.empty.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.empty.scope @@ -1,15 +1,15 @@ -class MyClass { - MyClass() {} +class Foo { + Foo() {} } --- [Content] = -[Removal] = 1:12-1:12 - >< -1| MyClass() {} +[Removal] = 1:8-1:8 + >< +1| Foo() {} -[Domain] = 1:4-1:16 - >------------< -1| MyClass() {} +[Domain] = 1:4-1:12 + >--------< +1| Foo() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope index a0153d3643..eeea010f89 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.multiLine.scope @@ -1,5 +1,5 @@ -class MyClass { - MyClass( +class Foo { + Foo( int aaa, int bbb ) {} @@ -12,9 +12,9 @@ class MyClass { 3| int bbb ---------------< -[Removal] = 1:12-4:4 - > -1| MyClass( +[Removal] = 1:8-4:4 + > +1| Foo( 2| int aaa, 3| int bbb 4| ) {} @@ -25,8 +25,8 @@ class MyClass { 2| int aaa, [Domain] = 1:4-4:8 - >-------- -1| MyClass( + >---- +1| Foo( 2| int aaa, 3| int bbb 4| ) {} diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope index ba318a7b14..a3385a5ff5 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.constructor.singleLine.scope @@ -1,15 +1,15 @@ -class MyClass { - MyClass(int aaa, int bbb) {} +class Foo { + Foo(int aaa, int bbb) {} } --- [Content] = -[Removal] = 1:12-1:28 - >----------------< -1| MyClass(int aaa, int bbb) {} +[Removal] = 1:8-1:24 + >----------------< +1| Foo(int aaa, int bbb) {} -[Domain] = 1:4-1:32 - >----------------------------< -1| MyClass(int aaa, int bbb) {} +[Domain] = 1:4-1:28 + >------------------------< +1| Foo(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.empty.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.empty.scope index 47572da9e3..4401363e85 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.empty.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.empty.scope @@ -1,15 +1,15 @@ -class MyClass { - void foo() {} +class Foo { + void Bar() {} } --- [Content] = [Removal] = 1:13-1:13 >< -1| void foo() {} +1| void Bar() {} [Domain] = 1:4-1:17 >-------------< -1| void foo() {} +1| void Bar() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope index 9a5c82d2dc..0a9ca5d9cd 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.multiLine.scope @@ -1,5 +1,5 @@ -class MyClass { - void foo( +class Foo { + void Bar( int aaa, int bbb ) {} @@ -14,7 +14,7 @@ class MyClass { [Removal] = 1:13-4:4 > -1| void foo( +1| void Bar( 2| int aaa, 3| int bbb 4| ) {} @@ -26,7 +26,7 @@ class MyClass { [Domain] = 1:4-4:8 >--------- -1| void foo( +1| void Bar( 2| int aaa, 3| int bbb 4| ) {} diff --git a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope index 35af67a9ce..e10a4e8b33 100644 --- a/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope +++ b/data/fixtures/scopes/csharp/argumentList/argumentList.formal.method.singleLine.scope @@ -1,15 +1,15 @@ -class MyClass { - void foo(int aaa, int bbb) {} +class Foo { + void Bar(int aaa, int bbb) {} } --- [Content] = [Removal] = 1:13-1:29 >----------------< -1| void foo(int aaa, int bbb) {} +1| void Bar(int aaa, int bbb) {} [Domain] = 1:4-1:33 >-----------------------------< -1| void foo(int aaa, int bbb) {} +1| void Bar(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/attribute.scope b/data/fixtures/scopes/csharp/attribute.scope index ed3d256a14..e8657d2bfe 100644 --- a/data/fixtures/scopes/csharp/attribute.scope +++ b/data/fixtures/scopes/csharp/attribute.scope @@ -1,11 +1,11 @@ -[Obsolete("Deprecated")] -void foo() {} +[Foo] +void Bar() {} --- [Content] = [Removal] = -[Domain] = 0:1-0:23 - >----------------------< -0| [Obsolete("Deprecated")] +[Domain] = 0:1-0:4 + >---< +0| [Foo] [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope index a6bb9937d3..f7be1a5796 100644 --- a/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope +++ b/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope @@ -1,12 +1,12 @@ if () {} else if () {} -else { } +else {} --- [Content] = -[Domain] = 0:0-2:8 +[Domain] = 0:0-2:7 >-------- 0| if () {} 1| else if () {} -2| else { } - --------< +2| else {} + -------< diff --git a/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope index 2f1e02dd89..81eca1bb2c 100644 --- a/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope @@ -1,18 +1,10 @@ -switch (value) { - case 1: - break; - default: - break; -} +switch (foo) { } --- -[Content] = -[Domain] = 0:16-5:0 - > -0| switch (value) { -1| case 1: -2| break; -3| default: -4| break; -5| } - < +[Content] = 0:14-0:15 + >-< +0| switch (foo) { } + +[Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } diff --git a/data/fixtures/scopes/csharp/branch/branch.switchCase.scope b/data/fixtures/scopes/csharp/branch/branch.switchCase.scope index 7313cc9d2e..c67cd2b4cc 100644 --- a/data/fixtures/scopes/csharp/branch/branch.switchCase.scope +++ b/data/fixtures/scopes/csharp/branch/branch.switchCase.scope @@ -1,48 +1,44 @@ -switch (value) { - case 1: - break; - default: +switch (foo) { + case 0: break; + default: {} } --- [#1 Content] = [#1 Domain] = 1:4-2:14 >------- -1| case 1: +1| case 0: 2| break; --------------< [#1 Removal] = 1:0-3:0 >----------- -1| case 1: +1| case 0: 2| break; -3| default: +3| default: {} < [#1 Leading delimiter] = 1:0-1:4 >----< -1| case 1: +1| case 0: [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 3:4-4:14 - >-------- -3| default: -4| break; - --------------< - -[#2 Removal] = 3:0-5:0 - >------------ -3| default: -4| break; -5| } +[#2 Domain] = 3:4-3:15 + >-----------< +3| default: {} + +[#2 Removal] = 3:0-4:0 + >--------------- +3| default: {} +4| } < [#2 Leading delimiter] = 3:0-3:4 >----< -3| default: +3| default: {} [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope index 9e31a9e468..c61e621a3f 100644 --- a/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope +++ b/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope @@ -1,12 +1,12 @@ -try { } -catch(Exception ex) { } -finally { } +try {} +catch(Exception e) {} +finally {} --- [Content] = -[Domain] = 0:0-2:11 - >------- -0| try { } -1| catch(Exception ex) { } -2| finally { } - -----------< +[Domain] = 0:0-2:10 + >------ +0| try {} +1| catch(Exception e) {} +2| finally {} + ----------< diff --git a/data/fixtures/scopes/csharp/branch/branch.try.scope b/data/fixtures/scopes/csharp/branch/branch.try.scope index ad2cebdcb2..5da5630e30 100644 --- a/data/fixtures/scopes/csharp/branch/branch.try.scope +++ b/data/fixtures/scopes/csharp/branch/branch.try.scope @@ -1,45 +1,45 @@ -try { } -catch(Exception ex) { } -finally { } +try {} +catch(Exception e) {} +finally {} --- [#1 Content] = -[#1 Domain] = 0:0-0:7 - >-------< -0| try { } +[#1 Domain] = 0:0-0:6 + >------< +0| try {} [#1 Removal] = 0:0-1:0 - >------- -0| try { } -1| catch(Exception ex) { } + >------ +0| try {} +1| catch(Exception e) {} < [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 1:0-1:23 - >-----------------------< -1| catch(Exception ex) { } +[#2 Domain] = 1:0-1:21 + >---------------------< +1| catch(Exception e) {} [#2 Removal] = 1:0-2:0 - >----------------------- -1| catch(Exception ex) { } -2| finally { } + >--------------------- +1| catch(Exception e) {} +2| finally {} < [#2 Insertion delimiter] = "\n" [#3 Content] = -[#3 Domain] = 2:0-2:11 - >-----------< -2| finally { } - -[#3 Removal] = 1:23-2:11 - > -1| catch(Exception ex) { } -2| finally { } - -----------< +[#3 Domain] = 2:0-2:10 + >----------< +2| finally {} + +[#3 Removal] = 1:21-2:10 + > +1| catch(Exception e) {} +2| finally {} + ----------< [#3 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/csharp/class.iteration.block.scope b/data/fixtures/scopes/csharp/class.iteration.block.scope index 7c3ff91c48..b2423a8bd5 100644 --- a/data/fixtures/scopes/csharp/class.iteration.block.scope +++ b/data/fixtures/scopes/csharp/class.iteration.block.scope @@ -1,27 +1,27 @@ -public class Outer_class { - public class Inner_class { } +public class Foo { + public class Bar { } } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >-------------------------- -0| public class Outer_class { -1| public class Inner_class { } + >------------------ +0| public class Foo { +1| public class Bar { } 2| } -< [#2 Content] = -[#2 Domain] = 0:26-2:0 - > -0| public class Outer_class { -1| public class Inner_class { } +[#2 Domain] = 0:18-2:0 + > +0| public class Foo { +1| public class Bar { } 2| } < [#3 Content] = -[#3 Domain] = 1:28-1:31 - >---< -1| public class Inner_class { } +[#3 Domain] = 1:20-1:21 + >-< +1| public class Bar { } diff --git a/data/fixtures/scopes/csharp/class.iteration.document.scope b/data/fixtures/scopes/csharp/class.iteration.document.scope index 6797a78b5d..813bb62ea9 100644 --- a/data/fixtures/scopes/csharp/class.iteration.document.scope +++ b/data/fixtures/scopes/csharp/class.iteration.document.scope @@ -1,18 +1,12 @@ -public class BankAccount { } +class Foo {} --- -[#1 Content] = -[#1 Domain] = 0:0-2:0 +[Content] = +[Domain] = 0:0-2:0 > 0| -1| public class BankAccount { } +1| class Foo {} 2| < - - -[#2 Content] = -[#2 Domain] = 1:26-1:27 - >-< -1| public class BankAccount { } diff --git a/data/fixtures/scopes/csharp/class.scope b/data/fixtures/scopes/csharp/class.scope index 9096a8a95e..405cfe57da 100644 --- a/data/fixtures/scopes/csharp/class.scope +++ b/data/fixtures/scopes/csharp/class.scope @@ -1,10 +1,10 @@ -public class BankAccount {} +public class Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:27 - >---------------------------< -0| public class BankAccount {} +[Domain] = 0:0-0:19 + >-------------------< +0| public class Foo {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/csharp/className.iteration.block.scope b/data/fixtures/scopes/csharp/className.iteration.block.scope index 7c3ff91c48..b2423a8bd5 100644 --- a/data/fixtures/scopes/csharp/className.iteration.block.scope +++ b/data/fixtures/scopes/csharp/className.iteration.block.scope @@ -1,27 +1,27 @@ -public class Outer_class { - public class Inner_class { } +public class Foo { + public class Bar { } } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >-------------------------- -0| public class Outer_class { -1| public class Inner_class { } + >------------------ +0| public class Foo { +1| public class Bar { } 2| } -< [#2 Content] = -[#2 Domain] = 0:26-2:0 - > -0| public class Outer_class { -1| public class Inner_class { } +[#2 Domain] = 0:18-2:0 + > +0| public class Foo { +1| public class Bar { } 2| } < [#3 Content] = -[#3 Domain] = 1:28-1:31 - >---< -1| public class Inner_class { } +[#3 Domain] = 1:20-1:21 + >-< +1| public class Bar { } diff --git a/data/fixtures/scopes/csharp/className.iteration.document.scope b/data/fixtures/scopes/csharp/className.iteration.document.scope index 6797a78b5d..813bb62ea9 100644 --- a/data/fixtures/scopes/csharp/className.iteration.document.scope +++ b/data/fixtures/scopes/csharp/className.iteration.document.scope @@ -1,18 +1,12 @@ -public class BankAccount { } +class Foo {} --- -[#1 Content] = -[#1 Domain] = 0:0-2:0 +[Content] = +[Domain] = 0:0-2:0 > 0| -1| public class BankAccount { } +1| class Foo {} 2| < - - -[#2 Content] = -[#2 Domain] = 1:26-1:27 - >-< -1| public class BankAccount { } diff --git a/data/fixtures/scopes/csharp/className.scope b/data/fixtures/scopes/csharp/className.scope index db75e2a87d..793da2dfad 100644 --- a/data/fixtures/scopes/csharp/className.scope +++ b/data/fixtures/scopes/csharp/className.scope @@ -1,24 +1,24 @@ -public class BankAccount {} +public class Foo {} --- -[Content] = 0:13-0:24 - >-----------< -0| public class BankAccount {} +[Content] = 0:13-0:16 + >---< +0| public class Foo {} -[Removal] = 0:13-0:25 - >------------< -0| public class BankAccount {} +[Removal] = 0:13-0:17 + >----< +0| public class Foo {} [Leading delimiter] = 0:12-0:13 >-< -0| public class BankAccount {} +0| public class Foo {} -[Trailing delimiter] = 0:24-0:25 - >-< -0| public class BankAccount {} +[Trailing delimiter] = 0:16-0:17 + >-< +0| public class Foo {} -[Domain] = 0:0-0:27 - >---------------------------< -0| public class BankAccount {} +[Domain] = 0:0-0:19 + >-------------------< +0| public class Foo {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/comment.block.scope b/data/fixtures/scopes/csharp/comment.block.scope index 5ac1a61ca4..5e8b51111c 100644 --- a/data/fixtures/scopes/csharp/comment.block.scope +++ b/data/fixtures/scopes/csharp/comment.block.scope @@ -1,17 +1,10 @@ -/* - Hello - world -*/ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-3:2 - >-- -0| /* -1| Hello -2| world -3| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/csharp/condition/condition.doWhile.scope b/data/fixtures/scopes/csharp/condition/condition.doWhile.scope index 19863ff506..f8e3242e13 100644 --- a/data/fixtures/scopes/csharp/condition/condition.doWhile.scope +++ b/data/fixtures/scopes/csharp/condition/condition.doWhile.scope @@ -1,20 +1,13 @@ -do { - -} -while (1 > 5); +do {} while (true); --- [Content] = -[Removal] = 3:7-3:12 - >-----< -3| while (1 > 5); +[Removal] = 0:13-0:17 + >----< +0| do {} while (true); -[Domain] = 0:0-3:14 - >---- -0| do { -1| -2| } -3| while (1 > 5); - --------------< +[Domain] = 0:0-0:19 + >-------------------< +0| do {} while (true); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/condition/condition.for.scope b/data/fixtures/scopes/csharp/condition/condition.for.scope index e9948ca2e9..ffb884ac10 100644 --- a/data/fixtures/scopes/csharp/condition/condition.for.scope +++ b/data/fixtures/scopes/csharp/condition/condition.for.scope @@ -1,20 +1,20 @@ -for (int i = 0; i < 5; i++) { } +for (int i = 0; i < size; i++) {} --- -[Content] = 0:16-0:21 - >-----< -0| for (int i = 0; i < 5; i++) { } +[Content] = 0:16-0:24 + >--------< +0| for (int i = 0; i < size; i++) {} -[Removal] = 0:15-0:21 - >------< -0| for (int i = 0; i < 5; i++) { } +[Removal] = 0:15-0:24 + >---------< +0| for (int i = 0; i < size; i++) {} [Leading delimiter] = 0:15-0:16 >-< -0| for (int i = 0; i < 5; i++) { } +0| for (int i = 0; i < size; i++) {} -[Domain] = 0:0-0:31 - >-------------------------------< -0| for (int i = 0; i < 5; i++) { } +[Domain] = 0:0-0:33 + >---------------------------------< +0| for (int i = 0; i < size; i++) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope index ce40b5c558..bc1baaf399 100644 --- a/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope @@ -1,15 +1,7 @@ -switch(expression) -{ - case x: break; - default: break; -} +switch(foo) { } --- [Content] = -[Domain] = 1:1-4:0 - > -1| { -2| case x: break; -3| default: break; -4| } - < +[Domain] = 0:13-0:14 + >-< +0| switch(foo) { } diff --git a/data/fixtures/scopes/csharp/condition/condition.switchCase.scope b/data/fixtures/scopes/csharp/condition/condition.switchCase.scope index aa0a6baffd..b109c4351e 100644 --- a/data/fixtures/scopes/csharp/condition/condition.switchCase.scope +++ b/data/fixtures/scopes/csharp/condition/condition.switchCase.scope @@ -1,25 +1,22 @@ -switch(value) { - case x: - break; +switch(foo) { + case 0: break; } --- [Content] = 1:9-1:10 >-< -1| case x: +1| case 0: break; [Removal] = 1:8-1:10 >--< -1| case x: +1| case 0: break; [Leading delimiter] = 1:8-1:9 >-< -1| case x: +1| case 0: break; -[Domain] = 1:4-2:14 - >------- -1| case x: -2| break; - --------------< +[Domain] = 1:4-1:18 + >--------------< +1| case 0: break; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/condition/condition.ternary.scope b/data/fixtures/scopes/csharp/condition/condition.ternary.scope index 1e645e4fab..e7892837ea 100644 --- a/data/fixtures/scopes/csharp/condition/condition.ternary.scope +++ b/data/fixtures/scopes/csharp/condition/condition.ternary.scope @@ -1,20 +1,20 @@ -1 < 5 ? foo : bar; +true ? 0 : 1; --- -[Content] = 0:0-0:5 - >-----< -0| 1 < 5 ? foo : bar; +[Content] = 0:0-0:4 + >----< +0| true ? 0 : 1; -[Removal] = 0:0-0:6 - >------< -0| 1 < 5 ? foo : bar; +[Removal] = 0:0-0:5 + >-----< +0| true ? 0 : 1; -[Trailing delimiter] = 0:5-0:6 - >-< -0| 1 < 5 ? foo : bar; +[Trailing delimiter] = 0:4-0:5 + >-< +0| true ? 0 : 1; -[Domain] = 0:0-0:17 - >-----------------< -0| 1 < 5 ? foo : bar; +[Domain] = 0:0-0:12 + >------------< +0| true ? 0 : 1; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/condition/condition.while.scope b/data/fixtures/scopes/csharp/condition/condition.while.scope index 51884f6ef8..61cd7d9e7a 100644 --- a/data/fixtures/scopes/csharp/condition/condition.while.scope +++ b/data/fixtures/scopes/csharp/condition/condition.while.scope @@ -1,13 +1,13 @@ -while (a != true) { } +while (true) {} --- [Content] = -[Removal] = 0:7-0:16 - >---------< -0| while (a != true) { } +[Removal] = 0:7-0:11 + >----< +0| while (true) {} -[Domain] = 0:0-0:21 - >---------------------< -0| while (a != true) { } +[Domain] = 0:0-0:15 + >---------------< +0| while (true) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCall.constructor.scope b/data/fixtures/scopes/csharp/functionCall.constructor.scope index 9902d22286..d94f8bf315 100644 --- a/data/fixtures/scopes/csharp/functionCall.constructor.scope +++ b/data/fixtures/scopes/csharp/functionCall.constructor.scope @@ -1,17 +1,10 @@ -Taxi t = new Taxi(); +new Foo(); --- [Content] = -[Domain] = 0:9-0:19 - >----------< -0| Taxi t = new Taxi(); - -[Removal] = 0:8-0:19 - >-----------< -0| Taxi t = new Taxi(); - -[Leading delimiter] = 0:8-0:9 - >-< -0| Taxi t = new Taxi(); +[Removal] = +[Domain] = 0:0-0:9 + >---------< +0| new Foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCall.constructor2.scope b/data/fixtures/scopes/csharp/functionCall.constructor2.scope deleted file mode 100644 index b41b9945ba..0000000000 --- a/data/fixtures/scopes/csharp/functionCall.constructor2.scope +++ /dev/null @@ -1,17 +0,0 @@ -Taxi t = new c.Taxi(a, b); ---- - -[Content] = -[Domain] = 0:9-0:25 - >----------------< -0| Taxi t = new c.Taxi(a, b); - -[Removal] = 0:8-0:25 - >-----------------< -0| Taxi t = new c.Taxi(a, b); - -[Leading delimiter] = 0:8-0:9 - >-< -0| Taxi t = new c.Taxi(a, b); - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCall.constructor3.scope b/data/fixtures/scopes/csharp/functionCall.constructor3.scope deleted file mode 100644 index efe7cf147b..0000000000 --- a/data/fixtures/scopes/csharp/functionCall.constructor3.scope +++ /dev/null @@ -1,17 +0,0 @@ -Taxi t = new c[0].Taxi(a, b); ---- - -[Content] = -[Domain] = 0:9-0:28 - >-------------------< -0| Taxi t = new c[0].Taxi(a, b); - -[Removal] = 0:8-0:28 - >--------------------< -0| Taxi t = new c[0].Taxi(a, b); - -[Leading delimiter] = 0:8-0:9 - >-< -0| Taxi t = new c[0].Taxi(a, b); - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCall.scope b/data/fixtures/scopes/csharp/functionCall.scope index 14ac7e565e..f3c114570a 100644 --- a/data/fixtures/scopes/csharp/functionCall.scope +++ b/data/fixtures/scopes/csharp/functionCall.scope @@ -1,17 +1,10 @@ -int value = getValue(); +Foo(); --- [Content] = -[Domain] = 0:12-0:22 - >----------< -0| int value = getValue(); - -[Removal] = 0:11-0:22 - >-----------< -0| int value = getValue(); - -[Leading delimiter] = 0:11-0:12 - >-< -0| int value = getValue(); +[Removal] = +[Domain] = 0:0-0:5 + >-----< +0| Foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor.scope index 4d351e47ab..81ac744168 100644 --- a/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor.scope +++ b/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor.scope @@ -1,17 +1,13 @@ -TestMotorcycle moto = new TestMotorcycle(); +new Foo(); --- [Content] = -[Removal] = 0:22-0:40 - >------------------< -0| TestMotorcycle moto = new TestMotorcycle(); +[Removal] = 0:0-0:7 + >-------< +0| new Foo(); -[Leading delimiter] = 0:21-0:22 - >-< -0| TestMotorcycle moto = new TestMotorcycle(); - -[Domain] = 0:22-0:42 - >--------------------< -0| TestMotorcycle moto = new TestMotorcycle(); +[Domain] = 0:0-0:9 + >---------< +0| new Foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor2.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor2.scope deleted file mode 100644 index e11d59d663..0000000000 --- a/data/fixtures/scopes/csharp/functionCallee/functionCallee.constructor2.scope +++ /dev/null @@ -1,17 +0,0 @@ -TestMotorcycle moto = new TestMotorcycle[0](); ---- - -[Content] = -[Removal] = 0:22-0:43 - >---------------------< -0| TestMotorcycle moto = new TestMotorcycle[0](); - -[Leading delimiter] = 0:21-0:22 - >-< -0| TestMotorcycle moto = new TestMotorcycle[0](); - -[Domain] = 0:22-0:45 - >-----------------------< -0| TestMotorcycle moto = new TestMotorcycle[0](); - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCallee/functionCallee.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee.scope index 602c0c2ab3..3071a48ae9 100644 --- a/data/fixtures/scopes/csharp/functionCallee/functionCallee.scope +++ b/data/fixtures/scopes/csharp/functionCallee/functionCallee.scope @@ -1,13 +1,13 @@ -moto.StartEngine(); +foo(); --- [Content] = -[Removal] = 0:0-0:16 - >----------------< -0| moto.StartEngine(); +[Removal] = 0:0-0:3 + >---< +0| foo(); -[Domain] = 0:0-0:18 - >------------------< -0| moto.StartEngine(); +[Domain] = 0:0-0:5 + >-----< +0| foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCallee/functionCallee2.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee2.scope deleted file mode 100644 index dd5aa9db4e..0000000000 --- a/data/fixtures/scopes/csharp/functionCallee/functionCallee2.scope +++ /dev/null @@ -1,13 +0,0 @@ -moto.StartEngine[0](5, true); ---- - -[Content] = -[Removal] = 0:0-0:19 - >-------------------< -0| moto.StartEngine[0](5, true); - -[Domain] = 0:0-0:28 - >----------------------------< -0| moto.StartEngine[0](5, true); - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCallee/functionCallee3.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee3.scope deleted file mode 100644 index a3f9af9431..0000000000 --- a/data/fixtures/scopes/csharp/functionCallee/functionCallee3.scope +++ /dev/null @@ -1,25 +0,0 @@ -startEngine[0](5, true)(); ---- - -[#1 Content] = -[#1 Removal] = 0:0-0:14 - >--------------< -0| startEngine[0](5, true)(); - -[#1 Domain] = 0:0-0:23 - >-----------------------< -0| startEngine[0](5, true)(); - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = 0:0-0:23 - >-----------------------< -0| startEngine[0](5, true)(); - -[#2 Domain] = 0:0-0:25 - >-------------------------< -0| startEngine[0](5, true)(); - -[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionCallee/functionCallee4.scope b/data/fixtures/scopes/csharp/functionCallee/functionCallee4.scope deleted file mode 100644 index bff563faa5..0000000000 --- a/data/fixtures/scopes/csharp/functionCallee/functionCallee4.scope +++ /dev/null @@ -1,25 +0,0 @@ -startEngine[0](5, true).test(); ---- - -[#1 Content] = -[#1 Removal] = 0:0-0:14 - >--------------< -0| startEngine[0](5, true).test(); - -[#1 Domain] = 0:0-0:23 - >-----------------------< -0| startEngine[0](5, true).test(); - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = 0:0-0:28 - >----------------------------< -0| startEngine[0](5, true).test(); - -[#2 Domain] = 0:0-0:30 - >------------------------------< -0| startEngine[0](5, true).test(); - -[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/functionName/functionName.method.iteration.class.scope b/data/fixtures/scopes/csharp/functionName/functionName.method.iteration.class.scope index 1740bcc7df..a3ec5f3456 100644 --- a/data/fixtures/scopes/csharp/functionName/functionName.method.iteration.class.scope +++ b/data/fixtures/scopes/csharp/functionName/functionName.method.iteration.class.scope @@ -1,13 +1,13 @@ -class MyClass { } +class Foo { } --- [#1 Content] = -[#1 Domain] = 0:0-0:17 - >-----------------< -0| class MyClass { } +[#1 Domain] = 0:0-0:13 + >-------------< +0| class Foo { } [#2 Content] = -[#2 Domain] = 0:15-0:16 - >-< -0| class MyClass { } +[#2 Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/csharp/ifStatement.scope b/data/fixtures/scopes/csharp/ifStatement.scope index f64174b953..14f2507621 100644 --- a/data/fixtures/scopes/csharp/ifStatement.scope +++ b/data/fixtures/scopes/csharp/ifStatement.scope @@ -1,10 +1,15 @@ -if (true) { } +if (true) {} +else if (false) {} +else {} --- [Content] = [Removal] = -[Domain] = 0:0-0:13 - >-------------< -0| if (true) { } +[Domain] = 0:0-2:7 + >------------ +0| if (true) {} +1| else if (false) {} +2| else {} + -------< [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/csharp/interior/interior.constructor.scope b/data/fixtures/scopes/csharp/interior/interior.constructor.scope index 0f109078ff..23adf22cbe 100644 --- a/data/fixtures/scopes/csharp/interior/interior.constructor.scope +++ b/data/fixtures/scopes/csharp/interior/interior.constructor.scope @@ -1,44 +1,44 @@ -class Program { - public Program() { } +class Foo { + public Foo() { } } --- -[#1 Content] = 1:4-1:24 - >--------------------< -1| public Program() { } +[#1 Content] = 1:4-1:20 + >----------------< +1| public Foo() { } -[#1 Removal] = 0:15-2:0 - > -0| class Program { -1| public Program() { } +[#1 Removal] = 0:11-2:0 + > +0| class Foo { +1| public Foo() { } 2| } < [#1 Domain] = 0:0-2:1 - >--------------- -0| class Program { -1| public Program() { } + >----------- +0| class Foo { +1| public Foo() { } 2| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:4-1:24 - >--------------------< -1| public Program() { } +[#2 Content] = 1:4-1:20 + >----------------< +1| public Foo() { } -[#2 Removal] = 0:15-2:0 - > -0| class Program { -1| public Program() { } +[#2 Removal] = 0:11-2:0 + > +0| class Foo { +1| public Foo() { } 2| } < -[#2 Domain] = 0:14-2:1 - >- -0| class Program { -1| public Program() { } +[#2 Domain] = 0:10-2:1 + >- +0| class Foo { +1| public Foo() { } 2| } -< @@ -46,36 +46,36 @@ class Program { [#3 Content] = -[#3 Removal] = 1:22-1:23 - >-< -1| public Program() { } +[#3 Removal] = 1:18-1:19 + >-< +1| public Foo() { } -[#3 Domain] = 1:4-1:24 - >--------------------< -1| public Program() { } +[#3 Domain] = 1:4-1:20 + >----------------< +1| public Foo() { } [#3 Insertion delimiter] = " " [#4 Content] = -[#4 Removal] = 1:19-1:19 - >< -1| public Program() { } +[#4 Removal] = 1:15-1:15 + >< +1| public Foo() { } -[#4 Domain] = 1:18-1:20 - >--< -1| public Program() { } +[#4 Domain] = 1:14-1:16 + >--< +1| public Foo() { } [#4 Insertion delimiter] = " " [#5 Content] = -[#5 Removal] = 1:22-1:23 - >-< -1| public Program() { } +[#5 Removal] = 1:18-1:19 + >-< +1| public Foo() { } -[#5 Domain] = 1:21-1:24 - >---< -1| public Program() { } +[#5 Domain] = 1:17-1:20 + >---< +1| public Foo() { } [#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/interior/interior.method.scope b/data/fixtures/scopes/csharp/interior/interior.method.scope index 6a03249aa3..87ab480019 100644 --- a/data/fixtures/scopes/csharp/interior/interior.method.scope +++ b/data/fixtures/scopes/csharp/interior/interior.method.scope @@ -1,23 +1,23 @@ -class Program { - public void foo() { } +class Foo { + public void Bar() { } } --- [#1 Content] = 1:4-1:25 >---------------------< -1| public void foo() { } +1| public void Bar() { } -[#1 Removal] = 0:15-2:0 - > -0| class Program { -1| public void foo() { } +[#1 Removal] = 0:11-2:0 + > +0| class Foo { +1| public void Bar() { } 2| } < [#1 Domain] = 0:0-2:1 - >--------------- -0| class Program { -1| public void foo() { } + >----------- +0| class Foo { +1| public void Bar() { } 2| } -< @@ -26,19 +26,19 @@ class Program { [#2 Content] = 1:4-1:25 >---------------------< -1| public void foo() { } +1| public void Bar() { } -[#2 Removal] = 0:15-2:0 - > -0| class Program { -1| public void foo() { } +[#2 Removal] = 0:11-2:0 + > +0| class Foo { +1| public void Bar() { } 2| } < -[#2 Domain] = 0:14-2:1 - >- -0| class Program { -1| public void foo() { } +[#2 Domain] = 0:10-2:1 + >- +0| class Foo { +1| public void Bar() { } 2| } -< @@ -48,11 +48,11 @@ class Program { [#3 Content] = [#3 Removal] = 1:23-1:24 >-< -1| public void foo() { } +1| public void Bar() { } [#3 Domain] = 1:4-1:25 >---------------------< -1| public void foo() { } +1| public void Bar() { } [#3 Insertion delimiter] = " " @@ -60,11 +60,11 @@ class Program { [#4 Content] = [#4 Removal] = 1:20-1:20 >< -1| public void foo() { } +1| public void Bar() { } [#4 Domain] = 1:19-1:21 >--< -1| public void foo() { } +1| public void Bar() { } [#4 Insertion delimiter] = " " @@ -72,10 +72,10 @@ class Program { [#5 Content] = [#5 Removal] = 1:23-1:24 >-< -1| public void foo() { } +1| public void Bar() { } [#5 Domain] = 1:22-1:25 >---< -1| public void foo() { } +1| public void Bar() { } [#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/interior/interior.switch.scope b/data/fixtures/scopes/csharp/interior/interior.switch.scope index e2ad168b18..fce2f668fa 100644 --- a/data/fixtures/scopes/csharp/interior/interior.switch.scope +++ b/data/fixtures/scopes/csharp/interior/interior.switch.scope @@ -1,37 +1,37 @@ -switch (value) { } +switch (foo) { } --- [#1 Content] = -[#1 Removal] = 0:16-0:17 - >-< -0| switch (value) { } +[#1 Removal] = 0:14-0:15 + >-< +0| switch (foo) { } -[#1 Domain] = 0:0-0:18 - >------------------< -0| switch (value) { } +[#1 Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:8-0:13 - >-----< -0| switch (value) { } +[#2 Removal] = 0:8-0:11 + >---< +0| switch (foo) { } -[#2 Domain] = 0:7-0:14 - >-------< -0| switch (value) { } +[#2 Domain] = 0:7-0:12 + >-----< +0| switch (foo) { } [#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 0:16-0:17 - >-< -0| switch (value) { } +[#3 Removal] = 0:14-0:15 + >-< +0| switch (foo) { } -[#3 Domain] = 0:15-0:18 - >---< -0| switch (value) { } +[#3 Domain] = 0:13-0:16 + >---< +0| switch (foo) { } [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/interior/interior.switchCase.scope b/data/fixtures/scopes/csharp/interior/interior.switchCase.scope index 58797959fa..79eec9b526 100644 --- a/data/fixtures/scopes/csharp/interior/interior.switchCase.scope +++ b/data/fixtures/scopes/csharp/interior/interior.switchCase.scope @@ -1,6 +1,6 @@ -switch (value) { +switch (foo) { case 0: - foo; + bar; break; case 1: { break; @@ -13,7 +13,7 @@ switch (value) { [#1 Content] = 1:4-8:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -22,11 +22,11 @@ switch (value) { 8| break; --------------< -[#1 Removal] = 0:16-9:0 - > -0| switch (value) { +[#1 Removal] = 0:14-9:0 + > +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -37,10 +37,10 @@ switch (value) { < [#1 Domain] = 0:0-9:1 - >---------------- -0| switch (value) { + >-------------- +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -54,13 +54,13 @@ switch (value) { [#2 Content] = -[#2 Removal] = 0:8-0:13 - >-----< -0| switch (value) { +[#2 Removal] = 0:8-0:11 + >---< +0| switch (foo) { -[#2 Domain] = 0:7-0:14 - >-------< -0| switch (value) { +[#2 Domain] = 0:7-0:12 + >-----< +0| switch (foo) { [#2 Insertion delimiter] = " " @@ -68,7 +68,7 @@ switch (value) { [#3 Content] = 1:4-8:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -77,11 +77,11 @@ switch (value) { 8| break; --------------< -[#3 Removal] = 0:16-9:0 - > -0| switch (value) { +[#3 Removal] = 0:14-9:0 + > +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -91,11 +91,11 @@ switch (value) { 9| } < -[#3 Domain] = 0:15-9:1 - >- -0| switch (value) { +[#3 Domain] = 0:13-9:1 + >- +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -111,14 +111,14 @@ switch (value) { [#4 Content] = [#4 Removal] = 2:8-3:14 >---- -2| foo; +2| bar; 3| break; --------------< [#4 Domain] = 1:4-3:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; --------------< diff --git a/data/fixtures/scopes/csharp/interior/interior.try.scope b/data/fixtures/scopes/csharp/interior/interior.try.scope index 87dc4ae08a..ae38809df4 100644 --- a/data/fixtures/scopes/csharp/interior/interior.try.scope +++ b/data/fixtures/scopes/csharp/interior/interior.try.scope @@ -1,5 +1,5 @@ try { } -catch(Exception ex) { } +catch(Exception e) { } finally { } --- @@ -28,37 +28,37 @@ finally { } [#3 Content] = -[#3 Removal] = 1:21-1:22 - >-< -1| catch(Exception ex) { } +[#3 Removal] = 1:20-1:21 + >-< +1| catch(Exception e) { } -[#3 Domain] = 1:0-1:23 - >-----------------------< -1| catch(Exception ex) { } +[#3 Domain] = 1:0-1:22 + >----------------------< +1| catch(Exception e) { } [#3 Insertion delimiter] = " " [#4 Content] = -[#4 Removal] = 1:6-1:18 - >------------< -1| catch(Exception ex) { } +[#4 Removal] = 1:6-1:17 + >-----------< +1| catch(Exception e) { } -[#4 Domain] = 1:5-1:19 - >--------------< -1| catch(Exception ex) { } +[#4 Domain] = 1:5-1:18 + >-------------< +1| catch(Exception e) { } [#4 Insertion delimiter] = " " [#5 Content] = -[#5 Removal] = 1:21-1:22 - >-< -1| catch(Exception ex) { } +[#5 Removal] = 1:20-1:21 + >-< +1| catch(Exception e) { } -[#5 Domain] = 1:20-1:23 - >---< -1| catch(Exception ex) { } +[#5 Domain] = 1:19-1:22 + >---< +1| catch(Exception e) { } [#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/key.mapPair.iteration.scope b/data/fixtures/scopes/csharp/key.mapPair.iteration.scope index 1d234360d0..397c2e0c4c 100644 --- a/data/fixtures/scopes/csharp/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/csharp/key.mapPair.iteration.scope @@ -1,12 +1,7 @@ -new StudentName { - FirstName = "Craig" -}; +new Foo {aaa = 0, bbb = 1}; --- [Content] = -[Domain] = 0:17-2:0 - > -0| new StudentName { -1| FirstName = "Craig" -2| }; - < +[Domain] = 0:9-0:25 + >----------------< +0| new Foo {aaa = 0, bbb = 1}; diff --git a/data/fixtures/scopes/csharp/key.mapPair.scope b/data/fixtures/scopes/csharp/key.mapPair.scope index 6545dfa39b..40beaead2c 100644 --- a/data/fixtures/scopes/csharp/key.mapPair.scope +++ b/data/fixtures/scopes/csharp/key.mapPair.scope @@ -1,26 +1,43 @@ -new StudentName { - FirstName = "Craig" -}; +new Foo {aaa = 0, bbb = 1}; --- -[Content] = 1:4-1:13 - >---------< -1| FirstName = "Craig" +[#1 Content] = 0:9-0:12 + >---< +0| new Foo {aaa = 0, bbb = 1}; -[Removal] = 1:4-1:14 - >----------< -1| FirstName = "Craig" +[#1 Removal] = 0:9-0:13 + >----< +0| new Foo {aaa = 0, bbb = 1}; -[Leading delimiter] = 1:0-1:4 - >----< -1| FirstName = "Craig" +[#1 Trailing delimiter] = 0:12-0:13 + >-< +0| new Foo {aaa = 0, bbb = 1}; -[Trailing delimiter] = 1:13-1:14 - >-< -1| FirstName = "Craig" +[#1 Domain] = 0:9-0:16 + >-------< +0| new Foo {aaa = 0, bbb = 1}; -[Domain] = 1:4-1:23 - >-------------------< -1| FirstName = "Craig" +[#1 Insertion delimiter] = " " -[Insertion delimiter] = " " + +[#2 Content] = 0:18-0:21 + >---< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Removal] = 0:18-0:22 + >----< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Leading delimiter] = 0:17-0:18 + >-< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Trailing delimiter] = 0:21-0:22 + >-< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Domain] = 0:18-0:25 + >-------< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/list.scope b/data/fixtures/scopes/csharp/list.scope index 894cd74f96..4874a2511c 100644 --- a/data/fixtures/scopes/csharp/list.scope +++ b/data/fixtures/scopes/csharp/list.scope @@ -1,17 +1,17 @@ -List values = new List() { 1, 2, 3 }; +new List() {aaa, bbb}; --- [Content] = -[Domain] = 0:35-0:46 - >-----------< -0| List values = new List() { 1, 2, 3 }; +[Domain] = 0:16-0:26 + >----------< +0| new List() {aaa, bbb}; -[Removal] = 0:34-0:46 - >------------< -0| List values = new List() { 1, 2, 3 }; +[Removal] = 0:15-0:26 + >-----------< +0| new List() {aaa, bbb}; -[Leading delimiter] = 0:34-0:35 - >-< -0| List values = new List() { 1, 2, 3 }; +[Leading delimiter] = 0:15-0:16 + >-< +0| new List() {aaa, bbb}; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/map.scope b/data/fixtures/scopes/csharp/map.scope index eff8665550..e76382c1de 100644 --- a/data/fixtures/scopes/csharp/map.scope +++ b/data/fixtures/scopes/csharp/map.scope @@ -1,25 +1,17 @@ -StudentName student = new StudentName { - FirstName = "Craig" -}; +new Foo {aaa = 0, bbb = 1}; --- [Content] = -[Domain] = 0:38-2:1 - >- -0| StudentName student = new StudentName { -1| FirstName = "Craig" -2| }; - -< +[Domain] = 0:8-0:26 + >------------------< +0| new Foo {aaa = 0, bbb = 1}; -[Removal] = 0:37-2:1 - >-- -0| StudentName student = new StudentName { -1| FirstName = "Craig" -2| }; - -< +[Removal] = 0:7-0:26 + >-------------------< +0| new Foo {aaa = 0, bbb = 1}; -[Leading delimiter] = 0:37-0:38 - >-< -0| StudentName student = new StudentName { +[Leading delimiter] = 0:7-0:8 + >-< +0| new Foo {aaa = 0, bbb = 1}; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.argument.catch.scope b/data/fixtures/scopes/csharp/name/name.argument.catch.scope index 08df3f843f..c7fef52586 100644 --- a/data/fixtures/scopes/csharp/name/name.argument.catch.scope +++ b/data/fixtures/scopes/csharp/name/name.argument.catch.scope @@ -1,41 +1,41 @@ try {} -catch(MyException ex) {} -catch(Exception ex) {} +catch(MyException e) {} +catch(Exception e) {} --- -[#1 Content] = 1:18-1:20 - >--< -1| catch(MyException ex) {} +[#1 Content] = 1:18-1:19 + >-< +1| catch(MyException e) {} -[#1 Removal] = 1:17-1:20 - >---< -1| catch(MyException ex) {} +[#1 Removal] = 1:17-1:19 + >--< +1| catch(MyException e) {} [#1 Leading delimiter] = 1:17-1:18 >-< -1| catch(MyException ex) {} +1| catch(MyException e) {} -[#1 Domain] = 1:6-1:20 - >--------------< -1| catch(MyException ex) {} +[#1 Domain] = 1:6-1:19 + >-------------< +1| catch(MyException e) {} [#1 Insertion delimiter] = " " -[#2 Content] = 2:16-2:18 - >--< -2| catch(Exception ex) {} +[#2 Content] = 2:16-2:17 + >-< +2| catch(Exception e) {} -[#2 Removal] = 2:15-2:18 - >---< -2| catch(Exception ex) {} +[#2 Removal] = 2:15-2:17 + >--< +2| catch(Exception e) {} [#2 Leading delimiter] = 2:15-2:16 >-< -2| catch(Exception ex) {} +2| catch(Exception e) {} -[#2 Domain] = 2:6-2:18 - >------------< -2| catch(Exception ex) {} +[#2 Domain] = 2:6-2:17 + >-----------< +2| catch(Exception e) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.iteration.scope index 7067000259..38b73085f5 100644 --- a/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - MyClass(int foo, int bar) {} +class Foo { + Foo(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int foo, int bar) {} + >----------- +0| class Foo { +1| Foo(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| MyClass(int foo, int bar) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| Foo(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:12-1:28 - >----------------< -1| MyClass(int foo, int bar) {} +[#3 Domain] = 1:8-1:24 + >----------------< +1| Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.scope index 264d3d503a..3a6057cbbf 100644 --- a/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.scope +++ b/data/fixtures/scopes/csharp/name/name.argument.formal.constructor.scope @@ -1,28 +1,28 @@ -class MyClass { - MyClass(int foo) {} +class Foo { + Foo(int aaa, int bbb) {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int foo) {} + >----------- +0| class Foo { +1| Foo(int aaa, int bbb) {} 2| } -< @@ -30,35 +30,54 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:4-1:11 - >-------< -1| MyClass(int foo) {} +[#2 Removal] = 1:4-1:7 + >---< +1| Foo(int aaa, int bbb) {} [#2 Leading delimiter] = 1:0-1:4 >----< -1| MyClass(int foo) {} +1| Foo(int aaa, int bbb) {} -[#2 Domain] = 1:4-1:23 - >-------------------< -1| MyClass(int foo) {} +[#2 Domain] = 1:4-1:28 + >------------------------< +1| Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:16-1:19 - >---< -1| MyClass(int foo) {} +[#3 Content] = 1:12-1:15 + >---< +1| Foo(int aaa, int bbb) {} -[#3 Removal] = 1:15-1:19 - >----< -1| MyClass(int foo) {} +[#3 Removal] = 1:11-1:15 + >----< +1| Foo(int aaa, int bbb) {} -[#3 Leading delimiter] = 1:15-1:16 - >-< -1| MyClass(int foo) {} +[#3 Leading delimiter] = 1:11-1:12 + >-< +1| Foo(int aaa, int bbb) {} -[#3 Domain] = 1:12-1:19 - >-------< -1| MyClass(int foo) {} +[#3 Domain] = 1:8-1:15 + >-------< +1| Foo(int aaa, int bbb) {} [#3 Insertion delimiter] = " " + + +[#4 Content] = 1:21-1:24 + >---< +1| Foo(int aaa, int bbb) {} + +[#4 Removal] = 1:20-1:24 + >----< +1| Foo(int aaa, int bbb) {} + +[#4 Leading delimiter] = 1:20-1:21 + >-< +1| Foo(int aaa, int bbb) {} + +[#4 Domain] = 1:17-1:24 + >-------< +1| Foo(int aaa, int bbb) {} + +[#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.iteration.scope index 26d5c66f0a..23ff30aaea 100644 --- a/data/fixtures/scopes/csharp/name/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/csharp/name/name.argument.formal.iteration.scope @@ -1,13 +1,13 @@ -void myFunk(String name, int value) {} +void Foo(int aaa, int bbb) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:38 - >--------------------------------------< -0| void myFunk(String name, int value) {} +[#1 Domain] = 0:0-0:29 + >-----------------------------< +0| void Foo(int aaa, int bbb) {} [#2 Content] = -[#2 Domain] = 0:12-0:34 - >----------------------< -0| void myFunk(String name, int value) {} +[#2 Domain] = 0:9-0:25 + >----------------< +0| void Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/name/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.method.iteration.scope index 1b943f8b64..038d21833d 100644 --- a/data/fixtures/scopes/csharp/name/name.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/csharp/name/name.argument.formal.method.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - void funk(int foo, int bar) {} +class Foo { + void Bar(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void funk(int foo, int bar) {} + >----------- +0| class Foo { +1| void Bar(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| void funk(int foo, int bar) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| void Bar(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:14-1:30 - >----------------< -1| void funk(int foo, int bar) {} +[#3 Domain] = 1:13-1:29 + >----------------< +1| void Bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/name/name.argument.formal.method.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.method.scope index a4e449bcc6..d9ad6eed7a 100644 --- a/data/fixtures/scopes/csharp/name/name.argument.formal.method.scope +++ b/data/fixtures/scopes/csharp/name/name.argument.formal.method.scope @@ -1,28 +1,28 @@ -class MyClass { - void funk(int foo) {} +class Foo { + void Bar(int aaa, int bbb) {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void funk(int foo) {} + >----------- +0| class Foo { +1| void Bar(int aaa, int bbb) {} 2| } -< @@ -30,35 +30,54 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:9-1:13 - >----< -1| void funk(int foo) {} +[#2 Removal] = 1:9-1:12 + >---< +1| void Bar(int aaa, int bbb) {} [#2 Leading delimiter] = 1:8-1:9 >-< -1| void funk(int foo) {} +1| void Bar(int aaa, int bbb) {} -[#2 Domain] = 1:4-1:25 - >---------------------< -1| void funk(int foo) {} +[#2 Domain] = 1:4-1:33 + >-----------------------------< +1| void Bar(int aaa, int bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:18-1:21 - >---< -1| void funk(int foo) {} +[#3 Content] = 1:17-1:20 + >---< +1| void Bar(int aaa, int bbb) {} -[#3 Removal] = 1:17-1:21 - >----< -1| void funk(int foo) {} +[#3 Removal] = 1:16-1:20 + >----< +1| void Bar(int aaa, int bbb) {} -[#3 Leading delimiter] = 1:17-1:18 - >-< -1| void funk(int foo) {} +[#3 Leading delimiter] = 1:16-1:17 + >-< +1| void Bar(int aaa, int bbb) {} -[#3 Domain] = 1:14-1:21 - >-------< -1| void funk(int foo) {} +[#3 Domain] = 1:13-1:20 + >-------< +1| void Bar(int aaa, int bbb) {} [#3 Insertion delimiter] = " " + + +[#4 Content] = 1:26-1:29 + >---< +1| void Bar(int aaa, int bbb) {} + +[#4 Removal] = 1:25-1:29 + >----< +1| void Bar(int aaa, int bbb) {} + +[#4 Leading delimiter] = 1:25-1:26 + >-< +1| void Bar(int aaa, int bbb) {} + +[#4 Domain] = 1:22-1:29 + >-------< +1| void Bar(int aaa, int bbb) {} + +[#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.argument.formal.scope b/data/fixtures/scopes/csharp/name/name.argument.formal.scope index bfad111248..80c4dae32b 100644 --- a/data/fixtures/scopes/csharp/name/name.argument.formal.scope +++ b/data/fixtures/scopes/csharp/name/name.argument.formal.scope @@ -1,55 +1,55 @@ -void myFunk(String name, int value) {} +void Foo(int aaa, int bbb) {} --- [#1 Content] = -[#1 Removal] = 0:5-0:11 - >------< -0| void myFunk(String name, int value) {} +[#1 Removal] = 0:5-0:8 + >---< +0| void Foo(int aaa, int bbb) {} [#1 Leading delimiter] = 0:4-0:5 >-< -0| void myFunk(String name, int value) {} +0| void Foo(int aaa, int bbb) {} -[#1 Domain] = 0:0-0:38 - >--------------------------------------< -0| void myFunk(String name, int value) {} +[#1 Domain] = 0:0-0:29 + >-----------------------------< +0| void Foo(int aaa, int bbb) {} [#1 Insertion delimiter] = " " -[#2 Content] = 0:19-0:23 - >----< -0| void myFunk(String name, int value) {} +[#2 Content] = 0:13-0:16 + >---< +0| void Foo(int aaa, int bbb) {} -[#2 Removal] = 0:18-0:23 - >-----< -0| void myFunk(String name, int value) {} +[#2 Removal] = 0:12-0:16 + >----< +0| void Foo(int aaa, int bbb) {} -[#2 Leading delimiter] = 0:18-0:19 - >-< -0| void myFunk(String name, int value) {} +[#2 Leading delimiter] = 0:12-0:13 + >-< +0| void Foo(int aaa, int bbb) {} -[#2 Domain] = 0:12-0:23 - >-----------< -0| void myFunk(String name, int value) {} +[#2 Domain] = 0:9-0:16 + >-------< +0| void Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 0:29-0:34 - >-----< -0| void myFunk(String name, int value) {} +[#3 Content] = 0:22-0:25 + >---< +0| void Foo(int aaa, int bbb) {} -[#3 Removal] = 0:28-0:34 - >------< -0| void myFunk(String name, int value) {} +[#3 Removal] = 0:21-0:25 + >----< +0| void Foo(int aaa, int bbb) {} -[#3 Leading delimiter] = 0:28-0:29 - >-< -0| void myFunk(String name, int value) {} +[#3 Leading delimiter] = 0:21-0:22 + >-< +0| void Foo(int aaa, int bbb) {} -[#3 Domain] = 0:25-0:34 - >---------< -0| void myFunk(String name, int value) {} +[#3 Domain] = 0:18-0:25 + >-------< +0| void Foo(int aaa, int bbb) {} [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.assignment.scope b/data/fixtures/scopes/csharp/name/name.assignment.scope index f03050c8a6..34e223fdda 100644 --- a/data/fixtures/scopes/csharp/name/name.assignment.scope +++ b/data/fixtures/scopes/csharp/name/name.assignment.scope @@ -1,20 +1,20 @@ -aaa = "bbb"; +foo = 0; --- [Content] = 0:0-0:3 >---< -0| aaa = "bbb"; +0| foo = 0; [Removal] = 0:0-0:4 >----< -0| aaa = "bbb"; +0| foo = 0; [Trailing delimiter] = 0:3-0:4 >-< -0| aaa = "bbb"; +0| foo = 0; -[Domain] = 0:0-0:11 - >-----------< -0| aaa = "bbb"; +[Domain] = 0:0-0:8 + >--------< +0| foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.assignment2.scope b/data/fixtures/scopes/csharp/name/name.assignment2.scope index 5f815a6b61..5bb9bb821d 100644 --- a/data/fixtures/scopes/csharp/name/name.assignment2.scope +++ b/data/fixtures/scopes/csharp/name/name.assignment2.scope @@ -1,20 +1,20 @@ -aaa += "bbb"; +foo += 0; --- [Content] = 0:0-0:3 >---< -0| aaa += "bbb"; +0| foo += 0; [Removal] = 0:0-0:4 >----< -0| aaa += "bbb"; +0| foo += 0; [Trailing delimiter] = 0:3-0:4 >-< -0| aaa += "bbb"; +0| foo += 0; -[Domain] = 0:0-0:12 - >------------< -0| aaa += "bbb"; +[Domain] = 0:0-0:9 + >---------< +0| foo += 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.constructor.scope b/data/fixtures/scopes/csharp/name/name.constructor.scope index 62614526f6..c067b52eed 100644 --- a/data/fixtures/scopes/csharp/name/name.constructor.scope +++ b/data/fixtures/scopes/csharp/name/name.constructor.scope @@ -1,28 +1,28 @@ -class MyClass { - MyClass() {} +class Foo { + Foo() {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass() {} + >----------- +0| class Foo { +1| Foo() {} 2| } -< @@ -30,16 +30,16 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:4-1:11 - >-------< -1| MyClass() {} +[#2 Removal] = 1:4-1:7 + >---< +1| Foo() {} [#2 Leading delimiter] = 1:0-1:4 >----< -1| MyClass() {} +1| Foo() {} -[#2 Domain] = 1:4-1:16 - >------------< -1| MyClass() {} +[#2 Domain] = 1:4-1:12 + >--------< +1| Foo() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.field.class.scope b/data/fixtures/scopes/csharp/name/name.field.class.scope index 4573c4536d..aab4cc8539 100644 --- a/data/fixtures/scopes/csharp/name/name.field.class.scope +++ b/data/fixtures/scopes/csharp/name/name.field.class.scope @@ -43,8 +43,8 @@ class Foo { >-< 1| int bar; -[#2 Domain] = 1:4-1:11 - >-------< +[#2 Domain] = 1:4-1:12 + >--------< 1| int bar; [#2 Insertion delimiter] = " " @@ -66,8 +66,8 @@ class Foo { >-< 2| int baz = 0; -[#3 Domain] = 2:4-2:15 - >-----------< +[#3 Domain] = 2:4-2:16 + >------------< 2| int baz = 0; [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.field.interface.scope b/data/fixtures/scopes/csharp/name/name.field.interface.scope index 2bb7bdefc7..94cb5a92cd 100644 --- a/data/fixtures/scopes/csharp/name/name.field.interface.scope +++ b/data/fixtures/scopes/csharp/name/name.field.interface.scope @@ -41,8 +41,8 @@ interface IFoo { >-< 1| int bar; -[#2 Domain] = 1:4-1:11 - >-------< +[#2 Domain] = 1:4-1:12 + >--------< 1| int bar; [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.foreach.scope b/data/fixtures/scopes/csharp/name/name.foreach.scope index e102189616..f31b3d1bb6 100644 --- a/data/fixtures/scopes/csharp/name/name.foreach.scope +++ b/data/fixtures/scopes/csharp/name/name.foreach.scope @@ -1,24 +1,24 @@ -foreach (int value in values) {} +foreach (int v in values) {} --- -[Content] = 0:13-0:18 - >-----< -0| foreach (int value in values) {} +[Content] = 0:13-0:14 + >-< +0| foreach (int v in values) {} -[Removal] = 0:13-0:19 - >------< -0| foreach (int value in values) {} +[Removal] = 0:13-0:15 + >--< +0| foreach (int v in values) {} [Leading delimiter] = 0:12-0:13 >-< -0| foreach (int value in values) {} +0| foreach (int v in values) {} -[Trailing delimiter] = 0:18-0:19 - >-< -0| foreach (int value in values) {} +[Trailing delimiter] = 0:14-0:15 + >-< +0| foreach (int v in values) {} -[Domain] = 0:0-0:32 - >--------------------------------< -0| foreach (int value in values) {} +[Domain] = 0:0-0:28 + >----------------------------< +0| foreach (int v in values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.iteration.block.scope b/data/fixtures/scopes/csharp/name/name.iteration.block.scope index 6a9caf512d..11f8f847e6 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.block.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.block.scope @@ -1,5 +1,5 @@ class Foo { - bar() { } + Bar() { } } --- @@ -7,7 +7,7 @@ class Foo { [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { -1| bar() { } +1| Bar() { } 2| } -< @@ -16,7 +16,7 @@ class Foo { [#2 Domain] = 0:11-2:0 > 0| class Foo { -1| bar() { } +1| Bar() { } 2| } < @@ -24,4 +24,4 @@ class Foo { [#3 Content] = [#3 Domain] = 1:11-1:12 >-< -1| bar() { } +1| Bar() { } diff --git a/data/fixtures/scopes/csharp/name/name.method.scope b/data/fixtures/scopes/csharp/name/name.method.scope index 219e506b77..9df6782d50 100644 --- a/data/fixtures/scopes/csharp/name/name.method.scope +++ b/data/fixtures/scopes/csharp/name/name.method.scope @@ -1,28 +1,28 @@ -class MyClass { - void funk() {} +class Foo { + void Bar() {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void funk() {} + >----------- +0| class Foo { +1| void Bar() {} 2| } -< @@ -30,16 +30,16 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:9-1:13 - >----< -1| void funk() {} +[#2 Removal] = 1:9-1:12 + >---< +1| void Bar() {} [#2 Leading delimiter] = 1:8-1:9 >-< -1| void funk() {} +1| void Bar() {} -[#2 Domain] = 1:4-1:18 - >--------------< -1| void funk() {} +[#2 Domain] = 1:4-1:17 + >-------------< +1| void Bar() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/name/name.variable.scope b/data/fixtures/scopes/csharp/name/name.variable.scope index 76bb5e32a2..65a4094cae 100644 --- a/data/fixtures/scopes/csharp/name/name.variable.scope +++ b/data/fixtures/scopes/csharp/name/name.variable.scope @@ -1,24 +1,24 @@ -String aaa = "bbb"; +int foo = 0; --- -[Content] = 0:7-0:10 - >---< -0| String aaa = "bbb"; +[Content] = 0:4-0:7 + >---< +0| int foo = 0; -[Removal] = 0:7-0:11 - >----< -0| String aaa = "bbb"; +[Removal] = 0:4-0:8 + >----< +0| int foo = 0; -[Leading delimiter] = 0:6-0:7 - >-< -0| String aaa = "bbb"; +[Leading delimiter] = 0:3-0:4 + >-< +0| int foo = 0; -[Trailing delimiter] = 0:10-0:11 - >-< -0| String aaa = "bbb"; +[Trailing delimiter] = 0:7-0:8 + >-< +0| int foo = 0; -[Domain] = 0:0-0:18 - >------------------< -0| String aaa = "bbb"; +[Domain] = 0:0-0:12 + >------------< +0| int foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/namedFunction/namedFunction.constructor.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.constructor.scope index e523d2c5b5..80cd6c934e 100644 --- a/data/fixtures/scopes/csharp/namedFunction/namedFunction.constructor.scope +++ b/data/fixtures/scopes/csharp/namedFunction/namedFunction.constructor.scope @@ -1,21 +1,21 @@ -class Program { - public Program() { } +class Foo { + public Foo() {} } --- [Content] = -[Domain] = 1:4-1:24 - >--------------------< -1| public Program() { } +[Domain] = 1:4-1:19 + >---------------< +1| public Foo() {} [Removal] = 1:0-2:0 - >------------------------ -1| public Program() { } + >------------------- +1| public Foo() {} 2| } < [Leading delimiter] = 1:0-1:4 >----< -1| public Program() { } +1| public Foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope index 76639112c1..0ee1ecdc48 100644 --- a/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope @@ -1,5 +1,5 @@ -void Foo() { } +void Foo() {} --- @@ -7,6 +7,6 @@ void Foo() { } [Domain] = 0:0-2:0 > 0| -1| void Foo() { } +1| void Foo() {} 2| < diff --git a/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.iteration.class.scope index 1740bcc7df..a3ec5f3456 100644 --- a/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.iteration.class.scope +++ b/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.iteration.class.scope @@ -1,13 +1,13 @@ -class MyClass { } +class Foo { } --- [#1 Content] = -[#1 Domain] = 0:0-0:17 - >-----------------< -0| class MyClass { } +[#1 Domain] = 0:0-0:13 + >-------------< +0| class Foo { } [#2 Content] = -[#2 Domain] = 0:15-0:16 - >-< -0| class MyClass { } +[#2 Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.scope index 6b0f6d705b..70fd8eb2a1 100644 --- a/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.scope +++ b/data/fixtures/scopes/csharp/namedFunction/namedFunction.method.scope @@ -1,21 +1,21 @@ -class Program { - public void foo() { } +class Foo { + public void Bar() {} } --- [Content] = -[Domain] = 1:4-1:25 - >---------------------< -1| public void foo() { } +[Domain] = 1:4-1:24 + >--------------------< +1| public void Bar() {} [Removal] = 1:0-2:0 - >------------------------- -1| public void foo() { } + >------------------------ +1| public void Bar() {} 2| } < [Leading delimiter] = 1:0-1:4 >----< -1| public void foo() { } +1| public void Bar() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/csharp/namedFunction/namedFunction.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.scope index 96c7f9a500..a3a49191c4 100644 --- a/data/fixtures/scopes/csharp/namedFunction/namedFunction.scope +++ b/data/fixtures/scopes/csharp/namedFunction/namedFunction.scope @@ -1,10 +1,10 @@ -void Foo() { } +void Foo() {} --- [Content] = [Removal] = -[Domain] = 0:0-0:14 - >--------------< -0| void Foo() { } +[Domain] = 0:0-0:13 + >-------------< +0| void Foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/csharp/statement/statement.scope b/data/fixtures/scopes/csharp/statement/statement.scope index 80a2e8baf9..be2d642f7d 100644 --- a/data/fixtures/scopes/csharp/statement/statement.scope +++ b/data/fixtures/scopes/csharp/statement/statement.scope @@ -1,10 +1,10 @@ -int value = 2; +int foo = 0; --- [Content] = [Removal] = -[Domain] = 0:0-0:14 - >--------------< -0| int value = 2; +[Domain] = 0:0-0:12 + >------------< +0| int foo = 0; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/csharp/string.multiLine.scope b/data/fixtures/scopes/csharp/string.multiLine.scope index ad49870e40..fdf7d3a8bd 100644 --- a/data/fixtures/scopes/csharp/string.multiLine.scope +++ b/data/fixtures/scopes/csharp/string.multiLine.scope @@ -1,4 +1,4 @@ -@"hello +@"Hello world"; --- @@ -6,7 +6,7 @@ world"; [Removal] = [Domain] = 0:0-1:6 >------- -0| @"hello +0| @"Hello 1| world"; ------< diff --git a/data/fixtures/scopes/csharp/string.singleLine.scope b/data/fixtures/scopes/csharp/string.singleLine.scope index 543db9f482..425e39531d 100644 --- a/data/fixtures/scopes/csharp/string.singleLine.scope +++ b/data/fixtures/scopes/csharp/string.singleLine.scope @@ -1,10 +1,10 @@ -"hello world"; +"Hello world"; --- [Content] = [Removal] = [Domain] = 0:0-0:13 >-------------< -0| "hello world"; +0| "Hello world"; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/textFragment.comment.block.scope b/data/fixtures/scopes/csharp/textFragment.comment.block.scope index e84187cf56..22e7a0bbf1 100644 --- a/data/fixtures/scopes/csharp/textFragment.comment.block.scope +++ b/data/fixtures/scopes/csharp/textFragment.comment.block.scope @@ -1,17 +1,10 @@ -/* - Hello - World -*/ +/* Hello World */ --- [Content] = [Removal] = -[Domain] = 0:0-3:2 - >-- -0| /* -1| Hello -2| World -3| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello World */ [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/textFragment.string.multiLine.scope b/data/fixtures/scopes/csharp/textFragment.string.multiLine.scope index bf3f875972..e2a312f112 100644 --- a/data/fixtures/scopes/csharp/textFragment.string.multiLine.scope +++ b/data/fixtures/scopes/csharp/textFragment.string.multiLine.scope @@ -1,4 +1,4 @@ -@"hello +@"Hello world"; --- @@ -6,7 +6,7 @@ world"; [Removal] = [Domain] = 0:2-1:5 >----- -0| @"hello +0| @"Hello 1| world"; -----< diff --git a/data/fixtures/scopes/csharp/textFragment.string.singleLine.scope b/data/fixtures/scopes/csharp/textFragment.string.singleLine.scope index 4ea57d25f0..87d1ed0db3 100644 --- a/data/fixtures/scopes/csharp/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/csharp/textFragment.string.singleLine.scope @@ -1,10 +1,10 @@ -"hello world"; +"Hello world"; --- [Content] = [Removal] = [Domain] = 0:1-0:12 >-----------< -0| "hello world"; +0| "Hello world"; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.argument.catch.scope b/data/fixtures/scopes/csharp/type/type.argument.catch.scope index 5dc6b51f56..d441dec71f 100644 --- a/data/fixtures/scopes/csharp/type/type.argument.catch.scope +++ b/data/fixtures/scopes/csharp/type/type.argument.catch.scope @@ -1,41 +1,41 @@ try {} -catch(MyException ex) {} -catch(Exception ex) {} +catch(MyException e) {} +catch(Exception e) {} --- [#1 Content] = 1:6-1:17 >-----------< -1| catch(MyException ex) {} +1| catch(MyException e) {} [#1 Removal] = 1:6-1:18 >------------< -1| catch(MyException ex) {} +1| catch(MyException e) {} [#1 Trailing delimiter] = 1:17-1:18 >-< -1| catch(MyException ex) {} +1| catch(MyException e) {} -[#1 Domain] = 1:6-1:20 - >--------------< -1| catch(MyException ex) {} +[#1 Domain] = 1:6-1:19 + >-------------< +1| catch(MyException e) {} [#1 Insertion delimiter] = " " [#2 Content] = 2:6-2:15 >---------< -2| catch(Exception ex) {} +2| catch(Exception e) {} [#2 Removal] = 2:6-2:16 >----------< -2| catch(Exception ex) {} +2| catch(Exception e) {} [#2 Trailing delimiter] = 2:15-2:16 >-< -2| catch(Exception ex) {} +2| catch(Exception e) {} -[#2 Domain] = 2:6-2:18 - >------------< -2| catch(Exception ex) {} +[#2 Domain] = 2:6-2:17 + >-----------< +2| catch(Exception e) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.iteration.scope index 390f568c68..38b73085f5 100644 --- a/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - MyClass(int a, int b) {} +class Foo { + Foo(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int a, int b) {} + >----------- +0| class Foo { +1| Foo(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| MyClass(int a, int b) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| Foo(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:12-1:24 - >------------< -1| MyClass(int a, int b) {} +[#3 Domain] = 1:8-1:24 + >----------------< +1| Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.scope index 1709516671..6cffd3fd6b 100644 --- a/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.scope +++ b/data/fixtures/scopes/csharp/type/type.argument.formal.constructor.scope @@ -1,34 +1,57 @@ -class MyClass { - MyClass(int a) {} +class Foo { + Foo(int aaa, int bbb) {} } --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int a) {} + >----------- +0| class Foo { +1| Foo(int aaa, int bbb) {} 2| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:12-1:15 - >---< -1| MyClass(int a) {} +[#2 Content] = 1:8-1:11 + >---< +1| Foo(int aaa, int bbb) {} -[#2 Removal] = 1:12-1:16 - >----< -1| MyClass(int a) {} +[#2 Removal] = 1:8-1:12 + >----< +1| Foo(int aaa, int bbb) {} -[#2 Trailing delimiter] = 1:15-1:16 - >-< -1| MyClass(int a) {} +[#2 Trailing delimiter] = 1:11-1:12 + >-< +1| Foo(int aaa, int bbb) {} -[#2 Domain] = 1:12-1:17 - >-----< -1| MyClass(int a) {} +[#2 Domain] = 1:8-1:15 + >-------< +1| Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = " " + + +[#3 Content] = 1:17-1:20 + >---< +1| Foo(int aaa, int bbb) {} + +[#3 Removal] = 1:17-1:21 + >----< +1| Foo(int aaa, int bbb) {} + +[#3 Leading delimiter] = 1:16-1:17 + >-< +1| Foo(int aaa, int bbb) {} + +[#3 Trailing delimiter] = 1:20-1:21 + >-< +1| Foo(int aaa, int bbb) {} + +[#3 Domain] = 1:17-1:24 + >-------< +1| Foo(int aaa, int bbb) {} + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.iteration.scope index 26d5c66f0a..23ff30aaea 100644 --- a/data/fixtures/scopes/csharp/type/type.argument.formal.iteration.scope +++ b/data/fixtures/scopes/csharp/type/type.argument.formal.iteration.scope @@ -1,13 +1,13 @@ -void myFunk(String name, int value) {} +void Foo(int aaa, int bbb) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:38 - >--------------------------------------< -0| void myFunk(String name, int value) {} +[#1 Domain] = 0:0-0:29 + >-----------------------------< +0| void Foo(int aaa, int bbb) {} [#2 Content] = -[#2 Domain] = 0:12-0:34 - >----------------------< -0| void myFunk(String name, int value) {} +[#2 Domain] = 0:9-0:25 + >----------------< +0| void Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/type/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.method.iteration.scope index 257510c605..038d21833d 100644 --- a/data/fixtures/scopes/csharp/type/type.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/csharp/type/type.argument.formal.method.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - void funk(int a, int b) {} +class Foo { + void Bar(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void funk(int a, int b) {} + >----------- +0| class Foo { +1| void Bar(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| void funk(int a, int b) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| void Bar(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:14-1:26 - >------------< -1| void funk(int a, int b) {} +[#3 Domain] = 1:13-1:29 + >----------------< +1| void Bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/csharp/type/type.argument.formal.method.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.method.scope index 91ac9a42a8..466d9daf93 100644 --- a/data/fixtures/scopes/csharp/type/type.argument.formal.method.scope +++ b/data/fixtures/scopes/csharp/type/type.argument.formal.method.scope @@ -1,14 +1,14 @@ -class MyClass { - void funk(int a) {} +class Foo { + void Bar(int aaa, int bbb) {} } --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void funk(int a) {} + >----------- +0| class Foo { +1| void Bar(int aaa, int bbb) {} 2| } -< @@ -17,41 +17,64 @@ class MyClass { [#2 Content] = 1:4-1:8 >----< -1| void funk(int a) {} +1| void Bar(int aaa, int bbb) {} [#2 Removal] = 1:4-1:9 >-----< -1| void funk(int a) {} +1| void Bar(int aaa, int bbb) {} [#2 Leading delimiter] = 1:0-1:4 >----< -1| void funk(int a) {} +1| void Bar(int aaa, int bbb) {} [#2 Trailing delimiter] = 1:8-1:9 >-< -1| void funk(int a) {} +1| void Bar(int aaa, int bbb) {} -[#2 Domain] = 1:4-1:23 - >-------------------< -1| void funk(int a) {} +[#2 Domain] = 1:4-1:33 + >-----------------------------< +1| void Bar(int aaa, int bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:14-1:17 - >---< -1| void funk(int a) {} +[#3 Content] = 1:13-1:16 + >---< +1| void Bar(int aaa, int bbb) {} -[#3 Removal] = 1:14-1:18 - >----< -1| void funk(int a) {} +[#3 Removal] = 1:13-1:17 + >----< +1| void Bar(int aaa, int bbb) {} -[#3 Trailing delimiter] = 1:17-1:18 - >-< -1| void funk(int a) {} +[#3 Trailing delimiter] = 1:16-1:17 + >-< +1| void Bar(int aaa, int bbb) {} -[#3 Domain] = 1:14-1:19 - >-----< -1| void funk(int a) {} +[#3 Domain] = 1:13-1:20 + >-------< +1| void Bar(int aaa, int bbb) {} [#3 Insertion delimiter] = " " + + +[#4 Content] = 1:22-1:25 + >---< +1| void Bar(int aaa, int bbb) {} + +[#4 Removal] = 1:22-1:26 + >----< +1| void Bar(int aaa, int bbb) {} + +[#4 Leading delimiter] = 1:21-1:22 + >-< +1| void Bar(int aaa, int bbb) {} + +[#4 Trailing delimiter] = 1:25-1:26 + >-< +1| void Bar(int aaa, int bbb) {} + +[#4 Domain] = 1:22-1:29 + >-------< +1| void Bar(int aaa, int bbb) {} + +[#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.argument.formal.scope b/data/fixtures/scopes/csharp/type/type.argument.formal.scope index 849c819617..e4c2c982b1 100644 --- a/data/fixtures/scopes/csharp/type/type.argument.formal.scope +++ b/data/fixtures/scopes/csharp/type/type.argument.formal.scope @@ -1,62 +1,62 @@ -void myFunk(String name, int value) {} +void Foo(int aaa, int bbb) {} --- [#1 Content] = 0:0-0:4 >----< -0| void myFunk(String name, int value) {} +0| void Foo(int aaa, int bbb) {} [#1 Removal] = 0:0-0:5 >-----< -0| void myFunk(String name, int value) {} +0| void Foo(int aaa, int bbb) {} [#1 Trailing delimiter] = 0:4-0:5 >-< -0| void myFunk(String name, int value) {} +0| void Foo(int aaa, int bbb) {} -[#1 Domain] = 0:0-0:38 - >--------------------------------------< -0| void myFunk(String name, int value) {} +[#1 Domain] = 0:0-0:29 + >-----------------------------< +0| void Foo(int aaa, int bbb) {} [#1 Insertion delimiter] = " " -[#2 Content] = 0:12-0:18 - >------< -0| void myFunk(String name, int value) {} +[#2 Content] = 0:9-0:12 + >---< +0| void Foo(int aaa, int bbb) {} -[#2 Removal] = 0:12-0:19 - >-------< -0| void myFunk(String name, int value) {} +[#2 Removal] = 0:9-0:13 + >----< +0| void Foo(int aaa, int bbb) {} -[#2 Trailing delimiter] = 0:18-0:19 - >-< -0| void myFunk(String name, int value) {} +[#2 Trailing delimiter] = 0:12-0:13 + >-< +0| void Foo(int aaa, int bbb) {} -[#2 Domain] = 0:12-0:23 - >-----------< -0| void myFunk(String name, int value) {} +[#2 Domain] = 0:9-0:16 + >-------< +0| void Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 0:25-0:28 - >---< -0| void myFunk(String name, int value) {} +[#3 Content] = 0:18-0:21 + >---< +0| void Foo(int aaa, int bbb) {} -[#3 Removal] = 0:25-0:29 - >----< -0| void myFunk(String name, int value) {} +[#3 Removal] = 0:18-0:22 + >----< +0| void Foo(int aaa, int bbb) {} -[#3 Leading delimiter] = 0:24-0:25 - >-< -0| void myFunk(String name, int value) {} +[#3 Leading delimiter] = 0:17-0:18 + >-< +0| void Foo(int aaa, int bbb) {} -[#3 Trailing delimiter] = 0:28-0:29 - >-< -0| void myFunk(String name, int value) {} +[#3 Trailing delimiter] = 0:21-0:22 + >-< +0| void Foo(int aaa, int bbb) {} -[#3 Domain] = 0:25-0:34 - >---------< -0| void myFunk(String name, int value) {} +[#3 Domain] = 0:18-0:25 + >-------< +0| void Foo(int aaa, int bbb) {} [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.cast.scope b/data/fixtures/scopes/csharp/type/type.cast.scope index 74cd6e837c..38a2f1808f 100644 --- a/data/fixtures/scopes/csharp/type/type.cast.scope +++ b/data/fixtures/scopes/csharp/type/type.cast.scope @@ -1,16 +1,16 @@ -(int)5.5; +(int)foo; --- [Content] = 0:1-0:4 >---< -0| (int)5.5; +0| (int)foo; [Removal] = 0:0-0:5 >-----< -0| (int)5.5; +0| (int)foo; [Domain] = 0:0-0:8 >--------< -0| (int)5.5; +0| (int)foo; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.field.class.scope b/data/fixtures/scopes/csharp/type/type.field.class.scope index d163e580a8..528fd810c8 100644 --- a/data/fixtures/scopes/csharp/type/type.field.class.scope +++ b/data/fixtures/scopes/csharp/type/type.field.class.scope @@ -33,8 +33,8 @@ class Foo { >-< 1| int bar; -[#2 Domain] = 1:4-1:11 - >-------< +[#2 Domain] = 1:4-1:12 + >--------< 1| int bar; [#2 Insertion delimiter] = " " @@ -56,8 +56,8 @@ class Foo { >-< 2| int baz = 0; -[#3 Domain] = 2:4-2:15 - >-----------< +[#3 Domain] = 2:4-2:16 + >------------< 2| int baz = 0; [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.field.interface.scope b/data/fixtures/scopes/csharp/type/type.field.interface.scope index 2181ad2cec..5b6114bb94 100644 --- a/data/fixtures/scopes/csharp/type/type.field.interface.scope +++ b/data/fixtures/scopes/csharp/type/type.field.interface.scope @@ -31,8 +31,8 @@ interface IFoo { >-< 1| int bar; -[#2 Domain] = 1:4-1:11 - >-------< +[#2 Domain] = 1:4-1:12 + >--------< 1| int bar; [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.foreach.scope b/data/fixtures/scopes/csharp/type/type.foreach.scope index 05dbc70579..03ee11627f 100644 --- a/data/fixtures/scopes/csharp/type/type.foreach.scope +++ b/data/fixtures/scopes/csharp/type/type.foreach.scope @@ -1,20 +1,20 @@ -foreach (int value in values) {} +foreach (int v in values) {} --- [Content] = 0:9-0:12 >---< -0| foreach (int value in values) {} +0| foreach (int v in values) {} [Removal] = 0:9-0:13 >----< -0| foreach (int value in values) {} +0| foreach (int v in values) {} [Trailing delimiter] = 0:12-0:13 >-< -0| foreach (int value in values) {} +0| foreach (int v in values) {} -[Domain] = 0:0-0:32 - >--------------------------------< -0| foreach (int value in values) {} +[Domain] = 0:0-0:28 + >----------------------------< +0| foreach (int v in values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.typeArgument.iteration.scope b/data/fixtures/scopes/csharp/type/type.typeArgument.iteration.scope index 76b1a140fc..116dc3ef5a 100644 --- a/data/fixtures/scopes/csharp/type/type.typeArgument.iteration.scope +++ b/data/fixtures/scopes/csharp/type/type.typeArgument.iteration.scope @@ -1,13 +1,13 @@ -Dictionary values; +Dictionary foo; --- [#1 Content] = -[#1 Domain] = 0:0-0:31 - >-------------------------------< -0| Dictionary values; +[#1 Domain] = 0:0-0:28 + >----------------------------< +0| Dictionary foo; [#2 Content] = [#2 Domain] = 0:11-0:22 >-----------< -0| Dictionary values; +0| Dictionary foo; diff --git a/data/fixtures/scopes/csharp/type/type.typeArgument.scope b/data/fixtures/scopes/csharp/type/type.typeArgument.scope index 8e2f5622bd..18cf2c231a 100644 --- a/data/fixtures/scopes/csharp/type/type.typeArgument.scope +++ b/data/fixtures/scopes/csharp/type/type.typeArgument.scope @@ -1,21 +1,21 @@ -List values; +List foo; --- [#1 Content] = 0:0-0:9 >---------< -0| List values; +0| List foo; [#1 Removal] = 0:0-0:10 >----------< -0| List values; +0| List foo; [#1 Trailing delimiter] = 0:9-0:10 >-< -0| List values; +0| List foo; -[#1 Domain] = 0:0-0:16 - >----------------< -0| List values; +[#1 Domain] = 0:0-0:14 + >--------------< +0| List foo; [#1 Insertion delimiter] = " " @@ -24,6 +24,6 @@ List values; [#2 Removal] = [#2 Domain] = 0:5-0:8 >---< -0| List values; +0| List foo; [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/csharp/type/type.variable.scope b/data/fixtures/scopes/csharp/type/type.variable.scope index a85b4c3e50..192f80ca15 100644 --- a/data/fixtures/scopes/csharp/type/type.variable.scope +++ b/data/fixtures/scopes/csharp/type/type.variable.scope @@ -1,20 +1,20 @@ -String name = "hello"; +int foo; --- -[Content] = 0:0-0:6 - >------< -0| String name = "hello"; +[Content] = 0:0-0:3 + >---< +0| int foo; -[Removal] = 0:0-0:7 - >-------< -0| String name = "hello"; +[Removal] = 0:0-0:4 + >----< +0| int foo; -[Trailing delimiter] = 0:6-0:7 - >-< -0| String name = "hello"; +[Trailing delimiter] = 0:3-0:4 + >-< +0| int foo; -[Domain] = 0:0-0:21 - >---------------------< -0| String name = "hello"; +[Domain] = 0:0-0:8 + >--------< +0| int foo; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/type/type.variable2.scope b/data/fixtures/scopes/csharp/type/type.variable2.scope new file mode 100644 index 0000000000..b3a492d68a --- /dev/null +++ b/data/fixtures/scopes/csharp/type/type.variable2.scope @@ -0,0 +1,20 @@ +int foo = 0; +--- + +[Content] = 0:0-0:3 + >---< +0| int foo = 0; + +[Removal] = 0:0-0:4 + >----< +0| int foo = 0; + +[Trailing delimiter] = 0:3-0:4 + >-< +0| int foo = 0; + +[Domain] = 0:0-0:12 + >------------< +0| int foo = 0; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.iteration.scope index ee5317ec1a..44a5a7db1e 100644 --- a/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - MyClass(int a = 1, int b = 2) {} +class Foo { + Foo(int aaa = 0, int bbb = 1) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| MyClass(int a = 1, int b = 2) {} + >----------- +0| class Foo { +1| Foo(int aaa = 0, int bbb = 1) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| MyClass(int a = 1, int b = 2) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| Foo(int aaa = 0, int bbb = 1) {} 2| } < [#3 Content] = -[#3 Domain] = 1:12-1:32 - >--------------------< -1| MyClass(int a = 1, int b = 2) {} +[#3 Domain] = 1:8-1:32 + >------------------------< +1| Foo(int aaa = 0, int bbb = 1) {} diff --git a/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.scope index 0cb76ed477..93360f1fd2 100644 --- a/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.scope +++ b/data/fixtures/scopes/csharp/value/value.argument.formal.constructor.scope @@ -1,22 +1,41 @@ -class MyClass { - MyClass(int a = 1) {} +class Foo { + Foo(int aaa = 0, int bbb = 1) {} } --- -[Content] = 1:20-1:21 - >-< -1| MyClass(int a = 1) {} +[#1 Content] = 1:18-1:19 + >-< +1| Foo(int aaa = 0, int bbb = 1) {} -[Removal] = 1:17-1:21 - >----< -1| MyClass(int a = 1) {} +[#1 Removal] = 1:15-1:19 + >----< +1| Foo(int aaa = 0, int bbb = 1) {} -[Leading delimiter] = 1:17-1:20 - >---< -1| MyClass(int a = 1) {} +[#1 Leading delimiter] = 1:15-1:18 + >---< +1| Foo(int aaa = 0, int bbb = 1) {} -[Domain] = 1:12-1:21 - >---------< -1| MyClass(int a = 1) {} +[#1 Domain] = 1:8-1:19 + >-----------< +1| Foo(int aaa = 0, int bbb = 1) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:31-1:32 + >-< +1| Foo(int aaa = 0, int bbb = 1) {} + +[#2 Removal] = 1:28-1:32 + >----< +1| Foo(int aaa = 0, int bbb = 1) {} + +[#2 Leading delimiter] = 1:28-1:31 + >---< +1| Foo(int aaa = 0, int bbb = 1) {} + +[#2 Domain] = 1:21-1:32 + >-----------< +1| Foo(int aaa = 0, int bbb = 1) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.argument.formal.iteration.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.iteration.scope index ff29567587..c35b80ead7 100644 --- a/data/fixtures/scopes/csharp/value/value.argument.formal.iteration.scope +++ b/data/fixtures/scopes/csharp/value/value.argument.formal.iteration.scope @@ -1,13 +1,13 @@ -void myFunk(String name, int value = 5) {} +void Foo(int aaa = 0, int bbb = 1) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:42 - >------------------------------------------< -0| void myFunk(String name, int value = 5) {} +[#1 Domain] = 0:0-0:37 + >-------------------------------------< +0| void Foo(int aaa = 0, int bbb = 1) {} [#2 Content] = -[#2 Domain] = 0:12-0:38 - >--------------------------< -0| void myFunk(String name, int value = 5) {} +[#2 Domain] = 0:9-0:33 + >------------------------< +0| void Foo(int aaa = 0, int bbb = 1) {} diff --git a/data/fixtures/scopes/csharp/value/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.method.iteration.scope index 9beae86c05..8661db65dc 100644 --- a/data/fixtures/scopes/csharp/value/value.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/csharp/value/value.argument.formal.method.iteration.scope @@ -1,27 +1,27 @@ -class MyClass { - void funk(int a = 1, int b = 2) {} +class Foo { + void Bar(int aaa = 0, int bbb = 1) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| void funk(int a = 1, int b = 2) {} + >----------- +0| class Foo { +1| void Bar(int aaa = 0, int bbb = 1) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| void funk(int a = 1, int b = 2) {} +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| void Bar(int aaa = 0, int bbb = 1) {} 2| } < [#3 Content] = -[#3 Domain] = 1:14-1:34 - >--------------------< -1| void funk(int a = 1, int b = 2) {} +[#3 Domain] = 1:13-1:37 + >------------------------< +1| void Bar(int aaa = 0, int bbb = 1) {} diff --git a/data/fixtures/scopes/csharp/value/value.argument.formal.method.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.method.scope index bdff558cb2..9a5184d4ed 100644 --- a/data/fixtures/scopes/csharp/value/value.argument.formal.method.scope +++ b/data/fixtures/scopes/csharp/value/value.argument.formal.method.scope @@ -1,22 +1,41 @@ -class MyClass { - void funk(int a = 1) {} +class Foo { + void Bar(int aaa = 0, int bbb = 1) {} } --- -[Content] = 1:22-1:23 - >-< -1| void funk(int a = 1) {} +[#1 Content] = 1:23-1:24 + >-< +1| void Bar(int aaa = 0, int bbb = 1) {} -[Removal] = 1:19-1:23 - >----< -1| void funk(int a = 1) {} +[#1 Removal] = 1:20-1:24 + >----< +1| void Bar(int aaa = 0, int bbb = 1) {} -[Leading delimiter] = 1:19-1:22 - >---< -1| void funk(int a = 1) {} +[#1 Leading delimiter] = 1:20-1:23 + >---< +1| void Bar(int aaa = 0, int bbb = 1) {} -[Domain] = 1:14-1:23 - >---------< -1| void funk(int a = 1) {} +[#1 Domain] = 1:13-1:24 + >-----------< +1| void Bar(int aaa = 0, int bbb = 1) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:36-1:37 + >-< +1| void Bar(int aaa = 0, int bbb = 1) {} + +[#2 Removal] = 1:33-1:37 + >----< +1| void Bar(int aaa = 0, int bbb = 1) {} + +[#2 Leading delimiter] = 1:33-1:36 + >---< +1| void Bar(int aaa = 0, int bbb = 1) {} + +[#2 Domain] = 1:26-1:37 + >-----------< +1| void Bar(int aaa = 0, int bbb = 1) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.argument.formal.scope b/data/fixtures/scopes/csharp/value/value.argument.formal.scope index 779beb40d0..c67add225b 100644 --- a/data/fixtures/scopes/csharp/value/value.argument.formal.scope +++ b/data/fixtures/scopes/csharp/value/value.argument.formal.scope @@ -1,20 +1,39 @@ -void myFunk(String name, int value = 5) {} +void Bar(int aaa = 0, int bbb = 1) {} --- -[Content] = 0:37-0:38 - >-< -0| void myFunk(String name, int value = 5) {} +[#1 Content] = 0:19-0:20 + >-< +0| void Bar(int aaa = 0, int bbb = 1) {} -[Removal] = 0:34-0:38 - >----< -0| void myFunk(String name, int value = 5) {} +[#1 Removal] = 0:16-0:20 + >----< +0| void Bar(int aaa = 0, int bbb = 1) {} -[Leading delimiter] = 0:34-0:37 - >---< -0| void myFunk(String name, int value = 5) {} +[#1 Leading delimiter] = 0:16-0:19 + >---< +0| void Bar(int aaa = 0, int bbb = 1) {} -[Domain] = 0:25-0:38 - >-------------< -0| void myFunk(String name, int value = 5) {} +[#1 Domain] = 0:9-0:20 + >-----------< +0| void Bar(int aaa = 0, int bbb = 1) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:32-0:33 + >-< +0| void Bar(int aaa = 0, int bbb = 1) {} + +[#2 Removal] = 0:29-0:33 + >----< +0| void Bar(int aaa = 0, int bbb = 1) {} + +[#2 Leading delimiter] = 0:29-0:32 + >---< +0| void Bar(int aaa = 0, int bbb = 1) {} + +[#2 Domain] = 0:22-0:33 + >-----------< +0| void Bar(int aaa = 0, int bbb = 1) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.assignment.scope b/data/fixtures/scopes/csharp/value/value.assignment.scope index 0226372a37..a614198096 100644 --- a/data/fixtures/scopes/csharp/value/value.assignment.scope +++ b/data/fixtures/scopes/csharp/value/value.assignment.scope @@ -1,220 +1,20 @@ -a = 1; -a += 1; -a -= 1; -a *= 1; -a /= 1; -a %= 1; -a &= 1; -a |= 1; -a ^= 1; -a <<= 1; -a >>= 1; +foo = 0; --- -[#1 Content] = 0:4-0:5 - >-< -0| a = 1; - -[#1 Removal] = 0:1-0:5 - >----< -0| a = 1; - -[#1 Leading delimiter] = 0:1-0:4 - >---< -0| a = 1; - -[#1 Domain] = 0:0-0:5 - >-----< -0| a = 1; - -[#1 Insertion delimiter] = " " - - -[#2 Content] = 1:5-1:6 - >-< -1| a += 1; - -[#2 Removal] = 1:1-1:6 - >-----< -1| a += 1; - -[#2 Leading delimiter] = 1:1-1:5 - >----< -1| a += 1; - -[#2 Domain] = 1:0-1:6 - >------< -1| a += 1; - -[#2 Insertion delimiter] = " " - - -[#3 Content] = 2:5-2:6 - >-< -2| a -= 1; - -[#3 Removal] = 2:1-2:6 - >-----< -2| a -= 1; - -[#3 Leading delimiter] = 2:1-2:5 - >----< -2| a -= 1; - -[#3 Domain] = 2:0-2:6 - >------< -2| a -= 1; - -[#3 Insertion delimiter] = " " - - -[#4 Content] = 3:5-3:6 - >-< -3| a *= 1; - -[#4 Removal] = 3:1-3:6 - >-----< -3| a *= 1; - -[#4 Leading delimiter] = 3:1-3:5 - >----< -3| a *= 1; - -[#4 Domain] = 3:0-3:6 - >------< -3| a *= 1; - -[#4 Insertion delimiter] = " " - - -[#5 Content] = 4:5-4:6 - >-< -4| a /= 1; - -[#5 Removal] = 4:1-4:6 - >-----< -4| a /= 1; - -[#5 Leading delimiter] = 4:1-4:5 - >----< -4| a /= 1; - -[#5 Domain] = 4:0-4:6 - >------< -4| a /= 1; - -[#5 Insertion delimiter] = " " - - -[#6 Content] = 5:5-5:6 - >-< -5| a %= 1; - -[#6 Removal] = 5:1-5:6 - >-----< -5| a %= 1; - -[#6 Leading delimiter] = 5:1-5:5 - >----< -5| a %= 1; - -[#6 Domain] = 5:0-5:6 - >------< -5| a %= 1; - -[#6 Insertion delimiter] = " " - - -[#7 Content] = 6:5-6:6 - >-< -6| a &= 1; - -[#7 Removal] = 6:1-6:6 - >-----< -6| a &= 1; - -[#7 Leading delimiter] = 6:1-6:5 - >----< -6| a &= 1; - -[#7 Domain] = 6:0-6:6 - >------< -6| a &= 1; - -[#7 Insertion delimiter] = " " - - -[#8 Content] = 7:5-7:6 - >-< -7| a |= 1; - -[#8 Removal] = 7:1-7:6 - >-----< -7| a |= 1; - -[#8 Leading delimiter] = 7:1-7:5 - >----< -7| a |= 1; - -[#8 Domain] = 7:0-7:6 - >------< -7| a |= 1; - -[#8 Insertion delimiter] = " " - - -[#9 Content] = 8:5-8:6 - >-< -8| a ^= 1; - -[#9 Removal] = 8:1-8:6 - >-----< -8| a ^= 1; - -[#9 Leading delimiter] = 8:1-8:5 - >----< -8| a ^= 1; - -[#9 Domain] = 8:0-8:6 - >------< -8| a ^= 1; - -[#9 Insertion delimiter] = " " - - -[#10 Content] = 9:6-9:7 +[Content] = 0:6-0:7 >-< -9| a <<= 1; - -[#10 Removal] = 9:1-9:7 - >------< -9| a <<= 1; - -[#10 Leading delimiter] = 9:1-9:6 - >-----< -9| a <<= 1; - -[#10 Domain] = 9:0-9:7 - >-------< -9| a <<= 1; - -[#10 Insertion delimiter] = " " - - -[#11 Content] = 10:6-10:7 - >-< -10| a >>= 1; +0| foo = 0; -[#11 Removal] = 10:1-10:7 - >------< -10| a >>= 1; +[Removal] = 0:3-0:7 + >----< +0| foo = 0; -[#11 Leading delimiter] = 10:1-10:6 - >-----< -10| a >>= 1; +[Leading delimiter] = 0:3-0:6 + >---< +0| foo = 0; -[#11 Domain] = 10:0-10:7 - >-------< -10| a >>= 1; +[Domain] = 0:0-0:8 + >--------< +0| foo = 0; -[#11 Insertion delimiter] = " " +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.assignment2.scope b/data/fixtures/scopes/csharp/value/value.assignment2.scope new file mode 100644 index 0000000000..8dbdfaf55e --- /dev/null +++ b/data/fixtures/scopes/csharp/value/value.assignment2.scope @@ -0,0 +1,20 @@ +foo += 0; +--- + +[Content] = 0:7-0:8 + >-< +0| foo += 0; + +[Removal] = 0:3-0:8 + >-----< +0| foo += 0; + +[Leading delimiter] = 0:3-0:7 + >----< +0| foo += 0; + +[Domain] = 0:0-0:9 + >---------< +0| foo += 0; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.field.class.scope b/data/fixtures/scopes/csharp/value/value.field.class.scope index 667f96450a..9e2a894d39 100644 --- a/data/fixtures/scopes/csharp/value/value.field.class.scope +++ b/data/fixtures/scopes/csharp/value/value.field.class.scope @@ -15,8 +15,8 @@ class Foo { >---< 1| int bar = 0; -[Domain] = 1:4-1:15 - >-----------< +[Domain] = 1:4-1:16 + >------------< 1| int bar = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope b/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope index e3f10c3d59..58fb1e6c31 100644 --- a/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope @@ -1,21 +1,13 @@ -new StudentName { - FirstName = "Craig" -}; +new Foo {aaa = 0, bbb = 1}; --- [#1 Content] = -[#1 Domain] = 0:0-2:2 - >----------------- -0| new StudentName { -1| FirstName = "Craig" -2| }; - --< +[#1 Domain] = 0:0-0:27 + >---------------------------< +0| new Foo {aaa = 0, bbb = 1}; [#2 Content] = -[#2 Domain] = 0:17-2:0 - > -0| new StudentName { -1| FirstName = "Craig" -2| }; - < +[#2 Domain] = 0:9-0:25 + >----------------< +0| new Foo {aaa = 0, bbb = 1}; diff --git a/data/fixtures/scopes/csharp/value/value.mapPair.scope b/data/fixtures/scopes/csharp/value/value.mapPair.scope index 3d94e0debc..92389fed83 100644 --- a/data/fixtures/scopes/csharp/value/value.mapPair.scope +++ b/data/fixtures/scopes/csharp/value/value.mapPair.scope @@ -1,22 +1,39 @@ -new StudentName { - FirstName = "Craig" -}; +new Foo {aaa = 0, bbb = 1}; --- -[Content] = 1:16-1:23 - >-------< -1| FirstName = "Craig" +[#1 Content] = 0:15-0:16 + >-< +0| new Foo {aaa = 0, bbb = 1}; -[Removal] = 1:13-1:23 - >----------< -1| FirstName = "Craig" +[#1 Removal] = 0:12-0:16 + >----< +0| new Foo {aaa = 0, bbb = 1}; -[Leading delimiter] = 1:13-1:16 - >---< -1| FirstName = "Craig" +[#1 Leading delimiter] = 0:12-0:15 + >---< +0| new Foo {aaa = 0, bbb = 1}; -[Domain] = 1:4-1:23 - >-------------------< -1| FirstName = "Craig" +[#1 Domain] = 0:9-0:16 + >-------< +0| new Foo {aaa = 0, bbb = 1}; -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:24-0:25 + >-< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Removal] = 0:21-0:25 + >----< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Leading delimiter] = 0:21-0:24 + >---< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Domain] = 0:18-0:25 + >-------< +0| new Foo {aaa = 0, bbb = 1}; + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.return.scope b/data/fixtures/scopes/csharp/value/value.return.scope index 77155463c2..c363e8f1b7 100644 --- a/data/fixtures/scopes/csharp/value/value.return.scope +++ b/data/fixtures/scopes/csharp/value/value.return.scope @@ -1,22 +1,22 @@ -int funk() { - return 2; +int foo() { + return 0; } --- [Content] = 1:11-1:12 >-< -1| return 2; +1| return 0; [Removal] = 1:10-1:12 >--< -1| return 2; +1| return 0; [Leading delimiter] = 1:10-1:11 >-< -1| return 2; +1| return 0; [Domain] = 1:4-1:13 >---------< -1| return 2; +1| return 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value.switch.scope b/data/fixtures/scopes/csharp/value/value.switch.scope similarity index 100% rename from data/fixtures/scopes/csharp/value.switch.scope rename to data/fixtures/scopes/csharp/value/value.switch.scope diff --git a/data/fixtures/scopes/csharp/value/value.variable.scope b/data/fixtures/scopes/csharp/value/value.variable.scope index a2a51856c8..e9f99d43e1 100644 --- a/data/fixtures/scopes/csharp/value/value.variable.scope +++ b/data/fixtures/scopes/csharp/value/value.variable.scope @@ -1,20 +1,20 @@ -String aaa = "bbb"; +int foo = 0; --- -[Content] = 0:13-0:18 - >-----< -0| String aaa = "bbb"; +[Content] = 0:10-0:11 + >-< +0| int foo = 0; -[Removal] = 0:10-0:18 - >--------< -0| String aaa = "bbb"; +[Removal] = 0:7-0:11 + >----< +0| int foo = 0; -[Leading delimiter] = 0:10-0:13 - >---< -0| String aaa = "bbb"; +[Leading delimiter] = 0:7-0:10 + >---< +0| int foo = 0; -[Domain] = 0:0-0:18 - >------------------< -0| String aaa = "bbb"; +[Domain] = 0:0-0:12 + >------------< +0| int foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/csharp/value/value.yield.scope b/data/fixtures/scopes/csharp/value/value.yield.scope index caef32a3cf..9a9e08166c 100644 --- a/data/fixtures/scopes/csharp/value/value.yield.scope +++ b/data/fixtures/scopes/csharp/value/value.yield.scope @@ -1,22 +1,22 @@ -IEnumerable funk() { - yield return 2; +IEnumerable foo() { + yield return 0; } --- [Content] = 1:17-1:18 >-< -1| yield return 2; +1| yield return 0; [Removal] = 1:16-1:18 >--< -1| yield return 2; +1| yield return 0; [Leading delimiter] = 1:16-1:17 >-< -1| yield return 2; +1| yield return 0; [Domain] = 1:4-1:19 >---------------< -1| yield return 2; +1| yield return 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/css/comment.block.scope b/data/fixtures/scopes/css/comment.block.scope index 32e87e4c47..5e8b51111c 100644 --- a/data/fixtures/scopes/css/comment.block.scope +++ b/data/fixtures/scopes/css/comment.block.scope @@ -1,15 +1,10 @@ -/* - Hello world -*/ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-2:2 - >-- -0| /* -1| Hello world -2| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/css/name.iteration.block.scope b/data/fixtures/scopes/css/name.iteration.block.scope index 67ba790b5c..e806f801b4 100644 --- a/data/fixtures/scopes/css/name.iteration.block.scope +++ b/data/fixtures/scopes/css/name.iteration.block.scope @@ -1,24 +1,13 @@ -a { - color: red; - padding: 1rem; -} +* { } --- [#1 Content] = -[#1 Domain] = 0:0-3:1 - >--- -0| a { -1| color: red; -2| padding: 1rem; -3| } - -< +[#1 Domain] = 0:0-0:5 + >-----< +0| * { } [#2 Content] = -[#2 Domain] = 0:3-3:0 - > -0| a { -1| color: red; -2| padding: 1rem; -3| } - < +[#2 Domain] = 0:3-0:4 + >-< +0| * { } diff --git a/data/fixtures/scopes/css/name.iteration.document.scope b/data/fixtures/scopes/css/name.iteration.document.scope index fe0f60629a..213d9c9e0f 100644 --- a/data/fixtures/scopes/css/name.iteration.document.scope +++ b/data/fixtures/scopes/css/name.iteration.document.scope @@ -1,18 +1,12 @@ -* { color: red; } +* {} --- -[#1 Content] = -[#1 Domain] = 0:0-2:0 +[Content] = +[Domain] = 0:0-2:0 > 0| -1| * { color: red; } +1| * {} 2| < - - -[#2 Content] = -[#2 Domain] = 1:3-1:16 - >-------------< -1| * { color: red; } diff --git a/data/fixtures/scopes/css/statement.iteration.document.scope b/data/fixtures/scopes/css/statement.iteration.document.scope index ce00a8a425..213d9c9e0f 100644 --- a/data/fixtures/scopes/css/statement.iteration.document.scope +++ b/data/fixtures/scopes/css/statement.iteration.document.scope @@ -1,5 +1,5 @@ -* { color: red; } +* {} --- @@ -7,6 +7,6 @@ [Domain] = 0:0-2:0 > 0| -1| * { color: red; } +1| * {} 2| < diff --git a/data/fixtures/scopes/css/statement.scope b/data/fixtures/scopes/css/statement.scope index 1ba073ba6d..a9213b5f14 100644 --- a/data/fixtures/scopes/css/statement.scope +++ b/data/fixtures/scopes/css/statement.scope @@ -1,15 +1,10 @@ -* { - color: red; -} +* {} --- [Content] = [Removal] = -[Domain] = 0:0-2:1 - >--- -0| * { -1| color: red; -2| } - -< +[Domain] = 0:0-0:4 + >----< +0| * {} [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/css/textFragment.comment.block.scope b/data/fixtures/scopes/css/textFragment.comment.block.scope index 9573c83d49..af33f95d00 100644 --- a/data/fixtures/scopes/css/textFragment.comment.block.scope +++ b/data/fixtures/scopes/css/textFragment.comment.block.scope @@ -1,15 +1,10 @@ -/* - Hello world -*/ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-2:2 - >-- -0| /* -1| Hello world -2| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/dart/class.scope b/data/fixtures/scopes/dart/class.scope index 9b0eef7978..ffbda12f63 100644 --- a/data/fixtures/scopes/dart/class.scope +++ b/data/fixtures/scopes/dart/class.scope @@ -1,15 +1,10 @@ -class MyClass { - -} +class Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| -2| } - -< +[Domain] = 0:0-0:12 + >------------< +0| class Foo {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/dart/ifStatement.scope b/data/fixtures/scopes/dart/ifStatement.scope index dbda11f63d..2c50bc964f 100644 --- a/data/fixtures/scopes/dart/ifStatement.scope +++ b/data/fixtures/scopes/dart/ifStatement.scope @@ -1,21 +1,28 @@ foo() { - if (true) { } + if (true) {} + else if (false) {} + else {} } --- [Content] = -[Domain] = 1:2-1:15 - >-------------< -1| if (true) { } +[Domain] = 1:4-3:11 + >------------ +1| if (true) {} +2| else if (false) {} +3| else {} + -----------< -[Removal] = 1:0-2:0 - >--------------- -1| if (true) { } -2| } +[Removal] = 1:0-4:0 + >---------------- +1| if (true) {} +2| else if (false) {} +3| else {} +4| } < -[Leading delimiter] = 1:0-1:2 - >--< -1| if (true) { } +[Leading delimiter] = 1:0-1:4 + >----< +1| if (true) {} [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/dart/list.scope b/data/fixtures/scopes/dart/list.scope index 169cc3d024..59e7e957cd 100644 --- a/data/fixtures/scopes/dart/list.scope +++ b/data/fixtures/scopes/dart/list.scope @@ -1,17 +1,17 @@ -final list = [1,2,3]; +final foo = [aaa, bbb] --- [Content] = -[Domain] = 0:13-0:20 - >-------< -0| final list = [1,2,3]; +[Domain] = 0:12-0:22 + >----------< +0| final foo = [aaa, bbb] -[Removal] = 0:12-0:20 - >--------< -0| final list = [1,2,3]; +[Removal] = 0:11-0:22 + >-----------< +0| final foo = [aaa, bbb] -[Leading delimiter] = 0:12-0:13 - >-< -0| final list = [1,2,3]; +[Leading delimiter] = 0:11-0:12 + >-< +0| final foo = [aaa, bbb] [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/dart/map.scope b/data/fixtures/scopes/dart/map.scope index bc293e112f..acefeabdac 100644 --- a/data/fixtures/scopes/dart/map.scope +++ b/data/fixtures/scopes/dart/map.scope @@ -1,25 +1,17 @@ - final map = { - 'hi': 1, - }; +final foo = {"aaa": 0, "bbb": 1}; --- [Content] = -[Domain] = 0:14-2:3 - >- -0| final map = { -1| 'hi': 1, -2| }; - ---< +[Domain] = 0:12-0:32 + >--------------------< +0| final foo = {"aaa": 0, "bbb": 1}; -[Removal] = 0:13-2:3 - >-- -0| final map = { -1| 'hi': 1, -2| }; - ---< +[Removal] = 0:11-0:32 + >---------------------< +0| final foo = {"aaa": 0, "bbb": 1}; -[Leading delimiter] = 0:13-0:14 - >-< -0| final map = { +[Leading delimiter] = 0:11-0:12 + >-< +0| final foo = {"aaa": 0, "bbb": 1}; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/go/comment.line.scope b/data/fixtures/scopes/go/comment.line.scope index 2856f7134a..7d1477b8a1 100644 --- a/data/fixtures/scopes/go/comment.line.scope +++ b/data/fixtures/scopes/go/comment.line.scope @@ -1,10 +1,10 @@ -// foo +// Hello world --- [Content] = [Removal] = -[Domain] = 0:0-0:6 - >------< -0| // foo +[Domain] = 0:0-0:14 + >--------------< +0| // Hello world [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/go/string.multiLine.scope b/data/fixtures/scopes/go/string.multiLine.scope new file mode 100644 index 0000000000..7ff38166b5 --- /dev/null +++ b/data/fixtures/scopes/go/string.multiLine.scope @@ -0,0 +1,13 @@ +`Hello +world` +--- + +[Content] = +[Removal] = +[Domain] = 0:0-1:6 + >------ +0| `Hello +1| world` + ------< + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/go/string.singleLine.scope b/data/fixtures/scopes/go/string.singleLine.scope new file mode 100644 index 0000000000..4b26cf31b3 --- /dev/null +++ b/data/fixtures/scopes/go/string.singleLine.scope @@ -0,0 +1,10 @@ +"Hello world" +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:13 + >-------------< +0| "Hello world" + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/go/textFragment.comment.line.scope b/data/fixtures/scopes/go/textFragment.comment.line.scope index a813ee8753..6758f81490 100644 --- a/data/fixtures/scopes/go/textFragment.comment.line.scope +++ b/data/fixtures/scopes/go/textFragment.comment.line.scope @@ -1,10 +1,10 @@ -// foo +// Hello world --- [Content] = [Removal] = -[Domain] = 0:0-0:6 - >------< -0| // foo +[Domain] = 0:0-0:14 + >--------------< +0| // Hello world [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/go/textFragment.string.multiLine.scope b/data/fixtures/scopes/go/textFragment.string.multiLine.scope index 45a46b4a68..2e6b61384a 100644 --- a/data/fixtures/scopes/go/textFragment.string.multiLine.scope +++ b/data/fixtures/scopes/go/textFragment.string.multiLine.scope @@ -1,15 +1,13 @@ -` -foo -` +`Hello +world` --- [Content] = [Removal] = -[Domain] = 0:1-2:0 - > -0| ` -1| foo -2| ` - < +[Domain] = 0:1-1:5 + >----- +0| `Hello +1| world` + -----< [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/go/textFragment.string.singleLine.scope b/data/fixtures/scopes/go/textFragment.string.singleLine.scope index 9afd386eef..85dcf5fa7f 100644 --- a/data/fixtures/scopes/go/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/go/textFragment.string.singleLine.scope @@ -1,10 +1,10 @@ -"foo" +"Hello world" --- [Content] = [Removal] = -[Domain] = 0:1-0:4 - >---< -0| "foo" +[Domain] = 0:1-0:12 + >-----------< +0| "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/attribute.scope b/data/fixtures/scopes/html/attribute.scope index ad4db47809..26357f4cc8 100644 --- a/data/fixtures/scopes/html/attribute.scope +++ b/data/fixtures/scopes/html/attribute.scope @@ -1,17 +1,17 @@ -
+
--- [Content] = -[Domain] = 0:5-0:14 - >---------< -0|
+[Domain] = 0:5-0:13 + >--------< +0|
-[Removal] = 0:4-0:14 - >----------< -0|
+[Removal] = 0:4-0:13 + >---------< +0|
[Leading delimiter] = 0:4-0:5 >-< -0|
+0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/comment.block.scope b/data/fixtures/scopes/html/comment.block.scope index 5bbed642b3..bf46a7b167 100644 --- a/data/fixtures/scopes/html/comment.block.scope +++ b/data/fixtures/scopes/html/comment.block.scope @@ -1,15 +1,10 @@ - + --- [Content] = [Removal] = -[Domain] = 0:0-2:3 - >---- -0| - ---< +[Domain] = 0:0-0:20 + >--------------------< +0| [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/html/element.scope b/data/fixtures/scopes/html/element.scope index 7fce7e4f9f..32576341c6 100644 --- a/data/fixtures/scopes/html/element.scope +++ b/data/fixtures/scopes/html/element.scope @@ -1,10 +1,10 @@ -
text
+
--- [Content] = [Removal] = -[Domain] = 0:0-0:25 - >-------------------------< -0|
text
+[Domain] = 0:0-0:11 + >-----------< +0|
[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/html/endTag.scope b/data/fixtures/scopes/html/endTag.scope index 61c4e46bcd..ee1ca07bd0 100644 --- a/data/fixtures/scopes/html/endTag.scope +++ b/data/fixtures/scopes/html/endTag.scope @@ -1,13 +1,13 @@ -
+
--- [Content] = -[Removal] = 0:15-0:21 - >------< -0|
+[Removal] = 0:5-0:11 + >------< +0|
-[Domain] = 0:0-0:21 - >---------------------< -0|
+[Domain] = 0:0-0:11 + >-----------< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/interior.element.scope b/data/fixtures/scopes/html/interior.element.scope index 9682fcd74b..74c625a413 100644 --- a/data/fixtures/scopes/html/interior.element.scope +++ b/data/fixtures/scopes/html/interior.element.scope @@ -1,40 +1,37 @@ -
text
+
--- [#1 Content] = [#1 Removal] = 0:1-0:4 >---< -0|
text
+0|
[#1 Domain] = 0:0-0:5 >-----< -0|
text
+0|
[#1 Insertion delimiter] = " " -[#2 Content] = 0:6-0:10 - >----< -0|
text
+[#2 Content] = +[#2 Removal] = 0:5-0:6 + >-< +0|
-[#2 Removal] = 0:5-0:11 - >------< -0|
text
- -[#2 Domain] = 0:0-0:17 - >-----------------< -0|
text
+[#2 Domain] = 0:0-0:12 + >------------< +0|
[#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 0:13-0:16 - >---< -0|
text
+[#3 Removal] = 0:8-0:11 + >---< +0|
-[#3 Domain] = 0:11-0:17 - >------< -0|
text
+[#3 Domain] = 0:6-0:12 + >------< +0|
[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/key.attribute.scope b/data/fixtures/scopes/html/key.attribute.scope index aae05371b9..f5eea35ea2 100644 --- a/data/fixtures/scopes/html/key.attribute.scope +++ b/data/fixtures/scopes/html/key.attribute.scope @@ -1,20 +1,20 @@ -
+
--- [Content] = 0:5-0:7 >--< -0|
+0|
[Removal] = 0:5-0:8 >---< -0|
+0|
[Trailing delimiter] = 0:7-0:8 >-< -0|
+0|
-[Domain] = 0:5-0:14 - >---------< -0|
+[Domain] = 0:5-0:13 + >--------< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/startTag.scope b/data/fixtures/scopes/html/startTag.scope index d3f5ce5ef8..bd0b430ab4 100644 --- a/data/fixtures/scopes/html/startTag.scope +++ b/data/fixtures/scopes/html/startTag.scope @@ -1,13 +1,13 @@ -
+
--- [Content] = -[Removal] = 0:0-0:15 - >---------------< -0|
+[Removal] = 0:0-0:5 + >-----< +0|
-[Domain] = 0:0-0:21 - >---------------------< -0|
+[Domain] = 0:0-0:11 + >-----------< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/string.singleLine.scope b/data/fixtures/scopes/html/string.singleLine.scope index d8863c28b1..c4fb13f214 100644 --- a/data/fixtures/scopes/html/string.singleLine.scope +++ b/data/fixtures/scopes/html/string.singleLine.scope @@ -1,10 +1,10 @@ -
+
--- [Content] = [Removal] = -[Domain] = 0:8-0:12 - >----< -0|
+[Domain] = 0:8-0:13 + >-----< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/tags.scope b/data/fixtures/scopes/html/tags.scope index 7343bd387e..3782d13608 100644 --- a/data/fixtures/scopes/html/tags.scope +++ b/data/fixtures/scopes/html/tags.scope @@ -1,20 +1,34 @@ -
hello
+
--- -[#1.1 Content] = -[#1.1 Removal] = 0:0-0:5 +[#1.1 Content] = 0:0-0:5 >-----< -0|
hello
+0|
+ +[#1.1 Removal] = 0:0-0:6 + >------< +0|
+ +[#1.1 Trailing delimiter] = 0:5-0:6 + >-< +0|
[#1.1 Insertion delimiter] = " " -[#1.2 Content] = -[#1.2 Removal] = 0:10-0:16 - >------< -0|
hello
+[#1.2 Content] = 0:6-0:12 + >------< +0|
+ +[#1.2 Removal] = 0:5-0:12 + >-------< +0|
+ +[#1.2 Leading delimiter] = 0:5-0:6 + >-< +0|
[#1.2 Insertion delimiter] = " " -[#1 Domain] = 0:0-0:16 - >----------------< -0|
hello
+[#1 Domain] = 0:0-0:12 + >------------< +0|
diff --git a/data/fixtures/scopes/html/textFragment.comment.block.scope b/data/fixtures/scopes/html/textFragment.comment.block.scope index 7959bbcea0..4bc2c04d34 100644 --- a/data/fixtures/scopes/html/textFragment.comment.block.scope +++ b/data/fixtures/scopes/html/textFragment.comment.block.scope @@ -1,15 +1,10 @@ - + --- [Content] = [Removal] = -[Domain] = 0:0-2:3 - >---- -0| - ---< +[Domain] = 0:0-0:20 + >--------------------< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/textFragment.element.scope b/data/fixtures/scopes/html/textFragment.element.scope index 5953d76ab8..f8ea261a92 100644 --- a/data/fixtures/scopes/html/textFragment.element.scope +++ b/data/fixtures/scopes/html/textFragment.element.scope @@ -1,10 +1,10 @@ -
hello
+
Hello world
--- [Content] = [Removal] = -[Domain] = 0:5-0:10 - >-----< -0|
hello
+[Domain] = 0:5-0:16 + >-----------< +0|
Hello world
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/textFragment.string.singleLine.scope b/data/fixtures/scopes/html/textFragment.string.singleLine.scope index 024a3d1c25..c2c50c1302 100644 --- a/data/fixtures/scopes/html/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/html/textFragment.string.singleLine.scope @@ -1,10 +1,10 @@ -
+
--- [Content] = [Removal] = -[Domain] = 0:9-0:11 - >--< -0|
+[Domain] = 0:9-0:12 + >---< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/html/value.attribute.scope b/data/fixtures/scopes/html/value.attribute.scope index c9b9bfb687..03a1818cd5 100644 --- a/data/fixtures/scopes/html/value.attribute.scope +++ b/data/fixtures/scopes/html/value.attribute.scope @@ -1,20 +1,20 @@ -
+
--- -[Content] = 0:8-0:14 - >------< -0|
+[Content] = 0:8-0:13 + >-----< +0|
-[Removal] = 0:7-0:14 - >-------< -0|
+[Removal] = 0:7-0:13 + >------< +0|
[Leading delimiter] = 0:7-0:8 >-< -0|
+0|
-[Domain] = 0:5-0:14 - >---------< -0|
+[Domain] = 0:5-0:13 + >--------< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/anonymousFunction.scope b/data/fixtures/scopes/java/anonymousFunction.scope index 7b67e0a019..8d87d11a99 100644 --- a/data/fixtures/scopes/java/anonymousFunction.scope +++ b/data/fixtures/scopes/java/anonymousFunction.scope @@ -1,10 +1,10 @@ -() -> 0; +() -> {}; --- [Content] = [Removal] = -[Domain] = 0:0-0:7 - >-------< -0| () -> 0; +[Domain] = 0:0-0:8 + >--------< +0| () -> {}; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/anonymousFunction2.scope b/data/fixtures/scopes/java/anonymousFunction2.scope index 8d87d11a99..7b67e0a019 100644 --- a/data/fixtures/scopes/java/anonymousFunction2.scope +++ b/data/fixtures/scopes/java/anonymousFunction2.scope @@ -1,10 +1,10 @@ -() -> {}; +() -> 0; --- [Content] = [Removal] = -[Domain] = 0:0-0:8 - >--------< -0| () -> {}; +[Domain] = 0:0-0:7 + >-------< +0| () -> 0; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/argument/argument.catch.scope b/data/fixtures/scopes/java/argument/argument.catch.scope index e0026ab550..f9d2f95945 100644 --- a/data/fixtures/scopes/java/argument/argument.catch.scope +++ b/data/fixtures/scopes/java/argument/argument.catch.scope @@ -1,21 +1,21 @@ try {} -catch(final MyException ex) {} -catch(final Exception ex) {} +catch(final MyException e) {} +catch(final Exception e) {} --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 1:6-1:26 - >--------------------< -1| catch(final MyException ex) {} +[#1 Domain] = 1:6-1:25 + >-------------------< +1| catch(final MyException e) {} [#1 Insertion delimiter] = " " [#2 Content] = [#2 Removal] = -[#2 Domain] = 2:6-2:24 - >------------------< -2| catch(final Exception ex) {} +[#2 Domain] = 2:6-2:23 + >-----------------< +2| catch(final Exception e) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.empty.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.empty.scope index e91e8c777d..4450d030f4 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.empty.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.empty.scope @@ -1,15 +1,15 @@ -public class MyClass { - public MyClass() {} +public class Foo { + public Foo() {} } --- [Content] = -[Removal] = 1:19-1:19 - >< -1| public MyClass() {} +[Removal] = 1:15-1:15 + >< +1| public Foo() {} -[Domain] = 1:4-1:23 - >-------------------< -1| public MyClass() {} +[Domain] = 1:4-1:19 + >---------------< +1| public Foo() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope index 31055654b3..468f30cb31 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.multiLine.scope @@ -1,5 +1,5 @@ -public class MyClass { - public MyClass( +public class Foo { + public Foo( int aaa, int bbb ) {} @@ -12,9 +12,9 @@ public class MyClass { 3| int bbb ---------------< -[Removal] = 1:19-4:4 - > -1| public MyClass( +[Removal] = 1:15-4:4 + > +1| public Foo( 2| int aaa, 3| int bbb 4| ) {} @@ -25,8 +25,8 @@ public class MyClass { 2| int aaa, [Domain] = 1:4-4:8 - >--------------- -1| public MyClass( + >----------- +1| public Foo( 2| int aaa, 3| int bbb 4| ) {} diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope index 123c220e8a..c462c2bfff 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.constructor.singleLine.scope @@ -1,15 +1,15 @@ -public class MyClass { - public MyClass(String aaa, int bbb) {} +public class Foo { + public Foo(int aaa, int bbb) {} } --- [Content] = -[Removal] = 1:19-1:38 - >-------------------< -1| public MyClass(String aaa, int bbb) {} +[Removal] = 1:15-1:31 + >----------------< +1| public Foo(int aaa, int bbb) {} -[Domain] = 1:4-1:42 - >--------------------------------------< -1| public MyClass(String aaa, int bbb) {} +[Domain] = 1:4-1:35 + >-------------------------------< +1| public Foo(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.empty.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.empty.scope index b3aee8883e..ded258aaab 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.empty.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.empty.scope @@ -1,13 +1,13 @@ -() -> { }; +() -> {}; --- [Content] = [Removal] = 0:1-0:1 >< -0| () -> { }; +0| () -> {}; -[Domain] = 0:0-0:9 - >---------< -0| () -> { }; +[Domain] = 0:0-0:8 + >--------< +0| () -> {}; [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.multiLine.scope index aaad5c108f..aeb0e5eb56 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.multiLine.scope @@ -1,7 +1,7 @@ ( aaa, bbb -) -> { }; +) -> {}; --- [Content] = 1:4-2:7 @@ -15,19 +15,19 @@ 0| ( 1| aaa, 2| bbb -3| ) -> { }; +3| ) -> {}; < [Leading delimiter] = 1:0-1:4 >----< 1| aaa, -[Domain] = 0:0-3:8 +[Domain] = 0:0-3:7 >- 0| ( 1| aaa, 2| bbb -3| ) -> { }; - --------< +3| ) -> {}; + -------< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.singleLine.scope index adc12d6cb2..b1991f0e6f 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.lambda.singleLine.scope @@ -1,13 +1,13 @@ -(aaa, bbb) -> { }; +(aaa, bbb) -> {}; --- [Content] = [Removal] = 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) -> {}; [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.empty.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.empty.scope index 698e5e2831..48f340ed1d 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.empty.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.empty.scope @@ -1,15 +1,15 @@ -public class MyClass { - public void foo() {} +public class Foo { + public void bar() {} } --- [Content] = [Removal] = 1:20-1:20 >< -1| public void foo() {} +1| public void bar() {} [Domain] = 1:4-1:24 >--------------------< -1| public void foo() {} +1| public void bar() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope index 249a4c3109..cb00b67516 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.multiLine.scope @@ -1,5 +1,5 @@ -public class MyClass { - public void foo( +public class Foo { + public void bar( int aaa, int bbb ) {} @@ -14,7 +14,7 @@ public class MyClass { [Removal] = 1:20-4:4 > -1| public void foo( +1| public void bar( 2| int aaa, 3| int bbb 4| ) {} @@ -26,7 +26,7 @@ public class MyClass { [Domain] = 1:4-4:8 >---------------- -1| public void foo( +1| public void bar( 2| int aaa, 3| int bbb 4| ) {} diff --git a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope index 150a8b0535..7ca686a584 100644 --- a/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope +++ b/data/fixtures/scopes/java/argumentList/argumentList.formal.method.singleLine.scope @@ -1,15 +1,15 @@ -public class MyClass { - public void foo(int aaa, int bbb) {} +public class Foo { + public void bar(int aaa, int bbb) {} } --- [Content] = [Removal] = 1:20-1:36 >----------------< -1| public void foo(int aaa, int bbb) {} +1| public void bar(int aaa, int bbb) {} [Domain] = 1:4-1:40 >------------------------------------< -1| public void foo(int aaa, int bbb) {} +1| public void bar(int aaa, int bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope index 240370cea1..81eca1bb2c 100644 --- a/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope @@ -1,33 +1,10 @@ -switch (value) { - case 1: - break; - case 2: - break; - default: - break; -} +switch (foo) { } --- -[Content] = 0:16-7:0 - > -0| switch (value) { -1| case 1: -2| break; -3| case 2: -4| break; -5| default: -6| break; -7| } - < +[Content] = 0:14-0:15 + >-< +0| switch (foo) { } -[Domain] = 0:0-7:1 - >---------------- -0| switch (value) { -1| case 1: -2| break; -3| case 2: -4| break; -5| default: -6| break; -7| } - -< +[Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } diff --git a/data/fixtures/scopes/java/branch/branch.switchCase.scope b/data/fixtures/scopes/java/branch/branch.switchCase.scope index 66ac2695d4..c67cd2b4cc 100644 --- a/data/fixtures/scopes/java/branch/branch.switchCase.scope +++ b/data/fixtures/scopes/java/branch/branch.switchCase.scope @@ -1,71 +1,44 @@ -switch (value) { - case 1: - break; - case 2: - break; - default: +switch (foo) { + case 0: break; + default: {} } --- [#1 Content] = [#1 Domain] = 1:4-2:14 >------- -1| case 1: +1| case 0: 2| break; --------------< [#1 Removal] = 1:0-3:0 >----------- -1| case 1: +1| case 0: 2| break; -3| case 2: +3| default: {} < [#1 Leading delimiter] = 1:0-1:4 >----< -1| case 1: +1| case 0: [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 3:4-4:14 - >------- -3| case 2: -4| break; - --------------< - -[#2 Removal] = 3:0-5:0 - >----------- -3| case 2: -4| break; -5| default: +[#2 Domain] = 3:4-3:15 + >-----------< +3| default: {} + +[#2 Removal] = 3:0-4:0 + >--------------- +3| default: {} +4| } < [#2 Leading delimiter] = 3:0-3:4 >----< -3| case 2: +3| default: {} [#2 Insertion delimiter] = "\n" - - -[#3 Content] = -[#3 Domain] = 5:4-6:14 - >-------- -5| default: -6| break; - --------------< - -[#3 Removal] = 5:0-7:0 - >------------ -5| default: -6| break; -7| } - < - -[#3 Leading delimiter] = 5:0-5:4 - >----< -5| default: - -[#3 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/class.iteration.block.scope b/data/fixtures/scopes/java/class.iteration.block.scope index 9aad767f59..40123c5055 100644 --- a/data/fixtures/scopes/java/class.iteration.block.scope +++ b/data/fixtures/scopes/java/class.iteration.block.scope @@ -1,13 +1,13 @@ -public class MyClass { } +public class Foo { } --- [#1 Content] = -[#1 Domain] = 0:0-0:24 - >------------------------< -0| public class MyClass { } +[#1 Domain] = 0:0-0:20 + >--------------------< +0| public class Foo { } [#2 Content] = -[#2 Domain] = 0:22-0:23 - >-< -0| public class MyClass { } +[#2 Domain] = 0:18-0:19 + >-< +0| public class Foo { } diff --git a/data/fixtures/scopes/java/class.iteration.document.scope b/data/fixtures/scopes/java/class.iteration.document.scope index 3ee1fa3159..813bb62ea9 100644 --- a/data/fixtures/scopes/java/class.iteration.document.scope +++ b/data/fixtures/scopes/java/class.iteration.document.scope @@ -1,18 +1,12 @@ -public class MyClass { } +class Foo {} --- -[#1 Content] = -[#1 Domain] = 0:0-2:0 +[Content] = +[Domain] = 0:0-2:0 > 0| -1| public class MyClass { } +1| class Foo {} 2| < - - -[#2 Content] = -[#2 Domain] = 1:22-1:23 - >-< -1| public class MyClass { } diff --git a/data/fixtures/scopes/java/class.scope b/data/fixtures/scopes/java/class.scope index eab5a96bbd..405cfe57da 100644 --- a/data/fixtures/scopes/java/class.scope +++ b/data/fixtures/scopes/java/class.scope @@ -1,10 +1,10 @@ -public class MyClass { } +public class Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:24 - >------------------------< -0| public class MyClass { } +[Domain] = 0:0-0:19 + >-------------------< +0| public class Foo {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/java/class2.scope b/data/fixtures/scopes/java/class2.scope new file mode 100644 index 0000000000..7e77d3e5f0 --- /dev/null +++ b/data/fixtures/scopes/java/class2.scope @@ -0,0 +1,13 @@ +@bar +public class Foo {} +--- + +[Content] = +[Removal] = +[Domain] = 0:0-1:19 + >---- +0| @bar +1| public class Foo {} + -------------------< + +[Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/java/className.iteration.block.scope b/data/fixtures/scopes/java/className.iteration.block.scope index 9aad767f59..a3ec5f3456 100644 --- a/data/fixtures/scopes/java/className.iteration.block.scope +++ b/data/fixtures/scopes/java/className.iteration.block.scope @@ -1,13 +1,13 @@ -public class MyClass { } +class Foo { } --- [#1 Content] = -[#1 Domain] = 0:0-0:24 - >------------------------< -0| public class MyClass { } +[#1 Domain] = 0:0-0:13 + >-------------< +0| class Foo { } [#2 Content] = -[#2 Domain] = 0:22-0:23 - >-< -0| public class MyClass { } +[#2 Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/java/className.iteration.document.scope b/data/fixtures/scopes/java/className.iteration.document.scope index 3ee1fa3159..813bb62ea9 100644 --- a/data/fixtures/scopes/java/className.iteration.document.scope +++ b/data/fixtures/scopes/java/className.iteration.document.scope @@ -1,18 +1,12 @@ -public class MyClass { } +class Foo {} --- -[#1 Content] = -[#1 Domain] = 0:0-2:0 +[Content] = +[Domain] = 0:0-2:0 > 0| -1| public class MyClass { } +1| class Foo {} 2| < - - -[#2 Content] = -[#2 Domain] = 1:22-1:23 - >-< -1| public class MyClass { } diff --git a/data/fixtures/scopes/java/className.scope b/data/fixtures/scopes/java/className.scope index dfc56cf188..793da2dfad 100644 --- a/data/fixtures/scopes/java/className.scope +++ b/data/fixtures/scopes/java/className.scope @@ -1,24 +1,24 @@ -public class MyClass { } +public class Foo {} --- -[Content] = 0:13-0:20 - >-------< -0| public class MyClass { } +[Content] = 0:13-0:16 + >---< +0| public class Foo {} -[Removal] = 0:13-0:21 - >--------< -0| public class MyClass { } +[Removal] = 0:13-0:17 + >----< +0| public class Foo {} [Leading delimiter] = 0:12-0:13 >-< -0| public class MyClass { } +0| public class Foo {} -[Trailing delimiter] = 0:20-0:21 - >-< -0| public class MyClass { } +[Trailing delimiter] = 0:16-0:17 + >-< +0| public class Foo {} -[Domain] = 0:0-0:24 - >------------------------< -0| public class MyClass { } +[Domain] = 0:0-0:19 + >-------------------< +0| public class Foo {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration.scope index f3e0175c3f..b29f3941ca 100644 --- a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration.scope +++ b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration.scope @@ -1,33 +1,33 @@ -public class MyClass { - String foo, bar; +public class Foo { + int aaa, bbb; } --- -[#1 Content] = 1:4-1:20 - >----------------< -1| String foo, bar; +[#1 Content] = 1:4-1:17 + >-------------< +1| int aaa, bbb; -[#1 Domain] = 0:22-2:0 - > -0| public class MyClass { -1| String foo, bar; +[#1 Domain] = 0:18-2:0 + > +0| public class Foo { +1| int aaa, bbb; 2| } < -[#2 Content] = 1:4-1:20 - >----------------< -1| String foo, bar; +[#2 Content] = 1:4-1:17 + >-------------< +1| int aaa, bbb; -[#2 Domain] = 1:0-1:20 - >--------------------< -1| String foo, bar; +[#2 Domain] = 1:0-1:17 + >-----------------< +1| int aaa, bbb; -[#3 Content] = 1:11-1:19 - >--------< -1| String foo, bar; +[#3 Content] = 1:8-1:16 + >--------< +1| int aaa, bbb; -[#3 Domain] = 1:4-1:20 - >----------------< -1| String foo, bar; +[#3 Domain] = 1:4-1:17 + >-------------< +1| int aaa, bbb; diff --git a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope index f26f414d74..ef6cac4991 100644 --- a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope +++ b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope @@ -1,52 +1,52 @@ -public class MyClass { - public void myFunk() { - String foo, bar; +public class Foo { + public void bar() { + int aaa, bbb; } } --- [#1 Content] = 1:4-3:5 - >---------------------- -1| public void myFunk() { -2| String foo, bar; + >------------------- +1| public void bar() { +2| int aaa, bbb; 3| } -----< -[#1 Domain] = 0:22-4:0 - > -0| public class MyClass { -1| public void myFunk() { -2| String foo, bar; +[#1 Domain] = 0:18-4:0 + > +0| public class Foo { +1| public void bar() { +2| int aaa, bbb; 3| } 4| } < -[#2 Content] = 2:8-2:24 - >----------------< -2| String foo, bar; +[#2 Content] = 2:8-2:21 + >-------------< +2| int aaa, bbb; -[#2 Domain] = 1:26-3:4 - > -1| public void myFunk() { -2| String foo, bar; +[#2 Domain] = 1:23-3:4 + > +1| public void bar() { +2| int aaa, bbb; 3| } ----< -[#3 Content] = 2:8-2:24 - >----------------< -2| String foo, bar; +[#3 Content] = 2:8-2:21 + >-------------< +2| int aaa, bbb; -[#3 Domain] = 2:0-2:24 - >------------------------< -2| String foo, bar; +[#3 Domain] = 2:0-2:21 + >---------------------< +2| int aaa, bbb; -[#4 Content] = 2:15-2:23 - >--------< -2| String foo, bar; +[#4 Content] = 2:12-2:20 + >--------< +2| int aaa, bbb; -[#4 Domain] = 2:8-2:24 - >----------------< -2| String foo, bar; +[#4 Domain] = 2:8-2:21 + >-------------< +2| int aaa, bbb; diff --git a/data/fixtures/scopes/java/collectionItem.unenclosed.scope b/data/fixtures/scopes/java/collectionItem.unenclosed.scope index 999c5c0da9..419ecc8098 100644 --- a/data/fixtures/scopes/java/collectionItem.unenclosed.scope +++ b/data/fixtures/scopes/java/collectionItem.unenclosed.scope @@ -1,67 +1,67 @@ -public class MyClass { - String foo, bar; +public class Foo { + int aaa, bbb; } --- [#1 Content] = -[#1 Domain] = 1:4-1:14 - >----------< -1| String foo, bar; +[#1 Domain] = 1:4-1:11 + >-------< +1| int aaa, bbb; -[#1 Removal] = 1:4-1:16 - >------------< -1| String foo, bar; +[#1 Removal] = 1:4-1:13 + >---------< +1| int aaa, bbb; -[#1 Trailing delimiter] = 1:14-1:16 - >--< -1| String foo, bar; +[#1 Trailing delimiter] = 1:11-1:13 + >--< +1| int aaa, bbb; [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 1:11-1:14 - >---< -1| String foo, bar; +[#2 Domain] = 1:8-1:11 + >---< +1| int aaa, bbb; -[#2 Removal] = 1:11-1:16 - >-----< -1| String foo, bar; +[#2 Removal] = 1:8-1:13 + >-----< +1| int aaa, bbb; -[#2 Trailing delimiter] = 1:14-1:16 - >--< -1| String foo, bar; +[#2 Trailing delimiter] = 1:11-1:13 + >--< +1| int aaa, bbb; [#2 Insertion delimiter] = ", " [#3 Content] = -[#3 Domain] = 1:16-1:19 - >---< -1| String foo, bar; +[#3 Domain] = 1:13-1:16 + >---< +1| int aaa, bbb; -[#3 Removal] = 1:14-1:19 - >-----< -1| String foo, bar; +[#3 Removal] = 1:11-1:16 + >-----< +1| int aaa, bbb; -[#3 Leading delimiter] = 1:14-1:16 - >--< -1| String foo, bar; +[#3 Leading delimiter] = 1:11-1:13 + >--< +1| int aaa, bbb; [#3 Insertion delimiter] = ", " [#4 Content] = -[#4 Domain] = 1:16-1:20 - >----< -1| String foo, bar; +[#4 Domain] = 1:13-1:17 + >----< +1| int aaa, bbb; -[#4 Removal] = 1:14-1:20 - >------< -1| String foo, bar; +[#4 Removal] = 1:11-1:17 + >------< +1| int aaa, bbb; -[#4 Leading delimiter] = 1:14-1:16 - >--< -1| String foo, bar; +[#4 Leading delimiter] = 1:11-1:13 + >--< +1| int aaa, bbb; [#4 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/collectionItem.unenclosed2.scope b/data/fixtures/scopes/java/collectionItem.unenclosed2.scope index 93021c3c80..6e3b471572 100644 --- a/data/fixtures/scopes/java/collectionItem.unenclosed2.scope +++ b/data/fixtures/scopes/java/collectionItem.unenclosed2.scope @@ -1,92 +1,92 @@ -public class MyClass { - public void myFunk() { - String foo, bar; +public class Foo { + public void bar() { + int aaa, bbb; } } --- [#1 Content] = [#1 Domain] = 1:4-3:5 - >---------------------- -1| public void myFunk() { -2| String foo, bar; + >------------------- +1| public void bar() { +2| int aaa, bbb; 3| } -----< [#1 Removal] = 1:0-4:0 - >-------------------------- -1| public void myFunk() { -2| String foo, bar; + >----------------------- +1| public void bar() { +2| int aaa, bbb; 3| } 4| } < [#1 Leading delimiter] = 1:0-1:4 >----< -1| public void myFunk() { +1| public void bar() { [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#2 Domain] = 2:8-2:18 - >----------< -2| String foo, bar; +[#2 Domain] = 2:8-2:15 + >-------< +2| int aaa, bbb; -[#2 Removal] = 2:8-2:20 - >------------< -2| String foo, bar; +[#2 Removal] = 2:8-2:17 + >---------< +2| int aaa, bbb; -[#2 Trailing delimiter] = 2:18-2:20 - >--< -2| String foo, bar; +[#2 Trailing delimiter] = 2:15-2:17 + >--< +2| int aaa, bbb; [#2 Insertion delimiter] = ",\n" [#3 Content] = -[#3 Domain] = 2:15-2:18 - >---< -2| String foo, bar; +[#3 Domain] = 2:12-2:15 + >---< +2| int aaa, bbb; -[#3 Removal] = 2:15-2:20 - >-----< -2| String foo, bar; +[#3 Removal] = 2:12-2:17 + >-----< +2| int aaa, bbb; -[#3 Trailing delimiter] = 2:18-2:20 - >--< -2| String foo, bar; +[#3 Trailing delimiter] = 2:15-2:17 + >--< +2| int aaa, bbb; [#3 Insertion delimiter] = ", " [#4 Content] = -[#4 Domain] = 2:20-2:23 - >---< -2| String foo, bar; +[#4 Domain] = 2:17-2:20 + >---< +2| int aaa, bbb; -[#4 Removal] = 2:18-2:23 - >-----< -2| String foo, bar; +[#4 Removal] = 2:15-2:20 + >-----< +2| int aaa, bbb; -[#4 Leading delimiter] = 2:18-2:20 - >--< -2| String foo, bar; +[#4 Leading delimiter] = 2:15-2:17 + >--< +2| int aaa, bbb; [#4 Insertion delimiter] = ", " [#5 Content] = -[#5 Domain] = 2:20-2:24 - >----< -2| String foo, bar; +[#5 Domain] = 2:17-2:21 + >----< +2| int aaa, bbb; -[#5 Removal] = 2:18-2:24 - >------< -2| String foo, bar; +[#5 Removal] = 2:15-2:21 + >------< +2| int aaa, bbb; -[#5 Leading delimiter] = 2:18-2:20 - >--< -2| String foo, bar; +[#5 Leading delimiter] = 2:15-2:17 + >--< +2| int aaa, bbb; [#5 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/java/comment.block.scope b/data/fixtures/scopes/java/comment.block.scope index 7c4611e225..5e8b51111c 100644 --- a/data/fixtures/scopes/java/comment.block.scope +++ b/data/fixtures/scopes/java/comment.block.scope @@ -1,10 +1,10 @@ -/* Hello */ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-0:11 - >-----------< -0| /* Hello */ +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/comment.block2.scope b/data/fixtures/scopes/java/comment.block2.scope new file mode 100644 index 0000000000..b5d8404237 --- /dev/null +++ b/data/fixtures/scopes/java/comment.block2.scope @@ -0,0 +1,10 @@ +/** Hello world */ +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:18 + >------------------< +0| /** Hello world */ + +[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/comment.line.scope b/data/fixtures/scopes/java/comment.line.scope index 576f62c186..7d1477b8a1 100644 --- a/data/fixtures/scopes/java/comment.line.scope +++ b/data/fixtures/scopes/java/comment.line.scope @@ -1,10 +1,10 @@ -// Hello +// Hello world --- [Content] = [Removal] = -[Domain] = 0:0-0:8 - >--------< -0| // Hello +[Domain] = 0:0-0:14 + >--------------< +0| // Hello world [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/condition/condition.doWhile.scope b/data/fixtures/scopes/java/condition/condition.doWhile.scope index a08fbe233d..f8e3242e13 100644 --- a/data/fixtures/scopes/java/condition/condition.doWhile.scope +++ b/data/fixtures/scopes/java/condition/condition.doWhile.scope @@ -1,13 +1,13 @@ -do { } while(value != null); +do {} while (true); --- [Content] = -[Removal] = 0:13-0:26 - >-------------< -0| do { } while(value != null); +[Removal] = 0:13-0:17 + >----< +0| do {} while (true); -[Domain] = 0:0-0:28 - >----------------------------< -0| do { } while(value != null); +[Domain] = 0:0-0:19 + >-------------------< +0| do {} while (true); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/condition/condition.for.scope b/data/fixtures/scopes/java/condition/condition.for.scope index 12ebd6c6c0..ffb884ac10 100644 --- a/data/fixtures/scopes/java/condition/condition.for.scope +++ b/data/fixtures/scopes/java/condition/condition.for.scope @@ -1,20 +1,20 @@ -for (int i = 0; i < value.length; ++i) { } +for (int i = 0; i < size; i++) {} --- -[Content] = 0:16-0:32 - >----------------< -0| for (int i = 0; i < value.length; ++i) { } +[Content] = 0:16-0:24 + >--------< +0| for (int i = 0; i < size; i++) {} -[Removal] = 0:15-0:32 - >-----------------< -0| for (int i = 0; i < value.length; ++i) { } +[Removal] = 0:15-0:24 + >---------< +0| for (int i = 0; i < size; i++) {} [Leading delimiter] = 0:15-0:16 >-< -0| for (int i = 0; i < value.length; ++i) { } +0| for (int i = 0; i < size; i++) {} -[Domain] = 0:0-0:42 - >------------------------------------------< -0| for (int i = 0; i < value.length; ++i) { } +[Domain] = 0:0-0:33 + >---------------------------------< +0| for (int i = 0; i < size; i++) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope index 240370cea1..81eca1bb2c 100644 --- a/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope @@ -1,33 +1,10 @@ -switch (value) { - case 1: - break; - case 2: - break; - default: - break; -} +switch (foo) { } --- -[Content] = 0:16-7:0 - > -0| switch (value) { -1| case 1: -2| break; -3| case 2: -4| break; -5| default: -6| break; -7| } - < +[Content] = 0:14-0:15 + >-< +0| switch (foo) { } -[Domain] = 0:0-7:1 - >---------------- -0| switch (value) { -1| case 1: -2| break; -3| case 2: -4| break; -5| default: -6| break; -7| } - -< +[Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } diff --git a/data/fixtures/scopes/java/condition/condition.switchCase.scope b/data/fixtures/scopes/java/condition/condition.switchCase.scope index cc709a517b..de92f6d536 100644 --- a/data/fixtures/scopes/java/condition/condition.switchCase.scope +++ b/data/fixtures/scopes/java/condition/condition.switchCase.scope @@ -1,50 +1,22 @@ -switch (value) { - case 1: - break; - case 2: - break; - default: - break; +switch (foo) { + case 0: break; } --- -[#1 Content] = 1:9-1:10 +[Content] = 1:9-1:10 >-< -1| case 1: +1| case 0: break; -[#1 Removal] = 1:8-1:10 +[Removal] = 1:8-1:10 >--< -1| case 1: +1| case 0: break; -[#1 Leading delimiter] = 1:8-1:9 +[Leading delimiter] = 1:8-1:9 >-< -1| case 1: +1| case 0: break; -[#1 Domain] = 1:4-2:14 - >------- -1| case 1: -2| break; - --------------< +[Domain] = 1:4-1:18 + >--------------< +1| case 0: break; -[#1 Insertion delimiter] = " " - - -[#2 Content] = 3:9-3:10 - >-< -3| case 2: - -[#2 Removal] = 3:8-3:10 - >--< -3| case 2: - -[#2 Leading delimiter] = 3:8-3:9 - >-< -3| case 2: - -[#2 Domain] = 3:4-4:14 - >------- -3| case 2: -4| break; - --------------< - -[#2 Insertion delimiter] = " " +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/condition/condition.switchCase2.scope b/data/fixtures/scopes/java/condition/condition.switchCase2.scope index 345428df7b..d8903b12e2 100644 --- a/data/fixtures/scopes/java/condition/condition.switchCase2.scope +++ b/data/fixtures/scopes/java/condition/condition.switchCase2.scope @@ -1,78 +1,36 @@ -switch (value) { - case 1, 2: - break; - case 3, 4: - break; - default: - break; +switch (foo) { + case 0, 1: break; } --- [#1.1 Content] = 1:9-1:10 >-< -1| case 1, 2: +1| case 0, 1: break; [#1.1 Removal] = 1:8-1:10 >--< -1| case 1, 2: +1| case 0, 1: break; [#1.1 Leading delimiter] = 1:8-1:9 >-< -1| case 1, 2: +1| case 0, 1: break; [#1.1 Insertion delimiter] = " " [#1.2 Content] = 1:12-1:13 >-< -1| case 1, 2: +1| case 0, 1: break; [#1.2 Removal] = 1:11-1:13 >--< -1| case 1, 2: +1| case 0, 1: break; [#1.2 Leading delimiter] = 1:11-1:12 >-< -1| case 1, 2: +1| case 0, 1: break; [#1.2 Insertion delimiter] = " " -[#1 Domain] = 1:4-2:14 - >---------- -1| case 1, 2: -2| break; - --------------< - - -[#2.1 Content] = 3:9-3:10 - >-< -3| case 3, 4: - -[#2.1 Removal] = 3:8-3:10 - >--< -3| case 3, 4: - -[#2.1 Leading delimiter] = 3:8-3:9 - >-< -3| case 3, 4: - -[#2.1 Insertion delimiter] = " " - -[#2.2 Content] = 3:12-3:13 - >-< -3| case 3, 4: - -[#2.2 Removal] = 3:11-3:13 - >--< -3| case 3, 4: - -[#2.2 Leading delimiter] = 3:11-3:12 - >-< -3| case 3, 4: - -[#2.2 Insertion delimiter] = " " - -[#2 Domain] = 3:4-4:14 - >---------- -3| case 3, 4: -4| break; - --------------< +[#1 Domain] = 1:4-1:21 + >-----------------< +1| case 0, 1: break; diff --git a/data/fixtures/scopes/java/condition/condition.ternary.scope b/data/fixtures/scopes/java/condition/condition.ternary.scope index 2d7ade10ae..e7892837ea 100644 --- a/data/fixtures/scopes/java/condition/condition.ternary.scope +++ b/data/fixtures/scopes/java/condition/condition.ternary.scope @@ -1,20 +1,20 @@ -value != null ? value : -1; +true ? 0 : 1; --- -[Content] = 0:0-0:13 - >-------------< -0| value != null ? value : -1; +[Content] = 0:0-0:4 + >----< +0| true ? 0 : 1; -[Removal] = 0:0-0:14 - >--------------< -0| value != null ? value : -1; +[Removal] = 0:0-0:5 + >-----< +0| true ? 0 : 1; -[Trailing delimiter] = 0:13-0:14 - >-< -0| value != null ? value : -1; +[Trailing delimiter] = 0:4-0:5 + >-< +0| true ? 0 : 1; -[Domain] = 0:0-0:26 - >--------------------------< -0| value != null ? value : -1; +[Domain] = 0:0-0:12 + >------------< +0| true ? 0 : 1; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/condition/condition.while.scope b/data/fixtures/scopes/java/condition/condition.while.scope index baedea2418..61cd7d9e7a 100644 --- a/data/fixtures/scopes/java/condition/condition.while.scope +++ b/data/fixtures/scopes/java/condition/condition.while.scope @@ -1,13 +1,13 @@ -while(value != null) { } +while (true) {} --- [Content] = -[Removal] = 0:6-0:19 - >-------------< -0| while(value != null) { } +[Removal] = 0:7-0:11 + >----< +0| while (true) {} -[Domain] = 0:0-0:24 - >------------------------< -0| while(value != null) { } +[Domain] = 0:0-0:15 + >---------------< +0| while (true) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/functionCall.constructor.scope b/data/fixtures/scopes/java/functionCall.constructor.scope index 1792bc1720..d94f8bf315 100644 --- a/data/fixtures/scopes/java/functionCall.constructor.scope +++ b/data/fixtures/scopes/java/functionCall.constructor.scope @@ -1,10 +1,10 @@ -new Foo(123, 456); +new Foo(); --- [Content] = [Removal] = -[Domain] = 0:0-0:17 - >-----------------< -0| new Foo(123, 456); +[Domain] = 0:0-0:9 + >---------< +0| new Foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/functionCall.scope b/data/fixtures/scopes/java/functionCall.scope index 0d549d2308..633f02ca5e 100644 --- a/data/fixtures/scopes/java/functionCall.scope +++ b/data/fixtures/scopes/java/functionCall.scope @@ -1,10 +1,10 @@ -foo(123, 456); +foo(); --- [Content] = [Removal] = -[Domain] = 0:0-0:13 - >-------------< -0| foo(123, 456); +[Domain] = 0:0-0:5 + >-----< +0| foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/functionName.constructor.scope b/data/fixtures/scopes/java/functionName.constructor.scope index 160e54fd14..e07a251942 100644 --- a/data/fixtures/scopes/java/functionName.constructor.scope +++ b/data/fixtures/scopes/java/functionName.constructor.scope @@ -1,19 +1,19 @@ -public class MyClass { - public MyClass() { } +public class Foo { + public Foo() {} } --- [Content] = -[Removal] = 1:11-1:18 - >-------< -1| public MyClass() { } +[Removal] = 1:11-1:14 + >---< +1| public Foo() {} [Leading delimiter] = 1:10-1:11 >-< -1| public MyClass() { } +1| public Foo() {} -[Domain] = 1:4-1:24 - >--------------------< -1| public MyClass() { } +[Domain] = 1:4-1:19 + >---------------< +1| public Foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/functionName.method.iteration.class.scope b/data/fixtures/scopes/java/functionName.method.iteration.class.scope index efc0d7bd94..aaf1f0f34f 100644 --- a/data/fixtures/scopes/java/functionName.method.iteration.class.scope +++ b/data/fixtures/scopes/java/functionName.method.iteration.class.scope @@ -1,7 +1,7 @@ -class MyClass { } +class Foo { } --- [Content] = -[Domain] = 0:15-0:16 - >-< -0| class MyClass { } +[Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/java/functionName.method.scope b/data/fixtures/scopes/java/functionName.method.scope index c2687ad6c3..bb09eca963 100644 --- a/data/fixtures/scopes/java/functionName.method.scope +++ b/data/fixtures/scopes/java/functionName.method.scope @@ -1,19 +1,19 @@ -public class MyClass { - public void foo() { } +public class Foo { + public void bar() {} } --- [Content] = [Removal] = 1:16-1:19 >---< -1| public void foo() { } +1| public void bar() {} [Leading delimiter] = 1:15-1:16 >-< -1| public void foo() { } +1| public void bar() {} -[Domain] = 1:4-1:25 - >---------------------< -1| public void foo() { } +[Domain] = 1:4-1:24 + >--------------------< +1| public void bar() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/ifStatement.scope b/data/fixtures/scopes/java/ifStatement.scope index 386e130326..14f2507621 100644 --- a/data/fixtures/scopes/java/ifStatement.scope +++ b/data/fixtures/scopes/java/ifStatement.scope @@ -1,10 +1,15 @@ -if (value != null) { } +if (true) {} +else if (false) {} +else {} --- [Content] = [Removal] = -[Domain] = 0:0-0:22 - >----------------------< -0| if (value != null) { } +[Domain] = 0:0-2:7 + >------------ +0| if (true) {} +1| else if (false) {} +2| else {} + -------< [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/interior/interior.constructor.scope b/data/fixtures/scopes/java/interior/interior.constructor.scope index 8fb5ad6349..d14e67d342 100644 --- a/data/fixtures/scopes/java/interior/interior.constructor.scope +++ b/data/fixtures/scopes/java/interior/interior.constructor.scope @@ -1,44 +1,44 @@ -public class MyClass { - public MyClass() { } +public class Foo { + public Foo() { } } --- -[#1 Content] = 1:4-1:24 - >--------------------< -1| public MyClass() { } +[#1 Content] = 1:4-1:20 + >----------------< +1| public Foo() { } -[#1 Removal] = 0:22-2:0 - > -0| public class MyClass { -1| public MyClass() { } +[#1 Removal] = 0:18-2:0 + > +0| public class Foo { +1| public Foo() { } 2| } < [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public MyClass() { } + >------------------ +0| public class Foo { +1| public Foo() { } 2| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:4-1:24 - >--------------------< -1| public MyClass() { } +[#2 Content] = 1:4-1:20 + >----------------< +1| public Foo() { } -[#2 Removal] = 0:22-2:0 - > -0| public class MyClass { -1| public MyClass() { } +[#2 Removal] = 0:18-2:0 + > +0| public class Foo { +1| public Foo() { } 2| } < -[#2 Domain] = 0:21-2:1 - >- -0| public class MyClass { -1| public MyClass() { } +[#2 Domain] = 0:17-2:1 + >- +0| public class Foo { +1| public Foo() { } 2| } -< @@ -46,36 +46,36 @@ public class MyClass { [#3 Content] = -[#3 Removal] = 1:22-1:23 - >-< -1| public MyClass() { } +[#3 Removal] = 1:18-1:19 + >-< +1| public Foo() { } -[#3 Domain] = 1:4-1:24 - >--------------------< -1| public MyClass() { } +[#3 Domain] = 1:4-1:20 + >----------------< +1| public Foo() { } [#3 Insertion delimiter] = " " [#4 Content] = -[#4 Removal] = 1:19-1:19 - >< -1| public MyClass() { } +[#4 Removal] = 1:15-1:15 + >< +1| public Foo() { } -[#4 Domain] = 1:18-1:20 - >--< -1| public MyClass() { } +[#4 Domain] = 1:14-1:16 + >--< +1| public Foo() { } [#4 Insertion delimiter] = " " [#5 Content] = -[#5 Removal] = 1:22-1:23 - >-< -1| public MyClass() { } +[#5 Removal] = 1:18-1:19 + >-< +1| public Foo() { } -[#5 Domain] = 1:21-1:24 - >---< -1| public MyClass() { } +[#5 Domain] = 1:17-1:20 + >---< +1| public Foo() { } [#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/interior/interior.method.scope b/data/fixtures/scopes/java/interior/interior.method.scope index dbc363f02e..646639ab38 100644 --- a/data/fixtures/scopes/java/interior/interior.method.scope +++ b/data/fixtures/scopes/java/interior/interior.method.scope @@ -1,23 +1,23 @@ -public class MyClass { - public void foo() { } +public class Foo { + public void bar() { } } --- [#1 Content] = 1:4-1:25 >---------------------< -1| public void foo() { } +1| public void bar() { } -[#1 Removal] = 0:22-2:0 - > -0| public class MyClass { -1| public void foo() { } +[#1 Removal] = 0:18-2:0 + > +0| public class Foo { +1| public void bar() { } 2| } < [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public void foo() { } + >------------------ +0| public class Foo { +1| public void bar() { } 2| } -< @@ -26,19 +26,19 @@ public class MyClass { [#2 Content] = 1:4-1:25 >---------------------< -1| public void foo() { } +1| public void bar() { } -[#2 Removal] = 0:22-2:0 - > -0| public class MyClass { -1| public void foo() { } +[#2 Removal] = 0:18-2:0 + > +0| public class Foo { +1| public void bar() { } 2| } < -[#2 Domain] = 0:21-2:1 - >- -0| public class MyClass { -1| public void foo() { } +[#2 Domain] = 0:17-2:1 + >- +0| public class Foo { +1| public void bar() { } 2| } -< @@ -48,11 +48,11 @@ public class MyClass { [#3 Content] = [#3 Removal] = 1:23-1:24 >-< -1| public void foo() { } +1| public void bar() { } [#3 Domain] = 1:4-1:25 >---------------------< -1| public void foo() { } +1| public void bar() { } [#3 Insertion delimiter] = " " @@ -60,11 +60,11 @@ public class MyClass { [#4 Content] = [#4 Removal] = 1:20-1:20 >< -1| public void foo() { } +1| public void bar() { } [#4 Domain] = 1:19-1:21 >--< -1| public void foo() { } +1| public void bar() { } [#4 Insertion delimiter] = " " @@ -72,10 +72,10 @@ public class MyClass { [#5 Content] = [#5 Removal] = 1:23-1:24 >-< -1| public void foo() { } +1| public void bar() { } [#5 Domain] = 1:22-1:25 >---< -1| public void foo() { } +1| public void bar() { } [#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/interior/interior.resource.scope b/data/fixtures/scopes/java/interior/interior.resource.scope index 1fdf6390af..e487b6ad51 100644 --- a/data/fixtures/scopes/java/interior/interior.resource.scope +++ b/data/fixtures/scopes/java/interior/interior.resource.scope @@ -1,49 +1,49 @@ -try (PrintWriter writer = create()) { } +try (Foo bar = create()) { } --- [#1 Content] = -[#1 Removal] = 0:37-0:38 - >-< -0| try (PrintWriter writer = create()) { } +[#1 Removal] = 0:26-0:27 + >-< +0| try (Foo bar = create()) { } -[#1 Domain] = 0:0-0:39 - >---------------------------------------< -0| try (PrintWriter writer = create()) { } +[#1 Domain] = 0:0-0:28 + >----------------------------< +0| try (Foo bar = create()) { } [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:5-0:34 - >-----------------------------< -0| try (PrintWriter writer = create()) { } +[#2 Removal] = 0:5-0:23 + >------------------< +0| try (Foo bar = create()) { } -[#2 Domain] = 0:4-0:35 - >-------------------------------< -0| try (PrintWriter writer = create()) { } +[#2 Domain] = 0:4-0:24 + >--------------------< +0| try (Foo bar = create()) { } [#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 0:33-0:33 - >< -0| try (PrintWriter writer = create()) { } +[#3 Removal] = 0:22-0:22 + >< +0| try (Foo bar = create()) { } -[#3 Domain] = 0:32-0:34 - >--< -0| try (PrintWriter writer = create()) { } +[#3 Domain] = 0:21-0:23 + >--< +0| try (Foo bar = create()) { } [#3 Insertion delimiter] = " " [#4 Content] = -[#4 Removal] = 0:37-0:38 - >-< -0| try (PrintWriter writer = create()) { } +[#4 Removal] = 0:26-0:27 + >-< +0| try (Foo bar = create()) { } -[#4 Domain] = 0:36-0:39 - >---< -0| try (PrintWriter writer = create()) { } +[#4 Domain] = 0:25-0:28 + >---< +0| try (Foo bar = create()) { } [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/interior/interior.static.scope b/data/fixtures/scopes/java/interior/interior.static.scope index ec5a85df74..ec08e00aa5 100644 --- a/data/fixtures/scopes/java/interior/interior.static.scope +++ b/data/fixtures/scopes/java/interior/interior.static.scope @@ -1,4 +1,4 @@ -class MyClass { +class Foo { static { } } --- @@ -7,16 +7,16 @@ class MyClass { >----------< 1| static { } -[#1 Removal] = 0:15-2:0 - > -0| class MyClass { +[#1 Removal] = 0:11-2:0 + > +0| class Foo { 1| static { } 2| } < [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { + >----------- +0| class Foo { 1| static { } 2| } -< @@ -28,16 +28,16 @@ class MyClass { >----------< 1| static { } -[#2 Removal] = 0:15-2:0 - > -0| class MyClass { +[#2 Removal] = 0:11-2:0 + > +0| class Foo { 1| static { } 2| } < -[#2 Domain] = 0:14-2:1 - >- -0| class MyClass { +[#2 Domain] = 0:10-2:1 + >- +0| class Foo { 1| static { } 2| } -< diff --git a/data/fixtures/scopes/java/interior/interior.switchCase2.scope b/data/fixtures/scopes/java/interior/interior.switchCase2.scope index d08b2d7795..a0e22c3b8b 100644 --- a/data/fixtures/scopes/java/interior/interior.switchCase2.scope +++ b/data/fixtures/scopes/java/interior/interior.switchCase2.scope @@ -1,40 +1,40 @@ -switch (value) { - case 0 -> foo; - case 1 -> bar; - default -> { - yield baz; - } +switch (foo) { + case 0 -> 1; + case 1 -> { + yield 2; + }; + default -> 3; } --- -[#1 Content] = 1:4-5:5 - >-------------- -1| case 0 -> foo; -2| case 1 -> bar; -3| default -> { -4| yield baz; -5| } - -----< - -[#1 Removal] = 0:16-6:0 - > -0| switch (value) { -1| case 0 -> foo; -2| case 1 -> bar; -3| default -> { -4| yield baz; -5| } +[#1 Content] = 1:4-5:17 + >------------ +1| case 0 -> 1; +2| case 1 -> { +3| yield 2; +4| }; +5| default -> 3; + -----------------< + +[#1 Removal] = 0:14-6:0 + > +0| switch (foo) { +1| case 0 -> 1; +2| case 1 -> { +3| yield 2; +4| }; +5| default -> 3; 6| } < [#1 Domain] = 0:0-6:1 - >---------------- -0| switch (value) { -1| case 0 -> foo; -2| case 1 -> bar; -3| default -> { -4| yield baz; -5| } + >-------------- +0| switch (foo) { +1| case 0 -> 1; +2| case 1 -> { +3| yield 2; +4| }; +5| default -> 3; 6| } -< @@ -42,45 +42,45 @@ switch (value) { [#2 Content] = -[#2 Removal] = 0:8-0:13 - >-----< -0| switch (value) { +[#2 Removal] = 0:8-0:11 + >---< +0| switch (foo) { -[#2 Domain] = 0:7-0:14 - >-------< -0| switch (value) { +[#2 Domain] = 0:7-0:12 + >-----< +0| switch (foo) { [#2 Insertion delimiter] = " " -[#3 Content] = 1:4-5:5 - >-------------- -1| case 0 -> foo; -2| case 1 -> bar; -3| default -> { -4| yield baz; -5| } - -----< - -[#3 Removal] = 0:16-6:0 - > -0| switch (value) { -1| case 0 -> foo; -2| case 1 -> bar; -3| default -> { -4| yield baz; -5| } +[#3 Content] = 1:4-5:17 + >------------ +1| case 0 -> 1; +2| case 1 -> { +3| yield 2; +4| }; +5| default -> 3; + -----------------< + +[#3 Removal] = 0:14-6:0 + > +0| switch (foo) { +1| case 0 -> 1; +2| case 1 -> { +3| yield 2; +4| }; +5| default -> 3; 6| } < -[#3 Domain] = 0:15-6:1 - >- -0| switch (value) { -1| case 0 -> foo; -2| case 1 -> bar; -3| default -> { -4| yield baz; -5| } +[#3 Domain] = 0:13-6:1 + >- +0| switch (foo) { +1| case 0 -> 1; +2| case 1 -> { +3| yield 2; +4| }; +5| default -> 3; 6| } -< @@ -88,66 +88,66 @@ switch (value) { [#4 Content] = -[#4 Removal] = 1:14-1:18 - >----< -1| case 0 -> foo; +[#4 Removal] = 1:14-1:16 + >--< +1| case 0 -> 1; -[#4 Domain] = 1:4-1:18 - >--------------< -1| case 0 -> foo; +[#4 Domain] = 1:4-1:16 + >------------< +1| case 0 -> 1; [#4 Insertion delimiter] = " " -[#5 Content] = -[#5 Removal] = 2:14-2:18 - >----< -2| case 1 -> bar; +[#5 Content] = 3:8-3:16 + >--------< +3| yield 2; -[#5 Domain] = 2:4-2:18 - >--------------< -2| case 1 -> bar; +[#5 Removal] = 2:15-4:4 + > +2| case 1 -> { +3| yield 2; +4| }; + ----< + +[#5 Domain] = 2:4-4:5 + >----------- +2| case 1 -> { +3| yield 2; +4| }; + -----< [#5 Insertion delimiter] = " " -[#6 Content] = 4:8-4:18 - >----------< -4| yield baz; +[#6 Content] = 3:8-3:16 + >--------< +3| yield 2; -[#6 Removal] = 3:16-5:4 - > -3| default -> { -4| yield baz; -5| } +[#6 Removal] = 2:15-4:4 + > +2| case 1 -> { +3| yield 2; +4| }; ----< -[#6 Domain] = 3:4-5:5 - >------------ -3| default -> { -4| yield baz; -5| } +[#6 Domain] = 2:14-4:5 + >- +2| case 1 -> { +3| yield 2; +4| }; -----< [#6 Insertion delimiter] = " " -[#7 Content] = 4:8-4:18 - >----------< -4| yield baz; +[#7 Content] = +[#7 Removal] = 5:15-5:17 + >--< +5| default -> 3; -[#7 Removal] = 3:16-5:4 - > -3| default -> { -4| yield baz; -5| } - ----< - -[#7 Domain] = 3:15-5:5 - >- -3| default -> { -4| yield baz; -5| } - -----< +[#7 Domain] = 5:4-5:17 + >-------------< +5| default -> 3; [#7 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/list.scope b/data/fixtures/scopes/java/list.scope index b69f66f00c..d6a1a10389 100644 --- a/data/fixtures/scopes/java/list.scope +++ b/data/fixtures/scopes/java/list.scope @@ -1,10 +1,17 @@ -new int[]{1, 2, 3}; +new int[] {aaa, bbb}; --- [Content] = -[Removal] = -[Domain] = 0:9-0:18 - >---------< -0| new int[]{1, 2, 3}; +[Domain] = 0:10-0:20 + >----------< +0| new int[] {aaa, bbb}; + +[Removal] = 0:9-0:20 + >-----------< +0| new int[] {aaa, bbb}; + +[Leading delimiter] = 0:9-0:10 + >-< +0| new int[] {aaa, bbb}; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.argument.catch.scope b/data/fixtures/scopes/java/name/name.argument.catch.scope index aeaeac26ef..2b2b145ffb 100644 --- a/data/fixtures/scopes/java/name/name.argument.catch.scope +++ b/data/fixtures/scopes/java/name/name.argument.catch.scope @@ -1,41 +1,41 @@ try {} -catch(final MyException ex) {} -catch(final Exception ex) {} +catch(final MyException e) {} +catch(final Exception e) {} --- -[#1 Content] = 1:24-1:26 - >--< -1| catch(final MyException ex) {} +[#1 Content] = 1:24-1:25 + >-< +1| catch(final MyException e) {} -[#1 Removal] = 1:23-1:26 - >---< -1| catch(final MyException ex) {} +[#1 Removal] = 1:23-1:25 + >--< +1| catch(final MyException e) {} [#1 Leading delimiter] = 1:23-1:24 >-< -1| catch(final MyException ex) {} +1| catch(final MyException e) {} -[#1 Domain] = 1:6-1:26 - >--------------------< -1| catch(final MyException ex) {} +[#1 Domain] = 1:6-1:25 + >-------------------< +1| catch(final MyException e) {} [#1 Insertion delimiter] = " " -[#2 Content] = 2:22-2:24 - >--< -2| catch(final Exception ex) {} +[#2 Content] = 2:22-2:23 + >-< +2| catch(final Exception e) {} -[#2 Removal] = 2:21-2:24 - >---< -2| catch(final Exception ex) {} +[#2 Removal] = 2:21-2:23 + >--< +2| catch(final Exception e) {} [#2 Leading delimiter] = 2:21-2:22 >-< -2| catch(final Exception ex) {} +2| catch(final Exception e) {} -[#2 Domain] = 2:6-2:24 - >------------------< -2| catch(final Exception ex) {} +[#2 Domain] = 2:6-2:23 + >-----------------< +2| catch(final Exception e) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/java/name/name.argument.formal.constructor.iteration.scope index 7fefcde510..bba8d304f1 100644 --- a/data/fixtures/scopes/java/name/name.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/java/name/name.argument.formal.constructor.iteration.scope @@ -1,27 +1,27 @@ -public class MyClass { - public MyClass(String name, int value) {} +public class Foo { + public Foo(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public MyClass(String name, int value) {} + >------------------ +0| public class Foo { +1| public Foo(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:22-2:0 - > -0| public class MyClass { -1| public MyClass(String name, int value) {} +[#2 Domain] = 0:18-2:0 + > +0| public class Foo { +1| public Foo(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:19-1:41 - >----------------------< -1| public MyClass(String name, int value) {} +[#3 Domain] = 1:15-1:31 + >----------------< +1| public Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/java/name/name.argument.formal.constructor.scope b/data/fixtures/scopes/java/name/name.argument.formal.constructor.scope index 30b58135a3..fe70ecd052 100644 --- a/data/fixtures/scopes/java/name/name.argument.formal.constructor.scope +++ b/data/fixtures/scopes/java/name/name.argument.formal.constructor.scope @@ -1,28 +1,28 @@ -public class MyClass { - public MyClass(String name, int value) {} +public class Foo { + public Foo(int aaa, int bbb) {} } --- -[#1 Content] = 0:13-0:20 - >-------< -0| public class MyClass { +[#1 Content] = 0:13-0:16 + >---< +0| public class Foo { -[#1 Removal] = 0:13-0:21 - >--------< -0| public class MyClass { +[#1 Removal] = 0:13-0:17 + >----< +0| public class Foo { [#1 Leading delimiter] = 0:12-0:13 >-< -0| public class MyClass { +0| public class Foo { -[#1 Trailing delimiter] = 0:20-0:21 - >-< -0| public class MyClass { +[#1 Trailing delimiter] = 0:16-0:17 + >-< +0| public class Foo { [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public MyClass(String name, int value) {} + >------------------ +0| public class Foo { +1| public Foo(int aaa, int bbb) {} 2| } -< @@ -30,54 +30,54 @@ public class MyClass { [#2 Content] = -[#2 Removal] = 1:11-1:18 - >-------< -1| public MyClass(String name, int value) {} +[#2 Removal] = 1:11-1:14 + >---< +1| public Foo(int aaa, int bbb) {} [#2 Leading delimiter] = 1:10-1:11 >-< -1| public MyClass(String name, int value) {} +1| public Foo(int aaa, int bbb) {} -[#2 Domain] = 1:4-1:45 - >-----------------------------------------< -1| public MyClass(String name, int value) {} +[#2 Domain] = 1:4-1:35 + >-------------------------------< +1| public Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:26-1:30 - >----< -1| public MyClass(String name, int value) {} +[#3 Content] = 1:19-1:22 + >---< +1| public Foo(int aaa, int bbb) {} -[#3 Removal] = 1:25-1:30 - >-----< -1| public MyClass(String name, int value) {} +[#3 Removal] = 1:18-1:22 + >----< +1| public Foo(int aaa, int bbb) {} -[#3 Leading delimiter] = 1:25-1:26 - >-< -1| public MyClass(String name, int value) {} +[#3 Leading delimiter] = 1:18-1:19 + >-< +1| public Foo(int aaa, int bbb) {} -[#3 Domain] = 1:19-1:30 - >-----------< -1| public MyClass(String name, int value) {} +[#3 Domain] = 1:15-1:22 + >-------< +1| public Foo(int aaa, int bbb) {} [#3 Insertion delimiter] = " " -[#4 Content] = 1:36-1:41 - >-----< -1| public MyClass(String name, int value) {} +[#4 Content] = 1:28-1:31 + >---< +1| public Foo(int aaa, int bbb) {} -[#4 Removal] = 1:35-1:41 - >------< -1| public MyClass(String name, int value) {} +[#4 Removal] = 1:27-1:31 + >----< +1| public Foo(int aaa, int bbb) {} -[#4 Leading delimiter] = 1:35-1:36 - >-< -1| public MyClass(String name, int value) {} +[#4 Leading delimiter] = 1:27-1:28 + >-< +1| public Foo(int aaa, int bbb) {} -[#4 Domain] = 1:32-1:41 - >---------< -1| public MyClass(String name, int value) {} +[#4 Domain] = 1:24-1:31 + >-------< +1| public Foo(int aaa, int bbb) {} [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/java/name/name.argument.formal.method.iteration.scope index 0cc563a6d2..d89a8a0cd4 100644 --- a/data/fixtures/scopes/java/name/name.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/java/name/name.argument.formal.method.iteration.scope @@ -1,27 +1,27 @@ -public class MyClass { - public void foo(String name, int value) {} +public class Foo { + public void bar(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public void foo(String name, int value) {} + >------------------ +0| public class Foo { +1| public void bar(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:22-2:0 - > -0| public class MyClass { -1| public void foo(String name, int value) {} +[#2 Domain] = 0:18-2:0 + > +0| public class Foo { +1| public void bar(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:20-1:42 - >----------------------< -1| public void foo(String name, int value) {} +[#3 Domain] = 1:20-1:36 + >----------------< +1| public void bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/java/name/name.argument.formal.method.scope b/data/fixtures/scopes/java/name/name.argument.formal.method.scope index 123d38ee89..a915c1e5ab 100644 --- a/data/fixtures/scopes/java/name/name.argument.formal.method.scope +++ b/data/fixtures/scopes/java/name/name.argument.formal.method.scope @@ -1,28 +1,28 @@ -public class MyClass { - public void foo(String name, int value) {} +public class Foo { + public void foo(int aaa, int bbb) {} } --- -[#1 Content] = 0:13-0:20 - >-------< -0| public class MyClass { +[#1 Content] = 0:13-0:16 + >---< +0| public class Foo { -[#1 Removal] = 0:13-0:21 - >--------< -0| public class MyClass { +[#1 Removal] = 0:13-0:17 + >----< +0| public class Foo { [#1 Leading delimiter] = 0:12-0:13 >-< -0| public class MyClass { +0| public class Foo { -[#1 Trailing delimiter] = 0:20-0:21 - >-< -0| public class MyClass { +[#1 Trailing delimiter] = 0:16-0:17 + >-< +0| public class Foo { [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public void foo(String name, int value) {} + >------------------ +0| public class Foo { +1| public void foo(int aaa, int bbb) {} 2| } -< @@ -32,52 +32,52 @@ public class MyClass { [#2 Content] = [#2 Removal] = 1:16-1:19 >---< -1| public void foo(String name, int value) {} +1| public void foo(int aaa, int bbb) {} [#2 Leading delimiter] = 1:15-1:16 >-< -1| public void foo(String name, int value) {} +1| public void foo(int aaa, int bbb) {} -[#2 Domain] = 1:4-1:46 - >------------------------------------------< -1| public void foo(String name, int value) {} +[#2 Domain] = 1:4-1:40 + >------------------------------------< +1| public void foo(int aaa, int bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:27-1:31 - >----< -1| public void foo(String name, int value) {} +[#3 Content] = 1:24-1:27 + >---< +1| public void foo(int aaa, int bbb) {} -[#3 Removal] = 1:26-1:31 - >-----< -1| public void foo(String name, int value) {} +[#3 Removal] = 1:23-1:27 + >----< +1| public void foo(int aaa, int bbb) {} -[#3 Leading delimiter] = 1:26-1:27 - >-< -1| public void foo(String name, int value) {} +[#3 Leading delimiter] = 1:23-1:24 + >-< +1| public void foo(int aaa, int bbb) {} -[#3 Domain] = 1:20-1:31 - >-----------< -1| public void foo(String name, int value) {} +[#3 Domain] = 1:20-1:27 + >-------< +1| public void foo(int aaa, int bbb) {} [#3 Insertion delimiter] = " " -[#4 Content] = 1:37-1:42 - >-----< -1| public void foo(String name, int value) {} +[#4 Content] = 1:33-1:36 + >---< +1| public void foo(int aaa, int bbb) {} -[#4 Removal] = 1:36-1:42 - >------< -1| public void foo(String name, int value) {} +[#4 Removal] = 1:32-1:36 + >----< +1| public void foo(int aaa, int bbb) {} -[#4 Leading delimiter] = 1:36-1:37 - >-< -1| public void foo(String name, int value) {} +[#4 Leading delimiter] = 1:32-1:33 + >-< +1| public void foo(int aaa, int bbb) {} -[#4 Domain] = 1:33-1:42 - >---------< -1| public void foo(String name, int value) {} +[#4 Domain] = 1:29-1:36 + >-------< +1| public void foo(int aaa, int bbb) {} [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.assignment.scope b/data/fixtures/scopes/java/name/name.assignment.scope index f18bb86183..d516138753 100644 --- a/data/fixtures/scopes/java/name/name.assignment.scope +++ b/data/fixtures/scopes/java/name/name.assignment.scope @@ -1,20 +1,20 @@ -value = 123; +foo = 0; --- -[Content] = 0:0-0:5 - >-----< -0| value = 123; +[Content] = 0:0-0:3 + >---< +0| foo = 0; -[Removal] = 0:0-0:8 - >--------< -0| value = 123; +[Removal] = 0:0-0:6 + >------< +0| foo = 0; -[Trailing delimiter] = 0:5-0:8 - >---< -0| value = 123; +[Trailing delimiter] = 0:3-0:6 + >---< +0| foo = 0; -[Domain] = 0:0-0:12 - >------------< -0| value = 123; +[Domain] = 0:0-0:8 + >--------< +0| foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.constructor.scope b/data/fixtures/scopes/java/name/name.constructor.scope index 9b6a51c2f9..b04a0f78bc 100644 --- a/data/fixtures/scopes/java/name/name.constructor.scope +++ b/data/fixtures/scopes/java/name/name.constructor.scope @@ -1,28 +1,28 @@ -public class MyClass { - public MyClass() { } +public class Foo { + public Foo() {} } --- -[#1 Content] = 0:13-0:20 - >-------< -0| public class MyClass { +[#1 Content] = 0:13-0:16 + >---< +0| public class Foo { -[#1 Removal] = 0:13-0:21 - >--------< -0| public class MyClass { +[#1 Removal] = 0:13-0:17 + >----< +0| public class Foo { [#1 Leading delimiter] = 0:12-0:13 >-< -0| public class MyClass { +0| public class Foo { -[#1 Trailing delimiter] = 0:20-0:21 - >-< -0| public class MyClass { +[#1 Trailing delimiter] = 0:16-0:17 + >-< +0| public class Foo { [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public MyClass() { } + >------------------ +0| public class Foo { +1| public Foo() {} 2| } -< @@ -30,16 +30,16 @@ public class MyClass { [#2 Content] = -[#2 Removal] = 1:11-1:18 - >-------< -1| public MyClass() { } +[#2 Removal] = 1:11-1:14 + >---< +1| public Foo() {} [#2 Leading delimiter] = 1:10-1:11 >-< -1| public MyClass() { } +1| public Foo() {} -[#2 Domain] = 1:4-1:24 - >--------------------< -1| public MyClass() { } +[#2 Domain] = 1:4-1:19 + >---------------< +1| public Foo() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.foreach.scope b/data/fixtures/scopes/java/name/name.foreach.scope index 82b3a98f98..41c44999f0 100644 --- a/data/fixtures/scopes/java/name/name.foreach.scope +++ b/data/fixtures/scopes/java/name/name.foreach.scope @@ -1,29 +1,24 @@ -for (final Item item : items) { - -} +for (final int v : values) {} --- -[Content] = 0:16-0:20 - >----< -0| for (final Item item : items) { +[Content] = 0:15-0:16 + >-< +0| for (final int v : values) {} -[Removal] = 0:16-0:21 - >-----< -0| for (final Item item : items) { +[Removal] = 0:15-0:17 + >--< +0| for (final int v : values) {} -[Leading delimiter] = 0:15-0:16 - >-< -0| for (final Item item : items) { +[Leading delimiter] = 0:14-0:15 + >-< +0| for (final int v : values) {} -[Trailing delimiter] = 0:20-0:21 - >-< -0| for (final Item item : items) { +[Trailing delimiter] = 0:16-0:17 + >-< +0| for (final int v : values) {} -[Domain] = 0:0-2:1 - >------------------------------- -0| for (final Item item : items) { -1| -2| } - -< +[Domain] = 0:0-0:29 + >-----------------------------< +0| for (final int v : values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.method.scope b/data/fixtures/scopes/java/name/name.method.scope index e31d1facd0..b96d3d40a8 100644 --- a/data/fixtures/scopes/java/name/name.method.scope +++ b/data/fixtures/scopes/java/name/name.method.scope @@ -1,28 +1,28 @@ -public class MyClass { - public void foo() { } +public class Foo { + public void bar() {} } --- -[#1 Content] = 0:13-0:20 - >-------< -0| public class MyClass { +[#1 Content] = 0:13-0:16 + >---< +0| public class Foo { -[#1 Removal] = 0:13-0:21 - >--------< -0| public class MyClass { +[#1 Removal] = 0:13-0:17 + >----< +0| public class Foo { [#1 Leading delimiter] = 0:12-0:13 >-< -0| public class MyClass { +0| public class Foo { -[#1 Trailing delimiter] = 0:20-0:21 - >-< -0| public class MyClass { +[#1 Trailing delimiter] = 0:16-0:17 + >-< +0| public class Foo { [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public void foo() { } + >------------------ +0| public class Foo { +1| public void bar() {} 2| } -< @@ -32,14 +32,14 @@ public class MyClass { [#2 Content] = [#2 Removal] = 1:16-1:19 >---< -1| public void foo() { } +1| public void bar() {} [#2 Leading delimiter] = 1:15-1:16 >-< -1| public void foo() { } +1| public void bar() {} -[#2 Domain] = 1:4-1:25 - >---------------------< -1| public void foo() { } +[#2 Domain] = 1:4-1:24 + >--------------------< +1| public void bar() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.resource.scope b/data/fixtures/scopes/java/name/name.resource.scope index ad10cad11b..9ebc6d62c1 100644 --- a/data/fixtures/scopes/java/name/name.resource.scope +++ b/data/fixtures/scopes/java/name/name.resource.scope @@ -1,24 +1,24 @@ -try (PrintWriter writer = create()) { } +try (Foo foo = create()) {} --- -[Content] = 0:17-0:23 - >------< -0| try (PrintWriter writer = create()) { } +[Content] = 0:9-0:12 + >---< +0| try (Foo foo = create()) {} -[Removal] = 0:17-0:24 - >-------< -0| try (PrintWriter writer = create()) { } +[Removal] = 0:9-0:13 + >----< +0| try (Foo foo = create()) {} -[Leading delimiter] = 0:16-0:17 - >-< -0| try (PrintWriter writer = create()) { } +[Leading delimiter] = 0:8-0:9 + >-< +0| try (Foo foo = create()) {} -[Trailing delimiter] = 0:23-0:24 - >-< -0| try (PrintWriter writer = create()) { } +[Trailing delimiter] = 0:12-0:13 + >-< +0| try (Foo foo = create()) {} -[Domain] = 0:0-0:39 - >---------------------------------------< -0| try (PrintWriter writer = create()) { } +[Domain] = 0:0-0:27 + >---------------------------< +0| try (Foo foo = create()) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/name/name.variable.scope b/data/fixtures/scopes/java/name/name.variable.scope index 6c908fcf08..eadef68728 100644 --- a/data/fixtures/scopes/java/name/name.variable.scope +++ b/data/fixtures/scopes/java/name/name.variable.scope @@ -1,20 +1,20 @@ -int value = 123; +int foo = 0; --- -[Content] = 0:4-0:9 - >-----< -0| int value = 123; +[Content] = 0:4-0:7 + >---< +0| int foo = 0; -[Removal] = 0:4-0:12 - >--------< -0| int value = 123; +[Removal] = 0:4-0:10 + >------< +0| int foo = 0; -[Trailing delimiter] = 0:9-0:12 - >---< -0| int value = 123; +[Trailing delimiter] = 0:7-0:10 + >---< +0| int foo = 0; -[Domain] = 0:0-0:16 - >----------------< -0| int value = 123; +[Domain] = 0:0-0:12 + >------------< +0| int foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/namedFunction.constructor.scope b/data/fixtures/scopes/java/namedFunction.constructor.scope index e683eae9c7..0d0953bad4 100644 --- a/data/fixtures/scopes/java/namedFunction.constructor.scope +++ b/data/fixtures/scopes/java/namedFunction.constructor.scope @@ -1,21 +1,21 @@ -public class MyClass { - public MyClass() { } +public class Foo { + public Foo() {} } --- [Content] = -[Domain] = 1:4-1:24 - >--------------------< -1| public MyClass() { } +[Domain] = 1:4-1:19 + >---------------< +1| public Foo() {} [Removal] = 1:0-2:0 - >------------------------ -1| public MyClass() { } + >------------------- +1| public Foo() {} 2| } < [Leading delimiter] = 1:0-1:4 >----< -1| public MyClass() { } +1| public Foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/java/namedFunction.constructor2.scope b/data/fixtures/scopes/java/namedFunction.constructor2.scope new file mode 100644 index 0000000000..13a45c0463 --- /dev/null +++ b/data/fixtures/scopes/java/namedFunction.constructor2.scope @@ -0,0 +1,25 @@ +public class Foo { + @bar + public Foo() {} +} +--- + +[Content] = +[Domain] = 1:4-2:19 + >---- +1| @bar +2| public Foo() {} + -------------------< + +[Removal] = 1:0-3:0 + >-------- +1| @bar +2| public Foo() {} +3| } + < + +[Leading delimiter] = 1:0-1:4 + >----< +1| @bar + +[Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/java/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/java/namedFunction.method.iteration.class.scope index efc0d7bd94..aaf1f0f34f 100644 --- a/data/fixtures/scopes/java/namedFunction.method.iteration.class.scope +++ b/data/fixtures/scopes/java/namedFunction.method.iteration.class.scope @@ -1,7 +1,7 @@ -class MyClass { } +class Foo { } --- [Content] = -[Domain] = 0:15-0:16 - >-< -0| class MyClass { } +[Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/java/namedFunction.method.scope b/data/fixtures/scopes/java/namedFunction.method.scope index cd7412a16f..dd681cd791 100644 --- a/data/fixtures/scopes/java/namedFunction.method.scope +++ b/data/fixtures/scopes/java/namedFunction.method.scope @@ -1,21 +1,21 @@ -public class MyClass { - public void foo() { } +public class Foo { + public void bar() {} } --- [Content] = -[Domain] = 1:4-1:25 - >---------------------< -1| public void foo() { } +[Domain] = 1:4-1:24 + >--------------------< +1| public void bar() {} [Removal] = 1:0-2:0 - >------------------------- -1| public void foo() { } + >------------------------ +1| public void bar() {} 2| } < [Leading delimiter] = 1:0-1:4 >----< -1| public void foo() { } +1| public void bar() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/java/namedFunction.method2.scope b/data/fixtures/scopes/java/namedFunction.method2.scope new file mode 100644 index 0000000000..877c7afe23 --- /dev/null +++ b/data/fixtures/scopes/java/namedFunction.method2.scope @@ -0,0 +1,25 @@ +public class Foo { + @baz + public void bar() {} +} +--- + +[Content] = +[Domain] = 1:4-2:24 + >---- +1| @baz +2| public void bar() {} + ------------------------< + +[Removal] = 1:0-3:0 + >-------- +1| @baz +2| public void bar() {} +3| } + < + +[Leading delimiter] = 1:0-1:4 + >----< +1| @baz + +[Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/java/statement/statement.class2.scope b/data/fixtures/scopes/java/statement/statement.class2.scope index a6008d311f..2676bb1634 100644 --- a/data/fixtures/scopes/java/statement/statement.class2.scope +++ b/data/fixtures/scopes/java/statement/statement.class2.scope @@ -1,10 +1,13 @@ +@bar class Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:12 - >------------< -0| class Foo {} +[Domain] = 0:0-1:12 + >---- +0| @bar +1| class Foo {} + ------------< [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/statement/statement.scope b/data/fixtures/scopes/java/statement/statement.scope index f64174b953..be2d642f7d 100644 --- a/data/fixtures/scopes/java/statement/statement.scope +++ b/data/fixtures/scopes/java/statement/statement.scope @@ -1,10 +1,10 @@ -if (true) { } +int foo = 0; --- [Content] = [Removal] = -[Domain] = 0:0-0:13 - >-------------< -0| if (true) { } +[Domain] = 0:0-0:12 + >------------< +0| int foo = 0; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/java/textFragment.comment.block2.scope b/data/fixtures/scopes/java/textFragment.comment.block2.scope new file mode 100644 index 0000000000..396e9267dc --- /dev/null +++ b/data/fixtures/scopes/java/textFragment.comment.block2.scope @@ -0,0 +1,10 @@ +/** Hello world */ +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:18 + >------------------< +0| /** Hello world */ + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.argument.catch.scope b/data/fixtures/scopes/java/type/type.argument.catch.scope index 14d276134e..b9b46451af 100644 --- a/data/fixtures/scopes/java/type/type.argument.catch.scope +++ b/data/fixtures/scopes/java/type/type.argument.catch.scope @@ -1,49 +1,49 @@ try {} -catch(final MyException ex) {} -catch(final Exception ex) {} +catch(final MyException e) {} +catch(final Exception e) {} --- [#1 Content] = 1:12-1:23 >-----------< -1| catch(final MyException ex) {} +1| catch(final MyException e) {} [#1 Removal] = 1:12-1:24 >------------< -1| catch(final MyException ex) {} +1| catch(final MyException e) {} [#1 Leading delimiter] = 1:11-1:12 >-< -1| catch(final MyException ex) {} +1| catch(final MyException e) {} [#1 Trailing delimiter] = 1:23-1:24 >-< -1| catch(final MyException ex) {} +1| catch(final MyException e) {} -[#1 Domain] = 1:6-1:26 - >--------------------< -1| catch(final MyException ex) {} +[#1 Domain] = 1:6-1:25 + >-------------------< +1| catch(final MyException e) {} [#1 Insertion delimiter] = " " [#2 Content] = 2:12-2:21 >---------< -2| catch(final Exception ex) {} +2| catch(final Exception e) {} [#2 Removal] = 2:12-2:22 >----------< -2| catch(final Exception ex) {} +2| catch(final Exception e) {} [#2 Leading delimiter] = 2:11-2:12 >-< -2| catch(final Exception ex) {} +2| catch(final Exception e) {} [#2 Trailing delimiter] = 2:21-2:22 >-< -2| catch(final Exception ex) {} +2| catch(final Exception e) {} -[#2 Domain] = 2:6-2:24 - >------------------< -2| catch(final Exception ex) {} +[#2 Domain] = 2:6-2:23 + >-----------------< +2| catch(final Exception e) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/java/type/type.argument.formal.constructor.iteration.scope index a62cf42616..bba8d304f1 100644 --- a/data/fixtures/scopes/java/type/type.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/java/type/type.argument.formal.constructor.iteration.scope @@ -1,27 +1,27 @@ -public class MyClass { - public MyClass(String name, int age) {} +public class Foo { + public Foo(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public MyClass(String name, int age) {} + >------------------ +0| public class Foo { +1| public Foo(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:22-2:0 - > -0| public class MyClass { -1| public MyClass(String name, int age) {} +[#2 Domain] = 0:18-2:0 + > +0| public class Foo { +1| public Foo(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:19-1:39 - >--------------------< -1| public MyClass(String name, int age) {} +[#3 Domain] = 1:15-1:31 + >----------------< +1| public Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/java/type/type.argument.formal.constructor.scope b/data/fixtures/scopes/java/type/type.argument.formal.constructor.scope index ff576258e6..a89eef87dd 100644 --- a/data/fixtures/scopes/java/type/type.argument.formal.constructor.scope +++ b/data/fixtures/scopes/java/type/type.argument.formal.constructor.scope @@ -1,38 +1,57 @@ -public class MyClass { - public MyClass(final int value) {} +public class Foo { + public Foo(int aaa, int bbb) {} } --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public MyClass(final int value) {} + >------------------ +0| public class Foo { +1| public Foo(int aaa, int bbb) {} 2| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:25-1:28 - >---< -1| public MyClass(final int value) {} +[#2 Content] = 1:15-1:18 + >---< +1| public Foo(int aaa, int bbb) {} -[#2 Removal] = 1:25-1:29 - >----< -1| public MyClass(final int value) {} +[#2 Removal] = 1:15-1:19 + >----< +1| public Foo(int aaa, int bbb) {} -[#2 Leading delimiter] = 1:24-1:25 - >-< -1| public MyClass(final int value) {} +[#2 Trailing delimiter] = 1:18-1:19 + >-< +1| public Foo(int aaa, int bbb) {} -[#2 Trailing delimiter] = 1:28-1:29 - >-< -1| public MyClass(final int value) {} - -[#2 Domain] = 1:19-1:34 - >---------------< -1| public MyClass(final int value) {} +[#2 Domain] = 1:15-1:22 + >-------< +1| public Foo(int aaa, int bbb) {} [#2 Insertion delimiter] = " " + + +[#3 Content] = 1:24-1:27 + >---< +1| public Foo(int aaa, int bbb) {} + +[#3 Removal] = 1:24-1:28 + >----< +1| public Foo(int aaa, int bbb) {} + +[#3 Leading delimiter] = 1:23-1:24 + >-< +1| public Foo(int aaa, int bbb) {} + +[#3 Trailing delimiter] = 1:27-1:28 + >-< +1| public Foo(int aaa, int bbb) {} + +[#3 Domain] = 1:24-1:31 + >-------< +1| public Foo(int aaa, int bbb) {} + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/java/type/type.argument.formal.method.iteration.scope index 7e55d136e6..d89a8a0cd4 100644 --- a/data/fixtures/scopes/java/type/type.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/java/type/type.argument.formal.method.iteration.scope @@ -1,27 +1,27 @@ -public class MyClass { - public void foo(String name, int age) {} +public class Foo { + public void bar(int aaa, int bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public void foo(String name, int age) {} + >------------------ +0| public class Foo { +1| public void bar(int aaa, int bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:22-2:0 - > -0| public class MyClass { -1| public void foo(String name, int age) {} +[#2 Domain] = 0:18-2:0 + > +0| public class Foo { +1| public void bar(int aaa, int bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:20-1:40 - >--------------------< -1| public void foo(String name, int age) {} +[#3 Domain] = 1:20-1:36 + >----------------< +1| public void bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/java/type/type.argument.formal.method.scope b/data/fixtures/scopes/java/type/type.argument.formal.method.scope index 51cdda94c6..05ad52d8e8 100644 --- a/data/fixtures/scopes/java/type/type.argument.formal.method.scope +++ b/data/fixtures/scopes/java/type/type.argument.formal.method.scope @@ -1,14 +1,14 @@ -public class MyClass { - public void foo(final int value) {} +public class Foo { + public void bar(int aaa, int bbb) {} } --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-2:1 - >---------------------- -0| public class MyClass { -1| public void foo(final int value) {} + >------------------ +0| public class Foo { +1| public void bar(int aaa, int bbb) {} 2| } -< @@ -17,45 +17,64 @@ public class MyClass { [#2 Content] = 1:11-1:15 >----< -1| public void foo(final int value) {} +1| public void bar(int aaa, int bbb) {} [#2 Removal] = 1:11-1:16 >-----< -1| public void foo(final int value) {} +1| public void bar(int aaa, int bbb) {} [#2 Leading delimiter] = 1:10-1:11 >-< -1| public void foo(final int value) {} +1| public void bar(int aaa, int bbb) {} [#2 Trailing delimiter] = 1:15-1:16 >-< -1| public void foo(final int value) {} +1| public void bar(int aaa, int bbb) {} -[#2 Domain] = 1:4-1:39 - >-----------------------------------< -1| public void foo(final int value) {} +[#2 Domain] = 1:4-1:40 + >------------------------------------< +1| public void bar(int aaa, int bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:26-1:29 - >---< -1| public void foo(final int value) {} +[#3 Content] = 1:20-1:23 + >---< +1| public void bar(int aaa, int bbb) {} -[#3 Removal] = 1:26-1:30 - >----< -1| public void foo(final int value) {} +[#3 Removal] = 1:20-1:24 + >----< +1| public void bar(int aaa, int bbb) {} -[#3 Leading delimiter] = 1:25-1:26 - >-< -1| public void foo(final int value) {} +[#3 Trailing delimiter] = 1:23-1:24 + >-< +1| public void bar(int aaa, int bbb) {} -[#3 Trailing delimiter] = 1:29-1:30 - >-< -1| public void foo(final int value) {} - -[#3 Domain] = 1:20-1:35 - >---------------< -1| public void foo(final int value) {} +[#3 Domain] = 1:20-1:27 + >-------< +1| public void bar(int aaa, int bbb) {} [#3 Insertion delimiter] = " " + + +[#4 Content] = 1:29-1:32 + >---< +1| public void bar(int aaa, int bbb) {} + +[#4 Removal] = 1:29-1:33 + >----< +1| public void bar(int aaa, int bbb) {} + +[#4 Leading delimiter] = 1:28-1:29 + >-< +1| public void bar(int aaa, int bbb) {} + +[#4 Trailing delimiter] = 1:32-1:33 + >-< +1| public void bar(int aaa, int bbb) {} + +[#4 Domain] = 1:29-1:36 + >-------< +1| public void bar(int aaa, int bbb) {} + +[#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.cast.scope b/data/fixtures/scopes/java/type/type.cast.scope index e6cff4d001..38a2f1808f 100644 --- a/data/fixtures/scopes/java/type/type.cast.scope +++ b/data/fixtures/scopes/java/type/type.cast.scope @@ -1,16 +1,16 @@ -(int)5; +(int)foo; --- [Content] = 0:1-0:4 >---< -0| (int)5; +0| (int)foo; [Removal] = 0:0-0:5 >-----< -0| (int)5; +0| (int)foo; -[Domain] = 0:0-0:6 - >------< -0| (int)5; +[Domain] = 0:0-0:8 + >--------< +0| (int)foo; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.class.scope b/data/fixtures/scopes/java/type/type.class.scope index f5a6c14b1e..cbba1c27c1 100644 --- a/data/fixtures/scopes/java/type/type.class.scope +++ b/data/fixtures/scopes/java/type/type.class.scope @@ -1,10 +1,10 @@ -public class MyClass { } +public class Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:24 - >------------------------< -0| public class MyClass { } +[Domain] = 0:0-0:19 + >-------------------< +0| public class Foo {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.foreach.scope b/data/fixtures/scopes/java/type/type.foreach.scope index 8d68f3643e..f6467c2e11 100644 --- a/data/fixtures/scopes/java/type/type.foreach.scope +++ b/data/fixtures/scopes/java/type/type.foreach.scope @@ -1,29 +1,24 @@ -for (final Item item : items) { - -} +for (final int v : values) {} --- -[Content] = 0:11-0:15 - >----< -0| for (final Item item : items) { +[Content] = 0:11-0:14 + >---< +0| for (final int v : values) {} -[Removal] = 0:11-0:16 - >-----< -0| for (final Item item : items) { +[Removal] = 0:11-0:15 + >----< +0| for (final int v : values) {} [Leading delimiter] = 0:10-0:11 >-< -0| for (final Item item : items) { +0| for (final int v : values) {} -[Trailing delimiter] = 0:15-0:16 - >-< -0| for (final Item item : items) { +[Trailing delimiter] = 0:14-0:15 + >-< +0| for (final int v : values) {} -[Domain] = 0:0-2:1 - >------------------------------- -0| for (final Item item : items) { -1| -2| } - -< +[Domain] = 0:0-0:29 + >-----------------------------< +0| for (final int v : values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.interface.scope b/data/fixtures/scopes/java/type/type.interface.scope index 252521a5af..1804eab111 100644 --- a/data/fixtures/scopes/java/type/type.interface.scope +++ b/data/fixtures/scopes/java/type/type.interface.scope @@ -1,10 +1,10 @@ -public interface Value { } +public interface Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:26 - >--------------------------< -0| public interface Value { } +[Domain] = 0:0-0:23 + >-----------------------< +0| public interface Foo {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.resource.scope b/data/fixtures/scopes/java/type/type.resource.scope index 04bebd6037..42cd318075 100644 --- a/data/fixtures/scopes/java/type/type.resource.scope +++ b/data/fixtures/scopes/java/type/type.resource.scope @@ -1,20 +1,20 @@ -try (PrintWriter writer = create()) { } +try (Foo foo = create()) {} --- -[Content] = 0:5-0:16 - >-----------< -0| try (PrintWriter writer = create()) { } +[Content] = 0:5-0:8 + >---< +0| try (Foo foo = create()) {} -[Removal] = 0:5-0:17 - >------------< -0| try (PrintWriter writer = create()) { } +[Removal] = 0:5-0:9 + >----< +0| try (Foo foo = create()) {} -[Trailing delimiter] = 0:16-0:17 - >-< -0| try (PrintWriter writer = create()) { } +[Trailing delimiter] = 0:8-0:9 + >-< +0| try (Foo foo = create()) {} -[Domain] = 0:0-0:39 - >---------------------------------------< -0| try (PrintWriter writer = create()) { } +[Domain] = 0:0-0:27 + >---------------------------< +0| try (Foo foo = create()) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.return.scope b/data/fixtures/scopes/java/type/type.return.scope index 1e834fba4c..74a68959c5 100644 --- a/data/fixtures/scopes/java/type/type.return.scope +++ b/data/fixtures/scopes/java/type/type.return.scope @@ -1,19 +1,15 @@ -public class MyClass { - public int myFunk() { - return 123; - } +public class Foo { + public int foo() {} } --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 0:0-4:1 - >---------------------- -0| public class MyClass { -1| public int myFunk() { -2| return 123; -3| } -4| } +[#1 Domain] = 0:0-2:1 + >------------------ +0| public class Foo { +1| public int foo() {} +2| } -< [#1 Insertion delimiter] = " " @@ -21,25 +17,22 @@ public class MyClass { [#2 Content] = 1:11-1:14 >---< -1| public int myFunk() { +1| public int foo() {} [#2 Removal] = 1:11-1:15 >----< -1| public int myFunk() { +1| public int foo() {} [#2 Leading delimiter] = 1:10-1:11 >-< -1| public int myFunk() { +1| public int foo() {} [#2 Trailing delimiter] = 1:14-1:15 >-< -1| public int myFunk() { - -[#2 Domain] = 1:4-3:5 - >--------------------- -1| public int myFunk() { -2| return 123; -3| } - -----< +1| public int foo() {} + +[#2 Domain] = 1:4-1:23 + >-------------------< +1| public int foo() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/type/type.variable2.scope b/data/fixtures/scopes/java/type/type.variable2.scope index a2c664ab43..8f8fe619f1 100644 --- a/data/fixtures/scopes/java/type/type.variable2.scope +++ b/data/fixtures/scopes/java/type/type.variable2.scope @@ -1,20 +1,20 @@ -int value = 123; +int value = 0; --- [Content] = 0:0-0:3 >---< -0| int value = 123; +0| int value = 0; [Removal] = 0:0-0:4 >----< -0| int value = 123; +0| int value = 0; [Trailing delimiter] = 0:3-0:4 >-< -0| int value = 123; +0| int value = 0; -[Domain] = 0:0-0:16 - >----------------< -0| int value = 123; +[Domain] = 0:0-0:14 + >--------------< +0| int value = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/value/value.assignment.scope b/data/fixtures/scopes/java/value/value.assignment.scope index 98eac669f7..a614198096 100644 --- a/data/fixtures/scopes/java/value/value.assignment.scope +++ b/data/fixtures/scopes/java/value/value.assignment.scope @@ -1,20 +1,20 @@ -value = 123; +foo = 0; --- -[Content] = 0:8-0:11 - >---< -0| value = 123; +[Content] = 0:6-0:7 + >-< +0| foo = 0; -[Removal] = 0:5-0:11 - >------< -0| value = 123; +[Removal] = 0:3-0:7 + >----< +0| foo = 0; -[Leading delimiter] = 0:5-0:8 - >---< -0| value = 123; +[Leading delimiter] = 0:3-0:6 + >---< +0| foo = 0; -[Domain] = 0:0-0:12 - >------------< -0| value = 123; +[Domain] = 0:0-0:8 + >--------< +0| foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/value/value.assignment2.scope b/data/fixtures/scopes/java/value/value.assignment2.scope new file mode 100644 index 0000000000..8dbdfaf55e --- /dev/null +++ b/data/fixtures/scopes/java/value/value.assignment2.scope @@ -0,0 +1,20 @@ +foo += 0; +--- + +[Content] = 0:7-0:8 + >-< +0| foo += 0; + +[Removal] = 0:3-0:8 + >-----< +0| foo += 0; + +[Leading delimiter] = 0:3-0:7 + >----< +0| foo += 0; + +[Domain] = 0:0-0:9 + >---------< +0| foo += 0; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/value/value.field.class.scope b/data/fixtures/scopes/java/value/value.field.class.scope index 5bc27b44b0..f57cea96d8 100644 --- a/data/fixtures/scopes/java/value/value.field.class.scope +++ b/data/fixtures/scopes/java/value/value.field.class.scope @@ -1,22 +1,22 @@ public class Foo { - private int value = 123; + private int bar = 0; } --- -[Content] = 1:24-1:27 - >---< -1| private int value = 123; +[Content] = 1:22-1:23 + >-< +1| private int bar = 0; -[Removal] = 1:21-1:27 - >------< -1| private int value = 123; +[Removal] = 1:19-1:23 + >----< +1| private int bar = 0; -[Leading delimiter] = 1:21-1:24 - >---< -1| private int value = 123; +[Leading delimiter] = 1:19-1:22 + >---< +1| private int bar = 0; -[Domain] = 1:4-1:28 - >------------------------< -1| private int value = 123; +[Domain] = 1:4-1:24 + >--------------------< +1| private int bar = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/value/value.foreach.scope b/data/fixtures/scopes/java/value/value.foreach.scope index 9ab4bd49c1..72b517046f 100644 --- a/data/fixtures/scopes/java/value/value.foreach.scope +++ b/data/fixtures/scopes/java/value/value.foreach.scope @@ -1,25 +1,20 @@ -for (final Item item : items) { - -} +for (final int v : values) {} --- -[Content] = 0:23-0:28 - >-----< -0| for (final Item item : items) { +[Content] = 0:19-0:25 + >------< +0| for (final int v : values) {} -[Removal] = 0:22-0:28 - >------< -0| for (final Item item : items) { +[Removal] = 0:18-0:25 + >-------< +0| for (final int v : values) {} -[Leading delimiter] = 0:22-0:23 - >-< -0| for (final Item item : items) { +[Leading delimiter] = 0:18-0:19 + >-< +0| for (final int v : values) {} -[Domain] = 0:0-2:1 - >------------------------------- -0| for (final Item item : items) { -1| -2| } - -< +[Domain] = 0:0-0:29 + >-----------------------------< +0| for (final int v : values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/value/value.resource.scope b/data/fixtures/scopes/java/value/value.resource.scope index 6f3714c08e..6d665a6fbb 100644 --- a/data/fixtures/scopes/java/value/value.resource.scope +++ b/data/fixtures/scopes/java/value/value.resource.scope @@ -1,20 +1,20 @@ -try (PrintWriter writer = create()) { } +try (Foo foo = create()) {} --- -[Content] = 0:26-0:34 - >--------< -0| try (PrintWriter writer = create()) { } +[Content] = 0:15-0:23 + >--------< +0| try (Foo foo = create()) {} -[Removal] = 0:25-0:34 - >---------< -0| try (PrintWriter writer = create()) { } +[Removal] = 0:14-0:23 + >---------< +0| try (Foo foo = create()) {} -[Leading delimiter] = 0:25-0:26 - >-< -0| try (PrintWriter writer = create()) { } +[Leading delimiter] = 0:14-0:15 + >-< +0| try (Foo foo = create()) {} -[Domain] = 0:0-0:39 - >---------------------------------------< -0| try (PrintWriter writer = create()) { } +[Domain] = 0:0-0:27 + >---------------------------< +0| try (Foo foo = create()) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/value/value.return.scope b/data/fixtures/scopes/java/value/value.return.scope index e30150b26d..090ac15b9d 100644 --- a/data/fixtures/scopes/java/value/value.return.scope +++ b/data/fixtures/scopes/java/value/value.return.scope @@ -1,24 +1,24 @@ -public class MyClass { - public int foo() { - return 123; +public class Foo { + public int bar() { + return 0; } } --- -[Content] = 2:15-2:18 - >---< -2| return 123; +[Content] = 2:15-2:16 + >-< +2| return 0; -[Removal] = 2:14-2:18 - >----< -2| return 123; +[Removal] = 2:14-2:16 + >--< +2| return 0; [Leading delimiter] = 2:14-2:15 >-< -2| return 123; +2| return 0; -[Domain] = 2:8-2:19 - >-----------< -2| return 123; +[Domain] = 2:8-2:17 + >---------< +2| return 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/value.switch.scope b/data/fixtures/scopes/java/value/value.switch.scope similarity index 100% rename from data/fixtures/scopes/java/value.switch.scope rename to data/fixtures/scopes/java/value/value.switch.scope diff --git a/data/fixtures/scopes/java/value/value.variable.scope b/data/fixtures/scopes/java/value/value.variable.scope index 98eac669f7..a614198096 100644 --- a/data/fixtures/scopes/java/value/value.variable.scope +++ b/data/fixtures/scopes/java/value/value.variable.scope @@ -1,20 +1,20 @@ -value = 123; +foo = 0; --- -[Content] = 0:8-0:11 - >---< -0| value = 123; +[Content] = 0:6-0:7 + >-< +0| foo = 0; -[Removal] = 0:5-0:11 - >------< -0| value = 123; +[Removal] = 0:3-0:7 + >----< +0| foo = 0; -[Leading delimiter] = 0:5-0:8 - >---< -0| value = 123; +[Leading delimiter] = 0:3-0:6 + >---< +0| foo = 0; -[Domain] = 0:0-0:12 - >------------< -0| value = 123; +[Domain] = 0:0-0:8 + >--------< +0| foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/java/value/value.yield.scope b/data/fixtures/scopes/java/value/value.yield.scope index a25b643c0b..4384e3ef92 100644 --- a/data/fixtures/scopes/java/value/value.yield.scope +++ b/data/fixtures/scopes/java/value/value.yield.scope @@ -1,62 +1,39 @@ -switch (value) { - case 1: - yield "foo"; - default: - yield "bar"; +switch (foo) { + case 0: + yield 0; } --- [#1 Content] = -[#1 Removal] = 0:8-0:13 - >-----< -0| switch (value) { - -[#1 Domain] = 0:0-5:1 - >---------------- -0| switch (value) { -1| case 1: -2| yield "foo"; -3| default: -4| yield "bar"; -5| } +[#1 Removal] = 0:8-0:11 + >---< +0| switch (foo) { + +[#1 Domain] = 0:0-3:1 + >-------------- +0| switch (foo) { +1| case 0: +2| yield 0; +3| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 2:14-2:19 - >-----< -2| yield "foo"; +[#2 Content] = 2:14-2:15 + >-< +2| yield 0; -[#2 Removal] = 2:13-2:19 - >------< -2| yield "foo"; +[#2 Removal] = 2:13-2:15 + >--< +2| yield 0; [#2 Leading delimiter] = 2:13-2:14 >-< -2| yield "foo"; +2| yield 0; -[#2 Domain] = 2:8-2:20 - >------------< -2| yield "foo"; +[#2 Domain] = 2:8-2:16 + >--------< +2| yield 0; [#2 Insertion delimiter] = " " - - -[#3 Content] = 4:14-4:19 - >-----< -4| yield "bar"; - -[#3 Removal] = 4:13-4:19 - >------< -4| yield "bar"; - -[#3 Leading delimiter] = 4:13-4:14 - >-< -4| yield "bar"; - -[#3 Domain] = 4:8-4:20 - >------------< -4| yield "bar"; - -[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/anonymousFunction.scope b/data/fixtures/scopes/javascript.core/anonymousFunction.scope index 515220a331..a0b6274e92 100644 --- a/data/fixtures/scopes/javascript.core/anonymousFunction.scope +++ b/data/fixtures/scopes/javascript.core/anonymousFunction.scope @@ -1,15 +1,10 @@ -function() { - -} +function() {} --- [Content] = [Removal] = -[Domain] = 0:0-2:1 - >------------ -0| function() { -1| -2| } - -< +[Domain] = 0:0-0:13 + >-------------< +0| function() {} [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/javascript.core/anonymousFunction2.scope b/data/fixtures/scopes/javascript.core/anonymousFunction2.scope index f669347db4..6ff2c1d6c3 100644 --- a/data/fixtures/scopes/javascript.core/anonymousFunction2.scope +++ b/data/fixtures/scopes/javascript.core/anonymousFunction2.scope @@ -1,15 +1,10 @@ -() => { - -} +() => {} --- [Content] = [Removal] = -[Domain] = 0:0-2:1 - >------- -0| () => { -1| -2| } - -< +[Domain] = 0:0-0:8 + >--------< +0| () => {} [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/javascript.core/argument/argument.catch.scope b/data/fixtures/scopes/javascript.core/argument/argument.catch.scope index 16f9ccf70f..1571957cbc 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.catch.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.catch.scope @@ -1,11 +1,11 @@ try {} -catch(error) {} +catch(e) {} --- [Content] = [Removal] = -[Domain] = 1:6-1:11 - >-----< -1| catch(error) {} +[Domain] = 1:6-1:7 + >-< +1| catch(e) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope index e645839f46..213ddf703a 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.constructor.iteration.scope @@ -1,12 +1,12 @@ -class MyClass { - constructor(aaa, bbb) { } +class Foo { + constructor(aaa, bbb) {} } --- [Content] = 1:14-1:22 >--------< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} -[Domain] = 1:2-1:27 - >-------------------------< -1| constructor(aaa, bbb) { } +[Domain] = 1:2-1:26 + >------------------------< +1| constructor(aaa, bbb) {} diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.iteration.scope index 05217b65dc..e14f9934ca 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.iteration.scope @@ -1,10 +1,10 @@ -function myFunk(aaa, bbb) { } +function foo(aaa, bbb) {} --- -[Content] = 0:16-0:24 - >--------< -0| function myFunk(aaa, bbb) { } +[Content] = 0:13-0:21 + >--------< +0| function foo(aaa, bbb) {} -[Domain] = 0:0-0:29 - >-----------------------------< -0| function myFunk(aaa, bbb) { } +[Domain] = 0:0-0:25 + >-------------------------< +0| function foo(aaa, bbb) {} diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration.scope index 0063b4d5ca..c77c9f8c25 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration.scope @@ -1,10 +1,10 @@ -(aaa, bbb) => { } +(aaa, bbb) => {} --- [Content] = 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/javascript.core/argument/argument.formal.lambda.iteration2.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration2.scope index 5e3afdecd1..dbdaa0cc55 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration2.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.iteration2.scope @@ -1,10 +1,10 @@ -function (aaa, bbb) { } +function (aaa, bbb) {} --- [Content] = 0:10-0:18 >--------< -0| function (aaa, bbb) { } +0| function (aaa, bbb) {} -[Domain] = 0:0-0:23 - >-----------------------< -0| function (aaa, bbb) { } +[Domain] = 0:0-0:22 + >----------------------< +0| function (aaa, bbb) {} diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope index 114ed3561b..9e2b7f7ab2 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.multiLine.scope @@ -1,7 +1,7 @@ ( aaa, bbb -) => { } +) => {} --- [#1 Content] = diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine.scope index b6b49f57b3..0361e604cb 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argument/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/javascript.core/argument/argument.formal.lambda.singleLine2.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine2.scope index 1fdc4be718..2b90ded2d7 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine2.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.lambda.singleLine2.scope @@ -1,18 +1,18 @@ -function (aaa, bbb) { } +function (aaa, bbb) {} --- [#1 Content] = [#1 Domain] = 0:10-0:13 >---< -0| function (aaa, bbb) { } +0| function (aaa, bbb) {} [#1 Removal] = 0:10-0:15 >-----< -0| function (aaa, bbb) { } +0| function (aaa, bbb) {} [#1 Trailing delimiter] = 0:13-0:15 >--< -0| function (aaa, bbb) { } +0| function (aaa, bbb) {} [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ function (aaa, bbb) { } [#2 Content] = [#2 Domain] = 0:15-0:18 >---< -0| function (aaa, bbb) { } +0| function (aaa, bbb) {} [#2 Removal] = 0:13-0:18 >-----< -0| function (aaa, bbb) { } +0| function (aaa, bbb) {} [#2 Leading delimiter] = 0:13-0:15 >--< -0| function (aaa, bbb) { } +0| function (aaa, bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope index e0f6c89bee..41dd9b4e72 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.method.iteration.scope @@ -1,12 +1,12 @@ -class MyClass { - myFunk(aaa, bbb) { } +class Foo { + bar(aaa, bbb) {} } --- -[Content] = 1:9-1:17 - >--------< -1| myFunk(aaa, bbb) { } +[Content] = 1:6-1:14 + >--------< +1| bar(aaa, bbb) {} -[Domain] = 1:2-1:22 - >--------------------< -1| myFunk(aaa, bbb) { } +[Domain] = 1:2-1:18 + >----------------< +1| bar(aaa, bbb) {} diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope index 6ad780ad8d..164f0d7eed 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.empty.scope @@ -1,15 +1,15 @@ -class MyClass { - constructor() { } +class Foo { + constructor() {} } --- [Content] = [Removal] = 1:14-1:14 >< -1| constructor() { } +1| constructor() {} -[Domain] = 1:2-1:19 - >-----------------< -1| constructor() { } +[Domain] = 1:2-1:18 + >----------------< +1| constructor() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope index 8a27ae367d..e37779bfa0 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.multiLine.scope @@ -1,8 +1,8 @@ -class MyClass { +class Foo { constructor( aaa, bbb - ) { } + ) {} } --- @@ -17,19 +17,19 @@ class MyClass { 1| constructor( 2| aaa, 3| bbb -4| ) { } +4| ) {} --< [Leading delimiter] = 2:0-2:4 >----< 2| aaa, -[Domain] = 1:2-4:7 +[Domain] = 1:2-4:6 >------------ 1| constructor( 2| aaa, 3| bbb -4| ) { } - -------< +4| ) {} + ------< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope index 13a0cbdedd..6a13020cf4 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.constructor.singleLine.scope @@ -1,15 +1,15 @@ -class MyClass { - constructor(aaa, bbb) { } +class Foo { + constructor(aaa, bbb) {} } --- [Content] = [Removal] = 1:14-1:22 >--------< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} -[Domain] = 1:2-1:27 - >-------------------------< -1| constructor(aaa, bbb) { } +[Domain] = 1:2-1:26 + >------------------------< +1| constructor(aaa, bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.empty.scope index a98608fdc3..da52745186 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.empty.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.empty.scope @@ -1,13 +1,13 @@ -function myFunk() { } +function foo() {} --- [Content] = -[Removal] = 0:16-0:16 - >< -0| function myFunk() { } +[Removal] = 0:13-0:13 + >< +0| function foo() {} -[Domain] = 0:0-0:21 - >---------------------< -0| function myFunk() { } +[Domain] = 0:0-0:17 + >-----------------< +0| function foo() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty.scope index 7783f73527..b963c1e75e 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty.scope @@ -1,13 +1,13 @@ -() => { } +() => {} --- [Content] = [Removal] = 0:1-0:1 >< -0| () => { } +0| () => {} -[Domain] = 0:0-0:9 - >---------< -0| () => { } +[Domain] = 0:0-0:8 + >--------< +0| () => {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty2.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty2.scope index 49ae698c96..afaa6882e2 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty2.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.empty2.scope @@ -1,13 +1,13 @@ -function () { } +function () {} --- [Content] = [Removal] = 0:10-0:10 >< -0| function () { } +0| function () {} -[Domain] = 0:0-0:15 - >---------------< -0| function () { } +[Domain] = 0:0-0:14 + >--------------< +0| function () {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope index 7bb02ab152..dabd9b5f90 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine.scope @@ -1,7 +1,7 @@ ( aaa, bbb -) => { } +) => {} --- [Content] = 1:2-2:5 @@ -15,19 +15,19 @@ 0| ( 1| aaa, 2| bbb -3| ) => { } +3| ) => {} < [Leading delimiter] = 1:0-1:2 >--< 1| aaa, -[Domain] = 0:0-3:8 +[Domain] = 0:0-3:7 >- 0| ( 1| aaa, 2| bbb -3| ) => { } - --------< +3| ) => {} + -------< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope index b5bd54810e..c0d07701af 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.multiLine2.scope @@ -1,7 +1,7 @@ function ( aaa, bbb -) { } +) {} --- [Content] = 1:2-2:5 @@ -15,19 +15,19 @@ function ( 0| function ( 1| aaa, 2| bbb -3| ) { } +3| ) {} < [Leading delimiter] = 1:0-1:2 >--< 1| aaa, -[Domain] = 0:0-3:5 +[Domain] = 0:0-3:4 >---------- 0| function ( 1| aaa, 2| bbb -3| ) { } - -----< +3| ) {} + ----< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine.scope index 30b60eaf01..0915e2c99c 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine.scope @@ -1,13 +1,13 @@ -(aaa, bbb) => { } +(aaa, bbb) => {} --- [Content] = [Removal] = 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) => {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine2.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine2.scope index 99b36bc73f..44cde88ec5 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine2.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.lambda.singleLine2.scope @@ -1,13 +1,13 @@ -function (aaa, bbb) { } +function (aaa, bbb) {} --- [Content] = [Removal] = 0:10-0:18 >--------< -0| function (aaa, bbb) { } +0| function (aaa, bbb) {} -[Domain] = 0:0-0:23 - >-----------------------< -0| function (aaa, bbb) { } +[Domain] = 0:0-0:22 + >----------------------< +0| function (aaa, bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope index 60d13ae256..ee5ee44c3b 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.empty.scope @@ -1,15 +1,15 @@ -class MyClass { - myFunk() { } +class Foo { + bar() {} } --- [Content] = -[Removal] = 1:9-1:9 - >< -1| myFunk() { } +[Removal] = 1:6-1:6 + >< +1| bar() {} -[Domain] = 1:2-1:14 - >------------< -1| myFunk() { } +[Domain] = 1:2-1:10 + >--------< +1| bar() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope index a3686fef5d..692d941ebf 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.multiLine.scope @@ -1,8 +1,8 @@ -class MyClass { - myFunk( +class Foo { + bar( aaa, bbb - ) { } + ) {} } --- @@ -12,24 +12,24 @@ class MyClass { 3| bbb -------< -[Removal] = 1:9-4:2 - > -1| myFunk( +[Removal] = 1:6-4:2 + > +1| bar( 2| aaa, 3| bbb -4| ) { } +4| ) {} --< [Leading delimiter] = 2:0-2:4 >----< 2| aaa, -[Domain] = 1:2-4:7 - >------- -1| myFunk( +[Domain] = 1:2-4:6 + >---- +1| bar( 2| aaa, 3| bbb -4| ) { } - -------< +4| ) {} + ------< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope index aeadb987a3..8a3cb1b547 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.method.singleLine.scope @@ -1,15 +1,15 @@ -class MyClass { - myFunk(aaa, bbb) { } +class Foo { + bar(aaa, bbb) {} } --- [Content] = -[Removal] = 1:9-1:17 - >--------< -1| myFunk(aaa, bbb) { } +[Removal] = 1:6-1:14 + >--------< +1| bar(aaa, bbb) {} -[Domain] = 1:2-1:22 - >--------------------< -1| myFunk(aaa, bbb) { } +[Domain] = 1:2-1:18 + >----------------< +1| bar(aaa, bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.multiLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.multiLine.scope index c6f1d34563..764ecac83b 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.multiLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.multiLine.scope @@ -1,7 +1,7 @@ -function myFunk( +function foo( aaa, bbb -) { } +) {} --- [Content] = 1:4-2:7 @@ -10,24 +10,24 @@ function myFunk( 2| bbb -------< -[Removal] = 0:16-3:0 - > -0| function myFunk( +[Removal] = 0:13-3:0 + > +0| function foo( 1| aaa, 2| bbb -3| ) { } +3| ) {} < [Leading delimiter] = 1:0-1:4 >----< 1| aaa, -[Domain] = 0:0-3:5 - >---------------- -0| function myFunk( +[Domain] = 0:0-3:4 + >------------- +0| function foo( 1| aaa, 2| bbb -3| ) { } - -----< +3| ) {} + ----< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.singleLine.scope b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.singleLine.scope index d86990597e..ecb5e15112 100644 --- a/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.singleLine.scope +++ b/data/fixtures/scopes/javascript.core/argumentList/argumentList.formal.singleLine.scope @@ -1,13 +1,13 @@ -function myFunk(aaa, bbb) { } +function foo(aaa, bbb) {} --- [Content] = -[Removal] = 0:16-0:24 - >--------< -0| function myFunk(aaa, bbb) { } +[Removal] = 0:13-0:21 + >--------< +0| function foo(aaa, bbb) {} -[Domain] = 0:0-0:29 - >-----------------------------< -0| function myFunk(aaa, bbb) { } +[Domain] = 0:0-0:25 + >-------------------------< +0| function foo(aaa, bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/javascript.core/branch/branch.if.iteration.scope b/data/fixtures/scopes/javascript.core/branch/branch.if.iteration.scope index 117c6199c1..84064bd4fa 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.if.iteration.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.if.iteration.scope @@ -1,24 +1,12 @@ -if (true) { - -} -else if (false) { - -} -else { - -} +if (true) {} +else if (false) {} +else {} --- [Content] = -[Domain] = 0:0-8:1 - >----------- -0| if (true) { -1| -2| } -3| else if (false) { -4| -5| } -6| else { -7| -8| } - -< +[Domain] = 0:0-2:7 + >------------ +0| if (true) {} +1| else if (false) {} +2| else {} + -------< diff --git a/data/fixtures/scopes/javascript.core/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.iteration.scope index d40679cd9f..81eca1bb2c 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.iteration.scope @@ -1,21 +1,10 @@ -switch (value) { - case 0: { } - case 1: { } -} +switch (foo) { } --- -[Content] = 0:16-3:0 - > -0| switch (value) { -1| case 0: { } -2| case 1: { } -3| } - < +[Content] = 0:14-0:15 + >-< +0| switch (foo) { } -[Domain] = 0:0-3:1 - >---------------- -0| switch (value) { -1| case 0: { } -2| case 1: { } -3| } - -< +[Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } diff --git a/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope index e663cdd925..fa1f127230 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.scope @@ -1,40 +1,44 @@ -switch (value) { - case 0: { } - default: { } +switch (foo) { + case 0: + break; + default: {} } --- [#1 Content] = -[#1 Domain] = 1:2-1:13 - >-----------< -1| case 0: { } - -[#1 Removal] = 1:0-2:0 - >------------- -1| case 0: { } -2| default: { } +[#1 Domain] = 1:2-2:10 + >------- +1| case 0: +2| break; + ----------< + +[#1 Removal] = 1:0-3:0 + >--------- +1| case 0: +2| break; +3| default: {} < [#1 Leading delimiter] = 1:0-1:2 >--< -1| case 0: { } +1| case 0: [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 2:2-2:14 - >------------< -2| default: { } - -[#2 Removal] = 2:0-3:0 - >-------------- -2| default: { } -3| } +[#2 Domain] = 3:2-3:13 + >-----------< +3| default: {} + +[#2 Removal] = 3:0-4:0 + >------------- +3| default: {} +4| } < -[#2 Leading delimiter] = 2:0-2:2 +[#2 Leading delimiter] = 3:0-3:2 >--< -2| default: { } +3| default: {} [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/javascript.core/branch/branch.try.iteration.scope b/data/fixtures/scopes/javascript.core/branch/branch.try.iteration.scope index b093efc9bf..0ee3ccbee2 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.try.iteration.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.try.iteration.scope @@ -1,5 +1,5 @@ try {} -catch(error) {} +catch(e) {} finally {} --- @@ -7,6 +7,6 @@ finally {} [Domain] = 0:0-2:10 >------ 0| try {} -1| catch(error) {} +1| catch(e) {} 2| finally {} ----------< diff --git a/data/fixtures/scopes/javascript.core/branch/branch.try.scope b/data/fixtures/scopes/javascript.core/branch/branch.try.scope index f80e3211ce..04519e2e7c 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.try.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.try.scope @@ -1,5 +1,5 @@ try {} -catch(error) {} +catch(e) {} finally {} --- @@ -11,20 +11,20 @@ finally {} [#1 Removal] = 0:0-1:0 >------ 0| try {} -1| catch(error) {} +1| catch(e) {} < [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 1:0-1:15 - >---------------< -1| catch(error) {} +[#2 Domain] = 1:0-1:11 + >-----------< +1| catch(e) {} [#2 Removal] = 1:0-2:0 - >--------------- -1| catch(error) {} + >----------- +1| catch(e) {} 2| finally {} < @@ -36,9 +36,9 @@ finally {} >----------< 2| finally {} -[#3 Removal] = 1:15-2:10 - > -1| catch(error) {} +[#3 Removal] = 1:11-2:10 + > +1| catch(e) {} 2| finally {} ----------< diff --git a/data/fixtures/scopes/javascript.core/className.iteration.document.scope b/data/fixtures/scopes/javascript.core/className.iteration.document.scope index 533e41e2a9..813bb62ea9 100644 --- a/data/fixtures/scopes/javascript.core/className.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/className.iteration.document.scope @@ -1,5 +1,5 @@ -int foo; +class Foo {} --- @@ -7,6 +7,6 @@ int foo; [Domain] = 0:0-2:0 > 0| -1| int foo; +1| class Foo {} 2| < diff --git a/data/fixtures/scopes/javascript.core/className.scope b/data/fixtures/scopes/javascript.core/className.scope index 428df96465..211086562c 100644 --- a/data/fixtures/scopes/javascript.core/className.scope +++ b/data/fixtures/scopes/javascript.core/className.scope @@ -1,29 +1,24 @@ -class MyClass { - -} +class Foo {} --- -[Content] = 0:6-0:13 - >-------< -0| class MyClass { +[Content] = 0:6-0:9 + >---< +0| class Foo {} -[Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[Removal] = 0:6-0:10 + >----< +0| class Foo {} [Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo {} -[Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo {} -[Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| -2| } - -< +[Domain] = 0:0-0:12 + >------------< +0| class Foo {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/comment.block.scope b/data/fixtures/scopes/javascript.core/comment.block.scope index f8b38ca6af..5e8b51111c 100644 --- a/data/fixtures/scopes/javascript.core/comment.block.scope +++ b/data/fixtures/scopes/javascript.core/comment.block.scope @@ -1,15 +1,10 @@ -/* - Hello world -*/ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-2:2 - >-- -0| /* -1| Hello world -2| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/javascript.core/comment.block2.scope b/data/fixtures/scopes/javascript.core/comment.block2.scope index a0ab76da25..b5d8404237 100644 --- a/data/fixtures/scopes/javascript.core/comment.block2.scope +++ b/data/fixtures/scopes/javascript.core/comment.block2.scope @@ -1,15 +1,10 @@ -/** -* Hello world -*/ +/** Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-2:2 - >--- -0| /** -1| * Hello world -2| */ - --< +[Domain] = 0:0-0:18 + >------------------< +0| /** Hello world */ [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/javascript.core/condition/condition.doWhile.scope b/data/fixtures/scopes/javascript.core/condition/condition.doWhile.scope index b32c0c4386..f8e3242e13 100644 --- a/data/fixtures/scopes/javascript.core/condition/condition.doWhile.scope +++ b/data/fixtures/scopes/javascript.core/condition/condition.doWhile.scope @@ -1,18 +1,13 @@ -do { - -} while (true); +do {} while (true); --- [Content] = -[Removal] = 2:9-2:13 - >----< -2| } while (true); +[Removal] = 0:13-0:17 + >----< +0| do {} while (true); -[Domain] = 0:0-2:15 - >---- -0| do { -1| -2| } while (true); - ---------------< +[Domain] = 0:0-0:19 + >-------------------< +0| do {} while (true); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/condition/condition.for.scope b/data/fixtures/scopes/javascript.core/condition/condition.for.scope index 194410b763..ee2f39e475 100644 --- a/data/fixtures/scopes/javascript.core/condition/condition.for.scope +++ b/data/fixtures/scopes/javascript.core/condition/condition.for.scope @@ -1,25 +1,20 @@ -for (let i = 0; i < 10; ++i) { - -} +for (let i = 0; i < size; i++) {} --- -[Content] = 0:16-0:22 - >------< -0| for (let i = 0; i < 10; ++i) { +[Content] = 0:16-0:24 + >--------< +0| for (let i = 0; i < size; i++) {} -[Removal] = 0:15-0:22 - >-------< -0| for (let i = 0; i < 10; ++i) { +[Removal] = 0:15-0:24 + >---------< +0| for (let i = 0; i < size; i++) {} [Leading delimiter] = 0:15-0:16 >-< -0| for (let i = 0; i < 10; ++i) { +0| for (let i = 0; i < size; i++) {} -[Domain] = 0:0-2:1 - >------------------------------ -0| for (let i = 0; i < 10; ++i) { -1| -2| } - -< +[Domain] = 0:0-0:33 + >---------------------------------< +0| for (let i = 0; i < size; i++) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.iteration.scope index d40679cd9f..81eca1bb2c 100644 --- a/data/fixtures/scopes/javascript.core/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.iteration.scope @@ -1,21 +1,10 @@ -switch (value) { - case 0: { } - case 1: { } -} +switch (foo) { } --- -[Content] = 0:16-3:0 - > -0| switch (value) { -1| case 0: { } -2| case 1: { } -3| } - < +[Content] = 0:14-0:15 + >-< +0| switch (foo) { } -[Domain] = 0:0-3:1 - >---------------- -0| switch (value) { -1| case 0: { } -2| case 1: { } -3| } - -< +[Domain] = 0:0-0:16 + >----------------< +0| switch (foo) { } diff --git a/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope index 34114d7a74..f300a38b47 100644 --- a/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope +++ b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.scope @@ -1,22 +1,22 @@ -switch (value) { - case 0: { } +switch (foo) { + case 0: break; } --- [Content] = 1:7-1:8 >-< -1| case 0: { } +1| case 0: break; [Removal] = 1:6-1:8 >--< -1| case 0: { } +1| case 0: break; [Leading delimiter] = 1:6-1:7 >-< -1| case 0: { } +1| case 0: break; -[Domain] = 1:2-1:13 - >-----------< -1| case 0: { } +[Domain] = 1:2-1:16 + >--------------< +1| case 0: break; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/condition/condition.while.scope b/data/fixtures/scopes/javascript.core/condition/condition.while.scope index ff4a0f87c7..61cd7d9e7a 100644 --- a/data/fixtures/scopes/javascript.core/condition/condition.while.scope +++ b/data/fixtures/scopes/javascript.core/condition/condition.while.scope @@ -1,18 +1,13 @@ -while (true) { - -} +while (true) {} --- [Content] = [Removal] = 0:7-0:11 >----< -0| while (true) { +0| while (true) {} -[Domain] = 0:0-2:1 - >-------------- -0| while (true) { -1| -2| } - -< +[Domain] = 0:0-0:15 + >---------------< +0| while (true) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/functionCall.constructor.scope b/data/fixtures/scopes/javascript.core/functionCall.constructor.scope index 5ef02ad32b..d94f8bf315 100644 --- a/data/fixtures/scopes/javascript.core/functionCall.constructor.scope +++ b/data/fixtures/scopes/javascript.core/functionCall.constructor.scope @@ -1,10 +1,10 @@ -new Foo.bar(0); +new Foo(); --- [Content] = [Removal] = -[Domain] = 0:0-0:14 - >--------------< -0| new Foo.bar(0); +[Domain] = 0:0-0:9 + >---------< +0| new Foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/functionCall.scope b/data/fixtures/scopes/javascript.core/functionCall.scope index 102bc15871..633f02ca5e 100644 --- a/data/fixtures/scopes/javascript.core/functionCall.scope +++ b/data/fixtures/scopes/javascript.core/functionCall.scope @@ -1,10 +1,10 @@ -foo.bar(0); +foo(); --- [Content] = [Removal] = -[Domain] = 0:0-0:10 - >----------< -0| foo.bar(0); +[Domain] = 0:0-0:5 + >-----< +0| foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/functionCallee.constructor.scope b/data/fixtures/scopes/javascript.core/functionCallee.constructor.scope index 7b6abd009a..81ac744168 100644 --- a/data/fixtures/scopes/javascript.core/functionCallee.constructor.scope +++ b/data/fixtures/scopes/javascript.core/functionCallee.constructor.scope @@ -1,13 +1,13 @@ -new Foo.bar(0); +new Foo(); --- [Content] = -[Removal] = 0:0-0:11 - >-----------< -0| new Foo.bar(0); +[Removal] = 0:0-0:7 + >-------< +0| new Foo(); -[Domain] = 0:0-0:14 - >--------------< -0| new Foo.bar(0); +[Domain] = 0:0-0:9 + >---------< +0| new Foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/functionCallee.scope b/data/fixtures/scopes/javascript.core/functionCallee.scope index 1b831132c6..3071a48ae9 100644 --- a/data/fixtures/scopes/javascript.core/functionCallee.scope +++ b/data/fixtures/scopes/javascript.core/functionCallee.scope @@ -1,13 +1,13 @@ -foo.bar(0); +foo(); --- [Content] = -[Removal] = 0:0-0:7 - >-------< -0| foo.bar(0); +[Removal] = 0:0-0:3 + >---< +0| foo(); -[Domain] = 0:0-0:10 - >----------< -0| foo.bar(0); +[Domain] = 0:0-0:5 + >-----< +0| foo(); [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/functionName/functionName.constructor.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.constructor.scope index 47614ac655..d06c62fae0 100644 --- a/data/fixtures/scopes/javascript.core/functionName/functionName.constructor.scope +++ b/data/fixtures/scopes/javascript.core/functionName/functionName.constructor.scope @@ -1,4 +1,4 @@ -class MyClass { +class Foo { constructor() { } } --- diff --git a/data/fixtures/scopes/javascript.core/functionName/functionName.iteration.document.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.iteration.document.scope index 6c78462994..79172806b9 100644 --- a/data/fixtures/scopes/javascript.core/functionName/functionName.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/functionName/functionName.iteration.document.scope @@ -1,5 +1,5 @@ -function myFunk() { } +function foo() {} --- @@ -7,6 +7,6 @@ function myFunk() { } [Domain] = 0:0-2:0 > 0| -1| function myFunk() { } +1| function foo() {} 2| < diff --git a/data/fixtures/scopes/javascript.core/functionName/functionName.method.iteration.class.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.method.iteration.class.scope index 387b7e4335..a3ec5f3456 100644 --- a/data/fixtures/scopes/javascript.core/functionName/functionName.method.iteration.class.scope +++ b/data/fixtures/scopes/javascript.core/functionName/functionName.method.iteration.class.scope @@ -1,21 +1,13 @@ -class MyClass { - myFunk() { } -} +class Foo { } --- [#1 Content] = -[#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk() { } -2| } - -< +[#1 Domain] = 0:0-0:13 + >-------------< +0| class Foo { } [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| myFunk() { } -2| } - < +[#2 Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/javascript.core/functionName/functionName.method.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.method.scope index 6c552e695e..d29784f2a7 100644 --- a/data/fixtures/scopes/javascript.core/functionName/functionName.method.scope +++ b/data/fixtures/scopes/javascript.core/functionName/functionName.method.scope @@ -1,19 +1,19 @@ -class MyClass { - myFunk() { } +class Foo { + bar() {} } --- [Content] = -[Removal] = 1:2-1:8 - >------< -1| myFunk() { } +[Removal] = 1:2-1:5 + >---< +1| bar() {} [Leading delimiter] = 1:0-1:2 >--< -1| myFunk() { } +1| bar() {} -[Domain] = 1:2-1:14 - >------------< -1| myFunk() { } +[Domain] = 1:2-1:10 + >--------< +1| bar() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/functionName/functionName.scope b/data/fixtures/scopes/javascript.core/functionName/functionName.scope index d69914ea6f..e5a3e93244 100644 --- a/data/fixtures/scopes/javascript.core/functionName/functionName.scope +++ b/data/fixtures/scopes/javascript.core/functionName/functionName.scope @@ -1,17 +1,17 @@ -function myFunk() { } +function foo() {} --- [Content] = -[Removal] = 0:9-0:15 - >------< -0| function myFunk() { } +[Removal] = 0:9-0:12 + >---< +0| function foo() {} [Leading delimiter] = 0:8-0:9 >-< -0| function myFunk() { } +0| function foo() {} -[Domain] = 0:0-0:21 - >---------------------< -0| function myFunk() { } +[Domain] = 0:0-0:17 + >-----------------< +0| function foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/ifStatement.scope b/data/fixtures/scopes/javascript.core/ifStatement.scope index d01f5e842d..14f2507621 100644 --- a/data/fixtures/scopes/javascript.core/ifStatement.scope +++ b/data/fixtures/scopes/javascript.core/ifStatement.scope @@ -1,15 +1,15 @@ -if (true) { - -} +if (true) {} +else if (false) {} +else {} --- [Content] = [Removal] = -[Domain] = 0:0-2:1 - >----------- -0| if (true) { -1| -2| } - -< +[Domain] = 0:0-2:7 + >------------ +0| if (true) {} +1| else if (false) {} +2| else {} + -------< [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/javascript.core/interior/interior.switchCase.scope b/data/fixtures/scopes/javascript.core/interior/interior.switchCase.scope index 58797959fa..79eec9b526 100644 --- a/data/fixtures/scopes/javascript.core/interior/interior.switchCase.scope +++ b/data/fixtures/scopes/javascript.core/interior/interior.switchCase.scope @@ -1,6 +1,6 @@ -switch (value) { +switch (foo) { case 0: - foo; + bar; break; case 1: { break; @@ -13,7 +13,7 @@ switch (value) { [#1 Content] = 1:4-8:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -22,11 +22,11 @@ switch (value) { 8| break; --------------< -[#1 Removal] = 0:16-9:0 - > -0| switch (value) { +[#1 Removal] = 0:14-9:0 + > +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -37,10 +37,10 @@ switch (value) { < [#1 Domain] = 0:0-9:1 - >---------------- -0| switch (value) { + >-------------- +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -54,13 +54,13 @@ switch (value) { [#2 Content] = -[#2 Removal] = 0:8-0:13 - >-----< -0| switch (value) { +[#2 Removal] = 0:8-0:11 + >---< +0| switch (foo) { -[#2 Domain] = 0:7-0:14 - >-------< -0| switch (value) { +[#2 Domain] = 0:7-0:12 + >-----< +0| switch (foo) { [#2 Insertion delimiter] = " " @@ -68,7 +68,7 @@ switch (value) { [#3 Content] = 1:4-8:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -77,11 +77,11 @@ switch (value) { 8| break; --------------< -[#3 Removal] = 0:16-9:0 - > -0| switch (value) { +[#3 Removal] = 0:14-9:0 + > +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -91,11 +91,11 @@ switch (value) { 9| } < -[#3 Domain] = 0:15-9:1 - >- -0| switch (value) { +[#3 Domain] = 0:13-9:1 + >- +0| switch (foo) { 1| case 0: -2| foo; +2| bar; 3| break; 4| case 1: { 5| break; @@ -111,14 +111,14 @@ switch (value) { [#4 Content] = [#4 Removal] = 2:8-3:14 >---- -2| foo; +2| bar; 3| break; --------------< [#4 Domain] = 1:4-3:14 >------- 1| case 0: -2| foo; +2| bar; 3| break; --------------< diff --git a/data/fixtures/scopes/javascript.core/key.mapPair.iteration.scope b/data/fixtures/scopes/javascript.core/key.mapPair.iteration.scope index e1fca4ab10..7708be130f 100644 --- a/data/fixtures/scopes/javascript.core/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/javascript.core/key.mapPair.iteration.scope @@ -1,7 +1,7 @@ -{ value: 123 } +{aaa: 0, bbb: 1} --- [Content] = -[Domain] = 0:1-0:13 - >------------< -0| { value: 123 } +[Domain] = 0:1-0:15 + >--------------< +0| {aaa: 0, bbb: 1} diff --git a/data/fixtures/scopes/javascript.core/key.mapPair.scope b/data/fixtures/scopes/javascript.core/key.mapPair.scope index efe7fbfce3..2a80a5972d 100644 --- a/data/fixtures/scopes/javascript.core/key.mapPair.scope +++ b/data/fixtures/scopes/javascript.core/key.mapPair.scope @@ -1,20 +1,39 @@ -{ value: 123 } +{aaa: 0, bbb: 1} --- -[Content] = 0:2-0:7 - >-----< -0| { value: 123 } +[#1 Content] = 0:1-0:4 + >---< +0| {aaa: 0, bbb: 1} -[Removal] = 0:2-0:9 - >-------< -0| { value: 123 } +[#1 Removal] = 0:1-0:6 + >-----< +0| {aaa: 0, bbb: 1} -[Trailing delimiter] = 0:7-0:9 - >--< -0| { value: 123 } +[#1 Trailing delimiter] = 0:4-0:6 + >--< +0| {aaa: 0, bbb: 1} -[Domain] = 0:2-0:12 - >----------< -0| { value: 123 } +[#1 Domain] = 0:1-0:7 + >------< +0| {aaa: 0, bbb: 1} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:9-0:12 + >---< +0| {aaa: 0, bbb: 1} + +[#2 Removal] = 0:9-0:14 + >-----< +0| {aaa: 0, bbb: 1} + +[#2 Trailing delimiter] = 0:12-0:14 + >--< +0| {aaa: 0, bbb: 1} + +[#2 Domain] = 0:9-0:15 + >------< +0| {aaa: 0, bbb: 1} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/list.scope b/data/fixtures/scopes/javascript.core/list.scope index 54a5d795c2..053c607f96 100644 --- a/data/fixtures/scopes/javascript.core/list.scope +++ b/data/fixtures/scopes/javascript.core/list.scope @@ -1,10 +1,10 @@ -[1, 2, 3] +[aaa, bbb] --- [Content] = [Removal] = -[Domain] = 0:0-0:9 - >---------< -0| [1, 2, 3] +[Domain] = 0:0-0:10 + >----------< +0| [aaa, bbb] [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/map.scope b/data/fixtures/scopes/javascript.core/map.scope index 7ae60ad3a8..7c6e537e73 100644 --- a/data/fixtures/scopes/javascript.core/map.scope +++ b/data/fixtures/scopes/javascript.core/map.scope @@ -1,10 +1,10 @@ -{ value: 123 } +{aaa: 0, bbb: 1} --- [Content] = [Removal] = -[Domain] = 0:0-0:14 - >--------------< -0| { value: 123 } +[Domain] = 0:0-0:16 + >----------------< +0| {aaa: 0, bbb: 1} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.catch.scope b/data/fixtures/scopes/javascript.core/name/name.argument.catch.scope index 16f9ccf70f..1571957cbc 100644 --- a/data/fixtures/scopes/javascript.core/name/name.argument.catch.scope +++ b/data/fixtures/scopes/javascript.core/name/name.argument.catch.scope @@ -1,11 +1,11 @@ try {} -catch(error) {} +catch(e) {} --- [Content] = [Removal] = -[Domain] = 1:6-1:11 - >-----< -1| catch(error) {} +[Domain] = 1:6-1:7 + >-< +1| catch(e) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope index 93d295351d..5480b99118 100644 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.iteration.scope @@ -1,22 +1,22 @@ -class MyClass { - constructor(aaa, bbb) { } +class Foo { + constructor(aaa, bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| constructor(aaa, bbb) { } + >----------- +0| class Foo { +1| constructor(aaa, bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| constructor(aaa, bbb) { } +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| constructor(aaa, bbb) {} 2| } < @@ -24,10 +24,4 @@ class MyClass { [#3 Content] = [#3 Domain] = 1:14-1:22 >--------< -1| constructor(aaa, bbb) { } - - -[#4 Content] = -[#4 Domain] = 1:25-1:26 - >-< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb) {} diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope index da15094fa6..4d84f24e01 100644 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope +++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor.scope @@ -1,28 +1,28 @@ -class MyClass { - constructor(aaa, bbb) { } +class Foo { + constructor(aaa, bbb = 0) {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| constructor(aaa, bbb) { } + >----------- +0| class Foo { +1| constructor(aaa, bbb = 0) {} 2| } -< @@ -32,15 +32,15 @@ class MyClass { [#2 Content] = [#2 Removal] = 1:2-1:13 >-----------< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb = 0) {} [#2 Leading delimiter] = 1:0-1:2 >--< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb = 0) {} -[#2 Domain] = 1:2-1:27 - >-------------------------< -1| constructor(aaa, bbb) { } +[#2 Domain] = 1:2-1:30 + >----------------------------< +1| constructor(aaa, bbb = 0) {} [#2 Insertion delimiter] = " " @@ -49,22 +49,29 @@ class MyClass { [#3 Removal] = [#3 Domain] = 1:14-1:17 >---< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb = 0) {} [#3 Insertion delimiter] = " " -[#4 Content] = -[#4 Domain] = 1:19-1:22 +[#4 Content] = 1:19-1:22 >---< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb = 0) {} -[#4 Removal] = 1:18-1:22 - >----< -1| constructor(aaa, bbb) { } +[#4 Removal] = 1:19-1:23 + >----< +1| constructor(aaa, bbb = 0) {} [#4 Leading delimiter] = 1:18-1:19 >-< -1| constructor(aaa, bbb) { } +1| constructor(aaa, bbb = 0) {} + +[#4 Trailing delimiter] = 1:22-1:23 + >-< +1| constructor(aaa, bbb = 0) {} + +[#4 Domain] = 1:19-1:26 + >-------< +1| constructor(aaa, bbb = 0) {} [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor2.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor2.scope deleted file mode 100644 index 2da840f698..0000000000 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.constructor2.scope +++ /dev/null @@ -1,87 +0,0 @@ -class MyClass { - constructor(aaa = 0, bbb = 1) { } -} ---- - -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { - -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { - -[#1 Leading delimiter] = 0:5-0:6 - >-< -0| class MyClass { - -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { - -[#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| constructor(aaa = 0, bbb = 1) { } -2| } - -< - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = 1:2-1:13 - >-----------< -1| constructor(aaa = 0, bbb = 1) { } - -[#2 Leading delimiter] = 1:0-1:2 - >--< -1| constructor(aaa = 0, bbb = 1) { } - -[#2 Domain] = 1:2-1:35 - >---------------------------------< -1| constructor(aaa = 0, bbb = 1) { } - -[#2 Insertion delimiter] = " " - - -[#3 Content] = 1:14-1:17 - >---< -1| constructor(aaa = 0, bbb = 1) { } - -[#3 Removal] = 1:14-1:18 - >----< -1| constructor(aaa = 0, bbb = 1) { } - -[#3 Trailing delimiter] = 1:17-1:18 - >-< -1| constructor(aaa = 0, bbb = 1) { } - -[#3 Domain] = 1:14-1:21 - >-------< -1| constructor(aaa = 0, bbb = 1) { } - -[#3 Insertion delimiter] = " " - - -[#4 Content] = 1:23-1:26 - >---< -1| constructor(aaa = 0, bbb = 1) { } - -[#4 Removal] = 1:23-1:27 - >----< -1| constructor(aaa = 0, bbb = 1) { } - -[#4 Leading delimiter] = 1:22-1:23 - >-< -1| constructor(aaa = 0, bbb = 1) { } - -[#4 Trailing delimiter] = 1:26-1:27 - >-< -1| constructor(aaa = 0, bbb = 1) { } - -[#4 Domain] = 1:23-1:30 - >-------< -1| constructor(aaa = 0, bbb = 1) { } - -[#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.iteration.scope index 44e3182834..0a1c0f6d7f 100644 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.iteration.scope @@ -1,19 +1,13 @@ -function myFunk(aaa, bbb) { } +function foo(aaa, bbb) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:29 - >-----------------------------< -0| function myFunk(aaa, bbb) { } +[#1 Domain] = 0:0-0:25 + >-------------------------< +0| function foo(aaa, bbb) {} [#2 Content] = -[#2 Domain] = 0:16-0:24 - >--------< -0| function myFunk(aaa, bbb) { } - - -[#3 Content] = -[#3 Domain] = 0:27-0:28 - >-< -0| function myFunk(aaa, bbb) { } +[#2 Domain] = 0:13-0:21 + >--------< +0| function foo(aaa, bbb) {} diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope index 22a8774205..3c84cf6102 100644 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.iteration.scope @@ -1,33 +1,27 @@ -class MyClass { - myFunk(aaa, bbb) { } +class Foo { + bar(aaa, bbb) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk(aaa, bbb) { } + >----------- +0| class Foo { +1| bar(aaa, bbb) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| myFunk(aaa, bbb) { } +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| bar(aaa, bbb) {} 2| } < [#3 Content] = -[#3 Domain] = 1:9-1:17 - >--------< -1| myFunk(aaa, bbb) { } - - -[#4 Content] = -[#4 Domain] = 1:20-1:21 - >-< -1| myFunk(aaa, bbb) { } +[#3 Domain] = 1:6-1:14 + >--------< +1| bar(aaa, bbb) {} diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope index 3b016ace52..e7fe0d0232 100644 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope +++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method.scope @@ -1,28 +1,28 @@ -class MyClass { - myFunk(aaa, bbb) { } +class Foo { + bar(aaa, bbb = 0) {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk(aaa, bbb) { } + >----------- +0| class Foo { +1| bar(aaa, bbb = 0) {} 2| } -< @@ -30,41 +30,48 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:2-1:8 - >------< -1| myFunk(aaa, bbb) { } +[#2 Removal] = 1:2-1:5 + >---< +1| bar(aaa, bbb = 0) {} [#2 Leading delimiter] = 1:0-1:2 >--< -1| myFunk(aaa, bbb) { } +1| bar(aaa, bbb = 0) {} [#2 Domain] = 1:2-1:22 >--------------------< -1| myFunk(aaa, bbb) { } +1| bar(aaa, bbb = 0) {} [#2 Insertion delimiter] = " " [#3 Content] = [#3 Removal] = -[#3 Domain] = 1:9-1:12 - >---< -1| myFunk(aaa, bbb) { } +[#3 Domain] = 1:6-1:9 + >---< +1| bar(aaa, bbb = 0) {} [#3 Insertion delimiter] = " " -[#4 Content] = -[#4 Domain] = 1:14-1:17 - >---< -1| myFunk(aaa, bbb) { } +[#4 Content] = 1:11-1:14 + >---< +1| bar(aaa, bbb = 0) {} -[#4 Removal] = 1:13-1:17 - >----< -1| myFunk(aaa, bbb) { } +[#4 Removal] = 1:11-1:15 + >----< +1| bar(aaa, bbb = 0) {} -[#4 Leading delimiter] = 1:13-1:14 - >-< -1| myFunk(aaa, bbb) { } +[#4 Leading delimiter] = 1:10-1:11 + >-< +1| bar(aaa, bbb = 0) {} + +[#4 Trailing delimiter] = 1:14-1:15 + >-< +1| bar(aaa, bbb = 0) {} + +[#4 Domain] = 1:11-1:18 + >-------< +1| bar(aaa, bbb = 0) {} [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method2.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.method2.scope deleted file mode 100644 index 7e3a6c46b3..0000000000 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.method2.scope +++ /dev/null @@ -1,87 +0,0 @@ -class MyClass { - myFunk(aaa = 0, bbb = 1) { } -} ---- - -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { - -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { - -[#1 Leading delimiter] = 0:5-0:6 - >-< -0| class MyClass { - -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { - -[#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk(aaa = 0, bbb = 1) { } -2| } - -< - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = 1:2-1:8 - >------< -1| myFunk(aaa = 0, bbb = 1) { } - -[#2 Leading delimiter] = 1:0-1:2 - >--< -1| myFunk(aaa = 0, bbb = 1) { } - -[#2 Domain] = 1:2-1:30 - >----------------------------< -1| myFunk(aaa = 0, bbb = 1) { } - -[#2 Insertion delimiter] = " " - - -[#3 Content] = 1:9-1:12 - >---< -1| myFunk(aaa = 0, bbb = 1) { } - -[#3 Removal] = 1:9-1:13 - >----< -1| myFunk(aaa = 0, bbb = 1) { } - -[#3 Trailing delimiter] = 1:12-1:13 - >-< -1| myFunk(aaa = 0, bbb = 1) { } - -[#3 Domain] = 1:9-1:16 - >-------< -1| myFunk(aaa = 0, bbb = 1) { } - -[#3 Insertion delimiter] = " " - - -[#4 Content] = 1:18-1:21 - >---< -1| myFunk(aaa = 0, bbb = 1) { } - -[#4 Removal] = 1:18-1:22 - >----< -1| myFunk(aaa = 0, bbb = 1) { } - -[#4 Leading delimiter] = 1:17-1:18 - >-< -1| myFunk(aaa = 0, bbb = 1) { } - -[#4 Trailing delimiter] = 1:21-1:22 - >-< -1| myFunk(aaa = 0, bbb = 1) { } - -[#4 Domain] = 1:18-1:25 - >-------< -1| myFunk(aaa = 0, bbb = 1) { } - -[#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal.scope index 0b23cc8dcb..d908e37f43 100644 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal.scope +++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal.scope @@ -1,42 +1,49 @@ -function myFunk(aaa, bbb) { } +function foo(aaa, bbb = 0) {} --- [#1 Content] = -[#1 Removal] = 0:9-0:15 - >------< -0| function myFunk(aaa, bbb) { } +[#1 Removal] = 0:9-0:12 + >---< +0| function foo(aaa, bbb = 0) {} [#1 Leading delimiter] = 0:8-0:9 >-< -0| function myFunk(aaa, bbb) { } +0| function foo(aaa, bbb = 0) {} [#1 Domain] = 0:0-0:29 >-----------------------------< -0| function myFunk(aaa, bbb) { } +0| function foo(aaa, bbb = 0) {} [#1 Insertion delimiter] = " " [#2 Content] = [#2 Removal] = -[#2 Domain] = 0:16-0:19 - >---< -0| function myFunk(aaa, bbb) { } +[#2 Domain] = 0:13-0:16 + >---< +0| function foo(aaa, bbb = 0) {} [#2 Insertion delimiter] = " " -[#3 Content] = -[#3 Domain] = 0:21-0:24 - >---< -0| function myFunk(aaa, bbb) { } +[#3 Content] = 0:18-0:21 + >---< +0| function foo(aaa, bbb = 0) {} -[#3 Removal] = 0:20-0:24 - >----< -0| function myFunk(aaa, bbb) { } +[#3 Removal] = 0:18-0:22 + >----< +0| function foo(aaa, bbb = 0) {} -[#3 Leading delimiter] = 0:20-0:21 - >-< -0| function myFunk(aaa, bbb) { } +[#3 Leading delimiter] = 0:17-0:18 + >-< +0| function foo(aaa, bbb = 0) {} + +[#3 Trailing delimiter] = 0:21-0:22 + >-< +0| function foo(aaa, bbb = 0) {} + +[#3 Domain] = 0:18-0:25 + >-------< +0| function foo(aaa, bbb = 0) {} [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.argument.formal2.scope b/data/fixtures/scopes/javascript.core/name/name.argument.formal2.scope index 20a4123dc2..67f485ca20 100644 --- a/data/fixtures/scopes/javascript.core/name/name.argument.formal2.scope +++ b/data/fixtures/scopes/javascript.core/name/name.argument.formal2.scope @@ -1,59 +1,29 @@ -function myFunk(aaa = 0, bbb = 1) { } +function foo(...aaa) {} --- [#1 Content] = -[#1 Removal] = 0:9-0:15 - >------< -0| function myFunk(aaa = 0, bbb = 1) { } +[#1 Removal] = 0:9-0:12 + >---< +0| function foo(...aaa) {} [#1 Leading delimiter] = 0:8-0:9 >-< -0| function myFunk(aaa = 0, bbb = 1) { } +0| function foo(...aaa) {} -[#1 Domain] = 0:0-0:37 - >-------------------------------------< -0| function myFunk(aaa = 0, bbb = 1) { } +[#1 Domain] = 0:0-0:23 + >-----------------------< +0| function foo(...aaa) {} [#1 Insertion delimiter] = " " -[#2 Content] = 0:16-0:19 +[#2 Content] = +[#2 Removal] = 0:16-0:19 >---< -0| function myFunk(aaa = 0, bbb = 1) { } +0| function foo(...aaa) {} -[#2 Removal] = 0:16-0:20 - >----< -0| function myFunk(aaa = 0, bbb = 1) { } - -[#2 Trailing delimiter] = 0:19-0:20 - >-< -0| function myFunk(aaa = 0, bbb = 1) { } - -[#2 Domain] = 0:16-0:23 - >-------< -0| function myFunk(aaa = 0, bbb = 1) { } +[#2 Domain] = 0:13-0:19 + >------< +0| function foo(...aaa) {} [#2 Insertion delimiter] = " " - - -[#3 Content] = 0:25-0:28 - >---< -0| function myFunk(aaa = 0, bbb = 1) { } - -[#3 Removal] = 0:25-0:29 - >----< -0| function myFunk(aaa = 0, bbb = 1) { } - -[#3 Leading delimiter] = 0:24-0:25 - >-< -0| function myFunk(aaa = 0, bbb = 1) { } - -[#3 Trailing delimiter] = 0:28-0:29 - >-< -0| function myFunk(aaa = 0, bbb = 1) { } - -[#3 Domain] = 0:25-0:32 - >-------< -0| function myFunk(aaa = 0, bbb = 1) { } - -[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.assignment.pattern.scope b/data/fixtures/scopes/javascript.core/name/name.assignment.pattern.scope index c4a2ae9f7f..a28aa961ee 100644 --- a/data/fixtures/scopes/javascript.core/name/name.assignment.pattern.scope +++ b/data/fixtures/scopes/javascript.core/name/name.assignment.pattern.scope @@ -1,20 +1,20 @@ -{ aaa: bbb } = ccc; +{ foo: bar } = baz; --- [Content] = 0:0-0:12 >------------< -0| { aaa: bbb } = ccc; +0| { foo: bar } = baz; [Removal] = 0:0-0:15 >---------------< -0| { aaa: bbb } = ccc; +0| { foo: bar } = baz; [Trailing delimiter] = 0:12-0:15 >---< -0| { aaa: bbb } = ccc; +0| { foo: bar } = baz; [Domain] = 0:0-0:19 >-------------------< -0| { aaa: bbb } = ccc; +0| { foo: bar } = baz; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.assignment.scope b/data/fixtures/scopes/javascript.core/name/name.assignment.scope index 6cf46c5ce8..d516138753 100644 --- a/data/fixtures/scopes/javascript.core/name/name.assignment.scope +++ b/data/fixtures/scopes/javascript.core/name/name.assignment.scope @@ -1,20 +1,20 @@ -aaa = bbb; +foo = 0; --- [Content] = 0:0-0:3 >---< -0| aaa = bbb; +0| foo = 0; [Removal] = 0:0-0:6 >------< -0| aaa = bbb; +0| foo = 0; [Trailing delimiter] = 0:3-0:6 >---< -0| aaa = bbb; +0| foo = 0; -[Domain] = 0:0-0:10 - >----------< -0| aaa = bbb; +[Domain] = 0:0-0:8 + >--------< +0| foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.constructor.scope b/data/fixtures/scopes/javascript.core/name/name.constructor.scope index cf09726769..1de0f7a6a3 100644 --- a/data/fixtures/scopes/javascript.core/name/name.constructor.scope +++ b/data/fixtures/scopes/javascript.core/name/name.constructor.scope @@ -1,28 +1,28 @@ -class MyClass { - constructor() { } +class Foo { + constructor() {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| constructor() { } + >----------- +0| class Foo { +1| constructor() {} 2| } -< @@ -32,14 +32,14 @@ class MyClass { [#2 Content] = [#2 Removal] = 1:2-1:13 >-----------< -1| constructor() { } +1| constructor() {} [#2 Leading delimiter] = 1:0-1:2 >--< -1| constructor() { } +1| constructor() {} -[#2 Domain] = 1:2-1:19 - >-----------------< -1| constructor() { } +[#2 Domain] = 1:2-1:18 + >----------------< +1| constructor() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.foreach.scope b/data/fixtures/scopes/javascript.core/name/name.foreach.scope index 331df7f4de..4ca5e4a2ab 100644 --- a/data/fixtures/scopes/javascript.core/name/name.foreach.scope +++ b/data/fixtures/scopes/javascript.core/name/name.foreach.scope @@ -1,29 +1,24 @@ -for (const item of items) { - -} +for (const v of values) {} --- -[Content] = 0:11-0:15 - >----< -0| for (const item of items) { +[Content] = 0:11-0:12 + >-< +0| for (const v of values) {} -[Removal] = 0:11-0:16 - >-----< -0| for (const item of items) { +[Removal] = 0:11-0:13 + >--< +0| for (const v of values) {} [Leading delimiter] = 0:10-0:11 >-< -0| for (const item of items) { +0| for (const v of values) {} -[Trailing delimiter] = 0:15-0:16 - >-< -0| for (const item of items) { +[Trailing delimiter] = 0:12-0:13 + >-< +0| for (const v of values) {} -[Domain] = 0:0-2:1 - >--------------------------- -0| for (const item of items) { -1| -2| } - -< +[Domain] = 0:0-0:26 + >--------------------------< +0| for (const v of values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.function.scope b/data/fixtures/scopes/javascript.core/name/name.function.scope index 92194c85e2..e5a3e93244 100644 --- a/data/fixtures/scopes/javascript.core/name/name.function.scope +++ b/data/fixtures/scopes/javascript.core/name/name.function.scope @@ -1,22 +1,17 @@ -function myFunk() { - -} +function foo() {} --- [Content] = -[Removal] = 0:9-0:15 - >------< -0| function myFunk() { +[Removal] = 0:9-0:12 + >---< +0| function foo() {} [Leading delimiter] = 0:8-0:9 >-< -0| function myFunk() { +0| function foo() {} -[Domain] = 0:0-2:1 - >------------------- -0| function myFunk() { -1| -2| } - -< +[Domain] = 0:0-0:17 + >-----------------< +0| function foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.method.scope b/data/fixtures/scopes/javascript.core/name/name.method.scope index 6c2a43f9da..2a89f29b57 100644 --- a/data/fixtures/scopes/javascript.core/name/name.method.scope +++ b/data/fixtures/scopes/javascript.core/name/name.method.scope @@ -1,28 +1,28 @@ -class MyClass { - myFunk() { } +class Foo { + bar() {} } --- -[#1 Content] = 0:6-0:13 - >-------< -0| class MyClass { +[#1 Content] = 0:6-0:9 + >---< +0| class Foo { -[#1 Removal] = 0:6-0:14 - >--------< -0| class MyClass { +[#1 Removal] = 0:6-0:10 + >----< +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class MyClass { +0| class Foo { -[#1 Trailing delimiter] = 0:13-0:14 - >-< -0| class MyClass { +[#1 Trailing delimiter] = 0:9-0:10 + >-< +0| class Foo { [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk() { } + >----------- +0| class Foo { +1| bar() {} 2| } -< @@ -30,16 +30,16 @@ class MyClass { [#2 Content] = -[#2 Removal] = 1:2-1:8 - >------< -1| myFunk() { } +[#2 Removal] = 1:2-1:5 + >---< +1| bar() {} [#2 Leading delimiter] = 1:0-1:2 >--< -1| myFunk() { } +1| bar() {} -[#2 Domain] = 1:2-1:14 - >------------< -1| myFunk() { } +[#2 Domain] = 1:2-1:10 + >--------< +1| bar() {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.variable.pattern.scope b/data/fixtures/scopes/javascript.core/name/name.variable.pattern.scope index 5b6f02cfa7..c99cf54d09 100644 --- a/data/fixtures/scopes/javascript.core/name/name.variable.pattern.scope +++ b/data/fixtures/scopes/javascript.core/name/name.variable.pattern.scope @@ -1,24 +1,24 @@ -const {aaa: bbb} = ccc; +const {foo: bar} = baz; --- [Content] = 0:6-0:16 >----------< -0| const {aaa: bbb} = ccc; +0| const {foo: bar} = baz; [Removal] = 0:0-0:19 >-------------------< -0| const {aaa: bbb} = ccc; +0| const {foo: bar} = baz; [Leading delimiter] = 0:5-0:6 >-< -0| const {aaa: bbb} = ccc; +0| const {foo: bar} = baz; [Trailing delimiter] = 0:16-0:17 >-< -0| const {aaa: bbb} = ccc; +0| const {foo: bar} = baz; [Domain] = 0:0-0:23 >-----------------------< -0| const {aaa: bbb} = ccc; +0| const {foo: bar} = baz; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.variable.pattern2.scope b/data/fixtures/scopes/javascript.core/name/name.variable.pattern2.scope index 2cd734612a..125ab88eaf 100644 --- a/data/fixtures/scopes/javascript.core/name/name.variable.pattern2.scope +++ b/data/fixtures/scopes/javascript.core/name/name.variable.pattern2.scope @@ -1,40 +1,40 @@ -function funk({ value = 2 }) { } +function foo({ bar = 0 }) { } --- [#1 Content] = -[#1 Removal] = 0:9-0:13 - >----< -0| function funk({ value = 2 }) { } +[#1 Removal] = 0:9-0:12 + >---< +0| function foo({ bar = 0 }) { } [#1 Leading delimiter] = 0:8-0:9 >-< -0| function funk({ value = 2 }) { } +0| function foo({ bar = 0 }) { } -[#1 Domain] = 0:0-0:32 - >--------------------------------< -0| function funk({ value = 2 }) { } +[#1 Domain] = 0:0-0:29 + >-----------------------------< +0| function foo({ bar = 0 }) { } [#1 Insertion delimiter] = " " -[#2 Content] = 0:16-0:21 - >-----< -0| function funk({ value = 2 }) { } +[#2 Content] = 0:15-0:18 + >---< +0| function foo({ bar = 0 }) { } -[#2 Removal] = 0:16-0:22 - >------< -0| function funk({ value = 2 }) { } +[#2 Removal] = 0:15-0:19 + >----< +0| function foo({ bar = 0 }) { } -[#2 Leading delimiter] = 0:15-0:16 - >-< -0| function funk({ value = 2 }) { } +[#2 Leading delimiter] = 0:14-0:15 + >-< +0| function foo({ bar = 0 }) { } -[#2 Trailing delimiter] = 0:21-0:22 - >-< -0| function funk({ value = 2 }) { } +[#2 Trailing delimiter] = 0:18-0:19 + >-< +0| function foo({ bar = 0 }) { } -[#2 Domain] = 0:16-0:25 - >---------< -0| function funk({ value = 2 }) { } +[#2 Domain] = 0:15-0:22 + >-------< +0| function foo({ bar = 0 }) { } [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.variable.pattern3.scope b/data/fixtures/scopes/javascript.core/name/name.variable.pattern3.scope index b3fa9db5bd..d444945ab7 100644 --- a/data/fixtures/scopes/javascript.core/name/name.variable.pattern3.scope +++ b/data/fixtures/scopes/javascript.core/name/name.variable.pattern3.scope @@ -1,47 +1,47 @@ -const { foo = 1 } = opts; +const { foo = 1 } = bar; --- [#1 Content] = 0:6-0:17 >-----------< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; [#1 Removal] = 0:0-0:20 >--------------------< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; [#1 Leading delimiter] = 0:5-0:6 >-< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; [#1 Trailing delimiter] = 0:17-0:18 >-< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; -[#1 Domain] = 0:0-0:25 - >-------------------------< -0| const { foo = 1 } = opts; +[#1 Domain] = 0:0-0:24 + >------------------------< +0| const { foo = 1 } = bar; [#1 Insertion delimiter] = " " [#2 Content] = 0:8-0:11 >---< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; [#2 Removal] = 0:8-0:12 >----< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; [#2 Leading delimiter] = 0:7-0:8 >-< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; [#2 Trailing delimiter] = 0:11-0:12 >-< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; [#2 Domain] = 0:8-0:15 >-------< -0| const { foo = 1 } = opts; +0| const { foo = 1 } = bar; [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.variable.scope b/data/fixtures/scopes/javascript.core/name/name.variable.scope index c9aed7af12..b29e4d221e 100644 --- a/data/fixtures/scopes/javascript.core/name/name.variable.scope +++ b/data/fixtures/scopes/javascript.core/name/name.variable.scope @@ -1,24 +1,24 @@ -const name = "Hello world"; +let foo = 0; --- -[Content] = 0:6-0:10 - >----< -0| const name = "Hello world"; +[Content] = 0:4-0:7 + >---< +0| let foo = 0; -[Removal] = 0:0-0:13 - >-------------< -0| const name = "Hello world"; +[Removal] = 0:0-0:10 + >----------< +0| let foo = 0; -[Leading delimiter] = 0:5-0:6 - >-< -0| const name = "Hello world"; +[Leading delimiter] = 0:3-0:4 + >-< +0| let foo = 0; -[Trailing delimiter] = 0:10-0:11 - >-< -0| const name = "Hello world"; +[Trailing delimiter] = 0:7-0:8 + >-< +0| let foo = 0; -[Domain] = 0:0-0:27 - >---------------------------< -0| const name = "Hello world"; +[Domain] = 0:0-0:12 + >------------< +0| let foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/name/name.variable2.scope b/data/fixtures/scopes/javascript.core/name/name.variable2.scope new file mode 100644 index 0000000000..cd15b48a5a --- /dev/null +++ b/data/fixtures/scopes/javascript.core/name/name.variable2.scope @@ -0,0 +1,24 @@ +const foo = 0; +--- + +[Content] = 0:6-0:9 + >---< +0| const foo = 0; + +[Removal] = 0:0-0:12 + >------------< +0| const foo = 0; + +[Leading delimiter] = 0:5-0:6 + >-< +0| const foo = 0; + +[Trailing delimiter] = 0:9-0:10 + >-< +0| const foo = 0; + +[Domain] = 0:0-0:14 + >--------------< +0| const foo = 0; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope index 25cdced0f6..9e51c27d52 100644 --- a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope +++ b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.constructor.scope @@ -1,21 +1,21 @@ -class MyClass { - constructor() { } +class Foo { + constructor() {} } --- [Content] = -[Domain] = 1:2-1:19 - >-----------------< -1| constructor() { } +[Domain] = 1:2-1:18 + >----------------< +1| constructor() {} [Removal] = 1:0-2:0 - >------------------- -1| constructor() { } + >------------------ +1| constructor() {} 2| } < [Leading delimiter] = 1:0-1:2 >--< -1| constructor() { } +1| constructor() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.iteration.document.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.iteration.document.scope index 6c78462994..79172806b9 100644 --- a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.iteration.document.scope @@ -1,5 +1,5 @@ -function myFunk() { } +function foo() {} --- @@ -7,6 +7,6 @@ function myFunk() { } [Domain] = 0:0-2:0 > 0| -1| function myFunk() { } +1| function foo() {} 2| < diff --git a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.iteration.class.scope index 387b7e4335..a3ec5f3456 100644 --- a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.iteration.class.scope +++ b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.iteration.class.scope @@ -1,21 +1,13 @@ -class MyClass { - myFunk() { } -} +class Foo { } --- [#1 Content] = -[#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk() { } -2| } - -< +[#1 Domain] = 0:0-0:13 + >-------------< +0| class Foo { } [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| myFunk() { } -2| } - < +[#2 Domain] = 0:11-0:12 + >-< +0| class Foo { } diff --git a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.scope index b926badbbb..5c901cbaf6 100644 --- a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.scope +++ b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.method.scope @@ -1,21 +1,21 @@ -class MyClass { - myFunk() { } +class Foo { + bar() {} } --- [Content] = -[Domain] = 1:2-1:14 - >------------< -1| myFunk() { } +[Domain] = 1:2-1:10 + >--------< +1| bar() {} [Removal] = 1:0-2:0 - >-------------- -1| myFunk() { } + >---------- +1| bar() {} 2| } < [Leading delimiter] = 1:0-1:2 >--< -1| myFunk() { } +1| bar() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.scope index 66e3aaf17f..bb0fb08770 100644 --- a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.scope +++ b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.scope @@ -1,10 +1,10 @@ -function myFunk() { } +function foo() {} --- [Content] = [Removal] = -[Domain] = 0:0-0:21 - >---------------------< -0| function myFunk() { } +[Domain] = 0:0-0:17 + >-----------------< +0| function foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction2.scope b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction2.scope index d8a9a512d4..dd8614aeee 100644 --- a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction2.scope +++ b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction2.scope @@ -1,10 +1,10 @@ -const myFunk = function() { } +const foo = function() {} --- [Content] = [Removal] = -[Domain] = 0:0-0:29 - >-----------------------------< -0| const myFunk = function() { } +[Domain] = 0:0-0:25 + >-------------------------< +0| const foo = function() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/javascript.core/statement/statement.scope b/data/fixtures/scopes/javascript.core/statement/statement.scope index 8e3c576f0c..9ec6744100 100644 --- a/data/fixtures/scopes/javascript.core/statement/statement.scope +++ b/data/fixtures/scopes/javascript.core/statement/statement.scope @@ -1,10 +1,10 @@ -const value = 0; +const foo = 0; --- [Content] = [Removal] = -[Domain] = 0:0-0:16 - >----------------< -0| const value = 0; +[Domain] = 0:0-0:14 + >--------------< +0| const foo = 0; [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block.scope b/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block.scope index 4daf73e290..af33f95d00 100644 --- a/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block.scope +++ b/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block.scope @@ -1,13 +1,10 @@ -/* hello -world */ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-1:8 - >-------- -0| /* hello -1| world */ - --------< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block2.scope b/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block2.scope index f37741c349..396e9267dc 100644 --- a/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block2.scope +++ b/data/fixtures/scopes/javascript.core/textFragment/textFragment.comment.block2.scope @@ -1,17 +1,10 @@ -/** -* hello -* world -*/ +/** Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-3:2 - >--- -0| /** -1| * hello -2| * world -3| */ - --< +[Domain] = 0:0-0:18 + >------------------< +0| /** Hello world */ [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope index bbb33a5cc6..9111131003 100644 --- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.iteration.scope @@ -1,22 +1,22 @@ -class MyClass { - constructor(aaa = 0, bbb = 1) { } +class Foo { + constructor(aaa = 0, bbb = 1) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| constructor(aaa = 0, bbb = 1) { } + >----------- +0| class Foo { +1| constructor(aaa = 0, bbb = 1) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| constructor(aaa = 0, bbb = 1) { } +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| constructor(aaa = 0, bbb = 1) {} 2| } < @@ -24,10 +24,4 @@ class MyClass { [#3 Content] = [#3 Domain] = 1:14-1:30 >----------------< -1| constructor(aaa = 0, bbb = 1) { } - - -[#4 Content] = -[#4 Domain] = 1:33-1:34 - >-< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope index 1d2c6188a0..691b97923c 100644 --- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope +++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.constructor.scope @@ -1,41 +1,41 @@ -class MyClass { - constructor(aaa = 0, bbb = 1) { } +class Foo { + constructor(aaa = 0, bbb = 1) {} } --- [#1 Content] = 1:20-1:21 >-< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} [#1 Removal] = 1:17-1:21 >----< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} [#1 Leading delimiter] = 1:17-1:20 >---< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} [#1 Domain] = 1:14-1:21 >-------< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} [#1 Insertion delimiter] = " " [#2 Content] = 1:29-1:30 >-< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} [#2 Removal] = 1:26-1:30 >----< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} [#2 Leading delimiter] = 1:26-1:29 >---< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} [#2 Domain] = 1:23-1:30 >-------< -1| constructor(aaa = 0, bbb = 1) { } +1| constructor(aaa = 0, bbb = 1) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.iteration.scope index 8ca3a14392..3c49de8008 100644 --- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.iteration.scope +++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.iteration.scope @@ -1,19 +1,13 @@ -function myFunk(aaa = 0, bbb = 1) { } +function foo(aaa = 0, bbb = 1) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:37 - >-------------------------------------< -0| function myFunk(aaa = 0, bbb = 1) { } +[#1 Domain] = 0:0-0:33 + >---------------------------------< +0| function foo(aaa = 0, bbb = 1) {} [#2 Content] = -[#2 Domain] = 0:16-0:32 - >----------------< -0| function myFunk(aaa = 0, bbb = 1) { } - - -[#3 Content] = -[#3 Domain] = 0:35-0:36 - >-< -0| function myFunk(aaa = 0, bbb = 1) { } +[#2 Domain] = 0:13-0:29 + >----------------< +0| function foo(aaa = 0, bbb = 1) {} diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope index d5d0134531..9f3c788613 100644 --- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.iteration.scope @@ -1,33 +1,27 @@ -class MyClass { - myFunk(aaa = 0, bbb = 1) { } +class Foo { + bar(aaa = 0, bbb = 1) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk(aaa = 0, bbb = 1) { } + >----------- +0| class Foo { +1| bar(aaa = 0, bbb = 1) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| myFunk(aaa = 0, bbb = 1) { } +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| bar(aaa = 0, bbb = 1) {} 2| } < [#3 Content] = -[#3 Domain] = 1:9-1:25 - >----------------< -1| myFunk(aaa = 0, bbb = 1) { } - - -[#4 Content] = -[#4 Domain] = 1:28-1:29 - >-< -1| myFunk(aaa = 0, bbb = 1) { } +[#3 Domain] = 1:6-1:22 + >----------------< +1| bar(aaa = 0, bbb = 1) {} diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope index e62303c1b2..5a3110c6f3 100644 --- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope +++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.method.scope @@ -1,41 +1,41 @@ -class MyClass { - myFunk(aaa = 0, bbb = 1) { } +class Foo { + bar(aaa = 0, bbb = 1) {} } --- -[#1 Content] = 1:15-1:16 - >-< -1| myFunk(aaa = 0, bbb = 1) { } +[#1 Content] = 1:12-1:13 + >-< +1| bar(aaa = 0, bbb = 1) {} -[#1 Removal] = 1:12-1:16 - >----< -1| myFunk(aaa = 0, bbb = 1) { } +[#1 Removal] = 1:9-1:13 + >----< +1| bar(aaa = 0, bbb = 1) {} -[#1 Leading delimiter] = 1:12-1:15 - >---< -1| myFunk(aaa = 0, bbb = 1) { } +[#1 Leading delimiter] = 1:9-1:12 + >---< +1| bar(aaa = 0, bbb = 1) {} -[#1 Domain] = 1:9-1:16 - >-------< -1| myFunk(aaa = 0, bbb = 1) { } +[#1 Domain] = 1:6-1:13 + >-------< +1| bar(aaa = 0, bbb = 1) {} [#1 Insertion delimiter] = " " -[#2 Content] = 1:24-1:25 - >-< -1| myFunk(aaa = 0, bbb = 1) { } +[#2 Content] = 1:21-1:22 + >-< +1| bar(aaa = 0, bbb = 1) {} -[#2 Removal] = 1:21-1:25 - >----< -1| myFunk(aaa = 0, bbb = 1) { } +[#2 Removal] = 1:18-1:22 + >----< +1| bar(aaa = 0, bbb = 1) {} -[#2 Leading delimiter] = 1:21-1:24 - >---< -1| myFunk(aaa = 0, bbb = 1) { } +[#2 Leading delimiter] = 1:18-1:21 + >---< +1| bar(aaa = 0, bbb = 1) {} -[#2 Domain] = 1:18-1:25 - >-------< -1| myFunk(aaa = 0, bbb = 1) { } +[#2 Domain] = 1:15-1:22 + >-------< +1| bar(aaa = 0, bbb = 1) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.argument.formal.scope b/data/fixtures/scopes/javascript.core/value/value.argument.formal.scope index 90ab463478..169faf764a 100644 --- a/data/fixtures/scopes/javascript.core/value/value.argument.formal.scope +++ b/data/fixtures/scopes/javascript.core/value/value.argument.formal.scope @@ -1,39 +1,39 @@ -function myFunk(aaa = 0, bbb = 1) { } +function foo(aaa = 0, bbb = 1) {} --- -[#1 Content] = 0:22-0:23 - >-< -0| function myFunk(aaa = 0, bbb = 1) { } +[#1 Content] = 0:19-0:20 + >-< +0| function foo(aaa = 0, bbb = 1) {} -[#1 Removal] = 0:19-0:23 - >----< -0| function myFunk(aaa = 0, bbb = 1) { } +[#1 Removal] = 0:16-0:20 + >----< +0| function foo(aaa = 0, bbb = 1) {} -[#1 Leading delimiter] = 0:19-0:22 - >---< -0| function myFunk(aaa = 0, bbb = 1) { } +[#1 Leading delimiter] = 0:16-0:19 + >---< +0| function foo(aaa = 0, bbb = 1) {} -[#1 Domain] = 0:16-0:23 - >-------< -0| function myFunk(aaa = 0, bbb = 1) { } +[#1 Domain] = 0:13-0:20 + >-------< +0| function foo(aaa = 0, bbb = 1) {} [#1 Insertion delimiter] = " " -[#2 Content] = 0:31-0:32 - >-< -0| function myFunk(aaa = 0, bbb = 1) { } +[#2 Content] = 0:28-0:29 + >-< +0| function foo(aaa = 0, bbb = 1) {} -[#2 Removal] = 0:28-0:32 - >----< -0| function myFunk(aaa = 0, bbb = 1) { } +[#2 Removal] = 0:25-0:29 + >----< +0| function foo(aaa = 0, bbb = 1) {} -[#2 Leading delimiter] = 0:28-0:31 - >---< -0| function myFunk(aaa = 0, bbb = 1) { } +[#2 Leading delimiter] = 0:25-0:28 + >---< +0| function foo(aaa = 0, bbb = 1) {} -[#2 Domain] = 0:25-0:32 - >-------< -0| function myFunk(aaa = 0, bbb = 1) { } +[#2 Domain] = 0:22-0:29 + >-------< +0| function foo(aaa = 0, bbb = 1) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.assignment.scope b/data/fixtures/scopes/javascript.core/value/value.assignment.scope index 47eb8c0f75..a614198096 100644 --- a/data/fixtures/scopes/javascript.core/value/value.assignment.scope +++ b/data/fixtures/scopes/javascript.core/value/value.assignment.scope @@ -1,20 +1,20 @@ -aaa = bbb; +foo = 0; --- -[Content] = 0:6-0:9 - >---< -0| aaa = bbb; +[Content] = 0:6-0:7 + >-< +0| foo = 0; -[Removal] = 0:3-0:9 - >------< -0| aaa = bbb; +[Removal] = 0:3-0:7 + >----< +0| foo = 0; [Leading delimiter] = 0:3-0:6 >---< -0| aaa = bbb; +0| foo = 0; -[Domain] = 0:0-0:10 - >----------< -0| aaa = bbb; +[Domain] = 0:0-0:8 + >--------< +0| foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.assignment2.scope b/data/fixtures/scopes/javascript.core/value/value.assignment2.scope new file mode 100644 index 0000000000..8dbdfaf55e --- /dev/null +++ b/data/fixtures/scopes/javascript.core/value/value.assignment2.scope @@ -0,0 +1,20 @@ +foo += 0; +--- + +[Content] = 0:7-0:8 + >-< +0| foo += 0; + +[Removal] = 0:3-0:8 + >-----< +0| foo += 0; + +[Leading delimiter] = 0:3-0:7 + >----< +0| foo += 0; + +[Domain] = 0:0-0:9 + >---------< +0| foo += 0; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.foreach.scope b/data/fixtures/scopes/javascript.core/value/value.foreach.scope index 534e095b62..897c4ffa5d 100644 --- a/data/fixtures/scopes/javascript.core/value/value.foreach.scope +++ b/data/fixtures/scopes/javascript.core/value/value.foreach.scope @@ -1,25 +1,20 @@ -for (const item of items) { - -} +for (const v of values) {} --- -[Content] = 0:19-0:24 - >-----< -0| for (const item of items) { +[Content] = 0:16-0:22 + >------< +0| for (const v of values) {} -[Removal] = 0:18-0:24 - >------< -0| for (const item of items) { +[Removal] = 0:15-0:22 + >-------< +0| for (const v of values) {} -[Leading delimiter] = 0:18-0:19 - >-< -0| for (const item of items) { +[Leading delimiter] = 0:15-0:16 + >-< +0| for (const v of values) {} -[Domain] = 0:0-2:1 - >--------------------------- -0| for (const item of items) { -1| -2| } - -< +[Domain] = 0:0-0:26 + >--------------------------< +0| for (const v of values) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.mapPair.iteration.scope b/data/fixtures/scopes/javascript.core/value/value.mapPair.iteration.scope index 6ad2fbdb42..e952029a05 100644 --- a/data/fixtures/scopes/javascript.core/value/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/javascript.core/value/value.mapPair.iteration.scope @@ -1,13 +1,13 @@ -{ value: 123 } +{aaa: 0, bbb: 1} --- [#1 Content] = -[#1 Domain] = 0:0-0:14 - >--------------< -0| { value: 123 } +[#1 Domain] = 0:0-0:16 + >----------------< +0| {aaa: 0, bbb: 1} [#2 Content] = -[#2 Domain] = 0:1-0:13 - >------------< -0| { value: 123 } +[#2 Domain] = 0:1-0:15 + >--------------< +0| {aaa: 0, bbb: 1} diff --git a/data/fixtures/scopes/javascript.core/value/value.mapPair.scope b/data/fixtures/scopes/javascript.core/value/value.mapPair.scope index 80ac508b04..c6bd37aa6c 100644 --- a/data/fixtures/scopes/javascript.core/value/value.mapPair.scope +++ b/data/fixtures/scopes/javascript.core/value/value.mapPair.scope @@ -1,20 +1,39 @@ -{ value: 123 } +{aaa: 0, bbb: 1} --- -[Content] = 0:9-0:12 - >---< -0| { value: 123 } +[#1 Content] = 0:6-0:7 + >-< +0| {aaa: 0, bbb: 1} -[Removal] = 0:7-0:12 - >-----< -0| { value: 123 } +[#1 Removal] = 0:4-0:7 + >---< +0| {aaa: 0, bbb: 1} -[Leading delimiter] = 0:7-0:9 - >--< -0| { value: 123 } +[#1 Leading delimiter] = 0:4-0:6 + >--< +0| {aaa: 0, bbb: 1} -[Domain] = 0:2-0:12 - >----------< -0| { value: 123 } +[#1 Domain] = 0:1-0:7 + >------< +0| {aaa: 0, bbb: 1} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:14-0:15 + >-< +0| {aaa: 0, bbb: 1} + +[#2 Removal] = 0:12-0:15 + >---< +0| {aaa: 0, bbb: 1} + +[#2 Leading delimiter] = 0:12-0:14 + >--< +0| {aaa: 0, bbb: 1} + +[#2 Domain] = 0:9-0:15 + >------< +0| {aaa: 0, bbb: 1} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.return.scope b/data/fixtures/scopes/javascript.core/value/value.return.scope index ff89cb727b..d9c04a9825 100644 --- a/data/fixtures/scopes/javascript.core/value/value.return.scope +++ b/data/fixtures/scopes/javascript.core/value/value.return.scope @@ -1,4 +1,4 @@ -function myFunk() { +function foo() { return 0; } --- diff --git a/data/fixtures/scopes/javascript.core/value.switch.scope b/data/fixtures/scopes/javascript.core/value/value.switch.scope similarity index 100% rename from data/fixtures/scopes/javascript.core/value.switch.scope rename to data/fixtures/scopes/javascript.core/value/value.switch.scope diff --git a/data/fixtures/scopes/javascript.core/value/value.variable.pattern.scope b/data/fixtures/scopes/javascript.core/value/value.variable.pattern.scope index ccc1ed20ae..c94a7c5421 100644 --- a/data/fixtures/scopes/javascript.core/value/value.variable.pattern.scope +++ b/data/fixtures/scopes/javascript.core/value/value.variable.pattern.scope @@ -1,20 +1,39 @@ -function funk({ value = 2 }) { } +function foo({aaa = 0, bbb = 1}) {} --- -[Content] = 0:24-0:25 - >-< -0| function funk({ value = 2 }) { } +[#1 Content] = 0:20-0:21 + >-< +0| function foo({aaa = 0, bbb = 1}) {} -[Removal] = 0:21-0:25 - >----< -0| function funk({ value = 2 }) { } +[#1 Removal] = 0:17-0:21 + >----< +0| function foo({aaa = 0, bbb = 1}) {} -[Leading delimiter] = 0:21-0:24 - >---< -0| function funk({ value = 2 }) { } +[#1 Leading delimiter] = 0:17-0:20 + >---< +0| function foo({aaa = 0, bbb = 1}) {} -[Domain] = 0:16-0:25 - >---------< -0| function funk({ value = 2 }) { } +[#1 Domain] = 0:14-0:21 + >-------< +0| function foo({aaa = 0, bbb = 1}) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:29-0:30 + >-< +0| function foo({aaa = 0, bbb = 1}) {} + +[#2 Removal] = 0:26-0:30 + >----< +0| function foo({aaa = 0, bbb = 1}) {} + +[#2 Leading delimiter] = 0:26-0:29 + >---< +0| function foo({aaa = 0, bbb = 1}) {} + +[#2 Domain] = 0:23-0:30 + >-------< +0| function foo({aaa = 0, bbb = 1}) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.variable.pattern2.scope b/data/fixtures/scopes/javascript.core/value/value.variable.pattern2.scope index 7e11f3c7c9..b87c7da753 100644 --- a/data/fixtures/scopes/javascript.core/value/value.variable.pattern2.scope +++ b/data/fixtures/scopes/javascript.core/value/value.variable.pattern2.scope @@ -1,39 +1,58 @@ -const { foo = 1 } = opts; +const {aaa = 0, bbb = 1} = foo; --- -[#1 Content] = 0:20-0:24 - >----< -0| const { foo = 1 } = opts; +[#1 Content] = 0:27-0:30 + >---< +0| const {aaa = 0, bbb = 1} = foo; -[#1 Removal] = 0:17-0:24 - >-------< -0| const { foo = 1 } = opts; +[#1 Removal] = 0:24-0:30 + >------< +0| const {aaa = 0, bbb = 1} = foo; -[#1 Leading delimiter] = 0:17-0:20 - >---< -0| const { foo = 1 } = opts; +[#1 Leading delimiter] = 0:24-0:27 + >---< +0| const {aaa = 0, bbb = 1} = foo; -[#1 Domain] = 0:0-0:25 - >-------------------------< -0| const { foo = 1 } = opts; +[#1 Domain] = 0:0-0:31 + >-------------------------------< +0| const {aaa = 0, bbb = 1} = foo; [#1 Insertion delimiter] = " " -[#2 Content] = 0:14-0:15 - >-< -0| const { foo = 1 } = opts; +[#2 Content] = 0:13-0:14 + >-< +0| const {aaa = 0, bbb = 1} = foo; -[#2 Removal] = 0:11-0:15 - >----< -0| const { foo = 1 } = opts; +[#2 Removal] = 0:10-0:14 + >----< +0| const {aaa = 0, bbb = 1} = foo; -[#2 Leading delimiter] = 0:11-0:14 - >---< -0| const { foo = 1 } = opts; +[#2 Leading delimiter] = 0:10-0:13 + >---< +0| const {aaa = 0, bbb = 1} = foo; -[#2 Domain] = 0:8-0:15 - >-------< -0| const { foo = 1 } = opts; +[#2 Domain] = 0:7-0:14 + >-------< +0| const {aaa = 0, bbb = 1} = foo; [#2 Insertion delimiter] = " " + + +[#3 Content] = 0:22-0:23 + >-< +0| const {aaa = 0, bbb = 1} = foo; + +[#3 Removal] = 0:19-0:23 + >----< +0| const {aaa = 0, bbb = 1} = foo; + +[#3 Leading delimiter] = 0:19-0:22 + >---< +0| const {aaa = 0, bbb = 1} = foo; + +[#3 Domain] = 0:16-0:23 + >-------< +0| const {aaa = 0, bbb = 1} = foo; + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.variable.scope b/data/fixtures/scopes/javascript.core/value/value.variable.scope index ff12557f65..b52ad1e5c6 100644 --- a/data/fixtures/scopes/javascript.core/value/value.variable.scope +++ b/data/fixtures/scopes/javascript.core/value/value.variable.scope @@ -1,20 +1,20 @@ -const name = "Hello world"; +const foo = 0; --- -[Content] = 0:13-0:26 - >-------------< -0| const name = "Hello world"; +[Content] = 0:12-0:13 + >-< +0| const foo = 0; -[Removal] = 0:10-0:26 - >----------------< -0| const name = "Hello world"; +[Removal] = 0:9-0:13 + >----< +0| const foo = 0; -[Leading delimiter] = 0:10-0:13 - >---< -0| const name = "Hello world"; +[Leading delimiter] = 0:9-0:12 + >---< +0| const foo = 0; -[Domain] = 0:0-0:27 - >---------------------------< -0| const name = "Hello world"; +[Domain] = 0:0-0:14 + >--------------< +0| const foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.core/value/value.yield.scope b/data/fixtures/scopes/javascript.core/value/value.yield.scope index b30ffd0db3..555b8dfc04 100644 --- a/data/fixtures/scopes/javascript.core/value/value.yield.scope +++ b/data/fixtures/scopes/javascript.core/value/value.yield.scope @@ -1,20 +1,20 @@ -yield 5; +yield 0; --- [Content] = 0:6-0:7 >-< -0| yield 5; +0| yield 0; [Removal] = 0:5-0:7 >--< -0| yield 5; +0| yield 0; [Leading delimiter] = 0:5-0:6 >-< -0| yield 5; +0| yield 0; -[Domain] = 0:0-0:7 - >-------< -0| yield 5; +[Domain] = 0:0-0:8 + >--------< +0| yield 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.jsx/attribute.scope b/data/fixtures/scopes/javascript.jsx/attribute.scope index ad4db47809..26357f4cc8 100644 --- a/data/fixtures/scopes/javascript.jsx/attribute.scope +++ b/data/fixtures/scopes/javascript.jsx/attribute.scope @@ -1,17 +1,17 @@ -
+
--- [Content] = -[Domain] = 0:5-0:14 - >---------< -0|
+[Domain] = 0:5-0:13 + >--------< +0|
-[Removal] = 0:4-0:14 - >----------< -0|
+[Removal] = 0:4-0:13 + >---------< +0|
[Leading delimiter] = 0:4-0:5 >-< -0|
+0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.jsx/element.scope b/data/fixtures/scopes/javascript.jsx/element.scope index 7fce7e4f9f..32576341c6 100644 --- a/data/fixtures/scopes/javascript.jsx/element.scope +++ b/data/fixtures/scopes/javascript.jsx/element.scope @@ -1,10 +1,10 @@ -
text
+
--- [Content] = [Removal] = -[Domain] = 0:0-0:25 - >-------------------------< -0|
text
+[Domain] = 0:0-0:11 + >-----------< +0|
[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/javascript.jsx/endTag.scope b/data/fixtures/scopes/javascript.jsx/endTag.scope index 61c4e46bcd..ee1ca07bd0 100644 --- a/data/fixtures/scopes/javascript.jsx/endTag.scope +++ b/data/fixtures/scopes/javascript.jsx/endTag.scope @@ -1,13 +1,13 @@ -
+
--- [Content] = -[Removal] = 0:15-0:21 - >------< -0|
+[Removal] = 0:5-0:11 + >------< +0|
-[Domain] = 0:0-0:21 - >---------------------< -0|
+[Domain] = 0:0-0:11 + >-----------< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.jsx/interior.element.scope b/data/fixtures/scopes/javascript.jsx/interior.element.scope index 9682fcd74b..74c625a413 100644 --- a/data/fixtures/scopes/javascript.jsx/interior.element.scope +++ b/data/fixtures/scopes/javascript.jsx/interior.element.scope @@ -1,40 +1,37 @@ -
text
+
--- [#1 Content] = [#1 Removal] = 0:1-0:4 >---< -0|
text
+0|
[#1 Domain] = 0:0-0:5 >-----< -0|
text
+0|
[#1 Insertion delimiter] = " " -[#2 Content] = 0:6-0:10 - >----< -0|
text
+[#2 Content] = +[#2 Removal] = 0:5-0:6 + >-< +0|
-[#2 Removal] = 0:5-0:11 - >------< -0|
text
- -[#2 Domain] = 0:0-0:17 - >-----------------< -0|
text
+[#2 Domain] = 0:0-0:12 + >------------< +0|
[#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 0:13-0:16 - >---< -0|
text
+[#3 Removal] = 0:8-0:11 + >---< +0|
-[#3 Domain] = 0:11-0:17 - >------< -0|
text
+[#3 Domain] = 0:6-0:12 + >------< +0|
[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.jsx/key.attribute.scope b/data/fixtures/scopes/javascript.jsx/key.attribute.scope index aae05371b9..f5eea35ea2 100644 --- a/data/fixtures/scopes/javascript.jsx/key.attribute.scope +++ b/data/fixtures/scopes/javascript.jsx/key.attribute.scope @@ -1,20 +1,20 @@ -
+
--- [Content] = 0:5-0:7 >--< -0|
+0|
[Removal] = 0:5-0:8 >---< -0|
+0|
[Trailing delimiter] = 0:7-0:8 >-< -0|
+0|
-[Domain] = 0:5-0:14 - >---------< -0|
+[Domain] = 0:5-0:13 + >--------< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.jsx/startTag.scope b/data/fixtures/scopes/javascript.jsx/startTag.scope index d3f5ce5ef8..bd0b430ab4 100644 --- a/data/fixtures/scopes/javascript.jsx/startTag.scope +++ b/data/fixtures/scopes/javascript.jsx/startTag.scope @@ -1,13 +1,13 @@ -
+
--- [Content] = -[Removal] = 0:0-0:15 - >---------------< -0|
+[Removal] = 0:0-0:5 + >-----< +0|
-[Domain] = 0:0-0:21 - >---------------------< -0|
+[Domain] = 0:0-0:11 + >-----------< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.jsx/tags.scope b/data/fixtures/scopes/javascript.jsx/tags.scope index 7343bd387e..3782d13608 100644 --- a/data/fixtures/scopes/javascript.jsx/tags.scope +++ b/data/fixtures/scopes/javascript.jsx/tags.scope @@ -1,20 +1,34 @@ -
hello
+
--- -[#1.1 Content] = -[#1.1 Removal] = 0:0-0:5 +[#1.1 Content] = 0:0-0:5 >-----< -0|
hello
+0|
+ +[#1.1 Removal] = 0:0-0:6 + >------< +0|
+ +[#1.1 Trailing delimiter] = 0:5-0:6 + >-< +0|
[#1.1 Insertion delimiter] = " " -[#1.2 Content] = -[#1.2 Removal] = 0:10-0:16 - >------< -0|
hello
+[#1.2 Content] = 0:6-0:12 + >------< +0|
+ +[#1.2 Removal] = 0:5-0:12 + >-------< +0|
+ +[#1.2 Leading delimiter] = 0:5-0:6 + >-< +0|
[#1.2 Insertion delimiter] = " " -[#1 Domain] = 0:0-0:16 - >----------------< -0|
hello
+[#1 Domain] = 0:0-0:12 + >------------< +0|
diff --git a/data/fixtures/scopes/javascript.jsx/textFragment.element.scope b/data/fixtures/scopes/javascript.jsx/textFragment.element.scope index 723c8bfea7..41015728b5 100644 --- a/data/fixtures/scopes/javascript.jsx/textFragment.element.scope +++ b/data/fixtures/scopes/javascript.jsx/textFragment.element.scope @@ -1,10 +1,10 @@ -
text
+
Hello world
--- [Content] = [Removal] = -[Domain] = 0:5-0:9 - >----< -0|
text
+[Domain] = 0:5-0:16 + >-----------< +0|
Hello world
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.jsx/textFragment.element2.scope b/data/fixtures/scopes/javascript.jsx/textFragment.element2.scope index 3cb0e8a63c..4ed9aaf9ae 100644 --- a/data/fixtures/scopes/javascript.jsx/textFragment.element2.scope +++ b/data/fixtures/scopes/javascript.jsx/textFragment.element2.scope @@ -1,10 +1,10 @@ -
({value})
+
({foo})
--- [Content] = [Removal] = -[Domain] = 0:5-0:14 - >---------< -0|
({value})
+[Domain] = 0:5-0:12 + >-------< +0|
({foo})
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/javascript.jsx/value.attribute.scope b/data/fixtures/scopes/javascript.jsx/value.attribute.scope index c9b9bfb687..03a1818cd5 100644 --- a/data/fixtures/scopes/javascript.jsx/value.attribute.scope +++ b/data/fixtures/scopes/javascript.jsx/value.attribute.scope @@ -1,20 +1,20 @@ -
+
--- -[Content] = 0:8-0:14 - >------< -0|
+[Content] = 0:8-0:13 + >-----< +0|
-[Removal] = 0:7-0:14 - >-------< -0|
+[Removal] = 0:7-0:13 + >------< +0|
[Leading delimiter] = 0:7-0:8 >-< -0|
+0|
-[Domain] = 0:5-0:14 - >---------< -0|
+[Domain] = 0:5-0:13 + >--------< +0|
[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/comment.block.scope b/data/fixtures/scopes/json/comment.block.scope index f8b38ca6af..5e8b51111c 100644 --- a/data/fixtures/scopes/json/comment.block.scope +++ b/data/fixtures/scopes/json/comment.block.scope @@ -1,15 +1,10 @@ -/* - Hello world -*/ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-2:2 - >-- -0| /* -1| Hello world -2| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/json/key.mapPair.iteration.scope b/data/fixtures/scopes/json/key.mapPair.iteration.scope index 26d6903226..8de11377ba 100644 --- a/data/fixtures/scopes/json/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/json/key.mapPair.iteration.scope @@ -1,7 +1,7 @@ -{"aaa": 123, "bbb": 456} +{"aaa": 0, "bbb": 1} --- [Content] = -[Domain] = 0:1-0:23 - >----------------------< -0| {"aaa": 123, "bbb": 456} +[Domain] = 0:1-0:19 + >------------------< +0| {"aaa": 0, "bbb": 1} diff --git a/data/fixtures/scopes/json/key.mapPair.scope b/data/fixtures/scopes/json/key.mapPair.scope index d77e7977cf..7865933555 100644 --- a/data/fixtures/scopes/json/key.mapPair.scope +++ b/data/fixtures/scopes/json/key.mapPair.scope @@ -1,39 +1,39 @@ -{"aaa": 123, "bbb": 456} +{"aaa": 0, "bbb": 1} --- [#1 Content] = 0:1-0:6 >-----< -0| {"aaa": 123, "bbb": 456} +0| {"aaa": 0, "bbb": 1} [#1 Removal] = 0:1-0:8 >-------< -0| {"aaa": 123, "bbb": 456} +0| {"aaa": 0, "bbb": 1} [#1 Trailing delimiter] = 0:6-0:8 >--< -0| {"aaa": 123, "bbb": 456} +0| {"aaa": 0, "bbb": 1} -[#1 Domain] = 0:1-0:11 - >----------< -0| {"aaa": 123, "bbb": 456} +[#1 Domain] = 0:1-0:9 + >--------< +0| {"aaa": 0, "bbb": 1} [#1 Insertion delimiter] = " " -[#2 Content] = 0:13-0:18 - >-----< -0| {"aaa": 123, "bbb": 456} +[#2 Content] = 0:11-0:16 + >-----< +0| {"aaa": 0, "bbb": 1} -[#2 Removal] = 0:13-0:20 - >-------< -0| {"aaa": 123, "bbb": 456} +[#2 Removal] = 0:11-0:18 + >-------< +0| {"aaa": 0, "bbb": 1} -[#2 Trailing delimiter] = 0:18-0:20 - >--< -0| {"aaa": 123, "bbb": 456} +[#2 Trailing delimiter] = 0:16-0:18 + >--< +0| {"aaa": 0, "bbb": 1} -[#2 Domain] = 0:13-0:23 - >----------< -0| {"aaa": 123, "bbb": 456} +[#2 Domain] = 0:11-0:19 + >--------< +0| {"aaa": 0, "bbb": 1} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/list.scope b/data/fixtures/scopes/json/list.scope index 54a5d795c2..053c607f96 100644 --- a/data/fixtures/scopes/json/list.scope +++ b/data/fixtures/scopes/json/list.scope @@ -1,10 +1,10 @@ -[1, 2, 3] +[aaa, bbb] --- [Content] = [Removal] = -[Domain] = 0:0-0:9 - >---------< -0| [1, 2, 3] +[Domain] = 0:0-0:10 + >----------< +0| [aaa, bbb] [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/map.scope b/data/fixtures/scopes/json/map.scope index 213d54caa1..73f7f94a1f 100644 --- a/data/fixtures/scopes/json/map.scope +++ b/data/fixtures/scopes/json/map.scope @@ -1,10 +1,10 @@ -{"aaa": 123, "bbb": 456} +{"aaa": 0, "bbb": 1} --- [Content] = [Removal] = -[Domain] = 0:0-0:24 - >------------------------< -0| {"aaa": 123, "bbb": 456} +[Domain] = 0:0-0:20 + >--------------------< +0| {"aaa": 0, "bbb": 1} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/string.singleLine.scope b/data/fixtures/scopes/json/string.singleLine.scope index 9a81284fe2..4b26cf31b3 100644 --- a/data/fixtures/scopes/json/string.singleLine.scope +++ b/data/fixtures/scopes/json/string.singleLine.scope @@ -1,10 +1,10 @@ -"value" +"Hello world" --- [Content] = [Removal] = -[Domain] = 0:0-0:7 - >-------< -0| "value" +[Domain] = 0:0-0:13 + >-------------< +0| "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/string.singleLine2.scope b/data/fixtures/scopes/json/string.singleLine2.scope deleted file mode 100644 index ac6fe7e5ee..0000000000 --- a/data/fixtures/scopes/json/string.singleLine2.scope +++ /dev/null @@ -1,26 +0,0 @@ -{"key": "value"} ---- - -[#1 Content] = -[#1 Removal] = -[#1 Domain] = 0:1-0:6 - >-----< -0| {"key": "value"} - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Domain] = 0:8-0:15 - >-------< -0| {"key": "value"} - -[#2 Removal] = 0:7-0:15 - >--------< -0| {"key": "value"} - -[#2 Leading delimiter] = 0:7-0:8 - >-< -0| {"key": "value"} - -[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/textFragment.comment.block.scope b/data/fixtures/scopes/json/textFragment.comment.block.scope index e037658206..af33f95d00 100644 --- a/data/fixtures/scopes/json/textFragment.comment.block.scope +++ b/data/fixtures/scopes/json/textFragment.comment.block.scope @@ -1,15 +1,10 @@ -/* - Hello world -*/ +/* Hello world */ --- [Content] = [Removal] = -[Domain] = 0:0-2:2 - >-- -0| /* -1| Hello world -2| */ - --< +[Domain] = 0:0-0:17 + >-----------------< +0| /* Hello world */ [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/textFragment.string.singleLine.scope b/data/fixtures/scopes/json/textFragment.string.singleLine.scope index 472aea176e..85dcf5fa7f 100644 --- a/data/fixtures/scopes/json/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/json/textFragment.string.singleLine.scope @@ -1,10 +1,10 @@ -"value" +"Hello world" --- [Content] = [Removal] = -[Domain] = 0:1-0:6 - >-----< -0| "value" +[Domain] = 0:1-0:12 + >-----------< +0| "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/textFragment.string.singleLine2.scope b/data/fixtures/scopes/json/textFragment.string.singleLine2.scope deleted file mode 100644 index 9c86ca8d55..0000000000 --- a/data/fixtures/scopes/json/textFragment.string.singleLine2.scope +++ /dev/null @@ -1,19 +0,0 @@ -{"key": "value"} ---- - -[#1 Content] = -[#1 Removal] = -[#1 Domain] = 0:2-0:5 - >---< -0| {"key": "value"} - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = -[#2 Domain] = 0:9-0:14 - >-----< -0| {"key": "value"} - -[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/json/value.mapPair.iteration.scope b/data/fixtures/scopes/json/value.mapPair.iteration.scope index 26d6903226..8de11377ba 100644 --- a/data/fixtures/scopes/json/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/json/value.mapPair.iteration.scope @@ -1,7 +1,7 @@ -{"aaa": 123, "bbb": 456} +{"aaa": 0, "bbb": 1} --- [Content] = -[Domain] = 0:1-0:23 - >----------------------< -0| {"aaa": 123, "bbb": 456} +[Domain] = 0:1-0:19 + >------------------< +0| {"aaa": 0, "bbb": 1} diff --git a/data/fixtures/scopes/json/value.mapPair.scope b/data/fixtures/scopes/json/value.mapPair.scope index d4cf96e4d9..ab58b19e40 100644 --- a/data/fixtures/scopes/json/value.mapPair.scope +++ b/data/fixtures/scopes/json/value.mapPair.scope @@ -1,39 +1,39 @@ -{"aaa": 123, "bbb": 456} +{"aaa": 0, "bbb": 1} --- -[#1 Content] = 0:8-0:11 - >---< -0| {"aaa": 123, "bbb": 456} +[#1 Content] = 0:8-0:9 + >-< +0| {"aaa": 0, "bbb": 1} -[#1 Removal] = 0:6-0:11 - >-----< -0| {"aaa": 123, "bbb": 456} +[#1 Removal] = 0:6-0:9 + >---< +0| {"aaa": 0, "bbb": 1} [#1 Leading delimiter] = 0:6-0:8 >--< -0| {"aaa": 123, "bbb": 456} +0| {"aaa": 0, "bbb": 1} -[#1 Domain] = 0:1-0:11 - >----------< -0| {"aaa": 123, "bbb": 456} +[#1 Domain] = 0:1-0:9 + >--------< +0| {"aaa": 0, "bbb": 1} [#1 Insertion delimiter] = " " -[#2 Content] = 0:20-0:23 - >---< -0| {"aaa": 123, "bbb": 456} +[#2 Content] = 0:18-0:19 + >-< +0| {"aaa": 0, "bbb": 1} -[#2 Removal] = 0:18-0:23 - >-----< -0| {"aaa": 123, "bbb": 456} +[#2 Removal] = 0:16-0:19 + >---< +0| {"aaa": 0, "bbb": 1} -[#2 Leading delimiter] = 0:18-0:20 - >--< -0| {"aaa": 123, "bbb": 456} +[#2 Leading delimiter] = 0:16-0:18 + >--< +0| {"aaa": 0, "bbb": 1} -[#2 Domain] = 0:13-0:23 - >----------< -0| {"aaa": 123, "bbb": 456} +[#2 Domain] = 0:11-0:19 + >--------< +0| {"aaa": 0, "bbb": 1} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/jsonl/map.scope b/data/fixtures/scopes/jsonl/map.scope index 46c7892ac0..e25547e05b 100644 --- a/data/fixtures/scopes/jsonl/map.scope +++ b/data/fixtures/scopes/jsonl/map.scope @@ -1,5 +1,5 @@ {"aaa": 0} -{"bbb": 0} +{"bbb": 1} --- [#1 Content] = @@ -10,7 +10,7 @@ [#1 Removal] = 0:0-1:0 >---------- 0| {"aaa": 0} -1| {"bbb": 0} +1| {"bbb": 1} < [#1 Insertion delimiter] = " " @@ -19,12 +19,12 @@ [#2 Content] = [#2 Domain] = 1:0-1:10 >----------< -1| {"bbb": 0} +1| {"bbb": 1} [#2 Removal] = 0:10-1:10 > 0| {"aaa": 0} -1| {"bbb": 0} +1| {"bbb": 1} ----------< [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/latex/comment.block.scope b/data/fixtures/scopes/latex/comment.block.scope index 05e52078e5..128b8963ea 100644 --- a/data/fixtures/scopes/latex/comment.block.scope +++ b/data/fixtures/scopes/latex/comment.block.scope @@ -1,15 +1,10 @@ -\iffalse -some comment -\fi +\iffalse Hello world \fi --- [Content] = [Removal] = -[Domain] = 0:0-2:3 - >-------- -0| \iffalse -1| some comment -2| \fi - ---< +[Domain] = 0:0-0:24 + >------------------------< +0| \iffalse Hello world \fi [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/latex/comment.line.scope b/data/fixtures/scopes/latex/comment.line.scope index 8269ee28b6..1877fe4eea 100644 --- a/data/fixtures/scopes/latex/comment.line.scope +++ b/data/fixtures/scopes/latex/comment.line.scope @@ -1,17 +1,17 @@ -\LaTeX % some comment +\LaTeX % Hello world --- [Content] = -[Domain] = 0:7-0:21 - >--------------< -0| \LaTeX % some comment +[Domain] = 0:7-0:20 + >-------------< +0| \LaTeX % Hello world -[Removal] = 0:6-0:21 - >---------------< -0| \LaTeX % some comment +[Removal] = 0:6-0:20 + >--------------< +0| \LaTeX % Hello world [Leading delimiter] = 0:6-0:7 >-< -0| \LaTeX % some comment +0| \LaTeX % Hello world [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/latex/environment.scope b/data/fixtures/scopes/latex/environment.scope index 8d938b3d62..6432d49613 100644 --- a/data/fixtures/scopes/latex/environment.scope +++ b/data/fixtures/scopes/latex/environment.scope @@ -1,5 +1,5 @@ \begin{quote} - Hello + Hello world \end{quote} --- @@ -8,7 +8,7 @@ [Domain] = 0:0-2:11 >------------- 0| \begin{quote} -1| Hello +1| Hello world 2| \end{quote} -----------< diff --git a/data/fixtures/scopes/lua/functionCall.scope b/data/fixtures/scopes/lua/functionCall.scope new file mode 100644 index 0000000000..00162e317c --- /dev/null +++ b/data/fixtures/scopes/lua/functionCall.scope @@ -0,0 +1,10 @@ +foo() +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:5 + >-----< +0| foo() + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/functionCallee.scope b/data/fixtures/scopes/lua/functionCallee.scope index d922c928de..2b075b5c33 100644 --- a/data/fixtures/scopes/lua/functionCallee.scope +++ b/data/fixtures/scopes/lua/functionCallee.scope @@ -1,13 +1,13 @@ -print("a is greater than 10") +foo() --- [Content] = -[Removal] = 0:0-0:5 - >-----< -0| print("a is greater than 10") +[Removal] = 0:0-0:3 + >---< +0| foo() -[Domain] = 0:0-0:29 - >-----------------------------< -0| print("a is greater than 10") +[Domain] = 0:0-0:5 + >-----< +0| foo() [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/ifStatement.scope b/data/fixtures/scopes/lua/ifStatement.scope index 0ae5d2a88f..f92c2b599b 100644 --- a/data/fixtures/scopes/lua/ifStatement.scope +++ b/data/fixtures/scopes/lua/ifStatement.scope @@ -1,9 +1,9 @@ if true then a = 1 elseif false then - a = 1 + a = 2 else - a = 1 + a = 3 end --- @@ -14,9 +14,9 @@ end 0| if true then 1| a = 1 2| elseif false then -3| a = 1 +3| a = 2 4| else -5| a = 1 +5| a = 3 6| end ---< diff --git a/data/fixtures/scopes/lua/interior.function.scope b/data/fixtures/scopes/lua/interior.function.scope index 4880d538f5..ee6c7f7217 100644 --- a/data/fixtures/scopes/lua/interior.function.scope +++ b/data/fixtures/scopes/lua/interior.function.scope @@ -1,30 +1,25 @@ -function makeCounter() - local count = 0 -end +function foo() end --- [#1 Content] = -[#1 Removal] = 1:4-1:19 - >---------------< -1| local count = 0 +[#1 Removal] = 0:14-0:15 + >-< +0| function foo() end -[#1 Domain] = 0:0-2:3 - >---------------------- -0| function makeCounter() -1| local count = 0 -2| end - ---< +[#1 Domain] = 0:0-0:18 + >------------------< +0| function foo() end [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:21-0:21 - >< -0| function makeCounter() +[#2 Removal] = 0:13-0:13 + >< +0| function foo() end -[#2 Domain] = 0:20-0:22 - >--< -0| function makeCounter() +[#2 Domain] = 0:12-0:14 + >--< +0| function foo() end [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/map.scope b/data/fixtures/scopes/lua/map.scope index afca7544f1..dede8241ac 100644 --- a/data/fixtures/scopes/lua/map.scope +++ b/data/fixtures/scopes/lua/map.scope @@ -1,17 +1,10 @@ -foo = { bar = "a", baz = "b" } +{ aaa = 0, bbb = 1 } --- [Content] = -[Domain] = 0:6-0:30 - >------------------------< -0| foo = { bar = "a", baz = "b" } - -[Removal] = 0:5-0:30 - >-------------------------< -0| foo = { bar = "a", baz = "b" } - -[Leading delimiter] = 0:5-0:6 - >-< -0| foo = { bar = "a", baz = "b" } +[Removal] = +[Domain] = 0:0-0:20 + >--------------------< +0| { aaa = 0, bbb = 1 } [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/name.assignment.scope b/data/fixtures/scopes/lua/name.assignment.scope index b74dbc1331..7a03d93749 100644 --- a/data/fixtures/scopes/lua/name.assignment.scope +++ b/data/fixtures/scopes/lua/name.assignment.scope @@ -1,20 +1,20 @@ -a, b = 1, 2 +foo = 0 --- -[Content] = 0:0-0:4 - >----< -0| a, b = 1, 2 +[Content] = 0:0-0:3 + >---< +0| foo = 0 -[Removal] = 0:0-0:7 - >-------< -0| a, b = 1, 2 +[Removal] = 0:0-0:6 + >------< +0| foo = 0 -[Trailing delimiter] = 0:4-0:7 - >---< -0| a, b = 1, 2 +[Trailing delimiter] = 0:3-0:6 + >---< +0| foo = 0 -[Domain] = 0:0-0:11 - >-----------< -0| a, b = 1, 2 +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/name.assignment2.scope b/data/fixtures/scopes/lua/name.assignment2.scope new file mode 100644 index 0000000000..3cba4f9d04 --- /dev/null +++ b/data/fixtures/scopes/lua/name.assignment2.scope @@ -0,0 +1,20 @@ +foo, bar = 0, 1 +--- + +[Content] = 0:0-0:8 + >--------< +0| foo, bar = 0, 1 + +[Removal] = 0:0-0:11 + >-----------< +0| foo, bar = 0, 1 + +[Trailing delimiter] = 0:8-0:11 + >---< +0| foo, bar = 0, 1 + +[Domain] = 0:0-0:15 + >---------------< +0| foo, bar = 0, 1 + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/name.variable.scope b/data/fixtures/scopes/lua/name.variable.scope index 0636e4e0dc..be73ac15c2 100644 --- a/data/fixtures/scopes/lua/name.variable.scope +++ b/data/fixtures/scopes/lua/name.variable.scope @@ -1,24 +1,24 @@ -local a, b = 1, 2 +local foo = 0 --- -[Content] = 0:6-0:10 - >----< -0| local a, b = 1, 2 +[Content] = 0:6-0:9 + >---< +0| local foo = 0 -[Removal] = 0:0-0:13 - >-------------< -0| local a, b = 1, 2 +[Removal] = 0:0-0:12 + >------------< +0| local foo = 0 [Leading delimiter] = 0:5-0:6 >-< -0| local a, b = 1, 2 +0| local foo = 0 -[Trailing delimiter] = 0:10-0:11 - >-< -0| local a, b = 1, 2 +[Trailing delimiter] = 0:9-0:10 + >-< +0| local foo = 0 -[Domain] = 0:0-0:17 - >-----------------< -0| local a, b = 1, 2 +[Domain] = 0:0-0:13 + >-------------< +0| local foo = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/name.variable2.scope b/data/fixtures/scopes/lua/name.variable2.scope new file mode 100644 index 0000000000..a1a6bc3ae1 --- /dev/null +++ b/data/fixtures/scopes/lua/name.variable2.scope @@ -0,0 +1,24 @@ +local foo, bar = 0, 1 +--- + +[Content] = 0:6-0:14 + >--------< +0| local foo, bar = 0, 1 + +[Removal] = 0:0-0:17 + >-----------------< +0| local foo, bar = 0, 1 + +[Leading delimiter] = 0:5-0:6 + >-< +0| local foo, bar = 0, 1 + +[Trailing delimiter] = 0:14-0:15 + >-< +0| local foo, bar = 0, 1 + +[Domain] = 0:0-0:21 + >---------------------< +0| local foo, bar = 0, 1 + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/namedFunction.scope b/data/fixtures/scopes/lua/namedFunction.scope index d14715737a..51b1d2134a 100644 --- a/data/fixtures/scopes/lua/namedFunction.scope +++ b/data/fixtures/scopes/lua/namedFunction.scope @@ -1,23 +1,15 @@ -function makeCounter() - local count = 0 - return function() - count = count + 1 - return count - end +function foo() + bar = 0 end --- [Content] = [Removal] = -[Domain] = 0:0-6:3 - >---------------------- -0| function makeCounter() -1| local count = 0 -2| return function() -3| count = count + 1 -4| return count -5| end -6| end +[Domain] = 0:0-2:3 + >-------------- +0| function foo() +1| bar = 0 +2| end ---< [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/lua/value.assignment.scope b/data/fixtures/scopes/lua/value.assignment.scope index 6c167887b4..6e89de0927 100644 --- a/data/fixtures/scopes/lua/value.assignment.scope +++ b/data/fixtures/scopes/lua/value.assignment.scope @@ -1,20 +1,20 @@ -a, b = 1, 2 +foo = 0 --- -[Content] = 0:7-0:11 - >----< -0| a, b = 1, 2 +[Content] = 0:6-0:7 + >-< +0| foo = 0 -[Removal] = 0:4-0:11 - >-------< -0| a, b = 1, 2 +[Removal] = 0:3-0:7 + >----< +0| foo = 0 -[Leading delimiter] = 0:4-0:7 - >---< -0| a, b = 1, 2 +[Leading delimiter] = 0:3-0:6 + >---< +0| foo = 0 -[Domain] = 0:0-0:11 - >-----------< -0| a, b = 1, 2 +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/value.assignment2.scope b/data/fixtures/scopes/lua/value.assignment2.scope new file mode 100644 index 0000000000..35ce89b4d6 --- /dev/null +++ b/data/fixtures/scopes/lua/value.assignment2.scope @@ -0,0 +1,21 @@ +foo, bar = 0, 1 + +--- + +[Content] = 0:11-0:15 + >----< +0| foo, bar = 0, 1 + +[Removal] = 0:8-0:15 + >-------< +0| foo, bar = 0, 1 + +[Leading delimiter] = 0:8-0:11 + >---< +0| foo, bar = 0, 1 + +[Domain] = 0:0-0:15 + >---------------< +0| foo, bar = 0, 1 + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/value.variable.scope b/data/fixtures/scopes/lua/value.variable.scope index 925e70be86..134377f10b 100644 --- a/data/fixtures/scopes/lua/value.variable.scope +++ b/data/fixtures/scopes/lua/value.variable.scope @@ -1,20 +1,20 @@ -local a, b = 1, 2 +local foo = 0 --- -[Content] = 0:13-0:17 - >----< -0| local a, b = 1, 2 +[Content] = 0:12-0:13 + >-< +0| local foo = 0 -[Removal] = 0:10-0:17 - >-------< -0| local a, b = 1, 2 +[Removal] = 0:9-0:13 + >----< +0| local foo = 0 -[Leading delimiter] = 0:10-0:13 - >---< -0| local a, b = 1, 2 +[Leading delimiter] = 0:9-0:12 + >---< +0| local foo = 0 -[Domain] = 0:0-0:17 - >-----------------< -0| local a, b = 1, 2 +[Domain] = 0:0-0:13 + >-------------< +0| local foo = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/lua/value.variable2.scope b/data/fixtures/scopes/lua/value.variable2.scope new file mode 100644 index 0000000000..3725f30c9f --- /dev/null +++ b/data/fixtures/scopes/lua/value.variable2.scope @@ -0,0 +1,20 @@ +local foo, bar = 0, 1 +--- + +[Content] = 0:17-0:21 + >----< +0| local foo, bar = 0, 1 + +[Removal] = 0:14-0:21 + >-------< +0| local foo, bar = 0, 1 + +[Leading delimiter] = 0:14-0:17 + >---< +0| local foo, bar = 0, 1 + +[Domain] = 0:0-0:21 + >---------------------< +0| local foo, bar = 0, 1 + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/markdown/comment.block.scope b/data/fixtures/scopes/markdown/comment.block.scope index c0ccd2e760..bf46a7b167 100644 --- a/data/fixtures/scopes/markdown/comment.block.scope +++ b/data/fixtures/scopes/markdown/comment.block.scope @@ -1,17 +1,10 @@ - + --- [Content] = [Removal] = -[Domain] = 0:0-3:3 - >---- -0| - ---< +[Domain] = 0:0-0:20 + >--------------------< +0| [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/markdown/interior.cell.scope b/data/fixtures/scopes/markdown/interior.cell.scope index 9bf5718ecd..ea6c76e382 100644 --- a/data/fixtures/scopes/markdown/interior.cell.scope +++ b/data/fixtures/scopes/markdown/interior.cell.scope @@ -1,116 +1,26 @@ -```python -def foo(): - pass +```ts +let foo; ``` - -``` -hello -``` - --- -[#1 Content] = 0:3-2:8 - >------ -0| ```python -1| def foo(): -2| pass +[Content] = 0:3-1:8 + >-- +0| ```ts +1| let foo; --------< -[#1 Removal] = 0:3-3:0 - >------ -0| ```python -1| def foo(): -2| pass -3| ``` - < - -[#1 Domain] = 0:0-3:3 - >--------- -0| ```python -1| def foo(): -2| pass -3| ``` - ---< - -[#1 Insertion delimiter] = " " - - -[#2 Content] = 1:0-2:8 - >---------- -1| def foo(): -2| pass - --------< - -[#2 Removal] = 0:9-3:0 - > -0| ```python -1| def foo(): -2| pass -3| ``` - < - -[#2 Domain] = 0:0-4:0 - >--------- -0| ```python -1| def foo(): -2| pass -3| ``` -4| - < - -[#2 Insertion delimiter] = " " - - -[#3 Content] = -[#3 Removal] = 1:8-1:8 - >< -1| def foo(): - -[#3 Domain] = 1:7-1:9 - >--< -1| def foo(): - -[#3 Insertion delimiter] = " " - - -[#4 Content] = 6:0-6:5 - >-----< -6| hello - -[#4 Removal] = 5:3-7:0 - > -5| ``` -6| hello -7| ``` +[Removal] = 0:3-2:0 + >-- +0| ```ts +1| let foo; +2| ``` < -[#4 Domain] = 5:0-7:3 - >--- -5| ``` -6| hello -7| ``` +[Domain] = 0:0-2:3 + >----- +0| ```ts +1| let foo; +2| ``` ---< -[#4 Insertion delimiter] = " " - - -[#5 Content] = 6:0-6:5 - >-----< -6| hello - -[#5 Removal] = 5:3-7:0 - > -5| ``` -6| hello -7| ``` - < - -[#5 Domain] = 5:0-8:0 - >--- -5| ``` -6| hello -7| ``` -8| - < - -[#5 Insertion delimiter] = " " +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/markdown/interior.cell2.scope b/data/fixtures/scopes/markdown/interior.cell2.scope new file mode 100644 index 0000000000..1366885ab2 --- /dev/null +++ b/data/fixtures/scopes/markdown/interior.cell2.scope @@ -0,0 +1,24 @@ +``` +Hello world +``` +--- + +[Content] = 1:0-1:11 + >-----------< +1| Hello world + +[Removal] = 0:3-2:0 + > +0| ``` +1| Hello world +2| ``` + < + +[Domain] = 0:0-2:3 + >--- +0| ``` +1| Hello world +2| ``` + ---< + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/markdown/list.scope b/data/fixtures/scopes/markdown/list.scope index 2f68327fde..ac6f23b019 100644 --- a/data/fixtures/scopes/markdown/list.scope +++ b/data/fixtures/scopes/markdown/list.scope @@ -1,13 +1,13 @@ -* hello -* stuff +* aaa +* bbb --- [Content] = [Removal] = -[Domain] = 0:0-1:7 - >------- -0| * hello -1| * stuff - -------< +[Domain] = 0:0-1:5 + >----- +0| * aaa +1| * bbb + -----< [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/markdown/notebookCell.scope b/data/fixtures/scopes/markdown/notebookCell.scope index 5493342751..e6ca027093 100644 --- a/data/fixtures/scopes/markdown/notebookCell.scope +++ b/data/fixtures/scopes/markdown/notebookCell.scope @@ -1,51 +1,23 @@ -```python -def foo(): - pass -``` - -``` -hello +```ts +let foo; ``` --- -[#1 Content] = -[#1 Domain] = 0:0-3:3 - >--------- -0| ```python -1| def foo(): -2| pass -3| ``` - ---< - -[#1 Removal] = 0:0-5:0 - >--------- -0| ```python -1| def foo(): -2| pass -3| ``` -4| -5| ``` - < - -[#1 Insertion delimiter] = "\n\n" - - -[#2 Content] = -[#2 Domain] = 5:0-7:3 - >--- -5| ``` -6| hello -7| ``` +[Content] = +[Domain] = 0:0-2:3 + >----- +0| ```ts +1| let foo; +2| ``` ---< -[#2 Removal] = 4:0-8:0 - > -4| -5| ``` -6| hello -7| ``` -8| +[Removal] = 0:0-3:0 + >----- +0| ```ts +1| let foo; +2| ``` +3| < -[#2 Insertion delimiter] = "\n\n" +[Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/markdown/notebookCell2.scope b/data/fixtures/scopes/markdown/notebookCell2.scope new file mode 100644 index 0000000000..dab6d36717 --- /dev/null +++ b/data/fixtures/scopes/markdown/notebookCell2.scope @@ -0,0 +1,23 @@ +``` +Hello world +``` + +--- + +[Content] = +[Domain] = 0:0-2:3 + >--- +0| ``` +1| Hello world +2| ``` + ---< + +[Removal] = 0:0-3:0 + >--- +0| ``` +1| Hello world +2| ``` +3| + < + +[Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/markdown/textFragment.comment.block.scope b/data/fixtures/scopes/markdown/textFragment.comment.block.scope index 4e5daae6be..4bc2c04d34 100644 --- a/data/fixtures/scopes/markdown/textFragment.comment.block.scope +++ b/data/fixtures/scopes/markdown/textFragment.comment.block.scope @@ -1,17 +1,10 @@ - + --- [Content] = [Removal] = -[Domain] = 0:0-3:3 - >---- -0| - ---< +[Domain] = 0:0-0:20 + >--------------------< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/argument/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/php/argument/argument.actual.constructor.iteration.scope index a6c0a9e326..67c85e75bb 100644 --- a/data/fixtures/scopes/php/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.actual.constructor.iteration.scope @@ -1,11 +1,11 @@ --------< -1| new MyClass(2, "foo") +[Content] = 1:8-1:16 + >--------< +1| new Foo(aaa, bbb) -[Domain] = 1:0-1:21 - >---------------------< -1| new MyClass(2, "foo") +[Domain] = 1:0-1:17 + >-----------------< +1| new Foo(aaa, bbb) diff --git a/data/fixtures/scopes/php/argument/argument.actual.constructor.multiLine.scope b/data/fixtures/scopes/php/argument/argument.actual.constructor.multiLine.scope index b8ee5447fd..51044e5c63 100644 --- a/data/fixtures/scopes/php/argument/argument.actual.constructor.multiLine.scope +++ b/data/fixtures/scopes/php/argument/argument.actual.constructor.multiLine.scope @@ -1,5 +1,5 @@ ---< -1| new MyClass(aaa, bbb) +[#1 Domain] = 1:8-1:11 + >---< +1| new Foo(aaa, bbb) -[#1 Removal] = 1:12-1:17 - >-----< -1| new MyClass(aaa, bbb) +[#1 Removal] = 1:8-1:13 + >-----< +1| new Foo(aaa, bbb) -[#1 Trailing delimiter] = 1:15-1:17 - >--< -1| new MyClass(aaa, bbb) +[#1 Trailing delimiter] = 1:11-1:13 + >--< +1| new Foo(aaa, bbb) [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:17-1:20 - >---< -1| new MyClass(aaa, bbb) +[#2 Domain] = 1:13-1:16 + >---< +1| new Foo(aaa, bbb) -[#2 Removal] = 1:15-1:20 - >-----< -1| new MyClass(aaa, bbb) +[#2 Removal] = 1:11-1:16 + >-----< +1| new Foo(aaa, bbb) -[#2 Leading delimiter] = 1:15-1:17 - >--< -1| new MyClass(aaa, bbb) +[#2 Leading delimiter] = 1:11-1:13 + >--< +1| new Foo(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument/argument.actual.iteration.scope b/data/fixtures/scopes/php/argument/argument.actual.iteration.scope index a88b0a2fa7..23bd2bed2f 100644 --- a/data/fixtures/scopes/php/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.actual.iteration.scope @@ -1,11 +1,11 @@ --------< -1| myFunc(2, "foo") +[Content] = 1:4-1:12 + >--------< +1| foo(aaa, bbb) -[Domain] = 1:0-1:16 - >----------------< -1| myFunc(2, "foo") +[Domain] = 1:0-1:13 + >-------------< +1| foo(aaa, bbb) diff --git a/data/fixtures/scopes/php/argument/argument.actual.method.iteration.scope b/data/fixtures/scopes/php/argument/argument.actual.method.iteration.scope index e39de2e09d..f2084436d5 100644 --- a/data/fixtures/scopes/php/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.actual.method.iteration.scope @@ -1,11 +1,11 @@ --------< -1| obj.myFunc(2, "foo"); +[Content] = 1:8-1:16 + >--------< +1| foo.bar(aaa, bbb); -[Domain] = 1:0-1:20 - >--------------------< -1| obj.myFunc(2, "foo"); +[Domain] = 1:0-1:17 + >-----------------< +1| foo.bar(aaa, bbb); diff --git a/data/fixtures/scopes/php/argument/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/php/argument/argument.formal.constructor.iteration.scope index 5864b5e41d..f910c691f1 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.constructor.iteration.scope @@ -1,13 +1,13 @@ -------------< -2| function __construct($name, $value) { } +[Content] = 2:25-2:35 + >----------< +2| function __construct($aaa, $bbb) {} -[Domain] = 2:4-2:43 - >---------------------------------------< -2| function __construct($name, $value) { } +[Domain] = 2:4-2:39 + >-----------------------------------< +2| function __construct($aaa, $bbb) {} diff --git a/data/fixtures/scopes/php/argument/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/php/argument/argument.formal.constructor.multiLine.scope index 4a98df1b43..e4c4af920c 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.constructor.multiLine.scope @@ -1,47 +1,47 @@ ------------< -3| string $name, +[#1 Domain] = 3:8-3:19 + >-----------< +3| number $aaa, [#1 Removal] = 3:8-4:8 - >------------- -3| string $name, -4| number $value + >------------ +3| number $aaa, +4| number $bbb --------< -[#1 Trailing delimiter] = 3:20-4:8 - >- -3| string $name, -4| number $value +[#1 Trailing delimiter] = 3:19-4:8 + >- +3| number $aaa, +4| number $bbb --------< [#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 Domain] = 4:8-4:19 + >-----------< +4| number $bbb + +[#2 Removal] = 3:19-4:19 + >- +3| number $aaa, +4| number $bbb + -------------------< + +[#2 Leading delimiter] = 3:19-4:8 + >- +3| number $aaa, +4| number $bbb --------< [#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/php/argument/argument.formal.constructor.singleLine.scope index df809d40b5..7dbd7b830e 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.constructor.singleLine.scope @@ -1,36 +1,36 @@ ------------< -2| function __construct(string $name, number $value) {} +[#1 Domain] = 2:25-2:36 + >-----------< +2| function __construct(number $aaa, number $bbb) {} -[#1 Removal] = 2:25-2:39 - >--------------< -2| function __construct(string $name, number $value) {} +[#1 Removal] = 2:25-2:38 + >-------------< +2| function __construct(number $aaa, number $bbb) {} -[#1 Trailing delimiter] = 2:37-2:39 - >--< -2| function __construct(string $name, number $value) {} +[#1 Trailing delimiter] = 2:36-2:38 + >--< +2| function __construct(number $aaa, number $bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 2:39-2:52 - >-------------< -2| function __construct(string $name, number $value) {} +[#2 Domain] = 2:38-2:49 + >-----------< +2| function __construct(number $aaa, number $bbb) {} -[#2 Removal] = 2:37-2:52 - >---------------< -2| function __construct(string $name, number $value) {} +[#2 Removal] = 2:36-2:49 + >-------------< +2| function __construct(number $aaa, number $bbb) {} -[#2 Leading delimiter] = 2:37-2:39 - >--< -2| function __construct(string $name, number $value) {} +[#2 Leading delimiter] = 2:36-2:38 + >--< +2| function __construct(number $aaa, number $bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument/argument.formal.iteration.scope b/data/fixtures/scopes/php/argument/argument.formal.iteration.scope index 55fb45221e..a8d8ef03b3 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.iteration.scope @@ -1,11 +1,11 @@ --------------------< -1| function myFunc($value, string $name) { } +[Content] = 1:13-1:30 + >-----------------< +1| function foo($aaa, number $bbb) {} -[Domain] = 1:0-1:41 - >-----------------------------------------< -1| function myFunc($value, string $name) { } +[Domain] = 1:0-1:34 + >----------------------------------< +1| function foo($aaa, number $bbb) {} diff --git a/data/fixtures/scopes/php/argument/argument.formal.method.iteration.scope b/data/fixtures/scopes/php/argument/argument.formal.method.iteration.scope index 00791ae499..0adc797143 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.method.iteration.scope @@ -1,13 +1,13 @@ --------------------< -2| function myFunc($value, string $name) { } +[Content] = 2:17-2:34 + >-----------------< +2| function bar($aaa, number $bbb) { } -[Domain] = 2:4-2:45 - >-----------------------------------------< -2| function myFunc($value, string $name) { } +[Domain] = 2:4-2:39 + >-----------------------------------< +2| function bar($aaa, number $bbb) { } diff --git a/data/fixtures/scopes/php/argument/argument.formal.method.multiLine.scope b/data/fixtures/scopes/php/argument/argument.formal.method.multiLine.scope index 8eff694657..d1d687a560 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.method.multiLine.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.method.multiLine.scope @@ -1,47 +1,47 @@ ------< -3| $value, +[#1 Domain] = 3:8-3:12 + >----< +3| $aaa, [#1 Removal] = 3:8-4:8 - >------- -3| $value, -4| string $name + >----- +3| $aaa, +4| number $bbb --------< -[#1 Trailing delimiter] = 3:14-4:8 - >- -3| $value, -4| string $name +[#1 Trailing delimiter] = 3:12-4:8 + >- +3| $aaa, +4| number $bbb --------< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#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 Domain] = 4:8-4:19 + >-----------< +4| number $bbb + +[#2 Removal] = 3:12-4:19 + >- +3| $aaa, +4| number $bbb + -------------------< + +[#2 Leading delimiter] = 3:12-4:8 + >- +3| $aaa, +4| number $bbb --------< [#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument/argument.formal.method.singleLine.scope b/data/fixtures/scopes/php/argument/argument.formal.method.singleLine.scope index de6e400ca2..ff65907307 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.method.singleLine.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.method.singleLine.scope @@ -1,36 +1,36 @@ ------< -2| function myFunc($value, string $name) {} +[#1 Domain] = 2:17-2:21 + >----< +2| function bar($aaa, number $bbb) {} -[#1 Removal] = 2:20-2:28 - >--------< -2| function myFunc($value, string $name) {} +[#1 Removal] = 2:17-2:23 + >------< +2| function bar($aaa, number $bbb) {} -[#1 Trailing delimiter] = 2:26-2:28 - >--< -2| function myFunc($value, string $name) {} +[#1 Trailing delimiter] = 2:21-2:23 + >--< +2| function bar($aaa, number $bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 2:28-2:40 - >------------< -2| function myFunc($value, string $name) {} +[#2 Domain] = 2:23-2:34 + >-----------< +2| function bar($aaa, number $bbb) {} -[#2 Removal] = 2:26-2:40 - >--------------< -2| function myFunc($value, string $name) {} +[#2 Removal] = 2:21-2:34 + >-------------< +2| function bar($aaa, number $bbb) {} -[#2 Leading delimiter] = 2:26-2:28 - >--< -2| function myFunc($value, string $name) {} +[#2 Leading delimiter] = 2:21-2:23 + >--< +2| function bar($aaa, number $bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/argument/argument.formal.multiLine.scope b/data/fixtures/scopes/php/argument/argument.formal.multiLine.scope index acb3d3210e..6920a3b447 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.multiLine.scope @@ -1,45 +1,45 @@ ------< -2| $value, +[#1 Domain] = 2:4-2:8 + >----< +2| $aaa, [#1 Removal] = 2:4-3:4 - >------- -2| $value, -3| string $name + >----- +2| $aaa, +3| number $bbb ----< -[#1 Trailing delimiter] = 2:10-3:4 - >- -2| $value, -3| string $name +[#1 Trailing delimiter] = 2:8-3:4 + >- +2| $aaa, +3| number $bbb ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#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 Domain] = 3:4-3:15 + >-----------< +3| number $bbb + +[#2 Removal] = 2:8-3:15 + >- +2| $aaa, +3| number $bbb + ---------------< + +[#2 Leading delimiter] = 2:8-3:4 + >- +2| $aaa, +3| number $bbb ----< [#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/php/argument/argument.formal.singleLine.scope b/data/fixtures/scopes/php/argument/argument.formal.singleLine.scope index e608773f35..ec5487d101 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.singleLine.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.singleLine.scope @@ -1,34 +1,34 @@ ------< -1| function myFunc($value, string $name) {} +[#1 Domain] = 1:13-1:17 + >----< +1| function foo($aaa, number $bbb) {} -[#1 Removal] = 1:16-1:24 - >--------< -1| function myFunc($value, string $name) {} +[#1 Removal] = 1:13-1:19 + >------< +1| function foo($aaa, number $bbb) {} -[#1 Trailing delimiter] = 1:22-1:24 - >--< -1| function myFunc($value, string $name) {} +[#1 Trailing delimiter] = 1:17-1:19 + >--< +1| function foo($aaa, number $bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 1:24-1:36 - >------------< -1| function myFunc($value, string $name) {} +[#2 Domain] = 1:19-1:30 + >-----------< +1| function foo($aaa, number $bbb) {} -[#2 Removal] = 1:22-1:36 - >--------------< -1| function myFunc($value, string $name) {} +[#2 Removal] = 1:17-1:30 + >-------------< +1| function foo($aaa, number $bbb) {} -[#2 Leading delimiter] = 1:22-1:24 - >--< -1| function myFunc($value, string $name) {} +[#2 Leading delimiter] = 1:17-1:19 + >--< +1| function foo($aaa, number $bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/php/comment.block.scope b/data/fixtures/scopes/php/comment.block.scope index 698d2b61d0..1846690327 100644 --- a/data/fixtures/scopes/php/comment.block.scope +++ b/data/fixtures/scopes/php/comment.block.scope @@ -1,21 +1,16 @@ +/* Hello world */ --- [Content] = -[Domain] = 1:4-1:22 - >------------------< -1| /* Hello world! */ +[Domain] = 1:0-1:17 + >-----------------< +1| /* Hello world */ -[Removal] = 1:0-2:0 - >---------------------- -1| /* Hello world! */ -2| ?> - < - -[Leading delimiter] = 1:0-1:4 - >----< -1| /* Hello world! */ +[Removal] = 0:5-1:17 + > +0| +// Hello world --- [Content] = -[Domain] = 1:4-1:19 - >---------------< -1| // Hello world! +[Domain] = 1:0-1:14 + >--------------< +1| // Hello world -[Removal] = 1:0-2:0 - >------------------- -1| // Hello world! -2| ?> - < - -[Leading delimiter] = 1:0-1:4 - >----< -1| // Hello world! +[Removal] = 0:5-1:14 + > +0| +# Hello world --- [Content] = -[Domain] = 1:4-1:18 - >--------------< -1| # Hello world! +[Domain] = 1:0-1:13 + >-------------< +1| # Hello world -[Removal] = 1:0-2:0 - >------------------ -1| # Hello world! -2| ?> - < - -[Leading delimiter] = 1:0-1:4 - >----< -1| # Hello world! +[Removal] = 0:5-1:13 + > +0| 1]; +["aaa" => 0, "bbb" => 1]; --- -[Content] = 1:1-1:6 +[#1 Content] = 1:1-1:6 >-----< -1| ['num' => 1]; +1| ["aaa" => 0, "bbb" => 1]; -[Removal] = 1:1-1:10 +[#1 Removal] = 1:1-1:10 >---------< -1| ['num' => 1]; +1| ["aaa" => 0, "bbb" => 1]; -[Trailing delimiter] = 1:6-1:10 +[#1 Trailing delimiter] = 1:6-1:10 >----< -1| ['num' => 1]; +1| ["aaa" => 0, "bbb" => 1]; -[Domain] = 1:1-1:11 +[#1 Domain] = 1:1-1:11 >----------< -1| ['num' => 1]; +1| ["aaa" => 0, "bbb" => 1]; -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:13-1:18 + >-----< +1| ["aaa" => 0, "bbb" => 1]; + +[#2 Removal] = 1:13-1:22 + >---------< +1| ["aaa" => 0, "bbb" => 1]; + +[#2 Trailing delimiter] = 1:18-1:22 + >----< +1| ["aaa" => 0, "bbb" => 1]; + +[#2 Domain] = 1:13-1:23 + >----------< +1| ["aaa" => 0, "bbb" => 1]; + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/name/name.argument.catch.scope b/data/fixtures/scopes/php/name/name.argument.catch.scope new file mode 100644 index 0000000000..35b87b448a --- /dev/null +++ b/data/fixtures/scopes/php/name/name.argument.catch.scope @@ -0,0 +1,22 @@ +--< +2| catch (Exception $e) {} + +[Removal] = 2:16-2:19 + >---< +2| catch (Exception $e) {} + +[Leading delimiter] = 2:16-2:17 + >-< +2| catch (Exception $e) {} + +[Domain] = 2:7-2:19 + >------------< +2| catch (Exception $e) {} + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/name/name.argument.formal.iteration.scope b/data/fixtures/scopes/php/name/name.argument.formal.iteration.scope index ac9f93b18d..49c858ecaf 100644 --- a/data/fixtures/scopes/php/name/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/php/name/name.argument.formal.iteration.scope @@ -1,8 +1,8 @@ -----------------------< -1| function myFunc(string $str, int $value) { } +[Domain] = 1:13-1:31 + >------------------< +1| function foo(int $aaa, int $bbb) {} diff --git a/data/fixtures/scopes/php/name/name.argument.formal.scope b/data/fixtures/scopes/php/name/name.argument.formal.scope index 04202c2e3e..279c4ca26f 100644 --- a/data/fixtures/scopes/php/name/name.argument.formal.scope +++ b/data/fixtures/scopes/php/name/name.argument.formal.scope @@ -1,56 +1,56 @@ ------< -1| function myFunc(string $str, int $value) { } +[#1 Removal] = 1:9-1:12 + >---< +1| function foo(int $aaa, int $bbb) {} [#1 Leading delimiter] = 1:8-1:9 >-< -1| function myFunc(string $str, int $value) { } +1| function foo(int $aaa, int $bbb) {} -[#1 Domain] = 1:0-1:44 - >--------------------------------------------< -1| function myFunc(string $str, int $value) { } +[#1 Domain] = 1:0-1:35 + >-----------------------------------< +1| function foo(int $aaa, int $bbb) {} [#1 Insertion delimiter] = " " -[#2 Content] = 1:23-1:27 - >----< -1| function myFunc(string $str, int $value) { } +[#2 Content] = 1:17-1:21 + >----< +1| function foo(int $aaa, int $bbb) {} -[#2 Removal] = 1:22-1:27 - >-----< -1| function myFunc(string $str, int $value) { } +[#2 Removal] = 1:16-1:21 + >-----< +1| function foo(int $aaa, int $bbb) {} -[#2 Leading delimiter] = 1:22-1:23 - >-< -1| function myFunc(string $str, int $value) { } +[#2 Leading delimiter] = 1:16-1:17 + >-< +1| function foo(int $aaa, int $bbb) {} -[#2 Domain] = 1:16-1:27 - >-----------< -1| function myFunc(string $str, int $value) { } +[#2 Domain] = 1:13-1:21 + >--------< +1| function foo(int $aaa, int $bbb) {} [#2 Insertion delimiter] = " " -[#3 Content] = 1:33-1:39 - >------< -1| function myFunc(string $str, int $value) { } +[#3 Content] = 1:27-1:31 + >----< +1| function foo(int $aaa, int $bbb) {} -[#3 Removal] = 1:32-1:39 - >-------< -1| function myFunc(string $str, int $value) { } +[#3 Removal] = 1:26-1:31 + >-----< +1| function foo(int $aaa, int $bbb) {} -[#3 Leading delimiter] = 1:32-1:33 - >-< -1| function myFunc(string $str, int $value) { } +[#3 Leading delimiter] = 1:26-1:27 + >-< +1| function foo(int $aaa, int $bbb) {} -[#3 Domain] = 1:29-1:39 - >----------< -1| function myFunc(string $str, int $value) { } +[#3 Domain] = 1:23-1:31 + >--------< +1| function foo(int $aaa, int $bbb) {} [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/name/name.argument.formal2.scope b/data/fixtures/scopes/php/name/name.argument.formal2.scope index a61fd35acc..43c79b4c01 100644 --- a/data/fixtures/scopes/php/name/name.argument.formal2.scope +++ b/data/fixtures/scopes/php/name/name.argument.formal2.scope @@ -1,30 +1,30 @@ ------< -1| function myFunc(array ...$nums) { } +[#1 Removal] = 1:9-1:12 + >---< +1| function foo(array ...$aaa) {} [#1 Leading delimiter] = 1:8-1:9 >-< -1| function myFunc(array ...$nums) { } +1| function foo(array ...$aaa) {} -[#1 Domain] = 1:0-1:35 - >-----------------------------------< -1| function myFunc(array ...$nums) { } +[#1 Domain] = 1:0-1:30 + >------------------------------< +1| function foo(array ...$aaa) {} [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 1:25-1:30 - >-----< -1| function myFunc(array ...$nums) { } +[#2 Removal] = 1:22-1:26 + >----< +1| function foo(array ...$aaa) {} -[#2 Domain] = 1:16-1:30 - >--------------< -1| function myFunc(array ...$nums) { } +[#2 Domain] = 1:13-1:26 + >-------------< +1| function foo(array ...$aaa) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/name/name.assignment.scope b/data/fixtures/scopes/php/name/name.assignment.scope index 48e6748c89..bf9be38768 100644 --- a/data/fixtures/scopes/php/name/name.assignment.scope +++ b/data/fixtures/scopes/php/name/name.assignment.scope @@ -1,21 +1,21 @@ ------< -1| $value = 2; +[Content] = 1:0-1:4 + >----< +1| $foo = 0; -[Removal] = 1:0-1:7 - >-------< -1| $value = 2; +[Removal] = 1:0-1:5 + >-----< +1| $foo = 0; -[Trailing delimiter] = 1:6-1:7 - >-< -1| $value = 2; +[Trailing delimiter] = 1:4-1:5 + >-< +1| $foo = 0; -[Domain] = 1:0-1:10 - >----------< -1| $value = 2; +[Domain] = 1:0-1:9 + >---------< +1| $foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/name/name.assignment2.scope b/data/fixtures/scopes/php/name/name.assignment2.scope index 1b7b07952f..3d0f1f21b9 100644 --- a/data/fixtures/scopes/php/name/name.assignment2.scope +++ b/data/fixtures/scopes/php/name/name.assignment2.scope @@ -1,21 +1,21 @@ ------< -1| $value += 2; +[Content] = 1:0-1:4 + >----< +1| $foo += 0; -[Removal] = 1:0-1:7 - >-------< -1| $value += 2; +[Removal] = 1:0-1:5 + >-----< +1| $foo += 0; -[Trailing delimiter] = 1:6-1:7 - >-< -1| $value += 2; +[Trailing delimiter] = 1:4-1:5 + >-< +1| $foo += 0; -[Domain] = 1:0-1:11 - >-----------< -1| $value += 2; +[Domain] = 1:0-1:10 + >----------< +1| $foo += 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/name/name.field.class.scope b/data/fixtures/scopes/php/name/name.field.class.scope index 119b07a120..ab1085f671 100644 --- a/data/fixtures/scopes/php/name/name.field.class.scope +++ b/data/fixtures/scopes/php/name/name.field.class.scope @@ -1,6 +1,7 @@ -< 1| class Foo { -[#1 Domain] = 1:0-3:1 +[#1 Domain] = 1:0-4:1 >----------- 1| class Foo { -2| public string $bar; -3| } +2| public number $bar; +3| public $baz = 0; +4| } -< [#1 Insertion delimiter] = " " @@ -32,18 +34,41 @@ class Foo { [#2 Content] = 2:18-2:22 >----< -2| public string $bar; +2| public number $bar; [#2 Removal] = 2:17-2:22 >-----< -2| public string $bar; +2| public number $bar; [#2 Leading delimiter] = 2:17-2:18 >-< -2| public string $bar; +2| public number $bar; [#2 Domain] = 2:4-2:23 >-------------------< -2| public string $bar; +2| public number $bar; [#2 Insertion delimiter] = " " + + +[#3 Content] = 3:11-3:15 + >----< +3| public $baz = 0; + +[#3 Removal] = 3:11-3:16 + >-----< +3| public $baz = 0; + +[#3 Leading delimiter] = 3:10-3:11 + >-< +3| public $baz = 0; + +[#3 Trailing delimiter] = 3:15-3:16 + >-< +3| public $baz = 0; + +[#3 Domain] = 3:4-3:20 + >----------------< +3| public $baz = 0; + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/name/name.variable.scope b/data/fixtures/scopes/php/name/name.variable.scope index 48e6748c89..bf9be38768 100644 --- a/data/fixtures/scopes/php/name/name.variable.scope +++ b/data/fixtures/scopes/php/name/name.variable.scope @@ -1,21 +1,21 @@ ------< -1| $value = 2; +[Content] = 1:0-1:4 + >----< +1| $foo = 0; -[Removal] = 1:0-1:7 - >-------< -1| $value = 2; +[Removal] = 1:0-1:5 + >-----< +1| $foo = 0; -[Trailing delimiter] = 1:6-1:7 - >-< -1| $value = 2; +[Trailing delimiter] = 1:4-1:5 + >-< +1| $foo = 0; -[Domain] = 1:0-1:10 - >----------< -1| $value = 2; +[Domain] = 1:0-1:9 + >---------< +1| $foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/string.singleLine.scope b/data/fixtures/scopes/php/string.singleLine.scope new file mode 100644 index 0000000000..038ba189f7 --- /dev/null +++ b/data/fixtures/scopes/php/string.singleLine.scope @@ -0,0 +1,16 @@ +-------------< +1| "Hello world" + +[Removal] = 0:5-1:13 + > +0| ---< -1| "aaa"; +[Content] = +[Removal] = +[Domain] = 1:1-1:12 + >-----------< +1| "Hello world" -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = -[#2 Domain] = 2:5-2:8 - >---< -2| 'aaa'; - -[#2 Insertion delimiter] = " " - - -[#3 Content] = -[#3 Removal] = -[#3 Domain] = 3:5-3:8 - >---< -3| `aaa`; - -[#3 Insertion delimiter] = " " - - -[#4 Content] = -[#4 Removal] = -[#4 Domain] = 4:5-4:17 - >------------< -4| "aaa $bbb ccc" - -[#4 Insertion delimiter] = " " - - -[#5 Content] = -[#5 Removal] = -[#5 Domain] = 5:5-5:17 - >------------< -5| `aaa $bbb ccc`; - -[#5 Insertion delimiter] = " " +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/type/type.argument.formal3.scope b/data/fixtures/scopes/php/type/type.argument.catch.scope similarity index 87% rename from data/fixtures/scopes/php/type/type.argument.formal3.scope rename to data/fixtures/scopes/php/type/type.argument.catch.scope index b2e6e1253c..19f1bf2b45 100644 --- a/data/fixtures/scopes/php/type/type.argument.formal3.scope +++ b/data/fixtures/scopes/php/type/type.argument.catch.scope @@ -15,8 +15,8 @@ catch (Exception $e) {} >-< 2| catch (Exception $e) {} -[Domain] = 2:0-2:23 - >-----------------------< +[Domain] = 2:7-2:19 + >------------< 2| catch (Exception $e) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/type/type.argument.formal.iteration.scope b/data/fixtures/scopes/php/type/type.argument.formal.iteration.scope index ac9f93b18d..49c858ecaf 100644 --- a/data/fixtures/scopes/php/type/type.argument.formal.iteration.scope +++ b/data/fixtures/scopes/php/type/type.argument.formal.iteration.scope @@ -1,8 +1,8 @@ -----------------------< -1| function myFunc(string $str, int $value) { } +[Domain] = 1:13-1:31 + >------------------< +1| function foo(int $aaa, int $bbb) {} diff --git a/data/fixtures/scopes/php/type/type.argument.formal.scope b/data/fixtures/scopes/php/type/type.argument.formal.scope index 35920f50a9..4d8c490b68 100644 --- a/data/fixtures/scopes/php/type/type.argument.formal.scope +++ b/data/fixtures/scopes/php/type/type.argument.formal.scope @@ -1,44 +1,44 @@ ------< -1| function myFunc(string $str, int $value) { } +[#1 Content] = 1:13-1:16 + >---< +1| function foo(int $aaa, int $bbb) {} -[#1 Removal] = 1:16-1:23 - >-------< -1| function myFunc(string $str, int $value) { } +[#1 Removal] = 1:13-1:17 + >----< +1| function foo(int $aaa, int $bbb) {} -[#1 Trailing delimiter] = 1:22-1:23 - >-< -1| function myFunc(string $str, int $value) { } +[#1 Trailing delimiter] = 1:16-1:17 + >-< +1| function foo(int $aaa, int $bbb) {} -[#1 Domain] = 1:16-1:27 - >-----------< -1| function myFunc(string $str, int $value) { } +[#1 Domain] = 1:13-1:21 + >--------< +1| function foo(int $aaa, int $bbb) {} [#1 Insertion delimiter] = " " -[#2 Content] = 1:29-1:32 - >---< -1| function myFunc(string $str, int $value) { } +[#2 Content] = 1:23-1:26 + >---< +1| function foo(int $aaa, int $bbb) {} -[#2 Removal] = 1:29-1:33 - >----< -1| function myFunc(string $str, int $value) { } +[#2 Removal] = 1:23-1:27 + >----< +1| function foo(int $aaa, int $bbb) {} -[#2 Leading delimiter] = 1:28-1:29 - >-< -1| function myFunc(string $str, int $value) { } +[#2 Leading delimiter] = 1:22-1:23 + >-< +1| function foo(int $aaa, int $bbb) {} -[#2 Trailing delimiter] = 1:32-1:33 - >-< -1| function myFunc(string $str, int $value) { } +[#2 Trailing delimiter] = 1:26-1:27 + >-< +1| function foo(int $aaa, int $bbb) {} -[#2 Domain] = 1:29-1:39 - >----------< -1| function myFunc(string $str, int $value) { } +[#2 Domain] = 1:23-1:31 + >--------< +1| function foo(int $aaa, int $bbb) {} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/type/type.argument.formal2.scope b/data/fixtures/scopes/php/type/type.argument.formal2.scope index 353c4bd6b6..884827dfb9 100644 --- a/data/fixtures/scopes/php/type/type.argument.formal2.scope +++ b/data/fixtures/scopes/php/type/type.argument.formal2.scope @@ -1,21 +1,21 @@ -----< -1| function myFunc(array ...$nums) { } +[Content] = 1:13-1:18 + >-----< +1| function foo(array ...$aaa) {} -[Removal] = 1:16-1:22 - >------< -1| function myFunc(array ...$nums) { } +[Removal] = 1:13-1:19 + >------< +1| function foo(array ...$aaa) {} -[Trailing delimiter] = 1:21-1:22 - >-< -1| function myFunc(array ...$nums) { } +[Trailing delimiter] = 1:18-1:19 + >-< +1| function foo(array ...$aaa) {} -[Domain] = 1:16-1:30 - >--------------< -1| function myFunc(array ...$nums) { } +[Domain] = 1:13-1:26 + >-------------< +1| function foo(array ...$aaa) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/type/type.cast.scope b/data/fixtures/scopes/php/type/type.cast.scope index 9dd913cdba..6556e77045 100644 --- a/data/fixtures/scopes/php/type/type.cast.scope +++ b/data/fixtures/scopes/php/type/type.cast.scope @@ -1,17 +1,17 @@ ------< -1| (string) $str; +[Content] = 1:1-1:4 + >---< +1| (int)$foo; -[Removal] = 1:0-1:9 - >---------< -1| (string) $str; +[Removal] = 1:0-1:5 + >-----< +1| (int)$foo; -[Domain] = 1:0-1:13 - >-------------< -1| (string) $str; +[Domain] = 1:0-1:9 + >---------< +1| (int)$foo; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/value/value.assignment.scope b/data/fixtures/scopes/php/value/value.assignment.scope index af2d33face..ac9403916a 100644 --- a/data/fixtures/scopes/php/value/value.assignment.scope +++ b/data/fixtures/scopes/php/value/value.assignment.scope @@ -1,21 +1,21 @@ -< -1| $value = 2; +[Content] = 1:7-1:8 + >-< +1| $foo = 0; -[Removal] = 1:6-1:10 - >----< -1| $value = 2; +[Removal] = 1:4-1:8 + >----< +1| $foo = 0; -[Leading delimiter] = 1:6-1:9 - >---< -1| $value = 2; +[Leading delimiter] = 1:4-1:7 + >---< +1| $foo = 0; -[Domain] = 1:0-1:10 - >----------< -1| $value = 2; +[Domain] = 1:0-1:9 + >---------< +1| $foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/value/value.assignment2.scope b/data/fixtures/scopes/php/value/value.assignment2.scope index 2a5ef68f37..ec8bd19c14 100644 --- a/data/fixtures/scopes/php/value/value.assignment2.scope +++ b/data/fixtures/scopes/php/value/value.assignment2.scope @@ -1,21 +1,21 @@ -< -1| $value += 2; +[Content] = 1:8-1:9 + >-< +1| $foo += 0; -[Removal] = 1:6-1:11 - >-----< -1| $value += 2; +[Removal] = 1:4-1:9 + >-----< +1| $foo += 0; -[Leading delimiter] = 1:6-1:10 - >----< -1| $value += 2; +[Leading delimiter] = 1:4-1:8 + >----< +1| $foo += 0; -[Domain] = 1:0-1:11 - >-----------< -1| $value += 2; +[Domain] = 1:0-1:10 + >----------< +1| $foo += 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/value/value.mapPair.scope b/data/fixtures/scopes/php/value/value.mapPair.scope index 48aea39d02..c1936f8985 100644 --- a/data/fixtures/scopes/php/value/value.mapPair.scope +++ b/data/fixtures/scopes/php/value/value.mapPair.scope @@ -1,21 +1,40 @@ 1]; +["aaa" => 0, "bbb" => 1]; --- -[Content] = 1:10-1:11 +[#1 Content] = 1:10-1:11 >-< -1| ['num' => 1]; +1| ["aaa" => 0, "bbb" => 1]; -[Removal] = 1:6-1:11 +[#1 Removal] = 1:6-1:11 >-----< -1| ['num' => 1]; +1| ["aaa" => 0, "bbb" => 1]; -[Leading delimiter] = 1:6-1:10 +[#1 Leading delimiter] = 1:6-1:10 >----< -1| ['num' => 1]; +1| ["aaa" => 0, "bbb" => 1]; -[Domain] = 1:1-1:11 +[#1 Domain] = 1:1-1:11 >----------< -1| ['num' => 1]; +1| ["aaa" => 0, "bbb" => 1]; -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:22-1:23 + >-< +1| ["aaa" => 0, "bbb" => 1]; + +[#2 Removal] = 1:18-1:23 + >-----< +1| ["aaa" => 0, "bbb" => 1]; + +[#2 Leading delimiter] = 1:18-1:22 + >----< +1| ["aaa" => 0, "bbb" => 1]; + +[#2 Domain] = 1:13-1:23 + >----------< +1| ["aaa" => 0, "bbb" => 1]; + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/value/value.variable.scope b/data/fixtures/scopes/php/value/value.variable.scope index af2d33face..ac9403916a 100644 --- a/data/fixtures/scopes/php/value/value.variable.scope +++ b/data/fixtures/scopes/php/value/value.variable.scope @@ -1,21 +1,21 @@ -< -1| $value = 2; +[Content] = 1:7-1:8 + >-< +1| $foo = 0; -[Removal] = 1:6-1:10 - >----< -1| $value = 2; +[Removal] = 1:4-1:8 + >----< +1| $foo = 0; -[Leading delimiter] = 1:6-1:9 - >---< -1| $value = 2; +[Leading delimiter] = 1:4-1:7 + >---< +1| $foo = 0; -[Domain] = 1:0-1:10 - >----------< -1| $value = 2; +[Domain] = 1:0-1:9 + >---------< +1| $foo = 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/php/value/value.yield.scope b/data/fixtures/scopes/php/value/value.yield.scope index 98c90414a3..a9c5fd401c 100644 --- a/data/fixtures/scopes/php/value/value.yield.scope +++ b/data/fixtures/scopes/php/value/value.yield.scope @@ -1,21 +1,21 @@ -< -1| yield 2; +1| yield 0; [Removal] = 1:5-1:7 >--< -1| yield 2; +1| yield 0; [Leading delimiter] = 1:5-1:6 >-< -1| yield 2; +1| yield 0; -[Domain] = 1:0-1:7 - >-------< -1| yield 2; +[Domain] = 1:0-1:8 + >--------< +1| yield 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/character.scope b/data/fixtures/scopes/plaintext/character.scope index ce61df103a..1c14ae278a 100644 --- a/data/fixtures/scopes/plaintext/character.scope +++ b/data/fixtures/scopes/plaintext/character.scope @@ -1,11 +1,11 @@ -aaa +foo bar --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-0:1 >-< -0| aaa +0| foo bar [#1 Insertion delimiter] = "" @@ -14,7 +14,7 @@ aaa [#2 Removal] = [#2 Domain] = 0:1-0:2 >-< -0| aaa +0| foo bar [#2 Insertion delimiter] = "" @@ -23,6 +23,42 @@ aaa [#3 Removal] = [#3 Domain] = 0:2-0:3 >-< -0| aaa +0| foo bar [#3 Insertion delimiter] = "" + + +[#4 Content] = +[#4 Removal] = +[#4 Domain] = 0:3-0:4 + >-< +0| foo bar + +[#4 Insertion delimiter] = "" + + +[#5 Content] = +[#5 Removal] = +[#5 Domain] = 0:4-0:5 + >-< +0| foo bar + +[#5 Insertion delimiter] = "" + + +[#6 Content] = +[#6 Removal] = +[#6 Domain] = 0:5-0:6 + >-< +0| foo bar + +[#6 Insertion delimiter] = "" + + +[#7 Content] = +[#7 Removal] = +[#7 Domain] = 0:6-0:7 + >-< +0| foo bar + +[#7 Insertion delimiter] = "" diff --git a/data/fixtures/scopes/plaintext/document.scope b/data/fixtures/scopes/plaintext/document.scope index 57492b0679..a2dcc0452a 100644 --- a/data/fixtures/scopes/plaintext/document.scope +++ b/data/fixtures/scopes/plaintext/document.scope @@ -1,32 +1,19 @@ - aaa - -bbb - -ccc +Hello world --- [Content] = [Removal] = -[Domain] = 0:0-6:0 +[Domain] = 0:0-2:0 > 0| -1| aaa +1| Hello world 2| -3| bbb -4| -5| ccc -6| < -[Interior] = 1:2-5:3 - >--- -1| aaa -2| -3| bbb -4| -5| ccc - ---< +[Interior] = 1:0-1:11 + >-----------< +1| Hello world [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/plaintext/identifier.scope b/data/fixtures/scopes/plaintext/identifier.scope index 8d3c33198b..417b70117a 100644 --- a/data/fixtures/scopes/plaintext/identifier.scope +++ b/data/fixtures/scopes/plaintext/identifier.scope @@ -1,10 +1,19 @@ -(foo) +foo.bar_1() --- -[Content] = -[Removal] = -[Domain] = 0:1-0:4 - >---< -0| (foo) +[#1 Content] = +[#1 Removal] = +[#1 Domain] = 0:0-0:3 + >---< +0| foo.bar_1() -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = +[#2 Removal] = +[#2 Domain] = 0:4-0:9 + >-----< +0| foo.bar_1() + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/line.scope b/data/fixtures/scopes/plaintext/line.scope index 5dabe4ab1b..f76e66aa5c 100644 --- a/data/fixtures/scopes/plaintext/line.scope +++ b/data/fixtures/scopes/plaintext/line.scope @@ -1,10 +1,10 @@ -aaa +Hello world --- [Content] = [Removal] = -[Domain] = 0:0-0:3 - >---< -0| aaa +[Domain] = 0:0-0:11 + >-----------< +0| Hello world [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/plaintext/line2.scope b/data/fixtures/scopes/plaintext/line2.scope index dfee2c5288..85c60a0faf 100644 --- a/data/fixtures/scopes/plaintext/line2.scope +++ b/data/fixtures/scopes/plaintext/line2.scope @@ -1,6 +1,7 @@ -aaa - +Hello + world + --- [#1 Content] = @@ -11,59 +12,88 @@ aaa [#1 Removal] = 0:0-1:0 > 0| -1| aaa +1| Hello < [#1 Trailing delimiter] = 0:0-1:0 > 0| -1| aaa +1| Hello < [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 1:0-1:3 - >---< -1| aaa +[#2 Domain] = 1:0-1:5 + >-----< +1| Hello [#2 Removal] = 1:0-2:0 - >--- -1| aaa -2| + >----- +1| Hello +2| world < [#2 Leading delimiter] = 0:0-1:0 > 0| -1| aaa +1| Hello < -[#2 Trailing delimiter] = 1:3-2:0 - > -1| aaa -2| +[#2 Trailing delimiter] = 1:5-2:0 + > +1| Hello +2| world < [#2 Insertion delimiter] = "\n" -[#3 Content] = -[#3 Domain] = 2:0-2:0 - >< -2| +[#3 Content] = 2:1-2:6 + >-----< +2| world + +[#3 Removal] = 2:0-3:0 + >------- +2| world +3| + < -[#3 Removal] = 1:3-2:0 - > -1| aaa -2| +[#3 Leading delimiter] = 1:5-2:0 + > +1| Hello +2| world < -[#3 Leading delimiter] = 1:3-2:0 - > -1| aaa -2| +[#3 Trailing delimiter] = 2:7-3:0 + > +2| world +3| < +[#3 Domain] = 2:0-2:7 + >-------< +2| world + [#3 Insertion delimiter] = "\n" + + +[#4 Content] = +[#4 Domain] = 3:0-3:2 + >--< +3| + +[#4 Removal] = 2:7-3:2 + > +2| world +3| + --< + +[#4 Leading delimiter] = 2:7-3:0 + > +2| world +3| + < + +[#4 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/plaintext/nonWhitespaceSequence.scope b/data/fixtures/scopes/plaintext/nonWhitespaceSequence.scope index f0dd953e12..6336831cac 100644 --- a/data/fixtures/scopes/plaintext/nonWhitespaceSequence.scope +++ b/data/fixtures/scopes/plaintext/nonWhitespaceSequence.scope @@ -1,17 +1,33 @@ - b.c(?!å_*/\)|d4 +b.c(?!å_*/\)|d4 aaa --- -[Content] = -[Domain] = 0:1-0:16 - >---------------< -0| b.c(?!å_*/\)|d4 +[#1 Content] = +[#1 Domain] = 0:0-0:15 + >---------------< +0| b.c(?!å_*/\)|d4 aaa -[Removal] = 0:0-0:16 +[#1 Removal] = 0:0-0:16 >----------------< -0| b.c(?!å_*/\)|d4 +0| b.c(?!å_*/\)|d4 aaa -[Leading delimiter] = 0:0-0:1 - >-< -0| b.c(?!å_*/\)|d4 +[#1 Trailing delimiter] = 0:15-0:16 + >-< +0| b.c(?!å_*/\)|d4 aaa -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = +[#2 Domain] = 0:16-0:19 + >---< +0| b.c(?!å_*/\)|d4 aaa + +[#2 Removal] = 0:15-0:19 + >----< +0| b.c(?!å_*/\)|d4 aaa + +[#2 Leading delimiter] = 0:15-0:16 + >-< +0| b.c(?!å_*/\)|d4 aaa + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/paragraph.scope b/data/fixtures/scopes/plaintext/paragraph.scope index 629d5796ce..1acdcd664d 100644 --- a/data/fixtures/scopes/plaintext/paragraph.scope +++ b/data/fixtures/scopes/plaintext/paragraph.scope @@ -2,39 +2,74 @@ aaa bbb +ccc + --- -[Content] = -[Domain] = 1:0-2:3 +[#1 Content] = +[#1 Domain] = 1:0-2:3 >--- 1| aaa 2| bbb ---< -[Removal] = 0:0-3:0 - > -0| +[#1 Removal] = 1:0-4:0 + >--- 1| aaa 2| bbb 3| +4| ccc < -[Leading delimiter: Content] = 0:0-0:0 +[#1 Leading delimiter: Content] = 0:0-0:0 >< 0| -[Leading delimiter: Removal] = 0:0-1:0 +[#1 Leading delimiter: Removal] = 0:0-1:0 > 0| 1| aaa < -[Trailing delimiter: Content] = 3:0-3:0 +[#1 Trailing delimiter: Content] = 3:0-3:0 >< 3| -[Trailing delimiter: Removal] = 2:3-3:0 - > -2| bbb +[#1 Trailing delimiter: Removal] = 3:0-4:0 + > +3| +4| ccc + < + +[#1 Insertion delimiter] = "\n\n" + + +[#2 Content] = +[#2 Domain] = 4:0-4:3 + >---< +4| ccc + +[#2 Removal] = 3:0-5:0 + > +3| +4| ccc +5| + < + +[#2 Leading delimiter: Content] = 3:0-3:0 + >< 3| +[#2 Leading delimiter: Removal] = 3:0-4:0 + > +3| +4| ccc + < + +[#2 Trailing delimiter: Content] = 5:0-5:0 + >< +5| +[#2 Trailing delimiter: Removal] = 4:3-5:0 + > +4| ccc +5| < -[Insertion delimiter] = "\n\n" +[#2 Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/plaintext/sentence.scope b/data/fixtures/scopes/plaintext/sentence.scope index 4db45fece0..2cb4321691 100644 --- a/data/fixtures/scopes/plaintext/sentence.scope +++ b/data/fixtures/scopes/plaintext/sentence.scope @@ -1,10 +1,33 @@ -This is a sentence. +This is a sentence. So is this. --- -[Content] = -[Removal] = -[Domain] = 0:0-0:19 +[#1 Content] = +[#1 Domain] = 0:0-0:19 >-------------------< -0| This is a sentence. +0| This is a sentence. So is this. -[Insertion delimiter] = " " +[#1 Removal] = 0:0-0:20 + >--------------------< +0| This is a sentence. So is this. + +[#1 Trailing delimiter] = 0:19-0:20 + >-< +0| This is a sentence. So is this. + +[#1 Insertion delimiter] = " " + + +[#2 Content] = +[#2 Domain] = 0:20-0:31 + >-----------< +0| This is a sentence. So is this. + +[#2 Removal] = 0:19-0:31 + >------------< +0| This is a sentence. So is this. + +[#2 Leading delimiter] = 0:19-0:20 + >-< +0| This is a sentence. So is this. + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/sentence2.scope b/data/fixtures/scopes/plaintext/sentence2.scope new file mode 100644 index 0000000000..761dc17094 --- /dev/null +++ b/data/fixtures/scopes/plaintext/sentence2.scope @@ -0,0 +1,13 @@ +This is a longer sentence +spanning multiple lines. +--- + +[Content] = +[Removal] = +[Domain] = 0:0-1:24 + >------------------------- +0| This is a longer sentence +1| spanning multiple lines. + ------------------------< + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/sentence3.scope b/data/fixtures/scopes/plaintext/sentence3.scope new file mode 100644 index 0000000000..7ac5a16803 --- /dev/null +++ b/data/fixtures/scopes/plaintext/sentence3.scope @@ -0,0 +1,22 @@ +// This is a longer sentence +// spanning multiple lines. +--- + +[Content] = +[Domain] = 0:3-1:27 + >------------------------- +0| // This is a longer sentence +1| // spanning multiple lines. + ---------------------------< + +[Removal] = 0:2-1:27 + >-------------------------- +0| // This is a longer sentence +1| // spanning multiple lines. + ---------------------------< + +[Leading delimiter] = 0:2-0:3 + >-< +0| // This is a longer sentence + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/sentence4.scope b/data/fixtures/scopes/plaintext/sentence4.scope new file mode 100644 index 0000000000..40dfbff151 --- /dev/null +++ b/data/fixtures/scopes/plaintext/sentence4.scope @@ -0,0 +1,24 @@ +/* +* This is a longer sentence +* spanning multiple lines. +*/ +--- + +[Content] = +[Domain] = 1:2-2:26 + >------------------------- +1| * This is a longer sentence +2| * spanning multiple lines. + --------------------------< + +[Removal] = 1:1-2:26 + >-------------------------- +1| * This is a longer sentence +2| * spanning multiple lines. + --------------------------< + +[Leading delimiter] = 1:1-1:2 + >-< +1| * This is a longer sentence + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/surroundingPair/surroundingPair.iteration2.scope b/data/fixtures/scopes/plaintext/surroundingPair/surroundingPair.iteration2.scope index 481b654461..0f69a33727 100644 --- a/data/fixtures/scopes/plaintext/surroundingPair/surroundingPair.iteration2.scope +++ b/data/fixtures/scopes/plaintext/surroundingPair/surroundingPair.iteration2.scope @@ -1,9 +1,9 @@ -hello +Hello world --- [Content] = -[Domain] = 1:0-1:5 - >-----< -1| hello +[Domain] = 1:0-1:11 + >-----------< +1| Hello world diff --git a/data/fixtures/scopes/plaintext/surroundingPair/surroundingPair2.scope b/data/fixtures/scopes/plaintext/surroundingPair/surroundingPair2.scope index 839a6471fe..667c806fe2 100644 --- a/data/fixtures/scopes/plaintext/surroundingPair/surroundingPair2.scope +++ b/data/fixtures/scopes/plaintext/surroundingPair/surroundingPair2.scope @@ -1,24 +1,24 @@ " -"hello" +"Hello world" " --- [Content] = [Removal] = -[Domain] = 1:0-1:7 - >-------< -1| "hello" +[Domain] = 1:0-1:13 + >-------------< +1| "Hello world" -[Interior] = 1:1-1:6 - >-----< -1| "hello" +[Interior] = 1:1-1:12 + >-----------< +1| "Hello world" [Boundary L] = 1:0-1:1 >-< -1| "hello" +1| "Hello world" -[Boundary R] = 1:6-1:7 - >-< -1| "hello" +[Boundary R] = 1:12-1:13 + >-< +1| "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/token.scope b/data/fixtures/scopes/plaintext/token.scope index a889537b1e..7119f8abfd 100644 --- a/data/fixtures/scopes/plaintext/token.scope +++ b/data/fixtures/scopes/plaintext/token.scope @@ -1,21 +1,68 @@ - aaa +Hello (Cursorless) world --- -[Content] = -[Domain] = 0:2-0:5 - >---< -0| aaa +[#1 Content] = +[#1 Domain] = 0:0-0:5 + >-----< +0| Hello (Cursorless) world -[Removal] = 0:0-0:7 - >-------< -0| aaa +[#1 Removal] = 0:0-0:6 + >------< +0| Hello (Cursorless) world -[Leading delimiter] = 0:0-0:2 - >--< -0| aaa +[#1 Trailing delimiter] = 0:5-0:6 + >-< +0| Hello (Cursorless) world -[Trailing delimiter] = 0:5-0:7 - >--< -0| aaa +[#1 Insertion delimiter] = " " -[Insertion delimiter] = " " + +[#2 Content] = +[#2 Removal] = +[#2 Domain] = 0:6-0:7 + >-< +0| Hello (Cursorless) world + +[#2 Leading delimiter] = 0:5-0:6 + >-< +0| Hello (Cursorless) world + +[#2 Insertion delimiter] = " " + + +[#3 Content] = +[#3 Removal] = +[#3 Domain] = 0:7-0:17 + >----------< +0| Hello (Cursorless) world + +[#3 Insertion delimiter] = " " + + +[#4 Content] = +[#4 Removal] = +[#4 Domain] = 0:17-0:18 + >-< +0| Hello (Cursorless) world + +[#4 Trailing delimiter] = 0:18-0:19 + >-< +0| Hello (Cursorless) world + +[#4 Insertion delimiter] = " " + + +[#5 Content] = +[#5 Domain] = 0:19-0:24 + >-----< +0| Hello (Cursorless) world + +[#5 Removal] = 0:18-0:24 + >------< +0| Hello (Cursorless) world + +[#5 Leading delimiter] = 0:18-0:19 + >-< +0| Hello (Cursorless) world + +[#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/url2.scope b/data/fixtures/scopes/plaintext/url2.scope new file mode 100644 index 0000000000..1be28cc9dc --- /dev/null +++ b/data/fixtures/scopes/plaintext/url2.scope @@ -0,0 +1,10 @@ +http://www.cursorless.org +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:25 + >-------------------------< +0| http://www.cursorless.org + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/url3.scope b/data/fixtures/scopes/plaintext/url3.scope new file mode 100644 index 0000000000..c850101fd6 --- /dev/null +++ b/data/fixtures/scopes/plaintext/url3.scope @@ -0,0 +1,10 @@ +https://cursorless.org +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:22 + >----------------------< +0| https://cursorless.org + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/url4.scope b/data/fixtures/scopes/plaintext/url4.scope new file mode 100644 index 0000000000..42855e4db8 --- /dev/null +++ b/data/fixtures/scopes/plaintext/url4.scope @@ -0,0 +1,10 @@ +www.cursorless.org +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:18 + >------------------< +0| www.cursorless.org + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/plaintext/word.scope b/data/fixtures/scopes/plaintext/word.scope index fc08b5125c..e9d1bdc9a2 100644 --- a/data/fixtures/scopes/plaintext/word.scope +++ b/data/fixtures/scopes/plaintext/word.scope @@ -1,33 +1,19 @@ -aaa_bbb +fooBar --- [#1 Content] = +[#1 Removal] = [#1 Domain] = 0:0-0:3 >---< -0| aaa_bbb +0| fooBar -[#1 Removal] = 0:0-0:4 - >----< -0| aaa_bbb - -[#1 Trailing delimiter] = 0:3-0:4 - >-< -0| aaa_bbb - -[#1 Insertion delimiter] = "_" +[#1 Insertion delimiter] = "" [#2 Content] = -[#2 Domain] = 0:4-0:7 - >---< -0| aaa_bbb - -[#2 Removal] = 0:3-0:7 - >----< -0| aaa_bbb - -[#2 Leading delimiter] = 0:3-0:4 - >-< -0| aaa_bbb +[#2 Removal] = +[#2 Domain] = 0:3-0:6 + >---< +0| fooBar -[#2 Insertion delimiter] = "_" +[#2 Insertion delimiter] = "" diff --git a/data/fixtures/scopes/plaintext/word2.scope b/data/fixtures/scopes/plaintext/word2.scope index 713a90d784..0ecd061156 100644 --- a/data/fixtures/scopes/plaintext/word2.scope +++ b/data/fixtures/scopes/plaintext/word2.scope @@ -1,19 +1,33 @@ -aaaBbb +foo_bar --- [#1 Content] = -[#1 Removal] = [#1 Domain] = 0:0-0:3 >---< -0| aaaBbb +0| foo_bar -[#1 Insertion delimiter] = "" +[#1 Removal] = 0:0-0:4 + >----< +0| foo_bar + +[#1 Trailing delimiter] = 0:3-0:4 + >-< +0| foo_bar + +[#1 Insertion delimiter] = "_" [#2 Content] = -[#2 Removal] = -[#2 Domain] = 0:3-0:6 - >---< -0| aaaBbb +[#2 Domain] = 0:4-0:7 + >---< +0| foo_bar + +[#2 Removal] = 0:3-0:7 + >----< +0| foo_bar + +[#2 Leading delimiter] = 0:3-0:4 + >-< +0| foo_bar -[#2 Insertion delimiter] = "" +[#2 Insertion delimiter] = "_" diff --git a/data/fixtures/scopes/python/argument/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/python/argument/argument.actual.constructor.iteration.scope index 72caa3b26d..69ff7aa216 100644 --- a/data/fixtures/scopes/python/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.actual.constructor.iteration.scope @@ -1,10 +1,10 @@ -Foo(123, 456) +Foo(aaa, bbb) --- [Content] = 0:4-0:12 >--------< -0| Foo(123, 456) +0| Foo(aaa, bbb) [Domain] = 0:0-0:13 >-------------< -0| Foo(123, 456) +0| Foo(aaa, bbb) diff --git a/data/fixtures/scopes/python/argument/argument.actual.iteration.scope b/data/fixtures/scopes/python/argument/argument.actual.iteration.scope index eddf4b802f..1b28526f67 100644 --- a/data/fixtures/scopes/python/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.actual.iteration.scope @@ -1,10 +1,10 @@ -foo("bar", 1) +foo(aaa, bbb) --- [Content] = 0:4-0:12 >--------< -0| foo("bar", 1) +0| foo(aaa, bbb) [Domain] = 0:0-0:13 >-------------< -0| foo("bar", 1) +0| foo(aaa, bbb) diff --git a/data/fixtures/scopes/python/argument/argument.actual.method.iteration.scope b/data/fixtures/scopes/python/argument/argument.actual.method.iteration.scope index ca500b4433..8b3899b4a1 100644 --- a/data/fixtures/scopes/python/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.actual.method.iteration.scope @@ -1,10 +1,10 @@ -foo.bar(123, 456) +foo.bar(aaa, bbb) --- [Content] = 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/python/argument/argument.actual.singleLine2.scope b/data/fixtures/scopes/python/argument/argument.actual.singleLine2.scope index a791dcb153..871e17b87b 100644 --- a/data/fixtures/scopes/python/argument/argument.actual.singleLine2.scope +++ b/data/fixtures/scopes/python/argument/argument.actual.singleLine2.scope @@ -1,10 +1,10 @@ -" ".join(word for word in word_list) +" ".join(v for v in values) --- [Content] = [Removal] = -[Domain] = 0:9-0:35 - >--------------------------< -0| " ".join(word for word in word_list) +[Domain] = 0:9-0:26 + >-----------------< +0| " ".join(v for v in values) [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/argument/argument.actual.singleLine3.scope b/data/fixtures/scopes/python/argument/argument.actual.singleLine3.scope deleted file mode 100644 index 04678b76a3..0000000000 --- a/data/fixtures/scopes/python/argument/argument.actual.singleLine3.scope +++ /dev/null @@ -1,33 +0,0 @@ -" ".join((word for word in word_list), "words") ---- - -[#1 Content] = -[#1 Domain] = 0:9-0:37 - >----------------------------< -0| " ".join((word for word in word_list), "words") - -[#1 Removal] = 0:9-0:39 - >------------------------------< -0| " ".join((word for word in word_list), "words") - -[#1 Trailing delimiter] = 0:37-0:39 - >--< -0| " ".join((word for word in word_list), "words") - -[#1 Insertion delimiter] = ", " - - -[#2 Content] = -[#2 Domain] = 0:39-0:46 - >-------< -0| " ".join((word for word in word_list), "words") - -[#2 Removal] = 0:37-0:46 - >---------< -0| " ".join((word for word in word_list), "words") - -[#2 Leading delimiter] = 0:37-0:39 - >--< -0| " ".join((word for word in word_list), "words") - -[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument/argument.actual.singleLine4.scope b/data/fixtures/scopes/python/argument/argument.actual.singleLine4.scope deleted file mode 100644 index decd794bad..0000000000 --- a/data/fixtures/scopes/python/argument/argument.actual.singleLine4.scope +++ /dev/null @@ -1,33 +0,0 @@ -" ".join((word for word in word_list), (word for word in word_list)) ---- - -[#1 Content] = -[#1 Domain] = 0:9-0:37 - >----------------------------< -0| " ".join((word for word in word_list), (word for word in word_list)) - -[#1 Removal] = 0:9-0:39 - >------------------------------< -0| " ".join((word for word in word_list), (word for word in word_list)) - -[#1 Trailing delimiter] = 0:37-0:39 - >--< -0| " ".join((word for word in word_list), (word for word in word_list)) - -[#1 Insertion delimiter] = ", " - - -[#2 Content] = -[#2 Domain] = 0:39-0:67 - >----------------------------< -0| " ".join((word for word in word_list), (word for word in word_list)) - -[#2 Removal] = 0:37-0:67 - >------------------------------< -0| " ".join((word for word in word_list), (word for word in word_list)) - -[#2 Leading delimiter] = 0:37-0:39 - >--< -0| " ".join((word for word in word_list), (word for word in word_list)) - -[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument/argument.catch.scope b/data/fixtures/scopes/python/argument/argument.catch.scope index 153e58326d..19c3604cf3 100644 --- a/data/fixtures/scopes/python/argument/argument.catch.scope +++ b/data/fixtures/scopes/python/argument/argument.catch.scope @@ -1,38 +1,35 @@ -try: - pass -except MyException as ex: - pass -except Exception as ex: - pass +try: pass +except MyException as e: pass +except Exception as e: pass --- [#1 Content] = -[#1 Domain] = 2:7-2:24 - >-----------------< -2| except MyException as ex: +[#1 Domain] = 1:7-1:23 + >----------------< +1| except MyException as e: pass -[#1 Removal] = 2:6-2:24 - >------------------< -2| except MyException as ex: +[#1 Removal] = 1:6-1:23 + >-----------------< +1| except MyException as e: pass -[#1 Leading delimiter] = 2:6-2:7 +[#1 Leading delimiter] = 1:6-1:7 >-< -2| except MyException as ex: +1| except MyException as e: pass [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Domain] = 4:7-4:22 - >---------------< -4| except Exception as ex: +[#2 Domain] = 2:7-2:21 + >--------------< +2| except Exception as e: pass -[#2 Removal] = 4:6-4:22 - >----------------< -4| except Exception as ex: +[#2 Removal] = 2:6-2:21 + >---------------< +2| except Exception as e: pass -[#2 Leading delimiter] = 4:6-4:7 +[#2 Leading delimiter] = 2:6-2:7 >-< -4| except Exception as ex: +2| except Exception as e: pass [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/argument/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.constructor.iteration.scope index 95f6ceb8a0..12f4cd38bb 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.constructor.iteration.scope @@ -1,14 +1,11 @@ class Foo: - def __init__(self, aaa: str, bbb: int): - pass + def __init__(self, aaa: str, bbb: int): pass --- [Content] = 1:17-1:41 >------------------------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass -[Domain] = 1:4-2:12 - >--------------------------------------- -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +[Domain] = 1:4-1:48 + >--------------------------------------------< +1| def __init__(self, aaa: str, bbb: int): pass diff --git a/data/fixtures/scopes/python/argument/argument.formal.constructor.multiLine.scope b/data/fixtures/scopes/python/argument/argument.formal.constructor.multiLine.scope index 8d77cf5de9..c0aed505f7 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.constructor.multiLine.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.constructor.multiLine.scope @@ -3,8 +3,7 @@ class Foo: self, aaa: str, bbb: int - ): - pass + ): pass --- [#1 Content] = diff --git a/data/fixtures/scopes/python/argument/argument.formal.constructor.singleLine.scope b/data/fixtures/scopes/python/argument/argument.formal.constructor.singleLine.scope index 8696328d19..4e3b8c8999 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.constructor.singleLine.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.constructor.singleLine.scope @@ -1,20 +1,19 @@ class Foo: - def __init__(self, aaa: str, bbb: int): - pass + def __init__(self, aaa: str, bbb: int): pass --- [#1 Content] = [#1 Domain] = 1:17-1:21 >----< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#1 Removal] = 1:17-1:23 >------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#1 Trailing delimiter] = 1:21-1:23 >--< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#1 Insertion delimiter] = ", " @@ -22,19 +21,19 @@ class Foo: [#2 Content] = [#2 Domain] = 1:23-1:31 >--------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#2 Removal] = 1:23-1:33 >----------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#2 Leading delimiter] = 1:21-1:23 >--< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#2 Trailing delimiter] = 1:31-1:33 >--< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#2 Insertion delimiter] = ", " @@ -42,14 +41,14 @@ class Foo: [#3 Content] = [#3 Domain] = 1:33-1:41 >--------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#3 Removal] = 1:31-1:41 >----------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#3 Leading delimiter] = 1:31-1:33 >--< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [#3 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument/argument.formal.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.iteration.scope index 5544db5a68..fdc681a3c3 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.iteration.scope @@ -1,13 +1,10 @@ -def for(name: str, value: int): - pass +def for(aaa: int, bbb: int): pass --- -[Content] = 0:8-0:29 - >---------------------< -0| def for(name: str, value: int): +[Content] = 0:8-0:26 + >------------------< +0| def for(aaa: int, bbb: int): pass -[Domain] = 0:0-1:8 - >------------------------------- -0| def for(name: str, value: int): -1| pass - --------< +[Domain] = 0:0-0:33 + >---------------------------------< +0| def for(aaa: int, bbb: int): pass diff --git a/data/fixtures/scopes/python/argument/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.lambda.iteration.scope index e7b703745c..a6fd39c3a9 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.lambda.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.lambda.iteration.scope @@ -1,10 +1,10 @@ -lambda a, b: pass +lambda aaa, bbb: pass --- -[Content] = 0:7-0:11 - >----< -0| lambda a, b: pass +[Content] = 0:7-0:15 + >--------< +0| lambda aaa, bbb: pass -[Domain] = 0:0-0:17 - >-----------------< -0| lambda a, b: pass +[Domain] = 0:0-0:21 + >---------------------< +0| lambda aaa, bbb: pass diff --git a/data/fixtures/scopes/python/argument/argument.formal.lambda.singleLine.scope b/data/fixtures/scopes/python/argument/argument.formal.lambda.singleLine.scope index 5adf6669e6..0216bc6c12 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.lambda.singleLine.scope @@ -1,33 +1,33 @@ -lambda a, b: pass +lambda aaa, bbb: pass --- [#1 Content] = -[#1 Domain] = 0:7-0:8 - >-< -0| lambda a, b: pass - -[#1 Removal] = 0:7-0:10 +[#1 Domain] = 0:7-0:10 >---< -0| lambda a, b: pass +0| lambda aaa, bbb: pass + +[#1 Removal] = 0:7-0:12 + >-----< +0| lambda aaa, bbb: pass -[#1 Trailing delimiter] = 0:8-0:10 - >--< -0| lambda a, b: pass +[#1 Trailing delimiter] = 0:10-0:12 + >--< +0| lambda aaa, bbb: pass [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:10-0:11 - >-< -0| lambda a, b: pass +[#2 Domain] = 0:12-0:15 + >---< +0| lambda aaa, bbb: pass -[#2 Removal] = 0:8-0:11 - >---< -0| lambda a, b: pass +[#2 Removal] = 0:10-0:15 + >-----< +0| lambda aaa, bbb: pass -[#2 Leading delimiter] = 0:8-0:10 - >--< -0| lambda a, b: pass +[#2 Leading delimiter] = 0:10-0:12 + >--< +0| lambda aaa, bbb: pass [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument/argument.formal.method.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.method.iteration.scope index d032d32ef0..ab3e0dfdcc 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.method.iteration.scope @@ -1,14 +1,11 @@ class Foo: - def bar(aaa: str, bbb: int): - pass + def bar(aaa: str, bbb: int): pass --- [Content] = 1:12-1:30 >------------------< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: str, bbb: int): pass -[Domain] = 1:4-2:12 - >---------------------------- -1| def bar(aaa: str, bbb: int): -2| pass - ------------< +[Domain] = 1:4-1:37 + >---------------------------------< +1| def bar(aaa: str, bbb: int): pass diff --git a/data/fixtures/scopes/python/argument/argument.formal.method.multiLine.scope b/data/fixtures/scopes/python/argument/argument.formal.method.multiLine.scope index 886af41601..2c971cb2c8 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.method.multiLine.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.method.multiLine.scope @@ -2,8 +2,7 @@ class Foo: def bar( aaa: str, bbb: int - ): - pass + ): pass --- [#1 Content] = diff --git a/data/fixtures/scopes/python/argument/argument.formal.method.singleLine.scope b/data/fixtures/scopes/python/argument/argument.formal.method.singleLine.scope index b4771bd3d1..e6b8e2cadd 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.method.singleLine.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.method.singleLine.scope @@ -1,20 +1,19 @@ class Foo: - def bar(aaa: str, bbb: int): - pass + def bar(aaa: str, bbb: int): pass --- [#1 Content] = [#1 Domain] = 1:12-1:20 >--------< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: str, bbb: int): pass [#1 Removal] = 1:12-1:22 >----------< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: str, bbb: int): pass [#1 Trailing delimiter] = 1:20-1:22 >--< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: str, bbb: int): pass [#1 Insertion delimiter] = ", " @@ -22,14 +21,14 @@ class Foo: [#2 Content] = [#2 Domain] = 1:22-1:30 >--------< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: str, bbb: int): pass [#2 Removal] = 1:20-1:30 >----------< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: str, bbb: int): pass [#2 Leading delimiter] = 1:20-1:22 >--< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: str, bbb: int): pass [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argument/argument.formal.multiLine.scope b/data/fixtures/scopes/python/argument/argument.formal.multiLine.scope index fd92a8b35c..4fb774fb48 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.multiLine.scope @@ -1,8 +1,7 @@ def foo( aaa, bbb, -): - pass +): pass --- [#1 Content] = diff --git a/data/fixtures/scopes/python/argument/argument.formal.singleLine.scope b/data/fixtures/scopes/python/argument/argument.formal.singleLine.scope index 9c72a8d485..67af92aa31 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.singleLine.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.singleLine.scope @@ -1,34 +1,33 @@ -def for(name: str, value: int): - pass +def for(aaa: int, bbb: int): pass --- [#1 Content] = -[#1 Domain] = 0:8-0:17 - >---------< -0| def for(name: str, value: int): +[#1 Domain] = 0:8-0:16 + >--------< +0| def for(aaa: int, bbb: int): pass -[#1 Removal] = 0:8-0:19 - >-----------< -0| def for(name: str, value: int): +[#1 Removal] = 0:8-0:18 + >----------< +0| def for(aaa: int, bbb: int): pass -[#1 Trailing delimiter] = 0:17-0:19 - >--< -0| def for(name: str, value: int): +[#1 Trailing delimiter] = 0:16-0:18 + >--< +0| def for(aaa: int, bbb: int): pass [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:19-0:29 - >----------< -0| def for(name: str, value: int): +[#2 Domain] = 0:18-0:26 + >--------< +0| def for(aaa: int, bbb: int): pass -[#2 Removal] = 0:17-0:29 - >------------< -0| def for(name: str, value: int): +[#2 Removal] = 0:16-0:26 + >----------< +0| def for(aaa: int, bbb: int): pass -[#2 Leading delimiter] = 0:17-0:19 - >--< -0| def for(name: str, value: int): +[#2 Leading delimiter] = 0:16-0:18 + >--< +0| def for(aaa: int, bbb: int): pass [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/argumentList/argumentList.actual.singleLine2.scope b/data/fixtures/scopes/python/argumentList/argumentList.actual.singleLine2.scope index daeddc0ac7..b6f33e2351 100644 --- a/data/fixtures/scopes/python/argumentList/argumentList.actual.singleLine2.scope +++ b/data/fixtures/scopes/python/argumentList/argumentList.actual.singleLine2.scope @@ -1,13 +1,13 @@ -" ".join(word for word in word_list) +" ".join(v for v in values) --- [Content] = -[Removal] = 0:9-0:35 - >--------------------------< -0| " ".join(word for word in word_list) +[Removal] = 0:9-0:26 + >-----------------< +0| " ".join(v for v in values) -[Domain] = 0:0-0:36 - >------------------------------------< -0| " ".join(word for word in word_list) +[Domain] = 0:0-0:27 + >---------------------------< +0| " ".join(v for v in values) [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/argumentList/argumentList.formal.singleLine.scope b/data/fixtures/scopes/python/argumentList/argumentList.formal.singleLine.scope index a0140576dc..12e4b19d0a 100644 --- a/data/fixtures/scopes/python/argumentList/argumentList.formal.singleLine.scope +++ b/data/fixtures/scopes/python/argumentList/argumentList.formal.singleLine.scope @@ -1,15 +1,15 @@ -def for(aaa: str, bbb: int): +def foo(aaa: str, bbb: int): pass --- [Content] = [Removal] = 0:8-0:26 >------------------< -0| def for(aaa: str, bbb: int): +0| def foo(aaa: str, bbb: int): [Domain] = 0:0-1:8 >---------------------------- -0| def for(aaa: str, bbb: int): +0| def foo(aaa: str, bbb: int): 1| pass --------< diff --git a/data/fixtures/scopes/python/branch/branch.if.elif.else.scope b/data/fixtures/scopes/python/branch/branch.if.elif.else.scope index 90331c9fad..a20d98eb8e 100644 --- a/data/fixtures/scopes/python/branch/branch.if.elif.else.scope +++ b/data/fixtures/scopes/python/branch/branch.if.elif.else.scope @@ -1,57 +1,45 @@ -if True: - pass -elif False: - pass -else: - pass +if True: pass +elif False: pass +else: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >-------- -0| if True: -1| pass - --------< - -[#1 Removal] = 0:0-2:2 - >-------- -0| if True: -1| pass -2| elif False: +[#1 Domain] = 0:0-0:13 + >-------------< +0| if True: pass + +[#1 Removal] = 0:0-1:2 + >------------- +0| if True: pass +1| elif False: pass --< [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 2:0-3:8 - >----------- -2| elif False: -3| pass - --------< - -[#2 Removal] = 2:0-4:0 - >----------- -2| elif False: -3| pass -4| else: +[#2 Domain] = 1:0-1:16 + >----------------< +1| elif False: pass + +[#2 Removal] = 1:0-2:0 + >---------------- +1| elif False: pass +2| else: pass < [#2 Insertion delimiter] = "\n" [#3 Content] = -[#3 Domain] = 4:0-5:8 - >----- -4| else: -5| pass - --------< - -[#3 Removal] = 3:8-5:8 - > -3| pass -4| else: -5| pass - --------< +[#3 Domain] = 2:0-2:10 + >----------< +2| else: pass + +[#3 Removal] = 1:16-2:10 + > +1| elif False: pass +2| else: pass + ----------< [#3 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/branch/branch.if.else.scope b/data/fixtures/scopes/python/branch/branch.if.else.scope index 2b540d1500..4180596cf8 100644 --- a/data/fixtures/scopes/python/branch/branch.if.else.scope +++ b/data/fixtures/scopes/python/branch/branch.if.else.scope @@ -1,38 +1,30 @@ -if True: - pass -else: - pass +if True: pass +else: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >-------- -0| if True: -1| pass - --------< +[#1 Domain] = 0:0-0:13 + >-------------< +0| if True: pass -[#1 Removal] = 0:0-2:0 - >-------- -0| if True: -1| pass -2| else: +[#1 Removal] = 0:0-1:0 + >------------- +0| if True: pass +1| else: pass < [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 2:0-3:8 - >----- -2| else: -3| pass - --------< +[#2 Domain] = 1:0-1:10 + >----------< +1| else: pass -[#2 Removal] = 1:8-3:8 - > -1| pass -2| else: -3| pass - --------< +[#2 Removal] = 0:13-1:10 + > +0| if True: pass +1| else: pass + ----------< [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/branch/branch.if.iteration.scope b/data/fixtures/scopes/python/branch/branch.if.iteration.scope index ddc9c3a97b..1a851a8e86 100644 --- a/data/fixtures/scopes/python/branch/branch.if.iteration.scope +++ b/data/fixtures/scopes/python/branch/branch.if.iteration.scope @@ -1,18 +1,12 @@ -if True: - pass -elif False: - pass -else: - pass +if True: pass +elif False: pass +else: pass --- [Content] = -[Domain] = 0:0-5:8 - >-------- -0| if True: -1| pass -2| elif False: -3| pass -4| else: -5| pass - --------< +[Domain] = 0:0-2:10 + >------------- +0| if True: pass +1| elif False: pass +2| else: pass + ----------< diff --git a/data/fixtures/scopes/python/branch/branch.if.scope b/data/fixtures/scopes/python/branch/branch.if.scope index ce48633dc0..6edbb125d7 100644 --- a/data/fixtures/scopes/python/branch/branch.if.scope +++ b/data/fixtures/scopes/python/branch/branch.if.scope @@ -1,13 +1,10 @@ -if True: - pass +if True: pass --- [Content] = [Removal] = -[Domain] = 0:0-1:8 - >-------- -0| if True: -1| pass - --------< +[Domain] = 0:0-0:13 + >-------------< +0| if True: pass [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/branch/branch.loop.iteration.scope b/data/fixtures/scopes/python/branch/branch.loop.iteration.scope index 5fc86a4a33..d801df9cec 100644 --- a/data/fixtures/scopes/python/branch/branch.loop.iteration.scope +++ b/data/fixtures/scopes/python/branch/branch.loop.iteration.scope @@ -1,14 +1,10 @@ -while True: - pass -else: - pass +while True: pass +else: pass --- [Content] = -[Domain] = 0:0-3:8 - >----------- -0| while True: -1| pass -2| else: -3| pass - --------< +[Domain] = 0:0-1:10 + >---------------- +0| while True: pass +1| else: pass + ----------< diff --git a/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope b/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope index 0122b85f9d..c0cfb84242 100644 --- a/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope +++ b/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope @@ -1,14 +1,10 @@ -for v in values: - pass -else: - pass +for v in values: pass +else: pass --- [Content] = -[Domain] = 0:0-3:8 - >---------------- -0| for v in values: -1| pass -2| else: -3| pass - --------< +[Domain] = 0:0-1:10 + >--------------------- +0| for v in values: pass +1| else: pass + ----------< diff --git a/data/fixtures/scopes/python/branch/branch.loop.scope b/data/fixtures/scopes/python/branch/branch.loop.scope index eb3c4708b2..96564b70c3 100644 --- a/data/fixtures/scopes/python/branch/branch.loop.scope +++ b/data/fixtures/scopes/python/branch/branch.loop.scope @@ -1,38 +1,30 @@ -while True: - pass -else: - pass +while True: pass +else: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >----------- -0| while True: -1| pass - --------< +[#1 Domain] = 0:0-0:16 + >----------------< +0| while True: pass -[#1 Removal] = 0:0-2:0 - >----------- -0| while True: -1| pass -2| else: +[#1 Removal] = 0:0-1:0 + >---------------- +0| while True: pass +1| else: pass < [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 2:0-3:8 - >----- -2| else: -3| pass - --------< +[#2 Domain] = 1:0-1:10 + >----------< +1| else: pass -[#2 Removal] = 1:8-3:8 - > -1| pass -2| else: -3| pass - --------< +[#2 Removal] = 0:16-1:10 + > +0| while True: pass +1| else: pass + ----------< [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/branch/branch.loop2.scope b/data/fixtures/scopes/python/branch/branch.loop2.scope index 2258b74d83..8c87a76e7a 100644 --- a/data/fixtures/scopes/python/branch/branch.loop2.scope +++ b/data/fixtures/scopes/python/branch/branch.loop2.scope @@ -1,38 +1,30 @@ -for v in values: - pass -else: - pass +for v in values: pass +else: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------------- -0| for v in values: -1| pass - --------< +[#1 Domain] = 0:0-0:21 + >---------------------< +0| for v in values: pass -[#1 Removal] = 0:0-2:0 - >---------------- -0| for v in values: -1| pass -2| else: +[#1 Removal] = 0:0-1:0 + >--------------------- +0| for v in values: pass +1| else: pass < [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 2:0-3:8 - >----- -2| else: -3| pass - --------< +[#2 Domain] = 1:0-1:10 + >----------< +1| else: pass -[#2 Removal] = 1:8-3:8 - > -1| pass -2| else: -3| pass - --------< +[#2 Removal] = 0:21-1:10 + > +0| for v in values: pass +1| else: pass + ----------< [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope index 6c7a1e0a6b..17672951bb 100644 --- a/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope @@ -1,24 +1,15 @@ -match 0: - case [0]: - pass - case [1]: - pass +match foo: + pass --- -[Content] = 0:8-4:12 - > -0| match 0: -1| case [0]: -2| pass -3| case [1]: -4| pass - ------------< +[Content] = 0:10-1:8 + > +0| match foo: +1| pass + --------< -[Domain] = 0:0-4:12 - >-------- -0| match 0: -1| case [0]: -2| pass -3| case [1]: -4| pass - ------------< +[Domain] = 0:0-1:8 + >---------- +0| match foo: +1| pass + --------< diff --git a/data/fixtures/scopes/python/branch/branch.switchCase.scope b/data/fixtures/scopes/python/branch/branch.switchCase.scope index 5a95cd0f28..27b2d53dee 100644 --- a/data/fixtures/scopes/python/branch/branch.switchCase.scope +++ b/data/fixtures/scopes/python/branch/branch.switchCase.scope @@ -1,47 +1,47 @@ -match 0: - case [0]: +match foo: + case 0: pass - case [1]: + case _: pass --- [#1 Content] = [#1 Domain] = 1:4-2:12 - >--------- -1| case [0]: + >------- +1| case 0: 2| pass ------------< [#1 Removal] = 1:0-3:0 - >------------- -1| case [0]: + >----------- +1| case 0: 2| pass -3| case [1]: +3| case _: < [#1 Leading delimiter] = 1:0-1:4 >----< -1| case [0]: +1| case 0: [#1 Insertion delimiter] = "\n" [#2 Content] = [#2 Domain] = 3:4-4:12 - >--------- -3| case [1]: + >------- +3| case _: 4| pass ------------< [#2 Removal] = 2:12-4:12 > 2| pass -3| case [1]: +3| case _: 4| pass ------------< [#2 Leading delimiter] = 3:0-3:4 >----< -3| case [1]: +3| case _: [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/branch/branch.try2.scope b/data/fixtures/scopes/python/branch/branch.try2.scope index 821983af5b..b1832ed988 100644 --- a/data/fixtures/scopes/python/branch/branch.try2.scope +++ b/data/fixtures/scopes/python/branch/branch.try2.scope @@ -1,6 +1,6 @@ try: pass -except* ValueError as eg: +except Exception as e: pass else: pass @@ -17,7 +17,7 @@ else: >---- 0| try: 1| pass -2| except* ValueError as eg: +2| except Exception as e: < [#1 Insertion delimiter] = "\n" @@ -25,14 +25,14 @@ else: [#2 Content] = [#2 Domain] = 2:0-3:8 - >------------------------- -2| except* ValueError as eg: + >---------------------- +2| except Exception as e: 3| pass --------< [#2 Removal] = 2:0-4:0 - >------------------------- -2| except* ValueError as eg: + >---------------------- +2| except Exception as e: 3| pass 4| else: < diff --git a/data/fixtures/scopes/python/class2.scope b/data/fixtures/scopes/python/class2.scope index 956e5e38d6..eca5dfb37d 100644 --- a/data/fixtures/scopes/python/class2.scope +++ b/data/fixtures/scopes/python/class2.scope @@ -1,4 +1,4 @@ -@value +@bar class Foo: pass --- @@ -6,8 +6,8 @@ class Foo: [Content] = [Removal] = [Domain] = 0:0-2:8 - >------ -0| @value + >---- +0| @bar 1| class Foo: 2| pass --------< diff --git a/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope index cc975a7302..17672951bb 100644 --- a/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope @@ -1,24 +1,15 @@ -match value: - case 0: - pass - case 1: - pass +match foo: + pass --- -[Content] = 0:12-4:12 - > -0| match value: -1| case 0: -2| pass -3| case 1: -4| pass - ------------< +[Content] = 0:10-1:8 + > +0| match foo: +1| pass + --------< -[Domain] = 0:0-4:12 - >------------ -0| match value: -1| case 0: -2| pass -3| case 1: -4| pass - ------------< +[Domain] = 0:0-1:8 + >---------- +0| match foo: +1| pass + --------< diff --git a/data/fixtures/scopes/python/condition/condition.switchCase.scope b/data/fixtures/scopes/python/condition/condition.switchCase.scope index 0f09294a8b..c0377e319a 100644 --- a/data/fixtures/scopes/python/condition/condition.switchCase.scope +++ b/data/fixtures/scopes/python/condition/condition.switchCase.scope @@ -1,47 +1,21 @@ -match value: - case 0: - pass - case 1: - pass +match foo: + case 0: pass --- -[#1 Content] = 1:9-1:10 +[Content] = 1:9-1:10 >-< -1| case 0: +1| case 0: pass -[#1 Removal] = 1:8-1:10 +[Removal] = 1:8-1:10 >--< -1| case 0: +1| case 0: pass -[#1 Leading delimiter] = 1:8-1:9 +[Leading delimiter] = 1:8-1:9 >-< -1| case 0: +1| case 0: pass -[#1 Domain] = 1:4-2:12 - >------- -1| case 0: -2| pass - ------------< +[Domain] = 1:4-1:16 + >------------< +1| case 0: pass -[#1 Insertion delimiter] = " " - - -[#2 Content] = 3:9-3:10 - >-< -3| case 1: - -[#2 Removal] = 3:8-3:10 - >--< -3| case 1: - -[#2 Leading delimiter] = 3:8-3:9 - >-< -3| case 1: - -[#2 Domain] = 3:4-4:12 - >------- -3| case 1: -4| pass - ------------< - -[#2 Insertion delimiter] = " " +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/condition/condition.ternary.scope b/data/fixtures/scopes/python/condition/condition.ternary.scope index 5743473512..f3aee2967b 100644 --- a/data/fixtures/scopes/python/condition/condition.ternary.scope +++ b/data/fixtures/scopes/python/condition/condition.ternary.scope @@ -1,24 +1,24 @@ -value if value > 0 else None +0 if True else 1 --- -[Content] = 0:9-0:18 - >---------< -0| value if value > 0 else None +[Content] = 0:5-0:9 + >----< +0| 0 if True else 1 -[Removal] = 0:9-0:19 - >----------< -0| value if value > 0 else None +[Removal] = 0:5-0:10 + >-----< +0| 0 if True else 1 -[Leading delimiter] = 0:8-0:9 - >-< -0| value if value > 0 else None +[Leading delimiter] = 0:4-0:5 + >-< +0| 0 if True else 1 -[Trailing delimiter] = 0:18-0:19 - >-< -0| value if value > 0 else None +[Trailing delimiter] = 0:9-0:10 + >-< +0| 0 if True else 1 -[Domain] = 0:0-0:28 - >----------------------------< -0| value if value > 0 else None +[Domain] = 0:0-0:16 + >----------------< +0| 0 if True else 1 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/condition/condition.while.scope b/data/fixtures/scopes/python/condition/condition.while.scope index 15e151af58..14b9585e9f 100644 --- a/data/fixtures/scopes/python/condition/condition.while.scope +++ b/data/fixtures/scopes/python/condition/condition.while.scope @@ -1,22 +1,22 @@ -while value > 0: +while True: pass --- -[Content] = 0:6-0:15 - >---------< -0| while value > 0: +[Content] = 0:6-0:10 + >----< +0| while True: -[Removal] = 0:5-0:15 - >----------< -0| while value > 0: +[Removal] = 0:5-0:10 + >-----< +0| while True: [Leading delimiter] = 0:5-0:6 >-< -0| while value > 0: +0| while True: [Domain] = 0:0-1:8 - >---------------- -0| while value > 0: + >----------- +0| while True: 1| pass --------< diff --git a/data/fixtures/scopes/python/ifStatement.scope b/data/fixtures/scopes/python/ifStatement.scope index d104e3e215..16b00e99dc 100644 --- a/data/fixtures/scopes/python/ifStatement.scope +++ b/data/fixtures/scopes/python/ifStatement.scope @@ -1,21 +1,15 @@ -if value > 0: - pass -elif value == 0: - pass -else: - pass +if True: pass +elif False: pass +else: pass --- [Content] = [Removal] = -[Domain] = 0:0-5:8 +[Domain] = 0:0-2:10 >------------- -0| if value > 0: -1| pass -2| elif value == 0: -3| pass -4| else: -5| pass - --------< +0| if True: pass +1| elif False: pass +2| else: pass + ----------< [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/interior/interior.class.scope b/data/fixtures/scopes/python/interior/interior.class.scope index 0248108e3e..719407b3ab 100644 --- a/data/fixtures/scopes/python/interior/interior.class.scope +++ b/data/fixtures/scopes/python/interior/interior.class.scope @@ -1,16 +1,13 @@ -class MyClass: - pass +class Foo: pass --- [Content] = -[Removal] = 1:4-1:8 - >----< -1| pass +[Removal] = 0:11-0:15 + >----< +0| class Foo: pass -[Domain] = 0:0-1:8 - >-------------- -0| class MyClass: -1| pass - --------< +[Domain] = 0:0-0:15 + >---------------< +0| class Foo: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.constructor.scope b/data/fixtures/scopes/python/interior/interior.constructor.scope index 68f9215f3e..641c966a22 100644 --- a/data/fixtures/scopes/python/interior/interior.constructor.scope +++ b/data/fixtures/scopes/python/interior/interior.constructor.scope @@ -1,35 +1,29 @@ class Foo: - def __init__(self): - pass + def __init__(self): pass --- [#1 Content] = -[#1 Removal] = 1:4-2:12 - >------------------- -1| def __init__(self): -2| pass - ------------< +[#1 Removal] = 1:4-1:28 + >------------------------< +1| def __init__(self): pass -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:28 >---------- 0| class Foo: -1| def __init__(self): -2| pass - ------------< +1| def __init__(self): pass + ----------------------------< [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 2:8-2:12 - >----< -2| pass +[#2 Removal] = 1:24-1:28 + >----< +1| def __init__(self): pass -[#2 Domain] = 1:4-2:12 - >------------------- -1| def __init__(self): -2| pass - ------------< +[#2 Domain] = 1:4-1:28 + >------------------------< +1| def __init__(self): pass [#2 Insertion delimiter] = " " @@ -37,10 +31,10 @@ class Foo: [#3 Content] = [#3 Removal] = 1:17-1:21 >----< -1| def __init__(self): +1| def __init__(self): pass [#3 Domain] = 1:16-1:22 >------< -1| def __init__(self): +1| def __init__(self): pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.foreach.scope b/data/fixtures/scopes/python/interior/interior.foreach.scope index 66c2c4a322..165854f8b2 100644 --- a/data/fixtures/scopes/python/interior/interior.foreach.scope +++ b/data/fixtures/scopes/python/interior/interior.foreach.scope @@ -1,16 +1,13 @@ -for v in values: - pass +for v in values: pass --- [Content] = -[Removal] = 1:4-1:8 - >----< -1| pass +[Removal] = 0:17-0:21 + >----< +0| for v in values: pass -[Domain] = 0:0-1:8 - >---------------- -0| for v in values: -1| pass - --------< +[Domain] = 0:0-0:21 + >---------------------< +0| for v in values: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.function.scope b/data/fixtures/scopes/python/interior/interior.function.scope index 9acf9a45a3..179ab55204 100644 --- a/data/fixtures/scopes/python/interior/interior.function.scope +++ b/data/fixtures/scopes/python/interior/interior.function.scope @@ -1,17 +1,14 @@ -def foo(): - pass +def foo(): pass --- [#1 Content] = -[#1 Removal] = 1:4-1:8 - >----< -1| pass +[#1 Removal] = 0:11-0:15 + >----< +0| def foo(): pass -[#1 Domain] = 0:0-1:8 - >---------- -0| def foo(): -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| def foo(): pass [#1 Insertion delimiter] = " " @@ -19,10 +16,10 @@ def foo(): [#2 Content] = [#2 Removal] = 0:8-0:8 >< -0| def foo(): +0| def foo(): pass [#2 Domain] = 0:7-0:9 >--< -0| def foo(): +0| def foo(): pass [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.function2.scope b/data/fixtures/scopes/python/interior/interior.function2.scope index d3b7564582..bd6ce81c00 100644 --- a/data/fixtures/scopes/python/interior/interior.function2.scope +++ b/data/fixtures/scopes/python/interior/interior.function2.scope @@ -1,30 +1,28 @@ -@foo -def bar(value: string) -> str: - return value +@bar +def foo(): pass --- [#1 Content] = -[#1 Removal] = 2:4-2:16 - >------------< -2| return value +[#1 Removal] = 1:11-1:15 + >----< +1| def foo(): pass -[#1 Domain] = 0:0-2:16 +[#1 Domain] = 0:0-1:15 >---- -0| @foo -1| def bar(value: string) -> str: -2| return value - ----------------< +0| @bar +1| def foo(): pass + ---------------< [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 1:8-1:21 - >-------------< -1| def bar(value: string) -> str: +[#2 Removal] = 1:8-1:8 + >< +1| def foo(): pass -[#2 Domain] = 1:7-1:22 - >---------------< -1| def bar(value: string) -> str: +[#2 Domain] = 1:7-1:9 + >--< +1| def foo(): pass [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.if.scope b/data/fixtures/scopes/python/interior/interior.if.scope index 1b902b0cab..023fe55488 100644 --- a/data/fixtures/scopes/python/interior/interior.if.scope +++ b/data/fixtures/scopes/python/interior/interior.if.scope @@ -1,48 +1,39 @@ -if True: - a -elif False: - b -else: - c +if True: pass +elif False: pass +else: pass --- [#1 Content] = -[#1 Removal] = 1:4-1:5 - >-< -1| a +[#1 Removal] = 0:9-0:13 + >----< +0| if True: pass -[#1 Domain] = 0:0-1:5 - >-------- -0| if True: -1| a - -----< +[#1 Domain] = 0:0-0:13 + >-------------< +0| if True: pass [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 3:4-3:5 - >-< -3| b +[#2 Removal] = 1:12-1:16 + >----< +1| elif False: pass -[#2 Domain] = 2:0-3:5 - >----------- -2| elif False: -3| b - -----< +[#2 Domain] = 1:0-1:16 + >----------------< +1| elif False: pass [#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 5:4-5:5 - >-< -5| c - -[#3 Domain] = 4:0-5:5 - >----- -4| else: -5| c - -----< +[#3 Removal] = 2:6-2:10 + >----< +2| else: pass + +[#3 Domain] = 2:0-2:10 + >----------< +2| else: pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.method.scope b/data/fixtures/scopes/python/interior/interior.method.scope index 10c21bafbf..df796b77d5 100644 --- a/data/fixtures/scopes/python/interior/interior.method.scope +++ b/data/fixtures/scopes/python/interior/interior.method.scope @@ -1,35 +1,29 @@ class Foo: - def bar(): - pass + def bar(): pass --- [#1 Content] = -[#1 Removal] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[#1 Removal] = 1:4-1:19 + >---------------< +1| def bar(): pass -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:19 >---------- 0| class Foo: -1| def bar(): -2| pass - ------------< +1| def bar(): pass + -------------------< [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 2:8-2:12 - >----< -2| pass +[#2 Removal] = 1:15-1:19 + >----< +1| def bar(): pass -[#2 Domain] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[#2 Domain] = 1:4-1:19 + >---------------< +1| def bar(): pass [#2 Insertion delimiter] = " " @@ -37,10 +31,10 @@ class Foo: [#3 Content] = [#3 Removal] = 1:12-1:12 >< -1| def bar(): +1| def bar(): pass [#3 Domain] = 1:11-1:13 >--< -1| def bar(): +1| def bar(): pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.resource.scope b/data/fixtures/scopes/python/interior/interior.resource.scope index f5cc28f2d3..ee195de6d4 100644 --- a/data/fixtures/scopes/python/interior/interior.resource.scope +++ b/data/fixtures/scopes/python/interior/interior.resource.scope @@ -1,16 +1,13 @@ -with file: - pass +with file: pass --- [Content] = -[Removal] = 1:4-1:8 - >----< -1| pass +[Removal] = 0:11-0:15 + >----< +0| with file: pass -[Domain] = 0:0-1:8 - >---------- -0| with file: -1| pass - --------< +[Domain] = 0:0-0:15 + >---------------< +0| with file: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.switchCase.scope b/data/fixtures/scopes/python/interior/interior.switchCase.scope index c8f89f9a36..551e1fab23 100644 --- a/data/fixtures/scopes/python/interior/interior.switchCase.scope +++ b/data/fixtures/scopes/python/interior/interior.switchCase.scope @@ -1,6 +1,6 @@ -match value: +match foo: case 0: - foo + bar pass case _: pass @@ -9,27 +9,27 @@ match value: [#1 Content] = 1:4-5:12 >------- 1| case 0: -2| foo +2| bar 3| pass 4| case _: 5| pass ------------< -[#1 Removal] = 0:12-5:12 - > -0| match value: +[#1 Removal] = 0:10-5:12 + > +0| match foo: 1| case 0: -2| foo +2| bar 3| pass 4| case _: 5| pass ------------< [#1 Domain] = 0:0-5:12 - >------------ -0| match value: + >---------- +0| match foo: 1| case 0: -2| foo +2| bar 3| pass 4| case _: 5| pass @@ -41,14 +41,14 @@ match value: [#2 Content] = [#2 Removal] = 2:8-3:12 >--- -2| foo +2| bar 3| pass ------------< [#2 Domain] = 1:4-3:12 >------- 1| case 0: -2| foo +2| bar 3| pass ------------< diff --git a/data/fixtures/scopes/python/interior/interior.ternary.scope b/data/fixtures/scopes/python/interior/interior.ternary.scope index fcd8355982..5064299d24 100644 --- a/data/fixtures/scopes/python/interior/interior.ternary.scope +++ b/data/fixtures/scopes/python/interior/interior.ternary.scope @@ -1,11 +1,11 @@ -1 if True else 0 +0 if True else 1 --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-0:1 >-< -0| 1 if True else 0 +0| 0 if True else 1 [#1 Insertion delimiter] = " " @@ -13,11 +13,11 @@ [#2 Content] = [#2 Removal] = 0:5-0:9 >----< -0| 1 if True else 0 +0| 0 if True else 1 [#2 Domain] = 0:2-0:9 >-------< -0| 1 if True else 0 +0| 0 if True else 1 [#2 Insertion delimiter] = " " @@ -25,10 +25,10 @@ [#3 Content] = [#3 Removal] = 0:15-0:16 >-< -0| 1 if True else 0 +0| 0 if True else 1 [#3 Domain] = 0:10-0:16 >------< -0| 1 if True else 0 +0| 0 if True else 1 [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.try.scope b/data/fixtures/scopes/python/interior/interior.try.scope index f84e164e81..28611b4b9d 100644 --- a/data/fixtures/scopes/python/interior/interior.try.scope +++ b/data/fixtures/scopes/python/interior/interior.try.scope @@ -1,48 +1,39 @@ -try: - a -except: - b -finally: - c +try: pass +except: pass +finally: pass --- [#1 Content] = -[#1 Removal] = 1:4-1:5 - >-< -1| a +[#1 Removal] = 0:5-0:9 + >----< +0| try: pass -[#1 Domain] = 0:0-1:5 - >---- -0| try: -1| a - -----< +[#1 Domain] = 0:0-0:9 + >---------< +0| try: pass [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 3:4-3:5 - >-< -3| b +[#2 Removal] = 1:8-1:12 + >----< +1| except: pass -[#2 Domain] = 2:0-3:5 - >------- -2| except: -3| b - -----< +[#2 Domain] = 1:0-1:12 + >------------< +1| except: pass [#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 5:4-5:5 - >-< -5| c - -[#3 Domain] = 4:0-5:5 - >-------- -4| finally: -5| c - -----< +[#3 Removal] = 2:9-2:13 + >----< +2| finally: pass + +[#3 Domain] = 2:0-2:13 + >-------------< +2| finally: pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.try2.scope b/data/fixtures/scopes/python/interior/interior.try2.scope index 3514dad238..58a5c379e2 100644 --- a/data/fixtures/scopes/python/interior/interior.try2.scope +++ b/data/fixtures/scopes/python/interior/interior.try2.scope @@ -1,32 +1,26 @@ -try: - a -except*: - b +try: pass +except*: pass --- [#1 Content] = -[#1 Removal] = 1:4-1:5 - >-< -1| a +[#1 Removal] = 0:5-0:9 + >----< +0| try: pass -[#1 Domain] = 0:0-1:5 - >---- -0| try: -1| a - -----< +[#1 Domain] = 0:0-0:9 + >---------< +0| try: pass [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 3:4-3:5 - >-< -3| b +[#2 Removal] = 1:9-1:13 + >----< +1| except*: pass -[#2 Domain] = 2:0-3:5 - >-------- -2| except*: -3| b - -----< +[#2 Domain] = 1:0-1:13 + >-------------< +1| except*: pass [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/interior/interior.while.scope b/data/fixtures/scopes/python/interior/interior.while.scope index 606f604f49..caaaf393e8 100644 --- a/data/fixtures/scopes/python/interior/interior.while.scope +++ b/data/fixtures/scopes/python/interior/interior.while.scope @@ -1,16 +1,13 @@ -while True: - pass +while True: pass --- [Content] = -[Removal] = 1:4-1:8 - >----< -1| pass +[Removal] = 0:12-0:16 + >----< +0| while True: pass -[Domain] = 0:0-1:8 - >----------- -0| while True: -1| pass - --------< +[Domain] = 0:0-0:16 + >----------------< +0| while True: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/key.mapPair.iteration.scope b/data/fixtures/scopes/python/key.mapPair.iteration.scope index 7a93431b7c..7708be130f 100644 --- a/data/fixtures/scopes/python/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/python/key.mapPair.iteration.scope @@ -1,7 +1,7 @@ -{ aaa: 123, bbb: 456} +{aaa: 0, bbb: 1} --- [Content] = -[Domain] = 0:1-0:20 - >-------------------< -0| { aaa: 123, bbb: 456} +[Domain] = 0:1-0:15 + >--------------< +0| {aaa: 0, bbb: 1} diff --git a/data/fixtures/scopes/python/key.mapPair.scope b/data/fixtures/scopes/python/key.mapPair.scope index d81e7d3914..2a80a5972d 100644 --- a/data/fixtures/scopes/python/key.mapPair.scope +++ b/data/fixtures/scopes/python/key.mapPair.scope @@ -1,39 +1,39 @@ -{ aaa: 123, bbb: 456} +{aaa: 0, bbb: 1} --- -[#1 Content] = 0:2-0:5 - >---< -0| { aaa: 123, bbb: 456} +[#1 Content] = 0:1-0:4 + >---< +0| {aaa: 0, bbb: 1} -[#1 Removal] = 0:2-0:7 - >-----< -0| { aaa: 123, bbb: 456} +[#1 Removal] = 0:1-0:6 + >-----< +0| {aaa: 0, bbb: 1} -[#1 Trailing delimiter] = 0:5-0:7 - >--< -0| { aaa: 123, bbb: 456} +[#1 Trailing delimiter] = 0:4-0:6 + >--< +0| {aaa: 0, bbb: 1} -[#1 Domain] = 0:2-0:10 - >--------< -0| { aaa: 123, bbb: 456} +[#1 Domain] = 0:1-0:7 + >------< +0| {aaa: 0, bbb: 1} [#1 Insertion delimiter] = " " -[#2 Content] = 0:12-0:15 - >---< -0| { aaa: 123, bbb: 456} +[#2 Content] = 0:9-0:12 + >---< +0| {aaa: 0, bbb: 1} -[#2 Removal] = 0:12-0:17 - >-----< -0| { aaa: 123, bbb: 456} +[#2 Removal] = 0:9-0:14 + >-----< +0| {aaa: 0, bbb: 1} -[#2 Trailing delimiter] = 0:15-0:17 - >--< -0| { aaa: 123, bbb: 456} +[#2 Trailing delimiter] = 0:12-0:14 + >--< +0| {aaa: 0, bbb: 1} -[#2 Domain] = 0:12-0:20 - >--------< -0| { aaa: 123, bbb: 456} +[#2 Domain] = 0:9-0:15 + >------< +0| {aaa: 0, bbb: 1} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/list.scope b/data/fixtures/scopes/python/list.scope index 16ece5387a..053c607f96 100644 --- a/data/fixtures/scopes/python/list.scope +++ b/data/fixtures/scopes/python/list.scope @@ -1,10 +1,10 @@ -[123, 456] +[aaa, bbb] --- [Content] = [Removal] = [Domain] = 0:0-0:10 >----------< -0| [123, 456] +0| [aaa, bbb] [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/map.scope b/data/fixtures/scopes/python/map.scope index f87e91a160..7c6e537e73 100644 --- a/data/fixtures/scopes/python/map.scope +++ b/data/fixtures/scopes/python/map.scope @@ -1,10 +1,10 @@ -{ aaa: 123, bbb: 456} +{aaa: 0, bbb: 1} --- [Content] = [Removal] = -[Domain] = 0:0-0:21 - >---------------------< -0| { aaa: 123, bbb: 456} +[Domain] = 0:0-0:16 + >----------------< +0| {aaa: 0, bbb: 1} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.argument.actual.iteration.scope b/data/fixtures/scopes/python/name/name.argument.actual.iteration.scope index 3a4e57fb0e..ad840ce1ac 100644 --- a/data/fixtures/scopes/python/name/name.argument.actual.iteration.scope +++ b/data/fixtures/scopes/python/name/name.argument.actual.iteration.scope @@ -1,13 +1,13 @@ -aaa(bbb=0, ccc=1) +foo(aaa=0, bbb=1) --- [#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Content] = [#2 Domain] = 0:4-0:16 >------------< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) diff --git a/data/fixtures/scopes/python/name/name.argument.actual.scope b/data/fixtures/scopes/python/name/name.argument.actual.scope index 12a9e7017a..499a30d10c 100644 --- a/data/fixtures/scopes/python/name/name.argument.actual.scope +++ b/data/fixtures/scopes/python/name/name.argument.actual.scope @@ -1,14 +1,14 @@ -aaa(bbb=0, ccc=1) +foo(aaa=0, bbb=1) --- [#1 Content] = [#1 Removal] = 0:4-0:7 >---< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#1 Domain] = 0:4-0:9 >-----< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#1 Insertion delimiter] = " " @@ -16,14 +16,14 @@ aaa(bbb=0, ccc=1) [#2 Content] = [#2 Removal] = 0:11-0:14 >---< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Leading delimiter] = 0:10-0:11 >-< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Domain] = 0:11-0:16 >-----< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.argument.catch.scope b/data/fixtures/scopes/python/name/name.argument.catch.scope index 966a24e0bb..b7a4f3cdc9 100644 --- a/data/fixtures/scopes/python/name/name.argument.catch.scope +++ b/data/fixtures/scopes/python/name/name.argument.catch.scope @@ -1,44 +1,41 @@ -try: - pass -except MyException as ex: - pass -except Exception as ex: - pass +try: pass +except MyException as e: pass +except Exception as e: pass --- -[#1 Content] = 2:22-2:24 - >--< -2| except MyException as ex: +[#1 Content] = 1:22-1:23 + >-< +1| except MyException as e: pass -[#1 Removal] = 2:21-2:24 - >---< -2| except MyException as ex: +[#1 Removal] = 1:21-1:23 + >--< +1| except MyException as e: pass -[#1 Leading delimiter] = 2:21-2:22 +[#1 Leading delimiter] = 1:21-1:22 >-< -2| except MyException as ex: +1| except MyException as e: pass -[#1 Domain] = 2:7-2:24 - >-----------------< -2| except MyException as ex: +[#1 Domain] = 1:7-1:23 + >----------------< +1| except MyException as e: pass [#1 Insertion delimiter] = " " -[#2 Content] = 4:20-4:22 - >--< -4| except Exception as ex: +[#2 Content] = 2:20-2:21 + >-< +2| except Exception as e: pass -[#2 Removal] = 4:19-4:22 - >---< -4| except Exception as ex: +[#2 Removal] = 2:19-2:21 + >--< +2| except Exception as e: pass -[#2 Leading delimiter] = 4:19-4:20 +[#2 Leading delimiter] = 2:19-2:20 >-< -4| except Exception as ex: +2| except Exception as e: pass -[#2 Domain] = 4:7-4:22 - >---------------< -4| except Exception as ex: +[#2 Domain] = 2:7-2:21 + >--------------< +2| except Exception as e: pass [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/python/name/name.argument.formal.constructor.iteration.scope index 72c05a5ae7..36081af4ef 100644 --- a/data/fixtures/scopes/python/name/name.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/python/name/name.argument.formal.constructor.iteration.scope @@ -1,32 +1,28 @@ class Foo: - def __init__(self, aaa: str, bbb: int): - pass + def __init__(self, aaa: int, bbb: int): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:48 >---------- 0| class Foo: -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +1| def __init__(self, aaa: int, bbb: int): pass + ------------------------------------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >--------------------------------------- -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +[#2 Domain] = 1:4-1:48 + >--------------------------------------------< +1| def __init__(self, aaa: int, bbb: int): pass [#3 Content] = [#3 Domain] = 1:17-1:41 >------------------------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#4 Content] = -[#4 Domain] = 2:8-2:12 - >----< -2| pass +[#4 Domain] = 1:44-1:48 + >----< +1| def __init__(self, aaa: int, bbb: int): pass diff --git a/data/fixtures/scopes/python/name/name.argument.formal.constructor.scope b/data/fixtures/scopes/python/name/name.argument.formal.constructor.scope index 5613888b33..369b69c3d3 100644 --- a/data/fixtures/scopes/python/name/name.argument.formal.constructor.scope +++ b/data/fixtures/scopes/python/name/name.argument.formal.constructor.scope @@ -1,6 +1,5 @@ class Foo: - def __init__(self, aaa: str, bbb: int): - pass + def __init__(self, aaa: int, bbb: int): pass --- [#1 Content] = 0:6-0:9 @@ -15,12 +14,11 @@ class Foo: >-< 0| class Foo: -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:48 >---------- 0| class Foo: -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +1| def __init__(self, aaa: int, bbb: int): pass + ------------------------------------------------< [#1 Insertion delimiter] = " " @@ -28,17 +26,15 @@ class Foo: [#2 Content] = [#2 Removal] = 1:8-1:16 >--------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#2 Leading delimiter] = 1:7-1:8 >-< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass -[#2 Domain] = 1:4-2:12 - >--------------------------------------- -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +[#2 Domain] = 1:4-1:48 + >--------------------------------------------< +1| def __init__(self, aaa: int, bbb: int): pass [#2 Insertion delimiter] = " " @@ -47,44 +43,44 @@ class Foo: [#3 Removal] = [#3 Domain] = 1:17-1:21 >----< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#3 Insertion delimiter] = " " [#4 Content] = 1:23-1:26 >---< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#4 Removal] = 1:22-1:26 >----< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#4 Leading delimiter] = 1:22-1:23 >-< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#4 Domain] = 1:23-1:31 >--------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#4 Insertion delimiter] = " " [#5 Content] = 1:33-1:36 >---< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#5 Removal] = 1:32-1:36 >----< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#5 Leading delimiter] = 1:32-1:33 >-< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#5 Domain] = 1:33-1:41 >--------< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: int, bbb: int): pass [#5 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.argument.formal.iteration.scope b/data/fixtures/scopes/python/name/name.argument.formal.iteration.scope index c906e47fd1..f98647c74a 100644 --- a/data/fixtures/scopes/python/name/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/python/name/name.argument.formal.iteration.scope @@ -1,22 +1,19 @@ -def foo(aaa: str, bbb: int): - pass +def bar(aaa: int, bbb: int): pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------------------------- -0| def foo(aaa: str, bbb: int): -1| pass - --------< +[#1 Domain] = 0:0-0:33 + >---------------------------------< +0| def bar(aaa: int, bbb: int): pass [#2 Content] = [#2 Domain] = 0:8-0:26 >------------------< -0| def foo(aaa: str, bbb: int): +0| def bar(aaa: int, bbb: int): pass [#3 Content] = -[#3 Domain] = 1:4-1:8 - >----< -1| pass +[#3 Domain] = 0:29-0:33 + >----< +0| def bar(aaa: int, bbb: int): pass diff --git a/data/fixtures/scopes/python/name/name.argument.formal.method.iteration.scope b/data/fixtures/scopes/python/name/name.argument.formal.method.iteration.scope index 24d83948e9..343ab37437 100644 --- a/data/fixtures/scopes/python/name/name.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/python/name/name.argument.formal.method.iteration.scope @@ -1,32 +1,28 @@ class Foo: - def bar(aaa: str, bbb: int): - pass + def bar(aaa: int, bbb: int): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:37 >---------- 0| class Foo: -1| def bar(aaa: str, bbb: int): -2| pass - ------------< +1| def bar(aaa: int, bbb: int): pass + -------------------------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >---------------------------- -1| def bar(aaa: str, bbb: int): -2| pass - ------------< +[#2 Domain] = 1:4-1:37 + >---------------------------------< +1| def bar(aaa: int, bbb: int): pass [#3 Content] = [#3 Domain] = 1:12-1:30 >------------------< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass [#4 Content] = -[#4 Domain] = 2:8-2:12 - >----< -2| pass +[#4 Domain] = 1:33-1:37 + >----< +1| def bar(aaa: int, bbb: int): pass diff --git a/data/fixtures/scopes/python/name/name.argument.formal.method.scope b/data/fixtures/scopes/python/name/name.argument.formal.method.scope index 0056f4a820..eeea94b286 100644 --- a/data/fixtures/scopes/python/name/name.argument.formal.method.scope +++ b/data/fixtures/scopes/python/name/name.argument.formal.method.scope @@ -1,6 +1,5 @@ class Foo: - def bar(aaa: str, bbb: int): - pass + def bar(aaa: int, bbb: int): pass --- [#1 Content] = 0:6-0:9 @@ -15,12 +14,11 @@ class Foo: >-< 0| class Foo: -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:37 >---------- 0| class Foo: -1| def bar(aaa: str, bbb: int): -2| pass - ------------< +1| def bar(aaa: int, bbb: int): pass + -------------------------------------< [#1 Insertion delimiter] = " " @@ -28,17 +26,15 @@ class Foo: [#2 Content] = [#2 Removal] = 1:8-1:11 >---< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass [#2 Leading delimiter] = 1:7-1:8 >-< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass -[#2 Domain] = 1:4-2:12 - >---------------------------- -1| def bar(aaa: str, bbb: int): -2| pass - ------------< +[#2 Domain] = 1:4-1:37 + >---------------------------------< +1| def bar(aaa: int, bbb: int): pass [#2 Insertion delimiter] = " " @@ -46,29 +42,29 @@ class Foo: [#3 Content] = [#3 Removal] = 1:12-1:15 >---< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass [#3 Domain] = 1:12-1:20 >--------< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass [#3 Insertion delimiter] = " " [#4 Content] = 1:22-1:25 >---< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass [#4 Removal] = 1:21-1:25 >----< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass [#4 Leading delimiter] = 1:21-1:22 >-< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass [#4 Domain] = 1:22-1:30 >--------< -1| def bar(aaa: str, bbb: int): +1| def bar(aaa: int, bbb: int): pass [#4 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.argument.formal.scope b/data/fixtures/scopes/python/name/name.argument.formal.scope index 8a83f93516..0a421e5927 100644 --- a/data/fixtures/scopes/python/name/name.argument.formal.scope +++ b/data/fixtures/scopes/python/name/name.argument.formal.scope @@ -1,21 +1,18 @@ -def foo(aaa: str, bbb: int): - pass +def foo(aaa: int, bbb: int): pass --- [#1 Content] = [#1 Removal] = 0:4-0:7 >---< -0| def foo(aaa: str, bbb: int): +0| def foo(aaa: int, bbb: int): pass [#1 Leading delimiter] = 0:3-0:4 >-< -0| def foo(aaa: str, bbb: int): +0| def foo(aaa: int, bbb: int): pass -[#1 Domain] = 0:0-1:8 - >---------------------------- -0| def foo(aaa: str, bbb: int): -1| pass - --------< +[#1 Domain] = 0:0-0:33 + >---------------------------------< +0| def foo(aaa: int, bbb: int): pass [#1 Insertion delimiter] = " " @@ -23,29 +20,29 @@ def foo(aaa: str, bbb: int): [#2 Content] = [#2 Removal] = 0:8-0:11 >---< -0| def foo(aaa: str, bbb: int): +0| def foo(aaa: int, bbb: int): pass [#2 Domain] = 0:8-0:16 >--------< -0| def foo(aaa: str, bbb: int): +0| def foo(aaa: int, bbb: int): pass [#2 Insertion delimiter] = " " [#3 Content] = 0:18-0:21 >---< -0| def foo(aaa: str, bbb: int): +0| def foo(aaa: int, bbb: int): pass [#3 Removal] = 0:17-0:21 >----< -0| def foo(aaa: str, bbb: int): +0| def foo(aaa: int, bbb: int): pass [#3 Leading delimiter] = 0:17-0:18 >-< -0| def foo(aaa: str, bbb: int): +0| def foo(aaa: int, bbb: int): pass [#3 Domain] = 0:18-0:26 >--------< -0| def foo(aaa: str, bbb: int): +0| def foo(aaa: int, bbb: int): pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.assignment.pattern.scope b/data/fixtures/scopes/python/name/name.assignment.pattern.scope index 1359143fa4..e124849644 100644 --- a/data/fixtures/scopes/python/name/name.assignment.pattern.scope +++ b/data/fixtures/scopes/python/name/name.assignment.pattern.scope @@ -1,20 +1,20 @@ -aaa, bbb, = ccc +foo, bar, = baz --- [Content] = 0:0-0:9 >---------< -0| aaa, bbb, = ccc +0| foo, bar, = baz [Removal] = 0:0-0:12 >------------< -0| aaa, bbb, = ccc +0| foo, bar, = baz [Trailing delimiter] = 0:9-0:12 >---< -0| aaa, bbb, = ccc +0| foo, bar, = baz [Domain] = 0:0-0:15 >---------------< -0| aaa, bbb, = ccc +0| foo, bar, = baz [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.assignment.scope b/data/fixtures/scopes/python/name/name.assignment.scope index b3c7ec5312..7a03d93749 100644 --- a/data/fixtures/scopes/python/name/name.assignment.scope +++ b/data/fixtures/scopes/python/name/name.assignment.scope @@ -1,20 +1,20 @@ -value = 2 +foo = 0 --- -[Content] = 0:0-0:5 - >-----< -0| value = 2 +[Content] = 0:0-0:3 + >---< +0| foo = 0 -[Removal] = 0:0-0:8 - >--------< -0| value = 2 +[Removal] = 0:0-0:6 + >------< +0| foo = 0 -[Trailing delimiter] = 0:5-0:8 - >---< -0| value = 2 +[Trailing delimiter] = 0:3-0:6 + >---< +0| foo = 0 -[Domain] = 0:0-0:9 - >---------< -0| value = 2 +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.class.scope b/data/fixtures/scopes/python/name/name.class.scope index 0e1664a7c2..42e237939c 100644 --- a/data/fixtures/scopes/python/name/name.class.scope +++ b/data/fixtures/scopes/python/name/name.class.scope @@ -1,23 +1,20 @@ -class Foo: - pass +class Foo: pass --- [Content] = 0:6-0:9 >---< -0| class Foo: +0| class Foo: pass [Removal] = 0:5-0:9 >----< -0| class Foo: +0| class Foo: pass [Leading delimiter] = 0:5-0:6 >-< -0| class Foo: +0| class Foo: pass -[Domain] = 0:0-1:8 - >---------- -0| class Foo: -1| pass - --------< +[Domain] = 0:0-0:15 + >---------------< +0| class Foo: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.constructor.scope b/data/fixtures/scopes/python/name/name.constructor.scope index 67bfa58204..fb12fd9385 100644 --- a/data/fixtures/scopes/python/name/name.constructor.scope +++ b/data/fixtures/scopes/python/name/name.constructor.scope @@ -1,6 +1,5 @@ class Foo: - def __init__(self): - pass + def __init__(self): pass --- [#1 Content] = 0:6-0:9 @@ -15,12 +14,11 @@ class Foo: >-< 0| class Foo: -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:28 >---------- 0| class Foo: -1| def __init__(self): -2| pass - ------------< +1| def __init__(self): pass + ----------------------------< [#1 Insertion delimiter] = " " @@ -28,17 +26,15 @@ class Foo: [#2 Content] = [#2 Removal] = 1:8-1:16 >--------< -1| def __init__(self): +1| def __init__(self): pass [#2 Leading delimiter] = 1:7-1:8 >-< -1| def __init__(self): +1| def __init__(self): pass -[#2 Domain] = 1:4-2:12 - >------------------- -1| def __init__(self): -2| pass - ------------< +[#2 Domain] = 1:4-1:28 + >------------------------< +1| def __init__(self): pass [#2 Insertion delimiter] = " " @@ -47,6 +43,6 @@ class Foo: [#3 Removal] = [#3 Domain] = 1:17-1:21 >----< -1| def __init__(self): +1| def __init__(self): pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.field.class.scope b/data/fixtures/scopes/python/name/name.field.class.scope index 96f44f2c5c..151e029596 100644 --- a/data/fixtures/scopes/python/name/name.field.class.scope +++ b/data/fixtures/scopes/python/name/name.field.class.scope @@ -1,5 +1,6 @@ class Foo: bar: int + baz = 0 --- [#1 Content] = 0:6-0:9 @@ -14,11 +15,12 @@ class Foo: >-< 0| class Foo: -[#1 Domain] = 0:0-1:12 +[#1 Domain] = 0:0-2:11 >---------- 0| class Foo: 1| bar: int - ------------< +2| baz = 0 + -----------< [#1 Insertion delimiter] = " " @@ -40,3 +42,22 @@ class Foo: 1| bar: int [#2 Insertion delimiter] = " " + + +[#3 Content] = 2:4-2:7 + >---< +2| baz = 0 + +[#3 Removal] = 2:4-2:10 + >------< +2| baz = 0 + +[#3 Trailing delimiter] = 2:7-2:10 + >---< +2| baz = 0 + +[#3 Domain] = 2:4-2:11 + >-------< +2| baz = 0 + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.foreach.scope b/data/fixtures/scopes/python/name/name.foreach.scope index 6fe7a12c1a..5f30dc1ff5 100644 --- a/data/fixtures/scopes/python/name/name.foreach.scope +++ b/data/fixtures/scopes/python/name/name.foreach.scope @@ -1,27 +1,24 @@ -for item in items: - pass +for v in values: pass --- -[Content] = 0:4-0:8 - >----< -0| for item in items: +[Content] = 0:4-0:5 + >-< +0| for v in values: pass -[Removal] = 0:4-0:9 - >-----< -0| for item in items: +[Removal] = 0:4-0:6 + >--< +0| for v in values: pass [Leading delimiter] = 0:3-0:4 >-< -0| for item in items: +0| for v in values: pass -[Trailing delimiter] = 0:8-0:9 - >-< -0| for item in items: +[Trailing delimiter] = 0:5-0:6 + >-< +0| for v in values: pass -[Domain] = 0:0-1:8 - >------------------ -0| for item in items: -1| pass - --------< +[Domain] = 0:0-0:21 + >---------------------< +0| for v in values: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.function.scope b/data/fixtures/scopes/python/name/name.function.scope index 0c2d0466d5..9c9fdc956c 100644 --- a/data/fixtures/scopes/python/name/name.function.scope +++ b/data/fixtures/scopes/python/name/name.function.scope @@ -1,20 +1,17 @@ -def foo(): - pass +def foo(): pass --- [Content] = [Removal] = 0:4-0:7 >---< -0| def foo(): +0| def foo(): pass [Leading delimiter] = 0:3-0:4 >-< -0| def foo(): +0| def foo(): pass -[Domain] = 0:0-1:8 - >---------- -0| def foo(): -1| pass - --------< +[Domain] = 0:0-0:15 + >---------------< +0| def foo(): pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.iteration.block.scope b/data/fixtures/scopes/python/name/name.iteration.block.scope index b5a0c42099..004b7242df 100644 --- a/data/fixtures/scopes/python/name/name.iteration.block.scope +++ b/data/fixtures/scopes/python/name/name.iteration.block.scope @@ -1,26 +1,22 @@ class Foo: - def bar(): - pass + def bar(): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:19 >---------- 0| class Foo: -1| def bar(): -2| pass - ------------< +1| def bar(): pass + -------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[#2 Domain] = 1:4-1:19 + >---------------< +1| def bar(): pass [#3 Content] = -[#3 Domain] = 2:8-2:12 - >----< -2| pass +[#3 Domain] = 1:15-1:19 + >----< +1| def bar(): pass diff --git a/data/fixtures/scopes/python/name/name.iteration.block2.scope b/data/fixtures/scopes/python/name/name.iteration.block2.scope index 203dbe821d..51b2b45413 100644 --- a/data/fixtures/scopes/python/name/name.iteration.block2.scope +++ b/data/fixtures/scopes/python/name/name.iteration.block2.scope @@ -1,16 +1,13 @@ -def foo(): - pass +def foo(): pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------- -0| def foo(): -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| def foo(): pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| def foo(): pass diff --git a/data/fixtures/scopes/python/name/name.iteration.block3.scope b/data/fixtures/scopes/python/name/name.iteration.block3.scope index 0e1c7d9ced..8976b8c45a 100644 --- a/data/fixtures/scopes/python/name/name.iteration.block3.scope +++ b/data/fixtures/scopes/python/name/name.iteration.block3.scope @@ -1,36 +1,30 @@ -if True: - pass -elif False: - pass -else: - pass +if True: pass +elif False: pass +else: pass --- [#1 Content] = -[#1 Domain] = 0:0-5:8 - >-------- -0| if True: -1| pass -2| elif False: -3| pass -4| else: -5| pass - --------< +[#1 Domain] = 0:0-2:10 + >------------- +0| if True: pass +1| elif False: pass +2| else: pass + ----------< [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:9-0:13 + >----< +0| if True: pass [#3 Content] = -[#3 Domain] = 3:4-3:8 - >----< -3| pass +[#3 Domain] = 1:12-1:16 + >----< +1| elif False: pass [#4 Content] = -[#4 Domain] = 5:4-5:8 - >----< -5| pass +[#4 Domain] = 2:6-2:10 + >----< +2| else: pass diff --git a/data/fixtures/scopes/python/name/name.iteration.block4.scope b/data/fixtures/scopes/python/name/name.iteration.block4.scope index bedd64a06d..6712a3a748 100644 --- a/data/fixtures/scopes/python/name/name.iteration.block4.scope +++ b/data/fixtures/scopes/python/name/name.iteration.block4.scope @@ -1,16 +1,13 @@ -while True: - pass +while True: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >----------- -0| while True: -1| pass - --------< +[#1 Domain] = 0:0-0:16 + >----------------< +0| while True: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:12-0:16 + >----< +0| while True: pass diff --git a/data/fixtures/scopes/python/name/name.iteration.class.scope b/data/fixtures/scopes/python/name/name.iteration.class.scope index 23872a9212..c91c1c425a 100644 --- a/data/fixtures/scopes/python/name/name.iteration.class.scope +++ b/data/fixtures/scopes/python/name/name.iteration.class.scope @@ -1,16 +1,13 @@ -class Foo: - pass +class Foo: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------- -0| class Foo: -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| class Foo: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| class Foo: pass diff --git a/data/fixtures/scopes/python/name/name.method.scope b/data/fixtures/scopes/python/name/name.method.scope index 8ba3d6e05a..5ac13eeac4 100644 --- a/data/fixtures/scopes/python/name/name.method.scope +++ b/data/fixtures/scopes/python/name/name.method.scope @@ -1,6 +1,5 @@ class Foo: - def bar(): - pass + def bar(): pass --- [#1 Content] = 0:6-0:9 @@ -15,12 +14,11 @@ class Foo: >-< 0| class Foo: -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:19 >---------- 0| class Foo: -1| def bar(): -2| pass - ------------< +1| def bar(): pass + -------------------< [#1 Insertion delimiter] = " " @@ -28,16 +26,14 @@ class Foo: [#2 Content] = [#2 Removal] = 1:8-1:11 >---< -1| def bar(): +1| def bar(): pass [#2 Leading delimiter] = 1:7-1:8 >-< -1| def bar(): +1| def bar(): pass -[#2 Domain] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[#2 Domain] = 1:4-1:19 + >---------------< +1| def bar(): pass [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.resource.iteration.scope b/data/fixtures/scopes/python/name/name.resource.iteration.scope index 8e14225d4b..b014dd3e66 100644 --- a/data/fixtures/scopes/python/name/name.resource.iteration.scope +++ b/data/fixtures/scopes/python/name/name.resource.iteration.scope @@ -1,19 +1,16 @@ -with aaa, bbb as ccc: - pass +with foo, bar as baz: pass --- [#1 Content] = 0:5-0:20 >---------------< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass -[#1 Domain] = 0:0-1:8 - >--------------------- -0| with aaa, bbb as ccc: -1| pass - --------< +[#1 Domain] = 0:0-0:26 + >--------------------------< +0| with foo, bar as baz: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:22-0:26 + >----< +0| with foo, bar as baz: pass diff --git a/data/fixtures/scopes/python/name/name.resource.scope b/data/fixtures/scopes/python/name/name.resource.scope index c8f1c1a311..42704cdf14 100644 --- a/data/fixtures/scopes/python/name/name.resource.scope +++ b/data/fixtures/scopes/python/name/name.resource.scope @@ -1,23 +1,20 @@ -with aaa as bbb: - pass +with foo as bar: pass --- [Content] = 0:12-0:15 >---< -0| with aaa as bbb: +0| with foo as bar: pass [Removal] = 0:8-0:15 >-------< -0| with aaa as bbb: +0| with foo as bar: pass [Leading delimiter] = 0:8-0:12 >----< -0| with aaa as bbb: +0| with foo as bar: pass -[Domain] = 0:0-1:8 - >---------------- -0| with aaa as bbb: -1| pass - --------< +[Domain] = 0:0-0:21 + >---------------------< +0| with foo as bar: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.resource2.scope b/data/fixtures/scopes/python/name/name.resource2.scope index c4dc614bf0..bb2a8a74ce 100644 --- a/data/fixtures/scopes/python/name/name.resource2.scope +++ b/data/fixtures/scopes/python/name/name.resource2.scope @@ -1,72 +1,69 @@ -with aaa, bbb as ccc: - pass +with foo, bar as baz: pass --- [#1.1 Content] = 0:5-0:8 >---< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.1 Removal] = 0:5-0:10 >-----< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.1 Trailing delimiter] = 0:8-0:10 >--< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.1 Insertion delimiter] = " " [#1.2 Content] = 0:17-0:20 >---< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.2 Removal] = 0:13-0:20 >-------< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.2 Leading delimiter] = 0:13-0:17 >----< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.2 Insertion delimiter] = " " -[#1 Domain] = 0:0-1:8 - >--------------------- -0| with aaa, bbb as ccc: -1| pass - --------< +[#1 Domain] = 0:0-0:26 + >--------------------------< +0| with foo, bar as baz: pass [#2 Content] = [#2 Domain] = 0:5-0:8 >---< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#2 Removal] = 0:5-0:10 >-----< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#2 Trailing delimiter] = 0:8-0:10 >--< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#2 Insertion delimiter] = " " [#3 Content] = 0:17-0:20 >---< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#3 Removal] = 0:13-0:20 >-------< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#3 Leading delimiter] = 0:13-0:17 >----< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#3 Domain] = 0:10-0:20 >----------< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.resource3.scope b/data/fixtures/scopes/python/name/name.resource3.scope index 944b7196b3..2839bb93ae 100644 --- a/data/fixtures/scopes/python/name/name.resource3.scope +++ b/data/fixtures/scopes/python/name/name.resource3.scope @@ -1,75 +1,72 @@ -with aaa as bbb, ccc as ddd: - pass +with foo as bar, baz as bongo: pass --- [#1.1 Content] = 0:12-0:15 >---< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.1 Removal] = 0:8-0:15 >-------< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.1 Leading delimiter] = 0:8-0:12 >----< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.1 Insertion delimiter] = " " -[#1.2 Content] = 0:24-0:27 - >---< -0| with aaa as bbb, ccc as ddd: +[#1.2 Content] = 0:24-0:29 + >-----< +0| with foo as bar, baz as bongo: pass -[#1.2 Removal] = 0:20-0:27 - >-------< -0| with aaa as bbb, ccc as ddd: +[#1.2 Removal] = 0:20-0:29 + >---------< +0| with foo as bar, baz as bongo: pass [#1.2 Leading delimiter] = 0:20-0:24 >----< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.2 Insertion delimiter] = " " -[#1 Domain] = 0:0-1:8 - >---------------------------- -0| with aaa as bbb, ccc as ddd: -1| pass - --------< +[#1 Domain] = 0:0-0:35 + >-----------------------------------< +0| with foo as bar, baz as bongo: pass [#2 Content] = 0:12-0:15 >---< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#2 Removal] = 0:8-0:15 >-------< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#2 Leading delimiter] = 0:8-0:12 >----< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#2 Domain] = 0:5-0:15 >----------< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#2 Insertion delimiter] = " " -[#3 Content] = 0:24-0:27 - >---< -0| with aaa as bbb, ccc as ddd: +[#3 Content] = 0:24-0:29 + >-----< +0| with foo as bar, baz as bongo: pass -[#3 Removal] = 0:20-0:27 - >-------< -0| with aaa as bbb, ccc as ddd: +[#3 Removal] = 0:20-0:29 + >---------< +0| with foo as bar, baz as bongo: pass [#3 Leading delimiter] = 0:20-0:24 >----< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass -[#3 Domain] = 0:17-0:27 - >----------< -0| with aaa as bbb, ccc as ddd: +[#3 Domain] = 0:17-0:29 + >------------< +0| with foo as bar, baz as bongo: pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.variable.pattern.scope b/data/fixtures/scopes/python/name/name.variable.pattern.scope index e88983eca6..8e600d7961 100644 --- a/data/fixtures/scopes/python/name/name.variable.pattern.scope +++ b/data/fixtures/scopes/python/name/name.variable.pattern.scope @@ -1,20 +1,20 @@ -foo, bar = value +foo, bar = baz --- [Content] = 0:0-0:8 >--------< -0| foo, bar = value +0| foo, bar = baz [Removal] = 0:0-0:11 >-----------< -0| foo, bar = value +0| foo, bar = baz [Trailing delimiter] = 0:8-0:11 >---< -0| foo, bar = value +0| foo, bar = baz -[Domain] = 0:0-0:16 - >----------------< -0| foo, bar = value +[Domain] = 0:0-0:14 + >--------------< +0| foo, bar = baz [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/name/name.variable.scope b/data/fixtures/scopes/python/name/name.variable.scope index e599086b99..7a03d93749 100644 --- a/data/fixtures/scopes/python/name/name.variable.scope +++ b/data/fixtures/scopes/python/name/name.variable.scope @@ -1,20 +1,20 @@ -value = 123 +foo = 0 --- -[Content] = 0:0-0:5 - >-----< -0| value = 123 +[Content] = 0:0-0:3 + >---< +0| foo = 0 -[Removal] = 0:0-0:8 - >--------< -0| value = 123 +[Removal] = 0:0-0:6 + >------< +0| foo = 0 -[Trailing delimiter] = 0:5-0:8 - >---< -0| value = 123 +[Trailing delimiter] = 0:3-0:6 + >---< +0| foo = 0 -[Domain] = 0:0-0:11 - >-----------< -0| value = 123 +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/namedFunction/namedFunction.constructor.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.constructor.scope index 2072da0885..c0b44dccef 100644 --- a/data/fixtures/scopes/python/namedFunction/namedFunction.constructor.scope +++ b/data/fixtures/scopes/python/namedFunction/namedFunction.constructor.scope @@ -1,24 +1,20 @@ class Foo: - def __init__(self, aaa: str, bbb: int): - pass + def __init__(self, aaa: str, bbb: int): pass --- [Content] = -[Domain] = 1:4-2:12 - >--------------------------------------- -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +[Domain] = 1:4-1:48 + >--------------------------------------------< +1| def __init__(self, aaa: str, bbb: int): pass -[Removal] = 0:10-2:12 +[Removal] = 0:10-1:48 > 0| class Foo: -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +1| def __init__(self, aaa: str, bbb: int): pass + ------------------------------------------------< [Leading delimiter] = 1:0-1:4 >----< -1| def __init__(self, aaa: str, bbb: int): +1| def __init__(self, aaa: str, bbb: int): pass [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope index df491f5017..cdd1e27081 100644 --- a/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope @@ -1,14 +1,12 @@ -def bar(): - pass +def foo(): pass --- [Content] = -[Domain] = 0:0-3:0 +[Domain] = 0:0-2:0 > 0| -1| def bar(): -2| pass -3| +1| def foo(): pass +2| < diff --git a/data/fixtures/scopes/python/namedFunction/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.method.iteration.class.scope index 87bb3e4216..7ec5e468a5 100644 --- a/data/fixtures/scopes/python/namedFunction/namedFunction.method.iteration.class.scope +++ b/data/fixtures/scopes/python/namedFunction/namedFunction.method.iteration.class.scope @@ -1,20 +1,16 @@ class Foo: - def bar(): - pass + def bar(): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:19 >---------- 0| class Foo: -1| def bar(): -2| pass - ------------< +1| def bar(): pass + -------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[#2 Domain] = 1:4-1:19 + >---------------< +1| def bar(): pass diff --git a/data/fixtures/scopes/python/namedFunction/namedFunction.method.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.method.scope index c1a400ab15..907a040c6f 100644 --- a/data/fixtures/scopes/python/namedFunction/namedFunction.method.scope +++ b/data/fixtures/scopes/python/namedFunction/namedFunction.method.scope @@ -1,24 +1,20 @@ class Foo: - def bar(): - pass + def bar(): pass --- [Content] = -[Domain] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[Domain] = 1:4-1:19 + >---------------< +1| def bar(): pass -[Removal] = 0:10-2:12 +[Removal] = 0:10-1:19 > 0| class Foo: -1| def bar(): -2| pass - ------------< +1| def bar(): pass + -------------------< [Leading delimiter] = 1:0-1:4 >----< -1| def bar(): +1| def bar(): pass [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/python/namedFunction/namedFunction.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.scope index ca7c1ce6ef..6c2e039150 100644 --- a/data/fixtures/scopes/python/namedFunction/namedFunction.scope +++ b/data/fixtures/scopes/python/namedFunction/namedFunction.scope @@ -1,13 +1,10 @@ -def foo(): - pass +def foo(): pass --- [Content] = [Removal] = -[Domain] = 0:0-1:8 - >---------- -0| def foo(): -1| pass - --------< +[Domain] = 0:0-0:15 + >---------------< +0| def foo(): pass [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/python/namedFunction/namedFunction2.scope b/data/fixtures/scopes/python/namedFunction/namedFunction2.scope index bb85d94947..19d1f7b240 100644 --- a/data/fixtures/scopes/python/namedFunction/namedFunction2.scope +++ b/data/fixtures/scopes/python/namedFunction/namedFunction2.scope @@ -1,15 +1,13 @@ -@foo -def bar(value: string) -> str: - return value +@bar +def foo() -> str: pass --- [Content] = [Removal] = -[Domain] = 0:0-2:16 +[Domain] = 0:0-1:22 >---- -0| @foo -1| def bar(value: string) -> str: -2| return value - ----------------< +0| @bar +1| def foo() -> str: pass + ----------------------< [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/python/statement/statement.class.scope b/data/fixtures/scopes/python/statement/statement.class.scope index 0c73d405ad..6e714329a2 100644 --- a/data/fixtures/scopes/python/statement/statement.class.scope +++ b/data/fixtures/scopes/python/statement/statement.class.scope @@ -1,31 +1,26 @@ -class Foo: - pass +class Foo: pass --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 0:0-1:8 - >---------- -0| class Foo: -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| class Foo: pass [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| class Foo: pass -[#2 Removal] = 0:10-1:8 - > -0| class Foo: -1| pass - --------< +[#2 Removal] = 0:10-0:15 + >-----< +0| class Foo: pass -[#2 Leading delimiter] = 1:0-1:4 - >----< -1| pass +[#2 Leading delimiter] = 0:10-0:11 + >-< +0| class Foo: pass [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/statement/statement.iteration.block.scope b/data/fixtures/scopes/python/statement/statement.iteration.block.scope index b5a0c42099..004b7242df 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.block.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.block.scope @@ -1,26 +1,22 @@ class Foo: - def bar(): - pass + def bar(): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:19 >---------- 0| class Foo: -1| def bar(): -2| pass - ------------< +1| def bar(): pass + -------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[#2 Domain] = 1:4-1:19 + >---------------< +1| def bar(): pass [#3 Content] = -[#3 Domain] = 2:8-2:12 - >----< -2| pass +[#3 Domain] = 1:15-1:19 + >----< +1| def bar(): pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.block2.scope b/data/fixtures/scopes/python/statement/statement.iteration.block2.scope index 203dbe821d..51b2b45413 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.block2.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.block2.scope @@ -1,16 +1,13 @@ -def foo(): - pass +def foo(): pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------- -0| def foo(): -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| def foo(): pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| def foo(): pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.block3.scope b/data/fixtures/scopes/python/statement/statement.iteration.block3.scope index 0e1c7d9ced..8976b8c45a 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.block3.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.block3.scope @@ -1,36 +1,30 @@ -if True: - pass -elif False: - pass -else: - pass +if True: pass +elif False: pass +else: pass --- [#1 Content] = -[#1 Domain] = 0:0-5:8 - >-------- -0| if True: -1| pass -2| elif False: -3| pass -4| else: -5| pass - --------< +[#1 Domain] = 0:0-2:10 + >------------- +0| if True: pass +1| elif False: pass +2| else: pass + ----------< [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:9-0:13 + >----< +0| if True: pass [#3 Content] = -[#3 Domain] = 3:4-3:8 - >----< -3| pass +[#3 Domain] = 1:12-1:16 + >----< +1| elif False: pass [#4 Content] = -[#4 Domain] = 5:4-5:8 - >----< -5| pass +[#4 Domain] = 2:6-2:10 + >----< +2| else: pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.block4.scope b/data/fixtures/scopes/python/statement/statement.iteration.block4.scope index bedd64a06d..6712a3a748 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.block4.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.block4.scope @@ -1,16 +1,13 @@ -while True: - pass +while True: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >----------- -0| while True: -1| pass - --------< +[#1 Domain] = 0:0-0:16 + >----------------< +0| while True: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:12-0:16 + >----< +0| while True: pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.class.scope b/data/fixtures/scopes/python/statement/statement.iteration.class.scope index 23872a9212..c91c1c425a 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.class.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.class.scope @@ -1,16 +1,13 @@ -class Foo: - pass +class Foo: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------- -0| class Foo: -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| class Foo: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| class Foo: pass diff --git a/data/fixtures/scopes/python/statement/statement.scope b/data/fixtures/scopes/python/statement/statement.scope index e6c7b9b699..acdb2b1498 100644 --- a/data/fixtures/scopes/python/statement/statement.scope +++ b/data/fixtures/scopes/python/statement/statement.scope @@ -1,10 +1,10 @@ -value = 123 +foo = 0 --- [Content] = [Removal] = -[Domain] = 0:0-0:11 - >-----------< -0| value = 123 +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/python/type/type.argument.catch.scope b/data/fixtures/scopes/python/type/type.argument.catch.scope index a7cd6b539a..2f2c13c510 100644 --- a/data/fixtures/scopes/python/type/type.argument.catch.scope +++ b/data/fixtures/scopes/python/type/type.argument.catch.scope @@ -1,52 +1,49 @@ -try: - pass -except MyException as ex: - pass -except Exception as ex: - pass +try: pass +except MyException as e: pass +except Exception as e: pass --- -[#1 Content] = 2:7-2:18 +[#1 Content] = 1:7-1:18 >-----------< -2| except MyException as ex: +1| except MyException as e: pass -[#1 Removal] = 2:7-2:19 +[#1 Removal] = 1:7-1:19 >------------< -2| except MyException as ex: +1| except MyException as e: pass -[#1 Leading delimiter] = 2:6-2:7 +[#1 Leading delimiter] = 1:6-1:7 >-< -2| except MyException as ex: +1| except MyException as e: pass -[#1 Trailing delimiter] = 2:18-2:19 +[#1 Trailing delimiter] = 1:18-1:19 >-< -2| except MyException as ex: +1| except MyException as e: pass -[#1 Domain] = 2:7-2:24 - >-----------------< -2| except MyException as ex: +[#1 Domain] = 1:7-1:23 + >----------------< +1| except MyException as e: pass [#1 Insertion delimiter] = " " -[#2 Content] = 4:7-4:16 +[#2 Content] = 2:7-2:16 >---------< -4| except Exception as ex: +2| except Exception as e: pass -[#2 Removal] = 4:7-4:17 +[#2 Removal] = 2:7-2:17 >----------< -4| except Exception as ex: +2| except Exception as e: pass -[#2 Leading delimiter] = 4:6-4:7 +[#2 Leading delimiter] = 2:6-2:7 >-< -4| except Exception as ex: +2| except Exception as e: pass -[#2 Trailing delimiter] = 4:16-4:17 +[#2 Trailing delimiter] = 2:16-2:17 >-< -4| except Exception as ex: +2| except Exception as e: pass -[#2 Domain] = 4:7-4:22 - >---------------< -4| except Exception as ex: +[#2 Domain] = 2:7-2:21 + >--------------< +2| except Exception as e: pass [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/type/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/python/type/type.argument.formal.constructor.iteration.scope index 9b65816f2e..36081af4ef 100644 --- a/data/fixtures/scopes/python/type/type.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/python/type/type.argument.formal.constructor.iteration.scope @@ -1,32 +1,28 @@ -class MyClass: - def __init__(self, a: int): - pass +class Foo: + def __init__(self, aaa: int, bbb: int): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 - >-------------- -0| class MyClass: -1| def __init__(self, a: int): -2| pass - ------------< +[#1 Domain] = 0:0-1:48 + >---------- +0| class Foo: +1| def __init__(self, aaa: int, bbb: int): pass + ------------------------------------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >--------------------------- -1| def __init__(self, a: int): -2| pass - ------------< +[#2 Domain] = 1:4-1:48 + >--------------------------------------------< +1| def __init__(self, aaa: int, bbb: int): pass [#3 Content] = -[#3 Domain] = 1:17-1:29 - >------------< -1| def __init__(self, a: int): +[#3 Domain] = 1:17-1:41 + >------------------------< +1| def __init__(self, aaa: int, bbb: int): pass [#4 Content] = -[#4 Domain] = 2:8-2:12 - >----< -2| pass +[#4 Domain] = 1:44-1:48 + >----< +1| def __init__(self, aaa: int, bbb: int): pass diff --git a/data/fixtures/scopes/python/type/type.argument.formal.constructor.scope b/data/fixtures/scopes/python/type/type.argument.formal.constructor.scope index be6e93f79c..4fc6148f61 100644 --- a/data/fixtures/scopes/python/type/type.argument.formal.constructor.scope +++ b/data/fixtures/scopes/python/type/type.argument.formal.constructor.scope @@ -1,34 +1,51 @@ -class MyClass: - def __init__(self, a: int): - pass +class Foo: + def __init__(self, aaa: int, bbb: int): pass --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 0:0-2:12 - >-------------- -0| class MyClass: -1| def __init__(self, a: int): -2| pass - ------------< +[#1 Domain] = 0:0-1:48 + >---------- +0| class Foo: +1| def __init__(self, aaa: int, bbb: int): pass + ------------------------------------------------< [#1 Insertion delimiter] = " " -[#2 Content] = 1:26-1:29 - >---< -1| def __init__(self, a: int): +[#2 Content] = 1:28-1:31 + >---< +1| def __init__(self, aaa: int, bbb: int): pass -[#2 Removal] = 1:24-1:29 - >-----< -1| def __init__(self, a: int): +[#2 Removal] = 1:26-1:31 + >-----< +1| def __init__(self, aaa: int, bbb: int): pass -[#2 Leading delimiter] = 1:24-1:26 - >--< -1| def __init__(self, a: int): +[#2 Leading delimiter] = 1:26-1:28 + >--< +1| def __init__(self, aaa: int, bbb: int): pass -[#2 Domain] = 1:23-1:29 - >------< -1| def __init__(self, a: int): +[#2 Domain] = 1:23-1:31 + >--------< +1| def __init__(self, aaa: int, bbb: int): pass [#2 Insertion delimiter] = " " + + +[#3 Content] = 1:38-1:41 + >---< +1| def __init__(self, aaa: int, bbb: int): pass + +[#3 Removal] = 1:36-1:41 + >-----< +1| def __init__(self, aaa: int, bbb: int): pass + +[#3 Leading delimiter] = 1:36-1:38 + >--< +1| def __init__(self, aaa: int, bbb: int): pass + +[#3 Domain] = 1:33-1:41 + >--------< +1| def __init__(self, aaa: int, bbb: int): pass + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/type/type.argument.formal.iteration.scope b/data/fixtures/scopes/python/type/type.argument.formal.iteration.scope index f0a6bc4f08..c95296c2ed 100644 --- a/data/fixtures/scopes/python/type/type.argument.formal.iteration.scope +++ b/data/fixtures/scopes/python/type/type.argument.formal.iteration.scope @@ -1,22 +1,19 @@ -def funk(a: int): - pass +def foo(aaa: int, bbb: int): pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >----------------- -0| def funk(a: int): -1| pass - --------< +[#1 Domain] = 0:0-0:33 + >---------------------------------< +0| def foo(aaa: int, bbb: int): pass [#2 Content] = -[#2 Domain] = 0:9-0:15 - >------< -0| def funk(a: int): +[#2 Domain] = 0:8-0:26 + >------------------< +0| def foo(aaa: int, bbb: int): pass [#3 Content] = -[#3 Domain] = 1:4-1:8 - >----< -1| pass +[#3 Domain] = 0:29-0:33 + >----< +0| def foo(aaa: int, bbb: int): pass diff --git a/data/fixtures/scopes/python/type/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/python/type/type.argument.formal.method.iteration.scope index 4370053f46..343ab37437 100644 --- a/data/fixtures/scopes/python/type/type.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/python/type/type.argument.formal.method.iteration.scope @@ -1,32 +1,28 @@ -class MyClass: - def funk(a: int): - pass +class Foo: + def bar(aaa: int, bbb: int): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 - >-------------- -0| class MyClass: -1| def funk(a: int): -2| pass - ------------< +[#1 Domain] = 0:0-1:37 + >---------- +0| class Foo: +1| def bar(aaa: int, bbb: int): pass + -------------------------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >----------------- -1| def funk(a: int): -2| pass - ------------< +[#2 Domain] = 1:4-1:37 + >---------------------------------< +1| def bar(aaa: int, bbb: int): pass [#3 Content] = -[#3 Domain] = 1:13-1:19 - >------< -1| def funk(a: int): +[#3 Domain] = 1:12-1:30 + >------------------< +1| def bar(aaa: int, bbb: int): pass [#4 Content] = -[#4 Domain] = 2:8-2:12 - >----< -2| pass +[#4 Domain] = 1:33-1:37 + >----< +1| def bar(aaa: int, bbb: int): pass diff --git a/data/fixtures/scopes/python/type/type.argument.formal.method.scope b/data/fixtures/scopes/python/type/type.argument.formal.method.scope index 7e6cee716c..c676b04166 100644 --- a/data/fixtures/scopes/python/type/type.argument.formal.method.scope +++ b/data/fixtures/scopes/python/type/type.argument.formal.method.scope @@ -1,34 +1,51 @@ -class MyClass: - def funk(a: int): - pass +class Foo: + def bar(aaa: int, bbb: int): pass --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 0:0-2:12 - >-------------- -0| class MyClass: -1| def funk(a: int): -2| pass - ------------< +[#1 Domain] = 0:0-1:37 + >---------- +0| class Foo: +1| def bar(aaa: int, bbb: int): pass + -------------------------------------< [#1 Insertion delimiter] = " " -[#2 Content] = 1:16-1:19 - >---< -1| def funk(a: int): +[#2 Content] = 1:17-1:20 + >---< +1| def bar(aaa: int, bbb: int): pass -[#2 Removal] = 1:14-1:19 - >-----< -1| def funk(a: int): +[#2 Removal] = 1:15-1:20 + >-----< +1| def bar(aaa: int, bbb: int): pass -[#2 Leading delimiter] = 1:14-1:16 - >--< -1| def funk(a: int): +[#2 Leading delimiter] = 1:15-1:17 + >--< +1| def bar(aaa: int, bbb: int): pass -[#2 Domain] = 1:13-1:19 - >------< -1| def funk(a: int): +[#2 Domain] = 1:12-1:20 + >--------< +1| def bar(aaa: int, bbb: int): pass [#2 Insertion delimiter] = " " + + +[#3 Content] = 1:27-1:30 + >---< +1| def bar(aaa: int, bbb: int): pass + +[#3 Removal] = 1:25-1:30 + >-----< +1| def bar(aaa: int, bbb: int): pass + +[#3 Leading delimiter] = 1:25-1:27 + >--< +1| def bar(aaa: int, bbb: int): pass + +[#3 Domain] = 1:22-1:30 + >--------< +1| def bar(aaa: int, bbb: int): pass + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/type/type.argument.formal.scope b/data/fixtures/scopes/python/type/type.argument.formal.scope index 20188e6482..320385b905 100644 --- a/data/fixtures/scopes/python/type/type.argument.formal.scope +++ b/data/fixtures/scopes/python/type/type.argument.formal.scope @@ -1,21 +1,39 @@ -def funk(a: int): - pass +def foo(aaa: int, bbb: int): pass --- -[Content] = 0:12-0:15 - >---< -0| def funk(a: int): +[#1 Content] = 0:13-0:16 + >---< +0| def foo(aaa: int, bbb: int): pass -[Removal] = 0:10-0:15 - >-----< -0| def funk(a: int): +[#1 Removal] = 0:11-0:16 + >-----< +0| def foo(aaa: int, bbb: int): pass -[Leading delimiter] = 0:10-0:12 - >--< -0| def funk(a: int): +[#1 Leading delimiter] = 0:11-0:13 + >--< +0| def foo(aaa: int, bbb: int): pass -[Domain] = 0:9-0:15 - >------< -0| def funk(a: int): +[#1 Domain] = 0:8-0:16 + >--------< +0| def foo(aaa: int, bbb: int): pass -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:23-0:26 + >---< +0| def foo(aaa: int, bbb: int): pass + +[#2 Removal] = 0:21-0:26 + >-----< +0| def foo(aaa: int, bbb: int): pass + +[#2 Leading delimiter] = 0:21-0:23 + >--< +0| def foo(aaa: int, bbb: int): pass + +[#2 Domain] = 0:18-0:26 + >--------< +0| def foo(aaa: int, bbb: int): pass + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/type/type.class.scope b/data/fixtures/scopes/python/type/type.class.scope index 74e429d8b4..109791376c 100644 --- a/data/fixtures/scopes/python/type/type.class.scope +++ b/data/fixtures/scopes/python/type/type.class.scope @@ -1,13 +1,10 @@ -class MyClass: - pass +class Foo: pass --- [Content] = [Removal] = -[Domain] = 0:0-1:8 - >-------------- -0| class MyClass: -1| pass - --------< +[Domain] = 0:0-0:15 + >---------------< +0| class Foo: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/type/type.class2.scope b/data/fixtures/scopes/python/type/type.class2.scope index 224bf7371a..74ef1b3a12 100644 --- a/data/fixtures/scopes/python/type/type.class2.scope +++ b/data/fixtures/scopes/python/type/type.class2.scope @@ -1,15 +1,13 @@ -@value -class MyClass: - pass +@bar +class Foo: pass --- [Content] = [Removal] = -[Domain] = 0:0-2:8 - >------ -0| @value -1| class MyClass: -2| pass - --------< +[Domain] = 0:0-1:15 + >---- +0| @bar +1| class Foo: pass + ---------------< [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/type/type.iteration.block.scope b/data/fixtures/scopes/python/type/type.iteration.block.scope index b5a0c42099..004b7242df 100644 --- a/data/fixtures/scopes/python/type/type.iteration.block.scope +++ b/data/fixtures/scopes/python/type/type.iteration.block.scope @@ -1,26 +1,22 @@ class Foo: - def bar(): - pass + def bar(): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:19 >---------- 0| class Foo: -1| def bar(): -2| pass - ------------< +1| def bar(): pass + -------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[#2 Domain] = 1:4-1:19 + >---------------< +1| def bar(): pass [#3 Content] = -[#3 Domain] = 2:8-2:12 - >----< -2| pass +[#3 Domain] = 1:15-1:19 + >----< +1| def bar(): pass diff --git a/data/fixtures/scopes/python/type/type.iteration.block2.scope b/data/fixtures/scopes/python/type/type.iteration.block2.scope index 203dbe821d..51b2b45413 100644 --- a/data/fixtures/scopes/python/type/type.iteration.block2.scope +++ b/data/fixtures/scopes/python/type/type.iteration.block2.scope @@ -1,16 +1,13 @@ -def foo(): - pass +def foo(): pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------- -0| def foo(): -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| def foo(): pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| def foo(): pass diff --git a/data/fixtures/scopes/python/type/type.iteration.block3.scope b/data/fixtures/scopes/python/type/type.iteration.block3.scope index 0e1c7d9ced..8976b8c45a 100644 --- a/data/fixtures/scopes/python/type/type.iteration.block3.scope +++ b/data/fixtures/scopes/python/type/type.iteration.block3.scope @@ -1,36 +1,30 @@ -if True: - pass -elif False: - pass -else: - pass +if True: pass +elif False: pass +else: pass --- [#1 Content] = -[#1 Domain] = 0:0-5:8 - >-------- -0| if True: -1| pass -2| elif False: -3| pass -4| else: -5| pass - --------< +[#1 Domain] = 0:0-2:10 + >------------- +0| if True: pass +1| elif False: pass +2| else: pass + ----------< [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:9-0:13 + >----< +0| if True: pass [#3 Content] = -[#3 Domain] = 3:4-3:8 - >----< -3| pass +[#3 Domain] = 1:12-1:16 + >----< +1| elif False: pass [#4 Content] = -[#4 Domain] = 5:4-5:8 - >----< -5| pass +[#4 Domain] = 2:6-2:10 + >----< +2| else: pass diff --git a/data/fixtures/scopes/python/type/type.iteration.block4.scope b/data/fixtures/scopes/python/type/type.iteration.block4.scope index bedd64a06d..6712a3a748 100644 --- a/data/fixtures/scopes/python/type/type.iteration.block4.scope +++ b/data/fixtures/scopes/python/type/type.iteration.block4.scope @@ -1,16 +1,13 @@ -while True: - pass +while True: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >----------- -0| while True: -1| pass - --------< +[#1 Domain] = 0:0-0:16 + >----------------< +0| while True: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:12-0:16 + >----< +0| while True: pass diff --git a/data/fixtures/scopes/python/type/type.iteration.class.scope b/data/fixtures/scopes/python/type/type.iteration.class.scope index 23872a9212..c91c1c425a 100644 --- a/data/fixtures/scopes/python/type/type.iteration.class.scope +++ b/data/fixtures/scopes/python/type/type.iteration.class.scope @@ -1,16 +1,13 @@ -class Foo: - pass +class Foo: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------- -0| class Foo: -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| class Foo: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| class Foo: pass diff --git a/data/fixtures/scopes/python/type/type.return.scope b/data/fixtures/scopes/python/type/type.return.scope index 5c1783b297..8fcea2c7fa 100644 --- a/data/fixtures/scopes/python/type/type.return.scope +++ b/data/fixtures/scopes/python/type/type.return.scope @@ -1,23 +1,20 @@ -def funk() -> int: - pass +def foo() -> int: pass --- -[Content] = 0:14-0:17 - >---< -0| def funk() -> int: +[Content] = 0:13-0:16 + >---< +0| def foo() -> int: pass -[Removal] = 0:10-0:17 - >-------< -0| def funk() -> int: +[Removal] = 0:9-0:16 + >-------< +0| def foo() -> int: pass -[Leading delimiter] = 0:10-0:14 - >----< -0| def funk() -> int: +[Leading delimiter] = 0:9-0:13 + >----< +0| def foo() -> int: pass -[Domain] = 0:0-1:8 - >------------------ -0| def funk() -> int: -1| pass - --------< +[Domain] = 0:0-0:22 + >----------------------< +0| def foo() -> int: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/type/type.typeArgument.iteration.scope b/data/fixtures/scopes/python/type/type.typeArgument.iteration.scope index 9e657b0591..0c53e2bb87 100644 --- a/data/fixtures/scopes/python/type/type.typeArgument.iteration.scope +++ b/data/fixtures/scopes/python/type/type.typeArgument.iteration.scope @@ -1,13 +1,13 @@ -value: map[str, int] +foo: map[str, int] --- [#1 Content] = -[#1 Domain] = 0:0-0:20 - >--------------------< -0| value: map[str, int] +[#1 Domain] = 0:0-0:18 + >------------------< +0| foo: map[str, int] [#2 Content] = -[#2 Domain] = 0:11-0:19 - >--------< -0| value: map[str, int] +[#2 Domain] = 0:9-0:17 + >--------< +0| foo: map[str, int] diff --git a/data/fixtures/scopes/python/type/type.typeArgument.scope b/data/fixtures/scopes/python/type/type.typeArgument.scope index 8eb4b05089..9b60ff9dc0 100644 --- a/data/fixtures/scopes/python/type/type.typeArgument.scope +++ b/data/fixtures/scopes/python/type/type.typeArgument.scope @@ -1,29 +1,29 @@ -value: list[int] +foo: list[int] --- -[#1 Content] = 0:7-0:16 - >---------< -0| value: list[int] +[#1 Content] = 0:5-0:14 + >---------< +0| foo: list[int] -[#1 Removal] = 0:5-0:16 - >-----------< -0| value: list[int] +[#1 Removal] = 0:3-0:14 + >-----------< +0| foo: list[int] -[#1 Leading delimiter] = 0:5-0:7 - >--< -0| value: list[int] +[#1 Leading delimiter] = 0:3-0:5 + >--< +0| foo: list[int] -[#1 Domain] = 0:0-0:16 - >----------------< -0| value: list[int] +[#1 Domain] = 0:0-0:14 + >--------------< +0| foo: list[int] [#1 Insertion delimiter] = " " [#2 Content] = [#2 Removal] = -[#2 Domain] = 0:12-0:15 - >---< -0| value: list[int] +[#2 Domain] = 0:10-0:13 + >---< +0| foo: list[int] [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/type/type.typeArgument2.scope b/data/fixtures/scopes/python/type/type.typeArgument2.scope index ee3eaf8185..eee9c0b355 100644 --- a/data/fixtures/scopes/python/type/type.typeArgument2.scope +++ b/data/fixtures/scopes/python/type/type.typeArgument2.scope @@ -1,52 +1,52 @@ -value: map[str, int] +foo: map[str, int] --- -[#1 Content] = 0:7-0:20 - >-------------< -0| value: map[str, int] +[#1 Content] = 0:5-0:18 + >-------------< +0| foo: map[str, int] -[#1 Removal] = 0:5-0:20 - >---------------< -0| value: map[str, int] +[#1 Removal] = 0:3-0:18 + >---------------< +0| foo: map[str, int] -[#1 Leading delimiter] = 0:5-0:7 - >--< -0| value: map[str, int] +[#1 Leading delimiter] = 0:3-0:5 + >--< +0| foo: map[str, int] -[#1 Domain] = 0:0-0:20 - >--------------------< -0| value: map[str, int] +[#1 Domain] = 0:0-0:18 + >------------------< +0| foo: map[str, int] [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Domain] = 0:11-0:14 - >---< -0| value: map[str, int] +[#2 Domain] = 0:9-0:12 + >---< +0| foo: map[str, int] -[#2 Removal] = 0:11-0:16 - >-----< -0| value: map[str, int] +[#2 Removal] = 0:9-0:14 + >-----< +0| foo: map[str, int] -[#2 Trailing delimiter] = 0:14-0:16 - >--< -0| value: map[str, int] +[#2 Trailing delimiter] = 0:12-0:14 + >--< +0| foo: map[str, int] [#2 Insertion delimiter] = ", " [#3 Content] = -[#3 Domain] = 0:16-0:19 - >---< -0| value: map[str, int] +[#3 Domain] = 0:14-0:17 + >---< +0| foo: map[str, int] -[#3 Removal] = 0:14-0:19 - >-----< -0| value: map[str, int] +[#3 Removal] = 0:12-0:17 + >-----< +0| foo: map[str, int] -[#3 Leading delimiter] = 0:14-0:16 - >--< -0| value: map[str, int] +[#3 Leading delimiter] = 0:12-0:14 + >--< +0| foo: map[str, int] [#3 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/python/type/type.variable.scope b/data/fixtures/scopes/python/type/type.variable.scope index 3036c8af4c..4c07c8302d 100644 --- a/data/fixtures/scopes/python/type/type.variable.scope +++ b/data/fixtures/scopes/python/type/type.variable.scope @@ -1,20 +1,20 @@ -value: int +foo: int --- -[Content] = 0:7-0:10 - >---< -0| value: int +[Content] = 0:5-0:8 + >---< +0| foo: int -[Removal] = 0:5-0:10 - >-----< -0| value: int +[Removal] = 0:3-0:8 + >-----< +0| foo: int -[Leading delimiter] = 0:5-0:7 - >--< -0| value: int +[Leading delimiter] = 0:3-0:5 + >--< +0| foo: int -[Domain] = 0:0-0:10 - >----------< -0| value: int +[Domain] = 0:0-0:8 + >--------< +0| foo: int [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/type/type.variable2.scope b/data/fixtures/scopes/python/type/type.variable2.scope index 991187c979..4a9819a89c 100644 --- a/data/fixtures/scopes/python/type/type.variable2.scope +++ b/data/fixtures/scopes/python/type/type.variable2.scope @@ -1,20 +1,20 @@ -value: int = 0 +foo: int = 0 --- -[Content] = 0:7-0:10 - >---< -0| value: int = 0 +[Content] = 0:5-0:8 + >---< +0| foo: int = 0 -[Removal] = 0:5-0:10 - >-----< -0| value: int = 0 +[Removal] = 0:3-0:8 + >-----< +0| foo: int = 0 -[Leading delimiter] = 0:5-0:7 - >--< -0| value: int = 0 +[Leading delimiter] = 0:3-0:5 + >--< +0| foo: int = 0 -[Domain] = 0:0-0:14 - >--------------< -0| value: int = 0 +[Domain] = 0:0-0:12 + >------------< +0| foo: int = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.argument.actual.iteration.scope b/data/fixtures/scopes/python/value/value.argument.actual.iteration.scope index 3a4e57fb0e..ad840ce1ac 100644 --- a/data/fixtures/scopes/python/value/value.argument.actual.iteration.scope +++ b/data/fixtures/scopes/python/value/value.argument.actual.iteration.scope @@ -1,13 +1,13 @@ -aaa(bbb=0, ccc=1) +foo(aaa=0, bbb=1) --- [#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Content] = [#2 Domain] = 0:4-0:16 >------------< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) diff --git a/data/fixtures/scopes/python/value/value.argument.actual.scope b/data/fixtures/scopes/python/value/value.argument.actual.scope index 01ee1717d2..236c7d017a 100644 --- a/data/fixtures/scopes/python/value/value.argument.actual.scope +++ b/data/fixtures/scopes/python/value/value.argument.actual.scope @@ -1,39 +1,39 @@ -aaa(bbb=0, ccc=1) +foo(aaa=0, bbb=1) --- [#1 Content] = 0:8-0:9 >-< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#1 Removal] = 0:7-0:9 >--< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#1 Leading delimiter] = 0:7-0:8 >-< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#1 Domain] = 0:4-0:9 >-----< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#1 Insertion delimiter] = " " [#2 Content] = 0:15-0:16 >-< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Removal] = 0:14-0:16 >--< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Leading delimiter] = 0:14-0:15 >-< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Domain] = 0:11-0:16 >-----< -0| aaa(bbb=0, ccc=1) +0| foo(aaa=0, bbb=1) [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/python/value/value.argument.formal.constructor.iteration.scope index 72c05a5ae7..3db3c7dfd9 100644 --- a/data/fixtures/scopes/python/value/value.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/python/value/value.argument.formal.constructor.iteration.scope @@ -1,32 +1,28 @@ class Foo: - def __init__(self, aaa: str, bbb: int): - pass + def __init__(self, aaa: int = 0, bbb: int = 1): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:56 >---------- 0| class Foo: -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass + --------------------------------------------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >--------------------------------------- -1| def __init__(self, aaa: str, bbb: int): -2| pass - ------------< +[#2 Domain] = 1:4-1:56 + >----------------------------------------------------< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass [#3 Content] = -[#3 Domain] = 1:17-1:41 - >------------------------< -1| def __init__(self, aaa: str, bbb: int): +[#3 Domain] = 1:17-1:49 + >--------------------------------< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass [#4 Content] = -[#4 Domain] = 2:8-2:12 - >----< -2| pass +[#4 Domain] = 1:52-1:56 + >----< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass diff --git a/data/fixtures/scopes/python/value/value.argument.formal.constructor.scope b/data/fixtures/scopes/python/value/value.argument.formal.constructor.scope index 070747e1ea..c6550db0b8 100644 --- a/data/fixtures/scopes/python/value/value.argument.formal.constructor.scope +++ b/data/fixtures/scopes/python/value/value.argument.formal.constructor.scope @@ -1,22 +1,40 @@ class Foo: - def __init__(self, aaa: str, bbb: int = 2): - pass + def __init__(self, aaa: int = 0, bbb: int = 1): pass --- -[Content] = 1:44-1:45 - >-< -1| def __init__(self, aaa: str, bbb: int = 2): +[#1 Content] = 1:34-1:35 + >-< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass -[Removal] = 1:41-1:45 - >----< -1| def __init__(self, aaa: str, bbb: int = 2): +[#1 Removal] = 1:31-1:35 + >----< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass -[Leading delimiter] = 1:41-1:44 - >---< -1| def __init__(self, aaa: str, bbb: int = 2): +[#1 Leading delimiter] = 1:31-1:34 + >---< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass -[Domain] = 1:33-1:45 - >------------< -1| def __init__(self, aaa: str, bbb: int = 2): +[#1 Domain] = 1:23-1:35 + >------------< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:48-1:49 + >-< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass + +[#2 Removal] = 1:45-1:49 + >----< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass + +[#2 Leading delimiter] = 1:45-1:48 + >---< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass + +[#2 Domain] = 1:37-1:49 + >------------< +1| def __init__(self, aaa: int = 0, bbb: int = 1): pass + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.argument.formal.iteration.scope b/data/fixtures/scopes/python/value/value.argument.formal.iteration.scope index 3d123ffb30..5686d53286 100644 --- a/data/fixtures/scopes/python/value/value.argument.formal.iteration.scope +++ b/data/fixtures/scopes/python/value/value.argument.formal.iteration.scope @@ -1,22 +1,19 @@ -def bar(aaa: str, bbb: int): - pass +def foo(aaa: int = 0, bbb: int = 1): pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------------------------- -0| def bar(aaa: str, bbb: int): -1| pass - --------< +[#1 Domain] = 0:0-0:41 + >-----------------------------------------< +0| def foo(aaa: int = 0, bbb: int = 1): pass [#2 Content] = -[#2 Domain] = 0:8-0:26 - >------------------< -0| def bar(aaa: str, bbb: int): +[#2 Domain] = 0:8-0:34 + >--------------------------< +0| def foo(aaa: int = 0, bbb: int = 1): pass [#3 Content] = -[#3 Domain] = 1:4-1:8 - >----< -1| pass +[#3 Domain] = 0:37-0:41 + >----< +0| def foo(aaa: int = 0, bbb: int = 1): pass diff --git a/data/fixtures/scopes/python/value/value.argument.formal.method.iteration.scope b/data/fixtures/scopes/python/value/value.argument.formal.method.iteration.scope index 24d83948e9..2e1c28c971 100644 --- a/data/fixtures/scopes/python/value/value.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/python/value/value.argument.formal.method.iteration.scope @@ -1,32 +1,28 @@ class Foo: - def bar(aaa: str, bbb: int): - pass + def bar(aaa: int = 0, bbb: int = 1): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:45 >---------- 0| class Foo: -1| def bar(aaa: str, bbb: int): -2| pass - ------------< +1| def bar(aaa: int = 0, bbb: int = 1): pass + ---------------------------------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >---------------------------- -1| def bar(aaa: str, bbb: int): -2| pass - ------------< +[#2 Domain] = 1:4-1:45 + >-----------------------------------------< +1| def bar(aaa: int = 0, bbb: int = 1): pass [#3 Content] = -[#3 Domain] = 1:12-1:30 - >------------------< -1| def bar(aaa: str, bbb: int): +[#3 Domain] = 1:12-1:38 + >--------------------------< +1| def bar(aaa: int = 0, bbb: int = 1): pass [#4 Content] = -[#4 Domain] = 2:8-2:12 - >----< -2| pass +[#4 Domain] = 1:41-1:45 + >----< +1| def bar(aaa: int = 0, bbb: int = 1): pass diff --git a/data/fixtures/scopes/python/value/value.argument.formal.method.scope b/data/fixtures/scopes/python/value/value.argument.formal.method.scope index 47fbc017f6..c88e9776bd 100644 --- a/data/fixtures/scopes/python/value/value.argument.formal.method.scope +++ b/data/fixtures/scopes/python/value/value.argument.formal.method.scope @@ -1,22 +1,40 @@ class Foo: - def bar(aaa: str, bbb: int = 123): - pass + def bar(aaa: int = 0, bbb: int = 1): pass --- -[Content] = 1:33-1:36 - >---< -1| def bar(aaa: str, bbb: int = 123): +[#1 Content] = 1:23-1:24 + >-< +1| def bar(aaa: int = 0, bbb: int = 1): pass -[Removal] = 1:30-1:36 - >------< -1| def bar(aaa: str, bbb: int = 123): +[#1 Removal] = 1:20-1:24 + >----< +1| def bar(aaa: int = 0, bbb: int = 1): pass -[Leading delimiter] = 1:30-1:33 - >---< -1| def bar(aaa: str, bbb: int = 123): +[#1 Leading delimiter] = 1:20-1:23 + >---< +1| def bar(aaa: int = 0, bbb: int = 1): pass -[Domain] = 1:22-1:36 - >--------------< -1| def bar(aaa: str, bbb: int = 123): +[#1 Domain] = 1:12-1:24 + >------------< +1| def bar(aaa: int = 0, bbb: int = 1): pass -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:37-1:38 + >-< +1| def bar(aaa: int = 0, bbb: int = 1): pass + +[#2 Removal] = 1:34-1:38 + >----< +1| def bar(aaa: int = 0, bbb: int = 1): pass + +[#2 Leading delimiter] = 1:34-1:37 + >---< +1| def bar(aaa: int = 0, bbb: int = 1): pass + +[#2 Domain] = 1:26-1:38 + >------------< +1| def bar(aaa: int = 0, bbb: int = 1): pass + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.argument.formal.scope b/data/fixtures/scopes/python/value/value.argument.formal.scope index 4e67a335ce..b0a174ba40 100644 --- a/data/fixtures/scopes/python/value/value.argument.formal.scope +++ b/data/fixtures/scopes/python/value/value.argument.formal.scope @@ -1,21 +1,39 @@ -def bar(aaa: str, bbb: int = 123): - pass +def foo(aaa: int = 0, bbb: int = 1): pass --- -[Content] = 0:29-0:32 - >---< -0| def bar(aaa: str, bbb: int = 123): +[#1 Content] = 0:19-0:20 + >-< +0| def foo(aaa: int = 0, bbb: int = 1): pass -[Removal] = 0:26-0:32 - >------< -0| def bar(aaa: str, bbb: int = 123): +[#1 Removal] = 0:16-0:20 + >----< +0| def foo(aaa: int = 0, bbb: int = 1): pass -[Leading delimiter] = 0:26-0:29 - >---< -0| def bar(aaa: str, bbb: int = 123): +[#1 Leading delimiter] = 0:16-0:19 + >---< +0| def foo(aaa: int = 0, bbb: int = 1): pass -[Domain] = 0:18-0:32 - >--------------< -0| def bar(aaa: str, bbb: int = 123): +[#1 Domain] = 0:8-0:20 + >------------< +0| def foo(aaa: int = 0, bbb: int = 1): pass -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:33-0:34 + >-< +0| def foo(aaa: int = 0, bbb: int = 1): pass + +[#2 Removal] = 0:30-0:34 + >----< +0| def foo(aaa: int = 0, bbb: int = 1): pass + +[#2 Leading delimiter] = 0:30-0:33 + >---< +0| def foo(aaa: int = 0, bbb: int = 1): pass + +[#2 Domain] = 0:22-0:34 + >------------< +0| def foo(aaa: int = 0, bbb: int = 1): pass + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.assignment.scope b/data/fixtures/scopes/python/value/value.assignment.scope index 9826a81936..6e89de0927 100644 --- a/data/fixtures/scopes/python/value/value.assignment.scope +++ b/data/fixtures/scopes/python/value/value.assignment.scope @@ -1,20 +1,20 @@ -value = 123 +foo = 0 --- -[Content] = 0:8-0:11 - >---< -0| value = 123 +[Content] = 0:6-0:7 + >-< +0| foo = 0 -[Removal] = 0:5-0:11 - >------< -0| value = 123 +[Removal] = 0:3-0:7 + >----< +0| foo = 0 -[Leading delimiter] = 0:5-0:8 - >---< -0| value = 123 +[Leading delimiter] = 0:3-0:6 + >---< +0| foo = 0 -[Domain] = 0:0-0:11 - >-----------< -0| value = 123 +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.assignment2.scope b/data/fixtures/scopes/python/value/value.assignment2.scope new file mode 100644 index 0000000000..0e71d5ba22 --- /dev/null +++ b/data/fixtures/scopes/python/value/value.assignment2.scope @@ -0,0 +1,20 @@ +foo += 0 +--- + +[Content] = 0:7-0:8 + >-< +0| foo += 0 + +[Removal] = 0:3-0:8 + >-----< +0| foo += 0 + +[Leading delimiter] = 0:3-0:7 + >----< +0| foo += 0 + +[Domain] = 0:0-0:8 + >--------< +0| foo += 0 + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.field.class.scope b/data/fixtures/scopes/python/value/value.field.class.scope index 809eab2a5c..13729bc22f 100644 --- a/data/fixtures/scopes/python/value/value.field.class.scope +++ b/data/fixtures/scopes/python/value/value.field.class.scope @@ -1,21 +1,41 @@ class Foo: bar = 0 + baz: int = 1 --- -[Content] = 1:10-1:11 +[#1 Content] = 1:10-1:11 >-< 1| bar = 0 -[Removal] = 1:7-1:11 +[#1 Removal] = 1:7-1:11 >----< 1| bar = 0 -[Leading delimiter] = 1:7-1:10 +[#1 Leading delimiter] = 1:7-1:10 >---< 1| bar = 0 -[Domain] = 1:4-1:11 +[#1 Domain] = 1:4-1:11 >-------< 1| bar = 0 -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 2:15-2:16 + >-< +2| baz: int = 1 + +[#2 Removal] = 2:12-2:16 + >----< +2| baz: int = 1 + +[#2 Leading delimiter] = 2:12-2:15 + >---< +2| baz: int = 1 + +[#2 Domain] = 2:4-2:16 + >------------< +2| baz: int = 1 + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.foreach.scope b/data/fixtures/scopes/python/value/value.foreach.scope index 2438c8f774..149eb4c2cc 100644 --- a/data/fixtures/scopes/python/value/value.foreach.scope +++ b/data/fixtures/scopes/python/value/value.foreach.scope @@ -1,23 +1,20 @@ -for item in items: - pass +for v in values: pass --- -[Content] = 0:12-0:17 - >-----< -0| for item in items: +[Content] = 0:9-0:15 + >------< +0| for v in values: pass -[Removal] = 0:11-0:17 - >------< -0| for item in items: +[Removal] = 0:8-0:15 + >-------< +0| for v in values: pass -[Leading delimiter] = 0:11-0:12 - >-< -0| for item in items: +[Leading delimiter] = 0:8-0:9 + >-< +0| for v in values: pass -[Domain] = 0:0-1:8 - >------------------ -0| for item in items: -1| pass - --------< +[Domain] = 0:0-0:21 + >---------------------< +0| for v in values: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.iteration.block.scope b/data/fixtures/scopes/python/value/value.iteration.block.scope index b5a0c42099..004b7242df 100644 --- a/data/fixtures/scopes/python/value/value.iteration.block.scope +++ b/data/fixtures/scopes/python/value/value.iteration.block.scope @@ -1,26 +1,22 @@ class Foo: - def bar(): - pass + def bar(): pass --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-1:19 >---------- 0| class Foo: -1| def bar(): -2| pass - ------------< +1| def bar(): pass + -------------------< [#2 Content] = -[#2 Domain] = 1:4-2:12 - >---------- -1| def bar(): -2| pass - ------------< +[#2 Domain] = 1:4-1:19 + >---------------< +1| def bar(): pass [#3 Content] = -[#3 Domain] = 2:8-2:12 - >----< -2| pass +[#3 Domain] = 1:15-1:19 + >----< +1| def bar(): pass diff --git a/data/fixtures/scopes/python/value/value.iteration.block2.scope b/data/fixtures/scopes/python/value/value.iteration.block2.scope index 203dbe821d..51b2b45413 100644 --- a/data/fixtures/scopes/python/value/value.iteration.block2.scope +++ b/data/fixtures/scopes/python/value/value.iteration.block2.scope @@ -1,16 +1,13 @@ -def foo(): - pass +def foo(): pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------- -0| def foo(): -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| def foo(): pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| def foo(): pass diff --git a/data/fixtures/scopes/python/value/value.iteration.block3.scope b/data/fixtures/scopes/python/value/value.iteration.block3.scope index 0e1c7d9ced..8976b8c45a 100644 --- a/data/fixtures/scopes/python/value/value.iteration.block3.scope +++ b/data/fixtures/scopes/python/value/value.iteration.block3.scope @@ -1,36 +1,30 @@ -if True: - pass -elif False: - pass -else: - pass +if True: pass +elif False: pass +else: pass --- [#1 Content] = -[#1 Domain] = 0:0-5:8 - >-------- -0| if True: -1| pass -2| elif False: -3| pass -4| else: -5| pass - --------< +[#1 Domain] = 0:0-2:10 + >------------- +0| if True: pass +1| elif False: pass +2| else: pass + ----------< [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:9-0:13 + >----< +0| if True: pass [#3 Content] = -[#3 Domain] = 3:4-3:8 - >----< -3| pass +[#3 Domain] = 1:12-1:16 + >----< +1| elif False: pass [#4 Content] = -[#4 Domain] = 5:4-5:8 - >----< -5| pass +[#4 Domain] = 2:6-2:10 + >----< +2| else: pass diff --git a/data/fixtures/scopes/python/value/value.iteration.block4.scope b/data/fixtures/scopes/python/value/value.iteration.block4.scope index bedd64a06d..6712a3a748 100644 --- a/data/fixtures/scopes/python/value/value.iteration.block4.scope +++ b/data/fixtures/scopes/python/value/value.iteration.block4.scope @@ -1,16 +1,13 @@ -while True: - pass +while True: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >----------- -0| while True: -1| pass - --------< +[#1 Domain] = 0:0-0:16 + >----------------< +0| while True: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:12-0:16 + >----< +0| while True: pass diff --git a/data/fixtures/scopes/python/value/value.iteration.class.scope b/data/fixtures/scopes/python/value/value.iteration.class.scope index 23872a9212..c91c1c425a 100644 --- a/data/fixtures/scopes/python/value/value.iteration.class.scope +++ b/data/fixtures/scopes/python/value/value.iteration.class.scope @@ -1,16 +1,13 @@ -class Foo: - pass +class Foo: pass --- [#1 Content] = -[#1 Domain] = 0:0-1:8 - >---------- -0| class Foo: -1| pass - --------< +[#1 Domain] = 0:0-0:15 + >---------------< +0| class Foo: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:11-0:15 + >----< +0| class Foo: pass diff --git a/data/fixtures/scopes/python/value/value.mapPair.iteration.scope b/data/fixtures/scopes/python/value/value.mapPair.iteration.scope index 9503ce8246..e952029a05 100644 --- a/data/fixtures/scopes/python/value/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/python/value/value.mapPair.iteration.scope @@ -1,13 +1,13 @@ -{ aaa: 123, bbb: 456} +{aaa: 0, bbb: 1} --- [#1 Content] = -[#1 Domain] = 0:0-0:21 - >---------------------< -0| { aaa: 123, bbb: 456} +[#1 Domain] = 0:0-0:16 + >----------------< +0| {aaa: 0, bbb: 1} [#2 Content] = -[#2 Domain] = 0:1-0:20 - >-------------------< -0| { aaa: 123, bbb: 456} +[#2 Domain] = 0:1-0:15 + >--------------< +0| {aaa: 0, bbb: 1} diff --git a/data/fixtures/scopes/python/value/value.mapPair.scope b/data/fixtures/scopes/python/value/value.mapPair.scope index 949027ef37..c6bd37aa6c 100644 --- a/data/fixtures/scopes/python/value/value.mapPair.scope +++ b/data/fixtures/scopes/python/value/value.mapPair.scope @@ -1,39 +1,39 @@ -{ aaa: 123, bbb: 456} +{aaa: 0, bbb: 1} --- -[#1 Content] = 0:7-0:10 - >---< -0| { aaa: 123, bbb: 456} +[#1 Content] = 0:6-0:7 + >-< +0| {aaa: 0, bbb: 1} -[#1 Removal] = 0:5-0:10 - >-----< -0| { aaa: 123, bbb: 456} +[#1 Removal] = 0:4-0:7 + >---< +0| {aaa: 0, bbb: 1} -[#1 Leading delimiter] = 0:5-0:7 - >--< -0| { aaa: 123, bbb: 456} +[#1 Leading delimiter] = 0:4-0:6 + >--< +0| {aaa: 0, bbb: 1} -[#1 Domain] = 0:2-0:10 - >--------< -0| { aaa: 123, bbb: 456} +[#1 Domain] = 0:1-0:7 + >------< +0| {aaa: 0, bbb: 1} [#1 Insertion delimiter] = " " -[#2 Content] = 0:17-0:20 - >---< -0| { aaa: 123, bbb: 456} +[#2 Content] = 0:14-0:15 + >-< +0| {aaa: 0, bbb: 1} -[#2 Removal] = 0:15-0:20 - >-----< -0| { aaa: 123, bbb: 456} +[#2 Removal] = 0:12-0:15 + >---< +0| {aaa: 0, bbb: 1} -[#2 Leading delimiter] = 0:15-0:17 - >--< -0| { aaa: 123, bbb: 456} +[#2 Leading delimiter] = 0:12-0:14 + >--< +0| {aaa: 0, bbb: 1} -[#2 Domain] = 0:12-0:20 - >--------< -0| { aaa: 123, bbb: 456} +[#2 Domain] = 0:9-0:15 + >------< +0| {aaa: 0, bbb: 1} [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.resource.iteration.scope b/data/fixtures/scopes/python/value/value.resource.iteration.scope index 8e14225d4b..b014dd3e66 100644 --- a/data/fixtures/scopes/python/value/value.resource.iteration.scope +++ b/data/fixtures/scopes/python/value/value.resource.iteration.scope @@ -1,19 +1,16 @@ -with aaa, bbb as ccc: - pass +with foo, bar as baz: pass --- [#1 Content] = 0:5-0:20 >---------------< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass -[#1 Domain] = 0:0-1:8 - >--------------------- -0| with aaa, bbb as ccc: -1| pass - --------< +[#1 Domain] = 0:0-0:26 + >--------------------------< +0| with foo, bar as baz: pass [#2 Content] = -[#2 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:22-0:26 + >----< +0| with foo, bar as baz: pass diff --git a/data/fixtures/scopes/python/value/value.resource.iteration2.scope b/data/fixtures/scopes/python/value/value.resource.iteration2.scope index 32aa556c32..3abf031d3c 100644 --- a/data/fixtures/scopes/python/value/value.resource.iteration2.scope +++ b/data/fixtures/scopes/python/value/value.resource.iteration2.scope @@ -1,33 +1,16 @@ -with aaa: - pass - -bbb = ccc -ddd = eee +with foo: pass --- [#1 Content] = 0:5-0:8 >---< -0| with aaa: +0| with foo: pass -[#1 Domain] = 0:0-1:8 - >--------- -0| with aaa: -1| pass - --------< +[#1 Domain] = 0:0-0:14 + >--------------< +0| with foo: pass [#2 Content] = -[#2 Domain] = 0:0-4:9 - >--------- -0| with aaa: -1| pass -2| -3| bbb = ccc -4| ddd = eee - ---------< - - -[#3 Content] = -[#3 Domain] = 1:4-1:8 - >----< -1| pass +[#2 Domain] = 0:10-0:14 + >----< +0| with foo: pass diff --git a/data/fixtures/scopes/python/value/value.resource.scope b/data/fixtures/scopes/python/value/value.resource.scope index 03500511ea..ee9ef4e50f 100644 --- a/data/fixtures/scopes/python/value/value.resource.scope +++ b/data/fixtures/scopes/python/value/value.resource.scope @@ -1,23 +1,20 @@ -with aaa: - pass +with foo: pass --- [Content] = 0:5-0:8 >---< -0| with aaa: +0| with foo: pass [Removal] = 0:4-0:8 >----< -0| with aaa: +0| with foo: pass [Leading delimiter] = 0:4-0:5 >-< -0| with aaa: +0| with foo: pass -[Domain] = 0:0-1:8 - >--------- -0| with aaa: -1| pass - --------< +[Domain] = 0:0-0:14 + >--------------< +0| with foo: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.resource2.scope b/data/fixtures/scopes/python/value/value.resource2.scope index 0e17a38125..d4b503f4bb 100644 --- a/data/fixtures/scopes/python/value/value.resource2.scope +++ b/data/fixtures/scopes/python/value/value.resource2.scope @@ -1,54 +1,51 @@ -with aaa, bbb: - pass +with foo, bar: pass --- [#1.1 Content] = 0:5-0:8 >---< -0| with aaa, bbb: +0| with foo, bar: pass [#1.1 Removal] = 0:5-0:10 >-----< -0| with aaa, bbb: +0| with foo, bar: pass [#1.1 Trailing delimiter] = 0:8-0:10 >--< -0| with aaa, bbb: +0| with foo, bar: pass [#1.1 Insertion delimiter] = " " [#1.2 Content] = 0:10-0:13 >---< -0| with aaa, bbb: +0| with foo, bar: pass [#1.2 Removal] = 0:8-0:13 >-----< -0| with aaa, bbb: +0| with foo, bar: pass [#1.2 Leading delimiter] = 0:8-0:10 >--< -0| with aaa, bbb: +0| with foo, bar: pass [#1.2 Insertion delimiter] = " " -[#1 Domain] = 0:0-1:8 - >-------------- -0| with aaa, bbb: -1| pass - --------< +[#1 Domain] = 0:0-0:19 + >-------------------< +0| with foo, bar: pass [#2 Content] = [#2 Domain] = 0:5-0:8 >---< -0| with aaa, bbb: +0| with foo, bar: pass [#2 Removal] = 0:5-0:10 >-----< -0| with aaa, bbb: +0| with foo, bar: pass [#2 Trailing delimiter] = 0:8-0:10 >--< -0| with aaa, bbb: +0| with foo, bar: pass [#2 Insertion delimiter] = " " @@ -56,14 +53,14 @@ with aaa, bbb: [#3 Content] = [#3 Domain] = 0:10-0:13 >---< -0| with aaa, bbb: +0| with foo, bar: pass [#3 Removal] = 0:8-0:13 >-----< -0| with aaa, bbb: +0| with foo, bar: pass [#3 Leading delimiter] = 0:8-0:10 >--< -0| with aaa, bbb: +0| with foo, bar: pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.resource3.scope b/data/fixtures/scopes/python/value/value.resource3.scope index e8a7708759..5cd902a7a0 100644 --- a/data/fixtures/scopes/python/value/value.resource3.scope +++ b/data/fixtures/scopes/python/value/value.resource3.scope @@ -1,23 +1,20 @@ -with aaa as bbb: - pass +with foo as bar: pass --- [Content] = 0:5-0:8 >---< -0| with aaa as bbb: +0| with foo as bar: pass [Removal] = 0:5-0:12 >-------< -0| with aaa as bbb: +0| with foo as bar: pass [Trailing delimiter] = 0:8-0:12 >----< -0| with aaa as bbb: +0| with foo as bar: pass -[Domain] = 0:0-1:8 - >---------------- -0| with aaa as bbb: -1| pass - --------< +[Domain] = 0:0-0:21 + >---------------------< +0| with foo as bar: pass [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.resource4.scope b/data/fixtures/scopes/python/value/value.resource4.scope index 467cfef917..71263b9c03 100644 --- a/data/fixtures/scopes/python/value/value.resource4.scope +++ b/data/fixtures/scopes/python/value/value.resource4.scope @@ -1,72 +1,69 @@ -with aaa, bbb as ccc: - pass +with foo, bar as baz: pass --- [#1.1 Content] = 0:5-0:8 >---< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.1 Removal] = 0:5-0:10 >-----< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.1 Trailing delimiter] = 0:8-0:10 >--< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.1 Insertion delimiter] = " " [#1.2 Content] = 0:10-0:13 >---< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.2 Removal] = 0:10-0:17 >-------< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.2 Trailing delimiter] = 0:13-0:17 >----< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#1.2 Insertion delimiter] = " " -[#1 Domain] = 0:0-1:8 - >--------------------- -0| with aaa, bbb as ccc: -1| pass - --------< +[#1 Domain] = 0:0-0:26 + >--------------------------< +0| with foo, bar as baz: pass [#2 Content] = [#2 Domain] = 0:5-0:8 >---< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#2 Removal] = 0:5-0:10 >-----< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#2 Trailing delimiter] = 0:8-0:10 >--< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#2 Insertion delimiter] = " " [#3 Content] = 0:10-0:13 >---< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#3 Removal] = 0:10-0:17 >-------< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#3 Trailing delimiter] = 0:13-0:17 >----< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#3 Domain] = 0:10-0:20 >----------< -0| with aaa, bbb as ccc: +0| with foo, bar as baz: pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.resource5.scope b/data/fixtures/scopes/python/value/value.resource5.scope index 435ff6a501..947d75fc49 100644 --- a/data/fixtures/scopes/python/value/value.resource5.scope +++ b/data/fixtures/scopes/python/value/value.resource5.scope @@ -1,75 +1,72 @@ -with aaa as bbb, ccc as ddd: - pass +with foo as bar, baz as bongo: pass --- [#1.1 Content] = 0:5-0:8 >---< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.1 Removal] = 0:5-0:12 >-------< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.1 Trailing delimiter] = 0:8-0:12 >----< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.1 Insertion delimiter] = " " [#1.2 Content] = 0:17-0:20 >---< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.2 Removal] = 0:17-0:24 >-------< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.2 Trailing delimiter] = 0:20-0:24 >----< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#1.2 Insertion delimiter] = " " -[#1 Domain] = 0:0-1:8 - >---------------------------- -0| with aaa as bbb, ccc as ddd: -1| pass - --------< +[#1 Domain] = 0:0-0:35 + >-----------------------------------< +0| with foo as bar, baz as bongo: pass [#2 Content] = 0:5-0:8 >---< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#2 Removal] = 0:5-0:12 >-------< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#2 Trailing delimiter] = 0:8-0:12 >----< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#2 Domain] = 0:5-0:15 >----------< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#2 Insertion delimiter] = " " [#3 Content] = 0:17-0:20 >---< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#3 Removal] = 0:17-0:24 >-------< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass [#3 Trailing delimiter] = 0:20-0:24 >----< -0| with aaa as bbb, ccc as ddd: +0| with foo as bar, baz as bongo: pass -[#3 Domain] = 0:17-0:27 - >----------< -0| with aaa as bbb, ccc as ddd: +[#3 Domain] = 0:17-0:29 + >------------< +0| with foo as bar, baz as bongo: pass [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.return.scope b/data/fixtures/scopes/python/value/value.return.scope index 40948e83e1..1b17d080cb 100644 --- a/data/fixtures/scopes/python/value/value.return.scope +++ b/data/fixtures/scopes/python/value/value.return.scope @@ -1,21 +1,21 @@ def bar(): - return 123 + return 0 --- -[Content] = 1:11-1:14 - >---< -1| return 123 +[Content] = 1:11-1:12 + >-< +1| return 0 -[Removal] = 1:10-1:14 - >----< -1| return 123 +[Removal] = 1:10-1:12 + >--< +1| return 0 [Leading delimiter] = 1:10-1:11 >-< -1| return 123 +1| return 0 -[Domain] = 1:4-1:14 - >----------< -1| return 123 +[Domain] = 1:4-1:12 + >--------< +1| return 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value.switch.scope b/data/fixtures/scopes/python/value/value.switch.scope similarity index 100% rename from data/fixtures/scopes/python/value.switch.scope rename to data/fixtures/scopes/python/value/value.switch.scope diff --git a/data/fixtures/scopes/python/value/value.variable.pattern.scope b/data/fixtures/scopes/python/value/value.variable.pattern.scope index 063e276290..b9c54f457f 100644 --- a/data/fixtures/scopes/python/value/value.variable.pattern.scope +++ b/data/fixtures/scopes/python/value/value.variable.pattern.scope @@ -1,20 +1,20 @@ -foo, bar = value +foo, bar = bar --- -[Content] = 0:11-0:16 - >-----< -0| foo, bar = value +[Content] = 0:11-0:14 + >---< +0| foo, bar = bar -[Removal] = 0:8-0:16 - >--------< -0| foo, bar = value +[Removal] = 0:8-0:14 + >------< +0| foo, bar = bar [Leading delimiter] = 0:8-0:11 >---< -0| foo, bar = value +0| foo, bar = bar -[Domain] = 0:0-0:16 - >----------------< -0| foo, bar = value +[Domain] = 0:0-0:14 + >--------------< +0| foo, bar = bar [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.variable.scope b/data/fixtures/scopes/python/value/value.variable.scope index 9826a81936..6e89de0927 100644 --- a/data/fixtures/scopes/python/value/value.variable.scope +++ b/data/fixtures/scopes/python/value/value.variable.scope @@ -1,20 +1,20 @@ -value = 123 +foo = 0 --- -[Content] = 0:8-0:11 - >---< -0| value = 123 +[Content] = 0:6-0:7 + >-< +0| foo = 0 -[Removal] = 0:5-0:11 - >------< -0| value = 123 +[Removal] = 0:3-0:7 + >----< +0| foo = 0 -[Leading delimiter] = 0:5-0:8 - >---< -0| value = 123 +[Leading delimiter] = 0:3-0:6 + >---< +0| foo = 0 -[Domain] = 0:0-0:11 - >-----------< -0| value = 123 +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/python/value/value.yield.scope b/data/fixtures/scopes/python/value/value.yield.scope index bcf06f46ce..cff4ce1005 100644 --- a/data/fixtures/scopes/python/value/value.yield.scope +++ b/data/fixtures/scopes/python/value/value.yield.scope @@ -1,21 +1,21 @@ -def aaa(): - yield bbb +def foo(): + yield 0 --- -[Content] = 1:10-1:13 - >---< -1| yield bbb +[Content] = 1:10-1:11 + >-< +1| yield 0 -[Removal] = 1:9-1:13 - >----< -1| yield bbb +[Removal] = 1:9-1:11 + >--< +1| yield 0 [Leading delimiter] = 1:9-1:10 >-< -1| yield bbb +1| yield 0 -[Domain] = 1:4-1:13 - >---------< -1| yield bbb +[Domain] = 1:4-1:11 + >-------< +1| yield 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/anonymousFunction.scope b/data/fixtures/scopes/r/anonymousFunction.scope index 1f2d152fd1..a0b6274e92 100644 --- a/data/fixtures/scopes/r/anonymousFunction.scope +++ b/data/fixtures/scopes/r/anonymousFunction.scope @@ -1,17 +1,10 @@ -lapply(1:10, function(x) x^2) +function() {} --- [Content] = -[Domain] = 0:13-0:28 - >---------------< -0| lapply(1:10, function(x) x^2) - -[Removal] = 0:12-0:28 - >----------------< -0| lapply(1:10, function(x) x^2) - -[Leading delimiter] = 0:12-0:13 - >-< -0| lapply(1:10, function(x) x^2) +[Removal] = +[Domain] = 0:0-0:13 + >-------------< +0| function() {} [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/r/anonymousFunction2.scope b/data/fixtures/scopes/r/anonymousFunction2.scope new file mode 100644 index 0000000000..d831cd4999 --- /dev/null +++ b/data/fixtures/scopes/r/anonymousFunction2.scope @@ -0,0 +1,10 @@ +(function() 0) +--- + +[Content] = +[Removal] = +[Domain] = 0:1-0:13 + >------------< +0| (function() 0) + +[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/r/argument/argument.actual.iteration.scope b/data/fixtures/scopes/r/argument/argument.actual.iteration.scope index 9eb9684c7a..1b28526f67 100644 --- a/data/fixtures/scopes/r/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/r/argument/argument.actual.iteration.scope @@ -1,10 +1,10 @@ -foo(x, y) +foo(aaa, bbb) --- -[Content] = 0:4-0:8 - >----< -0| foo(x, y) +[Content] = 0:4-0:12 + >--------< +0| foo(aaa, bbb) -[Domain] = 0:0-0:9 - >---------< -0| foo(x, y) +[Domain] = 0:0-0:13 + >-------------< +0| foo(aaa, bbb) diff --git a/data/fixtures/scopes/r/argument/argument.actual.multiLine.scope b/data/fixtures/scopes/r/argument/argument.actual.multiLine.scope index 021b530ce8..f1522638a4 100644 --- a/data/fixtures/scopes/r/argument/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/r/argument/argument.actual.multiLine.scope @@ -1,45 +1,45 @@ foo( - x, - y + aaa, + bbb ) --- [#1 Content] = -[#1 Domain] = 1:4-1:5 - >-< -1| x, +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, [#1 Removal] = 1:4-2:4 - >-- -1| x, -2| y + >---- +1| aaa, +2| bbb ----< -[#1 Trailing delimiter] = 1:5-2:4 - >- -1| x, -2| y +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#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 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/r/argument/argument.actual.singleLine.scope b/data/fixtures/scopes/r/argument/argument.actual.singleLine.scope index b1247a308d..35aa9e2ef8 100644 --- a/data/fixtures/scopes/r/argument/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/r/argument/argument.actual.singleLine.scope @@ -1,33 +1,33 @@ -func(x, y) +func(aaa, bbb) --- [#1 Content] = -[#1 Domain] = 0:5-0:6 - >-< -0| func(x, y) - -[#1 Removal] = 0:5-0:8 +[#1 Domain] = 0:5-0:8 >---< -0| func(x, y) +0| func(aaa, bbb) + +[#1 Removal] = 0:5-0:10 + >-----< +0| func(aaa, bbb) -[#1 Trailing delimiter] = 0:6-0:8 - >--< -0| func(x, y) +[#1 Trailing delimiter] = 0:8-0:10 + >--< +0| func(aaa, bbb) [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:8-0:9 - >-< -0| func(x, y) +[#2 Domain] = 0:10-0:13 + >---< +0| func(aaa, bbb) -[#2 Removal] = 0:6-0:9 - >---< -0| func(x, y) +[#2 Removal] = 0:8-0:13 + >-----< +0| func(aaa, bbb) -[#2 Leading delimiter] = 0:6-0:8 - >--< -0| func(x, y) +[#2 Leading delimiter] = 0:8-0:10 + >--< +0| func(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argument/argument.actual.singleLine2.scope b/data/fixtures/scopes/r/argument/argument.actual.singleLine2.scope index 536e3fc939..35aa9e2ef8 100644 --- a/data/fixtures/scopes/r/argument/argument.actual.singleLine2.scope +++ b/data/fixtures/scopes/r/argument/argument.actual.singleLine2.scope @@ -1,10 +1,33 @@ -func(1) +func(aaa, bbb) --- -[Content] = -[Removal] = -[Domain] = 0:5-0:6 - >-< -0| func(1) +[#1 Content] = +[#1 Domain] = 0:5-0:8 + >---< +0| func(aaa, bbb) -[Insertion delimiter] = ", " +[#1 Removal] = 0:5-0:10 + >-----< +0| func(aaa, bbb) + +[#1 Trailing delimiter] = 0:8-0:10 + >--< +0| func(aaa, bbb) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:10-0:13 + >---< +0| func(aaa, bbb) + +[#2 Removal] = 0:8-0:13 + >-----< +0| func(aaa, bbb) + +[#2 Leading delimiter] = 0:8-0:10 + >--< +0| func(aaa, bbb) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argument/argument.actual.singleLine4.scope b/data/fixtures/scopes/r/argument/argument.actual.singleLine4.scope index e1dde59bf3..88cadc33be 100644 --- a/data/fixtures/scopes/r/argument/argument.actual.singleLine4.scope +++ b/data/fixtures/scopes/r/argument/argument.actual.singleLine4.scope @@ -1,10 +1,33 @@ -func(x=1) +func(aaa=0, bbb=1) --- -[Content] = -[Removal] = -[Domain] = 0:5-0:8 - >---< -0| func(x=1) +[#1 Content] = +[#1 Domain] = 0:5-0:10 + >-----< +0| func(aaa=0, bbb=1) -[Insertion delimiter] = ", " +[#1 Removal] = 0:5-0:12 + >-------< +0| func(aaa=0, bbb=1) + +[#1 Trailing delimiter] = 0:10-0:12 + >--< +0| func(aaa=0, bbb=1) + +[#1 Insertion delimiter] = ", " + + +[#2 Content] = +[#2 Domain] = 0:12-0:17 + >-----< +0| func(aaa=0, bbb=1) + +[#2 Removal] = 0:10-0:17 + >-------< +0| func(aaa=0, bbb=1) + +[#2 Leading delimiter] = 0:10-0:12 + >--< +0| func(aaa=0, bbb=1) + +[#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argument/argument.formal.iteration.scope b/data/fixtures/scopes/r/argument/argument.formal.iteration.scope index ad38e7e2b2..f08866fb58 100644 --- a/data/fixtures/scopes/r/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/r/argument/argument.formal.iteration.scope @@ -1,10 +1,10 @@ -abc <- function(x, y){} +foo <- function(aaa, bbb) {} --- -[Content] = 0:16-0:20 - >----< -0| abc <- function(x, y){} +[Content] = 0:16-0:24 + >--------< +0| foo <- function(aaa, bbb) {} -[Domain] = 0:0-0:23 - >-----------------------< -0| abc <- function(x, y){} +[Domain] = 0:0-0:28 + >----------------------------< +0| foo <- function(aaa, bbb) {} diff --git a/data/fixtures/scopes/r/argument/argument.formal.multiLine.scope b/data/fixtures/scopes/r/argument/argument.formal.multiLine.scope index 972534acf7..5f967ae849 100644 --- a/data/fixtures/scopes/r/argument/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/r/argument/argument.formal.multiLine.scope @@ -1,44 +1,44 @@ -abc <- function( - x, - y -){ } +foo <- function( + aaa, + bbb +) {} --- [#1 Content] = -[#1 Domain] = 1:4-1:5 - >-< -1| x, +[#1 Domain] = 1:4-1:7 + >---< +1| aaa, [#1 Removal] = 1:4-2:4 - >-- -1| x, -2| y + >---- +1| aaa, +2| bbb ----< -[#1 Trailing delimiter] = 1:5-2:4 - >- -1| x, -2| y +[#1 Trailing delimiter] = 1:7-2:4 + >- +1| aaa, +2| bbb ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#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 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/r/argument/argument.formal.singleLine.scope b/data/fixtures/scopes/r/argument/argument.formal.singleLine.scope index 321b8a8b4c..17d62184be 100644 --- a/data/fixtures/scopes/r/argument/argument.formal.singleLine.scope +++ b/data/fixtures/scopes/r/argument/argument.formal.singleLine.scope @@ -1,33 +1,33 @@ -abc <- function(x, y){ } +foo <- function(aaa, bbb) {} --- [#1 Content] = -[#1 Domain] = 0:16-0:17 - >-< -0| abc <- function(x, y){ } - -[#1 Removal] = 0:16-0:19 +[#1 Domain] = 0:16-0:19 >---< -0| abc <- function(x, y){ } +0| foo <- function(aaa, bbb) {} + +[#1 Removal] = 0:16-0:21 + >-----< +0| foo <- function(aaa, bbb) {} -[#1 Trailing delimiter] = 0:17-0:19 - >--< -0| abc <- function(x, y){ } +[#1 Trailing delimiter] = 0:19-0:21 + >--< +0| foo <- function(aaa, bbb) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:19-0:20 - >-< -0| abc <- function(x, y){ } +[#2 Domain] = 0:21-0:24 + >---< +0| foo <- function(aaa, bbb) {} -[#2 Removal] = 0:17-0:20 - >---< -0| abc <- function(x, y){ } +[#2 Removal] = 0:19-0:24 + >-----< +0| foo <- function(aaa, bbb) {} -[#2 Leading delimiter] = 0:17-0:19 - >--< -0| abc <- function(x, y){ } +[#2 Leading delimiter] = 0:19-0:21 + >--< +0| foo <- function(aaa, bbb) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.empty.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.empty.scope index b4f4ae643a..0202787cce 100644 --- a/data/fixtures/scopes/r/argumentList/argumentList.formal.empty.scope +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.empty.scope @@ -1,13 +1,13 @@ -abc <- function() { } +foo <- function() {} --- [Content] = [Removal] = 0:16-0:16 >< -0| abc <- function() { } +0| foo <- function() {} -[Domain] = 0:0-0:21 - >---------------------< -0| abc <- function() { } +[Domain] = 0:0-0:20 + >--------------------< +0| foo <- function() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.empty.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.empty.scope index 355a4e9306..cd09be0361 100644 --- a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.empty.scope +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.empty.scope @@ -1,13 +1,13 @@ -function() { } +function() {} --- [Content] = [Removal] = 0:9-0:9 >< -0| function() { } +0| function() {} -[Domain] = 0:0-0:14 - >--------------< -0| function() { } +[Domain] = 0:0-0:13 + >-------------< +0| function() {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope index c2dad72b52..49ed409945 100644 --- a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.multiLine.scope @@ -1,7 +1,7 @@ function( aaa, bbb -) { } +) {} --- [Content] = 1:4-2:7 @@ -15,19 +15,19 @@ function( 0| function( 1| aaa, 2| bbb -3| ) { } +3| ) {} < [Leading delimiter] = 1:0-1:4 >----< 1| aaa, -[Domain] = 0:0-3:5 +[Domain] = 0:0-3:4 >--------- 0| function( 1| aaa, 2| bbb -3| ) { } - -----< +3| ) {} + ----< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.singleLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.singleLine.scope index 3ba0a4b729..b794219e66 100644 --- a/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.singleLine.scope +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.lambda.singleLine.scope @@ -1,13 +1,13 @@ -function(aaa, bbb) { } +function(aaa, bbb) {} --- [Content] = [Removal] = 0:9-0:17 >--------< -0| function(aaa, bbb) { } +0| function(aaa, bbb) {} -[Domain] = 0:0-0:22 - >----------------------< -0| function(aaa, bbb) { } +[Domain] = 0:0-0:21 + >---------------------< +0| function(aaa, bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.multiLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.multiLine.scope index a4b172f25f..87bf4c27fd 100644 --- a/data/fixtures/scopes/r/argumentList/argumentList.formal.multiLine.scope +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.multiLine.scope @@ -1,8 +1,7 @@ abc <- function( aaa, bbb -){ -} +){} --- [Content] = 1:4-2:7 @@ -16,20 +15,19 @@ abc <- function( 0| abc <- function( 1| aaa, 2| bbb -3| ){ +3| ){} < [Leading delimiter] = 1:0-1:4 >----< 1| aaa, -[Domain] = 0:0-4:1 +[Domain] = 0:0-3:3 >---------------- 0| abc <- function( 1| aaa, 2| bbb -3| ){ -4| } - -< +3| ){} + ---< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/r/argumentList/argumentList.formal.singleLine.scope b/data/fixtures/scopes/r/argumentList/argumentList.formal.singleLine.scope index fde348053b..960e7c9b7b 100644 --- a/data/fixtures/scopes/r/argumentList/argumentList.formal.singleLine.scope +++ b/data/fixtures/scopes/r/argumentList/argumentList.formal.singleLine.scope @@ -1,13 +1,13 @@ -abc <- function(aaa, bbb) { } +foo <- function(aaa, bbb) {} --- [Content] = [Removal] = 0:16-0:24 >--------< -0| abc <- function(aaa, bbb) { } +0| foo <- function(aaa, bbb) {} -[Domain] = 0:0-0:29 - >-----------------------------< -0| abc <- function(aaa, bbb) { } +[Domain] = 0:0-0:28 + >----------------------------< +0| foo <- function(aaa, bbb) {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/r/functionCall.scope b/data/fixtures/scopes/r/functionCall.scope index 9d9be652fd..00162e317c 100644 --- a/data/fixtures/scopes/r/functionCall.scope +++ b/data/fixtures/scopes/r/functionCall.scope @@ -1,10 +1,10 @@ -lapply(1:10, function(x) x^2) +foo() --- [Content] = [Removal] = -[Domain] = 0:0-0:29 - >-----------------------------< -0| lapply(1:10, function(x) x^2) +[Domain] = 0:0-0:5 + >-----< +0| foo() [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/functionCallee.scope b/data/fixtures/scopes/r/functionCallee.scope index b9f1e38504..1db3ea550d 100644 --- a/data/fixtures/scopes/r/functionCallee.scope +++ b/data/fixtures/scopes/r/functionCallee.scope @@ -1,10 +1,10 @@ -lapply(1:10, function(x) x^2) +foo() --- [Content] = [Removal] = -[Domain] = 0:0-0:6 - >------< -0| lapply(1:10, function(x) x^2) +[Domain] = 0:0-0:3 + >---< +0| foo() [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/functionName.scope b/data/fixtures/scopes/r/functionName.scope index 1ee4db97f0..400bf1eaa8 100644 --- a/data/fixtures/scopes/r/functionName.scope +++ b/data/fixtures/scopes/r/functionName.scope @@ -1,25 +1,20 @@ -abc <- function(arg){ - TRUE -} +foo <- function() {} --- [Content] = 0:0-0:3 >---< -0| abc <- function(arg){ +0| foo <- function() {} [Removal] = 0:0-0:7 >-------< -0| abc <- function(arg){ +0| foo <- function() {} [Trailing delimiter] = 0:3-0:7 >----< -0| abc <- function(arg){ +0| foo <- function() {} -[Domain] = 0:0-2:1 - >--------------------- -0| abc <- function(arg){ -1| TRUE -2| } - -< +[Domain] = 0:0-0:20 + >--------------------< +0| foo <- function() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/ifStatement.scope b/data/fixtures/scopes/r/ifStatement.scope index 9b1eee34b5..dff608890b 100644 --- a/data/fixtures/scopes/r/ifStatement.scope +++ b/data/fixtures/scopes/r/ifStatement.scope @@ -1,10 +1,10 @@ -if(FALSE) 0 +if(TRUE) {} --- [Content] = [Removal] = [Domain] = 0:0-0:11 >-----------< -0| if(FALSE) 0 +0| if(TRUE) {} [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/r/ifStatement3.scope b/data/fixtures/scopes/r/ifStatement3.scope deleted file mode 100644 index 530fab0f41..0000000000 --- a/data/fixtures/scopes/r/ifStatement3.scope +++ /dev/null @@ -1,29 +0,0 @@ -if(TRUE){ - 1 -} else { - 0 -} - ---- - -[Content] = -[Domain] = 0:0-4:1 - >--------- -0| if(TRUE){ -1| 1 -2| } else { -3| 0 -4| } - -< - -[Removal] = 0:0-5:0 - >--------- -0| if(TRUE){ -1| 1 -2| } else { -3| 0 -4| } -5| - < - -[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/r/name.assignment.scope b/data/fixtures/scopes/r/name.assignment.scope index ea78f068a8..f3686706d8 100644 --- a/data/fixtures/scopes/r/name.assignment.scope +++ b/data/fixtures/scopes/r/name.assignment.scope @@ -1,20 +1,20 @@ -hello = "world" +foo <- 0 --- -[Content] = 0:0-0:5 - >-----< -0| hello = "world" +[Content] = 0:0-0:3 + >---< +0| foo <- 0 -[Removal] = 0:0-0:8 - >--------< -0| hello = "world" +[Removal] = 0:0-0:7 + >-------< +0| foo <- 0 -[Trailing delimiter] = 0:5-0:8 - >---< -0| hello = "world" +[Trailing delimiter] = 0:3-0:7 + >----< +0| foo <- 0 -[Domain] = 0:0-0:15 - >---------------< -0| hello = "world" +[Domain] = 0:0-0:8 + >--------< +0| foo <- 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/name.assignment2.scope b/data/fixtures/scopes/r/name.assignment2.scope new file mode 100644 index 0000000000..7a03d93749 --- /dev/null +++ b/data/fixtures/scopes/r/name.assignment2.scope @@ -0,0 +1,20 @@ +foo = 0 +--- + +[Content] = 0:0-0:3 + >---< +0| foo = 0 + +[Removal] = 0:0-0:6 + >------< +0| foo = 0 + +[Trailing delimiter] = 0:3-0:6 + >---< +0| foo = 0 + +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/name.variable.scope b/data/fixtures/scopes/r/name.variable.scope index fbc108739d..f3686706d8 100644 --- a/data/fixtures/scopes/r/name.variable.scope +++ b/data/fixtures/scopes/r/name.variable.scope @@ -1,20 +1,20 @@ -hello <- "world" +foo <- 0 --- -[Content] = 0:0-0:5 - >-----< -0| hello <- "world" +[Content] = 0:0-0:3 + >---< +0| foo <- 0 -[Removal] = 0:0-0:9 - >---------< -0| hello <- "world" +[Removal] = 0:0-0:7 + >-------< +0| foo <- 0 -[Trailing delimiter] = 0:5-0:9 - >----< -0| hello <- "world" +[Trailing delimiter] = 0:3-0:7 + >----< +0| foo <- 0 -[Domain] = 0:0-0:16 - >----------------< -0| hello <- "world" +[Domain] = 0:0-0:8 + >--------< +0| foo <- 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/namedFunction.scope b/data/fixtures/scopes/r/namedFunction.scope index ab33c053d4..e1edf25a5f 100644 --- a/data/fixtures/scopes/r/namedFunction.scope +++ b/data/fixtures/scopes/r/namedFunction.scope @@ -1,10 +1,10 @@ -foo <- function(bar){} +foo <- function() {} --- [Content] = [Removal] = -[Domain] = 0:0-0:22 - >----------------------< -0| foo <- function(bar){} +[Domain] = 0:0-0:20 + >--------------------< +0| foo <- function() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/r/value.assignment.scope b/data/fixtures/scopes/r/value.assignment.scope index a21e094469..afd6071782 100644 --- a/data/fixtures/scopes/r/value.assignment.scope +++ b/data/fixtures/scopes/r/value.assignment.scope @@ -1,20 +1,20 @@ -hello <- "world" +foo <- 0 --- -[Content] = 0:9-0:16 - >-------< -0| hello <- "world" +[Content] = 0:7-0:8 + >-< +0| foo <- 0 -[Removal] = 0:5-0:16 - >-----------< -0| hello <- "world" +[Removal] = 0:3-0:8 + >-----< +0| foo <- 0 -[Leading delimiter] = 0:5-0:9 - >----< -0| hello <- "world" +[Leading delimiter] = 0:3-0:7 + >----< +0| foo <- 0 -[Domain] = 0:0-0:16 - >----------------< -0| hello <- "world" +[Domain] = 0:0-0:8 + >--------< +0| foo <- 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/value.assignment2.scope b/data/fixtures/scopes/r/value.assignment2.scope new file mode 100644 index 0000000000..6e89de0927 --- /dev/null +++ b/data/fixtures/scopes/r/value.assignment2.scope @@ -0,0 +1,20 @@ +foo = 0 +--- + +[Content] = 0:6-0:7 + >-< +0| foo = 0 + +[Removal] = 0:3-0:7 + >----< +0| foo = 0 + +[Leading delimiter] = 0:3-0:6 + >---< +0| foo = 0 + +[Domain] = 0:0-0:7 + >-------< +0| foo = 0 + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/r/value.variable.scope b/data/fixtures/scopes/r/value.variable.scope index 2d153b44d1..afd6071782 100644 --- a/data/fixtures/scopes/r/value.variable.scope +++ b/data/fixtures/scopes/r/value.variable.scope @@ -1,20 +1,20 @@ -hello = "world" +foo <- 0 --- -[Content] = 0:8-0:15 - >-------< -0| hello = "world" +[Content] = 0:7-0:8 + >-< +0| foo <- 0 -[Removal] = 0:5-0:15 - >----------< -0| hello = "world" +[Removal] = 0:3-0:8 + >-----< +0| foo <- 0 -[Leading delimiter] = 0:5-0:8 - >---< -0| hello = "world" +[Leading delimiter] = 0:3-0:7 + >----< +0| foo <- 0 -[Domain] = 0:0-0:15 - >---------------< -0| hello = "world" +[Domain] = 0:0-0:8 + >--------< +0| foo <- 0 [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/ruby/comment.block.scope b/data/fixtures/scopes/ruby/comment.block.scope index 495bdf7591..6fea52d3cc 100644 --- a/data/fixtures/scopes/ruby/comment.block.scope +++ b/data/fixtures/scopes/ruby/comment.block.scope @@ -1,5 +1,5 @@ =begin - Hi +Hello world =end --- @@ -8,7 +8,7 @@ [Domain] = 0:0-2:4 >------ 0| =begin -1| Hi +1| Hello world 2| =end ----< diff --git a/data/fixtures/scopes/ruby/comment.line.scope b/data/fixtures/scopes/ruby/comment.line.scope index e130005632..42719cdbb8 100644 --- a/data/fixtures/scopes/ruby/comment.line.scope +++ b/data/fixtures/scopes/ruby/comment.line.scope @@ -1,10 +1,10 @@ -# Hello World +# Hello world --- [Content] = [Removal] = [Domain] = 0:0-0:13 >-------------< -0| # Hello World +0| # Hello world [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/ruby/comment.line2.scope b/data/fixtures/scopes/ruby/comment.line2.scope deleted file mode 100644 index bb3e4355a9..0000000000 --- a/data/fixtures/scopes/ruby/comment.line2.scope +++ /dev/null @@ -1,17 +0,0 @@ -a = 0 # Hello World ---- - -[Content] = -[Domain] = 0:6-0:19 - >-------------< -0| a = 0 # Hello World - -[Removal] = 0:5-0:19 - >--------------< -0| a = 0 # Hello World - -[Leading delimiter] = 0:5-0:6 - >-< -0| a = 0 # Hello World - -[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/rust/ifStatement.scope b/data/fixtures/scopes/rust/ifStatement.scope index dd1503659e..e0d492e889 100644 --- a/data/fixtures/scopes/rust/ifStatement.scope +++ b/data/fixtures/scopes/rust/ifStatement.scope @@ -1,13 +1,15 @@ if true {} -else {}; +else if false {} +else {} --- [Content] = [Removal] = -[Domain] = 0:0-1:7 +[Domain] = 0:0-2:7 >---------- 0| if true {} -1| else {}; +1| else if false {} +2| else {} -------< [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/rust/string.singleLine.scope b/data/fixtures/scopes/rust/string.singleLine.scope index d4d6e2488e..4b26cf31b3 100644 --- a/data/fixtures/scopes/rust/string.singleLine.scope +++ b/data/fixtures/scopes/rust/string.singleLine.scope @@ -1,45 +1,10 @@ -"aaa" -r#"bbb"# -r##"ccc"## +"Hello world" --- -[#1 Content] = -[#1 Domain] = 0:0-0:5 - >-----< -0| "aaa" +[Content] = +[Removal] = +[Domain] = 0:0-0:13 + >-------------< +0| "Hello world" -[#1 Removal] = 0:0-1:0 - >----- -0| "aaa" -1| r#"bbb"# - < - -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Domain] = 1:0-1:8 - >--------< -1| r#"bbb"# - -[#2 Removal] = 1:0-2:0 - >-------- -1| r#"bbb"# -2| r##"ccc"## - < - -[#2 Insertion delimiter] = " " - - -[#3 Content] = -[#3 Domain] = 2:0-2:10 - >----------< -2| r##"ccc"## - -[#3 Removal] = 1:8-2:10 - > -1| r#"bbb"# -2| r##"ccc"## - ----------< - -[#3 Insertion delimiter] = " " +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/rust/string.singleLine2.scope b/data/fixtures/scopes/rust/string.singleLine2.scope new file mode 100644 index 0000000000..4a28cefff4 --- /dev/null +++ b/data/fixtures/scopes/rust/string.singleLine2.scope @@ -0,0 +1,10 @@ +r#"Hello world"# +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:16 + >----------------< +0| r#"Hello world"# + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/rust/string.singleLine3.scope b/data/fixtures/scopes/rust/string.singleLine3.scope new file mode 100644 index 0000000000..02a5f1ca8c --- /dev/null +++ b/data/fixtures/scopes/rust/string.singleLine3.scope @@ -0,0 +1,10 @@ +r##"Hello world"## +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:18 + >------------------< +0| r##"Hello world"## + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/rust/textFragment.string.singleLine.scope b/data/fixtures/scopes/rust/textFragment.string.singleLine.scope index 9d115cbc7b..85dcf5fa7f 100644 --- a/data/fixtures/scopes/rust/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/rust/textFragment.string.singleLine.scope @@ -1,30 +1,10 @@ -"aaa" -r#"bbb"# -r##"ccc"## +"Hello world" --- -[#1 Content] = -[#1 Removal] = -[#1 Domain] = 0:1-0:4 - >---< -0| "aaa" +[Content] = +[Removal] = +[Domain] = 0:1-0:12 + >-----------< +0| "Hello world" -[#1 Insertion delimiter] = " " - - -[#2 Content] = -[#2 Removal] = -[#2 Domain] = 1:3-1:6 - >---< -1| r#"bbb"# - -[#2 Insertion delimiter] = " " - - -[#3 Content] = -[#3 Removal] = -[#3 Domain] = 2:4-2:7 - >---< -2| r##"ccc"## - -[#3 Insertion delimiter] = " " +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/rust/textFragment.string.singleLine2.scope b/data/fixtures/scopes/rust/textFragment.string.singleLine2.scope new file mode 100644 index 0000000000..e8a23e1f7e --- /dev/null +++ b/data/fixtures/scopes/rust/textFragment.string.singleLine2.scope @@ -0,0 +1,10 @@ +r#"Hello world"# +--- + +[Content] = +[Removal] = +[Domain] = 0:3-0:14 + >-----------< +0| r#"Hello world"# + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/rust/textFragment.string.singleLine3.scope b/data/fixtures/scopes/rust/textFragment.string.singleLine3.scope new file mode 100644 index 0000000000..1ec8f515bc --- /dev/null +++ b/data/fixtures/scopes/rust/textFragment.string.singleLine3.scope @@ -0,0 +1,10 @@ +r##"Hello world"## +--- + +[Content] = +[Removal] = +[Domain] = 0:4-0:15 + >-----------< +0| r##"Hello world"## + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope b/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope index 8fa763b63b..76c933d3d5 100644 --- a/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope @@ -1,10 +1,10 @@ -def foo(aaa: Int, bbb: Int) = x +def foo(aaa: Int, bbb: Int) = {} --- [Content] = 0:8-0:26 >------------------< -0| def foo(aaa: Int, bbb: Int) = x +0| def foo(aaa: Int, bbb: Int) = {} -[Domain] = 0:0-0:31 - >-------------------------------< -0| def foo(aaa: Int, bbb: Int) = x +[Domain] = 0:0-0:32 + >--------------------------------< +0| def foo(aaa: Int, bbb: Int) = {} diff --git a/data/fixtures/scopes/scala/argument/argument.formal.multiLine.scope b/data/fixtures/scopes/scala/argument/argument.formal.multiLine.scope index 65344519d9..348a304af1 100644 --- a/data/fixtures/scopes/scala/argument/argument.formal.multiLine.scope +++ b/data/fixtures/scopes/scala/argument/argument.formal.multiLine.scope @@ -1,7 +1,7 @@ def foo( aaa: Int, bbb: Int -) = x +) = {} --- [#1 Content] = diff --git a/data/fixtures/scopes/scala/argument/argument.formal.singleLine.scope b/data/fixtures/scopes/scala/argument/argument.formal.singleLine.scope index d36a8373a6..9249bf3e76 100644 --- a/data/fixtures/scopes/scala/argument/argument.formal.singleLine.scope +++ b/data/fixtures/scopes/scala/argument/argument.formal.singleLine.scope @@ -1,18 +1,18 @@ -def foo(aaa: Int, bbb: Int) = x +def foo(aaa: Int, bbb: Int) = {} --- [#1 Content] = [#1 Domain] = 0:8-0:16 >--------< -0| def foo(aaa: Int, bbb: Int) = x +0| def foo(aaa: Int, bbb: Int) = {} [#1 Removal] = 0:8-0:18 >----------< -0| def foo(aaa: Int, bbb: Int) = x +0| def foo(aaa: Int, bbb: Int) = {} [#1 Trailing delimiter] = 0:16-0:18 >--< -0| def foo(aaa: Int, bbb: Int) = x +0| def foo(aaa: Int, bbb: Int) = {} [#1 Insertion delimiter] = ", " @@ -20,14 +20,14 @@ def foo(aaa: Int, bbb: Int) = x [#2 Content] = [#2 Domain] = 0:18-0:26 >--------< -0| def foo(aaa: Int, bbb: Int) = x +0| def foo(aaa: Int, bbb: Int) = {} [#2 Removal] = 0:16-0:26 >----------< -0| def foo(aaa: Int, bbb: Int) = x +0| def foo(aaa: Int, bbb: Int) = {} [#2 Leading delimiter] = 0:16-0:18 >--< -0| def foo(aaa: Int, bbb: Int) = x +0| def foo(aaa: Int, bbb: Int) = {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/scala/argumentList/argumentList.formal.empty.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.empty.scope index f51137bcb1..c653b6165f 100644 --- a/data/fixtures/scopes/scala/argumentList/argumentList.formal.empty.scope +++ b/data/fixtures/scopes/scala/argumentList/argumentList.formal.empty.scope @@ -1,13 +1,13 @@ -def foo() = x +def foo() = {} --- [Content] = [Removal] = 0:8-0:8 >< -0| def foo() = x +0| def foo() = {} -[Domain] = 0:0-0:13 - >-------------< -0| def foo() = x +[Domain] = 0:0-0:14 + >--------------< +0| def foo() = {} [Insertion delimiter] = "" diff --git a/data/fixtures/scopes/scala/argumentList/argumentList.formal.multiLine.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.multiLine.scope index 6334ade756..bcd42e3c23 100644 --- a/data/fixtures/scopes/scala/argumentList/argumentList.formal.multiLine.scope +++ b/data/fixtures/scopes/scala/argumentList/argumentList.formal.multiLine.scope @@ -1,7 +1,7 @@ def foo( aaa: Int, bbb: Int -) = x +) = {} --- [Content] = 1:4-2:12 @@ -15,19 +15,19 @@ def foo( 0| def foo( 1| aaa: Int, 2| bbb: Int -3| ) = x +3| ) = {} < [Leading delimiter] = 1:0-1:4 >----< 1| aaa: Int, -[Domain] = 0:0-3:5 +[Domain] = 0:0-3:6 >-------- 0| def foo( 1| aaa: Int, 2| bbb: Int -3| ) = x - -----< +3| ) = {} + ------< [Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/scala/argumentList/argumentList.formal.singleLine.scope b/data/fixtures/scopes/scala/argumentList/argumentList.formal.singleLine.scope index d09bab3082..ac167ea363 100644 --- a/data/fixtures/scopes/scala/argumentList/argumentList.formal.singleLine.scope +++ b/data/fixtures/scopes/scala/argumentList/argumentList.formal.singleLine.scope @@ -1,13 +1,13 @@ -def foo(aaa: Int, bbb: Int) = x +def foo(aaa: Int, bbb: Int) = {} --- [Content] = [Removal] = 0:8-0:26 >------------------< -0| def foo(aaa: Int, bbb: Int) = x +0| def foo(aaa: Int, bbb: Int) = {} -[Domain] = 0:0-0:31 - >-------------------------------< -0| def foo(aaa: Int, bbb: Int) = x +[Domain] = 0:0-0:32 + >--------------------------------< +0| def foo(aaa: Int, bbb: Int) = {} [Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/scala/ifStatement.scope b/data/fixtures/scopes/scala/ifStatement.scope index 2a457b4ea7..14f2507621 100644 --- a/data/fixtures/scopes/scala/ifStatement.scope +++ b/data/fixtures/scopes/scala/ifStatement.scope @@ -1,17 +1,15 @@ -val test = if (true) true else false +if (true) {} +else if (false) {} +else {} --- [Content] = -[Domain] = 0:11-0:36 - >-------------------------< -0| val test = if (true) true else false - -[Removal] = 0:10-0:36 - >--------------------------< -0| val test = if (true) true else false - -[Leading delimiter] = 0:10-0:11 - >-< -0| val test = if (true) true else false +[Removal] = +[Domain] = 0:0-2:7 + >------------ +0| if (true) {} +1| else if (false) {} +2| else {} + -------< [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/scala/ifStatement2.scope b/data/fixtures/scopes/scala/ifStatement2.scope deleted file mode 100644 index 29f38a40d6..0000000000 --- a/data/fixtures/scopes/scala/ifStatement2.scope +++ /dev/null @@ -1,31 +0,0 @@ -val test = if (true) { - true -} else { - false -} ---- - -[Content] = -[Domain] = 0:11-4:1 - >----------- -0| val test = if (true) { -1| true -2| } else { -3| false -4| } - -< - -[Removal] = 0:10-4:1 - >------------ -0| val test = if (true) { -1| true -2| } else { -3| false -4| } - -< - -[Leading delimiter] = 0:10-0:11 - >-< -0| val test = if (true) { - -[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/scm/functionCall.scope b/data/fixtures/scopes/scm/functionCall.scope index 9f69fa6ea4..5a7317edf2 100644 --- a/data/fixtures/scopes/scm/functionCall.scope +++ b/data/fixtures/scopes/scm/functionCall.scope @@ -1,10 +1,10 @@ -(#not-parent-type? @statement variable_declaration) +(#foo!) --- [Content] = [Removal] = -[Domain] = 0:0-0:51 - >---------------------------------------------------< -0| (#not-parent-type? @statement variable_declaration) +[Domain] = 0:0-0:7 + >-------< +0| (#foo!) [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scm/functionCallee.scope b/data/fixtures/scopes/scm/functionCallee.scope index cad5277e94..49c295c458 100644 --- a/data/fixtures/scopes/scm/functionCallee.scope +++ b/data/fixtures/scopes/scm/functionCallee.scope @@ -1,17 +1,13 @@ -(#not-parent-type? @statement variable_declaration) +(#foo!) --- [Content] = -[Removal] = 0:2-0:18 - >----------------< -0| (#not-parent-type? @statement variable_declaration) +[Removal] = 0:2-0:6 + >----< +0| (#foo!) -[Trailing delimiter] = 0:18-0:19 - >-< -0| (#not-parent-type? @statement variable_declaration) - -[Domain] = 0:0-0:51 - >---------------------------------------------------< -0| (#not-parent-type? @statement variable_declaration) +[Domain] = 0:0-0:7 + >-------< +0| (#foo!) [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scm/list.scope b/data/fixtures/scopes/scm/list.scope index 86aea79532..d65e8a21de 100644 --- a/data/fixtures/scopes/scm/list.scope +++ b/data/fixtures/scopes/scm/list.scope @@ -1,35 +1,20 @@ -[ - (foo) - (bar) -] @list +[(aaa) (bbb)] @list --- -[Content] = 0:0-3:1 - >- -0| [ -1| (foo) -2| (bar) -3| ] @list - -< +[Content] = 0:0-0:13 + >-------------< +0| [(aaa) (bbb)] @list -[Removal] = 0:0-3:2 - >- -0| [ -1| (foo) -2| (bar) -3| ] @list - --< +[Removal] = 0:0-0:14 + >--------------< +0| [(aaa) (bbb)] @list -[Trailing delimiter] = 3:1-3:2 - >-< -3| ] @list +[Trailing delimiter] = 0:13-0:14 + >-< +0| [(aaa) (bbb)] @list -[Domain] = 0:0-3:7 - >- -0| [ -1| (foo) -2| (bar) -3| ] @list - -------< +[Domain] = 0:0-0:19 + >-------------------< +0| [(aaa) (bbb)] @list [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scm/statement.scope b/data/fixtures/scopes/scm/statement.scope index 72bcfa7548..7d1783afac 100644 --- a/data/fixtures/scopes/scm/statement.scope +++ b/data/fixtures/scopes/scm/statement.scope @@ -1,10 +1,10 @@ -(aaa) @bbb +(foo) @bar --- [Content] = [Removal] = [Domain] = 0:0-0:10 >----------< -0| (aaa) @bbb +0| (foo) @bar [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/scm/string.singleLine.scope b/data/fixtures/scopes/scm/string.singleLine.scope index 7dab95d697..4b26cf31b3 100644 --- a/data/fixtures/scopes/scm/string.singleLine.scope +++ b/data/fixtures/scopes/scm/string.singleLine.scope @@ -1,10 +1,10 @@ -"hello world" +"Hello world" --- [Content] = [Removal] = [Domain] = 0:0-0:13 >-------------< -0| "hello world" +0| "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scss/argument.actual.iteration.scope b/data/fixtures/scopes/scss/argument.actual.iteration.scope index 7def4e4cd4..161ebd22d0 100644 --- a/data/fixtures/scopes/scss/argument.actual.iteration.scope +++ b/data/fixtures/scopes/scss/argument.actual.iteration.scope @@ -1,10 +1,10 @@ -@mixin replace-text($image, $color: red) {} +@mixin foo($aaa, $bbb: 0) {} --- -[Content] = 0:20-0:39 - >-------------------< -0| @mixin replace-text($image, $color: red) {} +[Content] = 0:11-0:24 + >-------------< +0| @mixin foo($aaa, $bbb: 0) {} -[Domain] = 0:0-0:43 - >-------------------------------------------< -0| @mixin replace-text($image, $color: red) {} +[Domain] = 0:0-0:28 + >----------------------------< +0| @mixin foo($aaa, $bbb: 0) {} diff --git a/data/fixtures/scopes/scss/argument.actual.multiLine.scope b/data/fixtures/scopes/scss/argument.actual.multiLine.scope index 0e409a9ba7..f824d6a269 100644 --- a/data/fixtures/scopes/scss/argument.actual.multiLine.scope +++ b/data/fixtures/scopes/scss/argument.actual.multiLine.scope @@ -1,44 +1,44 @@ -@mixin replace-text( - $image, - $color: red +@mixin foo( + $aaa, + $bbb: 0 ) {} --- [#1 Content] = -[#1 Domain] = 1:4-1:10 - >------< -1| $image, +[#1 Domain] = 1:4-1:8 + >----< +1| $aaa, [#1 Removal] = 1:4-2:4 - >------- -1| $image, -2| $color: red + >----- +1| $aaa, +2| $bbb: 0 ----< -[#1 Trailing delimiter] = 1:10-2:4 - >- -1| $image, -2| $color: red +[#1 Trailing delimiter] = 1:8-2:4 + >- +1| $aaa, +2| $bbb: 0 ----< [#1 Insertion delimiter] = ",\n" [#2 Content] = -[#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 Domain] = 2:4-2:11 + >-------< +2| $bbb: 0 + +[#2 Removal] = 1:8-2:11 + >- +1| $aaa, +2| $bbb: 0 + -----------< + +[#2 Leading delimiter] = 1:8-2:4 + >- +1| $aaa, +2| $bbb: 0 ----< [#2 Insertion delimiter] = ",\n" diff --git a/data/fixtures/scopes/scss/argument.actual.singleLine.scope b/data/fixtures/scopes/scss/argument.actual.singleLine.scope index 13d5375618..5574232593 100644 --- a/data/fixtures/scopes/scss/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/scss/argument.actual.singleLine.scope @@ -1,33 +1,33 @@ -@mixin replace-text($image, $color: red) {} +@mixin foo($aaa, $bbb: 0) {} --- [#1 Content] = -[#1 Domain] = 0:20-0:26 - >------< -0| @mixin replace-text($image, $color: red) {} +[#1 Domain] = 0:11-0:15 + >----< +0| @mixin foo($aaa, $bbb: 0) {} -[#1 Removal] = 0:20-0:28 - >--------< -0| @mixin replace-text($image, $color: red) {} +[#1 Removal] = 0:11-0:17 + >------< +0| @mixin foo($aaa, $bbb: 0) {} -[#1 Trailing delimiter] = 0:26-0:28 - >--< -0| @mixin replace-text($image, $color: red) {} +[#1 Trailing delimiter] = 0:15-0:17 + >--< +0| @mixin foo($aaa, $bbb: 0) {} [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:28-0:39 - >-----------< -0| @mixin replace-text($image, $color: red) {} +[#2 Domain] = 0:17-0:24 + >-------< +0| @mixin foo($aaa, $bbb: 0) {} -[#2 Removal] = 0:26-0:39 - >-------------< -0| @mixin replace-text($image, $color: red) {} +[#2 Removal] = 0:15-0:24 + >---------< +0| @mixin foo($aaa, $bbb: 0) {} -[#2 Leading delimiter] = 0:26-0:28 - >--< -0| @mixin replace-text($image, $color: red) {} +[#2 Leading delimiter] = 0:15-0:17 + >--< +0| @mixin foo($aaa, $bbb: 0) {} [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/scss/branch.if.iteration.scope b/data/fixtures/scopes/scss/branch.if.iteration.scope index 12208a5972..2d6287d7d6 100644 --- a/data/fixtures/scopes/scss/branch.if.iteration.scope +++ b/data/fixtures/scopes/scss/branch.if.iteration.scope @@ -1,14 +1,14 @@ * { - @if true { } - @else if false { } - @else { } + @if true {} + @else if false {} + @else {} } --- [Content] = -[Domain] = 1:2-3:11 - >------------ -1| @if true { } -2| @else if false { } -3| @else { } - -----------< +[Domain] = 1:2-3:10 + >----------- +1| @if true {} +2| @else if false {} +3| @else {} + ----------< diff --git a/data/fixtures/scopes/scss/functionName.iteration.block.scope b/data/fixtures/scopes/scss/functionName.iteration.block.scope index 0013aa8c36..e806f801b4 100644 --- a/data/fixtures/scopes/scss/functionName.iteration.block.scope +++ b/data/fixtures/scopes/scss/functionName.iteration.block.scope @@ -1,13 +1,13 @@ -* { color: red; } +* { } --- [#1 Content] = -[#1 Domain] = 0:0-0:17 - >-----------------< -0| * { color: red; } +[#1 Domain] = 0:0-0:5 + >-----< +0| * { } [#2 Content] = -[#2 Domain] = 0:3-0:16 - >-------------< -0| * { color: red; } +[#2 Domain] = 0:3-0:4 + >-< +0| * { } diff --git a/data/fixtures/scopes/scss/functionName.iteration.document.scope b/data/fixtures/scopes/scss/functionName.iteration.document.scope index fe0f60629a..213d9c9e0f 100644 --- a/data/fixtures/scopes/scss/functionName.iteration.document.scope +++ b/data/fixtures/scopes/scss/functionName.iteration.document.scope @@ -1,18 +1,12 @@ -* { color: red; } +* {} --- -[#1 Content] = -[#1 Domain] = 0:0-2:0 +[Content] = +[Domain] = 0:0-2:0 > 0| -1| * { color: red; } +1| * {} 2| < - - -[#2 Content] = -[#2 Domain] = 1:3-1:16 - >-------------< -1| * { color: red; } diff --git a/data/fixtures/scopes/scss/functionName.scope b/data/fixtures/scopes/scss/functionName.scope index c587a9a695..4654c1769b 100644 --- a/data/fixtures/scopes/scss/functionName.scope +++ b/data/fixtures/scopes/scss/functionName.scope @@ -1,17 +1,17 @@ -@function calculate-margin($size) {} +@function foo() {} --- [Content] = -[Removal] = 0:10-0:26 - >----------------< -0| @function calculate-margin($size) {} +[Removal] = 0:10-0:13 + >---< +0| @function foo() {} [Leading delimiter] = 0:9-0:10 >-< -0| @function calculate-margin($size) {} +0| @function foo() {} -[Domain] = 0:0-0:36 - >------------------------------------< -0| @function calculate-margin($size) {} +[Domain] = 0:0-0:18 + >------------------< +0| @function foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scss/functionName2.scope b/data/fixtures/scopes/scss/functionName2.scope index b11d5d5dab..c1ab2ffbe9 100644 --- a/data/fixtures/scopes/scss/functionName2.scope +++ b/data/fixtures/scopes/scss/functionName2.scope @@ -1,17 +1,17 @@ -@mixin replace-text($image, $color: red) {} +@mixin foo() {} --- [Content] = -[Removal] = 0:7-0:19 - >------------< -0| @mixin replace-text($image, $color: red) {} +[Removal] = 0:7-0:10 + >---< +0| @mixin foo() {} [Leading delimiter] = 0:6-0:7 >-< -0| @mixin replace-text($image, $color: red) {} +0| @mixin foo() {} -[Domain] = 0:0-0:43 - >-------------------------------------------< -0| @mixin replace-text($image, $color: red) {} +[Domain] = 0:0-0:15 + >---------------< +0| @mixin foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scss/ifStatement.scope b/data/fixtures/scopes/scss/ifStatement.scope index 2f093485ec..a824b037c7 100644 --- a/data/fixtures/scopes/scss/ifStatement.scope +++ b/data/fixtures/scopes/scss/ifStatement.scope @@ -1,15 +1,15 @@ -@if true { } -@else if false { } -@else { } +@if true {} +@else if false {} +@else {} --- [Content] = [Removal] = -[Domain] = 0:0-2:9 - >------------ -0| @if true { } -1| @else if false { } -2| @else { } - ---------< +[Domain] = 0:0-2:8 + >----------- +0| @if true {} +1| @else if false {} +2| @else {} + --------< [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 d0079c892b..c18c53156e 100644 --- a/data/fixtures/scopes/scss/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/scss/name.argument.formal.iteration.scope @@ -1,13 +1,13 @@ -@mixin replace-text($image, $color: red) {} +@mixin foo($aaa, $bbb: 0) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:43 - >-------------------------------------------< -0| @mixin replace-text($image, $color: red) {} +[#1 Domain] = 0:0-0:28 + >----------------------------< +0| @mixin foo($aaa, $bbb: 0) {} [#2 Content] = -[#2 Domain] = 0:20-0:39 - >-------------------< -0| @mixin replace-text($image, $color: red) {} +[#2 Domain] = 0:11-0:24 + >-------------< +0| @mixin foo($aaa, $bbb: 0) {} diff --git a/data/fixtures/scopes/scss/name.argument.formal.scope b/data/fixtures/scopes/scss/name.argument.formal.scope index 1d45bb8b31..72a50c1721 100644 --- a/data/fixtures/scopes/scss/name.argument.formal.scope +++ b/data/fixtures/scopes/scss/name.argument.formal.scope @@ -1,45 +1,45 @@ -@mixin replace-text($image, $color: red) {} +@mixin foo($aaa, $bbb: 0) {} --- [#1 Content] = -[#1 Removal] = 0:7-0:19 - >------------< -0| @mixin replace-text($image, $color: red) {} +[#1 Removal] = 0:7-0:10 + >---< +0| @mixin foo($aaa, $bbb: 0) {} [#1 Leading delimiter] = 0:6-0:7 >-< -0| @mixin replace-text($image, $color: red) {} +0| @mixin foo($aaa, $bbb: 0) {} -[#1 Domain] = 0:0-0:43 - >-------------------------------------------< -0| @mixin replace-text($image, $color: red) {} +[#1 Domain] = 0:0-0:28 + >----------------------------< +0| @mixin foo($aaa, $bbb: 0) {} [#1 Insertion delimiter] = " " [#2 Content] = [#2 Removal] = -[#2 Domain] = 0:20-0:26 - >------< -0| @mixin replace-text($image, $color: red) {} +[#2 Domain] = 0:11-0:15 + >----< +0| @mixin foo($aaa, $bbb: 0) {} [#2 Insertion delimiter] = " " -[#3 Content] = 0:28-0:34 - >------< -0| @mixin replace-text($image, $color: red) {} +[#3 Content] = 0:17-0:21 + >----< +0| @mixin foo($aaa, $bbb: 0) {} -[#3 Removal] = 0:27-0:34 - >-------< -0| @mixin replace-text($image, $color: red) {} +[#3 Removal] = 0:16-0:21 + >-----< +0| @mixin foo($aaa, $bbb: 0) {} -[#3 Leading delimiter] = 0:27-0:28 - >-< -0| @mixin replace-text($image, $color: red) {} +[#3 Leading delimiter] = 0:16-0:17 + >-< +0| @mixin foo($aaa, $bbb: 0) {} -[#3 Domain] = 0:28-0:39 - >-----------< -0| @mixin replace-text($image, $color: red) {} +[#3 Domain] = 0:17-0:24 + >-------< +0| @mixin foo($aaa, $bbb: 0) {} [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scss/name.function.scope b/data/fixtures/scopes/scss/name.function.scope index 29e2b977e5..4654c1769b 100644 --- a/data/fixtures/scopes/scss/name.function.scope +++ b/data/fixtures/scopes/scss/name.function.scope @@ -1,17 +1,17 @@ -@function calculate-margin() {} +@function foo() {} --- [Content] = -[Removal] = 0:10-0:26 - >----------------< -0| @function calculate-margin() {} +[Removal] = 0:10-0:13 + >---< +0| @function foo() {} [Leading delimiter] = 0:9-0:10 >-< -0| @function calculate-margin() {} +0| @function foo() {} -[Domain] = 0:0-0:31 - >-------------------------------< -0| @function calculate-margin() {} +[Domain] = 0:0-0:18 + >------------------< +0| @function foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scss/name.function2.scope b/data/fixtures/scopes/scss/name.function2.scope index 498ff99bde..c1ab2ffbe9 100644 --- a/data/fixtures/scopes/scss/name.function2.scope +++ b/data/fixtures/scopes/scss/name.function2.scope @@ -1,17 +1,17 @@ -@mixin replace-text() {} +@mixin foo() {} --- [Content] = -[Removal] = 0:7-0:19 - >------------< -0| @mixin replace-text() {} +[Removal] = 0:7-0:10 + >---< +0| @mixin foo() {} [Leading delimiter] = 0:6-0:7 >-< -0| @mixin replace-text() {} +0| @mixin foo() {} -[Domain] = 0:0-0:24 - >------------------------< -0| @mixin replace-text() {} +[Domain] = 0:0-0:15 + >---------------< +0| @mixin foo() {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scss/namedFunction.iteration.block.scope b/data/fixtures/scopes/scss/namedFunction.iteration.block.scope index 0013aa8c36..e806f801b4 100644 --- a/data/fixtures/scopes/scss/namedFunction.iteration.block.scope +++ b/data/fixtures/scopes/scss/namedFunction.iteration.block.scope @@ -1,13 +1,13 @@ -* { color: red; } +* { } --- [#1 Content] = -[#1 Domain] = 0:0-0:17 - >-----------------< -0| * { color: red; } +[#1 Domain] = 0:0-0:5 + >-----< +0| * { } [#2 Content] = -[#2 Domain] = 0:3-0:16 - >-------------< -0| * { color: red; } +[#2 Domain] = 0:3-0:4 + >-< +0| * { } diff --git a/data/fixtures/scopes/scss/namedFunction.iteration.document.scope b/data/fixtures/scopes/scss/namedFunction.iteration.document.scope index fe0f60629a..213d9c9e0f 100644 --- a/data/fixtures/scopes/scss/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/scss/namedFunction.iteration.document.scope @@ -1,18 +1,12 @@ -* { color: red; } +* {} --- -[#1 Content] = -[#1 Domain] = 0:0-2:0 +[Content] = +[Domain] = 0:0-2:0 > 0| -1| * { color: red; } +1| * {} 2| < - - -[#2 Content] = -[#2 Domain] = 1:3-1:16 - >-------------< -1| * { color: red; } diff --git a/data/fixtures/scopes/scss/namedFunction.scope b/data/fixtures/scopes/scss/namedFunction.scope index 27e20ca551..de22cc7fa5 100644 --- a/data/fixtures/scopes/scss/namedFunction.scope +++ b/data/fixtures/scopes/scss/namedFunction.scope @@ -1,10 +1,10 @@ -@function calculate-margin($size) {} +@function foo() {} --- [Content] = [Removal] = -[Domain] = 0:0-0:36 - >------------------------------------< -0| @function calculate-margin($size) {} +[Domain] = 0:0-0:18 + >------------------< +0| @function foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/scss/namedFunction2.scope b/data/fixtures/scopes/scss/namedFunction2.scope index ac00d85480..1f26ec9c8c 100644 --- a/data/fixtures/scopes/scss/namedFunction2.scope +++ b/data/fixtures/scopes/scss/namedFunction2.scope @@ -1,10 +1,10 @@ -@mixin replace-text($image, $color: red) {} +@mixin foo() {} --- [Content] = [Removal] = -[Domain] = 0:0-0:43 - >-------------------------------------------< -0| @mixin replace-text($image, $color: red) {} +[Domain] = 0:0-0:15 + >---------------< +0| @mixin foo() {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/scss/value.argument.formal.iteration.scope b/data/fixtures/scopes/scss/value.argument.formal.iteration.scope index d0079c892b..b541094b33 100644 --- a/data/fixtures/scopes/scss/value.argument.formal.iteration.scope +++ b/data/fixtures/scopes/scss/value.argument.formal.iteration.scope @@ -1,13 +1,13 @@ -@mixin replace-text($image, $color: red) {} +@mixin foo($aaa: 0, $bbb: 1) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:43 - >-------------------------------------------< -0| @mixin replace-text($image, $color: red) {} +[#1 Domain] = 0:0-0:31 + >-------------------------------< +0| @mixin foo($aaa: 0, $bbb: 1) {} [#2 Content] = -[#2 Domain] = 0:20-0:39 - >-------------------< -0| @mixin replace-text($image, $color: red) {} +[#2 Domain] = 0:11-0:27 + >----------------< +0| @mixin foo($aaa: 0, $bbb: 1) {} diff --git a/data/fixtures/scopes/scss/value.argument.formal.scope b/data/fixtures/scopes/scss/value.argument.formal.scope index ac78d9e69a..b15674a9ce 100644 --- a/data/fixtures/scopes/scss/value.argument.formal.scope +++ b/data/fixtures/scopes/scss/value.argument.formal.scope @@ -1,20 +1,39 @@ -@mixin replace-text($image, $color: red) {} +@mixin foo($aaa: 0, $bbb: 1) {} --- -[Content] = 0:36-0:39 - >---< -0| @mixin replace-text($image, $color: red) {} +[#1 Content] = 0:17-0:18 + >-< +0| @mixin foo($aaa: 0, $bbb: 1) {} -[Removal] = 0:35-0:39 - >----< -0| @mixin replace-text($image, $color: red) {} +[#1 Removal] = 0:16-0:18 + >--< +0| @mixin foo($aaa: 0, $bbb: 1) {} -[Leading delimiter] = 0:35-0:36 - >-< -0| @mixin replace-text($image, $color: red) {} +[#1 Leading delimiter] = 0:16-0:17 + >-< +0| @mixin foo($aaa: 0, $bbb: 1) {} -[Domain] = 0:28-0:39 - >-----------< -0| @mixin replace-text($image, $color: red) {} +[#1 Domain] = 0:11-0:18 + >-------< +0| @mixin foo($aaa: 0, $bbb: 1) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:26-0:27 + >-< +0| @mixin foo($aaa: 0, $bbb: 1) {} + +[#2 Removal] = 0:25-0:27 + >--< +0| @mixin foo($aaa: 0, $bbb: 1) {} + +[#2 Leading delimiter] = 0:25-0:26 + >-< +0| @mixin foo($aaa: 0, $bbb: 1) {} + +[#2 Domain] = 0:20-0:27 + >-------< +0| @mixin foo($aaa: 0, $bbb: 1) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/scss/value.return.scope b/data/fixtures/scopes/scss/value.return.scope index 147dfef9aa..68e2761d2a 100644 --- a/data/fixtures/scopes/scss/value.return.scope +++ b/data/fixtures/scopes/scss/value.return.scope @@ -1,22 +1,22 @@ -@function double($num) { - @return $num * 2; +@function foo() { + @return 0; } --- -[Content] = 1:10-1:18 - >--------< -1| @return $num * 2; +[Content] = 1:10-1:11 + >-< +1| @return 0; -[Removal] = 1:9-1:18 - >---------< -1| @return $num * 2; +[Removal] = 1:9-1:11 + >--< +1| @return 0; [Leading delimiter] = 1:9-1:10 >-< -1| @return $num * 2; +1| @return 0; -[Domain] = 1:2-1:19 - >-----------------< -1| @return $num * 2; +[Domain] = 1:2-1:12 + >----------< +1| @return 0; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope b/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope index d0371d49a9..e369e58d41 100644 --- a/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope @@ -1,10 +1,10 @@ -command: user.do_something(123, 456) +command: user.foo(aaa, bbb) --- -[Content] = 0:27-0:35 - >--------< -0| command: user.do_something(123, 456) +[Content] = 0:18-0:26 + >--------< +0| command: user.foo(aaa, bbb) -[Domain] = 0:9-0:36 - >---------------------------< -0| command: user.do_something(123, 456) +[Domain] = 0:9-0:27 + >------------------< +0| command: user.foo(aaa, bbb) diff --git a/data/fixtures/scopes/talon/argument/argument.actual.singleLine.scope b/data/fixtures/scopes/talon/argument/argument.actual.singleLine.scope index a1e82496d0..3e9361db4a 100644 --- a/data/fixtures/scopes/talon/argument/argument.actual.singleLine.scope +++ b/data/fixtures/scopes/talon/argument/argument.actual.singleLine.scope @@ -1,33 +1,33 @@ -command: user.do_something(123, 456) +command: user.foo(aaa, bbb) --- [#1 Content] = -[#1 Domain] = 0:27-0:30 - >---< -0| command: user.do_something(123, 456) +[#1 Domain] = 0:18-0:21 + >---< +0| command: user.foo(aaa, bbb) -[#1 Removal] = 0:27-0:32 - >-----< -0| command: user.do_something(123, 456) +[#1 Removal] = 0:18-0:23 + >-----< +0| command: user.foo(aaa, bbb) -[#1 Trailing delimiter] = 0:30-0:32 - >--< -0| command: user.do_something(123, 456) +[#1 Trailing delimiter] = 0:21-0:23 + >--< +0| command: user.foo(aaa, bbb) [#1 Insertion delimiter] = ", " [#2 Content] = -[#2 Domain] = 0:32-0:35 - >---< -0| command: user.do_something(123, 456) +[#2 Domain] = 0:23-0:26 + >---< +0| command: user.foo(aaa, bbb) -[#2 Removal] = 0:30-0:35 - >-----< -0| command: user.do_something(123, 456) +[#2 Removal] = 0:21-0:26 + >-----< +0| command: user.foo(aaa, bbb) -[#2 Leading delimiter] = 0:30-0:32 - >--< -0| command: user.do_something(123, 456) +[#2 Leading delimiter] = 0:21-0:23 + >--< +0| command: user.foo(aaa, bbb) [#2 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/talon/command.scope b/data/fixtures/scopes/talon/command.scope index 7f114b88bb..e9b8721b33 100644 --- a/data/fixtures/scopes/talon/command.scope +++ b/data/fixtures/scopes/talon/command.scope @@ -1,13 +1,10 @@ -press {user.key}: - key(key) +foo: "bar" --- [Content] = [Removal] = -[Domain] = 0:0-1:12 - >----------------- -0| press {user.key}: -1| key(key) - ------------< +[Domain] = 0:0-0:10 + >----------< +0| foo: "bar" [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/talon/command2.scope b/data/fixtures/scopes/talon/command2.scope new file mode 100644 index 0000000000..1d14dfcc47 --- /dev/null +++ b/data/fixtures/scopes/talon/command2.scope @@ -0,0 +1,10 @@ +press {user.key}: key(key) +--- + +[Content] = +[Removal] = +[Domain] = 0:0-0:26 + >--------------------------< +0| press {user.key}: key(key) + +[Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/talon/interior.command.scope b/data/fixtures/scopes/talon/interior.command.scope index 3b1f340e92..415e113c23 100644 --- a/data/fixtures/scopes/talon/interior.command.scope +++ b/data/fixtures/scopes/talon/interior.command.scope @@ -1,16 +1,16 @@ -do something: - a = 2 +command: + foo = 0 --- [Content] = -[Removal] = 1:4-1:9 - >-----< -1| a = 2 +[Removal] = 1:4-1:11 + >-------< +1| foo = 0 -[Domain] = 0:0-1:9 - >------------- -0| do something: -1| a = 2 - ---------< +[Domain] = 0:0-1:11 + >-------- +0| command: +1| foo = 0 + -----------< [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope b/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope index 08a1ebcdeb..aeb51b12f4 100644 --- a/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope +++ b/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope @@ -1,22 +1,22 @@ -foo: "bar" -baz: "bongo" +aaa: "0" +bbb: "1" --- [#1 Content] = -[#1 Domain] = 0:0-1:12 - >---------- -0| foo: "bar" -1| baz: "bongo" - ------------< +[#1 Domain] = 0:0-1:8 + >-------- +0| aaa: "0" +1| bbb: "1" + --------< [#2 Content] = -[#2 Domain] = 0:5-0:10 - >-----< -0| foo: "bar" +[#2 Domain] = 0:5-0:8 + >---< +0| aaa: "0" [#3 Content] = -[#3 Domain] = 1:5-1:12 - >-------< -1| baz: "bongo" +[#3 Domain] = 1:5-1:8 + >---< +1| bbb: "1" diff --git a/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope b/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope index 03b469027d..f71b46a982 100644 --- a/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope +++ b/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope @@ -1,20 +1,20 @@ settings(): - foo = 0 - bar = 0 + aaa = 0 + bbb = 1 --- [#1 Content] = [#1 Domain] = 0:0-2:11 >----------- 0| settings(): -1| foo = 0 -2| bar = 0 +1| aaa = 0 +2| bbb = 1 -----------< [#2 Content] = [#2 Domain] = 1:4-2:11 >------- -1| foo = 0 -2| bar = 0 +1| aaa = 0 +2| bbb = 1 -----------< diff --git a/data/fixtures/scopes/talon/key/key.mapPair.scope b/data/fixtures/scopes/talon/key/key.mapPair.scope index 6e9d91f6cf..9ffa1aec08 100644 --- a/data/fixtures/scopes/talon/key/key.mapPair.scope +++ b/data/fixtures/scopes/talon/key/key.mapPair.scope @@ -1,14 +1,27 @@ not mode: command +tag: browser - --- -[Content] = -[Removal] = 0:0-0:8 +[#1 Content] = +[#1 Removal] = 0:0-0:8 >--------< 0| not mode: command -[Domain] = 0:0-0:17 +[#1 Domain] = 0:0-0:17 >-----------------< 0| not mode: command -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = +[#2 Removal] = 1:0-1:3 + >---< +1| tag: browser + +[#2 Domain] = 1:0-1:12 + >------------< +1| tag: browser + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/key/key.mapPair2.scope b/data/fixtures/scopes/talon/key/key.mapPair2.scope index 5837b42ede..6442048e15 100644 --- a/data/fixtures/scopes/talon/key/key.mapPair2.scope +++ b/data/fixtures/scopes/talon/key/key.mapPair2.scope @@ -1,13 +1,26 @@ -foo: "bar" +aaa: "0" +bbb: "1" --- -[Content] = -[Removal] = 0:0-0:3 +[#1 Content] = +[#1 Removal] = 0:0-0:3 >---< -0| foo: "bar" +0| aaa: "0" -[Domain] = 0:0-0:10 - >----------< -0| foo: "bar" +[#1 Domain] = 0:0-0:8 + >--------< +0| aaa: "0" -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = +[#2 Removal] = 1:0-1:3 + >---< +1| bbb: "1" + +[#2 Domain] = 1:0-1:8 + >--------< +1| bbb: "1" + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/key/key.mapPair3.scope b/data/fixtures/scopes/talon/key/key.mapPair3.scope index 9a3ffb388b..b25decb153 100644 --- a/data/fixtures/scopes/talon/key/key.mapPair3.scope +++ b/data/fixtures/scopes/talon/key/key.mapPair3.scope @@ -1,5 +1,6 @@ settings(): - foo = 0 + aaa = 0 + bbb = 1 --- [#1 Content] = @@ -7,10 +8,11 @@ settings(): >----------< 0| settings(): -[#1 Domain] = 0:0-1:11 +[#1 Domain] = 0:0-2:11 >----------- 0| settings(): -1| foo = 0 +1| aaa = 0 +2| bbb = 1 -----------< [#1 Insertion delimiter] = " " @@ -18,22 +20,45 @@ settings(): [#2 Content] = 1:4-1:7 >---< -1| foo = 0 +1| aaa = 0 [#2 Removal] = 1:4-1:8 >----< -1| foo = 0 +1| aaa = 0 [#2 Leading delimiter] = 1:0-1:4 >----< -1| foo = 0 +1| aaa = 0 [#2 Trailing delimiter] = 1:7-1:8 >-< -1| foo = 0 +1| aaa = 0 [#2 Domain] = 1:4-1:11 >-------< -1| foo = 0 +1| aaa = 0 [#2 Insertion delimiter] = " " + + +[#3 Content] = 2:4-2:7 + >---< +2| bbb = 1 + +[#3 Removal] = 2:4-2:8 + >----< +2| bbb = 1 + +[#3 Leading delimiter] = 2:0-2:4 + >----< +2| bbb = 1 + +[#3 Trailing delimiter] = 2:7-2:8 + >-< +2| bbb = 1 + +[#3 Domain] = 2:4-2:11 + >-------< +2| bbb = 1 + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/name/name.assignment.scope b/data/fixtures/scopes/talon/name/name.assignment.scope index 30d3997d69..3cddd75f61 100644 --- a/data/fixtures/scopes/talon/name/name.assignment.scope +++ b/data/fixtures/scopes/talon/name/name.assignment.scope @@ -1,5 +1,5 @@ command: - value = 123 + foo = 0 --- [#1 Content] = @@ -7,33 +7,33 @@ command: >-------< 0| command: -[#1 Domain] = 0:0-1:15 +[#1 Domain] = 0:0-1:11 >-------- 0| command: -1| value = 123 - ---------------< +1| foo = 0 + -----------< [#1 Insertion delimiter] = " " -[#2 Content] = 1:4-1:9 - >-----< -1| value = 123 +[#2 Content] = 1:4-1:7 + >---< +1| foo = 0 -[#2 Removal] = 1:4-1:10 - >------< -1| value = 123 +[#2 Removal] = 1:4-1:8 + >----< +1| foo = 0 [#2 Leading delimiter] = 1:0-1:4 >----< -1| value = 123 +1| foo = 0 -[#2 Trailing delimiter] = 1:9-1:10 - >-< -1| value = 123 +[#2 Trailing delimiter] = 1:7-1:8 + >-< +1| foo = 0 -[#2 Domain] = 1:4-1:15 - >-----------< -1| value = 123 +[#2 Domain] = 1:4-1:11 + >-------< +1| foo = 0 [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/name/name.iteration.block.scope b/data/fixtures/scopes/talon/name/name.iteration.block.scope index 4ff90b6702..886736d230 100644 --- a/data/fixtures/scopes/talon/name/name.iteration.block.scope +++ b/data/fixtures/scopes/talon/name/name.iteration.block.scope @@ -1,13 +1,13 @@ -hello: "world" +foo: "bar" --- [#1 Content] = -[#1 Domain] = 0:0-0:14 - >--------------< -0| hello: "world" +[#1 Domain] = 0:0-0:10 + >----------< +0| foo: "bar" [#2 Content] = -[#2 Domain] = 0:7-0:14 - >-------< -0| hello: "world" +[#2 Domain] = 0:5-0:10 + >-----< +0| foo: "bar" diff --git a/data/fixtures/scopes/talon/name/name.iteration.block3.scope b/data/fixtures/scopes/talon/name/name.iteration.block3.scope index d16fad671e..ad8c49fb34 100644 --- a/data/fixtures/scopes/talon/name/name.iteration.block3.scope +++ b/data/fixtures/scopes/talon/name/name.iteration.block3.scope @@ -1,10 +1,7 @@ mode: command - -hello: "world" - -settings(): - foo = 0 +tag(): browser --- [#1 Content] = @@ -14,35 +11,16 @@ settings(): [#2 Content] = -[#2 Domain] = 0:0-6:11 +[#2 Domain] = 0:0-3:14 >------------- 0| mode: command 1| - 2| -3| hello: "world" -4| -5| settings(): -6| foo = 0 - -----------< +3| tag(): browser + --------------< [#3 Content] = -[#3 Domain] = 3:0-6:11 - >-------------- -3| hello: "world" -4| -5| settings(): -6| foo = 0 - -----------< - - -[#4 Content] = -[#4 Domain] = 3:7-3:14 - >-------< -3| hello: "world" - - -[#5 Content] = -[#5 Domain] = 6:4-6:11 - >-------< -6| foo = 0 +[#3 Domain] = 3:0-3:14 + >--------------< +3| tag(): browser diff --git a/data/fixtures/scopes/talon/statement.iteration.block.scope b/data/fixtures/scopes/talon/statement.iteration.block.scope index bfff6c9360..02bd0ff62b 100644 --- a/data/fixtures/scopes/talon/statement.iteration.block.scope +++ b/data/fixtures/scopes/talon/statement.iteration.block.scope @@ -1,16 +1,16 @@ command: - value = 123 + foo = 0 --- [#1 Content] = -[#1 Domain] = 0:0-1:15 +[#1 Domain] = 0:0-1:11 >-------- 0| command: -1| value = 123 - ---------------< +1| foo = 0 + -----------< [#2 Content] = -[#2 Domain] = 1:4-1:15 - >-----------< -1| value = 123 +[#2 Domain] = 1:4-1:11 + >-------< +1| foo = 0 diff --git a/data/fixtures/scopes/talon/statement.iteration.document.scope b/data/fixtures/scopes/talon/statement.iteration.document.scope index bf2f7f69c1..4f2f9d36f6 100644 --- a/data/fixtures/scopes/talon/statement.iteration.document.scope +++ b/data/fixtures/scopes/talon/statement.iteration.document.scope @@ -1,20 +1,12 @@ -command: - value = 123 +tag(): browser --- -[#1 Content] = -[#1 Domain] = 0:0-3:0 +[Content] = +[Domain] = 0:0-2:0 > 0| -1| command: -2| value = 123 -3| +1| tag(): browser +2| < - - -[#2 Content] = -[#2 Domain] = 2:4-2:15 - >-----------< -2| value = 123 diff --git a/data/fixtures/scopes/talon/statement.scope b/data/fixtures/scopes/talon/statement.scope index cbece6d612..6a5a9a2ff7 100644 --- a/data/fixtures/scopes/talon/statement.scope +++ b/data/fixtures/scopes/talon/statement.scope @@ -1,26 +1,31 @@ -command: user.do_something() +command: + foo = 0 --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 0:0-0:28 - >----------------------------< -0| command: user.do_something() +[#1 Domain] = 0:0-1:11 + >-------- +0| command: +1| foo = 0 + -----------< [#1 Insertion delimiter] = "\n" [#2 Content] = -[#2 Domain] = 0:9-0:28 - >-------------------< -0| command: user.do_something() +[#2 Domain] = 1:4-1:11 + >-------< +1| foo = 0 -[#2 Removal] = 0:8-0:28 - >--------------------< -0| command: user.do_something() +[#2 Removal] = 0:8-1:11 + > +0| command: +1| foo = 0 + -----------< -[#2 Leading delimiter] = 0:8-0:9 - >-< -0| command: user.do_something() +[#2 Leading delimiter] = 1:0-1:4 + >----< +1| foo = 0 [#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/talon/string.singleLine.scope b/data/fixtures/scopes/talon/string.singleLine.scope index c4fe6b178e..65c16cc2c1 100644 --- a/data/fixtures/scopes/talon/string.singleLine.scope +++ b/data/fixtures/scopes/talon/string.singleLine.scope @@ -1,17 +1,17 @@ -test: "foo" +command: "Hello world" --- [Content] = -[Domain] = 0:6-0:11 - >-----< -0| test: "foo" +[Domain] = 0:9-0:22 + >-------------< +0| command: "Hello world" -[Removal] = 0:5-0:11 - >------< -0| test: "foo" +[Removal] = 0:8-0:22 + >--------------< +0| command: "Hello world" -[Leading delimiter] = 0:5-0:6 - >-< -0| test: "foo" +[Leading delimiter] = 0:8-0:9 + >-< +0| command: "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/string.singleLine2.scope b/data/fixtures/scopes/talon/string.singleLine2.scope index ad2068c1cf..b64ee27ca0 100644 --- a/data/fixtures/scopes/talon/string.singleLine2.scope +++ b/data/fixtures/scopes/talon/string.singleLine2.scope @@ -1,17 +1,17 @@ -test: 'foo' +command: 'Hello world' --- [Content] = -[Domain] = 0:6-0:11 - >-----< -0| test: 'foo' +[Domain] = 0:9-0:22 + >-------------< +0| command: 'Hello world' -[Removal] = 0:5-0:11 - >------< -0| test: 'foo' +[Removal] = 0:8-0:22 + >--------------< +0| command: 'Hello world' -[Leading delimiter] = 0:5-0:6 - >-< -0| test: 'foo' +[Leading delimiter] = 0:8-0:9 + >-< +0| command: 'Hello world' [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/textFragment.string.singleLine.scope b/data/fixtures/scopes/talon/textFragment.string.singleLine.scope index 4a97704494..a4fb714434 100644 --- a/data/fixtures/scopes/talon/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/talon/textFragment.string.singleLine.scope @@ -1,10 +1,10 @@ -test: "foo" +command: "Hello world" --- [Content] = [Removal] = -[Domain] = 0:7-0:10 - >---< -0| test: "foo" +[Domain] = 0:10-0:21 + >-----------< +0| command: "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/textFragment.string.singleLine2.scope b/data/fixtures/scopes/talon/textFragment.string.singleLine2.scope index 00b7eb724f..b1afe96fcb 100644 --- a/data/fixtures/scopes/talon/textFragment.string.singleLine2.scope +++ b/data/fixtures/scopes/talon/textFragment.string.singleLine2.scope @@ -1,10 +1,10 @@ -test: 'foo' +command: 'Hello world' --- [Content] = [Removal] = -[Domain] = 0:7-0:10 - >---< -0| test: 'foo' +[Domain] = 0:10-0:21 + >-----------< +0| command: 'Hello world' [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/value/value.iteration.block.scope b/data/fixtures/scopes/talon/value/value.iteration.block.scope index 4ff90b6702..886736d230 100644 --- a/data/fixtures/scopes/talon/value/value.iteration.block.scope +++ b/data/fixtures/scopes/talon/value/value.iteration.block.scope @@ -1,13 +1,13 @@ -hello: "world" +foo: "bar" --- [#1 Content] = -[#1 Domain] = 0:0-0:14 - >--------------< -0| hello: "world" +[#1 Domain] = 0:0-0:10 + >----------< +0| foo: "bar" [#2 Content] = -[#2 Domain] = 0:7-0:14 - >-------< -0| hello: "world" +[#2 Domain] = 0:5-0:10 + >-----< +0| foo: "bar" diff --git a/data/fixtures/scopes/talon/value/value.iteration.block3.scope b/data/fixtures/scopes/talon/value/value.iteration.block3.scope index d16fad671e..ad8c49fb34 100644 --- a/data/fixtures/scopes/talon/value/value.iteration.block3.scope +++ b/data/fixtures/scopes/talon/value/value.iteration.block3.scope @@ -1,10 +1,7 @@ mode: command - -hello: "world" - -settings(): - foo = 0 +tag(): browser --- [#1 Content] = @@ -14,35 +11,16 @@ settings(): [#2 Content] = -[#2 Domain] = 0:0-6:11 +[#2 Domain] = 0:0-3:14 >------------- 0| mode: command 1| - 2| -3| hello: "world" -4| -5| settings(): -6| foo = 0 - -----------< +3| tag(): browser + --------------< [#3 Content] = -[#3 Domain] = 3:0-6:11 - >-------------- -3| hello: "world" -4| -5| settings(): -6| foo = 0 - -----------< - - -[#4 Content] = -[#4 Domain] = 3:7-3:14 - >-------< -3| hello: "world" - - -[#5 Content] = -[#5 Domain] = 6:4-6:11 - >-------< -6| foo = 0 +[#3 Domain] = 3:0-3:14 + >--------------< +3| tag(): browser diff --git a/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope b/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope index 08a1ebcdeb..aeb51b12f4 100644 --- a/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope +++ b/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope @@ -1,22 +1,22 @@ -foo: "bar" -baz: "bongo" +aaa: "0" +bbb: "1" --- [#1 Content] = -[#1 Domain] = 0:0-1:12 - >---------- -0| foo: "bar" -1| baz: "bongo" - ------------< +[#1 Domain] = 0:0-1:8 + >-------- +0| aaa: "0" +1| bbb: "1" + --------< [#2 Content] = -[#2 Domain] = 0:5-0:10 - >-----< -0| foo: "bar" +[#2 Domain] = 0:5-0:8 + >---< +0| aaa: "0" [#3 Content] = -[#3 Domain] = 1:5-1:12 - >-------< -1| baz: "bongo" +[#3 Domain] = 1:5-1:8 + >---< +1| bbb: "1" diff --git a/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope b/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope index 03b469027d..f71b46a982 100644 --- a/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope +++ b/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope @@ -1,20 +1,20 @@ settings(): - foo = 0 - bar = 0 + aaa = 0 + bbb = 1 --- [#1 Content] = [#1 Domain] = 0:0-2:11 >----------- 0| settings(): -1| foo = 0 -2| bar = 0 +1| aaa = 0 +2| bbb = 1 -----------< [#2 Content] = [#2 Domain] = 1:4-2:11 >------- -1| foo = 0 -2| bar = 0 +1| aaa = 0 +2| bbb = 1 -----------< diff --git a/data/fixtures/scopes/talon/value/value.mapPair.scope b/data/fixtures/scopes/talon/value/value.mapPair.scope index e263c7bbd9..536e1e2ca0 100644 --- a/data/fixtures/scopes/talon/value/value.mapPair.scope +++ b/data/fixtures/scopes/talon/value/value.mapPair.scope @@ -1,21 +1,41 @@ not mode: command +tag: browser - --- -[Content] = 0:10-0:17 +[#1 Content] = 0:10-0:17 >-------< 0| not mode: command -[Removal] = 0:9-0:17 +[#1 Removal] = 0:9-0:17 >--------< 0| not mode: command -[Leading delimiter] = 0:9-0:10 +[#1 Leading delimiter] = 0:9-0:10 >-< 0| not mode: command -[Domain] = 0:0-0:17 +[#1 Domain] = 0:0-0:17 >-----------------< 0| not mode: command -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 1:5-1:12 + >-------< +1| tag: browser + +[#2 Removal] = 1:4-1:12 + >--------< +1| tag: browser + +[#2 Leading delimiter] = 1:4-1:5 + >-< +1| tag: browser + +[#2 Domain] = 1:0-1:12 + >------------< +1| tag: browser + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/talon/value/value.mapPair2.scope b/data/fixtures/scopes/talon/value/value.mapPair2.scope index 0032aad70d..83acae3abe 100644 --- a/data/fixtures/scopes/talon/value/value.mapPair2.scope +++ b/data/fixtures/scopes/talon/value/value.mapPair2.scope @@ -1,25 +1,30 @@ settings(): - foo = 0 + aaa = 0 + bbb = 1 --- -[#1 Content] = 1:4-1:11 - >-------< -1| foo = 0 +[#1 Content] = 1:4-2:11 + >------- +1| aaa = 0 +2| bbb = 1 + -----------< -[#1 Removal] = 0:11-1:11 +[#1 Removal] = 0:11-2:11 > 0| settings(): -1| foo = 0 +1| aaa = 0 +2| bbb = 1 -----------< [#1 Leading delimiter] = 1:0-1:4 >----< -1| foo = 0 +1| aaa = 0 -[#1 Domain] = 0:0-1:11 +[#1 Domain] = 0:0-2:11 >----------- 0| settings(): -1| foo = 0 +1| aaa = 0 +2| bbb = 1 -----------< [#1 Insertion delimiter] = " " @@ -27,18 +32,37 @@ settings(): [#2 Content] = 1:10-1:11 >-< -1| foo = 0 +1| aaa = 0 [#2 Removal] = 1:9-1:11 >--< -1| foo = 0 +1| aaa = 0 [#2 Leading delimiter] = 1:9-1:10 >-< -1| foo = 0 +1| aaa = 0 [#2 Domain] = 1:4-1:11 >-------< -1| foo = 0 +1| aaa = 0 [#2 Insertion delimiter] = " " + + +[#3 Content] = 2:10-2:11 + >-< +2| bbb = 1 + +[#3 Removal] = 2:9-2:11 + >--< +2| bbb = 1 + +[#3 Leading delimiter] = 2:9-2:10 + >-< +2| bbb = 1 + +[#3 Domain] = 2:4-2:11 + >-------< +2| bbb = 1 + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/argument.catch.scope b/data/fixtures/scopes/typescript.core/argument.catch.scope index 73aa502737..c99ab326ed 100644 --- a/data/fixtures/scopes/typescript.core/argument.catch.scope +++ b/data/fixtures/scopes/typescript.core/argument.catch.scope @@ -1,11 +1,11 @@ try {} -catch(error: unknown) {} +catch(e: unknown) {} --- [Content] = [Removal] = -[Domain] = 1:6-1:20 - >--------------< -1| catch(error: unknown) {} +[Domain] = 1:6-1:16 + >----------< +1| catch(e: unknown) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/class.scope b/data/fixtures/scopes/typescript.core/class.scope index c68e199ef9..14f277250d 100644 --- a/data/fixtures/scopes/typescript.core/class.scope +++ b/data/fixtures/scopes/typescript.core/class.scope @@ -1,10 +1,10 @@ -abstract class MyClass { } +abstract class Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:26 - >--------------------------< -0| abstract class MyClass { } +[Domain] = 0:0-0:21 + >---------------------< +0| abstract class Foo {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/typescript.core/class2.scope b/data/fixtures/scopes/typescript.core/class2.scope index 5b46f476c7..6dc3c2625d 100644 --- a/data/fixtures/scopes/typescript.core/class2.scope +++ b/data/fixtures/scopes/typescript.core/class2.scope @@ -1,10 +1,10 @@ -export default abstract class MyClass { } +export default abstract class Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:41 - >-----------------------------------------< -0| export default abstract class MyClass { } +[Domain] = 0:0-0:36 + >------------------------------------< +0| export default abstract class Foo {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/typescript.core/class3.scope b/data/fixtures/scopes/typescript.core/class3.scope index 104ca4a34f..4c476790db 100644 --- a/data/fixtures/scopes/typescript.core/class3.scope +++ b/data/fixtures/scopes/typescript.core/class3.scope @@ -1,10 +1,10 @@ -export abstract class MyClass { } +export abstract class Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:33 - >---------------------------------< -0| export abstract class MyClass { } +[Domain] = 0:0-0:28 + >----------------------------< +0| export abstract class Foo {} [Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/typescript.core/name/name.argument.formal.scope b/data/fixtures/scopes/typescript.core/name/name.argument.formal.scope index 9f9794e915..d07a115741 100644 --- a/data/fixtures/scopes/typescript.core/name/name.argument.formal.scope +++ b/data/fixtures/scopes/typescript.core/name/name.argument.formal.scope @@ -1,29 +1,45 @@ -function myFunk(value?: number = 2) { } +function foo(aaa?: number, bbb?: number = 0) {} --- [#1 Content] = -[#1 Removal] = 0:9-0:15 - >------< -0| function myFunk(value?: number = 2) { } +[#1 Removal] = 0:9-0:12 + >---< +0| function foo(aaa?: number, bbb?: number = 0) {} [#1 Leading delimiter] = 0:8-0:9 >-< -0| function myFunk(value?: number = 2) { } +0| function foo(aaa?: number, bbb?: number = 0) {} -[#1 Domain] = 0:0-0:39 - >---------------------------------------< -0| function myFunk(value?: number = 2) { } +[#1 Domain] = 0:0-0:47 + >-----------------------------------------------< +0| function foo(aaa?: number, bbb?: number = 0) {} [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:16-0:21 - >-----< -0| function myFunk(value?: number = 2) { } +[#2 Removal] = 0:13-0:16 + >---< +0| function foo(aaa?: number, bbb?: number = 0) {} -[#2 Domain] = 0:16-0:34 - >------------------< -0| function myFunk(value?: number = 2) { } +[#2 Domain] = 0:13-0:25 + >------------< +0| function foo(aaa?: number, bbb?: number = 0) {} [#2 Insertion delimiter] = " " + + +[#3 Content] = +[#3 Removal] = 0:27-0:30 + >---< +0| function foo(aaa?: number, bbb?: number = 0) {} + +[#3 Leading delimiter] = 0:26-0:27 + >-< +0| function foo(aaa?: number, bbb?: number = 0) {} + +[#3 Domain] = 0:27-0:43 + >----------------< +0| function foo(aaa?: number, bbb?: number = 0) {} + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/name/name.argument.formal2.scope b/data/fixtures/scopes/typescript.core/name/name.argument.formal2.scope new file mode 100644 index 0000000000..5716acb915 --- /dev/null +++ b/data/fixtures/scopes/typescript.core/name/name.argument.formal2.scope @@ -0,0 +1,29 @@ +function foo(...aaa: number[]) {} +--- + +[#1 Content] = +[#1 Removal] = 0:9-0:12 + >---< +0| function foo(...aaa: number[]) {} + +[#1 Leading delimiter] = 0:8-0:9 + >-< +0| function foo(...aaa: number[]) {} + +[#1 Domain] = 0:0-0:33 + >---------------------------------< +0| function foo(...aaa: number[]) {} + +[#1 Insertion delimiter] = " " + + +[#2 Content] = +[#2 Removal] = 0:16-0:19 + >---< +0| function foo(...aaa: number[]) {} + +[#2 Domain] = 0:13-0:29 + >----------------< +0| function foo(...aaa: number[]) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/name/name.field.class.scope b/data/fixtures/scopes/typescript.core/name/name.field.class.scope index 76e361de04..e1c039904a 100644 --- a/data/fixtures/scopes/typescript.core/name/name.field.class.scope +++ b/data/fixtures/scopes/typescript.core/name/name.field.class.scope @@ -1,105 +1,69 @@ -class Aaa { - bbb!: string = undefined; - ccc: string = undefined; - ddd = undefined; - private eee!: string = undefined; +class Foo { + bar: number; + baz = 0; } --- [#1 Content] = 0:6-0:9 >---< -0| class Aaa { +0| class Foo { [#1 Removal] = 0:6-0:10 >----< -0| class Aaa { +0| class Foo { [#1 Leading delimiter] = 0:5-0:6 >-< -0| class Aaa { +0| class Foo { [#1 Trailing delimiter] = 0:9-0:10 >-< -0| class Aaa { +0| class Foo { -[#1 Domain] = 0:0-5:1 +[#1 Domain] = 0:0-3:1 >----------- -0| class Aaa { -1| bbb!: string = undefined; -2| ccc: string = undefined; -3| ddd = undefined; -4| private eee!: string = undefined; -5| } +0| class Foo { +1| bar: number; +2| baz = 0; +3| } -< [#1 Insertion delimiter] = " " -[#2 Content] = -[#2 Removal] = 1:4-1:7 +[#2 Content] = 1:4-1:7 >---< -1| bbb!: string = undefined; +1| bar: number; + +[#2 Removal] = 1:0-1:7 + >-------< +1| bar: number; [#2 Leading delimiter] = 1:0-1:4 >----< -1| bbb!: string = undefined; +1| bar: number; -[#2 Domain] = 1:4-1:29 - >-------------------------< -1| bbb!: string = undefined; +[#2 Domain] = 1:4-1:16 + >------------< +1| bar: number; [#2 Insertion delimiter] = " " [#3 Content] = 2:4-2:7 >---< -2| ccc: string = undefined; - -[#3 Removal] = 2:0-2:7 - >-------< -2| ccc: string = undefined; - -[#3 Leading delimiter] = 2:0-2:4 - >----< -2| ccc: string = undefined; - -[#3 Domain] = 2:4-2:28 - >------------------------< -2| ccc: string = undefined; - -[#3 Insertion delimiter] = " " - - -[#4 Content] = 3:4-3:7 - >---< -3| ddd = undefined; +2| baz = 0; -[#4 Removal] = 3:4-3:10 +[#3 Removal] = 2:4-2:10 >------< -3| ddd = undefined; +2| baz = 0; -[#4 Trailing delimiter] = 3:7-3:10 +[#3 Trailing delimiter] = 2:7-2:10 >---< -3| ddd = undefined; - -[#4 Domain] = 3:4-3:20 - >----------------< -3| ddd = undefined; - -[#4 Insertion delimiter] = " " +2| baz = 0; +[#3 Domain] = 2:4-2:12 + >--------< +2| baz = 0; -[#5 Content] = -[#5 Removal] = 4:12-4:15 - >---< -4| private eee!: string = undefined; - -[#5 Leading delimiter] = 4:11-4:12 - >-< -4| private eee!: string = undefined; - -[#5 Domain] = 4:4-4:37 - >---------------------------------< -4| private eee!: string = undefined; - -[#5 Insertion delimiter] = " " +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/name/name.field.interface.scope b/data/fixtures/scopes/typescript.core/name/name.field.interface.scope index e92982ddcc..24ebe3b8d7 100644 --- a/data/fixtures/scopes/typescript.core/name/name.field.interface.scope +++ b/data/fixtures/scopes/typescript.core/name/name.field.interface.scope @@ -41,8 +41,8 @@ interface Foo { >----< 1| bar: number; -[#2 Domain] = 1:4-1:15 - >-----------< +[#2 Domain] = 1:4-1:16 + >------------< 1| bar: number; [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/name/name.variable.scope b/data/fixtures/scopes/typescript.core/name/name.variable.scope index b435326b58..5a5650d856 100644 --- a/data/fixtures/scopes/typescript.core/name/name.variable.scope +++ b/data/fixtures/scopes/typescript.core/name/name.variable.scope @@ -1,24 +1,24 @@ -export type Aaa = Bbb; +export type Foo = Bar; --- [Content] = 0:12-0:15 >---< -0| export type Aaa = Bbb; +0| export type Foo = Bar; [Removal] = 0:12-0:16 >----< -0| export type Aaa = Bbb; +0| export type Foo = Bar; [Leading delimiter] = 0:11-0:12 >-< -0| export type Aaa = Bbb; +0| export type Foo = Bar; [Trailing delimiter] = 0:15-0:16 >-< -0| export type Aaa = Bbb; +0| export type Foo = Bar; [Domain] = 0:0-0:27 >---------------------------< -0| export type Aaa = Bbb; +0| export type Foo = Bar; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/namedFunction.constructor.scope b/data/fixtures/scopes/typescript.core/namedFunction.constructor.scope index 8337f095f7..09948088df 100644 --- a/data/fixtures/scopes/typescript.core/namedFunction.constructor.scope +++ b/data/fixtures/scopes/typescript.core/namedFunction.constructor.scope @@ -1,59 +1,40 @@ -class MyClass { - constructor(value: string) - constructor(value: number); - constructor(value: string | number) {} +class Foo { + constructor(); + constructor(value: number) {} } --- [#1 Content] = -[#1 Domain] = 1:2-1:28 - >--------------------------< -1| constructor(value: string) +[#1 Domain] = 1:2-1:16 + >--------------< +1| constructor(); [#1 Removal] = 1:0-2:0 - >---------------------------- -1| constructor(value: string) -2| constructor(value: number); + >---------------- +1| constructor(); +2| constructor(value: number) {} < [#1 Leading delimiter] = 1:0-1:2 >--< -1| constructor(value: string) +1| constructor(); [#1 Insertion delimiter] = "\n\n" [#2 Content] = -[#2 Domain] = 2:2-2:29 - >---------------------------< -2| constructor(value: number); +[#2 Domain] = 2:2-2:31 + >-----------------------------< +2| constructor(value: number) {} [#2 Removal] = 2:0-3:0 - >----------------------------- -2| constructor(value: number); -3| constructor(value: string | number) {} + >------------------------------- +2| constructor(value: number) {} +3| } < [#2 Leading delimiter] = 2:0-2:2 >--< -2| constructor(value: number); +2| constructor(value: number) {} [#2 Insertion delimiter] = "\n\n" - - -[#3 Content] = -[#3 Domain] = 3:2-3:40 - >--------------------------------------< -3| constructor(value: string | number) {} - -[#3 Removal] = 3:0-4:0 - >---------------------------------------- -3| constructor(value: string | number) {} -4| } - < - -[#3 Leading delimiter] = 3:0-3:2 - >--< -3| constructor(value: string | number) {} - -[#3 Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/typescript.core/namedFunction.method.scope b/data/fixtures/scopes/typescript.core/namedFunction.method.scope index cee0e0fe48..3f958c076d 100644 --- a/data/fixtures/scopes/typescript.core/namedFunction.method.scope +++ b/data/fixtures/scopes/typescript.core/namedFunction.method.scope @@ -1,59 +1,40 @@ -class MyClass { - foo(value: string) - foo(value: number); - foo(value: string | number) {} +class Foo { + bar(); + bar(value: number) {} } --- [#1 Content] = -[#1 Domain] = 1:2-1:20 - >------------------< -1| foo(value: string) +[#1 Domain] = 1:2-1:8 + >------< +1| bar(); [#1 Removal] = 1:0-2:0 - >-------------------- -1| foo(value: string) -2| foo(value: number); + >-------- +1| bar(); +2| bar(value: number) {} < [#1 Leading delimiter] = 1:0-1:2 >--< -1| foo(value: string) +1| bar(); [#1 Insertion delimiter] = "\n\n" [#2 Content] = -[#2 Domain] = 2:2-2:21 - >-------------------< -2| foo(value: number); +[#2 Domain] = 2:2-2:23 + >---------------------< +2| bar(value: number) {} [#2 Removal] = 2:0-3:0 - >--------------------- -2| foo(value: number); -3| foo(value: string | number) {} + >----------------------- +2| bar(value: number) {} +3| } < [#2 Leading delimiter] = 2:0-2:2 >--< -2| foo(value: number); +2| bar(value: number) {} [#2 Insertion delimiter] = "\n\n" - - -[#3 Content] = -[#3 Domain] = 3:2-3:32 - >------------------------------< -3| foo(value: string | number) {} - -[#3 Removal] = 3:0-4:0 - >-------------------------------- -3| foo(value: string | number) {} -4| } - < - -[#3 Leading delimiter] = 3:0-3:2 - >--< -3| foo(value: string | number) {} - -[#3 Insertion delimiter] = "\n\n" diff --git a/data/fixtures/scopes/typescript.core/statement/statement.scope b/data/fixtures/scopes/typescript.core/statement/statement.scope deleted file mode 100644 index 0eb91cb12d..0000000000 --- a/data/fixtures/scopes/typescript.core/statement/statement.scope +++ /dev/null @@ -1,33 +0,0 @@ -interface Aaa { - bbb(): void; -} ---- - -[#1 Content] = -[#1 Removal] = -[#1 Domain] = 0:0-2:1 - >--------------- -0| interface Aaa { -1| bbb(): void; -2| } - -< - -[#1 Insertion delimiter] = "\n" - - -[#2 Content] = -[#2 Domain] = 1:4-1:16 - >------------< -1| bbb(): void; - -[#2 Removal] = 1:0-2:0 - >---------------- -1| bbb(): void; -2| } - < - -[#2 Leading delimiter] = 1:0-1:4 - >----< -1| bbb(): void; - -[#2 Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/typescript.core/type/type.alias.scope b/data/fixtures/scopes/typescript.core/type/type.alias.scope index 8fe8c37785..22f28eaf55 100644 --- a/data/fixtures/scopes/typescript.core/type/type.alias.scope +++ b/data/fixtures/scopes/typescript.core/type/type.alias.scope @@ -1,10 +1,10 @@ -type Aaa = Bbb; +type Foo = Bar; --- [Content] = [Removal] = [Domain] = 0:0-0:15 >---------------< -0| type Aaa = Bbb; +0| type Foo = Bar; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.alias2.scope b/data/fixtures/scopes/typescript.core/type/type.alias2.scope index 9dbeaf95ed..9275b2743b 100644 --- a/data/fixtures/scopes/typescript.core/type/type.alias2.scope +++ b/data/fixtures/scopes/typescript.core/type/type.alias2.scope @@ -1,10 +1,10 @@ -export type Aaa = Bbb; +export type Foo = Bar; --- [Content] = [Removal] = [Domain] = 0:0-0:22 >----------------------< -0| export type Aaa = Bbb; +0| export type Foo = Bar; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.catch.scope b/data/fixtures/scopes/typescript.core/type/type.argument.catch.scope index 319579bbab..f1ceabce57 100644 --- a/data/fixtures/scopes/typescript.core/type/type.argument.catch.scope +++ b/data/fixtures/scopes/typescript.core/type/type.argument.catch.scope @@ -1,21 +1,21 @@ try {} -catch(error: unknown) {} +catch(e: unknown) {} --- -[Content] = 1:13-1:20 - >-------< -1| catch(error: unknown) {} +[Content] = 1:9-1:16 + >-------< +1| catch(e: unknown) {} -[Removal] = 1:11-1:20 - >---------< -1| catch(error: unknown) {} +[Removal] = 1:7-1:16 + >---------< +1| catch(e: unknown) {} -[Leading delimiter] = 1:11-1:13 - >--< -1| catch(error: unknown) {} +[Leading delimiter] = 1:7-1:9 + >--< +1| catch(e: unknown) {} -[Domain] = 1:6-1:20 - >--------------< -1| catch(error: unknown) {} +[Domain] = 1:6-1:16 + >----------< +1| catch(e: unknown) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope index debbe2f951..9d824ab820 100644 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.iteration.scope @@ -1,33 +1,27 @@ -class MyClass { - constructor(value: number) { } +class Foo { + constructor(aaa: number, bbb: number) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| constructor(value: number) { } + >----------- +0| class Foo { +1| constructor(aaa: number, bbb: number) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| constructor(value: number) { } +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| constructor(aaa: number, bbb: number) {} 2| } < [#3 Content] = -[#3 Domain] = 1:14-1:27 - >-------------< -1| constructor(value: number) { } - - -[#4 Content] = -[#4 Domain] = 1:30-1:31 - >-< -1| constructor(value: number) { } +[#3 Domain] = 1:14-1:38 + >------------------------< +1| constructor(aaa: number, bbb: number) {} diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope index 105bedcb56..2dfab90cd5 100644 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope +++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.constructor.scope @@ -1,34 +1,53 @@ -class MyClass { - constructor(value: number) { } +class Foo { + constructor(aaa: number, bbb: number = 0) {} } --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| constructor(value: number) { } + >----------- +0| class Foo { +1| constructor(aaa: number, bbb: number = 0) {} 2| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:21-1:27 - >------< -1| constructor(value: number) { } +[#2 Content] = 1:19-1:25 + >------< +1| constructor(aaa: number, bbb: number = 0) {} -[#2 Removal] = 1:19-1:27 - >--------< -1| constructor(value: number) { } +[#2 Removal] = 1:17-1:25 + >--------< +1| constructor(aaa: number, bbb: number = 0) {} -[#2 Leading delimiter] = 1:19-1:21 - >--< -1| constructor(value: number) { } +[#2 Leading delimiter] = 1:17-1:19 + >--< +1| constructor(aaa: number, bbb: number = 0) {} -[#2 Domain] = 1:14-1:27 - >-------------< -1| constructor(value: number) { } +[#2 Domain] = 1:14-1:25 + >-----------< +1| constructor(aaa: number, bbb: number = 0) {} [#2 Insertion delimiter] = " " + + +[#3 Content] = 1:32-1:38 + >------< +1| constructor(aaa: number, bbb: number = 0) {} + +[#3 Removal] = 1:30-1:38 + >--------< +1| constructor(aaa: number, bbb: number = 0) {} + +[#3 Leading delimiter] = 1:30-1:32 + >--< +1| constructor(aaa: number, bbb: number = 0) {} + +[#3 Domain] = 1:27-1:42 + >---------------< +1| constructor(aaa: number, bbb: number = 0) {} + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.iteration.scope index 48334bec03..e225f02c2e 100644 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.iteration.scope +++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.iteration.scope @@ -1,19 +1,13 @@ -function myFunk(value: number) { } +function foo(aaa: number, bbb: number) {} --- [#1 Content] = -[#1 Domain] = 0:0-0:34 - >----------------------------------< -0| function myFunk(value: number) { } +[#1 Domain] = 0:0-0:41 + >-----------------------------------------< +0| function foo(aaa: number, bbb: number) {} [#2 Content] = -[#2 Domain] = 0:16-0:29 - >-------------< -0| function myFunk(value: number) { } - - -[#3 Content] = -[#3 Domain] = 0:32-0:33 - >-< -0| function myFunk(value: number) { } +[#2 Domain] = 0:13-0:37 + >------------------------< +0| function foo(aaa: number, bbb: number) {} diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope index 76245545ad..167b724f4b 100644 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.iteration.scope @@ -1,33 +1,27 @@ -class MyClass { - myFunk(value: number) { } +class Foo { + bar(aaa: number, bbb: number) {} } --- [#1 Content] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk(value: number) { } + >----------- +0| class Foo { +1| bar(aaa: number, bbb: number) {} 2| } -< [#2 Content] = -[#2 Domain] = 0:15-2:0 - > -0| class MyClass { -1| myFunk(value: number) { } +[#2 Domain] = 0:11-2:0 + > +0| class Foo { +1| bar(aaa: number, bbb: number) {} 2| } < [#3 Content] = -[#3 Domain] = 1:9-1:22 - >-------------< -1| myFunk(value: number) { } - - -[#4 Content] = -[#4 Domain] = 1:25-1:26 - >-< -1| myFunk(value: number) { } +[#3 Domain] = 1:6-1:30 + >------------------------< +1| bar(aaa: number, bbb: number) {} diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope index 417343e4f3..d2b5ce8331 100644 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope +++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.method.scope @@ -1,34 +1,53 @@ -class MyClass { - myFunk(value: number) { } +class Foo { + bar(aaa: number, bbb: number = 0) {} } --- [#1 Content] = [#1 Removal] = [#1 Domain] = 0:0-2:1 - >--------------- -0| class MyClass { -1| myFunk(value: number) { } + >----------- +0| class Foo { +1| bar(aaa: number, bbb: number = 0) {} 2| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:16-1:22 - >------< -1| myFunk(value: number) { } +[#2 Content] = 1:11-1:17 + >------< +1| bar(aaa: number, bbb: number = 0) {} -[#2 Removal] = 1:14-1:22 - >--------< -1| myFunk(value: number) { } +[#2 Removal] = 1:9-1:17 + >--------< +1| bar(aaa: number, bbb: number = 0) {} -[#2 Leading delimiter] = 1:14-1:16 - >--< -1| myFunk(value: number) { } +[#2 Leading delimiter] = 1:9-1:11 + >--< +1| bar(aaa: number, bbb: number = 0) {} -[#2 Domain] = 1:9-1:22 - >-------------< -1| myFunk(value: number) { } +[#2 Domain] = 1:6-1:17 + >-----------< +1| bar(aaa: number, bbb: number = 0) {} [#2 Insertion delimiter] = " " + + +[#3 Content] = 1:24-1:30 + >------< +1| bar(aaa: number, bbb: number = 0) {} + +[#3 Removal] = 1:22-1:30 + >--------< +1| bar(aaa: number, bbb: number = 0) {} + +[#3 Leading delimiter] = 1:22-1:24 + >--< +1| bar(aaa: number, bbb: number = 0) {} + +[#3 Domain] = 1:19-1:34 + >---------------< +1| bar(aaa: number, bbb: number = 0) {} + +[#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal.scope index 9159f5f2b6..44db355a2b 100644 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal.scope +++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal.scope @@ -1,20 +1,39 @@ -function myFunk(value: number) { } +function foo(aaa: number, bbb?: number = 0) {} --- -[Content] = 0:23-0:29 - >------< -0| function myFunk(value: number) { } +[#1 Content] = 0:18-0:24 + >------< +0| function foo(aaa: number, bbb?: number = 0) {} -[Removal] = 0:21-0:29 - >--------< -0| function myFunk(value: number) { } +[#1 Removal] = 0:16-0:24 + >--------< +0| function foo(aaa: number, bbb?: number = 0) {} -[Leading delimiter] = 0:21-0:23 - >--< -0| function myFunk(value: number) { } +[#1 Leading delimiter] = 0:16-0:18 + >--< +0| function foo(aaa: number, bbb?: number = 0) {} -[Domain] = 0:16-0:29 - >-------------< -0| function myFunk(value: number) { } +[#1 Domain] = 0:13-0:24 + >-----------< +0| function foo(aaa: number, bbb?: number = 0) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:32-0:38 + >------< +0| function foo(aaa: number, bbb?: number = 0) {} + +[#2 Removal] = 0:30-0:38 + >--------< +0| function foo(aaa: number, bbb?: number = 0) {} + +[#2 Leading delimiter] = 0:30-0:32 + >--< +0| function foo(aaa: number, bbb?: number = 0) {} + +[#2 Domain] = 0:26-0:42 + >----------------< +0| function foo(aaa: number, bbb?: number = 0) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal2.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal2.scope index 022208192b..2bb3aa1c12 100644 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal2.scope +++ b/data/fixtures/scopes/typescript.core/type/type.argument.formal2.scope @@ -1,20 +1,20 @@ -function myFunk(value: number = 2) { } +function foo(...aaa: number[]) {} --- -[Content] = 0:23-0:29 - >------< -0| function myFunk(value: number = 2) { } - -[Removal] = 0:21-0:29 +[Content] = 0:21-0:29 >--------< -0| function myFunk(value: number = 2) { } +0| function foo(...aaa: number[]) {} + +[Removal] = 0:19-0:29 + >----------< +0| function foo(...aaa: number[]) {} -[Leading delimiter] = 0:21-0:23 - >--< -0| function myFunk(value: number = 2) { } +[Leading delimiter] = 0:19-0:21 + >--< +0| function foo(...aaa: number[]) {} -[Domain] = 0:16-0:33 - >-----------------< -0| function myFunk(value: number = 2) { } +[Domain] = 0:13-0:29 + >----------------< +0| function foo(...aaa: number[]) {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal3.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal3.scope deleted file mode 100644 index 3cef13d804..0000000000 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal3.scope +++ /dev/null @@ -1,20 +0,0 @@ -function myFunk(value?: number) { } ---- - -[Content] = 0:24-0:30 - >------< -0| function myFunk(value?: number) { } - -[Removal] = 0:22-0:30 - >--------< -0| function myFunk(value?: number) { } - -[Leading delimiter] = 0:22-0:24 - >--< -0| function myFunk(value?: number) { } - -[Domain] = 0:16-0:30 - >--------------< -0| function myFunk(value?: number) { } - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.argument.formal4.scope b/data/fixtures/scopes/typescript.core/type/type.argument.formal4.scope deleted file mode 100644 index 626ff9770b..0000000000 --- a/data/fixtures/scopes/typescript.core/type/type.argument.formal4.scope +++ /dev/null @@ -1,20 +0,0 @@ -function myFunkclose(value?: number = 2) { } ---- - -[Content] = 0:29-0:35 - >------< -0| function myFunkclose(value?: number = 2) { } - -[Removal] = 0:27-0:35 - >--------< -0| function myFunkclose(value?: number = 2) { } - -[Leading delimiter] = 0:27-0:29 - >--< -0| function myFunkclose(value?: number = 2) { } - -[Domain] = 0:21-0:39 - >------------------< -0| function myFunkclose(value?: number = 2) { } - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.enum.scope b/data/fixtures/scopes/typescript.core/type/type.enum.scope index 25a727623b..70c26e7b58 100644 --- a/data/fixtures/scopes/typescript.core/type/type.enum.scope +++ b/data/fixtures/scopes/typescript.core/type/type.enum.scope @@ -1,10 +1,10 @@ -enum Foo { } +enum Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:12 - >------------< -0| enum Foo { } +[Domain] = 0:0-0:11 + >-----------< +0| enum Foo {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.enum2.scope b/data/fixtures/scopes/typescript.core/type/type.enum2.scope index 66d0aeb8be..b688dc50e6 100644 --- a/data/fixtures/scopes/typescript.core/type/type.enum2.scope +++ b/data/fixtures/scopes/typescript.core/type/type.enum2.scope @@ -1,10 +1,10 @@ -const enum Foo { } +const enum Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:18 - >------------------< -0| const enum Foo { } +[Domain] = 0:0-0:17 + >-----------------< +0| const enum Foo {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.field.class.scope b/data/fixtures/scopes/typescript.core/type/type.field.class.scope index 76b55f00ea..0ab16039a3 100644 --- a/data/fixtures/scopes/typescript.core/type/type.field.class.scope +++ b/data/fixtures/scopes/typescript.core/type/type.field.class.scope @@ -1,118 +1,55 @@ -class Aaa { - bbb!: string = undefined; - ccc: string = undefined; - private eee!: string = undefined; - eee: string; - fff!: string; +class Foo { + bar: number; + baz: number = 0; } --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 0:0-6:1 +[#1 Domain] = 0:0-3:1 >----------- -0| class Aaa { -1| bbb!: string = undefined; -2| ccc: string = undefined; -3| private eee!: string = undefined; -4| eee: string; -5| fff!: string; -6| } +0| class Foo { +1| bar: number; +2| baz: number = 0; +3| } -< [#1 Insertion delimiter] = " " -[#2 Content] = 1:10-1:16 - >------< -1| bbb!: string = undefined; +[#2 Content] = 1:9-1:15 + >------< +1| bar: number; -[#2 Removal] = 1:7-1:16 - >---------< -1| bbb!: string = undefined; +[#2 Removal] = 1:7-1:15 + >--------< +1| bar: number; -[#2 Leading delimiter] = 1:7-1:10 - >---< -1| bbb!: string = undefined; +[#2 Leading delimiter] = 1:7-1:9 + >--< +1| bar: number; -[#2 Domain] = 1:4-1:29 - >-------------------------< -1| bbb!: string = undefined; +[#2 Domain] = 1:4-1:16 + >------------< +1| bar: number; [#2 Insertion delimiter] = " " [#3 Content] = 2:9-2:15 >------< -2| ccc: string = undefined; +2| baz: number = 0; [#3 Removal] = 2:7-2:15 >--------< -2| ccc: string = undefined; +2| baz: number = 0; [#3 Leading delimiter] = 2:7-2:9 >--< -2| ccc: string = undefined; +2| baz: number = 0; -[#3 Domain] = 2:4-2:28 - >------------------------< -2| ccc: string = undefined; +[#3 Domain] = 2:4-2:20 + >----------------< +2| baz: number = 0; [#3 Insertion delimiter] = " " - - -[#4 Content] = 3:18-3:24 - >------< -3| private eee!: string = undefined; - -[#4 Removal] = 3:15-3:24 - >---------< -3| private eee!: string = undefined; - -[#4 Leading delimiter] = 3:15-3:18 - >---< -3| private eee!: string = undefined; - -[#4 Domain] = 3:4-3:37 - >---------------------------------< -3| private eee!: string = undefined; - -[#4 Insertion delimiter] = " " - - -[#5 Content] = 4:9-4:15 - >------< -4| eee: string; - -[#5 Removal] = 4:7-4:15 - >--------< -4| eee: string; - -[#5 Leading delimiter] = 4:7-4:9 - >--< -4| eee: string; - -[#5 Domain] = 4:4-4:16 - >------------< -4| eee: string; - -[#5 Insertion delimiter] = " " - - -[#6 Content] = 5:10-5:16 - >------< -5| fff!: string; - -[#6 Removal] = 5:7-5:16 - >---------< -5| fff!: string; - -[#6 Leading delimiter] = 5:7-5:10 - >---< -5| fff!: string; - -[#6 Domain] = 5:4-5:17 - >-------------< -5| fff!: string; - -[#6 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.interface.scope b/data/fixtures/scopes/typescript.core/type/type.interface.scope index cc97809272..b589a37a0f 100644 --- a/data/fixtures/scopes/typescript.core/type/type.interface.scope +++ b/data/fixtures/scopes/typescript.core/type/type.interface.scope @@ -1,10 +1,10 @@ -interface Foo { } +interface Foo {} --- [Content] = [Removal] = -[Domain] = 0:0-0:17 - >-----------------< -0| interface Foo { } +[Domain] = 0:0-0:16 + >----------------< +0| interface Foo {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.return.scope b/data/fixtures/scopes/typescript.core/type/type.return.scope index 3070660e15..332d6ed92e 100644 --- a/data/fixtures/scopes/typescript.core/type/type.return.scope +++ b/data/fixtures/scopes/typescript.core/type/type.return.scope @@ -1,25 +1,20 @@ -function myFunk(): number { - return 0; -} +function foo(): number {} --- -[Content] = 0:19-0:25 - >------< -0| function myFunk(): number { +[Content] = 0:16-0:22 + >------< +0| function foo(): number {} -[Removal] = 0:17-0:25 - >--------< -0| function myFunk(): number { +[Removal] = 0:14-0:22 + >--------< +0| function foo(): number {} -[Leading delimiter] = 0:17-0:19 - >--< -0| function myFunk(): number { +[Leading delimiter] = 0:14-0:16 + >--< +0| function foo(): number {} -[Domain] = 0:0-2:1 - >--------------------------- -0| function myFunk(): number { -1| return 0; -2| } - -< +[Domain] = 0:0-0:25 + >-------------------------< +0| function foo(): number {} [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.typeArgument.scope b/data/fixtures/scopes/typescript.core/type/type.typeArgument.scope index 0b73b4b849..344e1b9bfa 100644 --- a/data/fixtures/scopes/typescript.core/type/type.typeArgument.scope +++ b/data/fixtures/scopes/typescript.core/type/type.typeArgument.scope @@ -1,52 +1,52 @@ -let value: Map; +let foo: Map; --- -[#1 Content] = 0:11-0:30 - >-------------------< -0| let value: Map; +[#1 Content] = 0:9-0:28 + >-------------------< +0| let foo: Map; -[#1 Removal] = 0:9-0:30 - >---------------------< -0| let value: Map; +[#1 Removal] = 0:7-0:28 + >---------------------< +0| let foo: Map; -[#1 Leading delimiter] = 0:10-0:11 - >-< -0| let value: Map; +[#1 Leading delimiter] = 0:8-0:9 + >-< +0| let foo: Map; -[#1 Domain] = 0:0-0:31 - >-------------------------------< -0| let value: Map; +[#1 Domain] = 0:0-0:29 + >-----------------------------< +0| let foo: Map; [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Domain] = 0:15-0:21 - >------< -0| let value: Map; +[#2 Domain] = 0:13-0:19 + >------< +0| let foo: Map; -[#2 Removal] = 0:15-0:23 - >--------< -0| let value: Map; +[#2 Removal] = 0:13-0:21 + >--------< +0| let foo: Map; -[#2 Trailing delimiter] = 0:21-0:23 - >--< -0| let value: Map; +[#2 Trailing delimiter] = 0:19-0:21 + >--< +0| let foo: Map; [#2 Insertion delimiter] = ", " [#3 Content] = -[#3 Domain] = 0:23-0:29 - >------< -0| let value: Map; +[#3 Domain] = 0:21-0:27 + >------< +0| let foo: Map; -[#3 Removal] = 0:21-0:29 - >--------< -0| let value: Map; +[#3 Removal] = 0:19-0:27 + >--------< +0| let foo: Map; -[#3 Leading delimiter] = 0:21-0:23 - >--< -0| let value: Map; +[#3 Leading delimiter] = 0:19-0:21 + >--< +0| let foo: Map; [#3 Insertion delimiter] = ", " diff --git a/data/fixtures/scopes/typescript.core/type/type.variable.scope b/data/fixtures/scopes/typescript.core/type/type.variable.scope index 92b7088992..1ed00efae6 100644 --- a/data/fixtures/scopes/typescript.core/type/type.variable.scope +++ b/data/fixtures/scopes/typescript.core/type/type.variable.scope @@ -1,24 +1,20 @@ -const value: number = 0; +let foo: number; --- -[Content] = 0:13-0:19 - >------< -0| const value: number = 0; +[Content] = 0:9-0:15 + >------< +0| let foo: number; -[Removal] = 0:11-0:19 - >--------< -0| const value: number = 0; +[Removal] = 0:7-0:15 + >--------< +0| let foo: number; -[Leading delimiter] = 0:12-0:13 - >-< -0| const value: number = 0; +[Leading delimiter] = 0:8-0:9 + >-< +0| let foo: number; -[Trailing delimiter] = 0:19-0:20 - >-< -0| const value: number = 0; - -[Domain] = 0:0-0:24 - >------------------------< -0| const value: number = 0; +[Domain] = 0:0-0:16 + >----------------< +0| let foo: number; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/type/type.variable2.scope b/data/fixtures/scopes/typescript.core/type/type.variable2.scope new file mode 100644 index 0000000000..ac22afb83d --- /dev/null +++ b/data/fixtures/scopes/typescript.core/type/type.variable2.scope @@ -0,0 +1,24 @@ +const foo: number = 0; +--- + +[Content] = 0:11-0:17 + >------< +0| const foo: number = 0; + +[Removal] = 0:9-0:17 + >--------< +0| const foo: number = 0; + +[Leading delimiter] = 0:10-0:11 + >-< +0| const foo: number = 0; + +[Trailing delimiter] = 0:17-0:18 + >-< +0| const foo: number = 0; + +[Domain] = 0:0-0:22 + >----------------------< +0| const foo: number = 0; + +[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/value/value.argument.formal.scope b/data/fixtures/scopes/typescript.core/value/value.argument.formal.scope index e4882ecd53..07a97bc888 100644 --- a/data/fixtures/scopes/typescript.core/value/value.argument.formal.scope +++ b/data/fixtures/scopes/typescript.core/value/value.argument.formal.scope @@ -1,20 +1,39 @@ -function myFunk(value?: number = 2) { } +function foo(aaa: number = 0, bbb?: number = 1) {} --- -[Content] = 0:33-0:34 - >-< -0| function myFunk(value?: number = 2) { } +[#1 Content] = 0:27-0:28 + >-< +0| function foo(aaa: number = 0, bbb?: number = 1) {} -[Removal] = 0:30-0:34 - >----< -0| function myFunk(value?: number = 2) { } +[#1 Removal] = 0:24-0:28 + >----< +0| function foo(aaa: number = 0, bbb?: number = 1) {} -[Leading delimiter] = 0:30-0:33 - >---< -0| function myFunk(value?: number = 2) { } +[#1 Leading delimiter] = 0:24-0:27 + >---< +0| function foo(aaa: number = 0, bbb?: number = 1) {} -[Domain] = 0:16-0:34 - >------------------< -0| function myFunk(value?: number = 2) { } +[#1 Domain] = 0:13-0:28 + >---------------< +0| function foo(aaa: number = 0, bbb?: number = 1) {} -[Insertion delimiter] = " " +[#1 Insertion delimiter] = " " + + +[#2 Content] = 0:45-0:46 + >-< +0| function foo(aaa: number = 0, bbb?: number = 1) {} + +[#2 Removal] = 0:42-0:46 + >----< +0| function foo(aaa: number = 0, bbb?: number = 1) {} + +[#2 Leading delimiter] = 0:42-0:45 + >---< +0| function foo(aaa: number = 0, bbb?: number = 1) {} + +[#2 Domain] = 0:30-0:46 + >----------------< +0| function foo(aaa: number = 0, bbb?: number = 1) {} + +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/value/value.argument.formal2.scope b/data/fixtures/scopes/typescript.core/value/value.argument.formal2.scope deleted file mode 100644 index 633cb369ac..0000000000 --- a/data/fixtures/scopes/typescript.core/value/value.argument.formal2.scope +++ /dev/null @@ -1,20 +0,0 @@ -function myFunk(value: number = 2) { } ---- - -[Content] = 0:32-0:33 - >-< -0| function myFunk(value: number = 2) { } - -[Removal] = 0:29-0:33 - >----< -0| function myFunk(value: number = 2) { } - -[Leading delimiter] = 0:29-0:32 - >---< -0| function myFunk(value: number = 2) { } - -[Domain] = 0:16-0:33 - >-----------------< -0| function myFunk(value: number = 2) { } - -[Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/value/value.field.class.scope b/data/fixtures/scopes/typescript.core/value/value.field.class.scope index 85c26dd946..49b5be2f85 100644 --- a/data/fixtures/scopes/typescript.core/value/value.field.class.scope +++ b/data/fixtures/scopes/typescript.core/value/value.field.class.scope @@ -1,82 +1,42 @@ -class Aaa { - bbb!: string = undefined; - ccc: string = undefined; - ddd = undefined; - private eee!: string = undefined; +class Foo { + bar: number = 0; + baz = 1; } --- -[#1 Content] = 1:19-1:28 - >---------< -1| bbb!: string = undefined; +[#1 Content] = 1:18-1:19 + >-< +1| bar: number = 0; -[#1 Removal] = 1:16-1:28 - >------------< -1| bbb!: string = undefined; +[#1 Removal] = 1:15-1:19 + >----< +1| bar: number = 0; -[#1 Leading delimiter] = 1:16-1:19 - >---< -1| bbb!: string = undefined; - -[#1 Domain] = 1:4-1:29 - >-------------------------< -1| bbb!: string = undefined; - -[#1 Insertion delimiter] = " " - - -[#2 Content] = 2:18-2:27 - >---------< -2| ccc: string = undefined; - -[#2 Removal] = 2:15-2:27 - >------------< -2| ccc: string = undefined; - -[#2 Leading delimiter] = 2:15-2:18 +[#1 Leading delimiter] = 1:15-1:18 >---< -2| ccc: string = undefined; - -[#2 Domain] = 2:4-2:28 - >------------------------< -2| ccc: string = undefined; - -[#2 Insertion delimiter] = " " - - -[#3 Content] = 3:10-3:19 - >---------< -3| ddd = undefined; +1| bar: number = 0; -[#3 Removal] = 3:7-3:19 - >------------< -3| ddd = undefined; - -[#3 Leading delimiter] = 3:7-3:10 - >---< -3| ddd = undefined; - -[#3 Domain] = 3:4-3:20 +[#1 Domain] = 1:4-1:20 >----------------< -3| ddd = undefined; +1| bar: number = 0; -[#3 Insertion delimiter] = " " +[#1 Insertion delimiter] = " " -[#4 Content] = 4:27-4:36 - >---------< -4| private eee!: string = undefined; +[#2 Content] = 2:10-2:11 + >-< +2| baz = 1; -[#4 Removal] = 4:24-4:36 - >------------< -4| private eee!: string = undefined; +[#2 Removal] = 2:7-2:11 + >----< +2| baz = 1; -[#4 Leading delimiter] = 4:24-4:27 - >---< -4| private eee!: string = undefined; +[#2 Leading delimiter] = 2:7-2:10 + >---< +2| baz = 1; -[#4 Domain] = 4:4-4:37 - >---------------------------------< -4| private eee!: string = undefined; +[#2 Domain] = 2:4-2:12 + >--------< +2| baz = 1; -[#4 Insertion delimiter] = " " +[#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/value/value.typeAlias.scope b/data/fixtures/scopes/typescript.core/value/value.typeAlias.scope index 0e3b1b567c..d40f63850b 100644 --- a/data/fixtures/scopes/typescript.core/value/value.typeAlias.scope +++ b/data/fixtures/scopes/typescript.core/value/value.typeAlias.scope @@ -1,20 +1,20 @@ -type Aaa = Bbb; +type Foo = Bar; --- [Content] = 0:11-0:14 >---< -0| type Aaa = Bbb; +0| type Foo = Bar; [Removal] = 0:10-0:14 >----< -0| type Aaa = Bbb; +0| type Foo = Bar; [Leading delimiter] = 0:10-0:11 >-< -0| type Aaa = Bbb; +0| type Foo = Bar; [Domain] = 0:0-0:15 >---------------< -0| type Aaa = Bbb; +0| type Foo = Bar; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript.core/value/value.typeAlias2.scope b/data/fixtures/scopes/typescript.core/value/value.typeAlias2.scope index 9e72d627f2..e5574f747b 100644 --- a/data/fixtures/scopes/typescript.core/value/value.typeAlias2.scope +++ b/data/fixtures/scopes/typescript.core/value/value.typeAlias2.scope @@ -1,20 +1,20 @@ -export type Aaa = Bbb; +export type For = Bar; --- [Content] = 0:18-0:21 >---< -0| export type Aaa = Bbb; +0| export type For = Bar; [Removal] = 0:17-0:21 >----< -0| export type Aaa = Bbb; +0| export type For = Bar; [Leading delimiter] = 0:17-0:18 >-< -0| export type Aaa = Bbb; +0| export type For = Bar; [Domain] = 0:0-0:22 >----------------------< -0| export type Aaa = Bbb; +0| export type For = Bar; [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/typescript/type.cast.scope b/data/fixtures/scopes/typescript/type.cast.scope index 1aa9a73ae6..ea5aa7d74a 100644 --- a/data/fixtures/scopes/typescript/type.cast.scope +++ b/data/fixtures/scopes/typescript/type.cast.scope @@ -1,16 +1,16 @@ -bbb +bar --- [Content] = 0:1-0:4 >---< -0| bbb +0| bar [Removal] = 0:0-0:5 >-----< -0| bbb +0| bar [Domain] = 0:0-0:8 >--------< -0| bbb +0| bar [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/attribute.scope b/data/fixtures/scopes/xml/attribute.scope index 7589cdb988..fe10c0dcbf 100644 --- a/data/fixtures/scopes/xml/attribute.scope +++ b/data/fixtures/scopes/xml/attribute.scope @@ -1,17 +1,17 @@ -Me + --- [Content] = -[Domain] = 0:6-0:15 - >---------< -0| Me +[Domain] = 0:6-0:14 + >--------< +0| -[Removal] = 0:5-0:15 - >----------< -0| Me +[Removal] = 0:5-0:14 + >---------< +0| [Leading delimiter] = 0:5-0:6 >-< -0| Me +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/comment.block.scope b/data/fixtures/scopes/xml/comment.block.scope index a1c5843a5e..bf46a7b167 100644 --- a/data/fixtures/scopes/xml/comment.block.scope +++ b/data/fixtures/scopes/xml/comment.block.scope @@ -1,15 +1,10 @@ - + --- [Content] = [Removal] = -[Domain] = 0:0-2:3 - >---- -0| - ---< +[Domain] = 0:0-0:20 + >--------------------< +0| [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/xml/element.scope b/data/fixtures/scopes/xml/element.scope index 2f1a2d68a5..6517105dbe 100644 --- a/data/fixtures/scopes/xml/element.scope +++ b/data/fixtures/scopes/xml/element.scope @@ -1,10 +1,10 @@ -Me + --- [Content] = [Removal] = -[Domain] = 0:0-0:25 - >-------------------------< -0| Me +[Domain] = 0:0-0:13 + >-------------< +0| [Insertion delimiter] = "\n" diff --git a/data/fixtures/scopes/xml/endTag.scope b/data/fixtures/scopes/xml/endTag.scope index b36de243a3..0bf4a3eb11 100644 --- a/data/fixtures/scopes/xml/endTag.scope +++ b/data/fixtures/scopes/xml/endTag.scope @@ -1,13 +1,13 @@ -Me + --- [Content] = -[Removal] = 0:18-0:25 - >-------< -0| Me +[Removal] = 0:6-0:13 + >-------< +0| -[Domain] = 0:0-0:25 - >-------------------------< -0| Me +[Domain] = 0:0-0:13 + >-------------< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/interior.element.scope b/data/fixtures/scopes/xml/interior.element.scope index e5f4411af9..4a43b91a60 100644 --- a/data/fixtures/scopes/xml/interior.element.scope +++ b/data/fixtures/scopes/xml/interior.element.scope @@ -1,37 +1,37 @@ -Me + --- [#1 Content] = [#1 Removal] = 0:1-0:5 >----< -0| Me +0| [#1 Domain] = 0:0-0:6 >------< -0| Me +0| [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Removal] = 0:6-0:8 - >--< -0| Me +[#2 Removal] = 0:6-0:7 + >-< +0| -[#2 Domain] = 0:0-0:15 - >---------------< -0| Me +[#2 Domain] = 0:0-0:14 + >--------------< +0| [#2 Insertion delimiter] = " " [#3 Content] = -[#3 Removal] = 0:10-0:14 - >----< -0| Me +[#3 Removal] = 0:9-0:13 + >----< +0| -[#3 Domain] = 0:8-0:15 - >-------< -0| Me +[#3 Domain] = 0:7-0:14 + >-------< +0| [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/key.attribute.scope b/data/fixtures/scopes/xml/key.attribute.scope index c2a9d776c7..6f52667dc0 100644 --- a/data/fixtures/scopes/xml/key.attribute.scope +++ b/data/fixtures/scopes/xml/key.attribute.scope @@ -1,20 +1,20 @@ -Me + --- [Content] = 0:6-0:8 >--< -0| Me +0| [Removal] = 0:6-0:9 >---< -0| Me +0| [Trailing delimiter] = 0:8-0:9 >-< -0| Me +0| -[Domain] = 0:6-0:15 - >---------< -0| Me +[Domain] = 0:6-0:14 + >--------< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/startTag.scope b/data/fixtures/scopes/xml/startTag.scope index 9ce8da9abf..8151af8cef 100644 --- a/data/fixtures/scopes/xml/startTag.scope +++ b/data/fixtures/scopes/xml/startTag.scope @@ -1,13 +1,13 @@ -Me + --- [Content] = -[Removal] = 0:0-0:16 - >----------------< -0| Me +[Removal] = 0:0-0:6 + >------< +0| -[Domain] = 0:0-0:25 - >-------------------------< -0| Me +[Domain] = 0:0-0:13 + >-------------< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/string.singleLine.scope b/data/fixtures/scopes/xml/string.singleLine.scope index 8a003dd6ae..be674738b3 100644 --- a/data/fixtures/scopes/xml/string.singleLine.scope +++ b/data/fixtures/scopes/xml/string.singleLine.scope @@ -1,10 +1,10 @@ -Me + --- [Content] = [Removal] = -[Domain] = 0:9-0:15 - >------< -0| Me +[Domain] = 0:9-0:14 + >-----< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/tags.scope b/data/fixtures/scopes/xml/tags.scope index b0287ac7ce..465a241d69 100644 --- a/data/fixtures/scopes/xml/tags.scope +++ b/data/fixtures/scopes/xml/tags.scope @@ -1,20 +1,34 @@ -Me + --- -[#1.1 Content] = -[#1.1 Removal] = 0:0-0:16 - >----------------< -0| Me +[#1.1 Content] = 0:0-0:6 + >------< +0| + +[#1.1 Removal] = 0:0-0:7 + >-------< +0| + +[#1.1 Trailing delimiter] = 0:6-0:7 + >-< +0| [#1.1 Insertion delimiter] = " " -[#1.2 Content] = -[#1.2 Removal] = 0:18-0:25 - >-------< -0| Me +[#1.2 Content] = 0:7-0:14 + >-------< +0| + +[#1.2 Removal] = 0:6-0:14 + >--------< +0| + +[#1.2 Leading delimiter] = 0:6-0:7 + >-< +0| [#1.2 Insertion delimiter] = " " -[#1 Domain] = 0:0-0:25 - >-------------------------< -0| Me +[#1 Domain] = 0:0-0:14 + >--------------< +0| diff --git a/data/fixtures/scopes/xml/textFragment.comment.block.scope b/data/fixtures/scopes/xml/textFragment.comment.block.scope index b25539f2d7..4bc2c04d34 100644 --- a/data/fixtures/scopes/xml/textFragment.comment.block.scope +++ b/data/fixtures/scopes/xml/textFragment.comment.block.scope @@ -1,15 +1,10 @@ - + --- [Content] = [Removal] = -[Domain] = 0:0-2:3 - >---- -0| - ---< +[Domain] = 0:0-0:20 + >--------------------< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/textFragment.element.scope b/data/fixtures/scopes/xml/textFragment.element.scope index 8521c6a84d..4fa98c8455 100644 --- a/data/fixtures/scopes/xml/textFragment.element.scope +++ b/data/fixtures/scopes/xml/textFragment.element.scope @@ -1,10 +1,10 @@ -Me +Hello world --- [Content] = [Removal] = -[Domain] = 0:6-0:8 - >--< -0| Me +[Domain] = 0:6-0:17 + >-----------< +0| Hello world [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/textFragment.string.singleLine.scope b/data/fixtures/scopes/xml/textFragment.string.singleLine.scope index 3f9ba7b635..3256a9c1ba 100644 --- a/data/fixtures/scopes/xml/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/xml/textFragment.string.singleLine.scope @@ -1,10 +1,10 @@ - + --- [Content] = [Removal] = -[Domain] = 0:10-0:14 - >----< -0| +[Domain] = 0:10-0:13 + >---< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/xml/value.attribute.scope b/data/fixtures/scopes/xml/value.attribute.scope index 1d7c1e12d0..2c42eb8dc8 100644 --- a/data/fixtures/scopes/xml/value.attribute.scope +++ b/data/fixtures/scopes/xml/value.attribute.scope @@ -1,20 +1,20 @@ -Me + --- -[Content] = 0:9-0:15 - >------< -0| Me +[Content] = 0:9-0:14 + >-----< +0| -[Removal] = 0:8-0:15 - >-------< -0| Me +[Removal] = 0:8-0:14 + >------< +0| [Leading delimiter] = 0:8-0:9 >-< -0| Me +0| -[Domain] = 0:6-0:15 - >---------< -0| Me +[Domain] = 0:6-0:14 + >--------< +0| [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/key.mapPair.iteration.scope b/data/fixtures/scopes/yaml/key.mapPair.iteration.scope index 487d85d056..aadfce1bd6 100644 --- a/data/fixtures/scopes/yaml/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/yaml/key.mapPair.iteration.scope @@ -1,20 +1,20 @@ -obj: - name: "foo" - value: 123 +foo: + aaa: 0 + bbb: 1 --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-2:8 >---- -0| obj: -1| name: "foo" -2| value: 123 - ------------< +0| foo: +1| aaa: 0 +2| bbb: 1 + --------< [#2 Content] = -[#2 Domain] = 1:2-2:12 - >----------- -1| name: "foo" -2| value: 123 - ------------< +[#2 Domain] = 1:2-2:8 + >------ +1| aaa: 0 +2| bbb: 1 + --------< diff --git a/data/fixtures/scopes/yaml/key.mapPair.scope b/data/fixtures/scopes/yaml/key.mapPair.scope index 7951202cd2..8cded4d88c 100644 --- a/data/fixtures/scopes/yaml/key.mapPair.scope +++ b/data/fixtures/scopes/yaml/key.mapPair.scope @@ -1,67 +1,67 @@ -obj: - name: "foo" - value: 123 +foo: + aaa: 0 + bbb: 1 --- [#1 Content] = 0:0-0:3 >---< -0| obj: +0| foo: [#1 Removal] = 0:0-1:2 >---- -0| obj: -1| name: "foo" +0| foo: +1| aaa: 0 --< [#1 Trailing delimiter] = 0:3-1:2 >- -0| obj: -1| name: "foo" +0| foo: +1| aaa: 0 --< -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-2:8 >---- -0| obj: -1| name: "foo" -2| value: 123 - ------------< +0| foo: +1| aaa: 0 +2| bbb: 1 + --------< [#1 Insertion delimiter] = " " -[#2 Content] = 1:2-1:6 - >----< -1| name: "foo" +[#2 Content] = 1:2-1:5 + >---< +1| aaa: 0 -[#2 Removal] = 1:2-1:8 - >------< -1| name: "foo" +[#2 Removal] = 1:2-1:7 + >-----< +1| aaa: 0 -[#2 Trailing delimiter] = 1:6-1:8 - >--< -1| name: "foo" +[#2 Trailing delimiter] = 1:5-1:7 + >--< +1| aaa: 0 -[#2 Domain] = 1:2-1:13 - >-----------< -1| name: "foo" +[#2 Domain] = 1:2-1:8 + >------< +1| aaa: 0 [#2 Insertion delimiter] = " " -[#3 Content] = 2:2-2:7 - >-----< -2| value: 123 +[#3 Content] = 2:2-2:5 + >---< +2| bbb: 1 -[#3 Removal] = 2:2-2:9 - >-------< -2| value: 123 +[#3 Removal] = 2:2-2:7 + >-----< +2| bbb: 1 -[#3 Trailing delimiter] = 2:7-2:9 - >--< -2| value: 123 +[#3 Trailing delimiter] = 2:5-2:7 + >--< +2| bbb: 1 -[#3 Domain] = 2:2-2:12 - >----------< -2| value: 123 +[#3 Domain] = 2:2-2:8 + >------< +2| bbb: 1 [#3 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/list.scope b/data/fixtures/scopes/yaml/list.scope index 41c3a0df61..3cf5ece386 100644 --- a/data/fixtures/scopes/yaml/list.scope +++ b/data/fixtures/scopes/yaml/list.scope @@ -1,17 +1,17 @@ -items: [1, 2, 3] +foo: [aaa, bbb] --- [Content] = -[Domain] = 0:7-0:16 - >---------< -0| items: [1, 2, 3] +[Domain] = 0:5-0:15 + >----------< +0| foo: [aaa, bbb] -[Removal] = 0:6-0:16 - >----------< -0| items: [1, 2, 3] +[Removal] = 0:4-0:15 + >-----------< +0| foo: [aaa, bbb] -[Leading delimiter] = 0:6-0:7 - >-< -0| items: [1, 2, 3] +[Leading delimiter] = 0:4-0:5 + >-< +0| foo: [aaa, bbb] [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/list2.scope b/data/fixtures/scopes/yaml/list2.scope index 7fb258c465..2d78b8a388 100644 --- a/data/fixtures/scopes/yaml/list2.scope +++ b/data/fixtures/scopes/yaml/list2.scope @@ -1,27 +1,24 @@ -items: - - 1 - - 2 - - 3 +foo: + - aaa + - bbb --- [Content] = -[Domain] = 1:2-3:5 - >--- -1| - 1 -2| - 2 -3| - 3 - -----< +[Domain] = 1:2-2:7 + >----- +1| - aaa +2| - bbb + -------< -[Removal] = 0:6-3:5 - > -0| items: -1| - 1 -2| - 2 -3| - 3 - -----< +[Removal] = 0:4-2:7 + > +0| foo: +1| - aaa +2| - bbb + -------< [Leading delimiter] = 1:0-1:2 >--< -1| - 1 +1| - aaa [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/map.scope b/data/fixtures/scopes/yaml/map.scope index ebfb5b37b0..c19667d5fb 100644 --- a/data/fixtures/scopes/yaml/map.scope +++ b/data/fixtures/scopes/yaml/map.scope @@ -1,36 +1,36 @@ -obj: - name: "foo" - value: 123 +foo: + aaa: 0 + bbb: 1 --- [#1 Content] = [#1 Removal] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-2:8 >---- -0| obj: -1| name: "foo" -2| value: 123 - ------------< +0| foo: +1| aaa: 0 +2| bbb: 1 + --------< [#1 Insertion delimiter] = " " [#2 Content] = -[#2 Domain] = 1:2-2:12 - >----------- -1| name: "foo" -2| value: 123 - ------------< +[#2 Domain] = 1:2-2:8 + >------ +1| aaa: 0 +2| bbb: 1 + --------< -[#2 Removal] = 0:4-2:12 +[#2 Removal] = 0:4-2:8 > -0| obj: -1| name: "foo" -2| value: 123 - ------------< +0| foo: +1| aaa: 0 +2| bbb: 1 + --------< [#2 Leading delimiter] = 1:0-1:2 >--< -1| name: "foo" +1| aaa: 0 [#2 Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/string.singleLine.scope b/data/fixtures/scopes/yaml/string.singleLine.scope index acbfec0bb6..b524bd2aa0 100644 --- a/data/fixtures/scopes/yaml/string.singleLine.scope +++ b/data/fixtures/scopes/yaml/string.singleLine.scope @@ -1,17 +1,17 @@ -value: "hello world" +foo: "Hello world" --- [Content] = -[Domain] = 0:7-0:20 - >-------------< -0| value: "hello world" +[Domain] = 0:5-0:18 + >-------------< +0| foo: "Hello world" -[Removal] = 0:6-0:20 - >--------------< -0| value: "hello world" +[Removal] = 0:4-0:18 + >--------------< +0| foo: "Hello world" -[Leading delimiter] = 0:6-0:7 - >-< -0| value: "hello world" +[Leading delimiter] = 0:4-0:5 + >-< +0| foo: "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/string.singleLine2.scope b/data/fixtures/scopes/yaml/string.singleLine2.scope index 0c9f84ad77..e0962d548a 100644 --- a/data/fixtures/scopes/yaml/string.singleLine2.scope +++ b/data/fixtures/scopes/yaml/string.singleLine2.scope @@ -1,17 +1,17 @@ -value: hello world +foo: Hello world --- [Content] = -[Domain] = 0:7-0:18 - >-----------< -0| value: hello world +[Domain] = 0:5-0:16 + >-----------< +0| foo: Hello world -[Removal] = 0:6-0:18 - >------------< -0| value: hello world +[Removal] = 0:4-0:16 + >------------< +0| foo: Hello world -[Leading delimiter] = 0:6-0:7 - >-< -0| value: hello world +[Leading delimiter] = 0:4-0:5 + >-< +0| foo: Hello world [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/textFragment.string.singleLine.scope b/data/fixtures/scopes/yaml/textFragment.string.singleLine.scope index 178104ab0f..9c5f96f796 100644 --- a/data/fixtures/scopes/yaml/textFragment.string.singleLine.scope +++ b/data/fixtures/scopes/yaml/textFragment.string.singleLine.scope @@ -1,10 +1,10 @@ -value: "hello world" +foo: "Hello world" --- [Content] = [Removal] = -[Domain] = 0:8-0:19 - >-----------< -0| value: "hello world" +[Domain] = 0:6-0:17 + >-----------< +0| foo: "Hello world" [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/textFragment.string.singleLine2.scope b/data/fixtures/scopes/yaml/textFragment.string.singleLine2.scope index 0c9f84ad77..e0962d548a 100644 --- a/data/fixtures/scopes/yaml/textFragment.string.singleLine2.scope +++ b/data/fixtures/scopes/yaml/textFragment.string.singleLine2.scope @@ -1,17 +1,17 @@ -value: hello world +foo: Hello world --- [Content] = -[Domain] = 0:7-0:18 - >-----------< -0| value: hello world +[Domain] = 0:5-0:16 + >-----------< +0| foo: Hello world -[Removal] = 0:6-0:18 - >------------< -0| value: hello world +[Removal] = 0:4-0:16 + >------------< +0| foo: Hello world -[Leading delimiter] = 0:6-0:7 - >-< -0| value: hello world +[Leading delimiter] = 0:4-0:5 + >-< +0| foo: Hello world [Insertion delimiter] = " " diff --git a/data/fixtures/scopes/yaml/value.mapPair.iteration.scope b/data/fixtures/scopes/yaml/value.mapPair.iteration.scope index 487d85d056..aadfce1bd6 100644 --- a/data/fixtures/scopes/yaml/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/yaml/value.mapPair.iteration.scope @@ -1,20 +1,20 @@ -obj: - name: "foo" - value: 123 +foo: + aaa: 0 + bbb: 1 --- [#1 Content] = -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-2:8 >---- -0| obj: -1| name: "foo" -2| value: 123 - ------------< +0| foo: +1| aaa: 0 +2| bbb: 1 + --------< [#2 Content] = -[#2 Domain] = 1:2-2:12 - >----------- -1| name: "foo" -2| value: 123 - ------------< +[#2 Domain] = 1:2-2:8 + >------ +1| aaa: 0 +2| bbb: 1 + --------< diff --git a/data/fixtures/scopes/yaml/value.mapPair.scope b/data/fixtures/scopes/yaml/value.mapPair.scope index 7508ea7c6f..d7542cd18a 100644 --- a/data/fixtures/scopes/yaml/value.mapPair.scope +++ b/data/fixtures/scopes/yaml/value.mapPair.scope @@ -1,70 +1,70 @@ -obj: - name: "foo" - value: 123 +foo: + aaa: 0 + bbb: 1 --- -[#1 Content] = 1:2-2:12 - >----------- -1| name: "foo" -2| value: 123 - ------------< +[#1 Content] = 1:2-2:8 + >------ +1| aaa: 0 +2| bbb: 1 + --------< -[#1 Removal] = 0:3-2:12 +[#1 Removal] = 0:3-2:8 >- -0| obj: -1| name: "foo" -2| value: 123 - ------------< +0| foo: +1| aaa: 0 +2| bbb: 1 + --------< [#1 Leading delimiter] = 0:3-1:2 >- -0| obj: -1| name: "foo" +0| foo: +1| aaa: 0 --< -[#1 Domain] = 0:0-2:12 +[#1 Domain] = 0:0-2:8 >---- -0| obj: -1| name: "foo" -2| value: 123 - ------------< +0| foo: +1| aaa: 0 +2| bbb: 1 + --------< [#1 Insertion delimiter] = " " -[#2 Content] = 1:8-1:13 - >-----< -1| name: "foo" +[#2 Content] = 1:7-1:8 + >-< +1| aaa: 0 -[#2 Removal] = 1:6-1:13 - >-------< -1| name: "foo" +[#2 Removal] = 1:5-1:8 + >---< +1| aaa: 0 -[#2 Leading delimiter] = 1:6-1:8 - >--< -1| name: "foo" +[#2 Leading delimiter] = 1:5-1:7 + >--< +1| aaa: 0 -[#2 Domain] = 1:2-1:13 - >-----------< -1| name: "foo" +[#2 Domain] = 1:2-1:8 + >------< +1| aaa: 0 [#2 Insertion delimiter] = " " -[#3 Content] = 2:9-2:12 - >---< -2| value: 123 +[#3 Content] = 2:7-2:8 + >-< +2| bbb: 1 -[#3 Removal] = 2:7-2:12 - >-----< -2| value: 123 +[#3 Removal] = 2:5-2:8 + >---< +2| bbb: 1 -[#3 Leading delimiter] = 2:7-2:9 - >--< -2| value: 123 +[#3 Leading delimiter] = 2:5-2:7 + >--< +2| bbb: 1 -[#3 Domain] = 2:2-2:12 - >----------< -2| value: 123 +[#3 Domain] = 2:2-2:8 + >------< +2| bbb: 1 [#3 Insertion delimiter] = " " diff --git a/data/scopeSupportFacetInfos.md b/data/scopeSupportFacetInfos.md index f060f49de6..409194f04e 100644 --- a/data/scopeSupportFacetInfos.md +++ b/data/scopeSupportFacetInfos.md @@ -220,7 +220,7 @@ ### name - `name.argument.actual` Name of a (keyword) argument in a function call -- `name.argument.actual.iteration` Iteration scope for names of the arguments in a function call: the argument list. The domain should be the whole function call. +- `name.argument.actual.iteration` Iteration scope for names of (keyword) arguments in a function call: the argument list.. - `name.argument.catch` Name of a parameter in a catch clause - `name.argument.formal` Name of a parameter in a function declaration - `name.argument.formal.constructor` The name of a parameter in a constructor declaration @@ -377,7 +377,7 @@ ### value - `value.argument.actual` The value of a (keyword) argument in a function call -- `value.argument.actual.iteration` Iteration scope for values of arguments in a function call: the arguments list. The domain should be the entire function call. +- `value.argument.actual.iteration` Iteration scope for values of (keyword) arguments in a function call: the arguments list.. - `value.argument.formal` The value of a (keyword) argument in a function declaration - `value.argument.formal.constructor` The value of a parameter in a constructor declaration - `value.argument.formal.constructor.iteration` Iteration scope for values of formal parameters in a constructor declaration: the parameters list. The domain should be the entire constructor. diff --git a/packages/common/src/scopeSupportFacets/go.ts b/packages/common/src/scopeSupportFacets/go.ts index d09a610fd3..835ea8a95e 100644 --- a/packages/common/src/scopeSupportFacets/go.ts +++ b/packages/common/src/scopeSupportFacets/go.ts @@ -5,9 +5,13 @@ import { ScopeSupportFacetLevel } from "./scopeSupportFacets.types"; const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel; export const goScopeSupport: LanguageScopeSupportFacetMap = { - "comment.line": supported, disqualifyDelimiter: supported, + "comment.line": supported, + + "string.singleLine": supported, + "string.multiLine": supported, + "textFragment.string.singleLine": supported, "textFragment.string.multiLine": supported, "textFragment.comment.line": supported, diff --git a/packages/common/src/scopeSupportFacets/lua.ts b/packages/common/src/scopeSupportFacets/lua.ts index 0e10f302dc..47ca17c0f2 100644 --- a/packages/common/src/scopeSupportFacets/lua.ts +++ b/packages/common/src/scopeSupportFacets/lua.ts @@ -5,6 +5,7 @@ const { supported, notApplicable } = ScopeSupportFacetLevel; export const luaScopeSupport: LanguageScopeSupportFacetMap = { tags: notApplicable, + functionCall: supported, functionCallee: supported, map: supported, ifStatement: supported, diff --git a/packages/common/src/scopeSupportFacets/php.ts b/packages/common/src/scopeSupportFacets/php.ts index 8806c9e1a9..ab00d104ae 100644 --- a/packages/common/src/scopeSupportFacets/php.ts +++ b/packages/common/src/scopeSupportFacets/php.ts @@ -42,12 +42,16 @@ export const phpScopeSupport: LanguageScopeSupportFacetMap = { "type.argument.formal": supported, "type.argument.formal.iteration": supported, + "type.argument.catch": supported, "type.cast": supported, "type.field.class": supported, "name.argument.formal": supported, "name.argument.formal.iteration": supported, + "name.argument.catch": supported, "name.field.class": supported, + "string.singleLine": supported, + disqualifyDelimiter: supported, }; diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts index c40b220c1d..8ffbd58dab 100644 --- a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts +++ b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts @@ -618,8 +618,8 @@ export const scopeSupportFacetInfos: Record< }, "name.argument.actual.iteration": iteration( "name", - "names of the arguments in a function call", - "the argument list. The domain should be the whole function call", + "names of (keyword) arguments in a function call", + "the argument list.", ), "name.argument.formal": { description: "Name of a parameter in a function declaration", @@ -744,8 +744,8 @@ export const scopeSupportFacetInfos: Record< }, "value.argument.actual.iteration": iteration( "value", - "values of arguments in a function call", - "the arguments list. The domain should be the entire function call", + "values of (keyword) arguments in a function call", + "the arguments list.", ), "value.argument.formal": { description: "The value of a (keyword) argument in a function declaration", diff --git a/packages/cursorless-org-docs/src/docs/components/Code.css b/packages/cursorless-org-docs/src/docs/components/Code.css index 18394a5cb4..775de931e0 100644 --- a/packages/cursorless-org-docs/src/docs/components/Code.css +++ b/packages/cursorless-org-docs/src/docs/components/Code.css @@ -3,6 +3,7 @@ width: 100%; min-height: 50px; counter-reset: line; + margin-bottom: 0.25rem; } .code-container .shiki { diff --git a/packages/cursorless-org-docs/src/docs/components/Code.tsx b/packages/cursorless-org-docs/src/docs/components/Code.tsx index ba1a7bedd9..5c14b9eadb 100644 --- a/packages/cursorless-org-docs/src/docs/components/Code.tsx +++ b/packages/cursorless-org-docs/src/docs/components/Code.tsx @@ -24,10 +24,10 @@ export function Code({ const [copied, setCopied] = useState(false); useEffect(() => { - if (renderWhitespace) { - children = children.replaceAll(" ", "␣").replaceAll("\t", "⭾"); - } - codeToHtml(children, { + const code = renderWhitespace + ? children.replaceAll(" ", "␣").replaceAll("\t", "⭾") + : children; + codeToHtml(code, { lang: getFallbackLanguage(languageId), theme: "nord", decorations, diff --git a/packages/cursorless-org-docs/src/docs/components/DynamicTOC.tsx b/packages/cursorless-org-docs/src/docs/components/DynamicTOC.tsx index 78ea7d9f7b..af7c50d162 100644 --- a/packages/cursorless-org-docs/src/docs/components/DynamicTOC.tsx +++ b/packages/cursorless-org-docs/src/docs/components/DynamicTOC.tsx @@ -35,7 +35,7 @@ function getTOC(minHeadingLevel: number, maxHeadingLevel: number) { col.className = "col col--3"; const toc = document.createElement("div"); - toc.className = "tableOfContents_tkZC thin-scrollbar"; + toc.className = "tableOfContents_TDAO thin-scrollbar"; const ul = document.createElement("ul"); ul.className = "table-of-contents table-of-contents__left-border"; diff --git a/packages/cursorless-org-docs/src/docs/components/ScopeVisualizer.tsx b/packages/cursorless-org-docs/src/docs/components/ScopeVisualizer.tsx index 06d293959c..9a658a2661 100644 --- a/packages/cursorless-org-docs/src/docs/components/ScopeVisualizer.tsx +++ b/packages/cursorless-org-docs/src/docs/components/ScopeVisualizer.tsx @@ -48,7 +48,9 @@ export function ScopeVisualizer({ languageId, scopeTypeType }: Props) { getScopeFixtures(scopeTests, languageId, scopeTypeType), ); const [rangeType, setRangeType] = useState("content"); - const [renderWhitespace, setRenderWhitespace] = useState(false); + const [renderWhitespace, setRenderWhitespace] = useState( + scopeTypeType != null, + ); const renderOptions = () => { return ( @@ -185,7 +187,10 @@ function renderFacet( if (scopeTypeType != null && previousLanguageId !== facetLanguageId) { previousLanguageId = facetLanguageId; return ( -
+
{prettifyLanguageName(facetLanguageId)}
); diff --git a/queries/c.scm b/queries/c.scm index 5ed6ce299a..c7aaf0796d 100644 --- a/queries/c.scm +++ b/queries/c.scm @@ -428,7 +428,7 @@ "{" @interior.start.endOf "}" @interior.end.startOf ) -) @_.domain +) @branch @_.domain ;;!! true ? 0 : 1 ;;! ^^^^ diff --git a/queries/cpp.scm b/queries/cpp.scm index 4d3bdad9a2..cbd13fb683 100644 --- a/queries/cpp.scm +++ b/queries/cpp.scm @@ -77,7 +77,8 @@ ) @anonymousFunction @interior.domain ;;!! [[attribute]] -(attribute_declaration) @attribute +;;! ^^^^^^^^^ +(attribute) @attribute ;; > curl https://raw.githubusercontent.com/tree-sitter/tree-sitter-cpp/master/src/node-types.json | jq '[.[] | select(.type == "_type_specifier") | .subtypes[].type]' [ diff --git a/queries/csharp.scm b/queries/csharp.scm index edcaa5f7bd..c73ba46c7e 100644 --- a/queries/csharp.scm +++ b/queries/csharp.scm @@ -391,7 +391,7 @@ "{" @branch.iteration.start.endOf @condition.iteration.start.endOf "}" @branch.iteration.end.startOf @condition.iteration.end.startOf ) -) +) @branch.iteration.domain (object_creation_expression initializer: (_) @map @list @@ -421,6 +421,7 @@ left: (_) @collectionKey ) @_.domain ) + (initializer_expression "{" @collectionKey.iteration.start.endOf @value.iteration.start.endOf "}" @collectionKey.iteration.end.startOf @value.iteration.end.startOf @@ -428,48 +429,41 @@ ;;!! String aaa; ;;! ^^^ -(variable_declaration - (variable_declarator - (identifier) @name +(_ + (variable_declaration + type: (_) @type + (variable_declarator + (identifier) @name + ) ) ) @_.domain ;;!! String aaa = "bbb"; ;;! ^^^ -(variable_declaration - (variable_declarator - (identifier) @name @value.leading.endOf - (equals_value_clause - (_) @value +(_ + (variable_declaration + type: (_) @type + (variable_declarator + (identifier) @name @value.leading.endOf + (equals_value_clause + (_) @value + ) ) ) ) @_.domain -( - (variable_declarator - (identifier) @name - ) @_.domain - (#not-parent-type? @_.domain variable_declaration) -) - -( - (variable_declarator - (identifier) @name @value.leading.endOf - (equals_value_clause - (_) @value - ) - ) @_.domain - (#not-parent-type? @_.domain variable_declaration) -) - ;;!! aaa = "bbb"; ;;! ^^^ ;;!! foo = 2; ;;! ^ -(assignment_expression - left: (_) @name @value.leading.endOf - right: (_) @value -) @_.domain +(_ + (assignment_expression + left: (_) @name @value.leading.endOf + right: (_) @value + ) @_.domain.start + . + ";"? @_.domain.end +) (_ name: (_) @name @@ -480,7 +474,7 @@ (_ type: (_) @type ) @_.domain - (#not-type? @_.domain catch_declaration cast_expression) + (#not-type? @_.domain catch_declaration cast_expression variable_declaration) ) ;;!! (int)5.5; @@ -604,15 +598,18 @@ operator: [ ">=" ">>" ] @disqualifyDelimiter + (assignment_operator [ "<<=" ">>=" ] @disqualifyDelimiter ) + (lambda_expression "=>" @disqualifyDelimiter ) + (member_access_expression "->" @disqualifyDelimiter ) diff --git a/queries/dart.scm b/queries/dart.scm index 26a6c331b0..3f8a70e974 100644 --- a/queries/dart.scm +++ b/queries/dart.scm @@ -1,6 +1,9 @@ ;;!! if () {} ;;! ^^^^^^^^ -(if_statement) @ifStatement +( + (if_statement) @ifStatement @statement + (#not-parent-type? @ifStatement if_statement) +) ;;!! [ 0 ] ;;! ^^^^^ diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm index f44c46c808..5df0c89704 100644 --- a/queries/javascript.core.scm +++ b/queries/javascript.core.scm @@ -71,6 +71,7 @@ public_field_definition field_definition generic_type + property_signature ) ) @@ -449,9 +450,13 @@ ;;!! yield 0; ;;! ^ ;;! -------- -(yield_expression - (_) @value -) @_.domain +(_ + (yield_expression + (_) @value + ) @_.domain.start + . + ";"? @_.domain.end +) ;;!! str => 0 ;;! ^ diff --git a/queries/javascript.scm b/queries/javascript.scm index 1ec03b8a75..8d94112311 100644 --- a/queries/javascript.scm +++ b/queries/javascript.scm @@ -57,6 +57,12 @@ ) @_.domain ) +;;!! function foo(...aaa) {} +;;! ^^^ +(rest_pattern + (identifier) @name +) @_.domain + ;;!! catch(error) {} ;;! ^^^^^ (catch_clause diff --git a/queries/lua.scm b/queries/lua.scm index 973aaf2f3e..e176daa432 100644 --- a/queries/lua.scm +++ b/queries/lua.scm @@ -218,7 +218,8 @@ ;;! ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ (function_declaration name: (_) @functionName - body: (_)? @interior + parameters: (_) @interior.start.endOf + "end" @interior.end.startOf ) @namedFunction @_.domain ;; inside lambda: @@ -228,9 +229,9 @@ ;;!! __add = function(a, b) return a + b end ;;! ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ (function_definition - !name - body: (_)? @interior -) @anonymousFunction @interior.domain + parameters: (_) @interior.start.endOf + "end" @interior.end.startOf +) @anonymousFunction @_.domain ;; Names and values diff --git a/queries/php.scm b/queries/php.scm index 3ef6552914..3a3d4dd0ff 100644 --- a/queries/php.scm +++ b/queries/php.scm @@ -74,21 +74,20 @@ ) @class @className.domain [ - (function_definition) @namedFunction - (method_declaration) @namedFunction - (expression_statement - (assignment_expression - right: (anonymous_function) - ) @namedFunction - ";" @_.trailing - ) - (expression_statement - (assignment_expression - right: (arrow_function) - ) @namedFunction - ";" @_.trailing - ) -] @namedFunction.domain + (function_definition) + (method_declaration) +] @namedFunction + +(expression_statement + (assignment_expression + right: [ + (anonymous_function) + (arrow_function) + ] + ) @namedFunction.start + . + ";"? @namedFunction.end +) [ (anonymous_function) @@ -112,18 +111,26 @@ ;;!! $value = 2; ;;! ^^^^^^ ;;! ^ -(assignment_expression - left: (_) @name @value.leading.endOf - right: (_) @value -) @_.domain +(_ + (assignment_expression + left: (_) @name @value.leading.endOf + right: (_) @value + ) @_.domain.start + . + ";"? @_.domain.end +) ;;!! $value += 2; ;;! ^^^^^^ ;;! ^ -(augmented_assignment_expression - left: (_) @name @value.leading.endOf - right: (_) @value -) @_.domain +(_ + (augmented_assignment_expression + left: (_) @name @value.leading.endOf + right: (_) @value + ) @_.domain.start + . + ";"? @_.domain.end +) (class_declaration name: (_) @name @@ -210,10 +217,14 @@ ;;!! yield 2; ;;! ^ -(yield_expression - "yield" @_.leading.endOf - (_) @value -) @_.domain +(_ + (yield_expression + "yield" @_.leading.endOf + (_) @value + ) @_.domain.start + . + ";"? @_.domain.end +) ;;!! (string $str) ;;! ^^^^^^ @@ -234,9 +245,9 @@ ;;!! catch (Exception $e) {} ;;! ^^^^^^^^^ (catch_clause - type: (_) @type - name: (_) @name -) @_.domain + type: (_) @type @_.domain.start + name: (_) @name @_.domain.end +) (formal_parameters "(" @type.iteration.start.endOf @name.iteration.start.endOf @value.iteration.start.endOf @@ -254,7 +265,7 @@ ;;! ^^^^^^ ;;! ^^^^^^ (property_declaration - type: (_) @type + type: (_)? @type (property_element (variable_name) @name ) diff --git a/queries/rust.scm b/queries/rust.scm index 989fc7ac02..dde0ec29b6 100644 --- a/queries/rust.scm +++ b/queries/rust.scm @@ -34,7 +34,10 @@ ;;!! if v < 0 {} ;;! ^^^^^^^^^^^ -(if_expression) @ifStatement +( + (if_expression) @ifStatement @statement + (#not-parent-type? @ifStatement else_clause) +) ;;!! if let Some(i) = number {} ;;! ^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/queries/scala.scm b/queries/scala.scm index 8b95d19af5..29e3d83dfe 100644 --- a/queries/scala.scm +++ b/queries/scala.scm @@ -1,6 +1,9 @@ ;; https://github.com/tree-sitter/tree-sitter-scala/blob/master/src/grammar.json -(if_expression) @ifStatement +( + (if_expression) @ifStatement @statement + (#not-parent-type? @ifStatement if_expression) +) [ (string) diff --git a/queries/typescript.core.scm b/queries/typescript.core.scm index 3752bd2fc9..d0dfe41437 100644 --- a/queries/typescript.core.scm +++ b/queries/typescript.core.scm @@ -70,6 +70,14 @@ (identifier) @name ) @_.domain +;;!! function foo(...aaa: number[]) {} +;;! ^^^ +(_ + (rest_pattern + (identifier) @name + ) +) @_.domain + ;; Define these here because these node types don't exist in javascript. (_ [ @@ -417,7 +425,7 @@ ;;! ------------ (_ (property_signature - name: (_) @collectionKey @type.leading.endOf + name: (_) @name @collectionKey @type.leading.endOf type: (_ ":" (_) @type @collectionKey.trailing.startOf