Skip to content

Commit b5e330c

Browse files
neetopianeetopia
committed
Revert "Reapply "UPDATE_KOTLIN_VERSION: 2.0.20-dev-3728""
This reverts commit 658211e.
1 parent 21b5591 commit b5e330c

21 files changed

+130
-125
lines changed

‎compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor/RecordJavaAsMemberOfProcessor.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ class RecordJavaAsMemberOfProcessor : AbstractTestProcessor() {
5959
}
6060
m.forEach { symbol, files ->
6161
files.filter { it.endsWith(".java") }.sorted().forEach {
62-
val fn = it.substringAfterLast("java-sources/")
63-
results.add("$symbol: $fn")
62+
results.add("$symbol: $it")
6463
}
6564
}
6665
return emptyList()

‎compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor/RecordJavaGetAllMembersProcessor.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ class RecordJavaGetAllMembersProcessor : AbstractTestProcessor() {
4747
}
4848
m.forEach { symbol, files ->
4949
files.filter { it.endsWith(".java") }.sorted().forEach {
50-
val fn = it.substringAfterLast("java-sources/")
51-
results.add("$symbol: $fn")
50+
results.add("$symbol: $it")
5251
}
5352
}
5453
return emptyList()

‎compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor/RecordJavaOverridesProcessor.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ class RecordJavaOverridesProcessor : AbstractTestProcessor() {
6464
}
6565
m.forEach { symbol, files ->
6666
files.filter { it.endsWith(".java") }.sorted().forEach {
67-
val fn = it.substringAfterLast("java-sources/")
68-
results.add("$symbol: $fn")
67+
results.add("$symbol: $it")
6968
}
7069
}
7170
return emptyList()

‎compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor/RecordJavaProcessor.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ class RecordJavaProcessor : AbstractTestProcessor() {
4343
}
4444
m.forEach { symbol, files ->
4545
files.filter { it.endsWith(".java") }.sorted().forEach {
46-
val fn = it.substringAfterLast("java-sources/")
47-
results.add("$symbol: $fn")
46+
results.add("$symbol: $it")
4847
}
4948
}
5049
return emptyList()

‎compiler-plugin/src/test/kotlin/com/google/devtools/ksp/processor/RecordJavaSupertypesProcessor.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ class RecordJavaSupertypesProcessor : AbstractTestProcessor() {
4444
}
4545
m.forEach { symbol, files ->
4646
files.filter { it.endsWith(".java") }.sorted().forEach {
47-
val fn = it.substringAfterLast("java-sources/")
48-
results.add("$symbol: $fn")
47+
results.add("$symbol: $it")
4948
}
5049
}
5150
return emptyList()

‎compiler-plugin/src/test/kotlin/com/google/devtools/ksp/test/AbstractKSPCompilerPluginTest.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
99
import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector
1010
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
1111
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
12-
import org.jetbrains.kotlin.cli.jvm.config.javaSourceRoots
12+
import org.jetbrains.kotlin.cli.jvm.config.addJavaSourceRoot
1313
import org.jetbrains.kotlin.codegen.GenerationUtils
1414
import org.jetbrains.kotlin.config.CommonConfigurationKeys
1515
import org.jetbrains.kotlin.config.languageVersionSettings
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.test.model.FrontendKinds
1818
import org.jetbrains.kotlin.test.model.TestModule
1919
import org.jetbrains.kotlin.test.services.TestServices
2020
import org.jetbrains.kotlin.test.services.compilerConfigurationProvider
21+
import org.jetbrains.kotlin.test.services.javaFiles
2122
import java.io.File
2223

2324
abstract class AbstractKSPCompilerPluginTest : AbstractKSPTest(FrontendKinds.ClassicFrontend) {
@@ -30,6 +31,10 @@ abstract class AbstractKSPCompilerPluginTest : AbstractKSPTest(FrontendKinds.Cla
3031
val compilerConfiguration = testServices.compilerConfigurationProvider.getCompilerConfiguration(mainModule)
3132
compilerConfiguration.put(CommonConfigurationKeys.MODULE_NAME, mainModule.name)
3233
compilerConfiguration.put(CommonConfigurationKeys.LOOKUP_TRACKER, DualLookupTracker())
34+
if (!mainModule.javaFiles.isEmpty()) {
35+
mainModule.writeJavaFiles()
36+
compilerConfiguration.addJavaSourceRoot(mainModule.javaDir)
37+
}
3338

3439
// TODO: other platforms
3540
val kotlinCoreEnvironment = KotlinCoreEnvironment.createForTests(
@@ -50,7 +55,9 @@ abstract class AbstractKSPCompilerPluginTest : AbstractKSPTest(FrontendKinds.Cla
5055
val analysisExtension =
5156
KotlinSymbolProcessingExtension(
5257
KspOptions.Builder().apply {
53-
javaSourceRoots.addAll(compilerConfiguration.javaSourceRoots.map { File(it) })
58+
if (!mainModule.javaFiles.isEmpty()) {
59+
javaSourceRoots.add(mainModule.javaDir)
60+
}
5461
classOutputDir = File(testRoot, "kspTest/classes/main")
5562
javaOutputDir = File(testRoot, "kspTest/src/main/java")
5663
kotlinOutputDir = File(testRoot, "kspTest/src/main/kotlin")

‎compiler-plugin/src/test/kotlin/com/google/devtools/ksp/test/AbstractKSPTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,8 @@ abstract class AbstractKSPTest(frontend: FrontendKind<*>) : DisposableTest() {
128128
defaultDirectives {
129129
+JvmEnvironmentConfigurationDirectives.FULL_JDK
130130
JvmEnvironmentConfigurationDirectives.JVM_TARGET with JvmTarget.DEFAULT
131+
// SourceFileProviderImpl doesn't group files by module. Let's load them manually.
132+
+JvmEnvironmentConfigurationDirectives.SKIP_JAVA_SOURCES
131133
+ConfigurationDirectives.WITH_STDLIB
132134
+LanguageSettingsDirectives.ALLOW_KOTLIN_PACKAGE
133135
}
@@ -196,10 +198,6 @@ abstract class AbstractKSPTest(frontend: FrontendKind<*>) : DisposableTest() {
196198
path,
197199
testConfiguration.directives,
198200
)
199-
val dependencyProvider = DependencyProviderImpl(testServices, moduleStructure.modules)
200-
testServices.registerDependencyProvider(dependencyProvider)
201-
testServices.register(TestModuleStructure::class, moduleStructure)
202-
203201
val mainModule = moduleStructure.modules.last()
204202
val libModules = moduleStructure.modules.dropLast(1)
205203

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copied from kotlinc
22
org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8
33

4-
kotlinBaseVersion=2.0.20-dev-3728
4+
kotlinBaseVersion=2.0.20-dev-2651
55
agpBaseVersion=7.2.0
66
intellijVersion=213.7172.25
77
junitVersion=4.13.1

‎kotlin-analysis-api/src/test/kotlin/com/google/devtools/ksp/test/AbstractKSPAATest.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.google.devtools.ksp.impl.KotlinSymbolProcessing
2222
import com.google.devtools.ksp.processing.KSPJvmConfig
2323
import com.google.devtools.ksp.processor.AbstractTestProcessor
2424
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
25-
import org.jetbrains.kotlin.cli.jvm.config.javaSourceRoots
2625
import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots
2726
import org.jetbrains.kotlin.cli.jvm.config.jvmModularRoots
2827
import org.jetbrains.kotlin.config.JVMConfigurationKeys
@@ -35,6 +34,7 @@ import org.jetbrains.kotlin.test.services.JUnit5Assertions
3534
import org.jetbrains.kotlin.test.services.TestServices
3635
import org.jetbrains.kotlin.test.services.compilerConfigurationProvider
3736
import org.jetbrains.kotlin.test.services.isKtFile
37+
import org.jetbrains.kotlin.test.services.javaFiles
3838
import org.jetbrains.kotlin.test.util.KtTestUtil
3939
import org.jetbrains.kotlin.utils.PathUtil
4040
import java.io.ByteArrayOutputStream
@@ -111,13 +111,18 @@ abstract class AbstractKSPAATest : AbstractKSPTest(FrontendKinds.FIR) {
111111
// Therefore, this doesn't work:
112112
// val ktFiles = mainModule.loadKtFiles(kotlinCoreEnvironment.project)
113113
mainModule.writeKtFiles()
114+
if (!mainModule.javaFiles.isEmpty()) {
115+
mainModule.writeJavaFiles()
116+
}
114117

115118
val testRoot = mainModule.testRoot
116119

117120
val kspConfig = KSPJvmConfig.Builder().apply {
118121
moduleName = mainModule.name
119122
sourceRoots = listOf(mainModule.kotlinSrc)
120-
javaSourceRoots = compilerConfiguration.javaSourceRoots.map { File(it) }.toList()
123+
if (!mainModule.javaFiles.isEmpty()) {
124+
javaSourceRoots = listOf(mainModule.javaDir)
125+
}
121126
jdkHome = compilerConfiguration.get(JVMConfigurationKeys.JDK_HOME)
122127
jvmTarget = compilerConfiguration.get(JVMConfigurationKeys.JVM_TARGET)!!.description
123128
languageVersion = compilerConfiguration.languageVersionSettings.languageVersion.versionString

‎kotlin-analysis-api/testData/recordJavaAnnotationTypes.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaProcessor
2020
// EXPECTED:
21-
// kotlin.Annotation: main/p1/J.java
22-
// kotlin.Any: main/p1/J.java
23-
// kotlin.collections.List: main/p1/J.java
24-
// kotlin.collections.MutableList: main/p1/J.java
25-
// p1.Anno: main/p1/J.java
26-
// p1.Bnno: main/p1/J.java
27-
// p1.J: main/p1/J.java
28-
// p1.K: main/p1/J.java
21+
// kotlin.Annotation: javaSrc/p1/J.java
22+
// kotlin.Any: javaSrc/p1/J.java
23+
// kotlin.collections.List: javaSrc/p1/J.java
24+
// kotlin.collections.MutableList: javaSrc/p1/J.java
25+
// p1.Anno: javaSrc/p1/J.java
26+
// p1.Bnno: javaSrc/p1/J.java
27+
// p1.J: javaSrc/p1/J.java
28+
// p1.K: javaSrc/p1/J.java
2929
// END
3030

3131
// FILE: p1/J.java

‎kotlin-analysis-api/testData/recordJavaAsMemberOf.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaAsMemberOfProcessor
2020
// EXPECTED:
21-
// kotlin.Any: main/p1/B.java
22-
// p1.A: main/p1/B.java
23-
// p1.B: main/p1/A.java
24-
// p1.C: main/p1/A.java
25-
// p1.C: main/p1/B.java
26-
// p1.D: main/p1/A.java
27-
// p1.D: main/p1/B.java
28-
// p1.E: main/p1/B.java
21+
// kotlin.Any: javaSrc/p1/B.java
22+
// p1.A: javaSrc/p1/B.java
23+
// p1.B: javaSrc/p1/A.java
24+
// p1.C: javaSrc/p1/A.java
25+
// p1.C: javaSrc/p1/B.java
26+
// p1.D: javaSrc/p1/A.java
27+
// p1.D: javaSrc/p1/B.java
28+
// p1.E: javaSrc/p1/B.java
2929
// END
3030

3131
// FILE: p1/A.java

‎kotlin-analysis-api/testData/recordJavaGetAllMembers.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaGetAllMembersProcessor
2020
// EXPECTED:
21-
// p1.B: main/p1/B.java
22-
// p1.C: main/p1/B.java
23-
// p1.C: main/p1/C.java
24-
// p1.D: main/p1/C.java
25-
// p1.R2: main/p1/B.java
26-
// p1.R3: main/p1/C.java
27-
// p1.V2: main/p1/B.java
28-
// p1.V3: main/p1/C.java
21+
// p1.B: javaSrc/p1/B.java
22+
// p1.C: javaSrc/p1/B.java
23+
// p1.C: javaSrc/p1/C.java
24+
// p1.D: javaSrc/p1/C.java
25+
// p1.R2: javaSrc/p1/B.java
26+
// p1.R3: javaSrc/p1/C.java
27+
// p1.V2: javaSrc/p1/B.java
28+
// p1.V3: javaSrc/p1/C.java
2929
// END
3030

3131
// FILE: p1/A.kt

‎kotlin-analysis-api/testData/recordJavaOverrides.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaOverridesProcessor
2020
// EXPECTED:
21-
// p1.B: main/p1/A.java
22-
// p1.C: main/p1/B.java
23-
// p1.R1: main/p1/A.java
24-
// p1.R1: main/p1/C.java
25-
// p1.R2: main/p1/A.java
26-
// p1.R2: main/p1/C.java
27-
// p1.V1: main/p1/A.java
28-
// p1.V1: main/p1/C.java
29-
// p1.V2: main/p1/A.java
30-
// p1.V2: main/p1/C.java
21+
// p1.B: javaSrc/p1/A.java
22+
// p1.C: javaSrc/p1/B.java
23+
// p1.R1: javaSrc/p1/A.java
24+
// p1.R1: javaSrc/p1/C.java
25+
// p1.R2: javaSrc/p1/A.java
26+
// p1.R2: javaSrc/p1/C.java
27+
// p1.V1: javaSrc/p1/A.java
28+
// p1.V1: javaSrc/p1/C.java
29+
// p1.V2: javaSrc/p1/A.java
30+
// p1.V2: javaSrc/p1/C.java
3131
// END
3232

3333
// FILE: p1/A.java

‎kotlin-analysis-api/testData/recordJavaResolutions.kt

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,30 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaProcessor
2020
// EXPECTED:
21-
// kotlin.Any: main/p1/J1.java
22-
// kotlin.Any: main/p1/J2.java
23-
// kotlin.Any: main/p1/TestJ2J.java
24-
// kotlin.Any: main/p1/TestJ2K.java
25-
// kotlin.Any: main/p2/J2.java
26-
// kotlin.Any: main/p3/J1.java
27-
// kotlin.Any: main/p3/J2.java
28-
// kotlin.Any: main/p3/J3.java
29-
// p1.J1: main/p1/J1.java
30-
// p1.J1: main/p1/TestJ2J.java
31-
// p1.J2: main/p1/J2.java
32-
// p1.J3: main/p1/TestJ2J.java
33-
// p1.K1: main/p1/TestJ2K.java
34-
// p1.K3: main/p1/TestJ2K.java
35-
// p1.TestJ2J: main/p1/TestJ2J.java
36-
// p1.TestJ2K: main/p1/TestJ2K.java
37-
// p2.J2: main/p1/TestJ2J.java
38-
// p2.J2: main/p2/J2.java
39-
// p2.K2: main/p1/TestJ2K.java
40-
// p3.J1: main/p3/J1.java
41-
// p3.J2: main/p3/J2.java
42-
// p3.J3: main/p1/TestJ2J.java
43-
// p3.J3: main/p3/J3.java
44-
// p3.K3: main/p1/TestJ2K.java
21+
// kotlin.Any: javaSrc/p1/J1.java
22+
// kotlin.Any: javaSrc/p1/J2.java
23+
// kotlin.Any: javaSrc/p1/TestJ2J.java
24+
// kotlin.Any: javaSrc/p1/TestJ2K.java
25+
// kotlin.Any: javaSrc/p2/J2.java
26+
// kotlin.Any: javaSrc/p3/J1.java
27+
// kotlin.Any: javaSrc/p3/J2.java
28+
// kotlin.Any: javaSrc/p3/J3.java
29+
// p1.J1: javaSrc/p1/J1.java
30+
// p1.J1: javaSrc/p1/TestJ2J.java
31+
// p1.J2: javaSrc/p1/J2.java
32+
// p1.J3: javaSrc/p1/TestJ2J.java
33+
// p1.K1: javaSrc/p1/TestJ2K.java
34+
// p1.K3: javaSrc/p1/TestJ2K.java
35+
// p1.TestJ2J: javaSrc/p1/TestJ2J.java
36+
// p1.TestJ2K: javaSrc/p1/TestJ2K.java
37+
// p2.J2: javaSrc/p1/TestJ2J.java
38+
// p2.J2: javaSrc/p2/J2.java
39+
// p2.K2: javaSrc/p1/TestJ2K.java
40+
// p3.J1: javaSrc/p3/J1.java
41+
// p3.J2: javaSrc/p3/J2.java
42+
// p3.J3: javaSrc/p1/TestJ2J.java
43+
// p3.J3: javaSrc/p3/J3.java
44+
// p3.K3: javaSrc/p1/TestJ2K.java
4545
// END
4646

4747
// FILE: p1/TestJ2K.java

‎kotlin-analysis-api/testData/recordJavaSupertypes.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaSupertypesProcessor
2020
// EXPECTED:
21-
// <anonymous>.A: main/A.java
22-
// <anonymous>.B: main/A.java
23-
// <anonymous>.C: main/A.java
24-
// <anonymous>.C: main/C.java
25-
// <anonymous>.D: main/C.java
26-
// <anonymous>.D: main/D.java
27-
// kotlin.Any: main/C.java
28-
// kotlin.Any: main/D.java
21+
// <anonymous>.A: javaSrc/A.java
22+
// <anonymous>.B: javaSrc/A.java
23+
// <anonymous>.C: javaSrc/A.java
24+
// <anonymous>.C: javaSrc/C.java
25+
// <anonymous>.D: javaSrc/C.java
26+
// <anonymous>.D: javaSrc/D.java
27+
// kotlin.Any: javaSrc/C.java
28+
// kotlin.Any: javaSrc/D.java
2929
// END
3030

3131
// FILE: A.java

‎test-utils/testData/api/recordJavaAnnotationTypes.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaProcessor
2020
// EXPECTED:
21-
// java.util.List: main/p1/J.java
22-
// p1.Anno: main/p1/J.java
23-
// p1.Bnno: main/p1/J.java
24-
// p1.K: main/p1/J.java
21+
// java.util.List: javaSrc/p1/J.java
22+
// p1.Anno: javaSrc/p1/J.java
23+
// p1.Bnno: javaSrc/p1/J.java
24+
// p1.K: javaSrc/p1/J.java
2525
// END
2626

2727
// FILE: p1/J.java

‎test-utils/testData/api/recordJavaAsMemberOf.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaAsMemberOfProcessor
2020
// EXPECTED:
21-
// p1.A: main/p1/B.java
22-
// p1.B: main/p1/A.java
23-
// p1.C: main/p1/B.java
24-
// p1.D: main/p1/A.java
25-
// p1.D: main/p1/B.java
26-
// p1.E: main/p1/B.java
21+
// p1.A: javaSrc/p1/B.java
22+
// p1.B: javaSrc/p1/A.java
23+
// p1.C: javaSrc/p1/B.java
24+
// p1.D: javaSrc/p1/A.java
25+
// p1.D: javaSrc/p1/B.java
26+
// p1.E: javaSrc/p1/B.java
2727
// END
2828

2929
// FILE: p1/A.java
@@ -44,4 +44,4 @@ package p1;
4444
class C
4545
class D
4646
class E
47-
val a = A<C>()
47+
val a = A<C>()

‎test-utils/testData/api/recordJavaGetAllMembers.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
// WITH_RUNTIME
1919
// TEST PROCESSOR: RecordJavaGetAllMembersProcessor
2020
// EXPECTED:
21-
// p1.C: main/p1/B.java
22-
// p1.D: main/p1/C.java
23-
// p1.R2: main/p1/B.java
24-
// p1.R3: main/p1/C.java
25-
// p1.V2: main/p1/B.java
26-
// p1.V3: main/p1/C.java
21+
// p1.C: javaSrc/p1/B.java
22+
// p1.D: javaSrc/p1/C.java
23+
// p1.R2: javaSrc/p1/B.java
24+
// p1.R3: javaSrc/p1/C.java
25+
// p1.V2: javaSrc/p1/B.java
26+
// p1.V3: javaSrc/p1/C.java
2727
// END
2828

2929
// FILE: p1/A.kt

0 commit comments

Comments
 (0)