Update to Kotlin 1.2.40 version

Kordyjan · Kordyjan · commit ce2d49b5bd9b · 2018-04-19T09:32:17.000+02:00
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/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)))
         }
diff --git a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/EclipseAnalyzerFacadeForJVM.kt b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/EclipseAnalyzerFacadeForJVM.kt
@@ -62,6 +62,7 @@ import org.jetbrains.kotlin.config.JvmTarget
 import org.jetbrains.kotlin.load.java.sam.SamWithReceiverResolver
 import org.jetbrains.kotlin.core.model.SamWithReceiverResolverExtension
 import org.jetbrains.kotlin.script.KotlinScriptDefinition
+import org.jetbrains.kotlin.cli.jvm.compiler.CliBindingTrace
 
 data class AnalysisResultWithProvider(val analysisResult: AnalysisResult, val componentProvider: ComponentProvider?) {
     companion object {
@@ -91,7 +92,7 @@ public object EclipseAnalyzerFacadeForJVM {
         val module = moduleContext.module
         
         val providerFactory = FileBasedDeclarationProviderFactory(moduleContext.storageManager, allFiles)
-        val trace = CliLightClassGenerationSupport.CliBindingTrace()
+        val trace = CliBindingTrace()
         
         val sourceScope = TopDownAnalyzerFacadeForJVM.newModuleSearchScope(project, filesToAnalyze)
         val moduleClassResolver = SourceOrBinaryModuleClassResolver(sourceScope)
@@ -155,10 +156,10 @@ public object EclipseAnalyzerFacadeForJVM {
             extension.getPackageFragmentProvider(project, module, storageManager, trace, null, LookupTracker.DO_NOTHING)
         }
         
-        module.setDependencies(ModuleDependenciesImpl(
+        module.setDependencies(
                 listOfNotNull(module, dependencyModule, optionalBuiltInsModule),
                 setOf(dependencyModule)
-        ))
+        )
         module.initialize(CompositePackageFragmentProvider(
                 listOf(container.get<KotlinCodeAnalyzer>().packageFragmentProvider) +
                 additionalProviders
@@ -187,7 +188,7 @@ public object EclipseAnalyzerFacadeForJVM {
             return AnalysisResultWithProvider.EMPTY
         }
         
-        val trace = CliLightClassGenerationSupport.CliBindingTrace()
+        val trace = CliBindingTrace()
         
         val container = TopDownAnalyzerFacadeForJVM.createContainer(
                 environment.project,
diff --git a/kotlin-eclipse-feature/feature.xml b/kotlin-eclipse-feature/feature.xml
@@ -2,11 +2,11 @@
 <feature
       id="org.jetbrains.kotlin.feature"
       label="Kotlin"
-      version="0.8.3.qualifier"
+      version="0.8.4.qualifier"
       provider-name="JetBrains">
 
    <description url="http://kotlinlang.org/">
-      Kotlin language support for Kotlin 1.2.31
+      Kotlin language support for Kotlin 1.2.40
    </description>
 
    <copyright url="http://www.jetbrains.com/">
diff --git a/kotlin-eclipse-feature/pom.xml b/kotlin-eclipse-feature/pom.xml
@@ -8,12 +8,12 @@
     <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.feature</artifactId>
 	<groupId>kotlin.eclipse</groupId>
-	<version>0.8.3-SNAPSHOT</version>
+	<version>0.8.4-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/kotlin-eclipse-maven/META-INF/MANIFEST.MF b/kotlin-eclipse-maven/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: kotlin-eclipse-maven
 Bundle-SymbolicName: org.jetbrains.kotlin.maven;singleton:=true
-Bundle-Version: 0.8.3.qualifier
+Bundle-Version: 0.8.4.qualifier
 Bundle-Activator: org.jetbrains.kotlin.maven.Activator
 Bundle-Vendor: JetBrains
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/kotlin-eclipse-maven/pom.xml b/kotlin-eclipse-maven/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.maven</artifactId>
diff --git a/kotlin-eclipse-p2updatesite/category.xml b/kotlin-eclipse-p2updatesite/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.jetbrains.kotlin.feature_0.8.3.qualifier.jar" id="org.jetbrains.kotlin.feature" version="0.8.3.qualifier">
+   <feature url="features/org.jetbrains.kotlin.feature_0.8.4.qualifier.jar" id="org.jetbrains.kotlin.feature" version="0.8.4.qualifier">
       <category name="org.jetbrains.kotlin.category"/>
    </feature>
    <category-def name="org.jetbrains.kotlin.category" label="Kotlin Development Tools"/>
diff --git a/kotlin-eclipse-p2updatesite/pom.xml b/kotlin-eclipse-p2updatesite/pom.xml
@@ -8,12 +8,12 @@
     <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.p2updatesite</artifactId>
 	<groupId>kotlin.eclipse</groupId>
-	<version>0.8.3-SNAPSHOT</version>
+	<version>0.8.4-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
 </project>
diff --git a/kotlin-eclipse-policy/feature.xml b/kotlin-eclipse-policy/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.jetbrains.kotlin.policy"
       label="kotlin-eclipse-policy"
-      version="0.8.3.qualifier"
+      version="0.8.4.qualifier"
       provider-name="JetBrains">
 
    <copyright url="http://www.jetbrains.com/">
diff --git a/kotlin-eclipse-policy/pom.xml b/kotlin-eclipse-policy/pom.xml
@@ -8,12 +8,12 @@
     <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.policy</artifactId>
     <groupId>kotlin.eclipse</groupId>
-    <version>0.8.3-SNAPSHOT</version>
+    <version>0.8.4-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/kotlin-eclipse-test-framework/META-INF/MANIFEST.MF b/kotlin-eclipse-test-framework/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: kotlin-eclipse-testframework
 Bundle-SymbolicName: org.jetbrains.kotlin.testframework
-Bundle-Version: 0.8.3.qualifier
+Bundle-Version: 0.8.4.qualifier
 Bundle-Activator: org.jetbrains.kotlin.testframework.Activator
 Require-Bundle: org.jetbrains.kotlin.core,
  org.jetbrains.kotlin.ui,
diff --git a/kotlin-eclipse-test-framework/pom.xml b/kotlin-eclipse-test-framework/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.testframework</artifactId>
diff --git a/kotlin-eclipse-ui-test/META-INF/MANIFEST.MF b/kotlin-eclipse-ui-test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: kotlin-eclipse-ui-test
 Bundle-SymbolicName: org.jetbrains.kotlin.ui.tests;singleton:=true
-Bundle-Version: 0.8.3.qualifier
+Bundle-Version: 0.8.4.qualifier
 Bundle-Vendor: JetBrains
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
diff --git a/kotlin-eclipse-ui-test/pom.xml b/kotlin-eclipse-ui-test/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.ui.tests</artifactId>
diff --git a/kotlin-eclipse-ui-test/src/org/jetbrains/kotlin/checkers/KotlinDiagnosticsTestCase.java b/kotlin-eclipse-ui-test/src/org/jetbrains/kotlin/checkers/KotlinDiagnosticsTestCase.java
@@ -45,6 +45,8 @@
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory2;
 import org.jetbrains.kotlin.diagnostics.DiagnosticUtils;
 import org.jetbrains.kotlin.diagnostics.Errors;
+import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils;
+import org.jetbrains.kotlin.diagnostics.PsiDiagnosticUtils.LineAndColumn;
 import org.jetbrains.kotlin.diagnostics.Severity;
 import org.jetbrains.kotlin.psi.Call;
 import org.jetbrains.kotlin.psi.KtDeclaration;
@@ -223,7 +225,7 @@ private static void checkAllResolvedCallsAreCompleted(@NotNull List<KtFile> jetF
             KtElement element = entry.getKey().getCallElement();
             ResolvedCall<?> resolvedCall = entry.getValue();
 
-            DiagnosticUtils.LineAndColumn lineAndColumn =
+            LineAndColumn lineAndColumn =
                     DiagnosticUtils.getLineAndColumnInPsiFile(element.getContainingFile(), element.getTextRange());
 
             TestCase.assertTrue("Resolved call for '" + element.getText() + "'" + lineAndColumn + " is not completed",
@@ -336,7 +338,7 @@ private static void assertResolvedCallsAreCompleted(
         }
 
         PsiElement element = diagnostic.getPsiElement();
-        DiagnosticUtils.LineAndColumn lineAndColumn =
+        LineAndColumn lineAndColumn =
                 DiagnosticUtils.getLineAndColumnInPsiFile(element.getContainingFile(), element.getTextRange());
 
         TestCase.assertTrue("Resolved calls stored in " + diagnostic.getFactory().getName() + "\n" +
@@ -514,14 +516,14 @@ public boolean value(final ActualDiagnostic actualDiagnostic) {
                     diagnosedRanges, diagnostics, new CheckerTestUtil.DiagnosticDiffCallbacks() {
                 @Override
                 public void missingDiagnostic(TextDiagnostic diagnostic, int expectedStart, int expectedEnd) {
-                    String message = "Missing " + diagnostic.getDescription() + DiagnosticUtils.atLocation(jetFile, new TextRange(expectedStart, expectedEnd));
+                    String message = "Missing " + diagnostic.getDescription() + PsiDiagnosticUtils.atLocation(jetFile, new TextRange(expectedStart, expectedEnd));
                     System.err.println(message);
                     ok[0] = false;
                 }
 
                 @Override
                 public void unexpectedDiagnostic(TextDiagnostic diagnostic, int actualStart, int actualEnd) {
-                    String message = "Unexpected " + diagnostic.getDescription() + DiagnosticUtils.atLocation(jetFile, new TextRange(actualStart, actualEnd));
+                    String message = "Unexpected " + diagnostic.getDescription() + PsiDiagnosticUtils.atLocation(jetFile, new TextRange(actualStart, actualEnd));
                     System.err.println(message);
                     ok[0] = false;
                 }
@@ -531,7 +533,7 @@ public void wrongParametersDiagnostic(
 						TextDiagnostic expectedDiagnostic,
 						TextDiagnostic actualDiagnostic, int start, int end) {
 					String message = "Parameters of diagnostic not equal at position "
-                                     + DiagnosticUtils.atLocation(jetFile, new TextRange(start, end))
+                                     + PsiDiagnosticUtils.atLocation(jetFile, new TextRange(start, end))
                                      + ". Expected: " + expectedDiagnostic.asString() + ", actual: " + actualDiagnostic.asString();
 		            System.err.println(message);
 		            ok[0] = false;
diff --git a/kotlin-eclipse-ui/META-INF/MANIFEST.MF b/kotlin-eclipse-ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: kotlin-eclipse-ui
 Bundle-SymbolicName: org.jetbrains.kotlin.ui;singleton:=true
-Bundle-Version: 0.8.3.qualifier
+Bundle-Version: 0.8.4.qualifier
 Bundle-Activator: org.jetbrains.kotlin.ui.Activator
 Bundle-Vendor: JetBrains
 Require-Bundle: org.eclipse.ui,
diff --git a/kotlin-eclipse-ui/pom.xml b/kotlin-eclipse-ui/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.ui</artifactId>
diff --git a/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/editors/codeassist/KotlinFunctionParameterInfoAssist.kt b/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/editors/codeassist/KotlinFunctionParameterInfoAssist.kt
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.eclipse.ui.utils.KotlinImageProvider
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.resolve.descriptorUtil.hasDefaultValue
+import org.jetbrains.kotlin.resolve.descriptorUtil.declaresOrInheritsDefaultValue
 import org.jetbrains.kotlin.core.resolve.EclipseDescriptorUtils
 import org.jetbrains.kotlin.descriptors.SourceElement
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
@@ -98,7 +98,7 @@ public class KotlinFunctionParameterContextInformation(descriptor: FunctionDescr
                 .append(": ")
                 .append(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(getActualParameterType(parameter)))
         
-        if (parameter.hasDefaultValue()) {
+        if (parameter.declaresOrInheritsDefaultValue()) {
             val parameterDeclaration = EclipseDescriptorUtils.descriptorToDeclaration(parameter)
             if (parameterDeclaration != null) {
                 result.append(" = ${getDefaultExpressionString(parameterDeclaration)}")
diff --git a/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/editors/navigation/navigationUtils.kt b/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/editors/navigation/navigationUtils.kt
@@ -75,6 +75,7 @@ import org.jetbrains.kotlin.ui.editors.KotlinScriptEditor
 import org.jetbrains.kotlin.ui.editors.getScriptDependencies
 import org.jetbrains.kotlin.ui.formatter.createKtFile
 import org.jetbrains.kotlin.ui.navigation.KotlinOpenEditor
+import org.jetbrains.kotlin.serialization.deserialization.getName
 
 private val KOTLIN_SOURCE_PATH = Path(ProjectUtils.buildLibPath(KotlinClasspathContainer.LIB_RUNTIME_SRC_NAME))
 private val RUNTIME_SOURCE_MAPPER = KOTLIN_SOURCE_PATH.createSourceMapperWithRoot()
diff --git a/kotlin-weaving-feature/feature.xml b/kotlin-weaving-feature/feature.xml
diff --git a/kotlin-weaving-feature/pom.xml b/kotlin-weaving-feature/pom.xml
diff --git a/pom.xml b/pom.xml
