From 07ba25c9aa19cbbf0df6a670b25c19792088ba76 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Sun, 15 Feb 2026 04:58:14 +0100 Subject: [PATCH] Update disqualifyDelimiter scope facet fixture --- .../scopes/c/disqualifyDelimiter.scope | 8 +- .../scopes/cpp/disqualifyDelimiter.scope | 8 +- .../scopes/csharp/disqualifyDelimiter.scope | 6 +- .../scopes/go/disqualifyDelimiter.scope | 4 +- .../scopes/java/disqualifyDelimiter.scope | 10 +- .../scopes/kotlin/disqualifyDelimiter.scope | 18 +-- .../scopes/php/disqualifyDelimiter.scope | 8 +- .../scopes/python/disqualifyDelimiter.scope | 4 +- .../scopes/r/disqualifyDelimiter.scope | 72 +++++------ .../scopes/ruby/disqualifyDelimiter.scope | 10 +- .../scopes/rust/disqualifyDelimiter.scope | 24 ++-- .../scopes/scala/disqualifyDelimiter.scope | 122 +++++++++--------- .../scopes/scss/disqualifyDelimiter.scope | 32 ++--- .../scopes/yaml/disqualifyDelimiter.scope | 24 ++-- 14 files changed, 181 insertions(+), 169 deletions(-) diff --git a/data/fixtures/scopes/c/disqualifyDelimiter.scope b/data/fixtures/scopes/c/disqualifyDelimiter.scope index 7664c17577..d921414a56 100644 --- a/data/fixtures/scopes/c/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/c/disqualifyDelimiter.scope @@ -6,7 +6,7 @@ a << 2; a >> 2; a <<= 2; a >>= 2; -a->b +foo->bar; --- [#1 Content] = 0:2-0:3 >-< @@ -40,6 +40,6 @@ a->b >---< 7| a >>= 2; -[#9 Content] = 8:1-8:3 - >--< -8| a->b +[#9 Content] = 8:3-8:5 + >--< +8| foo->bar; diff --git a/data/fixtures/scopes/cpp/disqualifyDelimiter.scope b/data/fixtures/scopes/cpp/disqualifyDelimiter.scope index 9097f5bbeb..4d773c7250 100644 --- a/data/fixtures/scopes/cpp/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/cpp/disqualifyDelimiter.scope @@ -1,5 +1,5 @@ -auto max(int a, int b) -> int; +auto max() -> int; --- -[Content] = 0:23-0:25 - >--< -0| auto max(int a, int b) -> int; +[Content] = 0:11-0:13 + >--< +0| auto max() -> int; diff --git a/data/fixtures/scopes/csharp/disqualifyDelimiter.scope b/data/fixtures/scopes/csharp/disqualifyDelimiter.scope index 3cfe7b0fe1..1b7d43ea79 100644 --- a/data/fixtures/scopes/csharp/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/csharp/disqualifyDelimiter.scope @@ -6,8 +6,8 @@ a << 2; a >> 2; a <<= 2; a >>= 2; -foo->bar; () => 2; +foo->bar; --- [#1 Content] = 0:2-0:3 >-< @@ -43,8 +43,8 @@ foo->bar; [#9 Content] = 8:3-8:5 >--< -8| foo->bar; +8| () => 2; [#10 Content] = 9:3-9:5 >--< -9| () => 2; +9| foo->bar; diff --git a/data/fixtures/scopes/go/disqualifyDelimiter.scope b/data/fixtures/scopes/go/disqualifyDelimiter.scope index 195db899c3..c49837a7f1 100644 --- a/data/fixtures/scopes/go/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/go/disqualifyDelimiter.scope @@ -6,7 +6,7 @@ a << 2 a >> 2 a <<= 2 a >>= 2 -ch <- 42 +ch <- 2 msg := <- ch --- [#1 Content] = 0:2-0:3 @@ -43,7 +43,7 @@ msg := <- ch [#9 Content] = 8:3-8:5 >--< -8| ch <- 42 +8| ch <- 2 [#10 Content] = 9:7-9:9 >--< diff --git a/data/fixtures/scopes/java/disqualifyDelimiter.scope b/data/fixtures/scopes/java/disqualifyDelimiter.scope index a0005ea65d..5987f9b986 100644 --- a/data/fixtures/scopes/java/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/java/disqualifyDelimiter.scope @@ -9,7 +9,9 @@ a >>= 2; a >>> 2; a >>>= 2; () -> 2; -switch () { case "foo" -> 1 } +switch (foo) { + case a -> 2 +} --- [#1 Content] = 0:2-0:3 >-< @@ -55,6 +57,6 @@ switch () { case "foo" -> 1 } >--< 10| () -> 2; -[#12 Content] = 11:23-11:25 - >--< -11| switch () { case "foo" -> 1 } +[#12 Content] = 12:11-12:13 + >--< +12| case a -> 2 diff --git a/data/fixtures/scopes/kotlin/disqualifyDelimiter.scope b/data/fixtures/scopes/kotlin/disqualifyDelimiter.scope index d29fc4f298..8228595c63 100644 --- a/data/fixtures/scopes/kotlin/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/kotlin/disqualifyDelimiter.scope @@ -2,8 +2,10 @@ 1 > 2 1 <= 2 1 >= 2 -when (foo) { x -> 0 } -{ x -> 0 } +{a -> 2} +when (foo) { + a -> 2 +} --- [#1 Content] = 0:2-0:3 >-< @@ -21,10 +23,10 @@ when (foo) { x -> 0 } >--< 3| 1 >= 2 -[#5 Content] = 4:15-4:17 - >--< -4| when (foo) { x -> 0 } +[#5 Content] = 4:3-4:5 + >--< +4| {a -> 2} -[#6 Content] = 5:4-5:6 - >--< -5| { x -> 0 } +[#6 Content] = 6:6-6:8 + >--< +6| a -> 2 diff --git a/data/fixtures/scopes/php/disqualifyDelimiter.scope b/data/fixtures/scopes/php/disqualifyDelimiter.scope index 0bac13f328..d90fae0106 100644 --- a/data/fixtures/scopes/php/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/php/disqualifyDelimiter.scope @@ -7,7 +7,7 @@ a << 2; a >> 2; a <<= 2; a >>= 2; -['first' => 1]; +['a' => 2]; $a = <<< EOT; $a = <<< 'TEXT'; foo->bar; @@ -47,9 +47,9 @@ foo?->bar(); >--< 8| a >>= 2; -[#9 Content] = 9:9-9:11 - >--< -9| ['first' => 1]; +[#9 Content] = 9:5-9:7 + >--< +9| ['a' => 2]; [#10 Content] = 10:5-10:8 >---< diff --git a/data/fixtures/scopes/python/disqualifyDelimiter.scope b/data/fixtures/scopes/python/disqualifyDelimiter.scope index d2e9a6cedb..77e47a4e73 100644 --- a/data/fixtures/scopes/python/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/python/disqualifyDelimiter.scope @@ -6,7 +6,7 @@ a << 2 a >> 2 a <<= 2 a >>= 2 -def foo() -> int: +def foo() -> int: pass --- [#1 Content] = 0:2-0:3 >-< @@ -42,4 +42,4 @@ def foo() -> int: [#9 Content] = 8:10-8:12 >--< -8| def foo() -> int: +8| def foo() -> int: pass diff --git a/data/fixtures/scopes/r/disqualifyDelimiter.scope b/data/fixtures/scopes/r/disqualifyDelimiter.scope index 2bb0d8cc5c..d5aaddd9ba 100644 --- a/data/fixtures/scopes/r/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/r/disqualifyDelimiter.scope @@ -1,45 +1,45 @@ -foo < 0 -foo > 0 -foo <- 0 -foo -> 0 -foo <= 0 -foo >= 0 -foo <<- 0 -foo ->> 0 -foo |> 0 +1 < 2 +1 > 2 +1 <= 2 +1 >= 2 +a <- 2 +a -> 2 +a <<- 2 +a ->> 2 +a |> 2 --- -[#1 Content] = 0:4-0:5 - >-< -0| foo < 0 +[#1 Content] = 0:2-0:3 + >-< +0| 1 < 2 -[#2 Content] = 1:4-1:5 - >-< -1| foo > 0 +[#2 Content] = 1:2-1:3 + >-< +1| 1 > 2 -[#3 Content] = 2:4-2:6 - >--< -2| foo <- 0 +[#3 Content] = 2:2-2:4 + >--< +2| 1 <= 2 -[#4 Content] = 3:4-3:6 - >--< -3| foo -> 0 +[#4 Content] = 3:2-3:4 + >--< +3| 1 >= 2 -[#5 Content] = 4:4-4:6 - >--< -4| foo <= 0 +[#5 Content] = 4:2-4:4 + >--< +4| a <- 2 -[#6 Content] = 5:4-5:6 - >--< -5| foo >= 0 +[#6 Content] = 5:2-5:4 + >--< +5| a -> 2 -[#7 Content] = 6:4-6:7 - >---< -6| foo <<- 0 +[#7 Content] = 6:2-6:5 + >---< +6| a <<- 2 -[#8 Content] = 7:4-7:7 - >---< -7| foo ->> 0 +[#8 Content] = 7:2-7:5 + >---< +7| a ->> 2 -[#9 Content] = 8:4-8:6 - >--< -8| foo |> 0 +[#9 Content] = 8:2-8:4 + >--< +8| a |> 2 diff --git a/data/fixtures/scopes/ruby/disqualifyDelimiter.scope b/data/fixtures/scopes/ruby/disqualifyDelimiter.scope index 6875157b68..9c4d694692 100644 --- a/data/fixtures/scopes/ruby/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/ruby/disqualifyDelimiter.scope @@ -7,7 +7,9 @@ a >> 2 a <<= 2 a >>= 2 a = { :b => 2 } -case 85 when 0 then => "Fail" end +case foo + when a then => 2 +end --- [#1 Content] = 0:2-0:3 >-< @@ -45,6 +47,6 @@ case 85 when 0 then => "Fail" end >--< 8| a = { :b => 2 } -[#10 Content] = 9:20-9:22 - >--< -9| case 85 when 0 then => "Fail" end +[#10 Content] = 10:16-10:18 + >--< +10| when a then => 2 diff --git a/data/fixtures/scopes/rust/disqualifyDelimiter.scope b/data/fixtures/scopes/rust/disqualifyDelimiter.scope index 0d781a8fb4..c1fb1b4452 100644 --- a/data/fixtures/scopes/rust/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/rust/disqualifyDelimiter.scope @@ -6,9 +6,13 @@ a << 2; a >> 2; a <<= 2; a >>= 2; -fn foo() -> string {} -match number { 0 => "fail" } -macro_rules! my_expr { ($x:expr) => {}; } +fn foo() -> i32 {} +match number { + 0 => "fail" +} +macro_rules! my_expr { + ($x:expr) => {}; +} --- [#1 Content] = 0:2-0:3 >-< @@ -44,12 +48,12 @@ macro_rules! my_expr { ($x:expr) => {}; } [#9 Content] = 8:9-8:11 >--< -8| fn foo() -> string {} +8| fn foo() -> i32 {} -[#10 Content] = 9:17-9:19 - >--< -9| match number { 0 => "fail" } +[#10 Content] = 10:6-10:8 + >--< +10| 0 => "fail" -[#11 Content] = 10:33-10:35 - >--< -10| macro_rules! my_expr { ($x:expr) => {}; } +[#11 Content] = 13:14-13:16 + >--< +13| ($x:expr) => {}; diff --git a/data/fixtures/scopes/scala/disqualifyDelimiter.scope b/data/fixtures/scopes/scala/disqualifyDelimiter.scope index 6c66bb054a..c49145f761 100644 --- a/data/fixtures/scopes/scala/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/scala/disqualifyDelimiter.scope @@ -1,75 +1,77 @@ -val minValue = if (1 < 2) a else b -val minValue = if (1 > 2) a else b -val minValue = if (1 <= 2) a else b -val minValue = if (1 >= 2) a else b -val minValue = if (a << 2) a else b -val minValue = if (a >> 2) a else b -val minValue = if (a <<= 2) a else b -val minValue = if (a >>= 2) a else b -for (n <- numbers) yield n -def function[T <% String](x: T) = {} -def method[T <: BaseType](param: T) = {} -def method[T >: BaseType](param: T) = {} -val foo = (x: Int) => x -val func: (Int, Int) => Int = foo -value match { case 0 => "fail" } +1 < 2 +1 > 2 +1 <= 2 +1 >= 2 +a << 2 +a >> 2 +a <<= 2 +a >>= 2 +() => 2 +var a: () => Int +for (a <- b) {} +def function[T <% Int] = {} +def method[T <: Int] = {} +def method[T >: Int] = {} +foo match { + case a => 2 +} --- -[#1 Content] = 0:21-0:22 - >-< -0| val minValue = if (1 < 2) a else b +[#1 Content] = 0:2-0:3 + >-< +0| 1 < 2 -[#2 Content] = 1:21-1:22 - >-< -1| val minValue = if (1 > 2) a else b +[#2 Content] = 1:2-1:3 + >-< +1| 1 > 2 -[#3 Content] = 2:21-2:23 - >--< -2| val minValue = if (1 <= 2) a else b +[#3 Content] = 2:2-2:4 + >--< +2| 1 <= 2 -[#4 Content] = 3:21-3:23 - >--< -3| val minValue = if (1 >= 2) a else b +[#4 Content] = 3:2-3:4 + >--< +3| 1 >= 2 -[#5 Content] = 4:21-4:23 - >--< -4| val minValue = if (a << 2) a else b +[#5 Content] = 4:2-4:4 + >--< +4| a << 2 -[#6 Content] = 5:21-5:23 - >--< -5| val minValue = if (a >> 2) a else b +[#6 Content] = 5:2-5:4 + >--< +5| a >> 2 -[#7 Content] = 6:21-6:24 - >---< -6| val minValue = if (a <<= 2) a else b +[#7 Content] = 6:2-6:5 + >---< +6| a <<= 2 -[#8 Content] = 7:21-7:24 - >---< -7| val minValue = if (a >>= 2) a else b +[#8 Content] = 7:2-7:5 + >---< +7| a >>= 2 -[#9 Content] = 8:7-8:9 - >--< -8| for (n <- numbers) yield n +[#9 Content] = 8:3-8:5 + >--< +8| () => 2 -[#10 Content] = 9:15-9:17 - >--< -9| def function[T <% String](x: T) = {} +[#10 Content] = 9:10-9:12 + >--< +9| var a: () => Int -[#11 Content] = 10:13-10:15 - >--< -10| def method[T <: BaseType](param: T) = {} +[#11 Content] = 10:7-10:9 + >--< +10| for (a <- b) {} -[#12 Content] = 11:13-11:15 - >--< -11| def method[T >: BaseType](param: T) = {} +[#12 Content] = 11:15-11:17 + >--< +11| def function[T <% Int] = {} -[#13 Content] = 12:19-12:21 - >--< -12| val foo = (x: Int) => x +[#13 Content] = 12:13-12:15 + >--< +12| def method[T <: Int] = {} -[#14 Content] = 13:21-13:23 - >--< -13| val func: (Int, Int) => Int = foo +[#14 Content] = 13:13-13:15 + >--< +13| def method[T >: Int] = {} -[#15 Content] = 14:21-14:23 - >--< -14| value match { case 0 => "fail" } +[#15 Content] = 15:11-15:13 + >--< +15| case a => 2 diff --git a/data/fixtures/scopes/scss/disqualifyDelimiter.scope b/data/fixtures/scopes/scss/disqualifyDelimiter.scope index e1c1631e97..5f348b034e 100644 --- a/data/fixtures/scopes/scss/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/scss/disqualifyDelimiter.scope @@ -1,22 +1,22 @@ * { - @if $container-width < $base-width {} - @if $container-width <= $base-width {} - @if $container-width > $base-width {} - @if $container-width >= $base-width {} + @if 1 < 2 {} + @if 1 > 2 {} + @if 1 <= 2 {} + @if 1 >= 2 {} } --- -[#1 Content] = 1:25-1:26 - >-< -1| @if $container-width < $base-width {} +[#1 Content] = 1:10-1:11 + >-< +1| @if 1 < 2 {} -[#2 Content] = 2:25-2:27 - >--< -2| @if $container-width <= $base-width {} +[#2 Content] = 2:10-2:11 + >-< +2| @if 1 > 2 {} -[#3 Content] = 3:25-3:26 - >-< -3| @if $container-width > $base-width {} +[#3 Content] = 3:10-3:12 + >--< +3| @if 1 <= 2 {} -[#4 Content] = 4:25-4:27 - >--< -4| @if $container-width >= $base-width {} +[#4 Content] = 4:10-4:12 + >--< +4| @if 1 >= 2 {} diff --git a/data/fixtures/scopes/yaml/disqualifyDelimiter.scope b/data/fixtures/scopes/yaml/disqualifyDelimiter.scope index 8f609bb02b..6052860e68 100644 --- a/data/fixtures/scopes/yaml/disqualifyDelimiter.scope +++ b/data/fixtures/scopes/yaml/disqualifyDelimiter.scope @@ -1,15 +1,15 @@ -foo: > -foo: >- -foo: >+ +a: > +a: >- +a: >+ --- -[#1 Content] = 0:5-0:6 - >-< -0| foo: > +[#1 Content] = 0:3-0:4 + >-< +0| a: > -[#2 Content] = 1:5-1:7 - >--< -1| foo: >- +[#2 Content] = 1:3-1:5 + >--< +1| a: >- -[#3 Content] = 2:5-2:7 - >--< -2| foo: >+ +[#3 Content] = 2:3-2:5 + >--< +2| a: >+