Update kotlin to 1.4.20 (#169)

* Update kotlin to 1.4.20

Author: yigit

build.gradle.kts

@@ -2,7 +2,7 @@ import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 plugins {
-    kotlin("jvm") version "1.4.0" apply false
+    kotlin("jvm") version "1.4.20" apply false
 }
 
 if (!extra.has("kspVersion")) {

compiler-plugin/build.gradle.kts

@@ -17,7 +17,7 @@ tasks.withType<KotlinCompile> {
 
 plugins {
     kotlin("jvm")
-    id("org.jetbrains.intellij") version "0.4.22"
+    id("org.jetbrains.intellij") version "0.6.4"
 }
 
 intellij {
@@ -49,6 +49,7 @@ dependencies {
     testImplementation(kotlin("stdlib", kotlinBaseVersion))
     testImplementation("org.jetbrains.kotlin:kotlin-compiler:$kotlinBaseVersion")
     testImplementation("org.jetbrains.kotlin:kotlin-compiler-tests:$kotlinBaseVersion")
+    testImplementation("org.jetbrains.kotlin:tests-mutes:$kotlinBaseVersion")
     testImplementation("org.jetbrains.kotlin:kotlin-scripting-compiler:$kotlinBaseVersion")
 
     testImplementation("junit:junit:$junitVersion")

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/binary/KSClassDeclarationDescriptorImpl.kt

@@ -54,13 +54,13 @@ class KSClassDeclarationDescriptorImpl private constructor(val descriptor: Class
 
     override fun getAllFunctions(): List<KSFunctionDeclaration> {
         return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS).toList()
-            .filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+            .filter { (it as FunctionDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
             .map { KSFunctionDeclarationDescriptorImpl.getCached(it as FunctionDescriptor) }
     }
 
     override fun getAllProperties(): List<KSPropertyDeclaration> {
         return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES).toList()
-                .filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                .filter { (it as PropertyDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
                 .map { KSPropertyDeclarationDescriptorImpl.getCached(it as PropertyDescriptor) }
     }
 
@@ -84,8 +84,8 @@ class KSClassDeclarationDescriptorImpl private constructor(val descriptor: Class
         listOf(descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(), descriptor.staticScope.getDescriptorsFiltered()).flatten()
             .filter {
                 it is MemberDescriptor
-                        && it.visibility != Visibilities.INHERITED
-                        && it.visibility != Visibilities.INVISIBLE_FAKE
+                        && it.visibility != DescriptorVisibilities.INHERITED
+                        && it.visibility != DescriptorVisibilities.INVISIBLE_FAKE
             }
             .map {
                 when (it) {

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/java/KSClassDeclarationJavaImpl.kt

@@ -31,6 +31,7 @@ import com.google.devtools.ksp.symbol.impl.kotlin.KSNameImpl
 import com.google.devtools.ksp.symbol.impl.kotlin.getKSTypeCached
 import com.google.devtools.ksp.symbol.impl.replaceTypeArguments
 import com.google.devtools.ksp.symbol.impl.toKSFunctionDeclaration
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
@@ -77,7 +78,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
         return descriptor?.let {
             it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS)
                 .toList()
-                .filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                .filter { (it as FunctionDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
                 .plus(it.constructors)
                 .map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
         } ?: emptyList()
@@ -87,7 +88,7 @@ class KSClassDeclarationJavaImpl private constructor(val psi: PsiClass) : KSClas
         return descriptor?.let {
             it.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES)
                     .toList()
-                    .filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                    .filter { (it as PropertyDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
                     .map{ (it as PropertyDescriptor).toKSPropertyDeclaration() }
         } ?: emptyList()
     }

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/kotlin/KSClassDeclarationImpl.kt

@@ -25,6 +25,7 @@ import com.google.devtools.ksp.processing.impl.ResolverImpl
 import com.google.devtools.ksp.symbol.*
 import com.google.devtools.ksp.symbol.impl.*
 import com.google.devtools.ksp.symbol.impl.synthetic.KSConstructorSyntheticImpl
+import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
@@ -50,13 +51,13 @@ class KSClassDeclarationImpl private constructor(val ktClassOrObject: KtClassOrO
 
     override fun getAllFunctions(): List<KSFunctionDeclaration> {
         return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.FUNCTIONS).toList()
-            .filter { (it as FunctionDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+            .filter { (it as FunctionDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
             .map { (it as FunctionDescriptor).toKSFunctionDeclaration() }
     }
 
     override fun getAllProperties(): List<KSPropertyDeclaration> {
         return descriptor.unsubstitutedMemberScope.getDescriptorsFiltered(DescriptorKindFilter.VARIABLES).toList()
-                .filter { (it as PropertyDescriptor).visibility != Visibilities.INVISIBLE_FAKE }
+                .filter { (it as PropertyDescriptor).visibility != DescriptorVisibilities.INVISIBLE_FAKE }
                 .map { (it as PropertyDescriptor).toKSPropertyDeclaration() }
     }
 

compiler-plugin/src/main/kotlin/com/google/devtools/ksp/symbol/impl/utils.kt

@@ -35,7 +35,7 @@ import com.google.devtools.ksp.symbol.impl.java.KSTypeArgumentJavaImpl
 import com.google.devtools.ksp.symbol.impl.kotlin.*
 import com.intellij.psi.impl.source.PsiClassImpl
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.load.java.JavaVisibilities
+import org.jetbrains.kotlin.load.java.JavaDescriptorVisibilities
 import org.jetbrains.kotlin.load.java.descriptors.JavaClassConstructorDescriptor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.source.getPsi
@@ -130,12 +130,12 @@ fun MemberDescriptor.toKSModifiers(): Set<Modifier> {
         Modality.ABSTRACT -> modifiers.add(Modifier.ABSTRACT)
     }
     when (this.visibility) {
-        Visibilities.PUBLIC -> modifiers.add(Modifier.PUBLIC)
-        Visibilities.PROTECTED, JavaVisibilities.PROTECTED_AND_PACKAGE -> modifiers.add(Modifier.PROTECTED)
-        Visibilities.PRIVATE -> modifiers.add(Modifier.PRIVATE)
-        Visibilities.INTERNAL -> modifiers.add(Modifier.INTERNAL)
+        DescriptorVisibilities.PUBLIC -> modifiers.add(Modifier.PUBLIC)
+        DescriptorVisibilities.PROTECTED, JavaDescriptorVisibilities.PROTECTED_AND_PACKAGE -> modifiers.add(Modifier.PROTECTED)
+        DescriptorVisibilities.PRIVATE -> modifiers.add(Modifier.PRIVATE)
+        DescriptorVisibilities.INTERNAL -> modifiers.add(Modifier.INTERNAL)
         // Since there is no modifier for package-private, use No modifier to tell if a symbol from binary is package private.
-        JavaVisibilities.PACKAGE_VISIBILITY, JavaVisibilities.PROTECTED_STATIC_VISIBILITY -> Unit
+        JavaDescriptorVisibilities.PACKAGE_VISIBILITY, JavaDescriptorVisibilities.PROTECTED_STATIC_VISIBILITY -> Unit
         else -> throw IllegalStateException("unhandled visibility: ${this.visibility}")
     }
     return modifiers

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

@@ -103,6 +103,7 @@ abstract class AbstractKotlinKSPTest : KotlinBaseTest<AbstractKotlinKSPTest.KspT
         val configuration = createConfiguration(
             ConfigurationKind.NO_KOTLIN_REFLECT,
             TestJdkKind.FULL_JDK_9,
+            TargetBackend.JVM,
             listOf(KotlinTestUtils.getAnnotationsJar()) + dependencies,
             listOf(module.javaSrcDir),
             emptyList()

gradle.properties

@@ -1,7 +1,7 @@
 # Copied from kotlinc
 org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8
 
-kotlinBaseVersion=1.4.10
-intellijVersion=193.6494.35
+kotlinBaseVersion=1.4.20
+intellijVersion=201.7223.91
 junitVersion=4.12
-compilerTestEnabled=false
+compilerTestEnabled=false

third_party/prebuilt/README.md

@@ -10,4 +10,6 @@ $ cd path_to_kotlin_compiler_src
 $ patch -p1 < 0001-Package-test-classes.patch
 $ ./gradlew :include:kotlin-compiler-tests:build
 $ cp include/kotlin-compiler-tests/build/libs/*.jar path_to_below
+$ ./gradlew :compiler:tests-mutes:build
+$ cp compiler/tests-mutes/build/libs/*.jar path_to_below
 ```