Skip to content

Commit 65f1ded

Browse files
jupblbjupblb
committed
Fix doubled package prefix in Kotlin snapshots
kotlincSnapshots wrote index.scip into the scanned targetroot, so re-runs re-aggregated it and doubled the package prefix (`scip-java maven . . scip-java maven . . ...`). Write the index to a separate dir and regenerate the affected goldens.
1 parent 032e08c commit 65f1ded

12 files changed

Lines changed: 316 additions & 308 deletions

File tree

‎build.sbt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -480,15 +480,23 @@ lazy val scipKotlincMinimized = project
480480
val snapDir =
481481
(baseDirectory.value / "src" / "generatedSnapshots" / "resources")
482482
.getAbsolutePath
483-
val scipOut = s"$tgtRoot/index.scip"
483+
// Write the aggregated index OUTSIDE the scanned targetroot. If it
484+
// lived under `tgtRoot`, a second `kotlincSnapshots` run would feed
485+
// the previous index.scip back into `aggregate`, which re-applies the
486+
// package prefix and yields doubled symbols
487+
// (e.g. `scip-java maven . . scip-java maven . . kotlin/`).
488+
val indexDir = target.value / "scip-index"
489+
IO.createDirectory(indexDir)
490+
val scipOut = (indexDir / "index.scip").getAbsolutePath
484491
val mainCls = "com.sourcegraph.scip_java.ScipJava"
485492
Def.sequential(
486493
Compile / compile,
487494
(cli / Compile / runMain).toTask(
488495
s" $mainCls aggregate --no-emit-inverse-relationships --cwd $srcRoot --output $scipOut $tgtRoot"
489496
),
490497
(cli / Compile / runMain).toTask(
491-
s" $mainCls snapshot --cwd $srcRoot --output $snapDir $tgtRoot"
498+
s" $mainCls snapshot --cwd $srcRoot --output $snapDir ${indexDir
499+
.getAbsolutePath}"
492500
)
493501
)
494502
}

‎scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/CompanionConsumer.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
package snapshots;
22

3-
//⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/CompanionConsumer#
3+
//⌄ enclosing_range_start scip-java maven . . snapshots/CompanionConsumer#
44
public class CompanionConsumer {
5-
// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . scip-java maven . . snapshots/CompanionConsumer#
5+
// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionConsumer#
66
// kind Class
77
// display_name CompanionConsumer
88
// signature_documentation
99
// > public class CompanionConsumer
10-
// ⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/CompanionConsumer#`<init>`().
10+
// ⌄ enclosing_range_start scip-java maven . . snapshots/CompanionConsumer#`<init>`().
1111
CompanionConsumer() {
12-
// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . scip-java maven . . snapshots/CompanionConsumer#`<init>`().
12+
// ^^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/CompanionConsumer#`<init>`().
1313
// kind Constructor
1414
// display_name <init>
1515
// signature_documentation
1616
// > CompanionConsumer()
1717
CompanionOwner.Companion.create();
18-
// ^^^^^^^^^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/CompanionOwner#
19-
// ^^^^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/CompanionOwner#Companion.
20-
// ^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/CompanionOwner#Companion#create().
18+
// ^^^^^^^^^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#
19+
// ^^^^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#Companion.
20+
// ^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#Companion#create().
2121
new CompanionOwner().create();
22-
// ^^^^^^^^^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/CompanionOwner#`<init>`().
23-
// ^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/CompanionOwner#create().
22+
// ^^^^^^^^^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#`<init>`().
23+
// ^^^^^^ reference scip-java maven . . snapshots/CompanionOwner#create().
2424
}
25-
// ⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/CompanionConsumer#`<init>`().
25+
// ⌃ enclosing_range_end scip-java maven . . snapshots/CompanionConsumer#`<init>`().
2626
}
27-
//⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/CompanionConsumer#
27+
//⌃ enclosing_range_end scip-java maven . . snapshots/CompanionConsumer#
2828

‎scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinClass.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
package snapshots;
22

3-
//⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/KotlinClass#
3+
//⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass#
44
public class KotlinClass {
5-
// ^^^^^^^^^^^ definition scip-java maven . . scip-java maven . . snapshots/KotlinClass#
5+
// ^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinClass#
66
// kind Class
77
// display_name KotlinClass
88
// signature_documentation
99
// > public class KotlinClass
10-
// ⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/KotlinClass#`<init>`().
10+
// ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass#`<init>`().
1111
KotlinClass() throws Class {
12-
// ^^^^^^^^^^^ definition scip-java maven . . scip-java maven . . snapshots/KotlinClass#`<init>`().
12+
// ^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinClass#`<init>`().
1313
// kind Constructor
1414
// display_name <init>
1515
// signature_documentation
1616
// > KotlinClass() throws Class
17-
// ^^^^^ reference scip-java maven . . scip-java maven . . snapshots/Class#
17+
// ^^^^^ reference scip-java maven . . snapshots/Class#
1818
throw new Class();
19-
// ^^^^^ reference scip-java maven . . scip-java maven . . snapshots/Class#`<init>`(+1).
19+
// ^^^^^ reference scip-java maven . . snapshots/Class#`<init>`(+1).
2020
}
21-
// ⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/KotlinClass#`<init>`().
21+
// ⌃ enclosing_range_end scip-java maven . . snapshots/KotlinClass#`<init>`().
2222

23-
// ⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/KotlinClass#test().
23+
// ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass#test().
2424
void test() throws Class {
25-
// ^^^^ definition scip-java maven . . scip-java maven . . snapshots/KotlinClass#test().
25+
// ^^^^ definition scip-java maven . . snapshots/KotlinClass#test().
2626
// kind Method
2727
// display_name test
2828
// signature_documentation
2929
// > void test() throws Class
30-
// ^^^^^ reference scip-java maven . . scip-java maven . . snapshots/Class#
30+
// ^^^^^ reference scip-java maven . . snapshots/Class#
3131
throw new Class(1, "");
32-
// ^^^^^ reference scip-java maven . . scip-java maven . . snapshots/Class#`<init>`().
32+
// ^^^^^ reference scip-java maven . . snapshots/Class#`<init>`().
3333
}
34-
// ⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/KotlinClass#test().
34+
// ⌃ enclosing_range_end scip-java maven . . snapshots/KotlinClass#test().
3535

36-
// ⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/KotlinClass#other().
36+
// ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinClass#other().
3737
void other() throws Class {
38-
// ^^^^^ definition scip-java maven . . scip-java maven . . snapshots/KotlinClass#other().
38+
// ^^^^^ definition scip-java maven . . snapshots/KotlinClass#other().
3939
// kind Method
4040
// display_name other
4141
// signature_documentation
4242
// > void other() throws Class
43-
// ^^^^^ reference scip-java maven . . scip-java maven . . snapshots/Class#
43+
// ^^^^^ reference scip-java maven . . snapshots/Class#
4444
throw new Class(1);
45-
// ^^^^^ reference scip-java maven . . scip-java maven . . snapshots/Class#`<init>`(+2).
45+
// ^^^^^ reference scip-java maven . . snapshots/Class#`<init>`(+2).
4646
}
47-
// ⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/KotlinClass#other().
47+
// ⌃ enclosing_range_end scip-java maven . . snapshots/KotlinClass#other().
4848
}
49-
//⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/KotlinClass#
49+
//⌃ enclosing_range_end scip-java maven . . snapshots/KotlinClass#
5050

‎scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/KotlinLambdas.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
package snapshots;
22

33
import kotlin.collections.CollectionsKt;
4-
// ^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/
5-
// ^^^^^^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/collections/
6-
// ^^^^^^^^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/collections/CollectionsKt#
4+
// ^^^^^^ reference scip-java maven . . kotlin/
5+
// ^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/
6+
// ^^^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/CollectionsKt#
77
import kotlin.text.StringsKt;
8-
// ^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/
9-
// ^^^^ reference scip-java maven . . scip-java maven . . kotlin/text/
10-
// ^^^^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/text/StringsKt#
8+
// ^^^^^^ reference scip-java maven . . kotlin/
9+
// ^^^^ reference scip-java maven . . kotlin/text/
10+
// ^^^^^^^^^ reference scip-java maven . . kotlin/text/StringsKt#
1111

12-
//⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/KotlinLambdas#
12+
//⌄ enclosing_range_start scip-java maven . . snapshots/KotlinLambdas#
1313
public class KotlinLambdas {
14-
// ^^^^^^^^^^^^^ definition scip-java maven . . scip-java maven . . snapshots/KotlinLambdas#
14+
// ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinLambdas#
1515
// kind Class
1616
// display_name KotlinLambdas
1717
// signature_documentation
1818
// > public class KotlinLambdas
19-
// ^^^^^^^^^^^^^ definition scip-java maven . . scip-java maven . . snapshots/KotlinLambdas#`<init>`().
19+
// ^^^^^^^^^^^^^ definition scip-java maven . . snapshots/KotlinLambdas#`<init>`().
2020
// kind Constructor
2121
// display_name <init>
2222
// signature_documentation
2323
// > public KotlinLambdas()
24-
// ⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/KotlinLambdas#test().
24+
// ⌄ enclosing_range_start scip-java maven . . snapshots/KotlinLambdas#test().
2525
public void test() {
26-
// ^^^^ definition scip-java maven . . scip-java maven . . snapshots/KotlinLambdas#test().
26+
// ^^^^ definition scip-java maven . . snapshots/KotlinLambdas#test().
2727
// kind Method
2828
// display_name test
2929
// signature_documentation
3030
// > public void test()
3131
LambdasKt.getX(); // TODO figure out emit getX on kotlin side
32-
// ^^^^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/LambdasKt#
33-
// ^^^^ reference scip-java maven . . scip-java maven . . snapshots/LambdasKt#getX().
32+
// ^^^^^^^^^ reference scip-java maven . . snapshots/LambdasKt#
33+
// ^^^^ reference scip-java maven . . snapshots/LambdasKt#getX().
3434

3535
kotlin.collections.CollectionsKt.listOf();
36-
// ^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/
37-
// ^^^^^^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/collections/
38-
// ^^^^^^^^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/collections/CollectionsKt#
39-
// ^^^^^^ reference scip-java maven . . scip-java maven . . kotlin/collections/CollectionsKt__CollectionsKt#listOf().
36+
// ^^^^^^ reference scip-java maven . . kotlin/
37+
// ^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/
38+
// ^^^^^^^^^^^^^ reference scip-java maven . . kotlin/collections/CollectionsKt#
39+
// ^^^^^^ reference scip-java maven . . kotlin/collections/CollectionsKt__CollectionsKt#listOf().
4040
FunctionsKt.sampleText("");
41-
// ^^^^^^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/FunctionsKt#
42-
// ^^^^^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/FunctionsKt#sampleText().
41+
// ^^^^^^^^^^^ reference scip-java maven . . snapshots/FunctionsKt#
42+
// ^^^^^^^^^^ reference scip-java maven . . snapshots/FunctionsKt#sampleText().
4343
}
44-
// ⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/KotlinLambdas#test().
44+
// ⌃ enclosing_range_end scip-java maven . . snapshots/KotlinLambdas#test().
4545
}
46-
//⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/KotlinLambdas#
46+
//⌃ enclosing_range_end scip-java maven . . snapshots/KotlinLambdas#
4747

‎scip-kotlinc/minimized/src/generatedSnapshots/resources/scip-kotlinc/minimized/src/main/java/snapshots/ObjectKtConsumer.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
package snapshots;
22

3-
//⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/ObjectKtConsumer#
3+
//⌄ enclosing_range_start scip-java maven . . snapshots/ObjectKtConsumer#
44
public class ObjectKtConsumer {
5-
// ^^^^^^^^^^^^^^^^ definition scip-java maven . . scip-java maven . . snapshots/ObjectKtConsumer#
5+
// ^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/ObjectKtConsumer#
66
// kind Class
77
// display_name ObjectKtConsumer
88
// signature_documentation
99
// > public class ObjectKtConsumer
10-
// ^^^^^^^^^^^^^^^^ definition scip-java maven . . scip-java maven . . snapshots/ObjectKtConsumer#`<init>`().
10+
// ^^^^^^^^^^^^^^^^ definition scip-java maven . . snapshots/ObjectKtConsumer#`<init>`().
1111
// kind Constructor
1212
// display_name <init>
1313
// signature_documentation
1414
// > public ObjectKtConsumer()
15-
// ⌄ enclosing_range_start scip-java maven . . scip-java maven . . snapshots/ObjectKtConsumer#run().
15+
// ⌄ enclosing_range_start scip-java maven . . snapshots/ObjectKtConsumer#run().
1616
public static void run() {
17-
// ^^^ definition scip-java maven . . scip-java maven . . snapshots/ObjectKtConsumer#run().
17+
// ^^^ definition scip-java maven . . snapshots/ObjectKtConsumer#run().
1818
// kind StaticMethod
1919
// display_name run
2020
// signature_documentation
2121
// > public static void run()
2222
ObjectKt.INSTANCE.fail("boom");
23-
// ^^^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/ObjectKt#
24-
// ^^^^^^^^ reference scip-java maven . . scip-java maven . . snapshots/ObjectKt#INSTANCE.
25-
// ^^^^ reference scip-java maven . . scip-java maven . . snapshots/ObjectKt#fail().
23+
// ^^^^^^^^ reference scip-java maven . . snapshots/ObjectKt#
24+
// ^^^^^^^^ reference scip-java maven . . snapshots/ObjectKt#INSTANCE.
25+
// ^^^^ reference scip-java maven . . snapshots/ObjectKt#fail().
2626
}
27-
// ⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/ObjectKtConsumer#run().
27+
// ⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKtConsumer#run().
2828
}
29-
//⌃ enclosing_range_end scip-java maven . . scip-java maven . . snapshots/ObjectKtConsumer#
29+
//⌃ enclosing_range_end scip-java maven . . snapshots/ObjectKtConsumer#
3030

0 commit comments

Comments
 (0)