From 70df3e6e38b696be3095863c8803f8ffa431f548 Mon Sep 17 00:00:00 2001 From: Andreas Arvidsson Date: Mon, 21 Sep 2026 15:25:22 +0200 Subject: [PATCH] Fix bug where some scope fixtures were missing empty line after divider --- .../app-web-docs/src/docs/contributing/scope-test-format.md | 2 ++ packages/lib-engine/src/testUtil/serializeScopeFixture.ts | 4 ++-- resources/fixtures/scopes/c/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/clojure/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/cpp/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/csharp/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/css/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/dart/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/go/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/java/disqualifyDelimiter.scope | 1 + .../fixtures/scopes/javascript.core/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/kotlin/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/latex/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/lua/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/php/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/python/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/r/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/ruby/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/rust/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/scala/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/scss/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/swift/disqualifyDelimiter.scope | 1 + .../fixtures/scopes/typescript.core/disqualifyDelimiter.scope | 1 + resources/fixtures/scopes/yaml/disqualifyDelimiter.scope | 1 + 24 files changed, 26 insertions(+), 2 deletions(-) diff --git a/packages/app-web-docs/src/docs/contributing/scope-test-format.md b/packages/app-web-docs/src/docs/contributing/scope-test-format.md index de5c8944522..0375711ad5a 100644 --- a/packages/app-web-docs/src/docs/contributing/scope-test-format.md +++ b/packages/app-web-docs/src/docs/contributing/scope-test-format.md @@ -9,6 +9,7 @@ Example of `.scope` file for the javascript statement scope. ``` const value = 0; --- + [Content] = [Removal] = [Domain] = 0:0-0:16 @@ -25,6 +26,7 @@ General layout of a `.scope` file is: ``` Source code --- + Scopes ``` diff --git a/packages/lib-engine/src/testUtil/serializeScopeFixture.ts b/packages/lib-engine/src/testUtil/serializeScopeFixture.ts index ff03777eba3..a223436dd8a 100644 --- a/packages/lib-engine/src/testUtil/serializeScopeFixture.ts +++ b/packages/lib-engine/src/testUtil/serializeScopeFixture.ts @@ -51,9 +51,9 @@ function serializeScopeFixtureHelper( codeLines: string[], scopes: string[], ): string { - const serializedScopes = scopes.join("\n\n"); + const serializedScopes = scopes.join("\n\n").trimStart(); - return [...codeLines, "---", serializedScopes, ""].join("\n"); + return [...codeLines, "---", "", serializedScopes, ""].join("\n"); } function serializeScope( diff --git a/resources/fixtures/scopes/c/disqualifyDelimiter.scope b/resources/fixtures/scopes/c/disqualifyDelimiter.scope index d921414a56a..3bebc3c68e4 100644 --- a/resources/fixtures/scopes/c/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/c/disqualifyDelimiter.scope @@ -8,6 +8,7 @@ a <<= 2; a >>= 2; foo->bar; --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2; diff --git a/resources/fixtures/scopes/clojure/disqualifyDelimiter.scope b/resources/fixtures/scopes/clojure/disqualifyDelimiter.scope index 3915696a3eb..08477a9f7fd 100644 --- a/resources/fixtures/scopes/clojure/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/clojure/disqualifyDelimiter.scope @@ -3,6 +3,7 @@ (<= 1 2) (>= 1 2) --- + [#1 Content] = 0:1-0:2 >-< 0| (< 1 2) diff --git a/resources/fixtures/scopes/cpp/disqualifyDelimiter.scope b/resources/fixtures/scopes/cpp/disqualifyDelimiter.scope index 4d773c7250d..22dacaec784 100644 --- a/resources/fixtures/scopes/cpp/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/cpp/disqualifyDelimiter.scope @@ -1,5 +1,6 @@ auto max() -> int; --- + [Content] = 0:11-0:13 >--< 0| auto max() -> int; diff --git a/resources/fixtures/scopes/csharp/disqualifyDelimiter.scope b/resources/fixtures/scopes/csharp/disqualifyDelimiter.scope index 1b7d43ea799..497ce76f9f0 100644 --- a/resources/fixtures/scopes/csharp/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/csharp/disqualifyDelimiter.scope @@ -9,6 +9,7 @@ a >>= 2; () => 2; foo->bar; --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2; diff --git a/resources/fixtures/scopes/css/disqualifyDelimiter.scope b/resources/fixtures/scopes/css/disqualifyDelimiter.scope index dbc80ec2552..d1a69d497a3 100644 --- a/resources/fixtures/scopes/css/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/css/disqualifyDelimiter.scope @@ -1,5 +1,6 @@ div > div {} --- + [Content] = 0:4-0:5 >-< 0| div > div {} diff --git a/resources/fixtures/scopes/dart/disqualifyDelimiter.scope b/resources/fixtures/scopes/dart/disqualifyDelimiter.scope index 45065e8d65b..b3567690a7c 100644 --- a/resources/fixtures/scopes/dart/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/dart/disqualifyDelimiter.scope @@ -15,6 +15,7 @@ class Foo { int get bar => 0; } --- + [#1 Content] = 1:6-1:7 >-< 1| 1 < 2; diff --git a/resources/fixtures/scopes/go/disqualifyDelimiter.scope b/resources/fixtures/scopes/go/disqualifyDelimiter.scope index c49837a7f14..11b10730248 100644 --- a/resources/fixtures/scopes/go/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/go/disqualifyDelimiter.scope @@ -9,6 +9,7 @@ a >>= 2 ch <- 2 msg := <- ch --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2 diff --git a/resources/fixtures/scopes/java/disqualifyDelimiter.scope b/resources/fixtures/scopes/java/disqualifyDelimiter.scope index 3743193a5b3..8fb66d8b3b3 100644 --- a/resources/fixtures/scopes/java/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/java/disqualifyDelimiter.scope @@ -13,6 +13,7 @@ switch (value) { case a -> 2 } --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2; diff --git a/resources/fixtures/scopes/javascript.core/disqualifyDelimiter.scope b/resources/fixtures/scopes/javascript.core/disqualifyDelimiter.scope index be4cde6c691..21346732b9f 100644 --- a/resources/fixtures/scopes/javascript.core/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/javascript.core/disqualifyDelimiter.scope @@ -10,6 +10,7 @@ a >>> 2; a >>>= 2; () => 2; --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2; diff --git a/resources/fixtures/scopes/kotlin/disqualifyDelimiter.scope b/resources/fixtures/scopes/kotlin/disqualifyDelimiter.scope index 8228595c63f..ea599f83274 100644 --- a/resources/fixtures/scopes/kotlin/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/kotlin/disqualifyDelimiter.scope @@ -7,6 +7,7 @@ when (foo) { a -> 2 } --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2 diff --git a/resources/fixtures/scopes/latex/disqualifyDelimiter.scope b/resources/fixtures/scopes/latex/disqualifyDelimiter.scope index 489ca6ced40..cd90ee10d58 100644 --- a/resources/fixtures/scopes/latex/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/latex/disqualifyDelimiter.scope @@ -1,6 +1,7 @@ 1 < 2 1 > 2 --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2 diff --git a/resources/fixtures/scopes/lua/disqualifyDelimiter.scope b/resources/fixtures/scopes/lua/disqualifyDelimiter.scope index 2714290df53..dd73b4500a9 100644 --- a/resources/fixtures/scopes/lua/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/lua/disqualifyDelimiter.scope @@ -5,6 +5,7 @@ a = 1 >= 2 a = 1 << 2 a = 1 >> 2 --- + [#1 Content] = 0:6-0:7 >-< 0| a = 1 < 2 diff --git a/resources/fixtures/scopes/php/disqualifyDelimiter.scope b/resources/fixtures/scopes/php/disqualifyDelimiter.scope index d90fae0106b..211a80bbd03 100644 --- a/resources/fixtures/scopes/php/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/php/disqualifyDelimiter.scope @@ -15,6 +15,7 @@ foo->bar(); foo?->bar; foo?->bar(); --- + [#1 Content] = 1:2-1:3 >-< 1| 1 < 2; diff --git a/resources/fixtures/scopes/python/disqualifyDelimiter.scope b/resources/fixtures/scopes/python/disqualifyDelimiter.scope index 77e47a4e730..2575985cefc 100644 --- a/resources/fixtures/scopes/python/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/python/disqualifyDelimiter.scope @@ -8,6 +8,7 @@ a <<= 2 a >>= 2 def foo() -> int: pass --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2 diff --git a/resources/fixtures/scopes/r/disqualifyDelimiter.scope b/resources/fixtures/scopes/r/disqualifyDelimiter.scope index d5aaddd9ba7..d6ed5d11fa4 100644 --- a/resources/fixtures/scopes/r/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/r/disqualifyDelimiter.scope @@ -8,6 +8,7 @@ a <<- 2 a ->> 2 a |> 2 --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2 diff --git a/resources/fixtures/scopes/ruby/disqualifyDelimiter.scope b/resources/fixtures/scopes/ruby/disqualifyDelimiter.scope index 9c4d6946927..0f75350b589 100644 --- a/resources/fixtures/scopes/ruby/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/ruby/disqualifyDelimiter.scope @@ -11,6 +11,7 @@ case foo when a then => 2 end --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2 diff --git a/resources/fixtures/scopes/rust/disqualifyDelimiter.scope b/resources/fixtures/scopes/rust/disqualifyDelimiter.scope index c1fb1b4452a..cd2511a7232 100644 --- a/resources/fixtures/scopes/rust/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/rust/disqualifyDelimiter.scope @@ -14,6 +14,7 @@ macro_rules! my_expr { ($x:expr) => {}; } --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2; diff --git a/resources/fixtures/scopes/scala/disqualifyDelimiter.scope b/resources/fixtures/scopes/scala/disqualifyDelimiter.scope index c49145f761a..3c911a1af50 100644 --- a/resources/fixtures/scopes/scala/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/scala/disqualifyDelimiter.scope @@ -16,6 +16,7 @@ foo match { case a => 2 } --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2 diff --git a/resources/fixtures/scopes/scss/disqualifyDelimiter.scope b/resources/fixtures/scopes/scss/disqualifyDelimiter.scope index 5f348b034ed..b21321e16fb 100644 --- a/resources/fixtures/scopes/scss/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/scss/disqualifyDelimiter.scope @@ -5,6 +5,7 @@ @if 1 >= 2 {} } --- + [#1 Content] = 1:10-1:11 >-< 1| @if 1 < 2 {} diff --git a/resources/fixtures/scopes/swift/disqualifyDelimiter.scope b/resources/fixtures/scopes/swift/disqualifyDelimiter.scope index 44151ad9015..b1d5ce9a4b3 100644 --- a/resources/fixtures/scopes/swift/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/swift/disqualifyDelimiter.scope @@ -16,6 +16,7 @@ a >~ 2 ..<2 let foo: () -> Int --- + [#1 Content] = 0:2-0:3 >-< 0| 1 < 2 diff --git a/resources/fixtures/scopes/typescript.core/disqualifyDelimiter.scope b/resources/fixtures/scopes/typescript.core/disqualifyDelimiter.scope index 8d72ab1b8d8..2933d6ba567 100644 --- a/resources/fixtures/scopes/typescript.core/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/typescript.core/disqualifyDelimiter.scope @@ -1,5 +1,6 @@ Promise<() => number> --- + [Content] = 0:11-0:13 >--< 0| Promise<() => number> diff --git a/resources/fixtures/scopes/yaml/disqualifyDelimiter.scope b/resources/fixtures/scopes/yaml/disqualifyDelimiter.scope index 6052860e680..aaf83a1fe8c 100644 --- a/resources/fixtures/scopes/yaml/disqualifyDelimiter.scope +++ b/resources/fixtures/scopes/yaml/disqualifyDelimiter.scope @@ -2,6 +2,7 @@ a: > a: >- a: >+ --- + [#1 Content] = 0:3-0:4 >-< 0| a: >