Kotlin · JulianHahn96 · Feb 25, 2023 · Feb 25, 2023 · Feb 26, 2023 · Feb 26, 2023
diff --git a/kotlin-bundled-compiler/build.gradle.kts b/kotlin-bundled-compiler/build.gradle.kts
@@ -13,13 +13,13 @@ val ideaSdkUrl = "https://www.jetbrains.com/intellij-repository/releases/com/jet
 // properties that might/should be modifiable
 
 //val kotlinCompilerTcBuildId: String = project.findProperty("kotlinCompilerTcBuildId") as String? ?: "3546752"
-val kotlinPluginUpdateId = project.findProperty("kotlinPluginUpdateId") as String? ?: "169248" // Kotlin Plugin 1.6.21 for Idea 2021.3
+val kotlinPluginUpdateId = project.findProperty("kotlinPluginUpdateId") as String? ?: "286278" // Kotlin Plugin 1.8.10 for Idea 2022.2
 
-val kotlinCompilerVersion: String = project.findProperty("kotlinCompilerVersion") as String? ?: "1.6.21"
-val kotlinxVersion: String = project.findProperty("kolinxVersion") as String? ?: "1.5.2"
+val kotlinCompilerVersion: String = project.findProperty("kotlinCompilerVersion") as String? ?: "1.8.10"
+val kotlinxVersion: String = project.findProperty("kolinxVersion") as String? ?: "1.6.3"
 val tcArtifactsPath: String = project.findProperty("tcArtifactsPath") as String? ?: ""
-val ideaVersion: String = project.findProperty("ideaVersion") as String? ?: "213.5744.223" //Idea 2021.3
-val kotlinIdeaCompatibleVersionMinor: String = project.findProperty("kotlinIdeaCompatibleVersionMinor") as String? ?: "2021.3"
+val ideaVersion: String = project.findProperty("ideaVersion") as String? ?: "222.4459.24" //Idea 2022.2
+val kotlinIdeaCompatibleVersionMinor: String = project.findProperty("kotlinIdeaCompatibleVersionMinor") as String? ?: "2022.2"
 val ignoreSources: Boolean = true//project.hasProperty("ignoreSources")
 
 //directories
@@ -195,38 +195,17 @@ val extractPackagesFromKTCompiler by tasks.registering(Jar::class) {
     }
 }
 
-val downloadIntellijCoreAndExtractSelectedJars by tasks.registering {
-    dependsOn(deleteLibrariesFromLibFolder)
-    val ideaDownloadDir = file("$downloadDir/idea-$ideaVersion")
-    val locallyDownloadedIntellijCoreFile by extra { file("$ideaDownloadDir/intellij-core.zip") }
-
-    doLast {
-        if(!locallyDownloadedIntellijCoreFile.exists()) {
-            ideaArtifactsResolver.downloadTo(ideaArtifactsResolver.INTELLIJ_CORE_ZIP, locallyDownloadedIntellijCoreFile)
-        }
-        copy {
-            from(zipTree(locallyDownloadedIntellijCoreFile))
-
-            setIncludes(setOf("intellij-core.jar"))
-
-            includeEmptyDirs = false
-
-            into(libDir)
-        }
-    }
-}
-
 val downloadIdeaDistributionZipAndExtractSelectedJars by tasks.registering {
     dependsOn(deleteLibrariesFromLibFolder)
     val ideaDownloadDir = file("$downloadDir/idea-$ideaVersion")
     val locallyDownloadedIdeaZipFile by extra { file("$ideaDownloadDir/ideaIC.zip") }
-    val chosenJars by extra { setOf(//"openapi",
-            //"platform-util-ui",
+    val chosenJars by extra { setOf(
             "util",
-            "idea",
-            //"trove4j",
-            "platform-api",
-            "platform-impl") }
+            "util_rt",
+            "idea_rt",
+            "app"
+        )
+    }
 
     doLast {
         if(!locallyDownloadedIdeaZipFile.exists()) {
@@ -328,17 +307,14 @@ val repackageIdeaAndKotlinCompilerSources by tasks.registering(Zip::class) {
 }
 
 val downloadBundled by tasks.registering {
-    libDir.listFiles()?.filter { it.isFile }?.forEach { it.deleteRecursively() }
     if (localTCArtifacts) {
         dependsOn(extractPackagesFromPlugin,
                 extractPackagesFromKTCompiler,
-                downloadIntellijCoreAndExtractSelectedJars,
                 createIdeDependenciesJar,
                 downloadKotlinxLibraries)
     } else {
         dependsOn(extractPackagesFromPlugin,
                 extractPackagesFromKTCompiler,
-                downloadIntellijCoreAndExtractSelectedJars,
                 createIdeDependenciesJar,
                 downloadKotlinxLibraries)
     }

diff --git a/kotlin-bundled-compiler/src/com/intellij/util/containers/ObjectIntHashMap.java b/kotlin-bundled-compiler/src/com/intellij/util/containers/ObjectIntHashMap.java
@@ -29,6 +29,15 @@ public final int get(@NotNull K key) {
         return this.get(key, -1);
     }
 
+    @Override
+    public int getOrDefault(@NotNull K k, int i) {
+        if(contains(k)) {
+            return get(k);
+        } else {
+            return i;
+        }
+    }
+
     @Override
     public @NotNull
     Set<K> keySet() {

diff --git a/kotlin-eclipse-core/preferences.ini b/kotlin-eclipse-core/preferences.ini
@@ -1,4 +1,4 @@
-jvmTarget=JVM_1_6
+jvmTarget=JVM_1_8
 compilerPlugins/all-open/active=false
 compilerPlugins/all-open/jarPath=$KOTLIN_HOME/lib/allopen-compiler-plugin.jar
 compilerPlugins/spring/active=false

diff --git a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/imports/importServices.kt b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/imports/importServices.kt
@@ -106,7 +106,8 @@ private fun findApplicableCallables(
 
     return searchCallableByName(element)
         .let { module.accept(visitor, it) }
-        .map { FunctionCandidate(it) }
+        ?.map { FunctionCandidate(it) }
+        ?: emptyList()
 }
 
 private fun CallableDescriptor.isReceiverTypeMatching(type: KotlinType): Boolean =

diff --git a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/KotlinCommonEnvironment.kt b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/KotlinCommonEnvironment.kt
@@ -43,10 +43,7 @@ import com.intellij.psi.JavaModuleSystem
 import com.intellij.psi.PsiElementFinder
 import com.intellij.psi.PsiManager
 import com.intellij.psi.augment.PsiAugmentProvider
-import com.intellij.psi.codeStyle.CodeStyleManager
-import com.intellij.psi.codeStyle.CodeStyleSettingsProvider
-import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider
-import com.intellij.psi.compiled.ClassFileDecompilers
+import com.intellij.psi.codeStyle.*
 import com.intellij.psi.impl.PsiElementFinderImpl
 import com.intellij.psi.impl.PsiTreeChangePreprocessor
 import com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy
@@ -93,8 +90,6 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionProvider
 import org.jetbrains.kotlin.scripting.extensions.ScriptingResolveExtension
 import java.io.File
 import kotlin.reflect.KClass
-import com.intellij.psi.codeStyle.CodeStyleSettingsService
-import com.intellij.psi.codeStyle.CodeStyleSettingsServiceImpl
 
 private fun setIdeaIoUseFallback() {
     if (SystemInfo.isWindows) {

diff --git a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/KotlinEnvironment.kt b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/model/KotlinEnvironment.kt
@@ -14,11 +14,12 @@
  * limitations under the License.
  *
  *******************************************************************************/
+@file:OptIn(ExperimentalCompilerApi::class)
+
 package org.jetbrains.kotlin.core.model
 
 import com.intellij.core.CoreJavaFileManager
 import com.intellij.openapi.Disposable
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.ServiceManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
@@ -35,15 +36,11 @@ import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.jdt.core.JavaCore
 import org.eclipse.jdt.internal.core.JavaProject
 import org.eclipse.osgi.internal.loader.EquinoxClassLoader
-import org.jetbrains.kotlin.asJava.classes.FacadeCache
 import org.jetbrains.kotlin.cli.jvm.compiler.CliVirtualFileFinderFactory
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCliJavaFileManagerImpl
 import org.jetbrains.kotlin.cli.jvm.index.JvmDependenciesIndexImpl
 import org.jetbrains.kotlin.cli.jvm.index.SingleJavaFileRootsIndex
-import org.jetbrains.kotlin.compiler.plugin.CliOptionValue
-import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor
-import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar
-import org.jetbrains.kotlin.compiler.plugin.parsePluginOption
+import org.jetbrains.kotlin.compiler.plugin.*
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.config.JVMConfigurationKeys
 import org.jetbrains.kotlin.container.ComponentProvider
@@ -156,11 +153,10 @@ class KotlinScriptEnvironment private constructor(
                 SingleJavaFileRootsIndex(singleJavaFileRoots),
                 configuration.getBoolean(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING))
 
-        val finderFactory = CliVirtualFileFinderFactory(index)
+        val finderFactory = CliVirtualFileFinderFactory(index, false)
         project.registerService(MetadataFinderFactory::class.java, finderFactory)
         project.registerService(VirtualFileFinderFactory::class.java, finderFactory)
 
-        project.registerService(FacadeCache::class.java, FacadeCache(project))
         project.registerService(KotlinLightClassManager::class.java, KotlinLightClassManager(javaProject.project))
 
 //        definition?.dependencyResolver?.also { project.registerService(DependenciesResolver::class.java, it) }
@@ -343,10 +339,6 @@ class KotlinEnvironment private constructor(val eclipseProject: IProject, dispos
         registerProjectDependenServices(javaProject)
         configureClasspath(javaProject)
 
-        with(project) {
-            registerService(FacadeCache::class.java, FacadeCache(project))
-        }
-
         registerCompilerPlugins()
 
         cachedEnvironment.putEnvironment(eclipseProject, this)
@@ -388,7 +380,7 @@ class KotlinEnvironment private constructor(val eclipseProject: IProject, dispos
 
     private fun parseOptions(args: List<String>): Map<String, List<String>> =
             args.asSequence()
-                    .map { parsePluginOption("plugin:$it") }
+                    .map { parseLegacyPluginOption("plugin:$it") }
                     .filterNotNull()
                     .groupBy(CliOptionValue::optionName, CliOptionValue::value)
 

diff --git a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/preferences/KotlinBuildingProperties.kt b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/preferences/KotlinBuildingProperties.kt
@@ -11,6 +11,8 @@ class KotlinBuildingProperties(scope: IScopeContext = InstanceScope.INSTANCE) :
 
     var useIncremental by BooleanPreference()
 
+    var alwaysRealBuild by BooleanPreference()
+
     companion object {
         val workspaceInstance by lazy { KotlinBuildingProperties() }
     }

diff --git a/...clipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaClass.kt b/...clipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaClass.kt
@@ -35,6 +35,8 @@ public class EclipseJavaClass(javaElement: ITypeBinding) : EclipseJavaClassifier
 
     override val isFinal: Boolean = Modifier.isFinal(binding.getModifiers())
 
+    override val isFromSource: Boolean get() = binding.isFromSource
+
     override val visibility: Visibility = EclipseJavaElementUtil.getVisibility(binding)
 
     override val typeParameters: List<JavaTypeParameter>

diff --git a/...ore/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaConstructor.java b/...ore/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaConstructor.java
@@ -37,4 +37,8 @@ public List<JavaValueParameter> getValueParameters() {
         return EclipseJavaElementUtil.getValueParameters(getBinding());
     }
 
+    @Override
+    public boolean isFromSource() {
+        return getBinding().getDeclaringClass().isFromSource();
+    }
 }
diff --git a/...clipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaField.kt b/...clipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaField.kt
@@ -28,7 +28,10 @@ public class EclipseJavaField(private val javaField: IVariableBinding) : Eclipse
     override val initializerValue: Any? = binding.constantValue
 
     override val isEnumEntry: Boolean = binding.isEnumConstant()
-
+
+    override val isFromSource: Boolean
+        get() = binding.declaringClass.isFromSource
+
     override val type: JavaType
         get() = EclipseJavaType.create(binding.getType())
 

diff --git a/...lipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaMethod.kt b/...lipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaMethod.kt
@@ -47,4 +47,7 @@ class EclipseJavaMethod(method: IMethodBinding) : EclipseJavaMember<IMethodBindi
 
     override val containingClass: JavaClass
         get() = EclipseJavaClass(binding.declaringClass)
+
+    override val isFromSource: Boolean
+        get() = binding.declaringClass.isFromSource
 }
diff --git a/...ore/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaTypeParameter.kt b/...ore/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaTypeParameter.kt
@@ -26,6 +26,9 @@ import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.name.SpecialNames
 
 public class EclipseJavaTypeParameter(binding: ITypeBinding) : EclipseJavaClassifier<ITypeBinding>(binding), JavaTypeParameter {
+    override val isFromSource: Boolean
+        get() = binding.isFromSource
+
     override val name: Name = SpecialNames.safeIdentifier(binding.getName())
 
     override val upperBounds: Collection<JavaClassifierType>

diff --git a/.../src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaValueParameter.java b/.../src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaValueParameter.java
@@ -78,4 +78,9 @@ public boolean isVararg() {
     public boolean isDeprecatedInJavaDoc() {
         return getBinding().isDeprecated();
     }
+
+    @Override
+    public boolean isFromSource() {
+        return getBinding().isFromSource();
+    }
 }
diff --git a/...re/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseOptimizedJavaClass.kt b/...re/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseOptimizedJavaClass.kt
@@ -79,7 +79,10 @@ class EclipseOptimizedJavaClass(val eclipseClass: IType) : JavaClass {
 
     override val isFinal: Boolean
         get() = throw UnsupportedOperationException()
-
+
+    override val isFromSource: Boolean
+        get() = !eclipseClass.isBinary
+
     override val isStatic: Boolean
         get() = throw UnsupportedOperationException()
 

diff --git a/...e-core/src/org/jetbrains/kotlin/core/script/template/ProjectScriptTemplateContribution.kt b/...e-core/src/org/jetbrains/kotlin/core/script/template/ProjectScriptTemplateContribution.kt
@@ -27,7 +27,7 @@ import java.io.File
 
 class ProjectScriptTemplateContribution : ScriptTemplateContribution() {
 
-    override val priority: Int get() = Int.MAX_VALUE
+    override val priority: Int get() = Int.MIN_VALUE
 
     override fun loadTemplate() = ProjectScriptTemplate::class
 

diff --git a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/utils/importsUtils.kt b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/utils/importsUtils.kt
@@ -22,10 +22,10 @@ import org.jetbrains.kotlin.config.LanguageFeature.DefaultImportOfPackageKotlinC
 import org.jetbrains.kotlin.config.LanguageVersion
 import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.util.ActionRunningMode
 import org.jetbrains.kotlin.idea.util.ImportDescriptorResult
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.ImportPath
@@ -38,20 +38,11 @@ class KotlinImportInserterHelper : ImportInsertHelper() {
         return importSortComparator
     }
 
-    override fun importDescriptor(
-        element: KtElement,
-        descriptor: DeclarationDescriptor,
-        actionRunningMode: ActionRunningMode,
-        forceAllUnderImport: Boolean
-    ): ImportDescriptorResult {
+    override fun importDescriptor(element: KtElement, descriptor: DeclarationDescriptor, runImmediately: Boolean, forceAllUnderImport: Boolean, aliasName: Name?): ImportDescriptorResult {
         throw UnsupportedOperationException()
     }
 
-    override fun importPsiClass(
-        element: KtElement,
-        psiClass: PsiClass,
-        actionRunningMode: ActionRunningMode
-    ): ImportDescriptorResult {
+    override fun importPsiClass(element: KtElement, psiClass: PsiClass, runImmediately: Boolean): ImportDescriptorResult {
         throw UnsupportedOperationException()
     }
 

diff --git a/kotlin-eclipse-feature/feature.xml b/kotlin-eclipse-feature/feature.xml
@@ -6,7 +6,7 @@
       provider-name="JetBrains">
 
    <description url="http://kotlinlang.org/">
-      Kotlin language support for Kotlin 1.6.21
+      Kotlin language support for Kotlin 1.8.10
    </description>
 
    <copyright url="http://www.jetbrains.com/">

diff --git a/kotlin-eclipse-ui/src/org/jetbrains/kotlin/preferences/views/BuildingPropertiesView.kt b/kotlin-eclipse-ui/src/org/jetbrains/kotlin/preferences/views/BuildingPropertiesView.kt
@@ -33,9 +33,14 @@ class BuildingPropertiesView(
         kotlinBuildingProperties.useIncremental = value
     }
 
+    private var alwaysRealBuild by Delegates.observable(kotlinBuildingProperties.alwaysRealBuild) { _, _, value ->
+        kotlinBuildingProperties.alwaysRealBuild = value
+    }
+
     init {
         control = parent.gridContainer {
             checkbox(::useIncremental, "Use incremental compiler (experimental)")
+            checkbox(::alwaysRealBuild, "Always build real class files")
         }.control
     }
 }
diff --git a/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/builder/BaseKotlinBuilderElement.kt b/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/builder/BaseKotlinBuilderElement.kt
@@ -27,7 +27,7 @@ abstract class BaseKotlinBuilderElement {
 
     private val fileFilters = listOf(ScriptFileFilter, FileFromOutputFolderFilter, FileFromKotlinBinFolderFilter)
 
-    abstract fun build(project: IProject, delta: IResourceDelta?, kind: Int): Array<IProject>?
+    abstract fun build(project: IProject, delta: IResourceDelta?, kind: Int)
 
     protected fun isAllFilesApplicableForFilters(files: Set<IFile>, javaProject: IJavaProject): Boolean {
         return files.all { file ->

diff --git a/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/builder/IncrementalKotlinBuilderElement.kt b/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/builder/IncrementalKotlinBuilderElement.kt
@@ -3,35 +3,26 @@ package org.jetbrains.kotlin.ui.builder
 import org.eclipse.core.resources.IProject
 import org.eclipse.core.resources.IResourceDelta
 import org.eclipse.core.resources.IncrementalProjectBuilder
-import org.eclipse.core.runtime.Status
-import org.eclipse.core.runtime.jobs.Job
 import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.jdt.core.JavaCore
-import org.jetbrains.kotlin.core.asJava.KotlinLightClassGeneration
-import org.jetbrains.kotlin.core.builder.KotlinPsiManager
 import org.jetbrains.kotlin.core.compiler.KotlinCompilerResult
 import org.jetbrains.kotlin.core.compiler.KotlinCompilerUtils
-import org.jetbrains.kotlin.core.model.runJob
-import org.jetbrains.kotlin.core.resolve.KotlinAnalyzer
-import org.jetbrains.kotlin.ui.KotlinPluginUpdater
 import org.jetbrains.kotlin.ui.launch.removeKotlinConsoles
 
 class IncrementalKotlinBuilderElement : BaseKotlinBuilderElement() {
 
-    override fun build(project: IProject, delta: IResourceDelta?, kind: Int): Array<IProject>? {
+    override fun build(project: IProject, delta: IResourceDelta?, kind: Int) {
         val javaProject = JavaCore.create(project)
 
         if (kind == IncrementalProjectBuilder.FULL_BUILD) {
             makeClean(javaProject)
-            return null
+            return
         }
 
         removeKotlinConsoles(javaProject)
         compileKotlinFilesIncrementally(javaProject)
 
         postBuild(delta, javaProject)
-
-        return null
     }
 
     private fun compileKotlinFilesIncrementally(javaProject: IJavaProject) {