diff --git a/data/fixtures/scopes/c/argument/argument.actual.iteration.scope b/data/fixtures/scopes/c/argument/argument.actual.iteration.scope index c6b7e07196..3f067b0c64 100644 --- a/data/fixtures/scopes/c/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/c/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ foo(aaa, bbb); --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| foo(aaa, bbb); diff --git a/data/fixtures/scopes/c/argument/argument.actual.method.iteration.scope b/data/fixtures/scopes/c/argument/argument.actual.method.iteration.scope index b4fa962af8..7dc906b75a 100644 --- a/data/fixtures/scopes/c/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/c/argument/argument.actual.method.iteration.scope @@ -1,7 +1,7 @@ foo.bar(aaa, bbb); --- -[Range] = 0:8-0:16 +[Content] = 0:8-0:16 >--------< 0| foo.bar(aaa, bbb); diff --git a/data/fixtures/scopes/c/argument/argument.formal.iteration.scope b/data/fixtures/scopes/c/argument/argument.formal.iteration.scope index a59fd8e9cc..0040160459 100644 --- a/data/fixtures/scopes/c/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/c/argument/argument.formal.iteration.scope @@ -1,7 +1,7 @@ void foo(int aaa, int bbb) {} --- -[Range] = 0:9-0:25 +[Content] = 0:9-0:25 >----------------< 0| void foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/c/branch/branch.if.iteration.scope b/data/fixtures/scopes/c/branch/branch.if.iteration.scope index 86acdd382f..84064bd4fa 100644 --- a/data/fixtures/scopes/c/branch/branch.if.iteration.scope +++ b/data/fixtures/scopes/c/branch/branch.if.iteration.scope @@ -3,7 +3,7 @@ else if (false) {} else {} --- -[Range] = +[Content] = [Domain] = 0:0-2:7 >------------ 0| if (true) {} diff --git a/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope index 909be76c4a..0ffadea6cc 100644 --- a/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/c/branch/branch.switchCase.iteration.scope @@ -6,7 +6,7 @@ switch (value) { } --- -[Range] = 0:16-5:0 +[Content] = 0:16-5:0 > 0| switch (value) { 1| case 0: diff --git a/data/fixtures/scopes/c/branch/branch.ternary.iteration.scope b/data/fixtures/scopes/c/branch/branch.ternary.iteration.scope index 7c4fa798f9..4df7550099 100644 --- a/data/fixtures/scopes/c/branch/branch.ternary.iteration.scope +++ b/data/fixtures/scopes/c/branch/branch.ternary.iteration.scope @@ -1,7 +1,7 @@ true ? 0 : 1; --- -[Range] = +[Content] = [Domain] = 0:0-0:12 >------------< 0| true ? 0 : 1; diff --git a/data/fixtures/scopes/c/class/class.iteration.document.scope b/data/fixtures/scopes/c/class/class.iteration.document.scope index 732f409fd3..e749942fd0 100644 --- a/data/fixtures/scopes/c/class/class.iteration.document.scope +++ b/data/fixtures/scopes/c/class/class.iteration.document.scope @@ -3,7 +3,7 @@ struct Foo {}; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/c/className.iteration.document.scope b/data/fixtures/scopes/c/className.iteration.document.scope index 732f409fd3..e749942fd0 100644 --- a/data/fixtures/scopes/c/className.iteration.document.scope +++ b/data/fixtures/scopes/c/className.iteration.document.scope @@ -3,7 +3,7 @@ struct Foo {}; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/c/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/c/collectionItem.unenclosed.iteration.scope index 667786128a..645b2a1175 100644 --- a/data/fixtures/scopes/c/collectionItem.unenclosed.iteration.scope +++ b/data/fixtures/scopes/c/collectionItem.unenclosed.iteration.scope @@ -1,7 +1,7 @@ int foo, bar; --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| int foo, bar; diff --git a/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope index e236bec91b..f654d7ce4f 100644 --- a/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/c/condition/condition.switchCase.iteration.scope @@ -1,7 +1,7 @@ switch (value) { } --- -[Range] = 0:16-0:17 +[Content] = 0:16-0:17 >-< 0| switch (value) { } diff --git a/data/fixtures/scopes/c/functionName/functionName.iteration.document.scope b/data/fixtures/scopes/c/functionName/functionName.iteration.document.scope index 9f52edea4d..3196afd2bb 100644 --- a/data/fixtures/scopes/c/functionName/functionName.iteration.document.scope +++ b/data/fixtures/scopes/c/functionName/functionName.iteration.document.scope @@ -3,7 +3,7 @@ void foo() {} --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| 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 0fc17b3c8e..7935150f75 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); --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:27 >---------------------------< 0| void aaa(int bbb, int ccc); -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:9-0:25 >----------------< 0| void aaa(int bbb, int ccc); 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 bc0277a46c..400afaf133 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) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:29 >-----------------------------< 0| void aaa(int bbb, int ccc) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:9-0:25 >----------------< 0| void aaa(int bbb, int ccc) {} diff --git a/data/fixtures/scopes/c/name/name.iteration.block2.scope b/data/fixtures/scopes/c/name/name.iteration.block2.scope index dd07df8311..ea20927c6d 100644 --- a/data/fixtures/scopes/c/name/name.iteration.block2.scope +++ b/data/fixtures/scopes/c/name/name.iteration.block2.scope @@ -1,13 +1,13 @@ void foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void foo() { } diff --git a/data/fixtures/scopes/c/name/name.iteration.block3.scope b/data/fixtures/scopes/c/name/name.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/c/name/name.iteration.block3.scope +++ b/data/fixtures/scopes/c/name/name.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/c/name/name.iteration.block4.scope b/data/fixtures/scopes/c/name/name.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/c/name/name.iteration.block4.scope +++ b/data/fixtures/scopes/c/name/name.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/c/name/name.iteration.class.scope b/data/fixtures/scopes/c/name/name.iteration.class.scope index 91fb39ebc7..db6aaa88e6 100644 --- a/data/fixtures/scopes/c/name/name.iteration.class.scope +++ b/data/fixtures/scopes/c/name/name.iteration.class.scope @@ -3,7 +3,7 @@ struct Foo { }; typedef struct { } Bar; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:23 >--------------- 0| struct Foo { }; @@ -12,13 +12,13 @@ typedef struct { } Bar; -----------------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| struct Foo { }; -[#3 Range] = +[#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 af4e4e8adf..0919e73336 100644 --- a/data/fixtures/scopes/c/name/name.iteration.class2.scope +++ b/data/fixtures/scopes/c/name/name.iteration.class2.scope @@ -3,7 +3,7 @@ union Foo { }; typedef union { } Bar; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:22 >-------------- 0| union Foo { }; @@ -12,13 +12,13 @@ typedef union { } Bar; ----------------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| union Foo { }; -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:15-2:16 >-< 2| typedef union { } Bar; diff --git a/data/fixtures/scopes/c/name/name.iteration.document.scope b/data/fixtures/scopes/c/name/name.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/c/name/name.iteration.document.scope +++ b/data/fixtures/scopes/c/name/name.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/c/name/name.iteration.enum.scope b/data/fixtures/scopes/c/name/name.iteration.enum.scope index d8bda96971..53e30a0a61 100644 --- a/data/fixtures/scopes/c/name/name.iteration.enum.scope +++ b/data/fixtures/scopes/c/name/name.iteration.enum.scope @@ -1,13 +1,13 @@ enum Foo { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| enum Foo { }; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:10-0:11 >-< 0| enum Foo { }; diff --git a/data/fixtures/scopes/c/namedFunction.iteration.document.scope b/data/fixtures/scopes/c/namedFunction.iteration.document.scope index 80049bb80e..5f7229c80f 100644 --- a/data/fixtures/scopes/c/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/c/namedFunction.iteration.document.scope @@ -3,7 +3,7 @@ void foo() { } --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/c/statement/statement.iteration.block2.scope b/data/fixtures/scopes/c/statement/statement.iteration.block2.scope index dd07df8311..ea20927c6d 100644 --- a/data/fixtures/scopes/c/statement/statement.iteration.block2.scope +++ b/data/fixtures/scopes/c/statement/statement.iteration.block2.scope @@ -1,13 +1,13 @@ void foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void foo() { } diff --git a/data/fixtures/scopes/c/statement/statement.iteration.block3.scope b/data/fixtures/scopes/c/statement/statement.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/c/statement/statement.iteration.block3.scope +++ b/data/fixtures/scopes/c/statement/statement.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/c/statement/statement.iteration.block4.scope b/data/fixtures/scopes/c/statement/statement.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/c/statement/statement.iteration.block4.scope +++ b/data/fixtures/scopes/c/statement/statement.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/c/statement/statement.iteration.class.scope b/data/fixtures/scopes/c/statement/statement.iteration.class.scope index 91fb39ebc7..db6aaa88e6 100644 --- a/data/fixtures/scopes/c/statement/statement.iteration.class.scope +++ b/data/fixtures/scopes/c/statement/statement.iteration.class.scope @@ -3,7 +3,7 @@ struct Foo { }; typedef struct { } Bar; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:23 >--------------- 0| struct Foo { }; @@ -12,13 +12,13 @@ typedef struct { } Bar; -----------------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| struct Foo { }; -[#3 Range] = +[#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 af4e4e8adf..0919e73336 100644 --- a/data/fixtures/scopes/c/statement/statement.iteration.class2.scope +++ b/data/fixtures/scopes/c/statement/statement.iteration.class2.scope @@ -3,7 +3,7 @@ union Foo { }; typedef union { } Bar; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:22 >-------------- 0| union Foo { }; @@ -12,13 +12,13 @@ typedef union { } Bar; ----------------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| union Foo { }; -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:15-2:16 >-< 2| typedef union { } Bar; diff --git a/data/fixtures/scopes/c/statement/statement.iteration.document.scope b/data/fixtures/scopes/c/statement/statement.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/c/statement/statement.iteration.document.scope +++ b/data/fixtures/scopes/c/statement/statement.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/c/type/type.argument.formal.iteration.scope b/data/fixtures/scopes/c/type/type.argument.formal.iteration.scope index 5c4994663a..43a1ad05e5 100644 --- a/data/fixtures/scopes/c/type/type.argument.formal.iteration.scope +++ b/data/fixtures/scopes/c/type/type.argument.formal.iteration.scope @@ -1,13 +1,13 @@ void foo(int aaa, int bbb) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:29 >-----------------------------< 0| void foo(int aaa, int bbb) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:9-0:25 >----------------< 0| void foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/c/type/type.iteration.block2.scope b/data/fixtures/scopes/c/type/type.iteration.block2.scope index dd07df8311..ea20927c6d 100644 --- a/data/fixtures/scopes/c/type/type.iteration.block2.scope +++ b/data/fixtures/scopes/c/type/type.iteration.block2.scope @@ -1,13 +1,13 @@ void foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void foo() { } diff --git a/data/fixtures/scopes/c/type/type.iteration.block3.scope b/data/fixtures/scopes/c/type/type.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/c/type/type.iteration.block3.scope +++ b/data/fixtures/scopes/c/type/type.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/c/type/type.iteration.block4.scope b/data/fixtures/scopes/c/type/type.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/c/type/type.iteration.block4.scope +++ b/data/fixtures/scopes/c/type/type.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/c/type/type.iteration.class.scope b/data/fixtures/scopes/c/type/type.iteration.class.scope index 91fb39ebc7..db6aaa88e6 100644 --- a/data/fixtures/scopes/c/type/type.iteration.class.scope +++ b/data/fixtures/scopes/c/type/type.iteration.class.scope @@ -3,7 +3,7 @@ struct Foo { }; typedef struct { } Bar; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:23 >--------------- 0| struct Foo { }; @@ -12,13 +12,13 @@ typedef struct { } Bar; -----------------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| struct Foo { }; -[#3 Range] = +[#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 af4e4e8adf..0919e73336 100644 --- a/data/fixtures/scopes/c/type/type.iteration.class2.scope +++ b/data/fixtures/scopes/c/type/type.iteration.class2.scope @@ -3,7 +3,7 @@ union Foo { }; typedef union { } Bar; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:22 >-------------- 0| union Foo { }; @@ -12,13 +12,13 @@ typedef union { } Bar; ----------------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| union Foo { }; -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:15-2:16 >-< 2| typedef union { } Bar; diff --git a/data/fixtures/scopes/c/type/type.iteration.document.scope b/data/fixtures/scopes/c/type/type.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/c/type/type.iteration.document.scope +++ b/data/fixtures/scopes/c/type/type.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/c/value/value.iteration.block2.scope b/data/fixtures/scopes/c/value/value.iteration.block2.scope index dd07df8311..ea20927c6d 100644 --- a/data/fixtures/scopes/c/value/value.iteration.block2.scope +++ b/data/fixtures/scopes/c/value/value.iteration.block2.scope @@ -1,13 +1,13 @@ void foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void foo() { } diff --git a/data/fixtures/scopes/c/value/value.iteration.block3.scope b/data/fixtures/scopes/c/value/value.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/c/value/value.iteration.block3.scope +++ b/data/fixtures/scopes/c/value/value.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/c/value/value.iteration.block4.scope b/data/fixtures/scopes/c/value/value.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/c/value/value.iteration.block4.scope +++ b/data/fixtures/scopes/c/value/value.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/c/value/value.iteration.class.scope b/data/fixtures/scopes/c/value/value.iteration.class.scope index 91fb39ebc7..db6aaa88e6 100644 --- a/data/fixtures/scopes/c/value/value.iteration.class.scope +++ b/data/fixtures/scopes/c/value/value.iteration.class.scope @@ -3,7 +3,7 @@ struct Foo { }; typedef struct { } Bar; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:23 >--------------- 0| struct Foo { }; @@ -12,13 +12,13 @@ typedef struct { } Bar; -----------------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| struct Foo { }; -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:16-2:17 >-< 2| typedef struct { } Bar; diff --git a/data/fixtures/scopes/c/value/value.iteration.class2.scope b/data/fixtures/scopes/c/value/value.iteration.class2.scope index af4e4e8adf..0919e73336 100644 --- a/data/fixtures/scopes/c/value/value.iteration.class2.scope +++ b/data/fixtures/scopes/c/value/value.iteration.class2.scope @@ -3,7 +3,7 @@ union Foo { }; typedef union { } Bar; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:22 >-------------- 0| union Foo { }; @@ -12,13 +12,13 @@ typedef union { } Bar; ----------------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| union Foo { }; -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:15-2:16 >-< 2| typedef union { } Bar; diff --git a/data/fixtures/scopes/c/value/value.iteration.document.scope b/data/fixtures/scopes/c/value/value.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/c/value/value.iteration.document.scope +++ b/data/fixtures/scopes/c/value/value.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/c/value/value.iteration.enum.scope b/data/fixtures/scopes/c/value/value.iteration.enum.scope index d8bda96971..53e30a0a61 100644 --- a/data/fixtures/scopes/c/value/value.iteration.enum.scope +++ b/data/fixtures/scopes/c/value/value.iteration.enum.scope @@ -1,13 +1,13 @@ enum Foo { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| enum Foo { }; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:10-0:11 >-< 0| enum Foo { }; diff --git a/data/fixtures/scopes/cpp/argument/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/cpp/argument/argument.actual.constructor.iteration.scope index 13be0a78c1..6aec551274 100644 --- a/data/fixtures/scopes/cpp/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/cpp/argument/argument.actual.constructor.iteration.scope @@ -1,7 +1,7 @@ new Foo(aaa, bbb); --- -[Range] = 0:8-0:16 +[Content] = 0:8-0:16 >--------< 0| new Foo(aaa, bbb); diff --git a/data/fixtures/scopes/cpp/argument/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/cpp/argument/argument.formal.constructor.iteration.scope index fbe34ad648..288002981c 100644 --- a/data/fixtures/scopes/cpp/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/cpp/argument/argument.formal.constructor.iteration.scope @@ -3,7 +3,7 @@ class Foo { } --- -[Range] = 1:8-1:24 +[Content] = 1:8-1:24 >----------------< 1| Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/cpp/argument/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/cpp/argument/argument.formal.lambda.iteration.scope index 2aca516e66..fb374b28af 100644 --- a/data/fixtures/scopes/cpp/argument/argument.formal.lambda.iteration.scope +++ b/data/fixtures/scopes/cpp/argument/argument.formal.lambda.iteration.scope @@ -1,7 +1,7 @@ [](int aaa, int bbb) {} --- -[Range] = 0:3-0:19 +[Content] = 0:3-0:19 >----------------< 0| [](int aaa, int bbb) {} diff --git a/data/fixtures/scopes/cpp/argument/argument.formal.method.iteration.scope b/data/fixtures/scopes/cpp/argument/argument.formal.method.iteration.scope index 7ce9ad3e21..4421f0d181 100644 --- a/data/fixtures/scopes/cpp/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/cpp/argument/argument.formal.method.iteration.scope @@ -3,7 +3,7 @@ class Foo { } --- -[Range] = 1:13-1:29 +[Content] = 1:13-1:29 >----------------< 1| void bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/cpp/branch.try.iteration.scope b/data/fixtures/scopes/cpp/branch.try.iteration.scope index a21e00f9c0..e7b19b17dd 100644 --- a/data/fixtures/scopes/cpp/branch.try.iteration.scope +++ b/data/fixtures/scopes/cpp/branch.try.iteration.scope @@ -2,7 +2,7 @@ try {} catch (const std::exception& e) {} --- -[Range] = +[Content] = [Domain] = 0:0-1:34 >------ 0| try {} diff --git a/data/fixtures/scopes/cpp/functionName.method.iteration.class.scope b/data/fixtures/scopes/cpp/functionName.method.iteration.class.scope index a9bd7ec26f..1740bcc7df 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 { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| class MyClass { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| class MyClass { } 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 9d6f2a4747..dc779a0222 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:12-1:32 >--------------------< 1| MyClass(int aaa, int bbb = 2) {} 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 c4e65a1da0..4599d64443 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) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:37 >-------------------------------------< 0| void aaa(int bbb = 0, int ccc = 0) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:9-0:33 >------------------------< 0| void aaa(int bbb = 0, int ccc = 0) {} 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 f103bb7282..726ca89138 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:13-1:33 >--------------------< 1| void foo(int aaa, int bbb = 2) {} diff --git a/data/fixtures/scopes/cpp/name/name.iteration.class.scope b/data/fixtures/scopes/cpp/name/name.iteration.class.scope index b79d7b395c..5658067297 100644 --- a/data/fixtures/scopes/cpp/name/name.iteration.class.scope +++ b/data/fixtures/scopes/cpp/name/name.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| class Foo { }; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { }; diff --git a/data/fixtures/scopes/cpp/name/name.iteration.enum.scope b/data/fixtures/scopes/cpp/name/name.iteration.enum.scope index 39c9e55f47..c44f8d2069 100644 --- a/data/fixtures/scopes/cpp/name/name.iteration.enum.scope +++ b/data/fixtures/scopes/cpp/name/name.iteration.enum.scope @@ -1,13 +1,13 @@ enum class Foo { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:19 >-------------------< 0| enum class Foo { }; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| enum class Foo { }; diff --git a/data/fixtures/scopes/cpp/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/cpp/namedFunction.method.iteration.class.scope index a9bd7ec26f..1740bcc7df 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 { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| class MyClass { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| class MyClass { } diff --git a/data/fixtures/scopes/cpp/statement.iteration.class.scope b/data/fixtures/scopes/cpp/statement.iteration.class.scope index b79d7b395c..5658067297 100644 --- a/data/fixtures/scopes/cpp/statement.iteration.class.scope +++ b/data/fixtures/scopes/cpp/statement.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| class Foo { }; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { }; 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 282891acb0..0387ca369c 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:12-1:28 >----------------< 1| MyClass(int aaa, int bbb) {} 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 a2f8959a5f..d0ca4661ff 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:13-1:29 >----------------< 1| void foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/cpp/type/type.iteration.class.scope b/data/fixtures/scopes/cpp/type/type.iteration.class.scope index b79d7b395c..5658067297 100644 --- a/data/fixtures/scopes/cpp/type/type.iteration.class.scope +++ b/data/fixtures/scopes/cpp/type/type.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| class Foo { }; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { }; diff --git a/data/fixtures/scopes/cpp/type/type.typeArgument.iteration.scope b/data/fixtures/scopes/cpp/type/type.typeArgument.iteration.scope index d997ab6aa4..1370179f76 100644 --- a/data/fixtures/scopes/cpp/type/type.typeArgument.iteration.scope +++ b/data/fixtures/scopes/cpp/type/type.typeArgument.iteration.scope @@ -1,13 +1,13 @@ Map foo; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:21 >---------------------< 0| Map foo; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:4-0:15 >-----------< 0| Map foo; 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 9d6f2a4747..dc779a0222 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:12-1:32 >--------------------< 1| MyClass(int aaa, int bbb = 2) {} 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 c4e65a1da0..4599d64443 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) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:37 >-------------------------------------< 0| void aaa(int bbb = 0, int ccc = 0) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:9-0:33 >------------------------< 0| void aaa(int bbb = 0, int ccc = 0) {} 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 f103bb7282..726ca89138 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:13-1:33 >--------------------< 1| void foo(int aaa, int bbb = 2) {} diff --git a/data/fixtures/scopes/cpp/value/value.iteration.class.scope b/data/fixtures/scopes/cpp/value/value.iteration.class.scope index b79d7b395c..5658067297 100644 --- a/data/fixtures/scopes/cpp/value/value.iteration.class.scope +++ b/data/fixtures/scopes/cpp/value/value.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| class Foo { }; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { }; diff --git a/data/fixtures/scopes/cpp/value/value.iteration.enum.scope b/data/fixtures/scopes/cpp/value/value.iteration.enum.scope index 39c9e55f47..c44f8d2069 100644 --- a/data/fixtures/scopes/cpp/value/value.iteration.enum.scope +++ b/data/fixtures/scopes/cpp/value/value.iteration.enum.scope @@ -1,13 +1,13 @@ enum class Foo { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:19 >-------------------< 0| enum class Foo { }; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| enum class Foo { }; 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 484dd5c808..327ff3d5c7 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.constructor.iteration.scope @@ -1,7 +1,7 @@ new Foo(a, b); --- -[Range] = 0:8-0:12 +[Content] = 0:8-0:12 >----< 0| new Foo(a, b); diff --git a/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope index b1b50cb7b9..962586a45c 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ Foo(5, "bar"); --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| Foo(5, "bar"); 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 c0370680a0..05a59a271a 100644 --- a/data/fixtures/scopes/csharp/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.actual.method.iteration.scope @@ -1,7 +1,7 @@ foo.bar(a, b); --- -[Range] = 0:8-0:12 +[Content] = 0:8-0:12 >----< 0| foo.bar(a, b); 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 4557615b0f..2b0db14a45 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.constructor.iteration.scope @@ -3,7 +3,7 @@ class MyClass { } --- -[Range] = 1:12-1:24 +[Content] = 1:12-1:24 >------------< 1| MyClass(int a, int b) {} diff --git a/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope b/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope index 4609100331..591d813a55 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.iteration.scope @@ -1,7 +1,7 @@ void Foo(String name, int value) {} --- -[Range] = 0:9-0:31 +[Content] = 0:9-0:31 >----------------------< 0| void Foo(String name, int value) {} 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 2eedb09354..02834b6e30 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.lambda.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.lambda.iteration.scope @@ -1,7 +1,7 @@ (a, b) => {} --- -[Range] = 0:1-0:5 +[Content] = 0:1-0:5 >----< 0| (a, b) => {} 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 938a3fcb41..0b02be8373 100644 --- a/data/fixtures/scopes/csharp/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/csharp/argument/argument.formal.method.iteration.scope @@ -3,7 +3,7 @@ class MyClass { } --- -[Range] = 1:13-1:25 +[Content] = 1:13-1:25 >------------< 1| void foo(int a, int b) {} diff --git a/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope index afbad9b639..a6bb9937d3 100644 --- a/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope +++ b/data/fixtures/scopes/csharp/branch/branch.if.iteration.scope @@ -3,7 +3,7 @@ else if () {} else { } --- -[Range] = +[Content] = [Domain] = 0:0-2:8 >-------- 0| if () {} diff --git a/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope index 1cd720756f..2f1e02dd89 100644 --- a/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/csharp/branch/branch.switchCase.iteration.scope @@ -6,7 +6,7 @@ switch (value) { } --- -[Range] = +[Content] = [Domain] = 0:16-5:0 > 0| switch (value) { diff --git a/data/fixtures/scopes/csharp/branch/branch.ternary.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.ternary.iteration.scope index 7c4fa798f9..4df7550099 100644 --- a/data/fixtures/scopes/csharp/branch/branch.ternary.iteration.scope +++ b/data/fixtures/scopes/csharp/branch/branch.ternary.iteration.scope @@ -1,7 +1,7 @@ true ? 0 : 1; --- -[Range] = +[Content] = [Domain] = 0:0-0:12 >------------< 0| true ? 0 : 1; diff --git a/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope b/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope index a43428f5c2..9e31a9e468 100644 --- a/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope +++ b/data/fixtures/scopes/csharp/branch/branch.try.iteration.scope @@ -3,7 +3,7 @@ catch(Exception ex) { } finally { } --- -[Range] = +[Content] = [Domain] = 0:0-2:11 >------- 0| try { } diff --git a/data/fixtures/scopes/csharp/class.iteration.block.scope b/data/fixtures/scopes/csharp/class.iteration.block.scope index 57d63603d3..7c3ff91c48 100644 --- a/data/fixtures/scopes/csharp/class.iteration.block.scope +++ b/data/fixtures/scopes/csharp/class.iteration.block.scope @@ -3,7 +3,7 @@ public class Outer_class { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >-------------------------- 0| public class Outer_class { @@ -12,7 +12,7 @@ public class Outer_class { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:26-2:0 > 0| public class Outer_class { @@ -21,7 +21,7 @@ public class Outer_class { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:28-1:31 >---< 1| public class Inner_class { } diff --git a/data/fixtures/scopes/csharp/class.iteration.document.scope b/data/fixtures/scopes/csharp/class.iteration.document.scope index 7816525a77..6797a78b5d 100644 --- a/data/fixtures/scopes/csharp/class.iteration.document.scope +++ b/data/fixtures/scopes/csharp/class.iteration.document.scope @@ -3,7 +3,7 @@ public class BankAccount { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:0 > 0| @@ -12,7 +12,7 @@ public class BankAccount { } < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:26-1:27 >-< 1| public class BankAccount { } diff --git a/data/fixtures/scopes/csharp/className.iteration.block.scope b/data/fixtures/scopes/csharp/className.iteration.block.scope index 57d63603d3..7c3ff91c48 100644 --- a/data/fixtures/scopes/csharp/className.iteration.block.scope +++ b/data/fixtures/scopes/csharp/className.iteration.block.scope @@ -3,7 +3,7 @@ public class Outer_class { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >-------------------------- 0| public class Outer_class { @@ -12,7 +12,7 @@ public class Outer_class { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:26-2:0 > 0| public class Outer_class { @@ -21,7 +21,7 @@ public class Outer_class { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:28-1:31 >---< 1| public class Inner_class { } diff --git a/data/fixtures/scopes/csharp/className.iteration.document.scope b/data/fixtures/scopes/csharp/className.iteration.document.scope index 7816525a77..6797a78b5d 100644 --- a/data/fixtures/scopes/csharp/className.iteration.document.scope +++ b/data/fixtures/scopes/csharp/className.iteration.document.scope @@ -3,7 +3,7 @@ public class BankAccount { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:0 > 0| @@ -12,7 +12,7 @@ public class BankAccount { } < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:26-1:27 >-< 1| public class BankAccount { } diff --git a/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope index 76405d55a7..ce40b5c558 100644 --- a/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/csharp/condition/condition.switchCase.iteration.scope @@ -5,7 +5,7 @@ switch(expression) } --- -[Range] = +[Content] = [Domain] = 1:1-4:0 > 1| { diff --git a/data/fixtures/scopes/csharp/functionName/functionName.iteration.document.scope b/data/fixtures/scopes/csharp/functionName/functionName.iteration.document.scope index 27476adbb1..76639112c1 100644 --- a/data/fixtures/scopes/csharp/functionName/functionName.iteration.document.scope +++ b/data/fixtures/scopes/csharp/functionName/functionName.iteration.document.scope @@ -3,7 +3,7 @@ void Foo() { } --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| 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 a9bd7ec26f..1740bcc7df 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 { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| class MyClass { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| class MyClass { } diff --git a/data/fixtures/scopes/csharp/key.mapPair.iteration.scope b/data/fixtures/scopes/csharp/key.mapPair.iteration.scope index 96c73a63fe..1d234360d0 100644 --- a/data/fixtures/scopes/csharp/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/csharp/key.mapPair.iteration.scope @@ -3,7 +3,7 @@ new StudentName { }; --- -[Range] = +[Content] = [Domain] = 0:17-2:0 > 0| new StudentName { 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 85f5d68136..7067000259 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:12-1:28 >----------------< 1| MyClass(int foo, int bar) {} 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 d259181d93..26d5c66f0a 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) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:38 >--------------------------------------< 0| void myFunk(String name, int value) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:34 >----------------------< 0| void myFunk(String name, int value) {} 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 ba1fb12c7a..1b943f8b64 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:14-1:30 >----------------< 1| void funk(int foo, int bar) {} diff --git a/data/fixtures/scopes/csharp/name/name.iteration.block.scope b/data/fixtures/scopes/csharp/name/name.iteration.block.scope index cf58c9ddb6..6a9caf512d 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.block.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:11-1:12 >-< 1| bar() { } diff --git a/data/fixtures/scopes/csharp/name/name.iteration.block2.scope b/data/fixtures/scopes/csharp/name/name.iteration.block2.scope index ebc8bdb16c..22c0bebaa5 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.block2.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.block2.scope @@ -1,13 +1,13 @@ void Foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void Foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void Foo() { } diff --git a/data/fixtures/scopes/csharp/name/name.iteration.block3.scope b/data/fixtures/scopes/csharp/name/name.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.block3.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/csharp/name/name.iteration.block4.scope b/data/fixtures/scopes/csharp/name/name.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.block4.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/csharp/name/name.iteration.class.scope b/data/fixtures/scopes/csharp/name/name.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.class.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/csharp/name/name.iteration.document.scope b/data/fixtures/scopes/csharp/name/name.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.document.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/csharp/name/name.iteration.enum.scope b/data/fixtures/scopes/csharp/name/name.iteration.enum.scope index 984f21de91..9034c4ee11 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.enum.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.enum.scope @@ -1,13 +1,13 @@ enum Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:12 >------------< 0| enum Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:10-0:11 >-< 0| enum Foo { } diff --git a/data/fixtures/scopes/csharp/name/name.iteration.interface.scope b/data/fixtures/scopes/csharp/name/name.iteration.interface.scope index 8760b1f7ef..7bda5ba922 100644 --- a/data/fixtures/scopes/csharp/name/name.iteration.interface.scope +++ b/data/fixtures/scopes/csharp/name/name.iteration.interface.scope @@ -1,13 +1,13 @@ interface IFoo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:18 >------------------< 0| interface IFoo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| interface IFoo { } diff --git a/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope b/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope index 27476adbb1..76639112c1 100644 --- a/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/csharp/namedFunction/namedFunction.iteration.document.scope @@ -3,7 +3,7 @@ void Foo() { } --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| 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 a9bd7ec26f..1740bcc7df 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 { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| class MyClass { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| class MyClass { } diff --git a/data/fixtures/scopes/csharp/statement/statement.iteration.block.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.block.scope index cf58c9ddb6..6a9caf512d 100644 --- a/data/fixtures/scopes/csharp/statement/statement.iteration.block.scope +++ b/data/fixtures/scopes/csharp/statement/statement.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:11-1:12 >-< 1| bar() { } diff --git a/data/fixtures/scopes/csharp/statement/statement.iteration.block2.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.block2.scope index ebc8bdb16c..22c0bebaa5 100644 --- a/data/fixtures/scopes/csharp/statement/statement.iteration.block2.scope +++ b/data/fixtures/scopes/csharp/statement/statement.iteration.block2.scope @@ -1,13 +1,13 @@ void Foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void Foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void Foo() { } diff --git a/data/fixtures/scopes/csharp/statement/statement.iteration.block3.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/csharp/statement/statement.iteration.block3.scope +++ b/data/fixtures/scopes/csharp/statement/statement.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/csharp/statement/statement.iteration.block4.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/csharp/statement/statement.iteration.block4.scope +++ b/data/fixtures/scopes/csharp/statement/statement.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/csharp/statement/statement.iteration.class.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/csharp/statement/statement.iteration.class.scope +++ b/data/fixtures/scopes/csharp/statement/statement.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/csharp/statement/statement.iteration.document.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/csharp/statement/statement.iteration.document.scope +++ b/data/fixtures/scopes/csharp/statement/statement.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/csharp/statement/statement.iteration.interface.scope b/data/fixtures/scopes/csharp/statement/statement.iteration.interface.scope index 8760b1f7ef..7bda5ba922 100644 --- a/data/fixtures/scopes/csharp/statement/statement.iteration.interface.scope +++ b/data/fixtures/scopes/csharp/statement/statement.iteration.interface.scope @@ -1,13 +1,13 @@ interface IFoo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:18 >------------------< 0| interface IFoo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| interface IFoo { } 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 d34ccee9b7..390f568c68 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:12-1:24 >------------< 1| MyClass(int a, int b) {} 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 d259181d93..26d5c66f0a 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) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:38 >--------------------------------------< 0| void myFunk(String name, int value) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:34 >----------------------< 0| void myFunk(String name, int value) {} 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 863db54f72..257510c605 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:14-1:26 >------------< 1| void funk(int a, int b) {} diff --git a/data/fixtures/scopes/csharp/type/type.iteration.block.scope b/data/fixtures/scopes/csharp/type/type.iteration.block.scope index cf58c9ddb6..6a9caf512d 100644 --- a/data/fixtures/scopes/csharp/type/type.iteration.block.scope +++ b/data/fixtures/scopes/csharp/type/type.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:11-1:12 >-< 1| bar() { } diff --git a/data/fixtures/scopes/csharp/type/type.iteration.block2.scope b/data/fixtures/scopes/csharp/type/type.iteration.block2.scope index ebc8bdb16c..22c0bebaa5 100644 --- a/data/fixtures/scopes/csharp/type/type.iteration.block2.scope +++ b/data/fixtures/scopes/csharp/type/type.iteration.block2.scope @@ -1,13 +1,13 @@ void Foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void Foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void Foo() { } diff --git a/data/fixtures/scopes/csharp/type/type.iteration.block3.scope b/data/fixtures/scopes/csharp/type/type.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/csharp/type/type.iteration.block3.scope +++ b/data/fixtures/scopes/csharp/type/type.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/csharp/type/type.iteration.block4.scope b/data/fixtures/scopes/csharp/type/type.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/csharp/type/type.iteration.block4.scope +++ b/data/fixtures/scopes/csharp/type/type.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/csharp/type/type.iteration.class.scope b/data/fixtures/scopes/csharp/type/type.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/csharp/type/type.iteration.class.scope +++ b/data/fixtures/scopes/csharp/type/type.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/csharp/type/type.iteration.document.scope b/data/fixtures/scopes/csharp/type/type.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/csharp/type/type.iteration.document.scope +++ b/data/fixtures/scopes/csharp/type/type.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/csharp/type/type.iteration.interface.scope b/data/fixtures/scopes/csharp/type/type.iteration.interface.scope index 8760b1f7ef..7bda5ba922 100644 --- a/data/fixtures/scopes/csharp/type/type.iteration.interface.scope +++ b/data/fixtures/scopes/csharp/type/type.iteration.interface.scope @@ -1,13 +1,13 @@ interface IFoo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:18 >------------------< 0| interface IFoo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| interface IFoo { } diff --git a/data/fixtures/scopes/csharp/type/type.typeArgument.iteration.scope b/data/fixtures/scopes/csharp/type/type.typeArgument.iteration.scope index 2bdfd7bb95..76b1a140fc 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; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:31 >-------------------------------< 0| Dictionary values; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:22 >-----------< 0| Dictionary values; 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 0e24f0f8a3..ee5317ec1a 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:12-1:32 >--------------------< 1| MyClass(int a = 1, int b = 2) {} 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 a3e25dc344..ff29567587 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) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:42 >------------------------------------------< 0| void myFunk(String name, int value = 5) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:38 >--------------------------< 0| void myFunk(String name, int value = 5) {} 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 ea72c107b5..9beae86c05 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,7 +21,7 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:14-1:34 >--------------------< 1| void funk(int a = 1, int b = 2) {} diff --git a/data/fixtures/scopes/csharp/value/value.iteration.block.scope b/data/fixtures/scopes/csharp/value/value.iteration.block.scope index cf58c9ddb6..6a9caf512d 100644 --- a/data/fixtures/scopes/csharp/value/value.iteration.block.scope +++ b/data/fixtures/scopes/csharp/value/value.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:11-1:12 >-< 1| bar() { } diff --git a/data/fixtures/scopes/csharp/value/value.iteration.block2.scope b/data/fixtures/scopes/csharp/value/value.iteration.block2.scope index ebc8bdb16c..22c0bebaa5 100644 --- a/data/fixtures/scopes/csharp/value/value.iteration.block2.scope +++ b/data/fixtures/scopes/csharp/value/value.iteration.block2.scope @@ -1,13 +1,13 @@ void Foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void Foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void Foo() { } diff --git a/data/fixtures/scopes/csharp/value/value.iteration.block3.scope b/data/fixtures/scopes/csharp/value/value.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/csharp/value/value.iteration.block3.scope +++ b/data/fixtures/scopes/csharp/value/value.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/csharp/value/value.iteration.block4.scope b/data/fixtures/scopes/csharp/value/value.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/csharp/value/value.iteration.block4.scope +++ b/data/fixtures/scopes/csharp/value/value.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/csharp/value/value.iteration.class.scope b/data/fixtures/scopes/csharp/value/value.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/csharp/value/value.iteration.class.scope +++ b/data/fixtures/scopes/csharp/value/value.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/csharp/value/value.iteration.document.scope b/data/fixtures/scopes/csharp/value/value.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/csharp/value/value.iteration.document.scope +++ b/data/fixtures/scopes/csharp/value/value.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/csharp/value/value.iteration.enum.scope b/data/fixtures/scopes/csharp/value/value.iteration.enum.scope index 984f21de91..9034c4ee11 100644 --- a/data/fixtures/scopes/csharp/value/value.iteration.enum.scope +++ b/data/fixtures/scopes/csharp/value/value.iteration.enum.scope @@ -1,13 +1,13 @@ enum Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:12 >------------< 0| enum Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:10-0:11 >-< 0| enum Foo { } diff --git a/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope b/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope index 4a0fca1c7d..e3f10c3d59 100644 --- a/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope @@ -3,7 +3,7 @@ new StudentName { }; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:2 >----------------- 0| new StudentName { @@ -12,7 +12,7 @@ new StudentName { --< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:17-2:0 > 0| new StudentName { diff --git a/data/fixtures/scopes/css/argument/argument.actual.iteration.scope b/data/fixtures/scopes/css/argument/argument.actual.iteration.scope index ed87b584bd..d487e07915 100644 --- a/data/fixtures/scopes/css/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/css/argument/argument.actual.iteration.scope @@ -3,7 +3,7 @@ } --- -[Range] = 1:14-1:25 +[Content] = 1:14-1:25 >-----------< 1| width: calc(100% - 50px); diff --git a/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope b/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope index 28c938b23e..d79ea8fff3 100644 --- a/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope +++ b/data/fixtures/scopes/css/argument/argument.actual.iteration2.scope @@ -3,7 +3,7 @@ } --- -[Range] = 1:40-1:56 +[Content] = 1:40-1:56 >----------------< 1| background: repeating-linear-gradient(red, orange 50px); diff --git a/data/fixtures/scopes/css/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/css/collectionItem.unenclosed.iteration.scope index 91a7fc74f5..77999217cf 100644 --- a/data/fixtures/scopes/css/collectionItem.unenclosed.iteration.scope +++ b/data/fixtures/scopes/css/collectionItem.unenclosed.iteration.scope @@ -4,7 +4,7 @@ } --- -[Range] = 1:4-2:18 +[Content] = 1:4-2:18 >----------- 1| color: red; 2| padding: 1rem; diff --git a/data/fixtures/scopes/css/key.mapPair.iteration.scope b/data/fixtures/scopes/css/key.mapPair.iteration.scope index d005076e82..1bf61836cf 100644 --- a/data/fixtures/scopes/css/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/css/key.mapPair.iteration.scope @@ -4,7 +4,7 @@ } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:1 >--- 0| * { @@ -14,7 +14,7 @@ -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:3-3:0 > 0| * { diff --git a/data/fixtures/scopes/css/name.iteration.block.scope b/data/fixtures/scopes/css/name.iteration.block.scope index 61324ccd17..67ba790b5c 100644 --- a/data/fixtures/scopes/css/name.iteration.block.scope +++ b/data/fixtures/scopes/css/name.iteration.block.scope @@ -4,7 +4,7 @@ a { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:1 >--- 0| a { @@ -14,7 +14,7 @@ a { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:3-3:0 > 0| a { diff --git a/data/fixtures/scopes/css/name.iteration.document.scope b/data/fixtures/scopes/css/name.iteration.document.scope index 32c45fd583..fe0f60629a 100644 --- a/data/fixtures/scopes/css/name.iteration.document.scope +++ b/data/fixtures/scopes/css/name.iteration.document.scope @@ -3,7 +3,7 @@ --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:0 > 0| @@ -12,7 +12,7 @@ < -[#2 Range] = +[#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 f4d12df4ea..ce00a8a425 100644 --- a/data/fixtures/scopes/css/statement.iteration.document.scope +++ b/data/fixtures/scopes/css/statement.iteration.document.scope @@ -3,7 +3,7 @@ --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/css/value.mapPair.iteration.scope b/data/fixtures/scopes/css/value.mapPair.iteration.scope index d005076e82..1bf61836cf 100644 --- a/data/fixtures/scopes/css/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/css/value.mapPair.iteration.scope @@ -4,7 +4,7 @@ } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:1 >--- 0| * { @@ -14,7 +14,7 @@ -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:3-3:0 > 0| * { diff --git a/data/fixtures/scopes/java/argument/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/java/argument/argument.actual.constructor.iteration.scope index 13be0a78c1..6aec551274 100644 --- a/data/fixtures/scopes/java/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/java/argument/argument.actual.constructor.iteration.scope @@ -1,7 +1,7 @@ new Foo(aaa, bbb); --- -[Range] = 0:8-0:16 +[Content] = 0:8-0:16 >--------< 0| new Foo(aaa, bbb); diff --git a/data/fixtures/scopes/java/argument/argument.actual.iteration.scope b/data/fixtures/scopes/java/argument/argument.actual.iteration.scope index c6b7e07196..3f067b0c64 100644 --- a/data/fixtures/scopes/java/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/java/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ foo(aaa, bbb); --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| foo(aaa, bbb); diff --git a/data/fixtures/scopes/java/argument/argument.actual.method.iteration.scope b/data/fixtures/scopes/java/argument/argument.actual.method.iteration.scope index b4fa962af8..7dc906b75a 100644 --- a/data/fixtures/scopes/java/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/java/argument/argument.actual.method.iteration.scope @@ -1,7 +1,7 @@ foo.bar(aaa, bbb); --- -[Range] = 0:8-0:16 +[Content] = 0:8-0:16 >--------< 0| foo.bar(aaa, bbb); diff --git a/data/fixtures/scopes/java/argument/argument.formal.constructor.iteration.scope b/data/fixtures/scopes/java/argument/argument.formal.constructor.iteration.scope index d5deb37214..2e217b35e8 100644 --- a/data/fixtures/scopes/java/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/java/argument/argument.formal.constructor.iteration.scope @@ -3,7 +3,7 @@ public class Foo { } --- -[Range] = 1:15-1:31 +[Content] = 1:15-1:31 >----------------< 1| public Foo(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/java/argument/argument.formal.lambda.iteration.scope b/data/fixtures/scopes/java/argument/argument.formal.lambda.iteration.scope index 2dd31f2c28..89fa5f3cdc 100644 --- a/data/fixtures/scopes/java/argument/argument.formal.lambda.iteration.scope +++ b/data/fixtures/scopes/java/argument/argument.formal.lambda.iteration.scope @@ -1,7 +1,7 @@ (aaa, bbb) -> {}; --- -[Range] = 0:1-0:9 +[Content] = 0:1-0:9 >--------< 0| (aaa, bbb) -> {}; diff --git a/data/fixtures/scopes/java/argument/argument.formal.method.iteration.scope b/data/fixtures/scopes/java/argument/argument.formal.method.iteration.scope index 8dd68093d0..5a79235964 100644 --- a/data/fixtures/scopes/java/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/java/argument/argument.formal.method.iteration.scope @@ -3,7 +3,7 @@ public class Foo { } --- -[Range] = 1:20-1:36 +[Content] = 1:20-1:36 >----------------< 1| public void bar(int aaa, int bbb) {} diff --git a/data/fixtures/scopes/java/branch/branch.if.iteration.scope b/data/fixtures/scopes/java/branch/branch.if.iteration.scope index 86acdd382f..84064bd4fa 100644 --- a/data/fixtures/scopes/java/branch/branch.if.iteration.scope +++ b/data/fixtures/scopes/java/branch/branch.if.iteration.scope @@ -3,7 +3,7 @@ else if (false) {} else {} --- -[Range] = +[Content] = [Domain] = 0:0-2:7 >------------ 0| if (true) {} diff --git a/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope index 737728229c..240370cea1 100644 --- a/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/java/branch/branch.switchCase.iteration.scope @@ -8,7 +8,7 @@ switch (value) { } --- -[Range] = 0:16-7:0 +[Content] = 0:16-7:0 > 0| switch (value) { 1| case 1: diff --git a/data/fixtures/scopes/java/branch/branch.ternary.iteration.scope b/data/fixtures/scopes/java/branch/branch.ternary.iteration.scope index 7c4fa798f9..4df7550099 100644 --- a/data/fixtures/scopes/java/branch/branch.ternary.iteration.scope +++ b/data/fixtures/scopes/java/branch/branch.ternary.iteration.scope @@ -1,7 +1,7 @@ true ? 0 : 1; --- -[Range] = +[Content] = [Domain] = 0:0-0:12 >------------< 0| true ? 0 : 1; diff --git a/data/fixtures/scopes/java/branch/branch.try.iteration.scope b/data/fixtures/scopes/java/branch/branch.try.iteration.scope index 756d78c510..c61e621a3f 100644 --- a/data/fixtures/scopes/java/branch/branch.try.iteration.scope +++ b/data/fixtures/scopes/java/branch/branch.try.iteration.scope @@ -3,7 +3,7 @@ catch(Exception e) {} finally {} --- -[Range] = +[Content] = [Domain] = 0:0-2:10 >------ 0| try {} diff --git a/data/fixtures/scopes/java/class.iteration.block.scope b/data/fixtures/scopes/java/class.iteration.block.scope index f3ca810401..9aad767f59 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 { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:24 >------------------------< 0| public class MyClass { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:22-0:23 >-< 0| public class MyClass { } diff --git a/data/fixtures/scopes/java/class.iteration.document.scope b/data/fixtures/scopes/java/class.iteration.document.scope index f1996be268..3ee1fa3159 100644 --- a/data/fixtures/scopes/java/class.iteration.document.scope +++ b/data/fixtures/scopes/java/class.iteration.document.scope @@ -3,7 +3,7 @@ public class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:0 > 0| @@ -12,7 +12,7 @@ public class MyClass { } < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:22-1:23 >-< 1| public class MyClass { } diff --git a/data/fixtures/scopes/java/className.iteration.block.scope b/data/fixtures/scopes/java/className.iteration.block.scope index f3ca810401..9aad767f59 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 { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:24 >------------------------< 0| public class MyClass { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:22-0:23 >-< 0| public class MyClass { } diff --git a/data/fixtures/scopes/java/className.iteration.document.scope b/data/fixtures/scopes/java/className.iteration.document.scope index f1996be268..3ee1fa3159 100644 --- a/data/fixtures/scopes/java/className.iteration.document.scope +++ b/data/fixtures/scopes/java/className.iteration.document.scope @@ -3,7 +3,7 @@ public class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:0 > 0| @@ -12,7 +12,7 @@ public class MyClass { } < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:22-1:23 >-< 1| public class MyClass { } diff --git a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration.scope index 323bff9b47..f3e0175c3f 100644 --- a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration.scope +++ b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration.scope @@ -3,7 +3,7 @@ public class MyClass { } --- -[#1 Range] = 1:4-1:20 +[#1 Content] = 1:4-1:20 >----------------< 1| String foo, bar; @@ -15,7 +15,7 @@ public class MyClass { < -[#2 Range] = 1:4-1:20 +[#2 Content] = 1:4-1:20 >----------------< 1| String foo, bar; @@ -24,7 +24,7 @@ public class MyClass { 1| String foo, bar; -[#3 Range] = 1:11-1:19 +[#3 Content] = 1:11-1:19 >--------< 1| String foo, bar; diff --git a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope index c618ca69cd..f26f414d74 100644 --- a/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope +++ b/data/fixtures/scopes/java/collectionItem.unenclosed.iteration2.scope @@ -5,7 +5,7 @@ public class MyClass { } --- -[#1 Range] = 1:4-3:5 +[#1 Content] = 1:4-3:5 >---------------------- 1| public void myFunk() { 2| String foo, bar; @@ -22,7 +22,7 @@ public class MyClass { < -[#2 Range] = 2:8-2:24 +[#2 Content] = 2:8-2:24 >----------------< 2| String foo, bar; @@ -34,7 +34,7 @@ public class MyClass { ----< -[#3 Range] = 2:8-2:24 +[#3 Content] = 2:8-2:24 >----------------< 2| String foo, bar; @@ -43,7 +43,7 @@ public class MyClass { 2| String foo, bar; -[#4 Range] = 2:15-2:23 +[#4 Content] = 2:15-2:23 >--------< 2| String foo, bar; diff --git a/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope index 737728229c..240370cea1 100644 --- a/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/java/condition/condition.switchCase.iteration.scope @@ -8,7 +8,7 @@ switch (value) { } --- -[Range] = 0:16-7:0 +[Content] = 0:16-7:0 > 0| switch (value) { 1| case 1: diff --git a/data/fixtures/scopes/java/functionName.method.iteration.class.scope b/data/fixtures/scopes/java/functionName.method.iteration.class.scope index 4eaba49f3c..efc0d7bd94 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 { } --- -[Range] = +[Content] = [Domain] = 0:15-0:16 >-< 0| class MyClass { } 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 d49abc5a0b..7fefcde510 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 @@ -3,7 +3,7 @@ public class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >---------------------- 0| public class MyClass { @@ -12,7 +12,7 @@ public class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:22-2:0 > 0| public class MyClass { @@ -21,7 +21,7 @@ public class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:19-1:41 >----------------------< 1| public MyClass(String name, int value) {} 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 645f6793a2..0cc563a6d2 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 @@ -3,7 +3,7 @@ public class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >---------------------- 0| public class MyClass { @@ -12,7 +12,7 @@ public class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:22-2:0 > 0| public class MyClass { @@ -21,7 +21,7 @@ public class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:20-1:42 >----------------------< 1| public void foo(String name, int value) {} diff --git a/data/fixtures/scopes/java/name/name.iteration.block.scope b/data/fixtures/scopes/java/name/name.iteration.block.scope index 4d4bdd63b9..5768db5310 100644 --- a/data/fixtures/scopes/java/name/name.iteration.block.scope +++ b/data/fixtures/scopes/java/name/name.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:16-1:17 >-< 1| void bar() { } diff --git a/data/fixtures/scopes/java/name/name.iteration.block2.scope b/data/fixtures/scopes/java/name/name.iteration.block2.scope index dd07df8311..ea20927c6d 100644 --- a/data/fixtures/scopes/java/name/name.iteration.block2.scope +++ b/data/fixtures/scopes/java/name/name.iteration.block2.scope @@ -1,13 +1,13 @@ void foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void foo() { } diff --git a/data/fixtures/scopes/java/name/name.iteration.block3.scope b/data/fixtures/scopes/java/name/name.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/java/name/name.iteration.block3.scope +++ b/data/fixtures/scopes/java/name/name.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/java/name/name.iteration.block4.scope b/data/fixtures/scopes/java/name/name.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/java/name/name.iteration.block4.scope +++ b/data/fixtures/scopes/java/name/name.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/java/name/name.iteration.class.scope b/data/fixtures/scopes/java/name/name.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/java/name/name.iteration.class.scope +++ b/data/fixtures/scopes/java/name/name.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/java/name/name.iteration.document.scope b/data/fixtures/scopes/java/name/name.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/java/name/name.iteration.document.scope +++ b/data/fixtures/scopes/java/name/name.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/java/name/name.iteration.enum.scope b/data/fixtures/scopes/java/name/name.iteration.enum.scope index 2ee79432fa..c2741acad1 100644 --- a/data/fixtures/scopes/java/name/name.iteration.enum.scope +++ b/data/fixtures/scopes/java/name/name.iteration.enum.scope @@ -1,13 +1,13 @@ public enum Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:19 >-------------------< 0| public enum Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:17-0:18 >-< 0| public enum Foo { } diff --git a/data/fixtures/scopes/java/name/name.iteration.interface.scope b/data/fixtures/scopes/java/name/name.iteration.interface.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/java/name/name.iteration.interface.scope +++ b/data/fixtures/scopes/java/name/name.iteration.interface.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/java/namedFunction.method.iteration.class.scope b/data/fixtures/scopes/java/namedFunction.method.iteration.class.scope index 4eaba49f3c..efc0d7bd94 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 { } --- -[Range] = +[Content] = [Domain] = 0:15-0:16 >-< 0| class MyClass { } diff --git a/data/fixtures/scopes/java/statement/statement.iteration.block.scope b/data/fixtures/scopes/java/statement/statement.iteration.block.scope index 4d4bdd63b9..5768db5310 100644 --- a/data/fixtures/scopes/java/statement/statement.iteration.block.scope +++ b/data/fixtures/scopes/java/statement/statement.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:16-1:17 >-< 1| void bar() { } diff --git a/data/fixtures/scopes/java/statement/statement.iteration.block2.scope b/data/fixtures/scopes/java/statement/statement.iteration.block2.scope index dd07df8311..ea20927c6d 100644 --- a/data/fixtures/scopes/java/statement/statement.iteration.block2.scope +++ b/data/fixtures/scopes/java/statement/statement.iteration.block2.scope @@ -1,13 +1,13 @@ void foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void foo() { } diff --git a/data/fixtures/scopes/java/statement/statement.iteration.block3.scope b/data/fixtures/scopes/java/statement/statement.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/java/statement/statement.iteration.block3.scope +++ b/data/fixtures/scopes/java/statement/statement.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/java/statement/statement.iteration.block4.scope b/data/fixtures/scopes/java/statement/statement.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/java/statement/statement.iteration.block4.scope +++ b/data/fixtures/scopes/java/statement/statement.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/java/statement/statement.iteration.class.scope b/data/fixtures/scopes/java/statement/statement.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/java/statement/statement.iteration.class.scope +++ b/data/fixtures/scopes/java/statement/statement.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/java/statement/statement.iteration.class2.scope b/data/fixtures/scopes/java/statement/statement.iteration.class2.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/java/statement/statement.iteration.class2.scope +++ b/data/fixtures/scopes/java/statement/statement.iteration.class2.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/java/statement/statement.iteration.document.scope b/data/fixtures/scopes/java/statement/statement.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/java/statement/statement.iteration.document.scope +++ b/data/fixtures/scopes/java/statement/statement.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/java/statement/statement.iteration.interface.scope b/data/fixtures/scopes/java/statement/statement.iteration.interface.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/java/statement/statement.iteration.interface.scope +++ b/data/fixtures/scopes/java/statement/statement.iteration.interface.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } 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 fc1f29963c..a62cf42616 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 @@ -3,7 +3,7 @@ public class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >---------------------- 0| public class MyClass { @@ -12,7 +12,7 @@ public class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:22-2:0 > 0| public class MyClass { @@ -21,7 +21,7 @@ public class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:19-1:39 >--------------------< 1| public MyClass(String name, int age) {} 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 4d7146a39e..7e55d136e6 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 @@ -3,7 +3,7 @@ public class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >---------------------- 0| public class MyClass { @@ -12,7 +12,7 @@ public class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:22-2:0 > 0| public class MyClass { @@ -21,7 +21,7 @@ public class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:20-1:40 >--------------------< 1| public void foo(String name, int age) {} diff --git a/data/fixtures/scopes/java/type/type.iteration.block.scope b/data/fixtures/scopes/java/type/type.iteration.block.scope index 4d4bdd63b9..5768db5310 100644 --- a/data/fixtures/scopes/java/type/type.iteration.block.scope +++ b/data/fixtures/scopes/java/type/type.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:16-1:17 >-< 1| void bar() { } diff --git a/data/fixtures/scopes/java/type/type.iteration.block2.scope b/data/fixtures/scopes/java/type/type.iteration.block2.scope index dd07df8311..ea20927c6d 100644 --- a/data/fixtures/scopes/java/type/type.iteration.block2.scope +++ b/data/fixtures/scopes/java/type/type.iteration.block2.scope @@ -1,13 +1,13 @@ void foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void foo() { } diff --git a/data/fixtures/scopes/java/type/type.iteration.block3.scope b/data/fixtures/scopes/java/type/type.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/java/type/type.iteration.block3.scope +++ b/data/fixtures/scopes/java/type/type.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/java/type/type.iteration.block4.scope b/data/fixtures/scopes/java/type/type.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/java/type/type.iteration.block4.scope +++ b/data/fixtures/scopes/java/type/type.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/java/type/type.iteration.class.scope b/data/fixtures/scopes/java/type/type.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/java/type/type.iteration.class.scope +++ b/data/fixtures/scopes/java/type/type.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/java/type/type.iteration.class2.scope b/data/fixtures/scopes/java/type/type.iteration.class2.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/java/type/type.iteration.class2.scope +++ b/data/fixtures/scopes/java/type/type.iteration.class2.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/java/type/type.iteration.document.scope b/data/fixtures/scopes/java/type/type.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/java/type/type.iteration.document.scope +++ b/data/fixtures/scopes/java/type/type.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/java/type/type.iteration.interface.scope b/data/fixtures/scopes/java/type/type.iteration.interface.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/java/type/type.iteration.interface.scope +++ b/data/fixtures/scopes/java/type/type.iteration.interface.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/java/type/type.typeArgument.iteration.scope b/data/fixtures/scopes/java/type/type.typeArgument.iteration.scope index 1928d94e7c..e37a9716ce 100644 --- a/data/fixtures/scopes/java/type/type.typeArgument.iteration.scope +++ b/data/fixtures/scopes/java/type/type.typeArgument.iteration.scope @@ -1,13 +1,13 @@ Map foo; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:18 >------------------< 0| Map foo; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:4-0:12 >--------< 0| Map foo; diff --git a/data/fixtures/scopes/java/value/value.iteration.block.scope b/data/fixtures/scopes/java/value/value.iteration.block.scope index 4d4bdd63b9..5768db5310 100644 --- a/data/fixtures/scopes/java/value/value.iteration.block.scope +++ b/data/fixtures/scopes/java/value/value.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:16-1:17 >-< 1| void bar() { } diff --git a/data/fixtures/scopes/java/value/value.iteration.block2.scope b/data/fixtures/scopes/java/value/value.iteration.block2.scope index dd07df8311..ea20927c6d 100644 --- a/data/fixtures/scopes/java/value/value.iteration.block2.scope +++ b/data/fixtures/scopes/java/value/value.iteration.block2.scope @@ -1,13 +1,13 @@ void foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| void foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:12-0:13 >-< 0| void foo() { } diff --git a/data/fixtures/scopes/java/value/value.iteration.block3.scope b/data/fixtures/scopes/java/value/value.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/java/value/value.iteration.block3.scope +++ b/data/fixtures/scopes/java/value/value.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/java/value/value.iteration.block4.scope b/data/fixtures/scopes/java/value/value.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/java/value/value.iteration.block4.scope +++ b/data/fixtures/scopes/java/value/value.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/java/value/value.iteration.class.scope b/data/fixtures/scopes/java/value/value.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/java/value/value.iteration.class.scope +++ b/data/fixtures/scopes/java/value/value.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/java/value/value.iteration.class2.scope b/data/fixtures/scopes/java/value/value.iteration.class2.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/java/value/value.iteration.class2.scope +++ b/data/fixtures/scopes/java/value/value.iteration.class2.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/java/value/value.iteration.document.scope b/data/fixtures/scopes/java/value/value.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/java/value/value.iteration.document.scope +++ b/data/fixtures/scopes/java/value/value.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.iteration.scope index 170dda3d5e..9f69e719b1 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.actual.constructor.iteration.scope @@ -1,7 +1,7 @@ new Foo(aaa, bbb) --- -[Range] = 0:8-0:16 +[Content] = 0:8-0:16 >--------< 0| new Foo(aaa, bbb) diff --git a/data/fixtures/scopes/javascript.core/argument/argument.actual.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.iteration.scope index c6b7e07196..3f067b0c64 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ foo(aaa, bbb); --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| foo(aaa, bbb); diff --git a/data/fixtures/scopes/javascript.core/argument/argument.actual.method.iteration.scope b/data/fixtures/scopes/javascript.core/argument/argument.actual.method.iteration.scope index b4fa962af8..7dc906b75a 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.actual.method.iteration.scope @@ -1,7 +1,7 @@ foo.bar(aaa, bbb); --- -[Range] = 0:8-0:16 +[Content] = 0:8-0:16 >--------< 0| foo.bar(aaa, bbb); 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 3cff29874e..e645839f46 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[Range] = 1:14-1:22 +[Content] = 1:14-1:22 >--------< 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 1f629dafb8..05217b65dc 100644 --- a/data/fixtures/scopes/javascript.core/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/javascript.core/argument/argument.formal.iteration.scope @@ -1,7 +1,7 @@ function myFunk(aaa, bbb) { } --- -[Range] = 0:16-0:24 +[Content] = 0:16-0:24 >--------< 0| function myFunk(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 7561b7c28a..0063b4d5ca 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,7 +1,7 @@ (aaa, bbb) => { } --- -[Range] = 0:1-0:9 +[Content] = 0:1-0:9 >--------< 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 1151d0840b..5e3afdecd1 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,7 +1,7 @@ function (aaa, bbb) { } --- -[Range] = 0:10-0:18 +[Content] = 0:10-0:18 >--------< 0| function (aaa, bbb) { } 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 3792a7eace..e0f6c89bee 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[Range] = 1:9-1:17 +[Content] = 1:9-1:17 >--------< 1| myFunk(aaa, bbb) { } 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 b39fb34ecc..117c6199c1 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.if.iteration.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.if.iteration.scope @@ -9,7 +9,7 @@ else { } --- -[Range] = +[Content] = [Domain] = 0:0-8:1 >----------- 0| if (true) { 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 44cc4ad233..d40679cd9f 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.switchCase.iteration.scope @@ -4,7 +4,7 @@ switch (value) { } --- -[Range] = 0:16-3:0 +[Content] = 0:16-3:0 > 0| switch (value) { 1| case 0: { } diff --git a/data/fixtures/scopes/javascript.core/branch/branch.ternary.iteration.scope b/data/fixtures/scopes/javascript.core/branch/branch.ternary.iteration.scope index 195e37b047..924f6a3ea3 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.ternary.iteration.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.ternary.iteration.scope @@ -1,7 +1,7 @@ true ? 0 : 1 --- -[Range] = +[Content] = [Domain] = 0:0-0:12 >------------< 0| true ? 0 : 1 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 016ff51260..b093efc9bf 100644 --- a/data/fixtures/scopes/javascript.core/branch/branch.try.iteration.scope +++ b/data/fixtures/scopes/javascript.core/branch/branch.try.iteration.scope @@ -3,7 +3,7 @@ catch(error) {} finally {} --- -[Range] = +[Content] = [Domain] = 0:0-2:10 >------ 0| try {} diff --git a/data/fixtures/scopes/javascript.core/class.iteration.document.scope b/data/fixtures/scopes/javascript.core/class.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/javascript.core/class.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/class.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/javascript.core/className.iteration.document.scope b/data/fixtures/scopes/javascript.core/className.iteration.document.scope index 3e0daecfa3..533e41e2a9 100644 --- a/data/fixtures/scopes/javascript.core/className.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/className.iteration.document.scope @@ -3,7 +3,7 @@ int foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/javascript.core/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/javascript.core/collectionItem.unenclosed.iteration.scope index a38a824b04..ebbf4cff1a 100644 --- a/data/fixtures/scopes/javascript.core/collectionItem.unenclosed.iteration.scope +++ b/data/fixtures/scopes/javascript.core/collectionItem.unenclosed.iteration.scope @@ -1,7 +1,7 @@ let foo, bar; --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| let foo, bar; 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 44cc4ad233..d40679cd9f 100644 --- a/data/fixtures/scopes/javascript.core/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/javascript.core/condition/condition.switchCase.iteration.scope @@ -4,7 +4,7 @@ switch (value) { } --- -[Range] = 0:16-3:0 +[Content] = 0:16-3:0 > 0| switch (value) { 1| case 0: { } 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 b65a086064..6c78462994 100644 --- a/data/fixtures/scopes/javascript.core/functionName/functionName.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/functionName/functionName.iteration.document.scope @@ -3,7 +3,7 @@ function myFunk() { } --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| 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 6f6128c677..387b7e4335 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { diff --git a/data/fixtures/scopes/javascript.core/key.mapPair.iteration.scope b/data/fixtures/scopes/javascript.core/key.mapPair.iteration.scope index 80af86055c..e1fca4ab10 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 } --- -[Range] = +[Content] = [Domain] = 0:1-0:13 >------------< 0| { value: 123 } 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 00821cfe98..93d295351d 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,13 +21,13 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:14-1:22 >--------< 1| constructor(aaa, bbb) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 1:25-1:26 >-< 1| constructor(aaa, bbb) { } 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 73848e31b8..44e3182834 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,19 @@ function myFunk(aaa, bbb) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:29 >-----------------------------< 0| function myFunk(aaa, bbb) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:24 >--------< 0| function myFunk(aaa, bbb) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 0:27-0:28 >-< 0| function myFunk(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 4291e12396..22a8774205 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,13 +21,13 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:9-1:17 >--------< 1| myFunk(aaa, bbb) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 1:20-1:21 >-< 1| myFunk(aaa, bbb) { } diff --git a/data/fixtures/scopes/javascript.core/name/name.iteration.block.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.block.scope index cf58c9ddb6..6a9caf512d 100644 --- a/data/fixtures/scopes/javascript.core/name/name.iteration.block.scope +++ b/data/fixtures/scopes/javascript.core/name/name.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:11-1:12 >-< 1| bar() { } diff --git a/data/fixtures/scopes/javascript.core/name/name.iteration.block2.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.block2.scope index 631a35c951..680b19102b 100644 --- a/data/fixtures/scopes/javascript.core/name/name.iteration.block2.scope +++ b/data/fixtures/scopes/javascript.core/name/name.iteration.block2.scope @@ -1,13 +1,13 @@ function foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:18 >------------------< 0| function foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| function foo() { } diff --git a/data/fixtures/scopes/javascript.core/name/name.iteration.block3.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/javascript.core/name/name.iteration.block3.scope +++ b/data/fixtures/scopes/javascript.core/name/name.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/javascript.core/name/name.iteration.block4.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/javascript.core/name/name.iteration.block4.scope +++ b/data/fixtures/scopes/javascript.core/name/name.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/javascript.core/name/name.iteration.class.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/javascript.core/name/name.iteration.class.scope +++ b/data/fixtures/scopes/javascript.core/name/name.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/javascript.core/name/name.iteration.document.scope b/data/fixtures/scopes/javascript.core/name/name.iteration.document.scope index cf1e2c36ea..a45b9305b9 100644 --- a/data/fixtures/scopes/javascript.core/name/name.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/name/name.iteration.document.scope @@ -3,7 +3,7 @@ let foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| 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 b65a086064..6c78462994 100644 --- a/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/namedFunction/namedFunction.iteration.document.scope @@ -3,7 +3,7 @@ function myFunk() { } --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| 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 6f6128c677..387b7e4335 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { diff --git a/data/fixtures/scopes/javascript.core/statement/statement.iteration.block.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block.scope index cf58c9ddb6..6a9caf512d 100644 --- a/data/fixtures/scopes/javascript.core/statement/statement.iteration.block.scope +++ b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:11-1:12 >-< 1| bar() { } diff --git a/data/fixtures/scopes/javascript.core/statement/statement.iteration.block2.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block2.scope index 631a35c951..680b19102b 100644 --- a/data/fixtures/scopes/javascript.core/statement/statement.iteration.block2.scope +++ b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block2.scope @@ -1,13 +1,13 @@ function foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:18 >------------------< 0| function foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| function foo() { } diff --git a/data/fixtures/scopes/javascript.core/statement/statement.iteration.block3.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/javascript.core/statement/statement.iteration.block3.scope +++ b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/javascript.core/statement/statement.iteration.block4.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/javascript.core/statement/statement.iteration.block4.scope +++ b/data/fixtures/scopes/javascript.core/statement/statement.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/javascript.core/statement/statement.iteration.class.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/javascript.core/statement/statement.iteration.class.scope +++ b/data/fixtures/scopes/javascript.core/statement/statement.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/javascript.core/statement/statement.iteration.document.scope b/data/fixtures/scopes/javascript.core/statement/statement.iteration.document.scope index bf6dba3280..bca321cd77 100644 --- a/data/fixtures/scopes/javascript.core/statement/statement.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/statement/statement.iteration.document.scope @@ -3,7 +3,7 @@ function foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:0 > 0| @@ -12,7 +12,7 @@ function foo() { } < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:16-1:17 >-< 1| function foo() { } 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 9b4a8f20b3..bbb33a5cc6 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,13 +21,13 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:14-1:30 >----------------< 1| constructor(aaa = 0, bbb = 1) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 1:33-1:34 >-< 1| constructor(aaa = 0, bbb = 1) { } 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 695b1da909..8ca3a14392 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,19 @@ function myFunk(aaa = 0, bbb = 1) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:37 >-------------------------------------< 0| function myFunk(aaa = 0, bbb = 1) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:32 >----------------< 0| function myFunk(aaa = 0, bbb = 1) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 0:35-0:36 >-< 0| function myFunk(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 c6fe878286..d5d0134531 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,13 +21,13 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:9-1:25 >----------------< 1| myFunk(aaa = 0, bbb = 1) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 1:28-1:29 >-< 1| myFunk(aaa = 0, bbb = 1) { } diff --git a/data/fixtures/scopes/javascript.core/value/value.iteration.block.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.block.scope index cf58c9ddb6..6a9caf512d 100644 --- a/data/fixtures/scopes/javascript.core/value/value.iteration.block.scope +++ b/data/fixtures/scopes/javascript.core/value/value.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:11-1:12 >-< 1| bar() { } diff --git a/data/fixtures/scopes/javascript.core/value/value.iteration.block2.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.block2.scope index 631a35c951..680b19102b 100644 --- a/data/fixtures/scopes/javascript.core/value/value.iteration.block2.scope +++ b/data/fixtures/scopes/javascript.core/value/value.iteration.block2.scope @@ -1,13 +1,13 @@ function foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:18 >------------------< 0| function foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| function foo() { } diff --git a/data/fixtures/scopes/javascript.core/value/value.iteration.block3.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/javascript.core/value/value.iteration.block3.scope +++ b/data/fixtures/scopes/javascript.core/value/value.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/javascript.core/value/value.iteration.class.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/javascript.core/value/value.iteration.class.scope +++ b/data/fixtures/scopes/javascript.core/value/value.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/javascript.core/value/value.iteration.document.scope b/data/fixtures/scopes/javascript.core/value/value.iteration.document.scope index cf1e2c36ea..a45b9305b9 100644 --- a/data/fixtures/scopes/javascript.core/value/value.iteration.document.scope +++ b/data/fixtures/scopes/javascript.core/value/value.iteration.document.scope @@ -3,7 +3,7 @@ let foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| 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 53deac1c0b..6ad2fbdb42 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 } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| { value: 123 } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:1-0:13 >------------< 0| { value: 123 } diff --git a/data/fixtures/scopes/json/key.mapPair.iteration.scope b/data/fixtures/scopes/json/key.mapPair.iteration.scope index 348e646e91..26d6903226 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} --- -[Range] = +[Content] = [Domain] = 0:1-0:23 >----------------------< 0| {"aaa": 123, "bbb": 456} diff --git a/data/fixtures/scopes/json/value.mapPair.iteration.scope b/data/fixtures/scopes/json/value.mapPair.iteration.scope index 348e646e91..26d6903226 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} --- -[Range] = +[Content] = [Domain] = 0:1-0:23 >----------------------< 0| {"aaa": 123, "bbb": 456} diff --git a/data/fixtures/scopes/lua/branch.if.iteration.scope b/data/fixtures/scopes/lua/branch.if.iteration.scope index d3e9385ac9..7e946b268d 100644 --- a/data/fixtures/scopes/lua/branch.if.iteration.scope +++ b/data/fixtures/scopes/lua/branch.if.iteration.scope @@ -7,7 +7,7 @@ else end --- -[Range] = +[Content] = [Domain] = 0:0-6:3 >------------ 0| if true then diff --git a/data/fixtures/scopes/markdown/section.iteration.document.scope b/data/fixtures/scopes/markdown/section.iteration.document.scope index 087062704b..f5f3115e85 100644 --- a/data/fixtures/scopes/markdown/section.iteration.document.scope +++ b/data/fixtures/scopes/markdown/section.iteration.document.scope @@ -4,7 +4,7 @@ Aaa --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:0 > 0| @@ -14,7 +14,7 @@ Aaa < -[#2 Range] = +[#2 Content] = [#2 Domain] = 2:0-2:3 >---< 2| Aaa diff --git a/data/fixtures/scopes/markdown/section.iteration.parent.scope b/data/fixtures/scopes/markdown/section.iteration.parent.scope index d92d8434b1..19e759bdb6 100644 --- a/data/fixtures/scopes/markdown/section.iteration.parent.scope +++ b/data/fixtures/scopes/markdown/section.iteration.parent.scope @@ -8,7 +8,7 @@ Bbb Ccc --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-7:3 >---- 0| # h1 @@ -22,7 +22,7 @@ Ccc ---< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:0-7:3 >--- 1| Aaa @@ -35,13 +35,13 @@ Ccc ---< -[#3 Range] = +[#3 Content] = [#3 Domain] = 4:0-4:3 >---< 4| Bbb -[#4 Range] = +[#4 Content] = [#4 Domain] = 7:0-7:3 >---< 7| Ccc 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 5a0f448362..a6c0a9e326 100644 --- a/data/fixtures/scopes/php/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.actual.constructor.iteration.scope @@ -2,7 +2,7 @@ new MyClass(2, "foo") --- -[Range] = 1:12-1:20 +[Content] = 1:12-1:20 >--------< 1| new MyClass(2, "foo") diff --git a/data/fixtures/scopes/php/argument/argument.actual.iteration.scope b/data/fixtures/scopes/php/argument/argument.actual.iteration.scope index 6d44592c8d..a88b0a2fa7 100644 --- a/data/fixtures/scopes/php/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.actual.iteration.scope @@ -2,7 +2,7 @@ myFunc(2, "foo") --- -[Range] = 1:7-1:15 +[Content] = 1:7-1:15 >--------< 1| myFunc(2, "foo") 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 837615380a..e39de2e09d 100644 --- a/data/fixtures/scopes/php/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.actual.method.iteration.scope @@ -2,7 +2,7 @@ obj.myFunc(2, "foo"); --- -[Range] = 1:11-1:19 +[Content] = 1:11-1:19 >--------< 1| obj.myFunc(2, "foo"); 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 bb582a7143..5864b5e41d 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.constructor.iteration.scope @@ -4,7 +4,7 @@ class MyClass { } --- -[Range] = 2:25-2:38 +[Content] = 2:25-2:38 >-------------< 2| function __construct($name, $value) { } diff --git a/data/fixtures/scopes/php/argument/argument.formal.iteration.scope b/data/fixtures/scopes/php/argument/argument.formal.iteration.scope index f9cebbfed4..55fb45221e 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.iteration.scope @@ -2,7 +2,7 @@ function myFunc($value, string $name) { } --- -[Range] = 1:16-1:36 +[Content] = 1:16-1:36 >--------------------< 1| function myFunc($value, string $name) { } 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 0aacb05f37..00791ae499 100644 --- a/data/fixtures/scopes/php/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/php/argument/argument.formal.method.iteration.scope @@ -4,7 +4,7 @@ class MyClass { } --- -[Range] = 2:20-2:40 +[Content] = 2:20-2:40 >--------------------< 2| function myFunc($value, string $name) { } 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 21f9c941f7..ac9f93b18d 100644 --- a/data/fixtures/scopes/php/name/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/php/name/name.argument.formal.iteration.scope @@ -2,7 +2,7 @@ function myFunc(string $str, int $value) { } --- -[Range] = +[Content] = [Domain] = 1:16-1:39 >-----------------------< 1| function myFunc(string $str, int $value) { } 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 21f9c941f7..ac9f93b18d 100644 --- a/data/fixtures/scopes/php/type/type.argument.formal.iteration.scope +++ b/data/fixtures/scopes/php/type/type.argument.formal.iteration.scope @@ -2,7 +2,7 @@ function myFunc(string $str, int $value) { } --- -[Range] = +[Content] = [Domain] = 1:16-1:39 >-----------------------< 1| function myFunc(string $str, int $value) { } 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 72e2facd44..72caa3b26d 100644 --- a/data/fixtures/scopes/python/argument/argument.actual.constructor.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.actual.constructor.iteration.scope @@ -1,7 +1,7 @@ Foo(123, 456) --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| Foo(123, 456) diff --git a/data/fixtures/scopes/python/argument/argument.actual.iteration.scope b/data/fixtures/scopes/python/argument/argument.actual.iteration.scope index 0d12c8d3dc..eddf4b802f 100644 --- a/data/fixtures/scopes/python/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ foo("bar", 1) --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| foo("bar", 1) 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 36c4cb67d9..ca500b4433 100644 --- a/data/fixtures/scopes/python/argument/argument.actual.method.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.actual.method.iteration.scope @@ -1,7 +1,7 @@ foo.bar(123, 456) --- -[Range] = 0:8-0:16 +[Content] = 0:8-0:16 >--------< 0| foo.bar(123, 456) 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 c26cbb4bb7..95f6ceb8a0 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.constructor.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.constructor.iteration.scope @@ -3,7 +3,7 @@ class Foo: pass --- -[Range] = 1:17-1:41 +[Content] = 1:17-1:41 >------------------------< 1| def __init__(self, aaa: str, bbb: int): diff --git a/data/fixtures/scopes/python/argument/argument.formal.iteration.scope b/data/fixtures/scopes/python/argument/argument.formal.iteration.scope index 8f4927aa07..5544db5a68 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.iteration.scope @@ -2,7 +2,7 @@ def for(name: str, value: int): pass --- -[Range] = 0:8-0:29 +[Content] = 0:8-0:29 >---------------------< 0| def for(name: str, value: int): 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 e3037349fa..e7b703745c 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.lambda.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.lambda.iteration.scope @@ -1,7 +1,7 @@ lambda a, b: pass --- -[Range] = 0:7-0:11 +[Content] = 0:7-0:11 >----< 0| lambda a, b: pass 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 ff9ccf528f..d032d32ef0 100644 --- a/data/fixtures/scopes/python/argument/argument.formal.method.iteration.scope +++ b/data/fixtures/scopes/python/argument/argument.formal.method.iteration.scope @@ -3,7 +3,7 @@ class Foo: pass --- -[Range] = 1:12-1:30 +[Content] = 1:12-1:30 >------------------< 1| def bar(aaa: str, bbb: int): diff --git a/data/fixtures/scopes/python/branch/branch.if.iteration.scope b/data/fixtures/scopes/python/branch/branch.if.iteration.scope index f310cd6f86..ddc9c3a97b 100644 --- a/data/fixtures/scopes/python/branch/branch.if.iteration.scope +++ b/data/fixtures/scopes/python/branch/branch.if.iteration.scope @@ -6,7 +6,7 @@ else: pass --- -[Range] = +[Content] = [Domain] = 0:0-5:8 >-------- 0| if True: diff --git a/data/fixtures/scopes/python/branch/branch.loop.iteration.scope b/data/fixtures/scopes/python/branch/branch.loop.iteration.scope index d18e9c41e4..5fc86a4a33 100644 --- a/data/fixtures/scopes/python/branch/branch.loop.iteration.scope +++ b/data/fixtures/scopes/python/branch/branch.loop.iteration.scope @@ -4,7 +4,7 @@ else: pass --- -[Range] = +[Content] = [Domain] = 0:0-3:8 >----------- 0| while True: diff --git a/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope b/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope index 56f8870a5a..0122b85f9d 100644 --- a/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope +++ b/data/fixtures/scopes/python/branch/branch.loop.iteration2.scope @@ -4,7 +4,7 @@ else: pass --- -[Range] = +[Content] = [Domain] = 0:0-3:8 >---------------- 0| for v in values: diff --git a/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope b/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope index 240c2fad17..6c7a1e0a6b 100644 --- a/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope +++ b/data/fixtures/scopes/python/branch/branch.switchCase.iteration.scope @@ -5,7 +5,7 @@ match 0: pass --- -[Range] = 0:8-4:12 +[Content] = 0:8-4:12 > 0| match 0: 1| case [0]: diff --git a/data/fixtures/scopes/python/branch/branch.ternary.iteration.scope b/data/fixtures/scopes/python/branch/branch.ternary.iteration.scope index c902f61ed2..3f1b54247e 100644 --- a/data/fixtures/scopes/python/branch/branch.ternary.iteration.scope +++ b/data/fixtures/scopes/python/branch/branch.ternary.iteration.scope @@ -1,7 +1,7 @@ 0 if True else 1 --- -[Range] = +[Content] = [Domain] = 0:0-0:16 >----------------< 0| 0 if True else 1 diff --git a/data/fixtures/scopes/python/branch/branch.try.iteration.scope b/data/fixtures/scopes/python/branch/branch.try.iteration.scope index f1c100a43e..9a0ca11b98 100644 --- a/data/fixtures/scopes/python/branch/branch.try.iteration.scope +++ b/data/fixtures/scopes/python/branch/branch.try.iteration.scope @@ -6,7 +6,7 @@ finally: pass --- -[Range] = +[Content] = [Domain] = 0:0-5:8 >---- 0| try: diff --git a/data/fixtures/scopes/python/class.iteration.document.scope b/data/fixtures/scopes/python/class.iteration.document.scope index 245fa30e1b..23774e47c6 100644 --- a/data/fixtures/scopes/python/class.iteration.document.scope +++ b/data/fixtures/scopes/python/class.iteration.document.scope @@ -4,7 +4,7 @@ class Foo: --- -[Range] = +[Content] = [Domain] = 0:0-3:0 > 0| diff --git a/data/fixtures/scopes/python/className.iteration.document.scope b/data/fixtures/scopes/python/className.iteration.document.scope index 245fa30e1b..23774e47c6 100644 --- a/data/fixtures/scopes/python/className.iteration.document.scope +++ b/data/fixtures/scopes/python/className.iteration.document.scope @@ -4,7 +4,7 @@ class Foo: --- -[Range] = +[Content] = [Domain] = 0:0-3:0 > 0| diff --git a/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration.scope index bdc62199a5..972bb711db 100644 --- a/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration.scope +++ b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration.scope @@ -1,7 +1,7 @@ import foo, bar --- -[Range] = 0:7-0:15 +[Content] = 0:7-0:15 >--------< 0| import foo, bar diff --git a/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration2.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration2.scope index fd50c185e4..3f2a478e3f 100644 --- a/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration2.scope +++ b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration2.scope @@ -1,7 +1,7 @@ from foo import bar, baz --- -[Range] = 0:16-0:24 +[Content] = 0:16-0:24 >--------< 0| from foo import bar, baz diff --git a/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration3.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration3.scope index fdee8ecd9e..dca32858f2 100644 --- a/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration3.scope +++ b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration3.scope @@ -2,7 +2,7 @@ def foo(): global bar, baz --- -[#1 Range] = 1:4-1:19 +[#1 Content] = 1:4-1:19 >---------------< 1| global bar, baz @@ -11,7 +11,7 @@ def foo(): 1| global bar, baz -[#2 Range] = 1:11-1:19 +[#2 Content] = 1:11-1:19 >--------< 1| global bar, baz diff --git a/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration4.scope b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration4.scope index c91ff7fbd7..465717220c 100644 --- a/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration4.scope +++ b/data/fixtures/scopes/python/collectionItem/collectionItem.unenclosed.iteration4.scope @@ -2,13 +2,13 @@ for key, value in map.items(): pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:30 >------------------------------< 0| for key, value in map.items(): -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:4-0:14 >----------< 0| for key, value in map.items(): diff --git a/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope b/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope index 1e8c79b001..cc975a7302 100644 --- a/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope +++ b/data/fixtures/scopes/python/condition/condition.switchCase.iteration.scope @@ -5,7 +5,7 @@ match value: pass --- -[Range] = 0:12-4:12 +[Content] = 0:12-4:12 > 0| match value: 1| case 0: diff --git a/data/fixtures/scopes/python/functionName/functionName.iteration.document.scope b/data/fixtures/scopes/python/functionName/functionName.iteration.document.scope index 405b865bc5..df491f5017 100644 --- a/data/fixtures/scopes/python/functionName/functionName.iteration.document.scope +++ b/data/fixtures/scopes/python/functionName/functionName.iteration.document.scope @@ -4,7 +4,7 @@ def bar(): --- -[Range] = +[Content] = [Domain] = 0:0-3:0 > 0| diff --git a/data/fixtures/scopes/python/functionName/functionName.method.iteration.class.scope b/data/fixtures/scopes/python/functionName/functionName.method.iteration.class.scope index f7bfad381d..87bb3e4216 100644 --- a/data/fixtures/scopes/python/functionName/functionName.method.iteration.class.scope +++ b/data/fixtures/scopes/python/functionName/functionName.method.iteration.class.scope @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >---------- 1| def bar(): diff --git a/data/fixtures/scopes/python/key.mapPair.iteration.scope b/data/fixtures/scopes/python/key.mapPair.iteration.scope index d70b60f322..7a93431b7c 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} --- -[Range] = +[Content] = [Domain] = 0:1-0:20 >-------------------< 0| { aaa: 123, bbb: 456} 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 e62b3cf13d..3a4e57fb0e 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) --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| aaa(bbb=0, ccc=1) -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:4-0:16 >------------< 0| aaa(bbb=0, ccc=1) 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 8d4c0b5357..72c05a5ae7 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 @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >--------------------------------------- 1| def __init__(self, aaa: str, bbb: int): @@ -20,13 +20,13 @@ class Foo: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:41 >------------------------< 1| def __init__(self, aaa: str, bbb: int): -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:8-2:12 >----< 2| pass 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 93a3acf6f4..c906e47fd1 100644 --- a/data/fixtures/scopes/python/name/name.argument.formal.iteration.scope +++ b/data/fixtures/scopes/python/name/name.argument.formal.iteration.scope @@ -2,7 +2,7 @@ def foo(aaa: str, bbb: int): pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------------------------- 0| def foo(aaa: str, bbb: int): @@ -10,13 +10,13 @@ def foo(aaa: str, bbb: int): --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:8-0:26 >------------------< 0| def foo(aaa: str, bbb: int): -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:4-1:8 >----< 1| 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 ae02609cc6..24d83948e9 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 @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >---------------------------- 1| def bar(aaa: str, bbb: int): @@ -20,13 +20,13 @@ class Foo: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:12-1:30 >------------------< 1| def bar(aaa: str, bbb: int): -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:8-2:12 >----< 2| pass diff --git a/data/fixtures/scopes/python/name/name.iteration.block.scope b/data/fixtures/scopes/python/name/name.iteration.block.scope index ec2e6429b2..b5a0c42099 100644 --- a/data/fixtures/scopes/python/name/name.iteration.block.scope +++ b/data/fixtures/scopes/python/name/name.iteration.block.scope @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >---------- 1| def bar(): @@ -20,7 +20,7 @@ class Foo: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:8-2:12 >----< 2| pass diff --git a/data/fixtures/scopes/python/name/name.iteration.block2.scope b/data/fixtures/scopes/python/name/name.iteration.block2.scope index d22d90cda3..203dbe821d 100644 --- a/data/fixtures/scopes/python/name/name.iteration.block2.scope +++ b/data/fixtures/scopes/python/name/name.iteration.block2.scope @@ -2,7 +2,7 @@ def foo(): pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------- 0| def foo(): @@ -10,7 +10,7 @@ def foo(): --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/name/name.iteration.block3.scope b/data/fixtures/scopes/python/name/name.iteration.block3.scope index 382f662f8d..0e1c7d9ced 100644 --- a/data/fixtures/scopes/python/name/name.iteration.block3.scope +++ b/data/fixtures/scopes/python/name/name.iteration.block3.scope @@ -6,7 +6,7 @@ else: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-5:8 >-------- 0| if True: @@ -18,19 +18,19 @@ else: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass -[#3 Range] = +[#3 Content] = [#3 Domain] = 3:4-3:8 >----< 3| pass -[#4 Range] = +[#4 Content] = [#4 Domain] = 5:4-5:8 >----< 5| pass diff --git a/data/fixtures/scopes/python/name/name.iteration.block4.scope b/data/fixtures/scopes/python/name/name.iteration.block4.scope index 98a8f15c8f..bedd64a06d 100644 --- a/data/fixtures/scopes/python/name/name.iteration.block4.scope +++ b/data/fixtures/scopes/python/name/name.iteration.block4.scope @@ -2,7 +2,7 @@ while True: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >----------- 0| while True: @@ -10,7 +10,7 @@ while True: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/name/name.iteration.class.scope b/data/fixtures/scopes/python/name/name.iteration.class.scope index 6a16802260..23872a9212 100644 --- a/data/fixtures/scopes/python/name/name.iteration.class.scope +++ b/data/fixtures/scopes/python/name/name.iteration.class.scope @@ -2,7 +2,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------- 0| class Foo: @@ -10,7 +10,7 @@ class Foo: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/name/name.iteration.document.scope b/data/fixtures/scopes/python/name/name.iteration.document.scope index 10eeeb6737..9a1bbe9f88 100644 --- a/data/fixtures/scopes/python/name/name.iteration.document.scope +++ b/data/fixtures/scopes/python/name/name.iteration.document.scope @@ -3,7 +3,7 @@ foo --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/python/name/name.resource.iteration.scope b/data/fixtures/scopes/python/name/name.resource.iteration.scope index 47cb57159c..8e14225d4b 100644 --- a/data/fixtures/scopes/python/name/name.resource.iteration.scope +++ b/data/fixtures/scopes/python/name/name.resource.iteration.scope @@ -2,7 +2,7 @@ with aaa, bbb as ccc: pass --- -[#1 Range] = 0:5-0:20 +[#1 Content] = 0:5-0:20 >---------------< 0| with aaa, bbb as ccc: @@ -13,7 +13,7 @@ with aaa, bbb as ccc: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope b/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope index 405b865bc5..df491f5017 100644 --- a/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/python/namedFunction/namedFunction.iteration.document.scope @@ -4,7 +4,7 @@ def bar(): --- -[Range] = +[Content] = [Domain] = 0:0-3:0 > 0| 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 f7bfad381d..87bb3e4216 100644 --- a/data/fixtures/scopes/python/namedFunction/namedFunction.method.iteration.class.scope +++ b/data/fixtures/scopes/python/namedFunction/namedFunction.method.iteration.class.scope @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >---------- 1| def bar(): diff --git a/data/fixtures/scopes/python/statement/statement.iteration.block.scope b/data/fixtures/scopes/python/statement/statement.iteration.block.scope index ec2e6429b2..b5a0c42099 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.block.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.block.scope @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >---------- 1| def bar(): @@ -20,7 +20,7 @@ class Foo: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:8-2:12 >----< 2| pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.block2.scope b/data/fixtures/scopes/python/statement/statement.iteration.block2.scope index d22d90cda3..203dbe821d 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.block2.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.block2.scope @@ -2,7 +2,7 @@ def foo(): pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------- 0| def foo(): @@ -10,7 +10,7 @@ def foo(): --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.block3.scope b/data/fixtures/scopes/python/statement/statement.iteration.block3.scope index 382f662f8d..0e1c7d9ced 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.block3.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.block3.scope @@ -6,7 +6,7 @@ else: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-5:8 >-------- 0| if True: @@ -18,19 +18,19 @@ else: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass -[#3 Range] = +[#3 Content] = [#3 Domain] = 3:4-3:8 >----< 3| pass -[#4 Range] = +[#4 Content] = [#4 Domain] = 5:4-5:8 >----< 5| pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.block4.scope b/data/fixtures/scopes/python/statement/statement.iteration.block4.scope index 98a8f15c8f..bedd64a06d 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.block4.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.block4.scope @@ -2,7 +2,7 @@ while True: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >----------- 0| while True: @@ -10,7 +10,7 @@ while True: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.class.scope b/data/fixtures/scopes/python/statement/statement.iteration.class.scope index 6a16802260..23872a9212 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.class.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.class.scope @@ -2,7 +2,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------- 0| class Foo: @@ -10,7 +10,7 @@ class Foo: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/statement/statement.iteration.document.scope b/data/fixtures/scopes/python/statement/statement.iteration.document.scope index 10eeeb6737..9a1bbe9f88 100644 --- a/data/fixtures/scopes/python/statement/statement.iteration.document.scope +++ b/data/fixtures/scopes/python/statement/statement.iteration.document.scope @@ -3,7 +3,7 @@ foo --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| 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 0f9c24d9f4..9b65816f2e 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 @@ -3,7 +3,7 @@ class MyClass: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >-------------- 0| class MyClass: @@ -12,7 +12,7 @@ class MyClass: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >--------------------------- 1| def __init__(self, a: int): @@ -20,13 +20,13 @@ class MyClass: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:29 >------------< 1| def __init__(self, a: int): -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:8-2:12 >----< 2| pass 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 258edf1d33..f0a6bc4f08 100644 --- a/data/fixtures/scopes/python/type/type.argument.formal.iteration.scope +++ b/data/fixtures/scopes/python/type/type.argument.formal.iteration.scope @@ -2,7 +2,7 @@ def funk(a: int): pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >----------------- 0| def funk(a: int): @@ -10,13 +10,13 @@ def funk(a: int): --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:9-0:15 >------< 0| def funk(a: int): -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:4-1:8 >----< 1| 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 d4e87dd90c..4370053f46 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 @@ -3,7 +3,7 @@ class MyClass: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >-------------- 0| class MyClass: @@ -12,7 +12,7 @@ class MyClass: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >----------------- 1| def funk(a: int): @@ -20,13 +20,13 @@ class MyClass: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:13-1:19 >------< 1| def funk(a: int): -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:8-2:12 >----< 2| pass diff --git a/data/fixtures/scopes/python/type/type.iteration.block.scope b/data/fixtures/scopes/python/type/type.iteration.block.scope index ec2e6429b2..b5a0c42099 100644 --- a/data/fixtures/scopes/python/type/type.iteration.block.scope +++ b/data/fixtures/scopes/python/type/type.iteration.block.scope @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >---------- 1| def bar(): @@ -20,7 +20,7 @@ class Foo: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:8-2:12 >----< 2| pass diff --git a/data/fixtures/scopes/python/type/type.iteration.block2.scope b/data/fixtures/scopes/python/type/type.iteration.block2.scope index d22d90cda3..203dbe821d 100644 --- a/data/fixtures/scopes/python/type/type.iteration.block2.scope +++ b/data/fixtures/scopes/python/type/type.iteration.block2.scope @@ -2,7 +2,7 @@ def foo(): pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------- 0| def foo(): @@ -10,7 +10,7 @@ def foo(): --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/type/type.iteration.block3.scope b/data/fixtures/scopes/python/type/type.iteration.block3.scope index 382f662f8d..0e1c7d9ced 100644 --- a/data/fixtures/scopes/python/type/type.iteration.block3.scope +++ b/data/fixtures/scopes/python/type/type.iteration.block3.scope @@ -6,7 +6,7 @@ else: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-5:8 >-------- 0| if True: @@ -18,19 +18,19 @@ else: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass -[#3 Range] = +[#3 Content] = [#3 Domain] = 3:4-3:8 >----< 3| pass -[#4 Range] = +[#4 Content] = [#4 Domain] = 5:4-5:8 >----< 5| pass diff --git a/data/fixtures/scopes/python/type/type.iteration.block4.scope b/data/fixtures/scopes/python/type/type.iteration.block4.scope index 98a8f15c8f..bedd64a06d 100644 --- a/data/fixtures/scopes/python/type/type.iteration.block4.scope +++ b/data/fixtures/scopes/python/type/type.iteration.block4.scope @@ -2,7 +2,7 @@ while True: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >----------- 0| while True: @@ -10,7 +10,7 @@ while True: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/type/type.iteration.class.scope b/data/fixtures/scopes/python/type/type.iteration.class.scope index 6a16802260..23872a9212 100644 --- a/data/fixtures/scopes/python/type/type.iteration.class.scope +++ b/data/fixtures/scopes/python/type/type.iteration.class.scope @@ -2,7 +2,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------- 0| class Foo: @@ -10,7 +10,7 @@ class Foo: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/type/type.iteration.document.scope b/data/fixtures/scopes/python/type/type.iteration.document.scope index 10eeeb6737..9a1bbe9f88 100644 --- a/data/fixtures/scopes/python/type/type.iteration.document.scope +++ b/data/fixtures/scopes/python/type/type.iteration.document.scope @@ -3,7 +3,7 @@ foo --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/python/type/type.typeArgument.iteration.scope b/data/fixtures/scopes/python/type/type.typeArgument.iteration.scope index 855e3ce1bd..9e657b0591 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] --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:20 >--------------------< 0| value: map[str, int] -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:19 >--------< 0| value: map[str, int] 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 e62b3cf13d..3a4e57fb0e 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) --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| aaa(bbb=0, ccc=1) -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:4-0:16 >------------< 0| aaa(bbb=0, ccc=1) 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 8d4c0b5357..72c05a5ae7 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 @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >--------------------------------------- 1| def __init__(self, aaa: str, bbb: int): @@ -20,13 +20,13 @@ class Foo: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:41 >------------------------< 1| def __init__(self, aaa: str, bbb: int): -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:8-2:12 >----< 2| pass 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 4ca6d7b072..3d123ffb30 100644 --- a/data/fixtures/scopes/python/value/value.argument.formal.iteration.scope +++ b/data/fixtures/scopes/python/value/value.argument.formal.iteration.scope @@ -2,7 +2,7 @@ def bar(aaa: str, bbb: int): pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------------------------- 0| def bar(aaa: str, bbb: int): @@ -10,13 +10,13 @@ def bar(aaa: str, bbb: int): --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:8-0:26 >------------------< 0| def bar(aaa: str, bbb: int): -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:4-1:8 >----< 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 ae02609cc6..24d83948e9 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 @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >---------------------------- 1| def bar(aaa: str, bbb: int): @@ -20,13 +20,13 @@ class Foo: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:12-1:30 >------------------< 1| def bar(aaa: str, bbb: int): -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:8-2:12 >----< 2| pass diff --git a/data/fixtures/scopes/python/value/value.iteration.block.scope b/data/fixtures/scopes/python/value/value.iteration.block.scope index ec2e6429b2..b5a0c42099 100644 --- a/data/fixtures/scopes/python/value/value.iteration.block.scope +++ b/data/fixtures/scopes/python/value/value.iteration.block.scope @@ -3,7 +3,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---------- 0| class Foo: @@ -12,7 +12,7 @@ class Foo: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:12 >---------- 1| def bar(): @@ -20,7 +20,7 @@ class Foo: ------------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 2:8-2:12 >----< 2| pass diff --git a/data/fixtures/scopes/python/value/value.iteration.block2.scope b/data/fixtures/scopes/python/value/value.iteration.block2.scope index d22d90cda3..203dbe821d 100644 --- a/data/fixtures/scopes/python/value/value.iteration.block2.scope +++ b/data/fixtures/scopes/python/value/value.iteration.block2.scope @@ -2,7 +2,7 @@ def foo(): pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------- 0| def foo(): @@ -10,7 +10,7 @@ def foo(): --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/value/value.iteration.block3.scope b/data/fixtures/scopes/python/value/value.iteration.block3.scope index 382f662f8d..0e1c7d9ced 100644 --- a/data/fixtures/scopes/python/value/value.iteration.block3.scope +++ b/data/fixtures/scopes/python/value/value.iteration.block3.scope @@ -6,7 +6,7 @@ else: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-5:8 >-------- 0| if True: @@ -18,19 +18,19 @@ else: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass -[#3 Range] = +[#3 Content] = [#3 Domain] = 3:4-3:8 >----< 3| pass -[#4 Range] = +[#4 Content] = [#4 Domain] = 5:4-5:8 >----< 5| pass diff --git a/data/fixtures/scopes/python/value/value.iteration.block4.scope b/data/fixtures/scopes/python/value/value.iteration.block4.scope index 98a8f15c8f..bedd64a06d 100644 --- a/data/fixtures/scopes/python/value/value.iteration.block4.scope +++ b/data/fixtures/scopes/python/value/value.iteration.block4.scope @@ -2,7 +2,7 @@ while True: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >----------- 0| while True: @@ -10,7 +10,7 @@ while True: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/value/value.iteration.class.scope b/data/fixtures/scopes/python/value/value.iteration.class.scope index 6a16802260..23872a9212 100644 --- a/data/fixtures/scopes/python/value/value.iteration.class.scope +++ b/data/fixtures/scopes/python/value/value.iteration.class.scope @@ -2,7 +2,7 @@ class Foo: pass --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:8 >---------- 0| class Foo: @@ -10,7 +10,7 @@ class Foo: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/value/value.iteration.document.scope b/data/fixtures/scopes/python/value/value.iteration.document.scope index 10eeeb6737..9a1bbe9f88 100644 --- a/data/fixtures/scopes/python/value/value.iteration.document.scope +++ b/data/fixtures/scopes/python/value/value.iteration.document.scope @@ -3,7 +3,7 @@ foo --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/python/value/value.mapPair.iteration.scope b/data/fixtures/scopes/python/value/value.mapPair.iteration.scope index 5c38cee112..9503ce8246 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} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:21 >---------------------< 0| { aaa: 123, bbb: 456} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:1-0:20 >-------------------< 0| { aaa: 123, bbb: 456} diff --git a/data/fixtures/scopes/python/value/value.resource.iteration.scope b/data/fixtures/scopes/python/value/value.resource.iteration.scope index 47cb57159c..8e14225d4b 100644 --- a/data/fixtures/scopes/python/value/value.resource.iteration.scope +++ b/data/fixtures/scopes/python/value/value.resource.iteration.scope @@ -2,7 +2,7 @@ with aaa, bbb as ccc: pass --- -[#1 Range] = 0:5-0:20 +[#1 Content] = 0:5-0:20 >---------------< 0| with aaa, bbb as ccc: @@ -13,7 +13,7 @@ with aaa, bbb as ccc: --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/python/value/value.resource.iteration2.scope b/data/fixtures/scopes/python/value/value.resource.iteration2.scope index 0be71b66d9..32aa556c32 100644 --- a/data/fixtures/scopes/python/value/value.resource.iteration2.scope +++ b/data/fixtures/scopes/python/value/value.resource.iteration2.scope @@ -5,7 +5,7 @@ bbb = ccc ddd = eee --- -[#1 Range] = 0:5-0:8 +[#1 Content] = 0:5-0:8 >---< 0| with aaa: @@ -16,7 +16,7 @@ ddd = eee --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:0-4:9 >--------- 0| with aaa: @@ -27,7 +27,7 @@ ddd = eee ---------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:4-1:8 >----< 1| pass diff --git a/data/fixtures/scopes/r/argument/argument.actual.iteration.scope b/data/fixtures/scopes/r/argument/argument.actual.iteration.scope index 5ff11cff7d..9eb9684c7a 100644 --- a/data/fixtures/scopes/r/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/r/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ foo(x, y) --- -[Range] = 0:4-0:8 +[Content] = 0:4-0:8 >----< 0| foo(x, y) diff --git a/data/fixtures/scopes/r/argument/argument.formal.iteration.scope b/data/fixtures/scopes/r/argument/argument.formal.iteration.scope index 8a24f38440..ad38e7e2b2 100644 --- a/data/fixtures/scopes/r/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/r/argument/argument.formal.iteration.scope @@ -1,7 +1,7 @@ abc <- function(x, y){} --- -[Range] = 0:16-0:20 +[Content] = 0:16-0:20 >----< 0| abc <- function(x, y){} diff --git a/data/fixtures/scopes/ruby/argument/argument.actual.iteration.scope b/data/fixtures/scopes/ruby/argument/argument.actual.iteration.scope index c9fcfe46b8..1b28526f67 100644 --- a/data/fixtures/scopes/ruby/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/ruby/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ foo(aaa, bbb) --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| foo(aaa, bbb) diff --git a/data/fixtures/scopes/ruby/argument/argument.actual.iteration2.scope b/data/fixtures/scopes/ruby/argument/argument.actual.iteration2.scope index 3be5bd5b8d..1a1cbea570 100644 --- a/data/fixtures/scopes/ruby/argument/argument.actual.iteration2.scope +++ b/data/fixtures/scopes/ruby/argument/argument.actual.iteration2.scope @@ -1,7 +1,7 @@ foo{ |aaa, bbb| } --- -[Range] = 0:6-0:14 +[Content] = 0:6-0:14 >--------< 0| foo{ |aaa, bbb| } diff --git a/data/fixtures/scopes/ruby/argument/argument.formal.iteration.scope b/data/fixtures/scopes/ruby/argument/argument.formal.iteration.scope index abc22d6b8d..d276222afc 100644 --- a/data/fixtures/scopes/ruby/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/ruby/argument/argument.formal.iteration.scope @@ -1,7 +1,7 @@ def foo(aaa, bbb) --- -[Range] = 0:8-0:16 +[Content] = 0:8-0:16 >--------< 0| def foo(aaa, bbb) diff --git a/data/fixtures/scopes/scala/argument/argument.actual.iteration.scope b/data/fixtures/scopes/scala/argument/argument.actual.iteration.scope index c9fcfe46b8..1b28526f67 100644 --- a/data/fixtures/scopes/scala/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/scala/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ foo(aaa, bbb) --- -[Range] = 0:4-0:12 +[Content] = 0:4-0:12 >--------< 0| foo(aaa, bbb) diff --git a/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope b/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope index 160e602e78..8fa763b63b 100644 --- a/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope +++ b/data/fixtures/scopes/scala/argument/argument.formal.iteration.scope @@ -1,7 +1,7 @@ def foo(aaa: Int, bbb: Int) = x --- -[Range] = 0:8-0:26 +[Content] = 0:8-0:26 >------------------< 0| def foo(aaa: Int, bbb: Int) = x diff --git a/data/fixtures/scopes/scala/argument/argument.formal.iteration2.scope b/data/fixtures/scopes/scala/argument/argument.formal.iteration2.scope index 399eb38f81..3b4393dee0 100644 --- a/data/fixtures/scopes/scala/argument/argument.formal.iteration2.scope +++ b/data/fixtures/scopes/scala/argument/argument.formal.iteration2.scope @@ -1,7 +1,7 @@ class Foo(aaa: Int, bbb: Int) {} --- -[Range] = 0:10-0:28 +[Content] = 0:10-0:28 >------------------< 0| class Foo(aaa: Int, bbb: Int) {} diff --git a/data/fixtures/scopes/scm/argument.actual.iteration.scope b/data/fixtures/scopes/scm/argument.actual.iteration.scope index 3c98fddf20..44eec6d1b1 100644 --- a/data/fixtures/scopes/scm/argument.actual.iteration.scope +++ b/data/fixtures/scopes/scm/argument.actual.iteration.scope @@ -1,7 +1,7 @@ (#foo? @aaa bbb) --- -[Range] = 0:7-0:15 +[Content] = 0:7-0:15 >--------< 0| (#foo? @aaa bbb) diff --git a/data/fixtures/scopes/scss/argument.actual.iteration.scope b/data/fixtures/scopes/scss/argument.actual.iteration.scope index bb88c5dafc..7def4e4cd4 100644 --- a/data/fixtures/scopes/scss/argument.actual.iteration.scope +++ b/data/fixtures/scopes/scss/argument.actual.iteration.scope @@ -1,7 +1,7 @@ @mixin replace-text($image, $color: red) {} --- -[Range] = 0:20-0:39 +[Content] = 0:20-0:39 >-------------------< 0| @mixin replace-text($image, $color: red) {} diff --git a/data/fixtures/scopes/scss/branch.if.iteration.scope b/data/fixtures/scopes/scss/branch.if.iteration.scope index 254dfad660..12208a5972 100644 --- a/data/fixtures/scopes/scss/branch.if.iteration.scope +++ b/data/fixtures/scopes/scss/branch.if.iteration.scope @@ -5,7 +5,7 @@ } --- -[Range] = +[Content] = [Domain] = 1:2-3:11 >------------ 1| @if true { } diff --git a/data/fixtures/scopes/scss/functionName.iteration.block.scope b/data/fixtures/scopes/scss/functionName.iteration.block.scope index 4637c1ce18..0013aa8c36 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 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| * { color: red; } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:3-0:16 >-------------< 0| * { color: red; } diff --git a/data/fixtures/scopes/scss/functionName.iteration.document.scope b/data/fixtures/scopes/scss/functionName.iteration.document.scope index 32c45fd583..fe0f60629a 100644 --- a/data/fixtures/scopes/scss/functionName.iteration.document.scope +++ b/data/fixtures/scopes/scss/functionName.iteration.document.scope @@ -3,7 +3,7 @@ --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:0 > 0| @@ -12,7 +12,7 @@ < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:3-1:16 >-------------< 1| * { color: red; } diff --git a/data/fixtures/scopes/scss/name.argument.formal.iteration.scope b/data/fixtures/scopes/scss/name.argument.formal.iteration.scope index a0203e0214..d0079c892b 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) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:43 >-------------------------------------------< 0| @mixin replace-text($image, $color: red) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:20-0:39 >-------------------< 0| @mixin replace-text($image, $color: red) {} diff --git a/data/fixtures/scopes/scss/namedFunction.iteration.block.scope b/data/fixtures/scopes/scss/namedFunction.iteration.block.scope index 4637c1ce18..0013aa8c36 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 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| * { color: red; } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:3-0:16 >-------------< 0| * { color: red; } diff --git a/data/fixtures/scopes/scss/namedFunction.iteration.document.scope b/data/fixtures/scopes/scss/namedFunction.iteration.document.scope index 32c45fd583..fe0f60629a 100644 --- a/data/fixtures/scopes/scss/namedFunction.iteration.document.scope +++ b/data/fixtures/scopes/scss/namedFunction.iteration.document.scope @@ -3,7 +3,7 @@ --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:0 > 0| @@ -12,7 +12,7 @@ < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:3-1:16 >-------------< 1| * { color: red; } diff --git a/data/fixtures/scopes/scss/value.argument.formal.iteration.scope b/data/fixtures/scopes/scss/value.argument.formal.iteration.scope index a0203e0214..d0079c892b 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) {} --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:43 >-------------------------------------------< 0| @mixin replace-text($image, $color: red) {} -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:20-0:39 >-------------------< 0| @mixin replace-text($image, $color: red) {} diff --git a/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope b/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope index a6ebed0860..d0371d49a9 100644 --- a/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope +++ b/data/fixtures/scopes/talon/argument/argument.actual.iteration.scope @@ -1,7 +1,7 @@ command: user.do_something(123, 456) --- -[Range] = 0:27-0:35 +[Content] = 0:27-0:35 >--------< 0| command: user.do_something(123, 456) diff --git a/data/fixtures/scopes/talon/argument/argument.actual.iteration2.scope b/data/fixtures/scopes/talon/argument/argument.actual.iteration2.scope index 7d5a20fff1..28bb332472 100644 --- a/data/fixtures/scopes/talon/argument/argument.actual.iteration2.scope +++ b/data/fixtures/scopes/talon/argument/argument.actual.iteration2.scope @@ -1,7 +1,7 @@ command: key(enter) --- -[Range] = 0:13-0:18 +[Content] = 0:13-0:18 >-----< 0| command: key(enter) diff --git a/data/fixtures/scopes/talon/argument/argument.actual.iteration3.scope b/data/fixtures/scopes/talon/argument/argument.actual.iteration3.scope index f828b67644..97bf6baeb1 100644 --- a/data/fixtures/scopes/talon/argument/argument.actual.iteration3.scope +++ b/data/fixtures/scopes/talon/argument/argument.actual.iteration3.scope @@ -1,7 +1,7 @@ command: sleep(100ms) --- -[Range] = 0:15-0:20 +[Content] = 0:15-0:20 >-----< 0| command: sleep(100ms) diff --git a/data/fixtures/scopes/talon/key/key.mapPair.iteration.scope b/data/fixtures/scopes/talon/key/key.mapPair.iteration.scope index 59613730c7..231eb469e3 100644 --- a/data/fixtures/scopes/talon/key/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/talon/key/key.mapPair.iteration.scope @@ -3,7 +3,7 @@ tag: browser - --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:12 >----------------- 0| not mode: command @@ -11,7 +11,7 @@ tag: browser ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:0-2:1 >----------------- 0| not mode: command diff --git a/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope b/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope index 986889b64c..08a1ebcdeb 100644 --- a/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope +++ b/data/fixtures/scopes/talon/key/key.mapPair.iteration2.scope @@ -2,7 +2,7 @@ foo: "bar" baz: "bongo" --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:12 >---------- 0| foo: "bar" @@ -10,13 +10,13 @@ baz: "bongo" ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:5-0:10 >-----< 0| foo: "bar" -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:5-1:12 >-------< 1| baz: "bongo" diff --git a/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope b/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope index 0704368e7e..03b469027d 100644 --- a/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope +++ b/data/fixtures/scopes/talon/key/key.mapPair.iteration3.scope @@ -3,7 +3,7 @@ settings(): bar = 0 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:11 >----------- 0| settings(): @@ -12,7 +12,7 @@ settings(): -----------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:11 >------- 1| foo = 0 diff --git a/data/fixtures/scopes/talon/name/name.iteration.block.scope b/data/fixtures/scopes/talon/name/name.iteration.block.scope index f839f283e9..4ff90b6702 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" --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| hello: "world" -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:7-0:14 >-------< 0| hello: "world" diff --git a/data/fixtures/scopes/talon/name/name.iteration.block2.scope b/data/fixtures/scopes/talon/name/name.iteration.block2.scope index 3bad208a56..da3333bb69 100644 --- a/data/fixtures/scopes/talon/name/name.iteration.block2.scope +++ b/data/fixtures/scopes/talon/name/name.iteration.block2.scope @@ -2,7 +2,7 @@ settings(): foo = 0 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:11 >----------- 0| settings(): @@ -10,7 +10,7 @@ settings(): -----------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:11 >-------< 1| foo = 0 diff --git a/data/fixtures/scopes/talon/name/name.iteration.block3.scope b/data/fixtures/scopes/talon/name/name.iteration.block3.scope index ce63b7a8b6..d16fad671e 100644 --- a/data/fixtures/scopes/talon/name/name.iteration.block3.scope +++ b/data/fixtures/scopes/talon/name/name.iteration.block3.scope @@ -7,13 +7,13 @@ settings(): foo = 0 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| mode: command -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:0-6:11 >------------- 0| mode: command @@ -26,7 +26,7 @@ settings(): -----------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 3:0-6:11 >-------------- 3| hello: "world" @@ -36,13 +36,13 @@ settings(): -----------< -[#4 Range] = +[#4 Content] = [#4 Domain] = 3:7-3:14 >-------< 3| hello: "world" -[#5 Range] = +[#5 Content] = [#5 Domain] = 6:4-6:11 >-------< 6| foo = 0 diff --git a/data/fixtures/scopes/talon/name/name.iteration.document.scope b/data/fixtures/scopes/talon/name/name.iteration.document.scope index cb50018a34..6303ac84b0 100644 --- a/data/fixtures/scopes/talon/name/name.iteration.document.scope +++ b/data/fixtures/scopes/talon/name/name.iteration.document.scope @@ -4,7 +4,7 @@ mode: command --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:0 > 0| @@ -14,7 +14,7 @@ mode: command < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:0-1:13 >-------------< 1| mode: command diff --git a/data/fixtures/scopes/talon/statement.iteration.block.scope b/data/fixtures/scopes/talon/statement.iteration.block.scope index 138ee103ab..bfff6c9360 100644 --- a/data/fixtures/scopes/talon/statement.iteration.block.scope +++ b/data/fixtures/scopes/talon/statement.iteration.block.scope @@ -2,7 +2,7 @@ command: value = 123 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:15 >-------- 0| command: @@ -10,7 +10,7 @@ command: ---------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:15 >-----------< 1| value = 123 diff --git a/data/fixtures/scopes/talon/statement.iteration.document.scope b/data/fixtures/scopes/talon/statement.iteration.document.scope index 09d83747e7..bf2f7f69c1 100644 --- a/data/fixtures/scopes/talon/statement.iteration.document.scope +++ b/data/fixtures/scopes/talon/statement.iteration.document.scope @@ -4,7 +4,7 @@ command: --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:0 > 0| @@ -14,7 +14,7 @@ command: < -[#2 Range] = +[#2 Content] = [#2 Domain] = 2:4-2:15 >-----------< 2| value = 123 diff --git a/data/fixtures/scopes/talon/value/value.iteration.block.scope b/data/fixtures/scopes/talon/value/value.iteration.block.scope index f839f283e9..4ff90b6702 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" --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:14 >--------------< 0| hello: "world" -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:7-0:14 >-------< 0| hello: "world" diff --git a/data/fixtures/scopes/talon/value/value.iteration.block2.scope b/data/fixtures/scopes/talon/value/value.iteration.block2.scope index 3bad208a56..da3333bb69 100644 --- a/data/fixtures/scopes/talon/value/value.iteration.block2.scope +++ b/data/fixtures/scopes/talon/value/value.iteration.block2.scope @@ -2,7 +2,7 @@ settings(): foo = 0 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:11 >----------- 0| settings(): @@ -10,7 +10,7 @@ settings(): -----------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-1:11 >-------< 1| foo = 0 diff --git a/data/fixtures/scopes/talon/value/value.iteration.block3.scope b/data/fixtures/scopes/talon/value/value.iteration.block3.scope index ce63b7a8b6..d16fad671e 100644 --- a/data/fixtures/scopes/talon/value/value.iteration.block3.scope +++ b/data/fixtures/scopes/talon/value/value.iteration.block3.scope @@ -7,13 +7,13 @@ settings(): foo = 0 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| mode: command -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:0-6:11 >------------- 0| mode: command @@ -26,7 +26,7 @@ settings(): -----------< -[#3 Range] = +[#3 Content] = [#3 Domain] = 3:0-6:11 >-------------- 3| hello: "world" @@ -36,13 +36,13 @@ settings(): -----------< -[#4 Range] = +[#4 Content] = [#4 Domain] = 3:7-3:14 >-------< 3| hello: "world" -[#5 Range] = +[#5 Content] = [#5 Domain] = 6:4-6:11 >-------< 6| foo = 0 diff --git a/data/fixtures/scopes/talon/value/value.iteration.document.scope b/data/fixtures/scopes/talon/value/value.iteration.document.scope index cb50018a34..6303ac84b0 100644 --- a/data/fixtures/scopes/talon/value/value.iteration.document.scope +++ b/data/fixtures/scopes/talon/value/value.iteration.document.scope @@ -4,7 +4,7 @@ mode: command --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:0 > 0| @@ -14,7 +14,7 @@ mode: command < -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:0-1:13 >-------------< 1| mode: command diff --git a/data/fixtures/scopes/talon/value/value.mapPair.iteration.scope b/data/fixtures/scopes/talon/value/value.mapPair.iteration.scope index 59613730c7..231eb469e3 100644 --- a/data/fixtures/scopes/talon/value/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/talon/value/value.mapPair.iteration.scope @@ -3,7 +3,7 @@ tag: browser - --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:12 >----------------- 0| not mode: command @@ -11,7 +11,7 @@ tag: browser ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:0-2:1 >----------------- 0| not mode: command diff --git a/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope b/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope index 986889b64c..08a1ebcdeb 100644 --- a/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope +++ b/data/fixtures/scopes/talon/value/value.mapPair.iteration2.scope @@ -2,7 +2,7 @@ foo: "bar" baz: "bongo" --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-1:12 >---------- 0| foo: "bar" @@ -10,13 +10,13 @@ baz: "bongo" ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:5-0:10 >-----< 0| foo: "bar" -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:5-1:12 >-------< 1| baz: "bongo" diff --git a/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope b/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope index 0704368e7e..03b469027d 100644 --- a/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope +++ b/data/fixtures/scopes/talon/value/value.mapPair.iteration3.scope @@ -3,7 +3,7 @@ settings(): bar = 0 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:11 >----------- 0| settings(): @@ -12,7 +12,7 @@ settings(): -----------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:4-2:11 >------- 1| foo = 0 diff --git a/data/fixtures/scopes/textual/boundedNonWhitespaceSequence.iteration.scope b/data/fixtures/scopes/textual/boundedNonWhitespaceSequence.iteration.scope index 21cf16b2e1..5906e7f504 100644 --- a/data/fixtures/scopes/textual/boundedNonWhitespaceSequence.iteration.scope +++ b/data/fixtures/scopes/textual/boundedNonWhitespaceSequence.iteration.scope @@ -1,19 +1,19 @@ aa(bb)cc dd(ee)ff --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| aa(bb)cc dd(ee)ff -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:3-0:5 >--< 0| aa(bb)cc dd(ee)ff -[#3 Range] = +[#3 Content] = [#3 Domain] = 0:12-0:14 >--< 0| aa(bb)cc dd(ee)ff diff --git a/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph.iteration.scope b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph.iteration.scope index b715ca67ef..5bc736180e 100644 --- a/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph.iteration.scope +++ b/data/fixtures/scopes/textual/boundedParagraph/boundedParagraph.iteration.scope @@ -4,7 +4,7 @@ } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:1 >- 0| { @@ -14,7 +14,7 @@ -< -[#2 Range] = 1:4-2:7 +[#2 Content] = 1:4-2:7 >--- 1| foo 2| bar diff --git a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration.scope index 9cced361b5..aaf3b7a7bb 100644 --- a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration.scope +++ b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration.scope @@ -1,7 +1,7 @@ (1, 2, 3) --- -[Range] = +[Content] = [Domain] = 0:1-0:8 >-------< 0| (1, 2, 3) diff --git a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration2.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration2.scope index 09af92177c..64e4946b0d 100644 --- a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration2.scope +++ b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration2.scope @@ -1,7 +1,7 @@ [1, 2, 3] --- -[Range] = +[Content] = [Domain] = 0:1-0:8 >-------< 0| [1, 2, 3] diff --git a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration3.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration3.scope index 06f24d63a9..97afe6d299 100644 --- a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration3.scope +++ b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration3.scope @@ -1,7 +1,7 @@ {1, 2, 3} --- -[Range] = +[Content] = [Domain] = 0:1-0:8 >-------< 0| {1, 2, 3} diff --git a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration4.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration4.scope index 81c9d30a35..1d2d6bcd7f 100644 --- a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration4.scope +++ b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration4.scope @@ -1,7 +1,7 @@ <1, 2, 3> --- -[Range] = +[Content] = [Domain] = 0:1-0:8 >-------< 0| <1, 2, 3> diff --git a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration5.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration5.scope index 166cce77cd..a7b37247dc 100644 --- a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration5.scope +++ b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration5.scope @@ -1,7 +1,7 @@ ( 1, 2, 3 ) --- -[Range] = 0:2-0:9 +[Content] = 0:2-0:9 >-------< 0| ( 1, 2, 3 ) diff --git a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration6.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration6.scope index 996188a6e7..268d1daff8 100644 --- a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration6.scope +++ b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration6.scope @@ -5,7 +5,7 @@ ] --- -[#1 Range] = 1:4-3:6 +[#1 Content] = 1:4-3:6 >-- 1| 1, 2| 2, @@ -22,7 +22,7 @@ < -[#2 Range] = 1:4-1:6 +[#2 Content] = 1:4-1:6 >--< 1| 1, @@ -31,7 +31,7 @@ 1| 1, -[#3 Range] = 2:4-2:6 +[#3 Content] = 2:4-2:6 >--< 2| 2, @@ -40,7 +40,7 @@ 2| 2, -[#4 Range] = 3:4-3:6 +[#4 Content] = 3:4-3:6 >--< 3| 3, diff --git a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration7.scope b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration7.scope index 5f081d0268..bc130600c2 100644 --- a/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration7.scope +++ b/data/fixtures/scopes/textual/collectionItem/collectionItem.textual.iteration7.scope @@ -5,7 +5,7 @@ } --- -[#1 Range] = 1:4-3:9 +[#1 Content] = 1:4-3:9 >----- 1| a: 1, 2| b: 2, @@ -22,7 +22,7 @@ < -[#2 Range] = 1:4-1:9 +[#2 Content] = 1:4-1:9 >-----< 1| a: 1, @@ -31,7 +31,7 @@ 1| a: 1, -[#3 Range] = 2:4-2:9 +[#3 Content] = 2:4-2:9 >-----< 2| b: 2, @@ -40,7 +40,7 @@ 2| b: 2, -[#4 Range] = 3:4-3:9 +[#4 Content] = 3:4-3:9 >-----< 3| c: 3, diff --git a/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration.scope index 26b2ab7e16..8dfcf858f5 100644 --- a/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration.scope +++ b/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration.scope @@ -3,7 +3,7 @@ --- -[Range] = +[Content] = [Domain] = 1:0-1:3 >---< 1| ( ) diff --git a/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration2.scope b/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration2.scope index 6fb4190a50..481b654461 100644 --- a/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration2.scope +++ b/data/fixtures/scopes/textual/surroundingPair/surroundingPair.iteration2.scope @@ -3,7 +3,7 @@ hello --- -[Range] = +[Content] = [Domain] = 1:0-1:5 >-----< 1| hello diff --git a/data/fixtures/scopes/typescript.core/name/name.iteration.class.scope b/data/fixtures/scopes/typescript.core/name/name.iteration.class.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/typescript.core/name/name.iteration.class.scope +++ b/data/fixtures/scopes/typescript.core/name/name.iteration.class.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/typescript.core/name/name.iteration.enum.scope b/data/fixtures/scopes/typescript.core/name/name.iteration.enum.scope index 984f21de91..9034c4ee11 100644 --- a/data/fixtures/scopes/typescript.core/name/name.iteration.enum.scope +++ b/data/fixtures/scopes/typescript.core/name/name.iteration.enum.scope @@ -1,13 +1,13 @@ enum Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:12 >------------< 0| enum Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:10-0:11 >-< 0| enum Foo { } diff --git a/data/fixtures/scopes/typescript.core/name/name.iteration.interface.scope b/data/fixtures/scopes/typescript.core/name/name.iteration.interface.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/typescript.core/name/name.iteration.interface.scope +++ b/data/fixtures/scopes/typescript.core/name/name.iteration.interface.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/typescript.core/statement/statement.iteration.interface.scope b/data/fixtures/scopes/typescript.core/statement/statement.iteration.interface.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/typescript.core/statement/statement.iteration.interface.scope +++ b/data/fixtures/scopes/typescript.core/statement/statement.iteration.interface.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } 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 ee1db1a57c..debbe2f951 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,13 +21,13 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:14-1:27 >-------------< 1| constructor(value: number) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 1:30-1:31 >-< 1| constructor(value: number) { } 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 92ab7d8a14..48334bec03 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,19 @@ function myFunk(value: number) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:34 >----------------------------------< 0| function myFunk(value: number) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:29 >-------------< 0| function myFunk(value: number) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 0:32-0:33 >-< 0| function myFunk(value: 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 37197136f8..76245545ad 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 @@ -3,7 +3,7 @@ class MyClass { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >--------------- 0| class MyClass { @@ -12,7 +12,7 @@ class MyClass { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-2:0 > 0| class MyClass { @@ -21,13 +21,13 @@ class MyClass { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:9-1:22 >-------------< 1| myFunk(value: number) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 1:25-1:26 >-< 1| myFunk(value: number) { } diff --git a/data/fixtures/scopes/typescript.core/type/type.iteration.block.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.block.scope index cf58c9ddb6..6a9caf512d 100644 --- a/data/fixtures/scopes/typescript.core/type/type.iteration.block.scope +++ b/data/fixtures/scopes/typescript.core/type/type.iteration.block.scope @@ -3,7 +3,7 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:1 >----------- 0| class Foo { @@ -12,7 +12,7 @@ class Foo { -< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-2:0 > 0| class Foo { @@ -21,7 +21,7 @@ class Foo { < -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:11-1:12 >-< 1| bar() { } diff --git a/data/fixtures/scopes/typescript.core/type/type.iteration.block2.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.block2.scope index 631a35c951..680b19102b 100644 --- a/data/fixtures/scopes/typescript.core/type/type.iteration.block2.scope +++ b/data/fixtures/scopes/typescript.core/type/type.iteration.block2.scope @@ -1,13 +1,13 @@ function foo() { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:18 >------------------< 0| function foo() { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:16-0:17 >-< 0| function foo() { } diff --git a/data/fixtures/scopes/typescript.core/type/type.iteration.block3.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.block3.scope index 0a78aceb4c..a9cb72326e 100644 --- a/data/fixtures/scopes/typescript.core/type/type.iteration.block3.scope +++ b/data/fixtures/scopes/typescript.core/type/type.iteration.block3.scope @@ -3,7 +3,7 @@ else if (false) { } else { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:8 >------------- 0| if (true) { } @@ -12,19 +12,19 @@ else { } --------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| if (true) { } -[#3 Range] = +[#3 Content] = [#3 Domain] = 1:17-1:18 >-< 1| else if (false) { } -[#4 Range] = +[#4 Content] = [#4 Domain] = 2:6-2:7 >-< 2| else { } diff --git a/data/fixtures/scopes/typescript.core/type/type.iteration.block4.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.block4.scope index e38a055e01..ba0f1535af 100644 --- a/data/fixtures/scopes/typescript.core/type/type.iteration.block4.scope +++ b/data/fixtures/scopes/typescript.core/type/type.iteration.block4.scope @@ -1,13 +1,13 @@ while (true) { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:16 >----------------< 0| while (true) { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:14-0:15 >-< 0| while (true) { } diff --git a/data/fixtures/scopes/typescript.core/type/type.iteration.class.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.class.scope index d68d97881e..a3ec5f3456 100644 --- a/data/fixtures/scopes/typescript.core/type/type.iteration.class.scope +++ b/data/fixtures/scopes/typescript.core/type/type.iteration.class.scope @@ -1,13 +1,13 @@ class Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:13 >-------------< 0| class Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:11-0:12 >-< 0| class Foo { } diff --git a/data/fixtures/scopes/typescript.core/type/type.iteration.document.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.document.scope index cf1e2c36ea..a45b9305b9 100644 --- a/data/fixtures/scopes/typescript.core/type/type.iteration.document.scope +++ b/data/fixtures/scopes/typescript.core/type/type.iteration.document.scope @@ -3,7 +3,7 @@ let foo; --- -[Range] = +[Content] = [Domain] = 0:0-2:0 > 0| diff --git a/data/fixtures/scopes/typescript.core/type/type.iteration.interface.scope b/data/fixtures/scopes/typescript.core/type/type.iteration.interface.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/typescript.core/type/type.iteration.interface.scope +++ b/data/fixtures/scopes/typescript.core/type/type.iteration.interface.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/typescript.core/type/type.typeArgument.iteration.scope b/data/fixtures/scopes/typescript.core/type/type.typeArgument.iteration.scope index 11833db77c..bbf5a7c105 100644 --- a/data/fixtures/scopes/typescript.core/type/type.typeArgument.iteration.scope +++ b/data/fixtures/scopes/typescript.core/type/type.typeArgument.iteration.scope @@ -1,13 +1,13 @@ let value: Map; --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:31 >-------------------------------< 0| let value: Map; -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:29 >--------------< 0| let value: Map; diff --git a/data/fixtures/scopes/typescript.core/value/value.iteration.class.scope b/data/fixtures/scopes/typescript.core/value/value.iteration.class.scope index 96db32e4ed..4140b6c622 100644 --- a/data/fixtures/scopes/typescript.core/value/value.iteration.class.scope +++ b/data/fixtures/scopes/typescript.core/value/value.iteration.class.scope @@ -1,13 +1,13 @@ interface Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:17 >-----------------< 0| interface Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:15-0:16 >-< 0| interface Foo { } diff --git a/data/fixtures/scopes/typescript.core/value/value.iteration.enum.scope b/data/fixtures/scopes/typescript.core/value/value.iteration.enum.scope index 984f21de91..9034c4ee11 100644 --- a/data/fixtures/scopes/typescript.core/value/value.iteration.enum.scope +++ b/data/fixtures/scopes/typescript.core/value/value.iteration.enum.scope @@ -1,13 +1,13 @@ enum Foo { } --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-0:12 >------------< 0| enum Foo { } -[#2 Range] = +[#2 Content] = [#2 Domain] = 0:10-0:11 >-< 0| enum Foo { } diff --git a/data/fixtures/scopes/yaml/collectionItem.unenclosed.iteration.scope b/data/fixtures/scopes/yaml/collectionItem.unenclosed.iteration.scope index c523bc87d3..843d16ed49 100644 --- a/data/fixtures/scopes/yaml/collectionItem.unenclosed.iteration.scope +++ b/data/fixtures/scopes/yaml/collectionItem.unenclosed.iteration.scope @@ -4,7 +4,7 @@ items: - 3 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-3:5 >------ 0| items: @@ -14,7 +14,7 @@ items: -----< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:2-3:5 >--- 1| - 1 diff --git a/data/fixtures/scopes/yaml/key.mapPair.iteration.scope b/data/fixtures/scopes/yaml/key.mapPair.iteration.scope index c75d13702c..487d85d056 100644 --- a/data/fixtures/scopes/yaml/key.mapPair.iteration.scope +++ b/data/fixtures/scopes/yaml/key.mapPair.iteration.scope @@ -3,7 +3,7 @@ obj: value: 123 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---- 0| obj: @@ -12,7 +12,7 @@ obj: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:2-2:12 >----------- 1| name: "foo" diff --git a/data/fixtures/scopes/yaml/value.mapPair.iteration.scope b/data/fixtures/scopes/yaml/value.mapPair.iteration.scope index c75d13702c..487d85d056 100644 --- a/data/fixtures/scopes/yaml/value.mapPair.iteration.scope +++ b/data/fixtures/scopes/yaml/value.mapPair.iteration.scope @@ -3,7 +3,7 @@ obj: value: 123 --- -[#1 Range] = +[#1 Content] = [#1 Domain] = 0:0-2:12 >---- 0| obj: @@ -12,7 +12,7 @@ obj: ------------< -[#2 Range] = +[#2 Content] = [#2 Domain] = 1:2-2:12 >----------- 1| name: "foo" diff --git a/packages/cursorless-vscode-e2e/src/suite/serializeScopeFixture.ts b/packages/cursorless-vscode-e2e/src/suite/serializeScopeFixture.ts index 23489e75b5..19aaf59e13 100644 --- a/packages/cursorless-vscode-e2e/src/suite/serializeScopeFixture.ts +++ b/packages/cursorless-vscode-e2e/src/suite/serializeScopeFixture.ts @@ -133,7 +133,7 @@ function serializeIterationScope( lines.push( serializeHeader({ - header: "Range", + header: "Content", scopeNumber, targetNumber: ranges.length > 1 ? index + 1 : undefined, range: groupHeaders ? undefined : range.range,