Rename org.jetbrains.kotlin.plugin -> org.jetbrains.kotlin.idea

compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java

@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.codegen.CodegenTestFiles;
 import org.jetbrains.kotlin.codegen.GenerationUtils;
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil;
-import org.jetbrains.kotlin.plugin.JetFileType;
+import org.jetbrains.kotlin.idea.JetFileType;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.test.ConfigurationKind;
 import org.jetbrains.kotlin.test.JetTestUtils;

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java

@@ -50,9 +50,9 @@ import org.jetbrains.kotlin.codegen.GeneratedClassLoader;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
 import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
+import org.jetbrains.kotlin.idea.JetFileType;
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.plugin.JetFileType;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.utils.KotlinPaths;
 import org.jetbrains.kotlin.utils.PathUtil;

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java

@@ -52,11 +52,11 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
 import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys;
 import org.jetbrains.kotlin.config.CommonConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
+import org.jetbrains.kotlin.idea.JetFileType;
 import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache;
 import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory;
 import org.jetbrains.kotlin.parsing.JetParserDefinition;
 import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
-import org.jetbrains.kotlin.plugin.JetFileType;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer;
 import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService;

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java

@@ -44,6 +44,7 @@ import org.jetbrains.kotlin.codegen.state.Progress;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.context.ContextPackage;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
+import org.jetbrains.kotlin.idea.MainFunctionDetector;
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
 import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackage;
 import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache;
@@ -51,7 +52,6 @@ import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvid
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.parsing.JetScriptDefinition;
 import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider;
-import org.jetbrains.kotlin.plugin.MainFunctionDetector;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter;
 import org.jetbrains.kotlin.resolve.BindingTrace;

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java

@@ -52,9 +52,9 @@ import org.jetbrains.kotlin.descriptors.ScriptDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider;
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl;
 import org.jetbrains.kotlin.di.InjectorForReplWithJava;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.parsing.JetParserDefinition;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.JetScript;
 import org.jetbrains.kotlin.resolve.*;

compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java

@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaPackageImpl;
 import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.FqNameUnsafe;
-import org.jetbrains.kotlin.plugin.JetFileType;
+import org.jetbrains.kotlin.idea.JetFileType;
 import org.jetbrains.kotlin.resolve.jvm.JavaClassFinderPostConstruct;
 import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade;
 

compiler/frontend/src/org/jetbrains/kotlin/JetNodeType.java

@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.JetElement;
 import org.jetbrains.kotlin.psi.JetElementImpl;
 

compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java

@@ -18,7 +18,7 @@ package org.jetbrains.kotlin;
 
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.IFileElementType;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
 

compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java

@@ -50,8 +50,8 @@ import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory;
 import org.jetbrains.kotlin.diagnostics.Errors;
+import org.jetbrains.kotlin.idea.MainFunctionDetector;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.kotlin.plugin.MainFunctionDetector;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.*;
 import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage;

compiler/frontend/src/org/jetbrains/kotlin/idea/JetFileType.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin;
+package org.jetbrains.kotlin.idea;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.util.IconLoader;
@@ -31,7 +31,7 @@ public class JetFileType extends LanguageFileType {
         @NotNull
         @Override
         protected Icon compute() {
-            return IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin_file.png");
+            return IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.png");
         }
     };
 

compiler/frontend/src/org/jetbrains/kotlin/idea/JetLanguage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin;
+package org.jetbrains.kotlin.idea;
 
 import com.intellij.lang.Language;
 import org.jetbrains.annotations.NotNull;

compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin;
+package org.jetbrains.kotlin.idea;
 
 import com.intellij.util.NotNullFunction;
 import org.jetbrains.annotations.NotNull;

compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java

@@ -25,9 +25,9 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.ILazyParseableElementType;
 import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.kdoc.parser.KDocParser;
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocImpl;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 
 public interface KDocTokens {
     ILazyParseableElementType KDOC = new ILazyParseableElementType("KDoc", JetLanguage.INSTANCE) {

compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocElementImpl.java

@@ -20,7 +20,7 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 
 public abstract class KDocElementImpl extends ASTWrapperPsiElement {
     @NotNull

compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.java

@@ -20,10 +20,10 @@ import com.intellij.lang.Language;
 import com.intellij.psi.impl.source.tree.LazyParseablePsiElement;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
 import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 
 public class KDocImpl extends LazyParseablePsiElement implements KDoc {
     public KDocImpl(CharSequence buffer) {

compiler/frontend/src/org/jetbrains/kotlin/lexer/JetToken.java

@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.lexer;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 
 public class JetToken extends IElementType {
     public JetToken(@NotNull @NonNls String debugName) {

compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java

@@ -32,9 +32,9 @@ import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.JetNodeType;
 import org.jetbrains.kotlin.JetNodeTypes;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.lexer.JetLexer;
 import org.jetbrains.kotlin.lexer.JetTokens;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType;
 import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;

compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt

@@ -23,7 +23,7 @@ import com.intellij.psi.impl.source.tree.FileElement
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.tree.IElementType
 import com.intellij.testFramework.LightVirtualFile
-import org.jetbrains.kotlin.plugin.JetFileType
+import org.jetbrains.kotlin.idea.JetFileType
 import java.util.HashSet
 import com.intellij.openapi.util.Key
 import org.jetbrains.kotlin.types.JetType

compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java

@@ -25,7 +25,7 @@ import com.intellij.psi.PsiReference;
 import com.intellij.psi.PsiReferenceService;
 import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 
 public class JetElementImpl extends ASTWrapperPsiElement implements JetElement {
     public JetElementImpl(@NotNull ASTNode node) {

compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java

@@ -24,7 +24,7 @@ import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType;
 
 import java.util.Arrays;

compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java

@@ -31,9 +31,9 @@ import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.JetNodeTypes;
+import org.jetbrains.kotlin.idea.JetFileType;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.plugin.JetFileType;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.psi.stubs.KotlinFileStub;
 import org.jetbrains.kotlin.psi.stubs.elements.JetPlaceHolderStubElementType;
 import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;

compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt

@@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.LocalTimeCounter
 import org.jetbrains.kotlin.resolve.ImportPath
 import org.jetbrains.kotlin.lexer.JetKeywordToken
-import org.jetbrains.kotlin.plugin.JetFileType
+import org.jetbrains.kotlin.idea.JetFileType
 import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder.Target
 import com.intellij.openapi.util.Key
 import java.io.PrintWriter

compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java

@@ -28,8 +28,8 @@ import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.parsing.JetParser;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.psi.stubs.KotlinFileStub;
 import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl;
 

compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java

@@ -27,7 +27,7 @@ import com.intellij.util.ArrayFactory;
 import com.intellij.util.ReflectionUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.JetClassOrObject;
 import org.jetbrains.kotlin.psi.JetElementImplStub;
 import org.jetbrains.kotlin.psi.JetFunction;

compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java

@@ -24,8 +24,8 @@ import com.intellij.psi.PsiManager;
 import com.intellij.psi.impl.light.AbstractLightClass;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.psi.JetClassOrObject;
 import org.jetbrains.kotlin.psi.JetFile;
 

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java

@@ -46,10 +46,10 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptor;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.name.FqNameUnsafe;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName;

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java

@@ -34,9 +34,9 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.ReadOnly;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.psi.JetClassOrObject;
 import org.jetbrains.kotlin.psi.JetFile;
 

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java

@@ -27,7 +27,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.JetDeclaration;
 
 // Copied from com.intellij.psi.impl.light.LightField

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt

@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.asJava
 import com.intellij.psi.impl.light.LightMethod
 import com.intellij.psi.*
 import org.jetbrains.kotlin.psi.JetDeclaration
-import org.jetbrains.kotlin.plugin.JetLanguage
+import org.jetbrains.kotlin.idea.JetLanguage
 import kotlin.properties.Delegates
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.PsiModificationTracker

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java

@@ -23,7 +23,7 @@ import com.intellij.psi.impl.light.LightModifierList;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 
 public abstract class KotlinLightModifierList extends LightModifierList {
     public KotlinLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) {

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java

@@ -23,7 +23,7 @@ import com.intellij.psi.PsiParameter;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage;
 

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java

@@ -21,7 +21,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.light.AbstractLightClass;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.JetTypeParameter;
 import org.jetbrains.kotlin.psi.JetTypeParameterListOwner;
 

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.asJava
 
 import com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.plugin.JetLanguage
+import org.jetbrains.kotlin.idea.JetLanguage
 import com.intellij.psi.impl.light.LightTypeParameterListBuilder
 import com.intellij.psi.scope.PsiScopeProcessor
 import com.intellij.psi.ResolveState

compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java

@@ -33,8 +33,8 @@ import com.intellij.util.containers.ContainerUtil;
 import kotlin.Function1;
 import kotlin.KotlinPackage;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.plugin.JetLanguage;
 import org.jetbrains.kotlin.psi.*;
 
 import java.util.List;

compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java

@@ -61,7 +61,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages;
 import org.jetbrains.kotlin.lexer.JetTokens;
 import org.jetbrains.kotlin.name.Name;
 import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap;
-import org.jetbrains.kotlin.plugin.JetLanguage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.JetFile;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.BindingTrace;

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -59,10 +59,10 @@ import org.jetbrains.jet.plugin.hierarchy.AbstractHierarchyTest
 import org.jetbrains.jet.plugin.codeInsight.moveUpDown.AbstractCodeMoverTest
 import org.jetbrains.jet.plugin.refactoring.inline.AbstractInlineTest
 import org.jetbrains.jet.plugin.codeInsight.unwrap.AbstractUnwrapRemoveTest
-import org.jetbrains.kotlin.plugin.editor.quickDoc.AbstractJetQuickDocProviderTest
+import org.jetbrains.kotlin.idea.editor.quickDoc.AbstractJetQuickDocProviderTest
 import org.jetbrains.kotlin.safeDelete.AbstractJetSafeDeleteTest
-import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveTest
-import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveWithLibTest
+import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveTest
+import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveWithLibTest
 import org.jetbrains.kotlin.findUsages.AbstractJetFindUsagesTest
 import org.jetbrains.jet.plugin.configuration.AbstractConfigureProjectByChangingFileTest
 import org.jetbrains.kotlin.formatter.AbstractJetFormatterTest
@@ -79,15 +79,15 @@ import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteCon
 import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest
 import org.jetbrains.kotlin.completion.handlers.AbstractSmartCompletionHandlerTest
 import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil
-import org.jetbrains.kotlin.plugin.resolve.AbstractAdditionalResolveDescriptorRendererTest
-import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInLibrarySourcesTest
+import org.jetbrains.kotlin.idea.resolve.AbstractAdditionalResolveDescriptorRendererTest
+import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveInLibrarySourcesTest
 import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest
 import org.jetbrains.kotlin.completion.AbstractCompiledKotlinInJavaCompletionTest
 import org.jetbrains.kotlin.completion.AbstractKotlinSourceInJavaCompletionTest
 import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithStdLib
 import org.jetbrains.jet.plugin.codeInsight.AbstractInsertImportOnPasteTest
 import org.jetbrains.jet.plugin.codeInsight.AbstractLineMarkersTest
-import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceToJavaWithWrongFileStructureTest
+import org.jetbrains.kotlin.idea.resolve.AbstractReferenceToJavaWithWrongFileStructureTest
 import org.jetbrains.jet.plugin.navigation.AbstractKotlinGotoTest
 import org.jetbrains.jet.plugin.AbstractExpressionSelectionTest
 import org.jetbrains.jet.plugin.refactoring.move.AbstractJetMoveTest
@@ -121,14 +121,14 @@ import org.jetbrains.kotlin.completion.weighers.AbstractBasicCompletionWeigherTe
 import org.jetbrains.kotlin.completion.weighers.AbstractSmartCompletionWeigherTest
 import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords
 import org.jetbrains.kotlin.js.test.semantics.AbstractReservedWordTest
-import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInJavaTest
+import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveInJavaTest
 import org.jetbrains.kotlin.js.test.semantics.AbstractBridgeTest
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest
 import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterForWebDemoTest
 import org.jetbrains.jet.plugin.decompiler.textBuilder.AbstractDecompiledTextTest
 import org.jetbrains.kotlin.completion.AbstractMultiFileSmartCompletionTest
 import org.jetbrains.kotlin.completion.handlers.AbstractCompletionCharFilterTest
-import org.jetbrains.kotlin.plugin.resolve.AbstractPartialBodyResolveTest
+import org.jetbrains.kotlin.idea.resolve.AbstractPartialBodyResolveTest
 import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib
 import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest
 import org.jetbrains.kotlin.types.AbstractJetTypeBindingTest

idea/ide-common/src/org/jetbrains/kotlin/idea/codeInsight/ReferenceVariantsHelper.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin.codeInsight
+package org.jetbrains.kotlin.idea.codeInsight
 
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.psi.*
@@ -35,9 +35,9 @@ import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.types.TypeUtils
 import org.jetbrains.kotlin.types.checker.JetTypeChecker
 import org.jetbrains.kotlin.lexer.JetTokens
-import org.jetbrains.kotlin.plugin.util.CallType
-import org.jetbrains.kotlin.plugin.util.substituteExtensionIfCallable
-import org.jetbrains.kotlin.plugin.util.getImplicitReceiversWithInstance
+import org.jetbrains.kotlin.idea.util.CallType
+import org.jetbrains.kotlin.idea.util.substituteExtensionIfCallable
+import org.jetbrains.kotlin.idea.util.getImplicitReceiversWithInstance
 
 public class ReferenceVariantsHelper(
         private val context: BindingContext,

idea/ide-common/src/org/jetbrains/kotlin/idea/util/FuzzyType.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin.util
+package org.jetbrains.kotlin.idea.util
 
 import org.jetbrains.kotlin.types.JetType
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor

idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin.util;
+package org.jetbrains.kotlin.idea.util;
 
 import kotlin.Function1;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;

idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin.util
+package org.jetbrains.kotlin.idea.util
 
 import org.jetbrains.kotlin.types.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns

idea/ide-common/src/org/jetbrains/kotlin/idea/util/extensionsUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin.util
+package org.jetbrains.kotlin.idea.util
 
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue

idea/ide-common/src/org/jetbrains/kotlin/idea/util/implicitReceiversUtils.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin.util
+package org.jetbrains.kotlin.idea.util
 
 import org.jetbrains.kotlin.resolve.scopes.JetScope
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor

idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIcons.java

@@ -22,24 +22,24 @@ import com.intellij.util.PlatformIcons;
 import javax.swing.*;
 
 public interface JetIcons {
-    Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin.png");
-    Icon KOTLIN_LOGO_24 = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin24.png");
+    Icon SMALL_LOGO = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin.png");
+    Icon KOTLIN_LOGO_24 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin24.png");
 
-    Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin13.png");
+    Icon SMALL_LOGO_13 = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin13.png");
 
-    Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/classKotlin.png");
-    Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/enumKotlin.png");
-    Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin_file.png");
-    Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/objectKotlin.png");
-    Icon TRAIT = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/traitKotlin.png");
-    Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/function.png");
+    Icon CLASS = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/classKotlin.png");
+    Icon ENUM = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/enumKotlin.png");
+    Icon FILE = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.png");
+    Icon OBJECT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/objectKotlin.png");
+    Icon TRAIT = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/traitKotlin.png");
+    Icon FUNCTION = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/function.png");
     Icon EXTENSION_FUNCTION = PlatformIcons.FUNCTION_ICON;
-    Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/lambda.png");
+    Icon LAMBDA = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/lambda.png");
     Icon VAR = PlatformIcons.VARIABLE_ICON;
-    Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/value.png");
+    Icon VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/value.png");
     Icon PARAMETER = PlatformIcons.PARAMETER_ICON;
-    Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/field_value.png");
-    Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/field_variable.png");
+    Icon FIELD_VAL = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_value.png");
+    Icon FIELD_VAR = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/field_variable.png");
 
-    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin_launch_configuration.png");
+    Icon LAUNCH = IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_launch_configuration.png");
 }

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt

@@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
 import com.intellij.psi.SingleRootFileViewProvider
-import org.jetbrains.kotlin.plugin.JetLanguage
+import org.jetbrains.kotlin.idea.JetLanguage
 import kotlin.properties.Delegates
 
 public class JetClassFileViewProvider(
@@ -45,4 +45,4 @@ public class JetClassFileViewProvider(
     override fun createCopy(copy: VirtualFile): SingleRootFileViewProvider {
         return JetClassFileViewProvider(getManager(), copy, false, isInternal)
     }
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java

@@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.CommonProcessors;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.plugin.JetFileType;
+import org.jetbrains.kotlin.idea.JetFileType;
 
 import java.util.List;
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinProblemHighlightFilter.kt

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.highlighter
 
 import com.intellij.codeInsight.daemon.ProblemHighlightFilter
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.plugin.JetFileType
+import org.jetbrains.kotlin.idea.JetFileType
 import com.intellij.ide.projectView.impl.ProjectRootsUtil
 
 class KotlinProblemHighlightFilter : ProblemHighlightFilter() {
@@ -27,4 +27,4 @@ class KotlinProblemHighlightFilter : ProblemHighlightFilter() {
         return psiFile.getFileType() != JetFileType.INSTANCE || !ProjectRootsUtil.isOutsideSourceRoot(psiFile)
     }
 
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt

@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.psi.JetElement
-import org.jetbrains.kotlin.plugin.JetBundle
+import org.jetbrains.kotlin.idea.JetBundle
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate
 import com.intellij.codeInsight.intention.IntentionAction
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt

@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetDeclarationWithBody
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation
 import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo
-import org.jetbrains.kotlin.plugin.util.approximateFlexibleTypes
+import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
 import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor
 import org.jetbrains.jet.plugin.caches.resolve.analyze
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt

@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.psi.JetPsiUtil
-import org.jetbrains.kotlin.plugin.JetBundle
+import org.jetbrains.kotlin.idea.JetBundle
 import org.jetbrains.kotlin.psi.JetPsiFactory
 
 public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingIntention<JetPrefixExpression>("simplify.negated.binary.expression", javaClass()) {

idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java

@@ -35,10 +35,10 @@ import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.kotlin.plugin.JetFileType;
 import org.jetbrains.jet.plugin.framework.JsLibraryStdDetectionUtil;
 import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil;
+import org.jetbrains.kotlin.idea.JetFileType;
+import org.jetbrains.kotlin.psi.JetFile;
 
 import java.util.HashSet;
 import java.util.Set;

idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt

@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.plugin.JetBundle
+import org.jetbrains.kotlin.idea.JetBundle
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import com.intellij.codeInspection.SuppressIntentionAction

idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.plugin;
+package org.jetbrains.kotlin.idea;
 
 import com.intellij.CommonBundle;
 import org.jetbrains.annotations.NonNls;
@@ -29,7 +29,7 @@ public class JetBundle {
     private static Reference<ResourceBundle> ourBundle;
 
     @NonNls
-    private static final String BUNDLE = "org.jetbrains.kotlin.plugin.JetBundle";
+    private static final String BUNDLE = "org.jetbrains.kotlin.idea.JetBundle";
 
     private JetBundle() {
     }

idea/resources/liveTemplates/Kotlin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templateSet group="Kotlin">
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.main"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.main"
               name="main" toReformat="true" toShortenFQNames="true"
               value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -31,7 +31,7 @@
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.soutp"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.soutp"
               name="soutp" toReformat="true" toShortenFQNames="true" value="println($FORMAT$)">
         <variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;'\&quot;' + _1.collect { it + ' = [${' + it + '}]'}.join(', ') + '\&quot;'&quot;, functionParameters())"
                   name="FORMAT" />
@@ -39,7 +39,7 @@
             <option name="KOTLIN_STATEMENT" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.iter"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.iter"
               name="iter" toReformat="true" toShortenFQNames="true"
               value="for ($VAR$ in $ITERABLE$) {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;iterable&quot;" expression="kotlinIterableVariable()" name="ITERABLE" />
@@ -48,7 +48,7 @@
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.ifn"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.ifn"
               name="ifn" toReformat="true" toShortenFQNames="true"
               value="if ($VAR$ == null) {&#10;$END$&#10;}">
       <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" />
@@ -56,7 +56,7 @@
         <option name="KOTLIN_EXPRESSION" value="true" />
       </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.inn"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.inn"
               name="inn" toReformat="true" toShortenFQNames="true"
               value="if ($VAR$ != null) {&#10;$END$&#10;}">
       <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" />
@@ -64,7 +64,7 @@
         <option name="KOTLIN_EXPRESSION" value="true" />
       </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.void"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.void"
               name="void" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAMS$) {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="" expression="" name="PARAMS" />
@@ -74,7 +74,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun0"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.fun0"
               name="fun0" toReformat="true" toShortenFQNames="true" value="fun $NAME$() : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
@@ -84,7 +84,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun1"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.fun1"
               name="fun1" toReformat="true" toShortenFQNames="true"
               value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -97,7 +97,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.fun2"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.fun2"
               name="fun2" toReformat="true" toShortenFQNames="true"
               value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -113,7 +113,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.interface"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.interface"
               name="interface" toReformat="true" toShortenFQNames="true" value="trait $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
@@ -122,7 +122,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.singleton"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.singleton"
               name="singleton" toReformat="true" toShortenFQNames="true" value="object $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
@@ -132,7 +132,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.closure"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.closure"
               name="closure" toReformat="true" toShortenFQNames="true" value="{$PARAM$ -> $PARAM_COPY$}">
         <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM" />
         <variable alwaysStopAt="true" defaultValue="" expression="PARAM" name="PARAM_COPY" />
@@ -141,7 +141,7 @@
             <option name="KOTLIN_EXPRESSION" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.anonymous"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.anonymous"
               name="anonymous" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
         <context>
@@ -150,7 +150,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exfun"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.exfun"
               name="exfun" toReformat="true" toShortenFQNames="true"
               value="fun $RECEIVER$.$NAME$($PARAMS$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -162,7 +162,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exval"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.exval"
               name="exval" toReformat="true" toShortenFQNames="true"
               value="val $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -173,7 +173,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.exvar"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.exvar"
               name="exvar" toReformat="true" toShortenFQNames="true"
               value="var $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}&#10;set(value) {&#10; &#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -189,7 +189,7 @@
     <!-- Synonyms -->
 
     <!-- Synonym for main -->
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.main"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.main"
               name="psvm" toReformat="true" toShortenFQNames="true"
               value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -198,7 +198,7 @@
     </template>
 
     <!-- Synonym for anonymous -->
-    <template resource-bundle="org.jetbrains.kotlin.plugin.JetBundle" key="livetemplate.description.anonymous"
+    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.anonymous"
               name="object" id="kt-object" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
         <context>

idea/src/META-INF/plugin.xml

@@ -81,7 +81,7 @@
       <add-to-group group-id="EditorGutterPopupMenu" anchor="last"/>
     </group>
 
-    <group id="KotlinToolsGroup" popup="true" text="Kotlin" icon="/org/jetbrains/kotlin/plugin/icons/kotlin13.png"
+    <group id="KotlinToolsGroup" popup="true" text="Kotlin" icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
            class="org.jetbrains.jet.plugin.actions.KotlinActionGroup">
       <add-to-group group-id="ToolsMenu" anchor="last"/>
     </group>
@@ -443,7 +443,7 @@
     <toolWindow id="Kotlin Bytecode"
                 factoryClass="org.jetbrains.jet.plugin.internal.KotlinBytecodeToolWindow$Factory"
                 anchor="right"
-                icon="/org/jetbrains/kotlin/plugin/icons/kotlin13.png"
+                icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
                 canCloseContents="true"
         />
 

idea/src/org/jetbrains/jet/plugin/JetFileFactory.java

@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin;
 import com.intellij.openapi.fileTypes.FileTypeConsumer;
 import com.intellij.openapi.fileTypes.FileTypeFactory;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.plugin.JetFileType;
+import org.jetbrains.kotlin.idea.JetFileType;
 
 
 public class JetFileFactory extends FileTypeFactory {

idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java

@@ -29,20 +29,20 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
+import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassKind;
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.Modality;
+import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.psi.JetClass;
 import org.jetbrains.kotlin.psi.JetClassBody;
 import org.jetbrains.kotlin.psi.JetNamedFunction;
 import org.jetbrains.kotlin.psi.JetPsiFactory;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.kotlin.plugin.JetBundle;
-import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil;
-import org.jetbrains.jet.plugin.codeInsight.ShortenReferences;
-import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
 
 import javax.swing.*;
 import java.util.ArrayList;

idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java

@@ -32,10 +32,10 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.psi.JetFile;
-import org.jetbrains.kotlin.name.FqName;
-import org.jetbrains.kotlin.plugin.JetBundle;
 import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper;
+import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.name.FqName;
+import org.jetbrains.kotlin.psi.JetFile;
 
 import javax.swing.*;
 import java.util.List;

idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java

@@ -30,10 +30,10 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.kotlin.plugin.JetBundle;
-import org.jetbrains.kotlin.plugin.JetFileType;
 import org.jetbrains.jet.plugin.JetIcons;
 import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils;
+import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.JetFileType;
 
 import java.util.Map;
 

idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java

@@ -25,13 +25,13 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
+import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
+import org.jetbrains.kotlin.idea.JetLanguage;
 import org.jetbrains.kotlin.psi.JetExpression;
 import org.jetbrains.kotlin.psi.JetFile;
+import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.kotlin.plugin.JetLanguage;
-import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 
 public class ShowExpressionTypeAction extends AnAction {
     @Override

idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt

@@ -33,11 +33,11 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
 import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo
 import com.intellij.psi.stubs.StringStubIndexExtension
 import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade
-import org.jetbrains.kotlin.plugin.util.substituteExtensionIfCallable
-import org.jetbrains.kotlin.plugin.util.CallType
-import org.jetbrains.kotlin.plugin.codeInsight.ReferenceVariantsHelper
+import org.jetbrains.kotlin.idea.util.substituteExtensionIfCallable
+import org.jetbrains.kotlin.idea.util.CallType
+import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
-import org.jetbrains.kotlin.plugin.util.getImplicitReceiversWithInstance
+import org.jetbrains.kotlin.idea.util.getImplicitReceiversWithInstance
 
 public class KotlinIndicesHelper(
         private val project: Project,

idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java

@@ -32,14 +32,14 @@ import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.*;
+import org.jetbrains.kotlin.idea.JetBundle;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.resolve.OverrideResolver;
 import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.kotlin.plugin.JetBundle;
-import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 
 import java.util.Collection;
 import java.util.List;

idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java

@@ -23,8 +23,8 @@ import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
+import org.jetbrains.kotlin.idea.JetBundle;
 import org.jetbrains.kotlin.resolve.OverrideResolver;
-import org.jetbrains.kotlin.plugin.JetBundle;
 
 import java.util.Set;
 

idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt

@@ -61,10 +61,9 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
 import org.jetbrains.jet.plugin.imports.*
 import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
 import org.jetbrains.kotlin.utils.*
-import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension
 import com.intellij.openapi.progress.ProcessCanceledException
-import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers
+import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 
 //NOTE: this class is based on CopyPasteReferenceProcessor and JavaCopyPasteReferenceProcessor

idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java

@@ -31,15 +31,15 @@ import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.descriptors.*;
-import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.types.JetType;
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
 import org.jetbrains.jet.plugin.quickfix.QuickfixPackage;
-import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
+import org.jetbrains.kotlin.descriptors.*;
+import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
+import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder;
+import org.jetbrains.kotlin.types.JetType;
 
 import java.util.ArrayList;
 import java.util.Collections;