diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java index bf4df05114e..772f2f1aa4d 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.cli.jvm.compiler; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; @@ -31,10 +30,6 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.asJava.KotlinLightClassForExplicitDeclaration; -import org.jetbrains.jet.asJava.KotlinLightClassForPackage; -import org.jetbrains.jet.asJava.LightClassConstructionContext; -import org.jetbrains.jet.asJava.LightClassGenerationSupport; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; @@ -50,6 +45,10 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; +import org.jetbrains.kotlin.asJava.LightClassConstructionContext; +import org.jetbrains.kotlin.asJava.LightClassGenerationSupport; import java.util.Collection; import java.util.Collections; @@ -68,10 +67,6 @@ import java.util.List; * To mitigate this, CliLightClassGenerationSupport hold a trace that is shared between the analyzer and JetLightClasses */ public class CliLightClassGenerationSupport extends LightClassGenerationSupport implements CodeAnalyzerInitializer { - public static CliLightClassGenerationSupport getInstanceForCli(@NotNull Project project) { - return ServiceManager.getService(project, CliLightClassGenerationSupport.class); - } - private final PsiManager psiManager; private BindingContext bindingContext = null; private ModuleDescriptor module = null; @@ -221,6 +216,7 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport if (PackagePartClassUtils.getPackageFilesWithCallables(filesInPackage).isEmpty()) return Collections.emptyList(); + //noinspection RedundantTypeArguments return UtilsPackage.emptyOrSingletonList(KotlinLightClassForPackage.create(psiManager, packageFqName, scope, filesInPackage)); } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java index 08c0b582903..404073235b0 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java @@ -42,9 +42,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.CompilerModeProvider; import org.jetbrains.jet.OperationModeProvider; -import org.jetbrains.jet.asJava.JavaElementFinder; -import org.jetbrains.jet.asJava.KotlinLightClassForPackage; -import org.jetbrains.jet.asJava.LightClassGenerationSupport; import org.jetbrains.jet.cli.common.CLIConfigurationKeys; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; @@ -62,6 +59,9 @@ import org.jetbrains.jet.lang.resolve.lazy.declarations.CliDeclarationProviderFa import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.asJava.JavaElementFinder; +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; +import org.jetbrains.kotlin.asJava.LightClassGenerationSupport; import java.io.File; import java.util.ArrayList; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 112919054a2..c304c30963b 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -31,7 +31,6 @@ import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.asJava.FilteredJvmDiagnostics; import org.jetbrains.jet.cli.common.CLIConfigurationKeys; import org.jetbrains.jet.cli.common.CompilerPlugin; import org.jetbrains.jet.cli.common.CompilerPluginContext; @@ -59,6 +58,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheP import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.jet.utils.KotlinPaths; +import org.jetbrains.kotlin.asJava.FilteredJvmDiagnostics; import java.io.File; import java.net.URL; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java index 1e1f5698535..a83ea0e4513 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/ClsWrapperStubPsiFactory.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/ClsWrapperStubPsiFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.UserDataHolder; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java similarity index 97% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java index f085a535353..ca3e1a3ded5 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/FakeLightClassForFileOfPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.lang.Language; import com.intellij.psi.PsiClass; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java similarity index 99% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/JavaElementFinder.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java index 2dc5aadb4ae..05c0f45905d 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/JavaElementFinder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.google.common.base.Function; import com.google.common.collect.Collections2; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/JetLightPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JetLightPackage.java similarity index 94% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/JetLightPackage.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/JetLightPackage.java index a27ce31a835..1f9324dac18 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/JetLightPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JetLightPackage.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinCodeBlockModificationListener.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt similarity index 96% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinCodeBlockModificationListener.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt index da577c7b223..4dd6b53b197 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinCodeBlockModificationListener.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinCodeBlockModificationListener.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.* @@ -88,7 +88,7 @@ public class KotlinCodeBlockModificationListener(modificationTracker: PsiModific } class object { - private val LOG = Logger.getInstance("#org.jetbrains.jet.asJava.JetCodeBlockModificationListener") + private val LOG = Logger.getInstance("#org.jetbrains.kotlin.asJava.JetCodeBlockModificationListener") private fun containsClassesInside(element: PsiElement?): Boolean { if (element == null) return false diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java similarity index 99% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java index 540f65a6a75..82afe039af2 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.google.common.collect.Lists; import com.intellij.openapi.diagnostic.Logger; @@ -416,4 +416,4 @@ public class KotlinJavaFileStubProvider files); } -} \ No newline at end of file +} diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt similarity index 91% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClass.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt index 908b21e068f..c8d2f437d78 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClass.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiClass; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java similarity index 95% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java index 3f101068e7a..6cf7f3dc1b1 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassBuilderFactory.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.psi.stubs.StubElement; import com.intellij.util.containers.Stack; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForAnonymousDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java similarity index 97% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForAnonymousDeclaration.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java index 46d62982923..f4cb1380b45 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForAnonymousDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForEnumEntry.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt similarity index 93% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForEnumEntry.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt index d7d353ae368..3651d0d0f70 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForEnumEntry.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiManager import org.jetbrains.jet.lang.resolve.name.FqName @@ -29,4 +29,4 @@ public class KotlinLightClassForEnumEntry( private val enumConstant: PsiEnumConstant ): KotlinLightClassForAnonymousDeclaration(psiManager, fqName, enumEntry), PsiEnumConstantInitializer { override fun getEnumConstant(): PsiEnumConstant = enumConstant -} \ No newline at end of file +} diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java index 69546cb5880..7a9e92e63e0 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.intellij.navigation.ItemPresentation; -import com.intellij.navigation.ItemPresentationProviders; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.NullableLazyValue; @@ -573,7 +571,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC @Override public PsiClass invoke(PsiClass aClass) { JetClassOrObject declaration = (JetClassOrObject) ClsWrapperStubPsiFactory.getOriginalDeclaration(aClass); - return declaration != null ? KotlinLightClassForExplicitDeclaration.create(myManager, declaration) : null; + return declaration != null ? create(myManager, declaration) : null; } } ) diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java index 9696fbe8446..2854c867299 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,11 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.google.common.collect.Sets; -import com.intellij.navigation.ItemPresentation; -import com.intellij.navigation.ItemPresentationProviders; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightElement.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt similarity index 90% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightElement.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt index afcb2fe41db..3675e8c524d 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightElement.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import org.jetbrains.jet.lang.psi.JetDeclaration import com.intellij.psi.PsiElement @@ -22,4 +22,4 @@ import com.intellij.psi.PsiElement public trait KotlinLightElement { public val origin: T? public val delegate: D -} \ No newline at end of file +} diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightEnumConstant.kt similarity index 96% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightEnumConstant.kt index d2ff438d3df..0f1d29ba664 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightEnumConstant.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightEnumConstant.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.* import org.jetbrains.jet.lang.psi.JetEnumEntry diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightField.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightField.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java index da398e97ba2..9168fea0b64 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightField.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.lang.Language; import com.intellij.lang.java.JavaLanguage; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightFieldForDeclaration.kt similarity index 93% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightFieldForDeclaration.kt index b093d0d04da..caa58eb9a78 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightFieldForDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightFieldForDeclaration.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.* import org.jetbrains.jet.lang.psi.JetDeclaration diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt similarity index 90% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt index 2d3e346849e..0ae6bc491af 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethod.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiMethod import org.jetbrains.jet.lang.psi.JetDeclaration diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt similarity index 93% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt index 9711b488064..1015b3b228e 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.impl.light.LightMethod import com.intellij.psi.* @@ -25,11 +25,7 @@ import com.intellij.psi.util.CachedValuesManager import com.intellij.psi.util.PsiModificationTracker import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.util.CachedValue -import org.jetbrains.jet.lang.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.psi.JetProperty import org.jetbrains.jet.lang.psi.JetClassOrObject -import com.intellij.psi.impl.light.LightTypeParameterListBuilder import com.intellij.psi.search.SearchScope import com.intellij.lang.Language import com.intellij.psi.scope.PsiScopeProcessor @@ -48,7 +44,7 @@ open public class KotlinLightMethodForDeclaration( cacheManager.createCachedValue({ val parameterBuilder = LightParameterListBuilder(getManager(), JetLanguage.INSTANCE, this) - for ((index, parameter) in delegate.getParameterList().getParameters().withIndices()) { + for ((index, parameter) in delegate.getParameterList().getParameters().withIndex()) { parameterBuilder.addParameter(KotlinLightParameter(parameter, index, this)) } diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForTraitFakeOverride.kt similarity index 62% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForTraitFakeOverride.kt index bc346fc1d41..6516c2701dc 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightMethodForTraitFakeOverride.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForTraitFakeOverride.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,23 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiManager import com.intellij.psi.PsiMethod import org.jetbrains.jet.lang.psi.JetDeclaration import com.intellij.psi.PsiClass -import org.jetbrains.jet.asJava.KotlinLightMethodForTraitFakeOverride import com.intellij.psi.PsiElement - -public class KotlinLightMethodForTraitFakeOverride(manager: PsiManager, - override val delegate: PsiMethod, - override val origin: JetDeclaration, - containingClass: PsiClass) : - KotlinLightMethodForDeclaration(manager, delegate, origin, containingClass) { - +public class KotlinLightMethodForTraitFakeOverride( + manager: PsiManager, + override val delegate: PsiMethod, + override val origin: JetDeclaration, + containingClass: PsiClass +) : KotlinLightMethodForDeclaration(manager, delegate, origin, containingClass) { override fun copy(): PsiElement { return KotlinLightMethodForTraitFakeOverride(getManager()!!, delegate, origin.copy() as JetDeclaration, getContainingClass()!!) } -} \ No newline at end of file +} diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightModifierList.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java similarity index 95% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightModifierList.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java index f44cbc46820..e266fd56f09 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightModifierList.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiAnnotationOwner; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java similarity index 97% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightParameter.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java index ac3ebbb0660..7d7d9566dbc 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.lang.Language; import com.intellij.psi.PsiAnnotationOwner; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java index 22f2d8bfc94..ddf66ab4d40 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.lang.Language; import com.intellij.psi.*; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameterListBuilder.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt similarity index 93% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameterListBuilder.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt index 6103918bf9c..ddb5203a116 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinLightTypeParameterListBuilder.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiManager import org.jetbrains.jet.plugin.JetLanguage @@ -27,4 +27,4 @@ public class KotlinLightTypeParameterListBuilder(manager: PsiManager): LightType override fun processDeclarations(processor: PsiScopeProcessor, state: ResolveState, lastParent: PsiElement?, place: PsiElement): Boolean { return getTypeParameters().all { processor.execute(it, state) } } -} \ No newline at end of file +} diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java index 0a2affce14f..94ef252ce62 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.lang.Language; import com.intellij.navigation.ItemPresentation; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassConstructionContext.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java similarity index 94% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassConstructionContext.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java index f3c866f6bb0..77c9a329f1f 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassConstructionContext.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java similarity index 97% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java index 7f8afdea152..2fc9008b4be 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassGenerationSupport.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt similarity index 96% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt index 2f8e7270534..d45d6952b05 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassStubWithData.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.impl.java.stubs.PsiJavaFileStub import org.jetbrains.jet.lang.descriptors.ClassDescriptor @@ -53,4 +53,4 @@ data class OutermostKotlinClassLightClassData( override val classOrObject: JetClassOrObject, override val descriptor: ClassDescriptor?, val allInnerClasses: Map -): LightClassDataForKotlinClass, WithFileStubAndExtraDiagnostics \ No newline at end of file +): LightClassDataForKotlinClass, WithFileStubAndExtraDiagnostics diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java similarity index 99% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassUtil.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java index 300e9d169b0..85569ac97d8 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightClassUtil.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameter.java similarity index 96% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameter.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameter.java index e8f21c4c8b7..640bd1b394b 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.lang.Language; import com.intellij.psi.*; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameterListBuilder.java similarity index 95% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameterListBuilder.java index 0a1e4ae71e6..3558d124eed 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightParameterListBuilder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameterListBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.lang.Language; import com.intellij.psi.*; @@ -47,7 +47,7 @@ public class LightParameterListBuilder extends LightElement implements PsiParame @Override public String toString() { - return "Light parameter lsit"; + return "Light parameter list"; } @NotNull diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightVariableBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightVariableBuilder.java similarity index 95% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/LightVariableBuilder.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightVariableBuilder.java index 665efedb222..bff770bf9e1 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/LightVariableBuilder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightVariableBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.lang.Language; import com.intellij.navigation.NavigationItem; @@ -102,7 +102,7 @@ public class LightVariableBuilder extends LightElement implements PsiVariable, N @Override public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException { - throw new UnsupportedOperationException("setName is not implemented yet in org.jetbrains.jet.asJava.light.LightVariableBuilder"); + throw new UnsupportedOperationException("setName is not implemented yet in org.jetbrains.kotlin.asJava.light.LightVariableBuilder"); } @Override diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/StubClassBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/StubClassBuilder.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java index f93c5f5cd6a..b2d050a055b 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/StubClassBuilder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiElement; import com.intellij.psi.impl.compiled.InnerClassSourceStrategy; @@ -24,14 +24,14 @@ import com.intellij.psi.stubs.StubElement; import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; -import org.jetbrains.org.objectweb.asm.ClassVisitor; -import org.jetbrains.org.objectweb.asm.FieldVisitor; -import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.jet.codegen.AbstractClassBuilder; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.org.objectweb.asm.ClassVisitor; +import org.jetbrains.org.objectweb.asm.FieldVisitor; +import org.jetbrains.org.objectweb.asm.MethodVisitor; import java.util.List; diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt index c3b0e471105..bafd964becf 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics diff --git a/compiler/light-classes/src/org/jetbrains/jet/asJava/lightClassUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt similarity index 98% rename from compiler/light-classes/src/org/jetbrains/jet/asJava/lightClassUtils.kt rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt index feac9f0c731..d2f068d4619 100644 --- a/compiler/light-classes/src/org/jetbrains/jet/asJava/lightClassUtils.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava +package org.jetbrains.kotlin.asJava import com.intellij.psi.* import org.jetbrains.jet.lang.psi.* @@ -100,4 +100,4 @@ public val PsiElement.unwrapped: PsiElement? get() = if (this is KotlinLightElement<*, *>) origin else this public val PsiElement.namedUnwrappedElement: PsiNamedElement? - get() = unwrapped?.getNonStrictParentOfType() \ No newline at end of file + get() = unwrapped?.getNonStrictParentOfType() diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java index ef4d49a6a00..34433906a12 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java @@ -32,7 +32,6 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.AsJavaPackage; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.jet.lang.psi.JetDeclaration; @@ -40,6 +39,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.types.Flexibility; +import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.junit.Assert; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/asJava/AbstractKotlinLightClassTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/asJava/AbstractKotlinLightClassTest.java rename to compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java index 29334c257ff..7fa08ea9624 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/AbstractKotlinLightClassTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; diff --git a/compiler/tests/org/jetbrains/jet/asJava/JavaElementFinderTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/JavaElementFinderTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/asJava/JavaElementFinderTest.java rename to compiler/tests/org/jetbrains/kotlin/asJava/JavaElementFinderTest.java index 7629154443f..66ef2c0cd0a 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/JavaElementFinderTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/JavaElementFinderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinAsJavaTestBase.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/asJava/KotlinAsJavaTestBase.java rename to compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java index 05a4cda75db..63802907511 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/KotlinAsJavaTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java rename to compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java index b34f83dd04c..0182d08a374 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassCoherenceTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.google.common.collect.Lists; import com.intellij.openapi.util.Comparing; diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassStructureTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassStructureTest.java rename to compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java index 23e9d310462..85329457b07 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassStructureTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -32,8 +32,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.asJava.KotlinLightClassStructureTest.ClassProperty.*; import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY; +import static org.jetbrains.kotlin.asJava.KotlinLightClassStructureTest.ClassProperty.*; @SuppressWarnings("JUnitTestClassNamingConvention") public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase { diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java index 3d4d755333e..24e07a4be82 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/jet/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/asJava/LightClassAnnotationsTest.java rename to compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java index db72c3b0511..809179efcb9 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/LightClassAnnotationsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiClass; diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 83553a4a9f6..71bd31cbe8d 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -111,7 +111,7 @@ import org.jetbrains.jet.cfg.AbstractPseudoValueTest import org.jetbrains.jet.plugin.structureView.AbstractKotlinFileStructureTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest -import org.jetbrains.jet.asJava.AbstractKotlinLightClassTest +import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest import org.jetbrains.jet.lang.resolve.java.AbstractJavaTypeSubstitutorTest import org.jetbrains.jet.plugin.intentions.declarations.AbstractJoinLinesTest import org.jetbrains.jet.codegen.AbstractScriptCodegenTest diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java index 48ce139afda..63b0b43a4e1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java @@ -28,11 +28,11 @@ import com.intellij.util.PlatformIcons; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.KotlinLightClassForExplicitDeclaration; -import org.jetbrains.jet.asJava.KotlinLightClassForPackage; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration; +import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import javax.swing.*; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt index 90bc77139af..5e222cfcd1b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt @@ -57,7 +57,7 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec val fqNames = packageClasses.get(name) if (!fqNames.isEmpty()) { for (fqName in fqNames) { - val psiClass = org.jetbrains.jet.asJava.JavaElementFinder.getInstance(project).findClass(fqName.asString(), scope) + val psiClass = org.jetbrains.kotlin.asJava.JavaElementFinder.getInstance(project).findClass(fqName.asString(), scope) if (psiClass != null) { result.add(psiClass) } @@ -74,7 +74,7 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec val fqName = classOrObject.getFqName() if (fqName != null) { assert(fqName.shortName().asString() == name) { "A declaration obtained from index has non-matching name:\n" + "in index: " + name + "\n" + "declared: " + fqName.shortName() + "(" + fqName + ")" } - val psiClass = org.jetbrains.jet.asJava.JavaElementFinder.getInstance(project).findClass(fqName.asString(), scope) + val psiClass = org.jetbrains.kotlin.asJava.JavaElementFinder.getInstance(project).findClass(fqName.asString(), scope) if (psiClass != null) { result.add(psiClass) } @@ -115,4 +115,4 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec override fun getAllFieldNames(set: HashSet) { } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index 351708222b0..07403bee09e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -38,7 +38,6 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.*; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; @@ -58,6 +57,7 @@ import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; import org.jetbrains.jet.plugin.stubindex.JetTopLevelClassByPackageIndex; import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; +import org.jetbrains.kotlin.asJava.*; import java.io.IOException; import java.util.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt index 8f5a07c29d9..5dacac96b5f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.psi.PsiMethod import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.asJava.KotlinLightMethod +import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.jet.lang.resolve.java.resolveMethod import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaConstructorImpl @@ -58,4 +58,4 @@ fun PsiMethod.getJavaMethodDescriptor(): FunctionDescriptor { assert(methodDescriptor != null) { "No descriptor found for " + getText() } return methodDescriptor!! -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt index c9951e44068..d5a55ac78c3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt @@ -16,14 +16,10 @@ package org.jetbrains.jet.plugin.caches.resolve -import org.jetbrains.jet.asJava.KotlinWrappingLightClass +import org.jetbrains.kotlin.asJava.KotlinWrappingLightClass import com.intellij.psi.PsiClass import com.intellij.psi.impl.compiled.ClsClassImpl -import org.jetbrains.jet.plugin.JetLanguage -import org.jetbrains.jet.lang.psi.JetDeclaration import org.jetbrains.jet.lang.psi.JetClassOrObject -import com.intellij.navigation.ItemPresentation -import com.intellij.psi.PsiElement class KotlinLightClassForDecompiledDeclaration( private val clsClass: ClsClassImpl, @@ -40,4 +36,4 @@ class KotlinLightClassForDecompiledDeclaration( override fun getNavigationElement() = origin?.getNavigationElement() ?: super.getNavigationElement() override fun getDelegate() = clsClass -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index 4eab0a5f1af..dfc25124533 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -31,7 +31,7 @@ import org.jetbrains.jet.context.SimpleGlobalContext import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.psi.util.CachedValueProvider -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.resolve.LibrarySourceHacks import org.jetbrains.jet.plugin.project.TargetPlatform import org.jetbrains.jet.plugin.project.ResolveSessionForBodies diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt index 82c3d621449..1792f30611c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt @@ -17,13 +17,13 @@ package org.jetbrains.jet.plugin.caches.resolve import com.intellij.psi.PsiElement -import org.jetbrains.jet.asJava.KotlinLightElement +import org.jetbrains.kotlin.asJava.KotlinLightElement import org.jetbrains.jet.lang.psi.* import com.intellij.openapi.roots.ProjectFileIndex import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.JdkOrderEntry -import org.jetbrains.jet.asJava.FakeLightClassForFileOfPackage -import org.jetbrains.jet.asJava.KotlinLightClassForPackage +import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.roots.ModuleRootManager diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java index 12e0b065c41..278b2ee4d6f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java @@ -36,7 +36,6 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.codegen.binding.PsiCodegenPredictor; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; @@ -63,6 +62,7 @@ import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex; import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertyFqnNameIndex; +import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.di.InjectorForLazyResolve; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java index 3e0d99729d0..6604953b576 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java @@ -22,20 +22,19 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.AsJavaPackage; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetElement; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.TargetPlatform; import org.jetbrains.jet.plugin.project.TargetPlatformDetector; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; +import org.jetbrains.kotlin.asJava.AsJavaPackage; import static org.jetbrains.jet.plugin.caches.resolve.ResolvePackage.getModuleInfo; public class DuplicateJvmSignatureAnnotator implements Annotator { - @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { if (!(element instanceof JetFile) && !(element instanceof JetDeclaration)) return; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt index 363e6dff70d..0f344f4293b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.refactoring.fqName -import org.jetbrains.jet.asJava.namedUnwrappedElement +import org.jetbrains.kotlin.asJava.namedUnwrappedElement import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.psi.PsiPackage @@ -73,4 +73,4 @@ fun JetSimpleNameExpression.changeQualifiedName(fqName: FqName): JetElement { } else -> elementToReplace.replace(psiFactory.createExpression(text)) } as JetElement -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index bcbddc79c37..ac85dc7cac0 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -36,7 +36,6 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; @@ -50,6 +49,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.di.InjectorForLazyTopDownAnalyzerBasic; import java.io.File; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt index 45b04d4fa82..08bb3f887d9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.references import com.intellij.psi.PsiReference import com.intellij.psi.PsiElement -import org.jetbrains.jet.asJava.unwrapped +import org.jetbrains.kotlin.asJava.unwrapped import com.intellij.psi.PsiMethod import org.jetbrains.jet.lang.psi.JetPropertyAccessor import org.jetbrains.jet.lang.psi.JetProperty @@ -31,7 +31,6 @@ import org.jetbrains.jet.lang.psi.JetObjectDeclaration import org.jetbrains.jet.lang.psi.JetClass import com.intellij.psi.PsiPolyVariantReference import org.jetbrains.jet.utils.emptyOrSingletonList -import org.jetbrains.jet.lang.psi.psiUtil.getParentOfType import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType @@ -76,4 +75,4 @@ fun AbstractJetReference.renameImplicitConventionalCall(newNa val expr = OperatorToFunctionIntention.convert(expression) as JetQualifiedExpression val newCallee = (expr.getSelectorExpression() as JetCallExpression).getCalleeExpression()!!.getReference()!!.handleElementRename(newName) return newCallee.getStrictParentOfType() as JetExpression -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java index 3ab2225abc4..563b191c8d5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java @@ -25,12 +25,12 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.AsJavaPackage; -import org.jetbrains.jet.asJava.KotlinLightMethod; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.search.usagesSearch.*; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; +import org.jetbrains.kotlin.asJava.AsJavaPackage; +import org.jetbrains.kotlin.asJava.KotlinLightMethod; +import org.jetbrains.kotlin.asJava.LightClassUtil; public class KotlinReferencesSearcher extends QueryExecutorBase { public static void processJetClassOrObject( diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt index 34dfc233562..35d2c1daef8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt @@ -26,10 +26,10 @@ import java.util.Collections import java.util.ArrayList import org.jetbrains.jet.lang.psi.JetNamedDeclaration import com.intellij.psi.PsiNamedElement -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.psi.JetParameter import org.jetbrains.jet.lang.psi.JetPsiUtil -import org.jetbrains.jet.asJava.LightClassUtil.PropertyAccessorsPsiMethods +import org.jetbrains.kotlin.asJava.LightClassUtil.PropertyAccessorsPsiMethods import org.jetbrains.jet.lang.psi.psiUtil.* import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lexer.JetSingleValueToken diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt index d4ac11224e7..17306f45932 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.psi.PsiReference import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.codegen.PropertyCodegen -import org.jetbrains.jet.asJava.KotlinLightMethod +import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.jet.lang.resolve.OverrideResolver import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.references.* @@ -150,4 +150,4 @@ fun PsiReference.isPropertyReadOnlyUsage(): Boolean { } return false -} \ No newline at end of file +} diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 3c9da1c04cc..2f3f81f1757 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -157,7 +157,7 @@ - - + @@ -402,7 +402,7 @@ language="jet" implementationClass="org.jetbrains.jet.plugin.hierarchy.overrides.KotlinOverrideHierarchyProvider" /> - + @@ -430,7 +430,7 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/JetGotoTargetRenderProvider.java b/idea/src/org/jetbrains/jet/plugin/JetGotoTargetRenderProvider.java index 71466a7fb13..e4f1b44e463 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetGotoTargetRenderProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetGotoTargetRenderProvider.java @@ -21,8 +21,8 @@ import com.intellij.codeInsight.navigation.GotoTargetRendererProvider; import com.intellij.ide.util.PsiElementListCellRenderer; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.KotlinLightClass; import org.jetbrains.jet.plugin.presentation.JetLightClassListCellRenderer; +import org.jetbrains.kotlin.asJava.KotlinLightClass; public class JetGotoTargetRenderProvider implements GotoTargetRendererProvider { @Nullable diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 8aafd2c5488..3576bf9ef49 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -25,7 +25,6 @@ import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.KotlinLightMethod; import org.jetbrains.jet.kdoc.lexer.KDocTokens; import org.jetbrains.jet.kdoc.psi.api.KDoc; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; @@ -35,6 +34,7 @@ import org.jetbrains.jet.lang.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.asJava.KotlinLightMethod; public class JetQuickDocumentationProvider extends AbstractDocumentationProvider { private static final Predicate SKIP_WHITESPACE_AND_EMPTY_PACKAGE = new Predicate() { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt index 506593d7f6d..b8052ba94d7 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.completion import com.intellij.codeInsight.completion.* -import org.jetbrains.jet.asJava.KotlinLightClass +import org.jetbrains.kotlin.asJava.KotlinLightClass import org.jetbrains.jet.lang.descriptors.ClassKind import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt index 15ceed4d0d3..32705691958 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt @@ -29,7 +29,7 @@ import org.jetbrains.jet.plugin.JetDescriptorIconProvider import org.jetbrains.jet.plugin.completion.handlers.* import org.jetbrains.jet.renderer.DescriptorRenderer import com.intellij.psi.PsiClass -import org.jetbrains.jet.asJava.KotlinLightClass +import org.jetbrains.kotlin.asJava.KotlinLightClass import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.jet.lang.types.JetType @@ -264,8 +264,8 @@ public class LookupElementFactory( return when (descriptor) { is FunctionDescriptor -> { val parameters = descriptor.getValueParameters() - when (parameters.size) { - 0 -> KotlinFunctionInsertHandler.NO_PARAMETERS_HANDLER + when (parameters.size()) { + 0 -> KotlinFunctionInsertHandler.NO_PARAMETERS_HANDLER 1 -> { val parameterType = parameters.single().getType() diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt index 47f65144dd0..f135178b174 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -43,12 +43,12 @@ import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.ClassInheritorsSearch -import org.jetbrains.jet.asJava.KotlinLightClass +import org.jetbrains.kotlin.asJava.KotlinLightClass import org.jetbrains.jet.lang.types.TypeProjection import org.jetbrains.jet.utils.addIfNotNull import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.psi.JetClassOrObject import org.jetbrains.jet.lang.resolve.PossiblyBareType import org.jetbrains.jet.lang.types.JetTypeImpl @@ -176,9 +176,9 @@ class TypeInstantiationItems( val startOffset = context.getStartOffset() val text = "object: $typeText$constructorParenthesis {}" editor.getDocument().replaceString(startOffset, context.getTailOffset(), text) - editor.getCaretModel().moveToOffset(startOffset + text.length - 1) + editor.getCaretModel().moveToOffset(startOffset + text.length() - 1) - shortenReferences(context, startOffset, startOffset + text.length) + shortenReferences(context, startOffset, startOffset + text.length()) ImplementMethodsHandler().invoke(context.getProject(), editor, context.getFile(), true) } @@ -187,13 +187,13 @@ class TypeInstantiationItems( } else { //TODO: when constructor has one parameter of lambda type with more than one parameter, generate special additional item - signatureText = when (visibleConstructors.size) { + signatureText = when (visibleConstructors.size()) { 0 -> "()" 1 -> DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderFunctionParameters(visibleConstructors.single()) else -> "(...)" } - val baseInsertHandler = when (visibleConstructors.size) { + val baseInsertHandler = when (visibleConstructors.size()) { 0 -> KotlinFunctionInsertHandler.NO_PARAMETERS_HANDLER 1 -> LookupElementFactory.getDefaultInsertHandler(visibleConstructors.single()) as KotlinFunctionInsertHandler else -> KotlinFunctionInsertHandler.WITH_PARAMETERS_HANDLER @@ -202,7 +202,7 @@ class TypeInstantiationItems( insertHandler = object : InsertHandler { override fun handleInsert(context: InsertionContext, item: LookupElement) { context.getDocument().replaceString(context.getStartOffset(), context.getTailOffset(), typeText) - context.setTailOffset(context.getStartOffset() + typeText.length) + context.setTailOffset(context.getStartOffset() + typeText.length()) baseInsertHandler.handleInsert(context, item) diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt index 69f76373531..5adbbe40af3 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt @@ -24,7 +24,7 @@ import com.intellij.debugger.actions.MethodSmartStepTarget import com.intellij.util.containers.OrderedSet import com.intellij.util.Range import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.psi.* @@ -224,4 +224,4 @@ public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() { needBreakpointRequest: Boolean, lines: Range ): MethodSmartStepTarget(psiMethod, label, highlightElement, needBreakpointRequest, lines) -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt index 1c2391b53ad..bc40b7e358d 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -29,7 +29,7 @@ import org.jetbrains.jet.plugin.debugger.KotlinEditorTextProvider import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.jet.lang.psi.JetExpression import org.jetbrains.jet.lang.psi.JetBlockCodeFragment -import org.jetbrains.jet.asJava.KotlinLightClass +import org.jetbrains.kotlin.asJava.KotlinLightClass import com.intellij.debugger.DebuggerManagerEx import org.jetbrains.jet.lang.psi.JetCodeFragment import org.jetbrains.jet.lang.types.JetType diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt index 1abae476270..17365c5ada9 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt @@ -23,7 +23,7 @@ import com.intellij.psi.PsiNamedElement import com.intellij.refactoring.util.RefactoringDescriptionLocation import com.intellij.usageView.UsageViewLongNameLocation import org.jetbrains.jet.lang.psi.* -import org.jetbrains.jet.asJava.unwrapped +import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.jet.plugin.search.usagesSearch.descriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils import com.intellij.refactoring.util.CommonRefactoringUtil diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java index 41be3fdffa8..3b9d6456a18 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java @@ -26,10 +26,10 @@ import com.intellij.psi.PsiClass; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.StateRestoringCheckBox; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.jet.plugin.JetBundle; -import org.jetbrains.jet.plugin.findUsages.*; +import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; +import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import javax.swing.*; @@ -91,6 +91,7 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog { return findWhatPanel; } + @NotNull @Override protected KotlinClassFindUsagesOptions getFindUsagesOptions() { return (KotlinClassFindUsagesOptions) super.getFindUsagesOptions(); diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt index 3d646543e8e..ae9238c4206 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt @@ -25,7 +25,7 @@ import com.intellij.psi.search.PsiElementProcessor import com.intellij.psi.search.PsiElementProcessorAdapter import com.intellij.usageView.UsageInfo import com.intellij.util.Processor -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.psi.JetClassOrObject import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions import org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory @@ -37,7 +37,6 @@ import org.jetbrains.jet.plugin.findUsages.toClassHelper import org.jetbrains.jet.plugin.findUsages.toClassDeclarationsHelper import org.jetbrains.jet.plugin.search.usagesSearch.search import org.jetbrains.jet.plugin.util.application.runReadAction -import org.jetbrains.jet.asJava.namedUnwrappedElement import java.util.Collections import com.intellij.find.findUsages.JavaFindUsagesHandler import com.intellij.find.findUsages.JavaFindUsagesHandlerFactory diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java index f1a04e67be3..10d10cb7334 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java @@ -30,7 +30,6 @@ import com.intellij.usageView.UsageInfo; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.JetNamedDeclaration; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.psi.JetParameter; @@ -43,6 +42,7 @@ import org.jetbrains.jet.plugin.search.declarationsSearch.HierarchySearchRequest import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearch; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchHelper; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchRequest; +import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.Collection; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java index 81a5df3d7bb..d94b5c0747a 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java @@ -29,9 +29,9 @@ import com.intellij.util.containers.HashMap; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.Map; @@ -161,4 +161,4 @@ public abstract class KotlinCallTreeStructure extends HierarchyTreeStructure { public boolean isAlwaysShowPlus() { return true; } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java index 99c7fdcce62..28a5f45c4c3 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java @@ -25,9 +25,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.KotlinLightMethod; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.asJava.KotlinLightMethod; import java.util.ArrayList; import java.util.HashMap; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index 729e7c9eecd..83225edfab0 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java @@ -34,16 +34,13 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.LightClassUtil; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; -import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; import org.jetbrains.jet.plugin.references.JetReference; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchPackage; +import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.Collections; import java.util.HashSet; @@ -231,4 +228,4 @@ public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure { } }; } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt index 42449916933..e1b71dc3f80 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt @@ -24,12 +24,12 @@ import com.intellij.openapi.project.Project import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils import org.jetbrains.jet.plugin.JetBundle import com.intellij.ide.hierarchy.method.MethodHierarchyBrowser -import org.jetbrains.jet.asJava.getRepresentativeLightMethod +import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod import com.intellij.psi.PsiMethod import com.intellij.psi.ElementDescriptionUtil import com.intellij.refactoring.util.RefactoringDescriptionLocation import org.jetbrains.jet.lang.psi.JetDeclaration -import org.jetbrains.jet.asJava.unwrapped +import org.jetbrains.kotlin.asJava.unwrapped class KotlinOverrideHierarchyBrowser( project: Project, baseElement: PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt index 3367280ff62..73872a6309b 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt @@ -23,14 +23,14 @@ import com.intellij.psi.PsiElement import com.intellij.ide.hierarchy.method.MethodHierarchyNodeDescriptor import com.intellij.ide.hierarchy.method.MethodHierarchyTreeStructure import com.intellij.util.ArrayUtil -import org.jetbrains.jet.asJava.toLightMethods +import org.jetbrains.kotlin.asJava.toLightMethods import com.intellij.util.containers.ContainerUtil class KotlinOverrideTreeStructure(project: Project, val element: PsiElement) : HierarchyTreeStructure(project, null) { val javaTreeStructures = element.toLightMethods().map { method -> MethodHierarchyTreeStructure(project, method) }; { - setBaseElement(javaTreeStructures.first!!.getBaseDescriptor()!!) + setBaseElement(javaTreeStructures.first().getBaseDescriptor()!!) } override fun buildChildren(descriptor: HierarchyNodeDescriptor): Array { @@ -43,4 +43,4 @@ class KotlinOverrideTreeStructure(project: Project, val element: PsiElement) : H .map (::buildChildrenByTreeStructure) .reduce { (a, b) -> ContainerUtil.union(a.toSet(), b.toSet()).copyToArray() } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index aed7ec4e225..161da8b41e5 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -35,17 +35,17 @@ import com.intellij.util.NullableFunction; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.descriptors.Modality; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lexer.JetTokens; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.highlighter.markers.MarkersPackage; import org.jetbrains.jet.plugin.highlighter.markers.ResolveWithParentsResult; import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerNavigationHandler; import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerTooltip; +import org.jetbrains.jet.plugin.util.ProjectRootsUtil; +import org.jetbrains.kotlin.asJava.LightClassUtil; import javax.swing.*; import java.awt.event.MouseEvent; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/JavaPsiUtils.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/JavaPsiUtils.kt index 48d70fcc0aa..b1792b0ae8a 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/JavaPsiUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/JavaPsiUtils.kt @@ -23,7 +23,7 @@ import com.intellij.psi.CommonClassNames import com.intellij.openapi.progress.ProgressManager import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.psi.JetClass -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.psi.JetNamedFunction fun collectContainingClasses(methods: Collection): Set { diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt index 023a161d0ce..df486e40dfd 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenFunctionMarker.kt @@ -41,7 +41,7 @@ import com.intellij.psi.search.searches.AllOverridingMethodsSearch import com.intellij.openapi.util.Pair import java.util.HashSet import com.intellij.util.Processor -import org.jetbrains.jet.asJava.KotlinLightMethodForTraitFakeOverride +import org.jetbrains.kotlin.asJava.KotlinLightMethodForTraitFakeOverride private fun getOverriddenDeclarations(mappingToJava: MutableMap, classes: Set): Set { val overridden = HashSet() @@ -115,7 +115,7 @@ public fun navigateToOverriddenMethod(e: MouseEvent?, method: PsiMethod) { PsiElementListNavigator.openTargets( e, overridingJavaMethods.copyToArray(), - methodsUpdater.getCaption(overridingJavaMethods.size), + methodsUpdater.getCaption(overridingJavaMethods.size()), "Overriding declarations of " + method.getName(), renderer, methodsUpdater) @@ -144,4 +144,4 @@ private class OverridingMethodsUpdater( } }) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt index b072b81f939..6e7f46d8ca6 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/OverridenPropertyMarker.kt @@ -21,7 +21,7 @@ import com.intellij.psi.search.PsiElementProcessor import com.intellij.psi.PsiClass import org.jetbrains.jet.plugin.JetBundle import com.intellij.psi.search.searches.OverridingMethodsSearch -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import com.intellij.psi.PsiMethod import com.intellij.util.AdapterProcessor import com.intellij.util.CommonProcessors diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java index 62174cab01e..75784419c37 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java @@ -18,12 +18,13 @@ package org.jetbrains.jet.plugin.presentation; import com.intellij.ide.util.PsiElementListCellRenderer; import com.intellij.psi.presentation.java.ClassPresentationUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.KotlinLightClass; +import org.jetbrains.kotlin.asJava.KotlinLightClass; public class JetLightClassListCellRenderer extends PsiElementListCellRenderer { @Override - public String getElementText(KotlinLightClass element) { + public String getElementText(@NotNull KotlinLightClass element) { return ClassPresentationUtil.getNameForClass(element, false); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt index 97c0e076a48..849969504cc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt @@ -48,7 +48,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import com.intellij.openapi.module.ModuleUtilCore import org.jetbrains.jet.plugin.util.ProjectRootsUtil -import org.jetbrains.jet.asJava.unwrapped +import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.jet.lang.diagnostics.Errors @@ -67,9 +67,9 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction by CachedValueProperty( { - val fqnames = computeSuggestions(element) - anySuggestionFound = !fqnames.isEmpty() - fqnames + val fqNames = computeSuggestions(element) + anySuggestionFound = !fqNames.isEmpty() + fqNames }, { PsiModificationTracker.SERVICE.getInstance(element.getProject()).getModificationCount() }) @@ -230,4 +230,4 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction expressions = new ArrayList(); + List expressions = new ArrayList(); while (element != null && !(element instanceof JetBlockExpression && !(element.getParent() instanceof JetFunctionLiteral)) && !(element instanceof JetNamedFunction) && !(element instanceof JetClassBody)) { @@ -466,7 +466,7 @@ public class JetRefactoringUtil { list.setCellRenderer(new DefaultListCellRenderer() { @Override - public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { + public Component getListCellRendererComponent(@NotNull JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { Component rendererComponent = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); JetExpression element = (JetExpression) value; if (element.isValid()) { @@ -478,12 +478,12 @@ public class JetRefactoringUtil { list.addListSelectionListener(new ListSelectionListener() { @Override - public void valueChanged(ListSelectionEvent e) { + public void valueChanged(@NotNull ListSelectionEvent e) { highlighter.dropHighlight(); int selectedIndex = list.getSelectedIndex(); if (selectedIndex < 0) return; JetExpression expression = (JetExpression) model.get(selectedIndex); - ArrayList toExtract = new ArrayList(); + List toExtract = new ArrayList(); toExtract.add(expression); highlighter.highlight(expression, toExtract); } @@ -526,12 +526,13 @@ public class JetRefactoringUtil { } public static class IntroduceRefactoringException extends Exception { - private String myMessage; + private final String myMessage; public IntroduceRefactoringException(String message) { myMessage = message; } + @Override public String getMessage() { return myMessage; } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt index 5dd464a67cb..0baf22803ed 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt @@ -17,28 +17,21 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature import com.intellij.lang.Language -import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.PsiModifier import com.intellij.psi.PsiType import com.intellij.refactoring.changeSignature.* import com.intellij.usageView.UsageInfo -import com.intellij.util.Function import com.intellij.util.VisibilityUtil -import com.intellij.util.containers.ContainerUtil -import kotlin.Function1 -import kotlin.Pair -import org.jetbrains.jet.asJava.* +import org.jetbrains.kotlin.asJava.* import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.descriptors.Visibilities import org.jetbrains.jet.lang.descriptors.Visibility import org.jetbrains.jet.lang.psi.JetFunction import org.jetbrains.jet.lang.psi.JetFunctionLiteral import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.TypeSubstitutor import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lexer.JetTokens import org.jetbrains.jet.plugin.JetLanguage @@ -197,7 +190,7 @@ public class JetChangeInfo( else PsiModifier.PACKAGE_LOCAL - val newJavaParameters = newParameters.withIndices().map { pair -> + val newJavaParameters = newParameters.withIndex().map { pair -> val (i, info) = pair val type = if (isPrimaryMethodUpdated) currentPsiMethod.getParameterList().getParameters()[i].getType() @@ -241,7 +234,7 @@ public fun ChangeInfo.toJetChangeInfo(originalChangeSignatureDescriptor: JetMeth //noinspection ConstantConditions val originalParameterDescriptors = originalChangeSignatureDescriptor.baseDescriptor.getValueParameters() - val newParameters = getNewParameters().withIndices().map { pair -> + val newParameters = getNewParameters().withIndex().map { pair -> val (i, info) = pair val oldIndex = info.getOldIndex() val currentType = parameterDescriptors[i].getType() @@ -265,4 +258,4 @@ public fun ChangeInfo.toJetChangeInfo(originalChangeSignatureDescriptor: JetMeth functionDescriptor.getVisibility(), newParameters, method) -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt index e88e3910964..96ec3e8a152 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt @@ -21,8 +21,8 @@ import com.intellij.psi.search.searches.OverridingMethodsSearch import com.intellij.refactoring.changeSignature.MethodDescriptor import com.intellij.refactoring.changeSignature.OverriderUsageInfo import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.asJava.KotlinLightMethod -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.KotlinLightMethod +import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.jet.lang.psi.* diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java index 1acf4b065c7..8206a134605 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java @@ -16,9 +16,8 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.LangDataKeys; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ScrollType; import com.intellij.openapi.project.Project; @@ -34,7 +33,6 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.asJava.AsJavaPackage; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; @@ -47,6 +45,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; +import org.jetbrains.kotlin.asJava.AsJavaPackage; import java.util.Collection; @@ -166,11 +165,11 @@ public class JetChangeSignatureHandler implements ChangeSignatureHandler { } @Override - public void invoke(@NotNull Project project, Editor editor, PsiFile file, DataContext dataContext) { + public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file, DataContext dataContext) { editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE); PsiElement element = findTargetMember(file, editor); if (element == null) { - element = LangDataKeys.PSI_ELEMENT.getData(dataContext); + element = CommonDataKeys.PSI_ELEMENT.getData(dataContext); } PsiElement elementAtCaret = file.findElementAt(editor.getCaretModel().getOffset()); @@ -184,7 +183,7 @@ public class JetChangeSignatureHandler implements ChangeSignatureHandler { @Override public void invoke(@NotNull Project project, @NotNull PsiElement[] elements, @Nullable DataContext dataContext) { if (elements.length != 1) return; - Editor editor = dataContext != null ? PlatformDataKeys.EDITOR.getData(dataContext) : null; + Editor editor = dataContext != null ? CommonDataKeys.EDITOR.getData(dataContext) : null; PsiElement element = AsJavaPackage.getUnwrapped(elements[0]); assert element instanceof JetElement : "This handler must be invoked for elements of JetLanguage : " + element.getText(); diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index bb0747b5566..59bd30fbba3 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -63,14 +63,13 @@ import org.jetbrains.jet.renderer.DescriptorRenderer import com.intellij.openapi.util.text.StringUtil import javax.swing.Icon import org.jetbrains.jet.plugin.util.string.collapseSpaces -import org.jetbrains.jet.asJava.KotlinLightMethod +import org.jetbrains.kotlin.asJava.KotlinLightMethod import com.intellij.psi.PsiMethod import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.OverridingUtil import org.jetbrains.jet.lang.psi.psiUtil.getParentOfType -import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType import com.intellij.psi.PsiPackage import org.jetbrains.jet.plugin.util.ProjectRootsUtil @@ -362,8 +361,8 @@ public fun chooseContainerElementIfNecessary( onSelect: (T) -> Unit ) { when { - containers.empty -> return - containers.size == 1 || ApplicationManager.getApplication()!!.isUnitTestMode() -> onSelect(containers.first()) + containers.isEmpty() -> return + containers.size() == 1 || ApplicationManager.getApplication()!!.isUnitTestMode() -> onSelect(containers.first()) else -> chooseContainerElement(containers, editor, title, highlightSelection, toPsi, onSelect) } } @@ -394,4 +393,4 @@ public fun PsiElement.canRefactor(): Boolean { else -> false } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 773ff8d12bf..4c522170b04 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -41,7 +41,7 @@ import org.jetbrains.jet.plugin.refactoring.createKotlinFile import org.jetbrains.jet.plugin.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.jet.plugin.refactoring.move.getFileNameAfterMove import org.jetbrains.jet.lang.psi.JetNamedDeclaration -import org.jetbrains.jet.asJava.toLightElements +import org.jetbrains.kotlin.asJava.toLightElements import java.util.HashMap import org.jetbrains.jet.utils.flatten import java.util.ArrayList @@ -52,7 +52,7 @@ import com.intellij.refactoring.util.MoveRenameUsageInfo import com.intellij.refactoring.util.TextOccurrencesUtil import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassHandler import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.asJava.namedUnwrappedElement +import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.jet.lang.psi.psiUtil.isPrivate import org.jetbrains.jet.plugin.refactoring.getUsageContext import org.jetbrains.jet.lang.psi.psiUtil.isInsideOf diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt index 69b8d26c747..9704e52669d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt @@ -40,7 +40,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.refactoring.util.MoveRenameUsageInfo import org.jetbrains.jet.plugin.references.JetReference -import org.jetbrains.jet.asJava.namedUnwrappedElement +import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.jet.lang.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.jet.lang.psi.JetImportDirective import java.util.ArrayList @@ -168,7 +168,7 @@ fun createMoveUsageInfo( public fun JetNamedDeclaration.getFileNameAfterMove(): String? { return (getContainingFile() as? JetFile)?.let { file -> - if (file.getDeclarations().size > 1) "${getName()}.${JetFileType.EXTENSION}" else file.getName() + if (file.getDeclarations().size() > 1) "${getName()}.${JetFileType.EXTENSION}" else file.getName() } } @@ -206,7 +206,7 @@ fun postProcessMoveUsages(usages: List, for (usage in sortedUsages) { when (usage) { is NonCodeUsageInfo -> { - nonCodeUsages.add(usage as NonCodeUsageInfo) + nonCodeUsages.add(usage) } is MoveRenameUsageInfoForExtension -> { @@ -237,4 +237,4 @@ fun postProcessMoveUsages(usages: List, } return nonCodeUsages -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java index 2b6e4eb0f87..e571a72367e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameJetClassProcessor.java @@ -20,16 +20,15 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringBundle; -import com.intellij.refactoring.rename.RenamePsiElementProcessor; import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.KotlinLightClass; -import org.jetbrains.jet.asJava.KotlinLightClassForExplicitDeclaration; -import org.jetbrains.jet.asJava.KotlinLightClassForPackage; import org.jetbrains.jet.lang.psi.JetClassOrObject; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JetBundle; +import org.jetbrains.kotlin.asJava.KotlinLightClass; +import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import java.util.Map; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt index f7647e55cda..1ff1aa1210e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt @@ -20,10 +20,10 @@ import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.search.SearchScope -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.jet.lang.psi.JetNamedFunction import com.intellij.refactoring.rename.RenameJavaMethodProcessor -import org.jetbrains.jet.asJava.KotlinLightMethod +import org.jetbrains.kotlin.asJava.KotlinLightMethod import kotlin.properties.Delegates import org.jetbrains.jet.plugin.util.application.runReadAction @@ -47,11 +47,11 @@ public class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() { } // Use java dialog to ask we should rename function with the base element - val subtitudedJavaElement = javaMethodProcessorInstance.substituteElementToRename(wrappedMethod, editor) + val substitutedJavaElement = javaMethodProcessorInstance.substituteElementToRename(wrappedMethod, editor) - return when (subtitudedJavaElement) { - is KotlinLightMethod -> subtitudedJavaElement.origin as? JetNamedFunction - else -> subtitudedJavaElement + return when (substitutedJavaElement) { + is KotlinLightMethod -> substitutedJavaElement.origin as? JetNamedFunction + else -> substitutedJavaElement } } @@ -64,4 +64,4 @@ public class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() { is JetNamedFunction -> runReadAction { LightClassUtil.getLightClassMethod(element) } else -> throw IllegalStateException("Can't be for element $element there because of canProcessElement()") } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt index f831af8d688..bcfcc6f0ac4 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.psi.JetProperty import com.intellij.psi.search.SearchScope import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import com.intellij.psi.search.searches.OverridingMethodsSearch import com.intellij.psi.PsiMethod import com.intellij.psi.SyntheticElement @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.psi.JetClassOrObject import com.intellij.openapi.ui.Messages import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.asJava.namedUnwrappedElement +import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.jet.lang.resolve.OverrideResolver import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.util.application.runReadAction @@ -143,7 +143,7 @@ public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() { OverridingMethodsSearch.search(psiMethod, scope, true).forEach { overrider -> val overriderElement = overrider.namedUnwrappedElement - if (overriderElement != null && !(overriderElement is SyntheticElement)) { + if (overriderElement != null && overriderElement !is SyntheticElement) { RenameProcessor.assertNonCompileElement(overriderElement) val overriderName = overriderElement.getName() @@ -163,8 +163,6 @@ public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() { } } } - - true } } @@ -189,4 +187,4 @@ public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() { return null } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt index da8da848cf7..c25700c366a 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiReference import com.intellij.refactoring.safeDelete.JavaSafeDeleteDelegate import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.asJava.unwrapped +import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.jet.lang.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.references.JetReference @@ -59,7 +59,7 @@ public class KotlinJavaSafeDeleteDelegate : JavaSafeDeleteDelegate { val args = callExpression.getValueArguments() val namedArguments = args.filter { arg -> arg is JetValueArgument && arg.getArgumentName()?.getText() == parameter.getName() } - if (!namedArguments.empty) { + if (!namedArguments.isEmpty()) { usages.add(SafeDeleteValueArgumentListUsageInfo(namedArguments.first as JetValueArgument, parameter)) return } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt index 13a28faf21d..493e2bd8a24 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -32,7 +32,7 @@ import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteOverridingMethodU import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceJavaDeleteUsageInfo import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.asJava.* +import org.jetbrains.kotlin.asJava.* import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.descriptors.Modality import org.jetbrains.jet.lang.psi.* @@ -80,7 +80,7 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { is SafeDeleteOverrideAnnotation -> usageInfo.getSmartPointer().getElement()?.let { usageElement -> - if (usageElement.toLightMethods().all { method -> method.findSuperMethods().size == 0 }) { + if (usageElement.toLightMethods().all { method -> method.findSuperMethods().size() == 0 }) { KotlinSafeDeleteOverrideAnnotation(usageElement, usageInfo.getReferencedElement()) } else null diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt index a23bd4380f1..6fd89b1a03c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/utils.kt @@ -22,10 +22,8 @@ import org.jetbrains.jet.lang.psi.JetModifierListOwner import org.jetbrains.jet.lang.psi.JetProperty import com.intellij.psi.PsiElement import org.jetbrains.jet.lexer.JetTokens -import org.jetbrains.jet.lang.psi.JetPsiUtil import com.intellij.psi.search.searches.OverridingMethodsSearch -import org.jetbrains.jet.asJava.unwrapped -import java.util.ArrayList +import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.jet.lang.psi.JetParameter import org.jetbrains.jet.lang.psi.JetDeclaration import org.jetbrains.jet.lang.psi.JetPropertyAccessor @@ -54,7 +52,7 @@ fun PsiElement.removeOverrideModifier() { (this as JetModifierListOwner).getModifierList()?.getModifier(JetTokens.OVERRIDE_KEYWORD)?.delete() } is PsiMethod -> { - getModifierList().getAnnotations().find { + getModifierList().getAnnotations().firstOrNull { annotation -> annotation.getQualifiedName() == "java.lang.Override" }?.delete() } @@ -69,4 +67,4 @@ fun PsiMethod.cleanUpOverrides() { overridingMethod.unwrapped?.removeOverrideModifier() } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java index e93473f2dad..57a52c64dfd 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java @@ -31,10 +31,11 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; +import org.jetbrains.kotlin.asJava.LightClassUtil; public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer { private JetElement myElement; @@ -143,7 +144,7 @@ public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer } @Override - public int compareTo(Object o) { + public int compareTo(@NotNull Object o) { return 0; } } diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index b89d32ecfbd..ec3a90e81f4 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java @@ -41,9 +41,6 @@ import kotlin.KotlinPackage; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.asJava.KotlinLightClassForExplicitDeclaration; -import org.jetbrains.jet.asJava.KotlinLightClassForPackage; -import org.jetbrains.jet.asJava.KotlinLightMethod; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -52,6 +49,9 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex; +import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; +import org.jetbrains.kotlin.asJava.KotlinLightMethod; import java.util.*; @@ -209,7 +209,7 @@ public class JetRunConfiguration extends ModuleBasedConfiguration.searchInheritors(): Query(PsiMe object PsiMethodOverridingHierarchyTraverser: HierarchyTraverser { override fun nextElements(current: PsiMethod): Iterable = KotlinPsiMethodOverridersSearch.searchDirectOverriders(current) override fun shouldDescend(element: PsiMethod): Boolean = PsiUtil.canBeOverriden(element) -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java index 29bd74bd4f1..30fb1f96150 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java @@ -33,7 +33,6 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Processor; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.psi.JetAnnotationEntry; @@ -44,6 +43,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.stubindex.JetAnnotationsIndex; +import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java index dcfe26c5222..3ac7888bc0e 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java @@ -29,9 +29,9 @@ import com.intellij.util.Processor; import com.intellij.util.QueryExecutor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.KotlinLightMethod; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; +import org.jetbrains.kotlin.asJava.KotlinLightMethod; +import org.jetbrains.kotlin.asJava.LightClassUtil; public class KotlinDefinitionsSearcher implements QueryExecutor { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt index 2cbcf2033c1..fe7b70db371 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt @@ -24,7 +24,7 @@ import com.intellij.psi.search.UsageSearchContext import com.intellij.psi.search.searches.MethodReferencesSearch import com.intellij.util.Processor import org.jetbrains.jet.plugin.JetFileType -import org.jetbrains.jet.asJava.namedUnwrappedElement +import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.jet.lang.psi.JetProperty public class KotlinLightPropertyAccessorsReferenceSearcher() : QueryExecutorBase(true) { @@ -49,7 +49,7 @@ public class KotlinLightPropertyAccessorsReferenceSearcher() : QueryExecutorBase private fun restrictToKotlinSources(originalScope: SearchScope): SearchScope { if (originalScope is GlobalSearchScope) { - return GlobalSearchScope.getScopeRestrictedByFileTypes((originalScope as GlobalSearchScope), JetFileType.INSTANCE) + return GlobalSearchScope.getScopeRestrictedByFileTypes(originalScope as GlobalSearchScope, JetFileType.INSTANCE) } return originalScope } diff --git a/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java b/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java index 0da6fa1ddc7..ed1509dd6ab 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java @@ -19,13 +19,13 @@ package org.jetbrains.jet.plugin.util; import com.intellij.psi.PsiMember; import com.intellij.psi.PsiModifier; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.KotlinLightClassForExplicitDeclaration; -import org.jetbrains.jet.asJava.KotlinLightClassForPackage; import org.jetbrains.jet.lang.psi.JetClassOrObject; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.NamePackage; import org.jetbrains.jet.lexer.JetTokens; +import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; public class JetPsiHeuristicsUtil { private JetPsiHeuristicsUtil() {} diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java index 5c1094183b7..5182c1d3ace 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java @@ -30,15 +30,12 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiElement; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.MockLibraryUtil; -import org.jetbrains.jet.asJava.FakeLightClassForFileOfPackage; -import org.jetbrains.jet.asJava.KotlinLightClassForPackage; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; @@ -46,6 +43,8 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; import org.jetbrains.jet.testing.ConfigLibraryUtil; +import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage; +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import java.io.File; import java.util.ArrayList; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index d6a8bd7b6ff..c0b8b27169b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -31,7 +31,7 @@ import kotlin.test.fail import org.jetbrains.kotlin.util.sure import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.asJava.LightClassUtil +import org.jetbrains.kotlin.asJava.LightClassUtil import kotlin.test.assertTrue import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration @@ -92,4 +92,4 @@ public class NavigateFromLibrarySourcesTest: LightCodeInsightFixtureTestCase() { } } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java index ea87b7e588d..f871a41b58c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java @@ -21,14 +21,14 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.asJava.KotlinLightClass; -import org.jetbrains.jet.asJava.KotlinLightMethod; -import org.jetbrains.jet.asJava.LightClassUtil; import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.asJava.KotlinLightClass; +import org.jetbrains.kotlin.asJava.KotlinLightMethod; +import org.jetbrains.kotlin.asJava.LightClassUtil; public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase { @NotNull diff --git a/idea/tests/org/jetbrains/jet/asJava/FakeLightClassForPackageTest.java b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java similarity index 98% rename from idea/tests/org/jetbrains/jet/asJava/FakeLightClassForPackageTest.java rename to idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java index 9caffff6dbe..edb962c245f 100644 --- a/idea/tests/org/jetbrains/jet/asJava/FakeLightClassForPackageTest.java +++ b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.asJava; +package org.jetbrains.kotlin.asJava; import com.google.common.collect.Sets; import com.intellij.psi.PsiClass; diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt index 4f393f50937..874435880f5 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt @@ -24,7 +24,7 @@ import com.intellij.psi.CommonClassNames.* import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.jet.lang.types.lang.PrimitiveType import org.jetbrains.kotlin.j2k.* -import org.jetbrains.jet.asJava.KotlinLightMethod +import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.jet.lang.psi.JetProperty import org.jetbrains.jet.lang.psi.JetFunction import org.jetbrains.jet.lang.psi.JetClassOrObject @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.psi.JetParameter import org.jetbrains.jet.lang.psi.JetNamedDeclaration import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.asJava.KotlinLightField +import org.jetbrains.kotlin.asJava.KotlinLightField import org.jetbrains.jet.lang.psi.JetObjectDeclaration import org.jetbrains.jet.lang.psi.psiUtil.getStrictParentOfType diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt index 481e177268a..58b6fb852e1 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.j2k.ast.Identifier import java.util.HashMap import org.jetbrains.kotlin.j2k.ast.Mutability import java.util.HashSet -import org.jetbrains.jet.asJava.KotlinLightElement +import org.jetbrains.kotlin.asJava.KotlinLightElement import org.jetbrains.jet.lang.psi.JetCallableDeclaration import org.jetbrains.jet.lang.types.TypeUtils import org.jetbrains.jet.lang.resolve.DescriptorUtils diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt index 3569e66e7ee..236479ffdc7 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiImportList import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap import com.intellij.psi.PsiJavaCodeReferenceElement -import org.jetbrains.jet.asJava.KotlinLightClassForPackage +import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage class Import(val name: String) : Element() { override fun generateCode(builder: CodeBuilder) {