Rename package jet -> kotlin in light-classes

org.jetbrains.jet.asJava -> org.jetbrains.kotlin.asJava Also fix some minor warnings and deprecated API usage
2015-01-06 04:44:52 +03:00
parent 98faeb8647
commit 2e0fab3f98
113 changed files with 278 additions and 314 deletions
@@ -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.<PsiClass>emptyOrSingletonList(KotlinLightClassForPackage.create(psiManager, packageFqName, scope, filesInPackage));
    }

@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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
@@ -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<T extends WithFileStubAndExtraDiagnostic
        GenerationState.GenerateClassFilter getGenerateClassFilter();
        void generate(@NotNull GenerationState state, @NotNull Collection<JetFile> files);
    }
-}
+}
@@ -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;
@@ -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;
@@ -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;
@@ -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
-}
+}
@@ -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;
                            }
                        }
                )
@@ -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;
@@ -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<T : JetDeclaration, D : PsiElement> {
    public val origin: T?
    public val delegate: D
-}
+}
@@ -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
@@ -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;
@@ -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
@@ -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
@@ -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<PsiParameterList>({
            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))
            }

@@ -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()!!)
    }
-}
+}
@@ -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;
@@ -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;
@@ -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.*;
@@ -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) }
    }
-}
+}
@@ -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;
@@ -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;
@@ -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;
@@ -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<JetClassOrObject, InnerKotlinClassLightClassData>
-): LightClassDataForKotlinClass, WithFileStubAndExtraDiagnostics
+): LightClassDataForKotlinClass, WithFileStubAndExtraDiagnostics
@@ -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;
@@ -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.*;
@@ -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
@@ -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
@@ -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;

@@ -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
@@ -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<PsiNamedElement>()
+    get() = unwrapped?.getNonStrictParentOfType<PsiNamedElement>()
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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
@@ -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;
@@ -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<String>) {
    }
-}
+}
@@ -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.*;
@@ -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!!
-}
+}
@@ -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
-}
+}
@@ -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
@@ -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
@@ -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;
@@ -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;
@@ -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
-}
+}
@@ -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;
@@ -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<out JetExpression>.renameImplicitConventionalCall(newNa
    val expr = OperatorToFunctionIntention.convert(expression) as JetQualifiedExpression
    val newCallee = (expr.getSelectorExpression() as JetCallExpression).getCalleeExpression()!!.getReference()!!.handleElementRename(newName)
    return newCallee.getStrictParentOfType<JetQualifiedExpression>() as JetExpression
-}
+}
@@ -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<PsiReference, ReferencesSearch.SearchParameters> {
    public static void processJetClassOrObject(
@@ -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
@@ -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
-}
+}
@@ -157,7 +157,7 @@
    <projectService serviceInterface="org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory"
                    serviceImplementation="org.jetbrains.jet.plugin.vfilefinder.IDEVirtualFileFinderFactory"/>

-    <projectService serviceInterface="org.jetbrains.jet.asJava.LightClassGenerationSupport"
+    <projectService serviceInterface="org.jetbrains.kotlin.asJava.LightClassGenerationSupport"
                    serviceImplementation="org.jetbrains.jet.plugin.caches.resolve.IDELightClassGenerationSupport"/>

    <projectService serviceInterface="org.jetbrains.jet.lang.resolve.CodeAnalyzerInitializer"
@@ -183,8 +183,8 @@

    <projectService serviceImplementation="org.jetbrains.jet.plugin.compiler.configuration.KotlinCompilerWorkspaceSettings"/>

-    <projectService serviceInterface="org.jetbrains.jet.asJava.KotlinLightClassForPackage$FileStubCache"
-                    serviceImplementation="org.jetbrains.jet.asJava.KotlinLightClassForPackage$FileStubCache"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.asJava.KotlinLightClassForPackage$FileStubCache"
+                    serviceImplementation="org.jetbrains.kotlin.asJava.KotlinLightClassForPackage$FileStubCache"/>

    <projectService serviceInterface="org.jetbrains.jet.plugin.debugger.evaluate.KotlinEvaluateExpressionCache"
                    serviceImplementation="org.jetbrains.jet.plugin.debugger.evaluate.KotlinEvaluateExpressionCache"/>
@@ -402,7 +402,7 @@
        language="jet"
        implementationClass="org.jetbrains.jet.plugin.hierarchy.overrides.KotlinOverrideHierarchyProvider" />

-    <java.elementFinder implementation="org.jetbrains.jet.asJava.JavaElementFinder"/>
+    <java.elementFinder implementation="org.jetbrains.kotlin.asJava.JavaElementFinder"/>
    <java.shortNamesCache implementation="org.jetbrains.jet.plugin.caches.JetShortNamesCache"/>

    <stubElementTypeHolder class="org.jetbrains.jet.lang.psi.stubs.elements.JetStubElementTypes"/>
@@ -430,7 +430,7 @@
    <editorNotificationProvider implementation="org.jetbrains.jet.plugin.versions.UnsupportedAbiVersionNotificationPanelProvider"/>
    <editorNotificationProvider implementation="org.jetbrains.jet.plugin.highlighter.ErrorDuringFileAnalyzeNotificationProvider"/>

-    <psi.treeChangePreprocessor implementation="org.jetbrains.jet.asJava.KotlinCodeBlockModificationListener"/>
+    <psi.treeChangePreprocessor implementation="org.jetbrains.kotlin.asJava.KotlinCodeBlockModificationListener"/>

    <referencesSearch implementation="org.jetbrains.jet.plugin.search.ideaExtensions.KotlinReferencesSearcher"/>
    <directClassInheritorsSearch implementation="org.jetbrains.jet.plugin.search.ideaExtensions.KotlinDirectInheritorsSearcher"/>
@@ -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
@@ -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<PsiElement> SKIP_WHITESPACE_AND_EMPTY_PACKAGE = new Predicate<PsiElement>() {
@@ -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
@@ -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()
@@ -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<LookupElement> {
                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)

@@ -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<Int>
    ): MethodSmartStepTarget(psiMethod, label, highlightElement, needBreakpointRequest, lines)
-}
+}
@@ -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
@@ -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
@@ -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();
@@ -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
@@ -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;
@@ -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;
    }
-}
+}
@@ -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;
@@ -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 {
            }
        };
    }
-}
+}
@@ -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
@@ -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<Any> {
@@ -43,4 +43,4 @@ class KotlinOverrideTreeStructure(project: Project, val element: PsiElement) : H
                .map (::buildChildrenByTreeStructure)
                .reduce { (a, b) -> ContainerUtil.union(a.toSet(), b.toSet()).copyToArray() }
    }
-}
+}
@@ -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;
@@ -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<PsiMethod>): Set<PsiClass> {
@@ -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 <T> getOverriddenDeclarations(mappingToJava: MutableMap<PsiMethod, T>, classes: Set<PsiClass>): Set<T> {
    val overridden = HashSet<T>()
@@ -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(
            }
        })
    }
-}
+}
@@ -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
@@ -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<KotlinLightClass> {
    @Override
-    public String getElementText(KotlinLightClass element) {
+    public String getElementText(@NotNull KotlinLightClass element) {
        return ClassPresentationUtil.getNameForClass(element, false);
    }

@@ -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<Jet

    private val suggestions: Collection<FqName> 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<Jet
            }
        }
    }
-}
+}
@@ -37,8 +37,6 @@ import com.intellij.util.containers.ContainerUtil;
 import jet.runtime.typeinfo.KotlinSignature;
 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.lang.descriptors.*;
 import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor;
 import org.jetbrains.jet.lang.psi.*;
@@ -57,6 +55,8 @@ import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
 import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers;
 import org.jetbrains.jet.plugin.util.string.StringPackage;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
+import org.jetbrains.kotlin.asJava.AsJavaPackage;
+import org.jetbrains.kotlin.asJava.KotlinLightMethod;

 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
@@ -396,7 +396,7 @@ public class JetRefactoringUtil {
            return getSmartSelectSuggestions(file, offset - 1);
        }

-        ArrayList<JetExpression> expressions = new ArrayList<JetExpression>();
+        List<JetExpression> expressions = new ArrayList<JetExpression>();
        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<PsiElement> toExtract = new ArrayList<PsiElement>();
+                List<PsiElement> toExtract = new ArrayList<PsiElement>();
                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;
        }
@@ -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)
-}
+}
@@ -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.*
@@ -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();
@@ -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<T>(
        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
    }
-}
+}
@@ -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
@@ -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<UsageInfo>,
    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<UsageInfo>,
    }

    return nonCodeUsages
-}
+}
@@ -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;

@@ -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()")
    }
-}
+}
@@ -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
    }
-}
+}
@@ -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
        }
@@ -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
@@ -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()
        }
    }
-}
+}
@@ -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;
    }
 }
@@ -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<RunConfigurati
        return state;
    }

-    private class MyJavaCommandLineState extends JavaCommandLineState {
+    private static class MyJavaCommandLineState extends JavaCommandLineState {

        private final JetRunConfiguration myConfiguration;

@@ -32,9 +32,9 @@ import com.theoryinpractice.testng.configuration.TestNGConfiguration;
 import com.theoryinpractice.testng.configuration.TestNGConfigurationProducer;
 import com.theoryinpractice.testng.util.TestNGUtil;
 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 JetTestNgConfigurationProducer extends TestNGConfigurationProducer {
    @Override
--- a/Show More
+++ b/Show More