From 49f3c31e29c1288e0c92753fde6aee35e0be2079 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 19:47:02 +0300 Subject: [PATCH] Rename jet -> kotlin in idea: configuration, editor, framework, search --- .../kotlin/generators/tests/GenerateTests.kt | 2 +- .../plugin/project/ProjectStructureUtil.java | 2 +- .../jet/plugin/util/ProjectRootsUtil.kt | 2 +- .../DescriptorToDeclarationUtil.kt | 2 +- .../configuration/JetModuleTypeManager.java | 4 +- .../idea}/configuration/ModuleTypeCache.kt | 6 +- .../idea/findUsages/KotlinWordsScanner.kt | 2 +- .../framework/JavaRuntimeDetectionUtil.java | 4 +- .../JsHeaderLibraryDetectionUtil.java | 4 +- .../framework/JsLibraryStdDetectionUtil.java | 4 +- .../KotlinReferencesSearcher.java | 8 +-- .../idea}/search/searchUtil.kt | 9 +-- .../search/usagesSearch/commonFilters.kt | 8 +-- .../idea}/search/usagesSearch/conventions.kt | 4 +- .../search/usagesSearch/searchHelpers.kt | 8 +-- .../idea}/search/usagesSearch/usagesSearch.kt | 10 +-- .../idea}/search/usagesSearch/utils.kt | 4 +- idea/src/META-INF/extensions/ide.xml | 6 +- idea/src/META-INF/gradle.xml | 6 +- idea/src/META-INF/maven.xml | 6 +- idea/src/META-INF/plugin.xml | 64 +++++++++---------- .../jet/plugin/JetModuleTypeManagerImpl.java | 2 +- .../jetbrains/jet/plugin/JetPluginUtil.java | 2 +- .../ConfigureKotlinInProjectAction.java | 6 +- .../ConfigureKotlinJsInProjectAction.java | 6 +- .../plugin/actions/NewKotlinFileAction.java | 2 +- .../copy/ConvertJavaCopyPastePostProcessor.kt | 2 +- .../copy/KotlinPasteFromJavaDialog.java | 2 +- .../KotlinCallerMethodsTreeStructure.java | 2 +- .../versions/KotlinRuntimeLibraryUtil.java | 10 +-- .../OutdatedKotlinRuntimeNotification.java | 6 +- ...edAbiVersionNotificationPanelProvider.java | 8 +-- .../ConfigureKotlinInProjectUtils.java | 4 +- .../ConfigureKotlinNotificationManager.kt | 8 +-- ...KotlinAndroidGradleModuleConfigurator.java | 4 +- .../KotlinGradleModuleConfigurator.java | 4 +- .../KotlinJavaMavenConfigurator.java | 6 +- .../KotlinJavaModuleConfigurator.java | 10 +-- .../KotlinJavascriptMavenConfigurator.java | 4 +- .../KotlinJsModuleConfigurator.java | 8 +-- .../KotlinMavenConfigurator.java | 8 +-- .../KotlinProjectConfigurator.java | 4 +- .../KotlinWithGradleConfigurator.java | 8 +-- .../KotlinWithLibraryConfigurator.java | 10 +-- .../ui/AbsentJdkAnnotationsComponent.java | 12 ++-- .../NonConfiguredKotlinProjectComponent.java | 6 +- .../AbsentSdkAnnotationsNotification.kt | 6 +- .../ConfigureKotlinNotification.java | 10 +-- .../idea}/editor/JetEditorOptions.java | 4 +- .../idea}/editor/JetLtGtTypingUtils.java | 4 +- .../editor/JetSettingEditorConfigurable.java | 4 +- .../idea}/editor/KotlinBackspaceHandler.java | 4 +- .../idea}/editor/KotlinEnterHandler.kt | 4 +- .../idea}/editor/KotlinQuoteHandler.java | 4 +- .../idea}/editor/KotlinSmartEnterHandler.kt | 6 +- .../idea}/editor/KotlinTypedHandler.java | 6 +- .../idea}/editor/fixers/KotlinDoWhileFixer.kt | 6 +- .../editor/fixers/KotlinForConditionFixer.kt | 5 +- .../KotlinFunctionDeclarationBodyFixer.kt | 7 +- .../fixers/KotlinFunctionParametersFixer.kt | 6 +- .../editor/fixers/KotlinIfConditionFixer.kt | 9 +-- .../KotlinMissingForOrWhileBodyFixer.kt | 6 +- .../fixers/KotlinMissingIfBranchFixer.kt | 8 +-- .../fixers/KotlinMissingWhenBodyFixer.kt | 6 +- .../fixers/KotlinWhenSubjectCaretFixer.kt | 6 +- .../fixers/KotlinWhileConditionFixer.kt | 5 +- .../editor/fixers/MissingConditionFixer.kt | 8 +-- .../idea}/editor/fixers/fixersUtil.kt | 6 +- .../KotlinCodeBlockSelectioner.kt | 6 +- .../KotlinDeclarationSelectioner.kt | 5 +- .../KotlinDocCommentSelectioner.kt | 9 +-- .../wordSelection/KotlinListSelectioner.kt | 4 +- .../KotlinStatementGroupSelectioner.kt | 4 +- .../KotlinStringLiteralSelectioner.kt | 4 +- .../KotlinWordSelectionFilter.kt | 4 +- .../JetElementDescriptionProvider.kt | 2 +- .../kotlin/idea/findUsages/dialogs/Utils.java | 2 +- .../idea/findUsages/findUsagesOptions.kt | 12 ++-- .../handlers/KotlinFindClassUsagesHandler.kt | 6 +- .../KotlinFindMemberUsagesHandler.java | 10 +-- .../KotlinTypeParameterFindUsagesHandler.kt | 4 +- ...stomLibraryDescriptorWithDefferConfig.java | 14 ++-- .../FrameworksCompatibilityUtils.java | 5 +- .../framework/JSFrameworkSupportProvider.java | 4 +- .../idea}/framework/JSFrameworkType.java | 4 +- .../framework/JSLibraryCreateOptions.java | 4 +- .../framework/JSLibraryStdDescription.java | 10 +-- .../JSLibraryStdPresentationProvider.java | 4 +- .../JavaFrameworkSupportProvider.java | 4 +- .../idea}/framework/JavaFrameworkType.java | 4 +- .../JavaRuntimeLibraryDescription.java | 8 +-- .../JavaRuntimePresentationProvider.java | 4 +- .../JsHeaderLibraryPresentationProvider.java | 4 +- .../idea}/framework/KotlinModuleBuilder.kt | 13 +--- .../framework/KotlinModuleSettingStep.java | 6 +- .../idea}/framework/KotlinTemplatesFactory.kt | 4 +- .../LibraryPresentationProviderUtil.java | 4 +- .../framework/ui/ChooseLibraryPathPanel.form | 2 +- .../framework/ui/ChooseLibraryPathPanel.java | 4 +- .../idea}/framework/ui/ChooseModulePanel.form | 2 +- .../idea}/framework/ui/ChooseModulePanel.java | 5 +- .../idea}/framework/ui/ChoosePathDialog.java | 6 +- .../ConfigureDialogWithModulesAndVersion.form | 2 +- .../ConfigureDialogWithModulesAndVersion.java | 4 +- .../idea}/framework/ui/CopyIntoPanel.form | 2 +- .../idea}/framework/ui/CopyIntoPanel.java | 4 +- .../framework/ui/CreateLibraryDialog.java | 4 +- .../framework/ui/CreateLibraryDialogBase.form | 2 +- .../framework/ui/CreateLibraryDialogBase.java | 4 +- .../ui/CreateLibraryDialogWithModules.java | 4 +- .../idea}/framework/ui/FileUIUtils.java | 5 +- .../idea}/framework/ui/ValidityListener.java | 6 +- .../markers/OverridenPropertyMarker.kt | 2 +- ...MoveKotlinTopLevelDeclarationsProcessor.kt | 2 +- .../classInheritorsSearch.kt | 4 +- .../declarationSearchUtil.kt | 6 +- .../declarationsSearch/overridersSearch.kt | 6 +- .../JetTargetElementEvaluator.kt | 4 +- .../KotlinAnnotatedElementsSearcher.java | 10 +-- .../KotlinDefinitionsSearcher.java | 6 +- .../KotlinDirectInheritorsSearcher.kt | 6 +- ...LightPropertyAccessorsReferenceSearcher.kt | 4 +- .../jet/plugin/JetStdJSProjectDescriptor.java | 2 +- ...ctJavaToKotlinCopyPasteConversionTest.java | 2 +- .../jet/plugin/run/RunConfigurationTest.kt | 2 +- ...actConfigureProjectByChangingFileTest.java | 4 +- .../configuration/ConfigureKotlinTest.java | 8 +-- ...ureProjectByChangingFileTestGenerated.java | 2 +- .../ui/LoadVersionsFromMavenTest.java | 4 +- .../refactoring/move/AbstractJetMoveTest.kt | 2 +- .../refactoring/rename/AbstractRenameTest.kt | 2 +- 131 files changed, 352 insertions(+), 389 deletions(-) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/JetModuleTypeManager.java (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ModuleTypeCache.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JavaRuntimeDetectionUtil.java (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JsHeaderLibraryDetectionUtil.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JsLibraryStdDetectionUtil.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/ideaExtensions/KotlinReferencesSearcher.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/searchUtil.kt (84%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/usagesSearch/commonFilters.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/usagesSearch/conventions.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/usagesSearch/searchHelpers.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/usagesSearch/usagesSearch.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/usagesSearch/utils.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ConfigureKotlinInProjectUtils.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ConfigureKotlinNotificationManager.kt (86%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinAndroidGradleModuleConfigurator.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinGradleModuleConfigurator.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinJavaMavenConfigurator.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinJavaModuleConfigurator.java (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinJavascriptMavenConfigurator.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinJsModuleConfigurator.java (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinMavenConfigurator.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinProjectConfigurator.java (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinWithGradleConfigurator.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/KotlinWithLibraryConfigurator.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ui/AbsentJdkAnnotationsComponent.java (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ui/NonConfiguredKotlinProjectComponent.java (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ui/notifications/ConfigureKotlinNotification.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/JetEditorOptions.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/JetLtGtTypingUtils.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/JetSettingEditorConfigurable.java (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/KotlinBackspaceHandler.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/KotlinEnterHandler.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/KotlinQuoteHandler.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/KotlinSmartEnterHandler.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/KotlinTypedHandler.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinDoWhileFixer.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinForConditionFixer.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinFunctionParametersFixer.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinIfConditionFixer.kt (78%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinMissingIfBranchFixer.kt (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinMissingWhenBodyFixer.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinWhenSubjectCaretFixer.kt (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/KotlinWhileConditionFixer.kt (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/MissingConditionFixer.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/fixers/fixersUtil.kt (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/wordSelection/KotlinCodeBlockSelectioner.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/wordSelection/KotlinDeclarationSelectioner.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/wordSelection/KotlinDocCommentSelectioner.kt (78%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/wordSelection/KotlinListSelectioner.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/wordSelection/KotlinStatementGroupSelectioner.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/wordSelection/KotlinStringLiteralSelectioner.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/editor/wordSelection/KotlinWordSelectionFilter.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/CustomLibraryDescriptorWithDefferConfig.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/FrameworksCompatibilityUtils.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JSFrameworkSupportProvider.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JSFrameworkType.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JSLibraryCreateOptions.java (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JSLibraryStdDescription.java (86%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JSLibraryStdPresentationProvider.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JavaFrameworkSupportProvider.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JavaFrameworkType.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JavaRuntimeLibraryDescription.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JavaRuntimePresentationProvider.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/JsHeaderLibraryPresentationProvider.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/KotlinModuleBuilder.kt (79%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/KotlinModuleSettingStep.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/KotlinTemplatesFactory.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/LibraryPresentationProviderUtil.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/ChooseLibraryPathPanel.form (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/ChooseLibraryPathPanel.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/ChooseModulePanel.form (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/ChooseModulePanel.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/ChoosePathDialog.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/ConfigureDialogWithModulesAndVersion.form (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/ConfigureDialogWithModulesAndVersion.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/CopyIntoPanel.form (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/CopyIntoPanel.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/CreateLibraryDialog.java (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/CreateLibraryDialogBase.form (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/CreateLibraryDialogBase.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/CreateLibraryDialogWithModules.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/FileUIUtils.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/ValidityListener.java (88%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/declarationsSearch/classInheritorsSearch.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/declarationsSearch/declarationSearchUtil.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/declarationsSearch/overridersSearch.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/ideaExtensions/JetTargetElementEvaluator.kt (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/ideaExtensions/KotlinDefinitionsSearcher.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/AbstractConfigureProjectByChangingFileTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ConfigureKotlinTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/configuration/ConfigureProjectByChangingFileTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/framework/ui/LoadVersionsFromMavenTest.java (91%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 2366127720b..f848508c9ad 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -64,7 +64,7 @@ import org.jetbrains.kotlin.safeDelete.AbstractJetSafeDeleteTest 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.idea.configuration.AbstractConfigureProjectByChangingFileTest import org.jetbrains.kotlin.formatter.AbstractJetFormatterTest import org.jetbrains.kotlin.idea.highlighter.AbstractDiagnosticMessageTest import org.jetbrains.kotlin.idea.codeInsight.AbstractOutOfBlockModificationTest diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java index fee5c843823..d4557a259bd 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java @@ -35,7 +35,7 @@ import com.intellij.psi.util.CachedValuesManager; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.framework.JsLibraryStdDetectionUtil; +import org.jetbrains.kotlin.idea.framework.JsLibraryStdDetectionUtil; import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt index 3486d90b7cd..90e5970fc44 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.roots.ProjectFileIndex import com.intellij.psi.PsiElement import kotlin.platform.platformStatic import org.jetbrains.jet.plugin.util.application.runReadAction -import org.jetbrains.jet.plugin.configuration.JetModuleTypeManager +import org.jetbrains.kotlin.idea.configuration.JetModuleTypeManager import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiDirectory diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt index ae33ed99d45..99c539fad02 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver import java.util.HashSet import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import com.intellij.psi.JavaPsiFacade -import org.jetbrains.jet.plugin.search.allScope +import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.utils.addIfNotNull public object DescriptorToDeclarationUtil { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/configuration/JetModuleTypeManager.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/configuration/JetModuleTypeManager.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java index bcdf74e32dc..f2d78f69ff9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/configuration/JetModuleTypeManager.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.module.Module; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/configuration/ModuleTypeCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/configuration/ModuleTypeCache.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt index 8dcc5df9947..ae873a6cb98 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/configuration/ModuleTypeCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/ModuleTypeCache.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration +package org.jetbrains.kotlin.idea.configuration import com.intellij.openapi.module.Module import com.intellij.openapi.components.ServiceManager @@ -101,4 +101,4 @@ private fun isGradleModule(module: Module): Boolean { val buildFile = moduleFile.getParent()?.findChild(DEFAULT_SCRIPT_NAME) return buildFile != null && buildFile.exists() -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinWordsScanner.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinWordsScanner.kt index 99c18e352b3..464908aef9e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinWordsScanner.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinWordsScanner.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.findUsages -import org.jetbrains.jet.plugin.search.usagesSearch.* +import org.jetbrains.kotlin.idea.search.usagesSearch.* import com.intellij.lang.cacheBuilder.WordsScanner import com.intellij.util.Processor import org.jetbrains.kotlin.lexer.JetLexer diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JavaRuntimeDetectionUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JavaRuntimeDetectionUtil.java similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JavaRuntimeDetectionUtil.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JavaRuntimeDetectionUtil.java index d9cd6be19a2..eaab57c9000 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JavaRuntimeDetectionUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JavaRuntimeDetectionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.openapi.util.io.JarUtil; import com.intellij.openapi.vfs.VfsUtilCore; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryDetectionUtil.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryDetectionUtil.java index 1236b2bf8fa..52901959550 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryDetectionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsLibraryStdDetectionUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JsLibraryStdDetectionUtil.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsLibraryStdDetectionUtil.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JsLibraryStdDetectionUtil.java index f5ee5f2a9d8..434b06a15c0 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsLibraryStdDetectionUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/framework/JsLibraryStdDetectionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java index a1cd6d2971b..b9d7ad838f2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.ideaExtensions; +package org.jetbrains.kotlin.idea.search.ideaExtensions; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.QueryExecutorBase; @@ -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.kotlin.psi.*; -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; +import org.jetbrains.kotlin.idea.search.usagesSearch.*; +import org.jetbrains.kotlin.psi.*; public class KotlinReferencesSearcher extends QueryExecutorBase { public static void processJetClassOrObject( diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/searchUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt similarity index 84% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/search/searchUtil.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt index ec352cbe5c1..8c3661ccd15 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/searchUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search +package org.jetbrains.kotlin.idea.search import com.intellij.psi.search.GlobalSearchScope import com.intellij.openapi.project.Project import com.intellij.psi.PsiFile import com.intellij.psi.search.SearchScope -import com.intellij.psi.PsiElement -import com.intellij.openapi.module.ModuleUtilCore -import com.intellij.openapi.roots.ModuleRootManager public fun SearchScope.and(otherScope: SearchScope): SearchScope = intersectWith(otherScope) public fun SearchScope.or(otherScope: SearchScope): SearchScope = union(otherScope) @@ -33,4 +30,4 @@ public fun Project.allScope(): GlobalSearchScope = GlobalSearchScope.allScope(th public fun Project.projectScope(): GlobalSearchScope = GlobalSearchScope.projectScope(this) -public fun PsiFile.fileScope(): GlobalSearchScope = GlobalSearchScope.fileScope(this) \ No newline at end of file +public fun PsiFile.fileScope(): GlobalSearchScope = GlobalSearchScope.fileScope(this) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/commonFilters.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/commonFilters.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/commonFilters.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/commonFilters.kt index ea6b0f29f85..79938f1c5b4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/commonFilters.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/commonFilters.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.usagesSearch +package org.jetbrains.kotlin.idea.search.usagesSearch import com.intellij.psi.PsiReference import com.intellij.psi.PsiNamedElement -import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchFilter.* +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchFilter.* class OrFilter(val filter1: UsagesSearchFilter, val filter2: UsagesSearchFilter): UsagesSearchFilter { override fun accepts(ref: PsiReference, item: UsagesSearchRequestItem): Boolean = @@ -71,4 +71,4 @@ val (PsiReference.(T) -> Boolean).searchFilter: UsagesSearc get() = object: UsagesSearchFilter { [suppress("UNCHECKED_CAST")] override fun accepts(ref: PsiReference, item: UsagesSearchRequestItem): Boolean = ref.this@searchFilter(item.target.element as T) - } \ No newline at end of file + } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/conventions.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/conventions.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt index 5c07d6ca6ec..23eed8b2a95 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/conventions.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/conventions.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.usagesSearch +package org.jetbrains.kotlin.idea.search.usagesSearch import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.lexer.JetToken diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt index e9c63aaaaf1..066a2e12598 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.usagesSearch +package org.jetbrains.kotlin.idea.search.usagesSearch import com.intellij.psi.PsiReference import org.jetbrains.kotlin.psi.JetClassOrObject -import org.jetbrains.jet.plugin.search.usagesSearch.* -import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchFilter.* +import org.jetbrains.kotlin.idea.search.usagesSearch.* +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchFilter.* import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetNamedFunction import java.util.Collections diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt index d33817f8f51..2b939ee9ed4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.usagesSearch +package org.jetbrains.kotlin.idea.search.usagesSearch import com.intellij.psi.PsiReference import com.intellij.util.QueryFactory @@ -36,8 +36,8 @@ import com.intellij.psi.PsiReferenceService import com.intellij.openapi.progress.ProgressManager import com.intellij.psi.ReferenceRange import com.intellij.openapi.project.Project -import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchFilter.* -import org.jetbrains.jet.plugin.search.and +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchFilter.* +import org.jetbrains.kotlin.idea.search.and import com.intellij.psi.impl.search.PsiSearchHelperImpl import com.intellij.psi.search.GlobalSearchScope import com.intellij.openapi.vfs.VirtualFile @@ -186,4 +186,4 @@ val PsiElement.effectiveScope: SearchScope fun Query.merge(that: Query): Query = MergeQuery(this, that) val Query.unique: Query - get() = UniqueResultsQuery(this, ContainerUtil.canonicalStrategy(), ReferenceDescriptor.MAPPER) \ No newline at end of file + get() = UniqueResultsQuery(this, ContainerUtil.canonicalStrategy(), ReferenceDescriptor.MAPPER) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt index b3f37841810..d4be9e54fd8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.usagesSearch +package org.jetbrains.kotlin.idea.search.usagesSearch import com.intellij.psi.PsiConstructorCall import org.jetbrains.kotlin.descriptors.* diff --git a/idea/src/META-INF/extensions/ide.xml b/idea/src/META-INF/extensions/ide.xml index facaa577fcf..7971c60231c 100644 --- a/idea/src/META-INF/extensions/ide.xml +++ b/idea/src/META-INF/extensions/ide.xml @@ -1,12 +1,12 @@ - + - - + + diff --git a/idea/src/META-INF/gradle.xml b/idea/src/META-INF/gradle.xml index 0d70c9a7061..c26ed098059 100644 --- a/idea/src/META-INF/gradle.xml +++ b/idea/src/META-INF/gradle.xml @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff --git a/idea/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml index 8e582542766..6f76714ba14 100644 --- a/idea/src/META-INF/maven.xml +++ b/idea/src/META-INF/maven.xml @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 783a1abe285..9bf76506d79 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -28,13 +28,13 @@ org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification - org.jetbrains.jet.plugin.configuration.ui.NonConfiguredKotlinProjectComponent + org.jetbrains.kotlin.idea.configuration.ui.NonConfiguredKotlinProjectComponent org.jetbrains.jet.plugin.ktSignature.KotlinSignatureInJavaMarkerUpdater - org.jetbrains.jet.plugin.configuration.ui.AbsentJdkAnnotationsComponent + org.jetbrains.kotlin.idea.configuration.ui.AbsentJdkAnnotationsComponent @@ -142,7 +142,7 @@ - - + @@ -235,7 +235,7 @@ - + - - - - - - - + + + + + + + - - + - - + + @@ -382,13 +382,13 @@ - - - + + + - - - + + + - - - - - + + + + + @@ -447,9 +447,9 @@ canCloseContents="true" /> - - + + + implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.JetTargetElementEvaluator" /> org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyAction diff --git a/idea/src/org/jetbrains/jet/plugin/JetModuleTypeManagerImpl.java b/idea/src/org/jetbrains/jet/plugin/JetModuleTypeManagerImpl.java index 5209ac1cd88..3a577cc00f8 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetModuleTypeManagerImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/JetModuleTypeManagerImpl.java @@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.configuration.JetModuleTypeManager; +import org.jetbrains.kotlin.idea.configuration.JetModuleTypeManager; public class JetModuleTypeManagerImpl extends JetModuleTypeManager { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java index 1ee577a4a1a..d5bc14801f9 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java @@ -25,7 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.configuration.JetModuleTypeManager; +import org.jetbrains.kotlin.idea.configuration.JetModuleTypeManager; import java.util.Arrays; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinInProjectAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinInProjectAction.java index d91a4e53e63..eca90aa0ec7 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinInProjectAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinInProjectAction.java @@ -23,9 +23,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; -import org.jetbrains.jet.plugin.configuration.KotlinJsModuleConfigurator; -import org.jetbrains.jet.plugin.configuration.KotlinProjectConfigurator; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator; +import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinJsInProjectAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinJsInProjectAction.java index ee793904b61..d4629d7015e 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinJsInProjectAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ConfigureKotlinJsInProjectAction.java @@ -21,9 +21,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; -import org.jetbrains.jet.plugin.configuration.KotlinJsModuleConfigurator; -import org.jetbrains.jet.plugin.configuration.KotlinProjectConfigurator; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator; +import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator; public class ConfigureKotlinJsInProjectAction extends AnAction { diff --git a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java index 40a4549647e..869edda72c5 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/NewKotlinFileAction.java @@ -31,7 +31,7 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; import org.jetbrains.jet.plugin.JetIcons; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.JetFileType; diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt index 9f9e2a8c72b..64b193e28a8 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt @@ -28,7 +28,7 @@ import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.* import org.jetbrains.kotlin.j2k.* import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.editor.JetEditorOptions +import org.jetbrains.kotlin.idea.editor.JetEditorOptions import java.awt.datatransfer.Transferable import com.intellij.openapi.util.TextRange import com.intellij.psi.codeStyle.CodeStyleManager diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/KotlinPasteFromJavaDialog.java b/idea/src/org/jetbrains/jet/plugin/conversion/copy/KotlinPasteFromJavaDialog.java index 0533f796014..249b4766e4a 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/KotlinPasteFromJavaDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/conversion/copy/KotlinPasteFromJavaDialog.java @@ -20,7 +20,7 @@ import com.intellij.CommonBundle; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.editor.JetEditorOptions; +import org.jetbrains.kotlin.idea.editor.JetEditorOptions; import javax.swing.*; import java.awt.*; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index dacae681bf9..a617ab13e80 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; import org.jetbrains.kotlin.idea.references.JetReference; -import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchPackage; +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchPackage; import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java b/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java index 34eb793e6ea..11d496ea1f2 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java @@ -39,11 +39,11 @@ import com.intellij.util.indexing.ID; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.load.java.AbiVersionUtil; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; -import org.jetbrains.jet.plugin.configuration.KotlinJavaModuleConfigurator; -import org.jetbrains.jet.plugin.framework.JSLibraryStdPresentationProvider; -import org.jetbrains.jet.plugin.framework.JavaRuntimePresentationProvider; -import org.jetbrains.jet.plugin.framework.LibraryPresentationProviderUtil; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator; +import org.jetbrains.kotlin.idea.framework.JSLibraryStdPresentationProvider; +import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider; +import org.jetbrains.kotlin.idea.framework.LibraryPresentationProviderUtil; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.utils.PathUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java b/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java index a08aed5f3d7..1fec761deea 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java @@ -38,9 +38,9 @@ import com.intellij.util.text.VersionComparatorUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetPluginUtil; -import org.jetbrains.jet.plugin.framework.JSLibraryStdPresentationProvider; -import org.jetbrains.jet.plugin.framework.JavaRuntimePresentationProvider; -import org.jetbrains.jet.plugin.framework.LibraryPresentationProviderUtil; +import org.jetbrains.kotlin.idea.framework.JSLibraryStdPresentationProvider; +import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider; +import org.jetbrains.kotlin.idea.framework.LibraryPresentationProviderUtil; import javax.swing.event.HyperlinkEvent; import java.io.IOException; diff --git a/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java b/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java index 29d676f2833..881f8353b3f 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java @@ -47,10 +47,10 @@ import com.intellij.ui.EditorNotifications; import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; -import org.jetbrains.jet.plugin.configuration.KotlinJavaModuleConfigurator; -import org.jetbrains.jet.plugin.configuration.KotlinProjectConfigurator; -import org.jetbrains.jet.plugin.framework.JavaRuntimePresentationProvider; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator; +import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator; +import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider; import org.jetbrains.kotlin.idea.JetFileType; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.java index 23bc00e6ad4..0c28675fe6a 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinInProjectUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinNotificationManager.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt similarity index 86% rename from idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinNotificationManager.kt rename to idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt index 7cdf15b2a5b..2964160cc6c 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ConfigureKotlinNotificationManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinNotificationManager.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration +package org.jetbrains.kotlin.idea.configuration import com.intellij.openapi.project.Project -import org.jetbrains.jet.plugin.configuration.ui.notifications.ConfigureKotlinNotification import com.intellij.notification.NotificationsManager import com.intellij.notification.Notification import com.intellij.openapi.projectRoots.Sdk -import org.jetbrains.jet.plugin.configuration.ui.notifications.AbsentSdkAnnotationsNotification -import org.jetbrains.jet.plugin.configuration.ui.notifications.* +import org.jetbrains.kotlin.idea.configuration.ui.notifications.* object ConfigureKotlinNotificationManager: KotlinSingleNotificationManager { fun notify(project: Project) { diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinAndroidGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinAndroidGradleModuleConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java index b9454584172..22071a9089f 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinAndroidGradleModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.module.Module; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinGradleModuleConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java index e8711ad3c80..7ccc51f6028 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinGradleModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.module.Module; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaMavenConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java index 0c5e93d21c8..71638ea0a6b 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaMavenConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.module.Module; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.idea.maven.dom.model.*; +import org.jetbrains.idea.maven.dom.model.MavenDomPlugin; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; public class KotlinJavaMavenConfigurator extends KotlinMavenConfigurator { diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java index c643f3b4990..df046ad1e65 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavaModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; @@ -24,15 +24,15 @@ import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.framework.JavaRuntimeLibraryDescription; -import org.jetbrains.jet.plugin.framework.JavaRuntimePresentationProvider; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil; +import org.jetbrains.kotlin.idea.framework.JavaRuntimeLibraryDescription; +import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider; import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; -import static org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils.showInfoNotification; +import static org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils.showInfoNotification; public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator { public static final String NAME = "java"; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavascriptMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavascriptMavenConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java index 734a681c064..a790a8ead67 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJavascriptMavenConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.module.Module; import com.intellij.openapi.vfs.VirtualFile; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java index 4a6df5cd82a..454a0d74c5a 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinJsModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.module.Module; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.framework.JSLibraryStdDescription; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; -import org.jetbrains.kotlin.utils.PathUtil; +import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription; import org.jetbrains.kotlin.js.JavaScript; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java index e86118df8d8..8b2bb43ad11 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.codeInsight.CodeInsightUtilCore; import com.intellij.ide.actions.OpenFileAction; @@ -42,9 +42,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.dom.MavenDomUtil; import org.jetbrains.idea.maven.dom.model.*; import org.jetbrains.idea.maven.project.MavenProjectsManager; -import org.jetbrains.kotlin.cli.common.KotlinVersion; import org.jetbrains.jet.plugin.JetPluginUtil; -import org.jetbrains.jet.plugin.framework.ui.ConfigureDialogWithModulesAndVersion; +import org.jetbrains.kotlin.cli.common.KotlinVersion; +import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinProjectConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinProjectConfigurator.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinProjectConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinProjectConfigurator.java index 7d82cead0c7..97b8f9218e6 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinProjectConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinProjectConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.module.Module; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java index 1ce501db493..3f95986b078 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithGradleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithGradleConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.codeInsight.CodeInsightUtilCore; import com.intellij.ide.actions.OpenFileAction; @@ -33,8 +33,8 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.framework.ui.ConfigureDialogWithModulesAndVersion; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; +import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion; import org.jetbrains.plugins.gradle.util.GradleConstants; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory; @@ -48,7 +48,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.util.GrStatementOwner; import java.io.File; import java.util.List; -import static org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils.showInfoNotification; +import static org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils.showInfoNotification; public abstract class KotlinWithGradleConfigurator implements KotlinProjectConfigurator { private static final String[] KOTLIN_VERSIONS = {"0.6.+"}; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java index ac8c44769dc..0b2abd2662a 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinWithLibraryConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; @@ -35,15 +35,15 @@ import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetPluginUtil; -import org.jetbrains.jet.plugin.framework.ui.CreateLibraryDialogWithModules; -import org.jetbrains.jet.plugin.framework.ui.FileUIUtils; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; +import org.jetbrains.kotlin.idea.framework.ui.CreateLibraryDialogWithModules; +import org.jetbrains.kotlin.idea.framework.ui.FileUIUtils; import java.io.File; import java.util.Arrays; import java.util.List; -import static org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils.showInfoNotification; +import static org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils.showInfoNotification; public abstract class KotlinWithLibraryConfigurator implements KotlinProjectConfigurator { public static final String DEFAULT_LIBRARY_DIR = "lib"; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java index 90133035125..c9e70fa5730 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/AbsentJdkAnnotationsComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration.ui; +package org.jetbrains.kotlin.idea.configuration.ui; import com.google.common.collect.Sets; import com.intellij.ProjectTopics; @@ -34,11 +34,11 @@ import com.intellij.openapi.vfs.newvfs.events.*; import com.intellij.util.Alarm; import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.configuration.AbsentSdkAnnotationsNotificationManager; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; -import org.jetbrains.jet.plugin.configuration.ui.notifications.NotificationsPackage; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil; +import org.jetbrains.kotlin.idea.configuration.AbsentSdkAnnotationsNotificationManager; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.ui.notifications.NotificationsPackage; import java.util.Collection; import java.util.List; @@ -137,4 +137,4 @@ public class AbsentJdkAnnotationsComponent extends AbstractProjectComponent { ? KotlinRuntimeLibraryUtil.androidSdkAnnotationsArePresent(sdk) && !KotlinRuntimeLibraryUtil.jdkAnnotationsArePresent(sdk) : KotlinRuntimeLibraryUtil.jdkAnnotationsArePresent(sdk); } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/NonConfiguredKotlinProjectComponent.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/NonConfiguredKotlinProjectComponent.java similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/configuration/ui/NonConfiguredKotlinProjectComponent.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/ui/NonConfiguredKotlinProjectComponent.java index f20366fdadd..c5d17fa817b 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/NonConfiguredKotlinProjectComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/NonConfiguredKotlinProjectComponent.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration.ui; +package org.jetbrains.kotlin.idea.configuration.ui; import com.intellij.notification.NotificationDisplayType; import com.intellij.notification.NotificationsConfiguration; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupManager; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; public class NonConfiguredKotlinProjectComponent extends AbstractProjectComponent { public static final String CONFIGURE_NOTIFICATION_GROUP_ID = "Configure Kotlin in Project"; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt rename to idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt index 9275e899359..2cccb4269eb 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration.ui.notifications +package org.jetbrains.kotlin.idea.configuration.ui.notifications import com.intellij.notification.Notification import com.intellij.notification.NotificationListener @@ -22,7 +22,7 @@ import com.intellij.notification.NotificationType import com.intellij.openapi.projectRoots.Sdk import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil import javax.swing.event.HyperlinkEvent -import org.jetbrains.jet.plugin.configuration.ui.AbsentJdkAnnotationsComponent +import org.jetbrains.kotlin.idea.configuration.ui.AbsentJdkAnnotationsComponent public class AbsentSdkAnnotationsNotification(sdks: Collection, title: String, val text: String) : Notification( diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/ConfigureKotlinNotification.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/ConfigureKotlinNotification.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/ConfigureKotlinNotification.java rename to idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/ConfigureKotlinNotification.java index da0bd802ee6..66d56f1b47f 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/ui/notifications/ConfigureKotlinNotification.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/ConfigureKotlinNotification.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration.ui.notifications; +package org.jetbrains.kotlin.idea.configuration.ui.notifications; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; @@ -24,9 +24,9 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; -import org.jetbrains.jet.plugin.configuration.KotlinProjectConfigurator; -import org.jetbrains.jet.plugin.configuration.ui.NonConfiguredKotlinProjectComponent; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator; +import org.jetbrains.kotlin.idea.configuration.ui.NonConfiguredKotlinProjectComponent; import javax.swing.event.HyperlinkEvent; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/editor/JetEditorOptions.java b/idea/src/org/jetbrains/kotlin/idea/editor/JetEditorOptions.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/editor/JetEditorOptions.java rename to idea/src/org/jetbrains/kotlin/idea/editor/JetEditorOptions.java index c1ea3045410..445096aae81 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/JetEditorOptions.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/JetEditorOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor; +package org.jetbrains.kotlin.idea.editor; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.ServiceManager; diff --git a/idea/src/org/jetbrains/jet/plugin/editor/JetLtGtTypingUtils.java b/idea/src/org/jetbrains/kotlin/idea/editor/JetLtGtTypingUtils.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/editor/JetLtGtTypingUtils.java rename to idea/src/org/jetbrains/kotlin/idea/editor/JetLtGtTypingUtils.java index bca242c96fd..49140ccb0eb 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/JetLtGtTypingUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/JetLtGtTypingUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor; +package org.jetbrains.kotlin.idea.editor; import com.intellij.codeInsight.editorActions.JavaBackspaceHandler; import com.intellij.codeInsight.editorActions.JavaTypedHandler; diff --git a/idea/src/org/jetbrains/jet/plugin/editor/JetSettingEditorConfigurable.java b/idea/src/org/jetbrains/kotlin/idea/editor/JetSettingEditorConfigurable.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/editor/JetSettingEditorConfigurable.java rename to idea/src/org/jetbrains/kotlin/idea/editor/JetSettingEditorConfigurable.java index 6223d5d252f..00722a5bcef 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/JetSettingEditorConfigurable.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/JetSettingEditorConfigurable.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor; +package org.jetbrains.kotlin.idea.editor; import com.intellij.openapi.options.BeanConfigurable; import com.intellij.openapi.options.UnnamedConfigurable; diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java rename to idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java index 3c520481df0..ad3290c379d 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinBackspaceHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor; +package org.jetbrains.kotlin.idea.editor; import com.intellij.codeInsight.editorActions.BackspaceHandlerDelegate; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/editor/KotlinEnterHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt index 3e621e7112b..f8909810a7f 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinEnterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEnterHandler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor +package org.jetbrains.kotlin.idea.editor import com.intellij.codeInsight.editorActions.enter.EnterHandlerDelegateAdapter import com.intellij.psi.PsiFile diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinQuoteHandler.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java rename to idea/src/org/jetbrains/kotlin/idea/editor/KotlinQuoteHandler.java index e6df1f0dfef..07bbcfeacc1 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinQuoteHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor; +package org.jetbrains.kotlin.idea.editor; import com.intellij.codeInsight.editorActions.QuoteHandler; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt index 9660a463530..1c49cf847c8 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinSmartEnterHandler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor +package org.jetbrains.kotlin.idea.editor -import org.jetbrains.jet.plugin.editor.fixers.* +import org.jetbrains.kotlin.idea.editor.fixers.* import com.intellij.lang.SmartEnterProcessorWithFixers import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiFile diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java rename to idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java index 8dad93422d3..1b65ba76bc8 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor; +package org.jetbrains.kotlin.idea.editor; import com.intellij.codeInsight.AutoPopupController; import com.intellij.codeInsight.CodeInsightSettings; @@ -44,8 +44,8 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.JetNodeTypes; -import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.JetFile; public class KotlinTypedHandler extends TypedHandlerDelegate { private final static TokenSet CONTROL_FLOW_EXPRESSIONS = TokenSet.create( diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinDoWhileFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinDoWhileFixer.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinDoWhileFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinDoWhileFixer.kt index 4e91d3961ca..63c5e92f267 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinDoWhileFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinDoWhileFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.lang.SmartEnterProcessorWithFixers -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler +import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetDoWhileExpression diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinForConditionFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinForConditionFixer.kt similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinForConditionFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinForConditionFixer.kt index 865e2eb7b2a..944994043f3 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinForConditionFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinForConditionFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers -import org.jetbrains.kotlin.psi.JetWhileExpression import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetForExpression diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt index 9df1c42e662..6442f7db0ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionDeclarationBodyFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.lang.SmartEnterProcessorWithFixers import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler +import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionParametersFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionParametersFixer.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionParametersFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionParametersFixer.kt index 3aa99c8a879..d8b592b7de0 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinFunctionParametersFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinFunctionParametersFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.lang.SmartEnterProcessorWithFixers import com.intellij.psi.PsiElement -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler +import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetNamedFunction diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinIfConditionFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinIfConditionFixer.kt similarity index 78% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinIfConditionFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinIfConditionFixer.kt index 8be3f1ec04f..e7aeb9eb297 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinIfConditionFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinIfConditionFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler -import com.intellij.lang.SmartEnterProcessorWithFixers -import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetIfExpression -import com.intellij.psi.util.PsiTreeUtil -import com.intellij.openapi.util.TextRange public class KotlinIfConditionFixer : MissingConditionFixer() { override val keyword = "if" diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt index e06648f5a8c..53f34e38a46 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingForOrWhileBodyFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.lang.SmartEnterProcessorWithFixers -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler +import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetWhileExpression diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingIfBranchFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingIfBranchFixer.kt similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingIfBranchFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingIfBranchFixer.kt index 57f3d0966a4..4f5c4d96fa9 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingIfBranchFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingIfBranchFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.lang.SmartEnterProcessorWithFixers -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler +import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement -import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetIfExpression -import org.jetbrains.jet.plugin.formatter.JetBlock import org.jetbrains.kotlin.psi.JetBlockExpression public class KotlinMissingIfBranchFixer : SmartEnterProcessorWithFixers.Fixer() { diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingWhenBodyFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingWhenBodyFixer.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingWhenBodyFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingWhenBodyFixer.kt index 5f308e14b15..5cedec5da00 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinMissingWhenBodyFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingWhenBodyFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.lang.SmartEnterProcessorWithFixers -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler +import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetWhenExpression diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhenSubjectCaretFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinWhenSubjectCaretFixer.kt similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhenSubjectCaretFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinWhenSubjectCaretFixer.kt index c114db19f85..dd8e59ad6f2 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhenSubjectCaretFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinWhenSubjectCaretFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.psi.PsiElement import com.intellij.lang.SmartEnterProcessorWithFixers -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler +import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetWhenExpression diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhileConditionFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinWhileConditionFixer.kt similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhileConditionFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinWhileConditionFixer.kt index 5085d9b1ebe..2b295a9b421 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/KotlinWhileConditionFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinWhileConditionFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers -import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetWhileExpression diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/MissingConditionFixer.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/MissingConditionFixer.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/MissingConditionFixer.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/MissingConditionFixer.kt index 5428f9bb235..f6e3dc2654e 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/MissingConditionFixer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/MissingConditionFixer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.lang.SmartEnterProcessorWithFixers -import org.jetbrains.jet.plugin.editor.KotlinSmartEnterHandler +import org.jetbrains.kotlin.idea.editor.KotlinSmartEnterHandler import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement @@ -61,4 +61,4 @@ abstract class MissingConditionFixer() : SmartEnterProcessorWithF abstract fun getLeftParenthesis(element: T): PsiElement? abstract fun getRightParenthesis(element: T): PsiElement? abstract fun getBody(element: T): PsiElement? -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/editor/fixers/fixersUtil.kt b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/fixersUtil.kt similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/editor/fixers/fixersUtil.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/fixers/fixersUtil.kt index 7b95cb43fba..1a9055562f8 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/fixers/fixersUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/fixers/fixersUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.fixers +package org.jetbrains.kotlin.idea.editor.fixers import com.intellij.psi.PsiElement import com.intellij.openapi.util.TextRange @@ -25,4 +25,4 @@ val TextRange.start: Int get() = getStartOffset() val TextRange.end: Int get() = getEndOffset() fun PsiElement.startLine(doc: Document): Int = doc.getLineNumber(range.start) -fun PsiElement?.isWithCaret(caret: Int) = this?.getTextRange()?.contains(caret) == true \ No newline at end of file +fun PsiElement?.isWithCaret(caret: Int) = this?.getTextRange()?.contains(caret) == true diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCodeBlockSelectioner.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCodeBlockSelectioner.kt index d3f32878afe..1e65d1f9380 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinCodeBlockSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinCodeBlockSelectioner.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.wordSelection +package org.jetbrains.kotlin.idea.editor.wordSelection -import com.intellij.codeInsight.editorActions.wordSelection.BasicSelectioner import com.intellij.lang.ASTNode import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.PsiWhiteSpace -import com.intellij.psi.impl.source.tree.LeafPsiElement import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.kotlin.psi.JetWhenExpression import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDeclarationSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinDeclarationSelectioner.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDeclarationSelectioner.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinDeclarationSelectioner.kt index 495c4dc496e..f5218e8af9c 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDeclarationSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinDeclarationSelectioner.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.wordSelection +package org.jetbrains.kotlin.idea.editor.wordSelection -import com.intellij.codeInsight.editorActions.wordSelection.BasicSelectioner import com.intellij.psi.PsiElement import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDocCommentSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinDocCommentSelectioner.kt similarity index 78% rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDocCommentSelectioner.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinDocCommentSelectioner.kt index 0d92509b4e7..a612b1c4649 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinDocCommentSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinDocCommentSelectioner.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.wordSelection +package org.jetbrains.kotlin.idea.editor.wordSelection -import com.intellij.codeInsight.editorActions.wordSelection.BasicSelectioner -import com.intellij.lang.ASTNode import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement -import com.intellij.psi.PsiWhiteSpace -import org.jetbrains.kotlin.lexer.JetTokens -import java.util.ArrayList import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase import org.jetbrains.kotlin.kdoc.psi.api.KDoc diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt index d31d13baf51..58e2c2e9f70 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinListSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinListSelectioner.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.wordSelection +package org.jetbrains.kotlin.idea.editor.wordSelection import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinStatementGroupSelectioner.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinStatementGroupSelectioner.kt index 31aeaf02965..b941abd0085 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStatementGroupSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinStatementGroupSelectioner.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.wordSelection +package org.jetbrains.kotlin.idea.editor.wordSelection import com.intellij.openapi.editor.Editor import com.intellij.openapi.util.TextRange diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStringLiteralSelectioner.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinStringLiteralSelectioner.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStringLiteralSelectioner.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinStringLiteralSelectioner.kt index 887acb3343e..839a77e3af3 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinStringLiteralSelectioner.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinStringLiteralSelectioner.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.wordSelection +package org.jetbrains.kotlin.idea.editor.wordSelection import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandlerBase import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinWordSelectionFilter.kt b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinWordSelectionFilter.kt rename to idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt index 4416adaca2c..e342863544c 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinWordSelectionFilter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/editor/wordSelection/KotlinWordSelectionFilter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.editor.wordSelection +package org.jetbrains.kotlin.idea.editor.wordSelection import com.intellij.openapi.util.Condition import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt index 75e14566d0b..5354232824b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt @@ -24,7 +24,7 @@ import com.intellij.refactoring.util.RefactoringDescriptionLocation import com.intellij.usageView.UsageViewLongNameLocation import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.asJava.unwrapped -import org.jetbrains.jet.plugin.search.usagesSearch.descriptor +import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor import org.jetbrains.kotlin.resolve.DescriptorUtils import com.intellij.refactoring.util.CommonRefactoringUtil diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java index f028e73ec34..67fcb059bcd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.findUsages.dialogs; import com.intellij.ui.SimpleColoredComponent; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchPackage; +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchPackage; import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/findUsagesOptions.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/findUsagesOptions.kt index db031c979c7..cb5d2ddaf47 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/findUsagesOptions.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/findUsagesOptions.kt @@ -19,15 +19,15 @@ package org.jetbrains.kotlin.idea.findUsages import com.intellij.find.findUsages.JavaMethodFindUsagesOptions import com.intellij.openapi.project.Project import com.intellij.find.findUsages.JavaClassFindUsagesOptions -import org.jetbrains.jet.plugin.search.usagesSearch.ClassUsagesSearchHelper -import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchTarget +import org.jetbrains.kotlin.idea.search.usagesSearch.ClassUsagesSearchHelper +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchTarget import com.intellij.psi.PsiNamedElement -import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchLocation +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchLocation import com.intellij.find.findUsages.FindUsagesOptions -import org.jetbrains.jet.plugin.search.usagesSearch.PropertyUsagesSearchHelper +import org.jetbrains.kotlin.idea.search.usagesSearch.PropertyUsagesSearchHelper import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.plugin.search.usagesSearch.ClassDeclarationsUsagesSearchHelper -import org.jetbrains.jet.plugin.search.usagesSearch.FunctionUsagesSearchHelper +import org.jetbrains.kotlin.idea.search.usagesSearch.ClassDeclarationsUsagesSearchHelper +import org.jetbrains.kotlin.idea.search.usagesSearch.FunctionUsagesSearchHelper import com.intellij.find.findUsages.JavaVariableFindUsagesOptions public class KotlinClassFindUsagesOptions(project: Project) : JavaClassFindUsagesOptions(project) { diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt index 8baa681b938..6448217f039 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt @@ -30,12 +30,12 @@ import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinFindClassUsagesDialog -import org.jetbrains.jet.plugin.search.declarationsSearch.HierarchySearchRequest -import org.jetbrains.jet.plugin.search.declarationsSearch.searchInheritors +import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest +import org.jetbrains.kotlin.idea.search.declarationsSearch.searchInheritors import org.jetbrains.kotlin.idea.findUsages.toSearchTarget import org.jetbrains.kotlin.idea.findUsages.toClassHelper import org.jetbrains.kotlin.idea.findUsages.toClassDeclarationsHelper -import org.jetbrains.jet.plugin.search.usagesSearch.search +import org.jetbrains.kotlin.idea.search.usagesSearch.search import org.jetbrains.jet.plugin.util.application.runReadAction import java.util.Collections import com.intellij.find.findUsages.JavaFindUsagesHandler diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.java index 66821323cdf..2b9743c825e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.java @@ -30,15 +30,15 @@ import com.intellij.usageView.UsageInfo; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.search.declarationsSearch.DeclarationsSearchPackage; -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 org.jetbrains.kotlin.idea.findUsages.*; import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinFindFunctionUsagesDialog; import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinFindPropertyUsagesDialog; +import org.jetbrains.kotlin.idea.search.declarationsSearch.DeclarationsSearchPackage; +import org.jetbrains.kotlin.idea.search.declarationsSearch.HierarchySearchRequest; +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearch; +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchHelper; +import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchRequest; import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetParameter; diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt index 5f6f9ec9fba..054bc237374 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt @@ -25,9 +25,9 @@ import com.intellij.util.Processor import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinTypeParameterFindUsagesDialog -import org.jetbrains.jet.plugin.search.usagesSearch.DefaultSearchHelper +import org.jetbrains.kotlin.idea.search.usagesSearch.DefaultSearchHelper import org.jetbrains.kotlin.idea.findUsages.toSearchTarget -import org.jetbrains.jet.plugin.search.usagesSearch.search +import org.jetbrains.kotlin.idea.search.usagesSearch.search import org.jetbrains.jet.plugin.util.application.runReadAction public class KotlinTypeParameterFindUsagesHandler( diff --git a/idea/src/org/jetbrains/jet/plugin/framework/CustomLibraryDescriptorWithDefferConfig.java b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDefferConfig.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/framework/CustomLibraryDescriptorWithDefferConfig.java rename to idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDefferConfig.java index 000261c1155..2d01e651da7 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/CustomLibraryDescriptorWithDefferConfig.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDefferConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.google.common.collect.Lists; import com.intellij.framework.library.LibraryVersionProperties; @@ -34,11 +34,11 @@ import com.intellij.openapi.vfs.VirtualFile; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; -import org.jetbrains.jet.plugin.configuration.KotlinWithLibraryConfigurator; -import org.jetbrains.jet.plugin.framework.ui.CreateLibraryDialog; -import org.jetbrains.jet.plugin.framework.ui.FileUIUtils; import org.jetbrains.jet.plugin.util.projectStructure.ProjectStructurePackage; +import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; +import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator; +import org.jetbrains.kotlin.idea.framework.ui.CreateLibraryDialog; +import org.jetbrains.kotlin.idea.framework.ui.FileUIUtils; import javax.swing.*; import java.io.File; @@ -46,7 +46,7 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.plugin.configuration.KotlinWithLibraryConfigurator.getFileInDir; +import static org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.getFileInDir; public abstract class CustomLibraryDescriptorWithDefferConfig extends CustomLibraryDescription { diff --git a/idea/src/org/jetbrains/jet/plugin/framework/FrameworksCompatibilityUtils.java b/idea/src/org/jetbrains/kotlin/idea/framework/FrameworksCompatibilityUtils.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/framework/FrameworksCompatibilityUtils.java rename to idea/src/org/jetbrains/kotlin/idea/framework/FrameworksCompatibilityUtils.java index fa1f81601c7..f4307786cd2 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/FrameworksCompatibilityUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/FrameworksCompatibilityUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.FrameworkType; import com.intellij.openapi.roots.LibraryOrderEntry; @@ -23,7 +23,6 @@ import com.intellij.openapi.roots.OrderEntry; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryKind; -import com.intellij.openapi.roots.ui.configuration.libraries.CustomLibraryDescription; import com.intellij.openapi.roots.ui.configuration.libraries.LibraryPresentationManager; import com.intellij.openapi.ui.Messages; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSFrameworkSupportProvider.java b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/framework/JSFrameworkSupportProvider.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.java index 3372edf3a85..a9b17b2b720 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSFrameworkSupportProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.FrameworkTypeEx; import com.intellij.framework.addSupport.FrameworkSupportInModuleConfigurable; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSFrameworkType.java b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/framework/JSFrameworkType.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java index 628704ec339..b795f880173 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSFrameworkType.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.FrameworkTypeEx; import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryCreateOptions.java b/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryCreateOptions.java similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/framework/JSLibraryCreateOptions.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryCreateOptions.java index ff0b08d81f5..0017c114fe7 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryCreateOptions.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryCreateOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import org.jetbrains.annotations.Nullable; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdDescription.java b/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdDescription.java similarity index 86% rename from idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdDescription.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdDescription.java index 8077d4cf1ee..c3459a31f4a 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdDescription.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.google.common.collect.Sets; import com.intellij.openapi.project.Project; @@ -22,12 +22,12 @@ import com.intellij.openapi.roots.libraries.LibraryKind; import com.intellij.openapi.roots.libraries.NewLibraryConfiguration; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.plugin.configuration.KotlinJsModuleConfigurator; +import org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator; import java.util.Set; -import static org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils.getConfiguratorByName; -import static org.jetbrains.jet.plugin.configuration.KotlinJsModuleConfigurator.NAME; +import static org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils.getConfiguratorByName; +import static org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator.NAME; public class JSLibraryStdDescription extends CustomLibraryDescriptorWithDefferConfig { public static final LibraryKind KOTLIN_JAVASCRIPT_KIND = LibraryKind.create("kotlin-js-stdlib"); diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java b/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdPresentationProvider.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdPresentationProvider.java index a7d23987cef..d2436ee9b7c 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdPresentationProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdPresentationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.library.LibraryVersionProperties; import com.intellij.openapi.roots.OrderRootType; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JavaFrameworkSupportProvider.java b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/framework/JavaFrameworkSupportProvider.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.java index 3a6c0c00c0f..e18fb010d1a 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JavaFrameworkSupportProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.FrameworkTypeEx; import com.intellij.framework.addSupport.FrameworkSupportInModuleConfigurable; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JavaFrameworkType.java b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/framework/JavaFrameworkType.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.java index b02c4d6aad7..de3c35b1cc5 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JavaFrameworkType.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.FrameworkTypeEx; import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java b/idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimeLibraryDescription.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimeLibraryDescription.java index b053e880678..c32543b7d7e 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimeLibraryDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.google.common.collect.Sets; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.libraries.LibraryKind; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.configuration.KotlinJavaModuleConfigurator; +import org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator; import java.util.Set; @@ -39,4 +39,4 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescriptorWithDe public JavaRuntimeLibraryDescription(@Nullable Project project) { super(project, KotlinJavaModuleConfigurator.NAME, LIBRARY_NAME, DIALOG_TITLE, LIBRARY_CAPTION, KOTLIN_JAVA_RUNTIME_KIND, SUITABLE_LIBRARY_KINDS); } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimePresentationProvider.java b/idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimePresentationProvider.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimePresentationProvider.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimePresentationProvider.java index 2a9e744c041..85ac31ba61c 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimePresentationProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimePresentationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.library.LibraryVersionProperties; import com.intellij.openapi.roots.OrderRootType; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryPresentationProvider.java b/idea/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryPresentationProvider.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryPresentationProvider.java rename to idea/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryPresentationProvider.java index fcaa0de9dcc..733de0063c1 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryPresentationProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryPresentationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.library.LibraryVersionProperties; import com.intellij.openapi.roots.libraries.LibraryKind; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/KotlinModuleBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt similarity index 79% rename from idea/src/org/jetbrains/jet/plugin/framework/KotlinModuleBuilder.kt rename to idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt index 2e0a4ce1c3a..c84762d167b 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/KotlinModuleBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,22 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework +package org.jetbrains.kotlin.idea.framework import com.intellij.ide.util.projectWizard.JavaModuleBuilder import com.intellij.ide.util.projectWizard.ModuleWizardStep import com.intellij.ide.util.projectWizard.SettingsStep -import com.intellij.openapi.module.ModifiableModuleModel -import com.intellij.openapi.module.Module -import com.intellij.openapi.module.ModuleWithNameAlreadyExists -import com.intellij.openapi.options.ConfigurationException -import com.intellij.openapi.util.InvalidDataException -import org.jdom.JDOMException -import org.jetbrains.annotations.Nullable import org.jetbrains.jet.plugin.JetIcons import org.jetbrains.jet.plugin.project.TargetPlatform -import javax.swing.* -import java.io.IOException import com.intellij.openapi.roots.ui.configuration.ModulesProvider import com.intellij.ide.util.projectWizard.WizardContext diff --git a/idea/src/org/jetbrains/jet/plugin/framework/KotlinModuleSettingStep.java b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/framework/KotlinModuleSettingStep.java rename to idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java index dca091e7be3..ec44f72da92 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/KotlinModuleSettingStep.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleSettingStep.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.facet.impl.ui.libraries.LibraryCompositionSettings; import com.intellij.facet.impl.ui.libraries.LibraryOptionsPanel; @@ -137,4 +137,4 @@ public class KotlinModuleSettingStep extends ModuleWizardStep { return libraryOptionsPanel; } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/framework/KotlinTemplatesFactory.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/framework/KotlinTemplatesFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt index 64e3d2df0df..0ad65ddf841 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/KotlinTemplatesFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework +package org.jetbrains.kotlin.idea.framework import com.intellij.ide.util.projectWizard.WizardContext import com.intellij.platform.ProjectTemplatesFactory diff --git a/idea/src/org/jetbrains/jet/plugin/framework/LibraryPresentationProviderUtil.java b/idea/src/org/jetbrains/kotlin/idea/framework/LibraryPresentationProviderUtil.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/framework/LibraryPresentationProviderUtil.java rename to idea/src/org/jetbrains/kotlin/idea/framework/LibraryPresentationProviderUtil.java index b395f3ee1df..9dfa8a3eb06 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/LibraryPresentationProviderUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/LibraryPresentationProviderUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework; +package org.jetbrains.kotlin.idea.framework; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseLibraryPathPanel.form b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.form similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseLibraryPathPanel.form rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.form index 01a2f50a85e..dca86975aea 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseLibraryPathPanel.form +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.form @@ -1,5 +1,5 @@ -
+ diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseLibraryPathPanel.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseLibraryPathPanel.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.java index 608c57290e2..c918ec80257 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseLibraryPathPanel.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseLibraryPathPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.intellij.ui.JBColor; import com.intellij.util.EventDispatcher; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.form b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.form similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.form rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.form index b0a937a1cf8..bdb8b28d305 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.form +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.form @@ -1,5 +1,5 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.java index f6cb9e28e10..de71d2a52a6 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChooseModulePanel.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChooseModulePanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -24,7 +24,6 @@ import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import javax.swing.*; -import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChoosePathDialog.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChoosePathDialog.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/ChoosePathDialog.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/ChoosePathDialog.java index c8dc4b75a69..04f764d39eb 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ChoosePathDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ChoosePathDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; @@ -78,4 +78,4 @@ class ChoosePathDialog extends DialogWrapper { public String getPath() { return myPathField.getText().trim(); } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ConfigureDialogWithModulesAndVersion.form b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.form similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/ConfigureDialogWithModulesAndVersion.form rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.form index 166367d8a50..820b9d5d78e 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ConfigureDialogWithModulesAndVersion.form +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.form @@ -1,5 +1,5 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ConfigureDialogWithModulesAndVersion.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/ConfigureDialogWithModulesAndVersion.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java index 7ff82a0d9a9..85f516970bd 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ConfigureDialogWithModulesAndVersion.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ConfigureDialogWithModulesAndVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.google.common.collect.Lists; import com.google.gson.JsonArray; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CopyIntoPanel.form b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.form similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CopyIntoPanel.form rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.form index 1c663110868..2b2cc9ab1e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CopyIntoPanel.form +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.form @@ -1,5 +1,5 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CopyIntoPanel.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CopyIntoPanel.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.java index c96a24f4a74..b88edd737cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CopyIntoPanel.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CopyIntoPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialog.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialog.java similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialog.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialog.java index a82e6b0aa74..c043843fc9a 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.form b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.form similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.form rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.form index 12520525a3a..a923e368400 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.form +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.form @@ -1,5 +1,5 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.java index fd4ebeedff0..91f97f08bae 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogBase.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogWithModules.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogWithModules.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogWithModules.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogWithModules.java index c6e6bb556b6..626ab326462 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/CreateLibraryDialogWithModules.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogWithModules.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/FileUIUtils.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/FileUIUtils.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/FileUIUtils.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/FileUIUtils.java index 3b175e26e42..c80eabf1415 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/FileUIUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/FileUIUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -32,7 +32,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import java.awt.*; import java.io.File; import java.io.IOException; import java.util.*; diff --git a/idea/src/org/jetbrains/jet/plugin/framework/ui/ValidityListener.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ValidityListener.java similarity index 88% rename from idea/src/org/jetbrains/jet/plugin/framework/ui/ValidityListener.java rename to idea/src/org/jetbrains/kotlin/idea/framework/ui/ValidityListener.java index 0e47d200f99..2030c7cdf94 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/ui/ValidityListener.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/ValidityListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import java.util.EventListener; public interface ValidityListener extends EventListener { void validityChanged(boolean isValid); -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt index 7d6dd928a18..6b59c3eeb8b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt @@ -30,7 +30,7 @@ import com.intellij.codeInsight.daemon.impl.GutterIconTooltipHelper import com.intellij.psi.PsiElement import java.awt.event.MouseEvent import com.intellij.openapi.project.DumbService -import org.jetbrains.jet.plugin.search.ideaExtensions.KotlinDefinitionsSearcher +import org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinDefinitionsSearcher import com.intellij.psi.search.GlobalSearchScope import com.intellij.openapi.progress.ProgressManager import com.intellij.codeInsight.daemon.impl.MarkerType diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 352b65d6ef0..dabf5a5a69a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -64,7 +64,7 @@ import com.intellij.psi.PsiModifierListOwner import com.intellij.psi.PsiModifier import com.intellij.util.VisibilityUtil import com.intellij.openapi.util.Ref -import org.jetbrains.jet.plugin.search.projectScope +import org.jetbrains.kotlin.idea.search.projectScope import org.jetbrains.kotlin.idea.refactoring.move.getInternalReferencesToUpdateOnPackageNameChange import org.jetbrains.kotlin.idea.refactoring.move.createMoveUsageInfo import org.jetbrains.kotlin.idea.refactoring.move.postProcessMoveUsages diff --git a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/classInheritorsSearch.kt b/idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/classInheritorsSearch.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/classInheritorsSearch.kt rename to idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/classInheritorsSearch.kt index a6e94e4a5b2..d08b5440a37 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/classInheritorsSearch.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/classInheritorsSearch.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.declarationsSearch +package org.jetbrains.kotlin.idea.search.declarationsSearch import com.intellij.psi.PsiClass import com.intellij.util.Query diff --git a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/declarationSearchUtil.kt b/idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/declarationSearchUtil.kt rename to idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt index 99aaa5c8028..fbe54ee483a 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/declarationSearchUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/declarationSearchUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,21 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.declarationsSearch +package org.jetbrains.kotlin.idea.search.declarationsSearch import com.intellij.psi.search.SearchScope import com.intellij.util.Query import com.intellij.util.QueryFactory import com.intellij.util.Processor import com.intellij.openapi.application.QueryExecutorBase -import com.intellij.openapi.progress.ProgressIndicatorProvider import com.intellij.psi.PsiElement import com.intellij.openapi.project.Project import com.intellij.util.EmptyQuery import java.util.Stack import java.util.HashSet import com.intellij.openapi.progress.ProgressIndicatorProvider -import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.psi.psiUtil.contains trait DeclarationSearchRequest { diff --git a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/overridersSearch.kt b/idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/overridersSearch.kt rename to idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt index 217f32ac6b6..9674b65d25a 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/declarationsSearch/overridersSearch.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/declarationsSearch/overridersSearch.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.declarationsSearch +package org.jetbrains.kotlin.idea.search.declarationsSearch import com.intellij.psi.PsiMethod import com.intellij.psi.util.PsiUtil @@ -35,7 +35,7 @@ import com.intellij.psi.search.searches.DirectClassInheritorsSearch import com.intellij.util.EmptyQuery import com.intellij.util.MergeQuery import org.jetbrains.kotlin.asJava.toLightMethods -import org.jetbrains.jet.plugin.search.allScope +import org.jetbrains.kotlin.idea.search.allScope fun PsiElement.isOverridableElement(): Boolean = when (this) { is PsiMethod -> PsiUtil.canBeOverriden(this) diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/JetTargetElementEvaluator.kt similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt rename to idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/JetTargetElementEvaluator.kt index f56db18150c..b53cf59850e 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/JetTargetElementEvaluator.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/JetTargetElementEvaluator.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.ideaExtensions +package org.jetbrains.kotlin.idea.search.ideaExtensions import com.intellij.codeInsight.TargetElementEvaluator import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java rename to idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java index d77e0f758e1..3d4d8eb29f9 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.ideaExtensions; +package org.jetbrains.kotlin.idea.search.ideaExtensions; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; @@ -33,17 +33,17 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Processor; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.stubindex.JetAnnotationsIndex; import org.jetbrains.kotlin.psi.JetAnnotationEntry; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.stubindex.JetAnnotationsIndex; -import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java rename to idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java index 9907180ed06..739ccc706ba 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDefinitionsSearcher.java +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.ideaExtensions; +package org.jetbrains.kotlin.idea.search.ideaExtensions; import com.intellij.codeInsight.navigation.MethodImplementationsSearch; import com.intellij.openapi.application.ApplicationManager; @@ -29,9 +29,9 @@ import com.intellij.util.Processor; import com.intellij.util.QueryExecutor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.asJava.LightClassUtil; +import org.jetbrains.kotlin.psi.*; public class KotlinDefinitionsSearcher implements QueryExecutor { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt rename to idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt index 11ec1a707e1..082bbdd6c58 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.ideaExtensions +package org.jetbrains.kotlin.idea.search.ideaExtensions import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.QueryExecutorBase @@ -24,7 +24,7 @@ import com.intellij.psi.search.searches.DirectClassInheritorsSearch import com.intellij.util.Processor import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper import org.jetbrains.kotlin.idea.stubindex.JetSuperClassIndex -import org.jetbrains.jet.plugin.search.fileScope +import org.jetbrains.kotlin.idea.search.fileScope import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope public open class KotlinDirectInheritorsSearcher() : QueryExecutorBase(true) { diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt rename to idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt index e28984c64c3..91bc4c5a187 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.search.ideaExtensions +package org.jetbrains.kotlin.idea.search.ideaExtensions import com.intellij.openapi.application.QueryExecutorBase import com.intellij.psi.PsiReference diff --git a/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java b/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java index 35458a6f2db..66e8f2f4f42 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java +++ b/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java @@ -26,7 +26,7 @@ import com.intellij.openapi.roots.libraries.NewLibraryConfiguration; import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.framework.JSLibraryStdDescription; +import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription; import org.jetbrains.kotlin.test.ConfigLibraryUtil; public class JetStdJSProjectDescriptor implements LightProjectDescriptor { diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java index 7a2eff686db..69e3a013771 100644 --- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java @@ -22,7 +22,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.plugin.editor.JetEditorOptions; +import org.jetbrains.kotlin.idea.editor.JetEditorOptions; public abstract class AbstractJavaToKotlinCopyPasteConversionTest extends LightCodeInsightFixtureTestCase { diff --git a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt index f03300b5a46..53d1327734e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt @@ -37,7 +37,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.module.Module import java.io.File import com.intellij.openapi.roots.ModuleRootModificationUtil -import org.jetbrains.jet.plugin.search.allScope +import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.jet.plugin.util.application.runWriteAction import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex import org.jetbrains.kotlin.psi.JetTreeVisitorVoid diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/AbstractConfigureProjectByChangingFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/configuration/AbstractConfigureProjectByChangingFileTest.java rename to idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java index 0e566b0393a..756302ca843 100644 --- a/idea/tests/org/jetbrains/jet/plugin/configuration/AbstractConfigureProjectByChangingFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureProjectByChangingFileTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureKotlinTest.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureKotlinTest.java rename to idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java index aece3ec63ae..626b8ec4c2b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureKotlinTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.module.Module; @@ -31,8 +31,8 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.plugin.configuration.KotlinWithLibraryConfigurator.FileState; -import static org.jetbrains.jet.plugin.configuration.KotlinWithLibraryConfigurator.LibraryState; +import static org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState; +import static org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.LibraryState; public class ConfigureKotlinTest extends PlatformTestCase { private static final String BASE_PATH = "idea/testData/configuration/"; diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java index aa5dacac102..da06efc5a00 100644 --- a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.configuration; +package org.jetbrains.kotlin.idea.configuration; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/framework/ui/LoadVersionsFromMavenTest.java b/idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java similarity index 91% rename from idea/tests/org/jetbrains/jet/plugin/framework/ui/LoadVersionsFromMavenTest.java rename to idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java index 5ae656dcc5c..381dce225df 100644 --- a/idea/tests/org/jetbrains/jet/plugin/framework/ui/LoadVersionsFromMavenTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/framework/ui/LoadVersionsFromMavenTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.framework.ui; +package org.jetbrains.kotlin.idea.framework.ui; import com.intellij.testFramework.LightIdeaTestCase; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt index fc2aacec667..4742f1de90a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt @@ -52,7 +52,7 @@ import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveD import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsOptions import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.search.allScope +import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.test.ConfigLibraryUtil import org.jetbrains.jet.plugin.util.application.runWriteAction diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt index 9e6def9c6c3..7aa51959a72 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.name.isSubpackageOf import org.jetbrains.kotlin.idea.refactoring.move.getString import org.jetbrains.kotlin.idea.refactoring.move.getNullableString -import org.jetbrains.jet.plugin.search.allScope +import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException