Merge pull request #87 from wpopielarski/master

Update to version 1.2.40
Kotlin · Apr 19, 2018 · 0109bcd · 0109bcd
2 parents 726d8be + c44856b
commit 0109bcd
Show file tree

Hide file tree

Showing 40 changed files with 91 additions and 396 deletions.
diff --git a/.teamcity/Kotlin_KotlinEclipse/Project.kt b/.teamcity/Kotlin_KotlinEclipse/Project.kt
diff --git a/.teamcity/Kotlin_KotlinEclipse/buildTypes/Kotlin_KotlinEclipse_EclipsePluginDev.kt b/.teamcity/Kotlin_KotlinEclipse/buildTypes/Kotlin_KotlinEclipse_EclipsePluginDev.kt
diff --git a/.teamcity/Kotlin_KotlinEclipse/settings.kts b/.teamcity/Kotlin_KotlinEclipse/settings.kts
diff --git a/...ipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster.kt b/...ipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster.kt
diff --git a/...in_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse.kt b/...in_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse.kt
diff --git a/...sRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230.kt b/...sRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230.kt
diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml
diff --git a/kotlin-bundled-compiler/META-INF/MANIFEST.MF b/kotlin-bundled-compiler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bundled Kotlin Compiler
 Bundle-SymbolicName: org.jetbrains.kotlin.bundled-compiler;singleton:=true
-Bundle-Version: 0.8.3.qualifier
+Bundle-Version: 0.8.4.qualifier
 Bundle-Vendor: JetBrains
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
@@ -338,7 +338,6 @@ Export-Package:
  org.jetbrains.kotlin.serialization.builtins,
  org.jetbrains.kotlin.serialization.deserialization,
  org.jetbrains.kotlin.serialization.deserialization.descriptors,
- org.jetbrains.kotlin.serialization.jvm,
  org.jetbrains.kotlin.storage,
  org.jetbrains.kotlin.synthetic,
  org.jetbrains.kotlin.types,

diff --git a/kotlin-bundled-compiler/get_bundled.xml b/kotlin-bundled-compiler/get_bundled.xml
@@ -1,15 +1,15 @@
 <project default="get_bundled">
-    <property name="compiler.tag" value="1.2.31" />
+    <property name="compiler.tag" value="1.2.40" />
     <property name="bootstrap_branch" value=""/>
     <property name="idea-version" value="162.1812.17"/>
 
-    <property name="compiler.query" value="1334344:id" />
+    <property name="compiler.query" value="1395958:id" />
 
     <property name="teamcity-base" value="https://teamcity.jetbrains.com"/>
 
     <property name="kotlin-idea-compatible-version" value="IJ2017.3-1" />
-    <property name="kotlin-version" value="1.2.30" />
-    <property name="teamcity-kotlin-url" value = "${teamcity-base}/guestAuth/repository/download/Kotlin_1230_CompilerAllPlugins/${compiler.query}" />
+    <property name="kotlin-version" value="1.2.40" />
+    <property name="teamcity-kotlin-url" value = "${teamcity-base}/guestAuth/repository/download/Kotlin_1240_CompilerAllPlugins/${compiler.query}" />
 
     <property name="idea-sdk-url" value="https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea" />
 
@@ -238,7 +238,7 @@
         </unzip>
 
         <!-- Also retrivive sources -->
-        <get src="${teamcity-kotlin-url}/maven/org/jetbrains/kotlin/kotlin-compiler/1.2.30/kotlin-compiler-1.2.30-sources.jar" 
+        <get src="${teamcity-kotlin-url}/maven/org/jetbrains/kotlin/kotlin-compiler/${kotlin-version}/kotlin-compiler-${kotlin-version}-sources.jar" 
                     dest="${download.dir}/${compiler-sources-file}" usetimestamp="true" />
         <!-- Get idea sources -->
         <get src="${idea-sdk-url}/ideaIC/${idea-version}/ideaIC-${idea-version}-sources.jar" dest="${download.dir}/idea-sdk-sources.jar" usetimestamp="true" />

diff --git a/kotlin-bundled-compiler/pom.xml b/kotlin-bundled-compiler/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>../pom.xml</relativePath>
 		<groupId>kotlin.eclipse</groupId>
 		<artifactId>kotlin.eclipse.plugin</artifactId>
-		<version>0.8.3-SNAPSHOT</version>
+		<version>0.8.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.jetbrains.kotlin.bundled-compiler</artifactId>

diff --git a/kotlin-eclipse-aspects/META-INF/MANIFEST.MF b/kotlin-eclipse-aspects/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: kotlin-eclipse-aspects
 Bundle-SymbolicName: org.jetbrains.kotlin.aspects
-Bundle-Version: 0.8.3.qualifier
+Bundle-Version: 0.8.4.qualifier
 Bundle-Activator: org.jetbrains.kotlin.aspects.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/kotlin-eclipse-aspects/pom.xml b/kotlin-eclipse-aspects/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>../pom.xml</relativePath>
 		<groupId>kotlin.eclipse</groupId>
 		<artifactId>kotlin.eclipse.plugin</artifactId>
-		<version>0.8.3-SNAPSHOT</version>
+		<version>0.8.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.jetbrains.kotlin.aspects</artifactId>

diff --git a/kotlin-eclipse-core/META-INF/MANIFEST.MF b/kotlin-eclipse-core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: kotlin-eclipse-core
 Bundle-SymbolicName: org.jetbrains.kotlin.core;singleton:=true
-Bundle-Version: 0.8.3.qualifier
+Bundle-Version: 0.8.4.qualifier
 Bundle-Activator: org.jetbrains.kotlin.core.Activator
 Bundle-Vendor: JetBrains
 Require-Bundle: org.jetbrains.kotlin.bundled-compiler,

diff --git a/kotlin-eclipse-core/pom.xml b/kotlin-eclipse-core/pom.xml
@@ -8,7 +8,7 @@
 		<relativePath>../pom.xml</relativePath>
 		<groupId>kotlin.eclipse</groupId>
 		<artifactId>kotlin.eclipse.plugin</artifactId>
-		<version>0.8.3-SNAPSHOT</version>
+		<version>0.8.4-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.jetbrains.kotlin.core</artifactId>

diff --git a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/asJava/KotlinLightClassGeneration.kt b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/asJava/KotlinLightClassGeneration.kt
@@ -69,7 +69,7 @@ object KotlinLightClassGeneration {
                     override fun shouldGenerateScript(script: KtScript): Boolean = false
 
                     override fun shouldGenerateClassMembers(processingClassOrObject: KtClassOrObject): Boolean {
-						return shouldGenerateClass(processingClassOrObject) ||
+						return super.shouldGenerateClassMembers(processingClassOrObject) ||
 								processingClassOrObject.hasModifier(KtTokens.COMPANION_KEYWORD)
 					}
 			}).build()

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
@@ -95,6 +95,8 @@ import org.jetbrains.kotlin.script.ScriptHelperImpl
 import com.intellij.lang.jvm.facade.JvmElementProvider
 import org.jetbrains.kotlin.resolve.ModuleAnnotationsResolver
 import org.jetbrains.kotlin.cli.jvm.compiler.CliModuleAnnotationsResolver
+import org.jetbrains.kotlin.cli.jvm.compiler.CliTraceHolder
+import org.jetbrains.kotlin.cli.jvm.compiler.CliKotlinAsJavaSupport
 
 private fun setIdeaIoUseFallback() {
     if (SystemInfo.isWindows) {
@@ -160,15 +162,19 @@ abstract class KotlinCommonEnvironment(disposable: Disposable) {
             registerService(ExternalAnnotationsManager::class.java, MockExternalAnnotationsManager())
             registerService(InferredAnnotationsManager::class.java, MockInferredAnnotationsManager())
 
-            val cliLightClassGenerationSupport = CliLightClassGenerationSupport(project)
-            registerService(LightClassGenerationSupport::class.java, cliLightClassGenerationSupport)
-            registerService(CliLightClassGenerationSupport::class.java, cliLightClassGenerationSupport)
-            registerService(CodeAnalyzerInitializer::class.java, cliLightClassGenerationSupport)
+            val traceHolder = CliTraceHolder().also {
+                registerService(CodeAnalyzerInitializer::class.java, it)
+            }
+
+            CliLightClassGenerationSupport(traceHolder).also {
+                registerService(LightClassGenerationSupport::class.java, it)
+                registerService(CliLightClassGenerationSupport::class.java, it)
+            }
 
             registerService(JavaModuleResolver::class.java, EclipseKotlinJavaModuleResolver())
 
 			val area = Extensions.getArea(this)
-			area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(JavaElementFinder(this, cliLightClassGenerationSupport))
+			area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(JavaElementFinder(this, CliKotlinAsJavaSupport(project, traceHolder)))
             area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(
                     PsiElementFinderImpl(this, ServiceManager.getService(this, JavaFileManager::class.java)))
         }