diff --git a/.teamcity/Kotlin_KotlinEclipse/Project.kt b/.teamcity/Kotlin_KotlinEclipse/Project.kt deleted file mode 100644 index 50da82b40..000000000 --- a/.teamcity/Kotlin_KotlinEclipse/Project.kt +++ /dev/null @@ -1,34 +0,0 @@ -package Kotlin_KotlinEclipse - -import Kotlin_KotlinEclipse.buildTypes.* -import Kotlin_KotlinEclipse.vcsRoots.* -import Kotlin_KotlinEclipse.vcsRoots.Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse -import jetbrains.buildServer.configs.kotlin.v2017_2.* -import jetbrains.buildServer.configs.kotlin.v2017_2.Project -import jetbrains.buildServer.configs.kotlin.v2017_2.projectFeatures.VersionedSettings -import jetbrains.buildServer.configs.kotlin.v2017_2.projectFeatures.versionedSettings - -object Project : Project({ - uuid = "50370339-ba28-41a1-8570-e9a59ac7d52f" - id = "Kotlin_KotlinEclipse" - parentId = "Kotlin" - name = "Kotlin Eclipse" - - vcsRoot(Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster) - vcsRoot(Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230) - vcsRoot(Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse) - - buildType(Kotlin_KotlinEclipse_EclipsePluginDev) - - features { - versionedSettings { - id = "PROJECT_EXT_192" - mode = VersionedSettings.Mode.ENABLED - buildSettingsMode = VersionedSettings.BuildSettingsMode.PREFER_CURRENT_SETTINGS - rootExtId = Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse.id - showChanges = false - settingsFormat = VersionedSettings.Format.KOTLIN - storeSecureParamsOutsideOfVcs = true - } - } -}) diff --git a/.teamcity/Kotlin_KotlinEclipse/buildTypes/Kotlin_KotlinEclipse_EclipsePluginDev.kt b/.teamcity/Kotlin_KotlinEclipse/buildTypes/Kotlin_KotlinEclipse_EclipsePluginDev.kt deleted file mode 100644 index eaf30d321..000000000 --- a/.teamcity/Kotlin_KotlinEclipse/buildTypes/Kotlin_KotlinEclipse_EclipsePluginDev.kt +++ /dev/null @@ -1,49 +0,0 @@ -package Kotlin_KotlinEclipse.buildTypes - -import jetbrains.buildServer.configs.kotlin.v2017_2.* -import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.ant -import jetbrains.buildServer.configs.kotlin.v2017_2.buildSteps.maven -import jetbrains.buildServer.configs.kotlin.v2017_2.triggers.vcs - -object Kotlin_KotlinEclipse_EclipsePluginDev : BuildType({ - uuid = "2179f557-b5d5-4a1f-b98d-87264e9ce916" - id = "Kotlin_KotlinEclipse_EclipsePluginDev" - name = "Eclipse Plugin Dev" - - vcs { - root(Kotlin_KotlinEclipse.vcsRoots.Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster) - root(Kotlin_KotlinEclipse.vcsRoots.Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse) - - checkoutMode = CheckoutMode.ON_AGENT - } - - steps { - ant { - mode = antFile { - path = "kotlin-bundled-compiler/get_bundled.xml" - } - workingDir = "kotlin-bundled-compiler" - targets = "get_bundled" - } - maven { - goals = "clean install" - mavenVersion = custom { - path = "%teamcity.tool.maven.3.5.2%" - } - jdkHome = "%env.JDK_18_x64%" - runnerArgs = "-e" - param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL") - } - } - - triggers { - vcs { - } - } - - requirements { - contains("teamcity.agent.jvm.os.name", "Windows") - } - - artifactRules = "+:**/.log" -}) diff --git a/.teamcity/Kotlin_KotlinEclipse/settings.kts b/.teamcity/Kotlin_KotlinEclipse/settings.kts deleted file mode 100644 index 36b3ac881..000000000 --- a/.teamcity/Kotlin_KotlinEclipse/settings.kts +++ /dev/null @@ -1,35 +0,0 @@ -package Kotlin_KotlinEclipse - -import jetbrains.buildServer.configs.kotlin.v2017_2.* - -/* -The settings script is an entry point for defining a single -TeamCity project. TeamCity looks for the 'settings.kts' file in a -project directory and runs it if it's found, so the script name -shouldn't be changed and its package should be the same as the -project's id. - -The script should contain a single call to the project() function -with a Project instance or an init function as an argument. - -VcsRoots, BuildTypes, and Templates of this project must be -registered inside project using the vcsRoot(), buildType(), and -template() methods respectively. - -Subprojects can be defined either in their own settings.kts or by -calling the subProjects() method in this project. - -To debug settings scripts in command-line, run the - - mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate - -command and attach your debugger to the port 8000. - -To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View -> -Tool Windows -> Maven Projects), find the generate task -node (Plugins -> teamcity-configs -> teamcity-configs:generate), -the 'Debug' option is available in the context menu for the task. -*/ - -version = "2017.2" -project(Kotlin_KotlinEclipse.Project) \ No newline at end of file diff --git a/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster.kt b/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster.kt deleted file mode 100644 index 38ea178c0..000000000 --- a/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster.kt +++ /dev/null @@ -1,11 +0,0 @@ -package Kotlin_KotlinEclipse.vcsRoots - -import jetbrains.buildServer.configs.kotlin.v2017_2.* -import jetbrains.buildServer.configs.kotlin.v2017_2.vcs.GitVcsRoot - -object Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster : GitVcsRoot({ - uuid = "ff510a4b-45d6-4ee3-89a5-11354b05dcb7" - id = "Kotlin_KotlinEclipse_HttpsGithubComJetBrainsKotlinEclipseRefsHeadsMaster" - name = "https://github.com/JetBrains/kotlin-eclipse#refs/heads/master" - url = "https://github.com/JetBrains/kotlin-eclipse" -}) diff --git a/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse.kt b/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse.kt deleted file mode 100644 index 9ba8dc20b..000000000 --- a/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse.kt +++ /dev/null @@ -1,12 +0,0 @@ -package Kotlin_KotlinEclipse.vcsRoots - -import jetbrains.buildServer.configs.kotlin.v2017_2.* -import jetbrains.buildServer.configs.kotlin.v2017_2.vcs.GitVcsRoot - -object Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse : GitVcsRoot({ - uuid = "e85cd456-6de2-4b0d-aac5-54db1f3076f9" - id = "Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipse" - name = "https://github.com/wpopielarski/kotlin-eclipse" - url = "https://github.com/wpopielarski/kotlin-eclipse" - branch = "refs/heads/bump-to-1.2.30" -}) diff --git a/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230.kt b/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230.kt deleted file mode 100644 index 23f43a819..000000000 --- a/.teamcity/Kotlin_KotlinEclipse/vcsRoots/Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230.kt +++ /dev/null @@ -1,12 +0,0 @@ -package Kotlin_KotlinEclipse.vcsRoots - -import jetbrains.buildServer.configs.kotlin.v2017_2.* -import jetbrains.buildServer.configs.kotlin.v2017_2.vcs.GitVcsRoot - -object Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230 : GitVcsRoot({ - uuid = "dfbe8ed0-44c4-40e5-8624-8e62ade985e6" - id = "Kotlin_KotlinEclipse_HttpsGithubComWpopielarskiKotlinEclipseRefsHeadsBumpTo1230" - name = "https://github.com/wpopielarski/kotlin-eclipse#refs/heads/bump-to-1.2.30" - url = "https://github.com/wpopielarski/kotlin-eclipse" - branch = "refs/heads/bump-to-1.2.30" -}) diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml deleted file mode 100644 index b51dd9ccc..000000000 --- a/.teamcity/pom.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - 4.0.0 - Kotlin_KotlinEclipse Config DSL Script - Kotlin_KotlinEclipse - Kotlin_KotlinEclipse_dsl - 1.0-SNAPSHOT - - - org.jetbrains.teamcity - configs-dsl-kotlin-parent - 1.0-SNAPSHOT - - - - - jetbrains-all - http://download.jetbrains.com/teamcity-repository - - true - - - - teamcity-server - https://teamcity.jetbrains.com/app/dsl-plugins-repository - - true - - - - - - - JetBrains - http://download.jetbrains.com/teamcity-repository - - - - - . - - - kotlin-maven-plugin - org.jetbrains.kotlin - ${kotlin.version} - - - - - compile - process-sources - - compile - - - - test-compile - process-test-sources - - test-compile - - - - - - org.jetbrains.teamcity - teamcity-configs-maven-plugin - ${teamcity.dsl.version} - - kotlin - target/generated-configs - - - - - - - - org.jetbrains.teamcity - configs-dsl-kotlin - ${teamcity.dsl.version} - compile - - - org.jetbrains.teamcity - configs-dsl-kotlin-plugins - 1.0-SNAPSHOT - pom - compile - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - compile - - - org.jetbrains.kotlin - kotlin-script-runtime - ${kotlin.version} - compile - - - \ No newline at end of file diff --git a/kotlin-bundled-compiler/META-INF/MANIFEST.MF b/kotlin-bundled-compiler/META-INF/MANIFEST.MF index 1dba04572..614e6b412 100644 --- 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 index 5a599ac94..1a474451d 100644 --- a/kotlin-bundled-compiler/get_bundled.xml +++ b/kotlin-bundled-compiler/get_bundled.xml @@ -1,15 +1,15 @@ - + - + - - + + @@ -238,7 +238,7 @@ - diff --git a/kotlin-bundled-compiler/pom.xml b/kotlin-bundled-compiler/pom.xml index 94a9500fd..b5edf7043 100644 --- a/kotlin-bundled-compiler/pom.xml +++ b/kotlin-bundled-compiler/pom.xml @@ -8,7 +8,7 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.bundled-compiler diff --git a/kotlin-eclipse-aspects/META-INF/MANIFEST.MF b/kotlin-eclipse-aspects/META-INF/MANIFEST.MF index 09970e840..1e31bc05c 100644 --- 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 index 6da0e46e1..270d5407f 100644 --- a/kotlin-eclipse-aspects/pom.xml +++ b/kotlin-eclipse-aspects/pom.xml @@ -8,7 +8,7 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.aspects diff --git a/kotlin-eclipse-core/META-INF/MANIFEST.MF b/kotlin-eclipse-core/META-INF/MANIFEST.MF index c3a060e89..cb678ffb6 100644 --- 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 index 52dd047ac..3a04aa47f 100644 --- a/kotlin-eclipse-core/pom.xml +++ b/kotlin-eclipse-core/pom.xml @@ -8,7 +8,7 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.core 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 index a971c1f6b..637789f48 100644 --- 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 index bf42474e6..751096f10 100644 --- 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 index ffde6edfe..264fd2510 100644 --- 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().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-core/src/org/jetbrains/kotlin/core/resolve/KotlinPackagePartProvider.kt b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/KotlinPackagePartProvider.kt index 61ea8a923..e95efc1cd 100644 --- a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/KotlinPackagePartProvider.kt +++ b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/KotlinPackagePartProvider.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.config.LanguageVersionSettingsImpl import org.jetbrains.kotlin.name.ClassId public class KotlinPackagePartProvider(private val environment: KotlinCommonEnvironment) : PackagePartProvider { - private data class ModuleMappingInfo(val root: VirtualFile, val mapping: ModuleMapping) + private data class ModuleMappingInfo(val root: VirtualFile, val mapping: ModuleMapping, val name: String) private val notLoadedRoots by lazy(LazyThreadSafetyMode.NONE) { environment.getRoots() @@ -42,7 +42,10 @@ public class KotlinPackagePartProvider(private val environment: KotlinCommonEnvi private val deserializationConfiguration = CompilerDeserializationConfiguration(LanguageVersionSettingsImpl.DEFAULT) - override fun getAnnotationsOnBinaryModule(moduleName: String): List = emptyList() + override fun getAnnotationsOnBinaryModule(moduleName: String): List = + loadedModules.mapNotNull { (_, mapping, name) -> + mapping.moduleData.annotations.takeIf { name == moduleName } + }.flatten() override fun findPackageParts(packageFqName: String): List { val rootToPackageParts = getPackageParts(packageFqName) @@ -50,7 +53,7 @@ public class KotlinPackagePartProvider(private val environment: KotlinCommonEnvi val result = linkedSetOf() val visitedMultifileFacades = linkedSetOf() - for ((virtualFile, packageParts) in rootToPackageParts) { + for ((_, packageParts) in rootToPackageParts) { for (name in packageParts.parts) { val facadeName = packageParts.getMultifileFacadeName(name) if (facadeName == null || facadeName !in visitedMultifileFacades) { @@ -96,7 +99,7 @@ public class KotlinPackagePartProvider(private val environment: KotlinCommonEnvi for (root in relevantRoots) { val metaInf = root.findChild("META-INF") ?: continue val moduleFiles = metaInf.children.filter { it.name.endsWith(ModuleMapping.MAPPING_FILE_EXT) } - for (moduleFile in moduleFiles) { + for (moduleFile: VirtualFile in moduleFiles) { val mapping = try { ModuleMapping.create(moduleFile.contentsToByteArray(), moduleFile.toString(), deserializationConfiguration) } @@ -104,7 +107,7 @@ public class KotlinPackagePartProvider(private val environment: KotlinCommonEnvi throw RuntimeException("Error on reading package parts for '$packageFqName' package in '$moduleFile', " + "roots: $notLoadedRoots", e) } - loadedModules.add(ModuleMappingInfo(root, mapping)) + loadedModules.add(ModuleMappingInfo(root, mapping, moduleFile.nameWithoutExtension)) } } } diff --git a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaReferenceAnnotationArgument.java b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaReferenceAnnotationArgument.java index 281b3d786..e21ab22c1 100644 --- a/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaReferenceAnnotationArgument.java +++ b/kotlin-eclipse-core/src/org/jetbrains/kotlin/core/resolve/lang/java/structure/EclipseJavaReferenceAnnotationArgument.java @@ -20,8 +20,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.load.java.structure.JavaEnumValueAnnotationArgument; import org.jetbrains.kotlin.load.java.structure.JavaField; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; public class EclipseJavaReferenceAnnotationArgument extends EclipseJavaAnnotationArgument implements JavaEnumValueAnnotationArgument { @@ -44,6 +45,7 @@ public Name getEntryName() { @Override @Nullable public ClassId getEnumClassId() { - return null; + String className = getBinding().getType().getQualifiedName(); + return ClassId.topLevel(new FqName(className)); } } diff --git a/kotlin-eclipse-feature/feature.xml b/kotlin-eclipse-feature/feature.xml index 32f55e072..494fbaf1d 100644 --- a/kotlin-eclipse-feature/feature.xml +++ b/kotlin-eclipse-feature/feature.xml @@ -2,11 +2,11 @@ - Kotlin language support for Kotlin 1.2.31 + Kotlin language support for Kotlin 1.2.40 diff --git a/kotlin-eclipse-feature/pom.xml b/kotlin-eclipse-feature/pom.xml index 6e04a735b..e39e701f8 100644 --- a/kotlin-eclipse-feature/pom.xml +++ b/kotlin-eclipse-feature/pom.xml @@ -8,12 +8,12 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.feature kotlin.eclipse - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT eclipse-feature \ No newline at end of file diff --git a/kotlin-eclipse-maven/META-INF/MANIFEST.MF b/kotlin-eclipse-maven/META-INF/MANIFEST.MF index e686a2212..4757cc894 100644 --- 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 index c83abc435..8e4aba11d 100644 --- a/kotlin-eclipse-maven/pom.xml +++ b/kotlin-eclipse-maven/pom.xml @@ -8,7 +8,7 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.maven diff --git a/kotlin-eclipse-p2updatesite/category.xml b/kotlin-eclipse-p2updatesite/category.xml index 85391d93e..49bc5ccbc 100644 --- a/kotlin-eclipse-p2updatesite/category.xml +++ b/kotlin-eclipse-p2updatesite/category.xml @@ -1,6 +1,6 @@ - + diff --git a/kotlin-eclipse-p2updatesite/pom.xml b/kotlin-eclipse-p2updatesite/pom.xml index 0379b2b35..6579c363d 100644 --- a/kotlin-eclipse-p2updatesite/pom.xml +++ b/kotlin-eclipse-p2updatesite/pom.xml @@ -8,12 +8,12 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.p2updatesite kotlin.eclipse - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT eclipse-repository \ No newline at end of file diff --git a/kotlin-eclipse-policy/feature.xml b/kotlin-eclipse-policy/feature.xml index 8c83f1c39..f6db86002 100644 --- a/kotlin-eclipse-policy/feature.xml +++ b/kotlin-eclipse-policy/feature.xml @@ -2,7 +2,7 @@ diff --git a/kotlin-eclipse-policy/pom.xml b/kotlin-eclipse-policy/pom.xml index 57b26d091..bae409424 100644 --- a/kotlin-eclipse-policy/pom.xml +++ b/kotlin-eclipse-policy/pom.xml @@ -8,12 +8,12 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.policy kotlin.eclipse - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT eclipse-feature \ No newline at end of file diff --git a/kotlin-eclipse-test-framework/META-INF/MANIFEST.MF b/kotlin-eclipse-test-framework/META-INF/MANIFEST.MF index d07bfe519..f67e9b9fc 100644 --- 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 index ee10bb8ed..cee54f1ae 100644 --- a/kotlin-eclipse-test-framework/pom.xml +++ b/kotlin-eclipse-test-framework/pom.xml @@ -8,7 +8,7 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.testframework diff --git a/kotlin-eclipse-ui-test/META-INF/MANIFEST.MF b/kotlin-eclipse-ui-test/META-INF/MANIFEST.MF index c02bd256d..a2df96857 100644 --- 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 index 64f903416..71f8c9e32 100644 --- a/kotlin-eclipse-ui-test/pom.xml +++ b/kotlin-eclipse-ui-test/pom.xml @@ -8,12 +8,16 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.ui.tests eclipse-test-plugin + + + + @@ -21,7 +25,7 @@ tycho-surefire-plugin true - -Xmx1024m -XX:MaxPermSize=256m + -Xmx1024m -XX:MaxPermSize=256m ${os-jvm-flags} eclipse-feature @@ -63,4 +67,16 @@ + + + + macosx-jvm-flags + + mac + + + -XstartOnFirstThread + + + \ No newline at end of file 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 index 52ec87ab7..4d62cb81f 100644 --- 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 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; @@ -561,7 +563,7 @@ private Set computeJvmSignatureDiagnostics(BindingContext bind jvmSignatureDiagnostics.addAll(CollectionsKt.map(diagnostics.forElement(declaration), new Function1() { @Override public ActualDiagnostic invoke(Diagnostic arg0) { - return new ActualDiagnostic(arg0, null, true); + return new ActualDiagnostic(arg0, null, false); } })); diff --git a/kotlin-eclipse-ui/META-INF/MANIFEST.MF b/kotlin-eclipse-ui/META-INF/MANIFEST.MF index 2878db40e..9d51224f1 100644 --- 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 index b4e7a9843..d10736fe6 100644 --- a/kotlin-eclipse-ui/pom.xml +++ b/kotlin-eclipse-ui/pom.xml @@ -8,7 +8,7 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.ui diff --git a/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/ActivatorJava.java b/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/ActivatorJava.java deleted file mode 100644 index 85a997de6..000000000 --- a/kotlin-eclipse-ui/src/org/jetbrains/kotlin/ui/ActivatorJava.java +++ /dev/null @@ -1,78 +0,0 @@ -/******************************************************************************* - * Copyright 2000-2014 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - *******************************************************************************/ -package org.jetbrains.kotlin.ui; - -import org.eclipse.core.resources.IResourceChangeEvent; -import org.eclipse.core.resources.IResourceChangeListener; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jdt.core.IElementChangedListener; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.jetbrains.kotlin.ui.builder.KotlinClassPathListener; -import org.jetbrains.kotlin.ui.builder.KotlinJavaDeclarationsListener; -import org.jetbrains.kotlin.ui.builder.ResourceChangeListener; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class ActivatorJava extends AbstractUIPlugin { - // The plug-in ID - public static final String PLUGIN_ID = "org.jetbrains.kotlin.ui"; //$NON-NLS-1$ - - // The shared instance - private static ActivatorJava plugin; - - private final IResourceChangeListener resourceChangeListener = new ResourceChangeListener(); - private final IResourceChangeListener scriptClasspathUpdater = new ScriptClasspathUpdater(); - private final IElementChangedListener kotlinClassPathChangedListener = new KotlinClassPathListener(); - private final IElementChangedListener kotlinJavaDeclarationsListener = new KotlinJavaDeclarationsListener(); - - public ActivatorJava() { - } - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - - ResourcesPlugin.getWorkspace().addResourceChangeListener( - resourceChangeListener, - IResourceChangeEvent.POST_CHANGE | IResourceChangeEvent.PRE_CLOSE | IResourceChangeEvent.PRE_DELETE); - ResourcesPlugin.getWorkspace().addResourceChangeListener(scriptClasspathUpdater, IResourceChangeEvent.POST_CHANGE); - JavaCore.addElementChangedListener(kotlinClassPathChangedListener); - JavaCore.addElementChangedListener(kotlinJavaDeclarationsListener); - } - - @Override - public void stop(BundleContext context) throws Exception { - ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener); - ResourcesPlugin.getWorkspace().removeResourceChangeListener(scriptClasspathUpdater); - JavaCore.removeElementChangedListener(kotlinClassPathChangedListener); - JavaCore.removeElementChangedListener(kotlinJavaDeclarationsListener); - - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - */ - public static ActivatorJava getDefault() { - return plugin; - } -} 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 index 06e612220..31883c6bd 100644 --- 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 index d4dbea1a6..958cc4baf 100644 --- 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 index 5630e10ea..8a590376f 100644 --- a/kotlin-weaving-feature/feature.xml +++ b/kotlin-weaving-feature/feature.xml @@ -2,7 +2,7 @@ ../pom.xml kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT org.jetbrains.kotlin.weaving.feature kotlin.eclipse - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT eclipse-feature \ No newline at end of file diff --git a/pom.xml b/pom.xml index f218a25ee..6de8909bc 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 kotlin.eclipse kotlin.eclipse.plugin - 0.8.3-SNAPSHOT + 0.8.4-SNAPSHOT pom @@ -28,7 +28,7 @@ http://download.eclipse.org/tools/ajdt/46/dev/update - 1.2.31 + 1.2.40-eap-62 1.8.7 1.8