Merge branch 'main' into z/moduleName

.github/workflows/auto-merge.yml

@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-        ref: 1.0.20-release
+        ref: 1.0.21-release
 
     - name: merge commits from main to release branch
       run: |
@@ -109,7 +109,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-          ref: 1.0.20-release
+          ref: 1.0.21-release
 
       - name: merge commits from main to release branch
         run: |

.github/workflows/main.yml

@@ -4,9 +4,9 @@ name: CI
 
 on:
   push:
-    branches: [ main, 1.0.20-release, 1.0.19-release ]
+    branches: [ main, 1.0.20-release, 1.0.21-release ]
   pull_request:
-    branches: [ main, 1.0.20-release, 1.0.19-release ]
+    branches: [ main, 1.0.20-release, 1.0.21-release ]
 
 jobs:
   build-and-test:

.github/workflows/nightly.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        branch: [ main, 1.0.19-release, 1.0.20-release ]
+        branch: [ main, 1.0.21-release, 1.0.20-release ]
     runs-on: windows-latest
     steps:
       - name: configure Pagefile

gradle.properties

@@ -1,15 +1,15 @@
 # Copied from kotlinc
 org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8
 
-kotlinBaseVersion=2.0.0-dev-19480
+kotlinBaseVersion=2.0.20-dev-715
 agpBaseVersion=7.2.0
 intellijVersion=213.7172.25
 junitVersion=4.13.1
 junit5Version=5.8.2
 junitPlatformVersion=1.8.2
 googleTruthVersion=1.1
 
-aaKotlinBaseVersion=2.0.0-dev-19480
+aaKotlinBaseVersion=2.0.20-dev-715
 aaIntellijVersion=213.7172.25
 aaGuavaVersion=29.0-jre
 aaAsmVersion=9.0

kotlin-analysis-api/build.gradle.kts

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import java.io.ByteArrayOutputStream
 
 description = "Kotlin Symbol Processing implementation using Kotlin Analysis API"
 
@@ -23,6 +24,7 @@ plugins {
 }
 
 val depSourceJars by configurations.creating
+val depJarsForCheck by configurations.creating
 
 dependencies {
     listOf(
@@ -84,13 +86,18 @@ dependencies {
     ) {
         isTransitive = false
     }
+    implementation("org.jetbrains:annotations:24.1.0")
 
     compileOnly(project(":common-deps"))
 
     implementation(project(":api"))
     implementation(project(":common-util"))
 
     testImplementation(kotlin("stdlib", aaKotlinBaseVersion))
+
+    depJarsForCheck("org.jetbrains.kotlin", "kotlin-stdlib", aaKotlinBaseVersion)
+    depJarsForCheck(project(":api"))
+    depJarsForCheck(project(":common-deps"))
 }
 
 sourceSets.main {
@@ -121,8 +128,31 @@ tasks.withType<ShadowJar>() {
     }
     exclude("kotlin/**")
     archiveClassifier.set("")
-    minimize()
+    minimize {
+        exclude(dependency("org.lz4:lz4-java:.*"))
+    }
     mergeServiceFiles()
+
+    doLast {
+        // Checks for missing dependencies
+        val jarJar = archiveFile.get().asFile
+        val depJars = depJarsForCheck.resolve().map(File::getPath)
+        val stdout = ByteArrayOutputStream()
+        try {
+            exec {
+                executable = "jdeps"
+                args = listOf(
+                    "--multi-release", "base",
+                    "--missing-deps",
+                    "-cp", depJars.joinToString(":"), jarJar.path
+                )
+                standardOutput = stdout
+            }
+        } catch (e: org.gradle.process.internal.ExecException) {
+            logger.warn(e.message)
+        }
+        logger.warn(stdout.toString())
+    }
 }
 
 tasks {

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/KotlinSymbolProcessing.kt

@@ -707,6 +707,15 @@ internal val DEAR_SHADOW_JAR_PLEASE_DO_NOT_REMOVE_THESE = listOf(
     org.jetbrains.kotlin.load.java.ErasedOverridabilityCondition::class.java,
     org.jetbrains.kotlin.load.java.FieldOverridabilityCondition::class.java,
     org.jetbrains.kotlin.serialization.deserialization.builtins.BuiltInsLoaderImpl::class.java,
+    com.fasterxml.aalto.AaltoInputProperties::class.java,
+    com.google.errorprone.annotations.CheckReturnValue::class.java,
+    com.intellij.openapi.application.JetBrainsProtocolHandler::class.java,
+    com.intellij.openapi.editor.impl.EditorDocumentPriorities::class.java,
+    com.intellij.psi.tree.ChildRoleBase::class.java,
+    com.intellij.util.xmlb.Constants::class.java,
+    com.intellij.xml.CommonXmlStrings::class.java,
+    org.codehaus.stax2.XMLInputFactory2::class.java,
+    org.codehaus.stax2.XMLStreamProperties::class.java,
 )
 
 fun TargetPlatform.getPlatformInfo(kspConfig: KSPConfig): List<PlatformInfo> =

kotlin-analysis-api/src/main/kotlin/com/google/devtools/ksp/impl/symbol/kotlin/util.kt

@@ -231,7 +231,7 @@ internal inline fun <R> analyze(crossinline action: KtAnalysisSession.() -> R):
 internal fun KtSymbolWithMembers.declarations(): Sequence<KSDeclaration> {
     return analyze {
         this@declarations.let {
-            it.getDeclaredMemberScope().getAllSymbols() + it.getStaticMemberScope().getAllSymbols()
+            it.getDeclaredMemberScope().getAllSymbols() + it.getStaticDeclaredMemberScope().getAllSymbols()
         }.distinct().map { symbol ->
             when (symbol) {
                 is KtNamedClassOrObjectSymbol -> KSClassDeclarationImpl.getCached(symbol)
@@ -349,7 +349,11 @@ internal fun KtType.classifierSymbol(): KtClassifierSymbol? {
 }
 
 internal fun KtType.typeArguments(): List<KtTypeProjection> {
-    return (this as? KtNonErrorClassType)?.qualifiers?.reversed()?.flatMap { it.typeArguments } ?: emptyList()
+    return if (this is KtFlexibleType) {
+        this.lowerBound
+    } else {
+        this
+    }.let { (it as? KtNonErrorClassType)?.qualifiers?.reversed()?.flatMap { it.typeArguments } ?: emptyList() }
 }
 
 internal fun KSAnnotated.findAnnotationFromUseSiteTarget(): Sequence<KSAnnotation> {

kotlin-analysis-api/testData/replaceWithErrorTypeArgs.kt

@@ -100,6 +100,7 @@
 // KLE.E.asType(emptyList()): KLE
 // default type:A
 // flexible type star:T
+// flexible type replace argument:JS1<Int>
 // END
 
 // MODULE: lib
@@ -123,6 +124,10 @@ class JS<T1, T2> {}
 class JS1<T> {
     T p;
 }
+
+class JavaClass {
+    JS1<?> p;
+}
 enum JSE {
     E
 }
@@ -137,3 +142,4 @@ enum class KSE {
 
 val x: KS<Int, String> = TODO()
 val y: KS<NotExist1, NotExist2> = TODO()
+val z: KL1<Int> = TODO()

test-utils/src/main/kotlin/com/google/devtools/ksp/processor/DefaultFunctionProcessor.kt

@@ -19,6 +19,7 @@ package com.google.devtools.ksp.processor
 
 import com.google.devtools.ksp.getClassDeclarationByName
 import com.google.devtools.ksp.getDeclaredFunctions
+import com.google.devtools.ksp.getDeclaredProperties
 import com.google.devtools.ksp.isAbstract
 import com.google.devtools.ksp.processing.Resolver
 import com.google.devtools.ksp.symbol.KSAnnotated
@@ -100,6 +101,9 @@ class DefaultFunctionProcessor : AbstractTestProcessor() {
         result.add("${aProperty.simpleName.asString()}: ${aProperty.isAbstract()}")
         val D = resolver.getClassDeclarationByName("D")!!
         D.getAllProperties().forEach { result.add("${it.simpleName.asString()}: isMutable: ${it.isMutable}") }
+        resolver.getClassDeclarationByName("JavaDerived")!!.getDeclaredProperties().forEach {
+            result.add(it.toString())
+        }
         return emptyList()
     }
 

test-utils/src/main/kotlin/com/google/devtools/ksp/processor/ReplaceWithErrorTypeArgsProcessor.kt

@@ -50,6 +50,8 @@ open class ReplaceWithErrorTypeArgsProcessor : AbstractTestProcessor() {
         val xargs = x.type.element!!.typeArguments
         val y = resolver.getPropertyDeclarationByName(resolver.getKSNameFromString("y"), true)!!
         val yargs = y.type.element!!.typeArguments
+        val z = resolver.getPropertyDeclarationByName(resolver.getKSNameFromString("z"), true)!!
+        val zargs = z.type.element!!.typeArguments
 
         for (decl in decls) {
             val declName = decl.qualifiedName!!.asString()
@@ -64,6 +66,9 @@ open class ReplaceWithErrorTypeArgsProcessor : AbstractTestProcessor() {
         // TODO: fix flexible type creation once upstream available.
         val js1 = resolver.getClassDeclarationByName("JS1")!!
         results.add("flexible type star:${js1.getDeclaredProperties().single().type.resolve().starProjection()}")
+        val javaClass = resolver.getClassDeclarationByName("JavaClass")!!
+        val genericFlexibleProperty = javaClass.getDeclaredProperties().single().type.resolve()
+        results.add("flexible type replace argument:${genericFlexibleProperty.replace(zargs)}")
         return emptyList()
     }
 

test-utils/testData/api/interfaceWithDefault.kt

@@ -76,3 +76,13 @@ class D {
 
     final int finalField;
 }
+
+// FILE: JavaBase.java
+
+class JavaBase {
+    static String staticField;
+}
+
+// FILE: JavaDerived.java
+class JavaDerived extends JavaBase {
+}

test-utils/testData/api/replaceWithErrorTypeArgs.kt

@@ -100,6 +100,7 @@
 // KLE.E.asType(emptyList()): KLE.E
 // default type:A
 // flexible type star:(T..T?)
+// flexible type replace argument:(JS1<Int>..JS1<Int>?)
 // END
 
 // MODULE: lib
@@ -123,6 +124,10 @@ class JS<T1, T2> {}
 class JS1<T> {
     T p;
 }
+
+class JavaClass {
+    JS1<?> p;
+}
 enum JSE {
     E
 }
@@ -137,3 +142,4 @@ enum class KSE {
 
 val x: KS<Int, String> = TODO()
 val y: KS<NotExist1, NotExist2> = TODO()
+val z: KL1<Int> = TODO()