From c82308d3bee822114261486894247c5413bfe51a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 21:50:09 +0300 Subject: [PATCH] Rename jet -> kotlin in idea --- .../kotlin/generators/tests/GenerateTests.kt | 28 ++-- .../idea}/JetDescriptorIconProvider.java | 6 +- .../idea}/JetIconProvider.java | 10 +- .../{jet/plugin => kotlin/idea}/JetIcons.java | 4 +- .../IDELightClassGenerationSupport.java | 2 +- .../idea/caches/resolve/KotlinCacheService.kt | 2 +- .../idea/caches/resolve/getModuleInfo.kt | 2 +- .../idea/highlighter/DebugInfoAnnotator.java | 2 +- .../DuplicateJvmSignatureAnnotator.java | 2 +- .../kotlin/idea/highlighter/JetPsiChecker.kt | 2 +- .../inspections/AbstractKotlinInspection.kt | 4 +- .../inspections/IntentionBasedInspection.kt | 4 +- .../RemoveExplicitTypeArgsInspection.kt | 4 +- .../SimplifyBinaryNegationInspection.kt | 4 +- .../idea/project/ProjectStructureUtil.java | 2 +- .../quickfix/KotlinSuppressIntentionAction.kt | 2 +- .../KotlinReferencesSearcher.java | 2 +- .../idea/search/usagesSearch/usagesSearch.kt | 2 +- .../JetClsStructureViewBuilderProvider.kt | 4 +- .../JetStructureViewElement.java | 6 +- .../JetStructureViewFactory.java | 4 +- .../structureView/JetStructureViewModel.java | 4 +- .../KotlinInheritedMembersNodeProvider.kt | 4 +- .../KotlinStructureElementPresentation.java | 10 +- .../idea/stubindex/JetSourceFilterScope.java | 2 +- .../idea}/util/ApplicationUtils.kt | 6 +- .../idea}/util/JetPsiPrecedences.kt | 4 +- .../idea}/util/ProjectRootsUtil.kt | 6 +- .../plugin => kotlin/idea}/util/stringUtil.kt | 6 +- .../KotlinRuntimeLibraryCoreUtil.java | 4 +- .../vfilefinder/IDEVirtualFileFinder.java | 4 +- .../IDEVirtualFileFinderFactory.java | 4 +- .../vfilefinder/KotlinClassFileIndex.java | 5 +- idea/src/META-INF/coverage.xml | 4 +- idea/src/META-INF/junit.xml | 4 +- idea/src/META-INF/kotlin-copyright.xml | 4 +- idea/src/META-INF/plugin.xml | 130 +++++++++--------- idea/src/META-INF/testng-j.xml | 4 +- .../idea}/IdeModeProvider.java | 4 +- .../plugin => kotlin/idea}/JetCommenter.java | 4 +- .../idea}/JetFileFactory.java | 5 +- .../idea}/JetFoldingBuilder.java | 6 +- .../idea}/JetGotoTargetRenderProvider.java | 6 +- .../idea}/JetModuleTypeManagerImpl.java | 4 +- .../idea}/JetPairMatcher.java | 4 +- .../plugin => kotlin/idea}/JetPluginUtil.java | 4 +- .../idea}/JetQuickDocumentationProvider.java | 12 +- .../idea}/PluginStartupComponent.java | 4 +- .../kotlin/idea/actions/JavaToKotlinAction.kt | 4 +- .../idea/actions/NewKotlinFileAction.java | 2 +- .../codeInsight/DescriptorClassMember.java | 2 +- .../KotlinCopyPasteReferenceProcessor.kt | 4 +- .../KotlinSpellcheckingStrategy.kt | 2 +- .../idea/completion/LookupElementFactory.kt | 2 +- .../completion/NamedParametersCompletion.kt | 4 +- .../completion/handlers/GenerateLambda.kt | 2 +- .../smart/MultipleArgumentsItemProvider.kt | 2 +- ...KotlinAndroidGradleModuleConfigurator.java | 2 +- .../KotlinGradleModuleConfigurator.java | 2 +- .../KotlinJavaModuleConfigurator.java | 2 +- .../KotlinMavenConfigurator.java | 2 +- .../KotlinWithLibraryConfigurator.java | 2 +- .../ui/AbsentJdkAnnotationsComponent.java | 2 +- .../AbsentSdkAnnotationsNotification.kt | 2 +- .../copy/ConvertJavaCopyPastePostProcessor.kt | 10 +- .../idea}/conversion/copy/CopiedCode.kt | 5 +- .../copy/KotlinPasteFromJavaDialog.form | 2 +- .../copy/KotlinPasteFromJavaDialog.java | 4 +- .../idea}/conversion/copy/RangeUtils.kt | 6 +- ...rationSettingsFormatConverterProvider.java | 4 +- .../copyright/UpdateKotlinCopyright.java | 4 +- .../UpdateKotlinCopyrightsProvider.java | 4 +- .../idea}/coverage/KotlinCoverageExtension.kt | 6 +- .../idea/debugger/JetPositionManager.kt | 4 +- .../debugger/KotlinSmartStepIntoHandler.kt | 2 +- .../evaluate/KotlinEvaluateExpressionCache.kt | 2 +- .../evaluate/KotlinEvaluationBuilder.kt | 6 +- .../extractFunctionForDebuggerUtil.kt | 4 +- .../idea}/filters/JetExceptionFilter.java | 10 +- .../filters/JetExceptionFilterFactory.java | 4 +- .../handlers/KotlinFindClassUsagesHandler.kt | 2 +- .../KotlinTypeParameterFindUsagesHandler.kt | 2 +- ...stomLibraryDescriptorWithDefferConfig.java | 2 +- .../idea/framework/JSFrameworkType.java | 2 +- .../JSLibraryStdPresentationProvider.java | 2 +- .../idea/framework/JavaFrameworkType.java | 2 +- .../JavaRuntimePresentationProvider.java | 2 +- .../JsHeaderLibraryPresentationProvider.java | 2 +- .../idea/framework/KotlinModuleBuilder.kt | 2 +- .../idea/framework/KotlinTemplatesFactory.kt | 2 +- .../framework/ui/CreateLibraryDialogBase.java | 2 +- .../idea}/hierarchy/HierarchyUtils.java | 6 +- .../KotlinTypeHierarchyProvider.java | 14 +- .../calls/CalleeReferenceVisitorBase.java | 4 +- .../calls/KotlinCallHierarchyBrowser.java | 6 +- .../KotlinCallHierarchyNodeDescriptor.java | 8 +- .../calls/KotlinCallHierarchyProvider.java | 8 +- .../calls/KotlinCallTreeStructure.java | 6 +- .../KotlinCalleeMethodsTreeStructure.java | 8 +- .../KotlinCallerMethodsTreeStructure.java | 12 +- .../KotlinOverrideHierarchyBrowser.kt | 6 +- .../KotlinOverrideHierarchyProvider.kt | 6 +- .../overrides/KotlinOverrideTreeStructure.kt | 4 +- .../highlighter/JetColorSettingsPage.java | 2 +- .../highlighter/JetLineMarkerProvider.java | 2 +- .../idea}/imports/ImportsUtils.kt | 4 +- .../idea}/imports/KotlinImportOptimizer.kt | 4 +- .../inspections/ExplicitGetInspection.kt | 4 +- .../inspections/IfThenToElvisInspection.kt | 4 +- .../IfThenToSafeAccessInspection.kt | 4 +- .../MoveLambdaInsideParenthesesIntention.kt | 2 +- .../ReplaceWithOperatorAssignIntention.kt | 2 +- .../idea/intentions/SwapBinaryExpression.kt | 2 +- .../AttributeCallReplacementIntention.kt | 6 +- .../branchedTransformationUtils.kt | 4 +- .../internal/KotlinBytecodeToolWindow.java | 16 +-- .../idea}/internal/Location.java | 4 +- .../CreateIncrementalCompilationBackup.kt | 6 +- .../makeBackup/MakeBackupCompileTask.kt | 5 +- .../idea}/internal/makeBackup/makeBackup.kt | 4 +- .../idea}/j2k/IdeaResolverForConverter.kt | 4 +- .../idea}/j2k/J2kPostProcessor.kt | 4 +- .../JoinBlockIntoSingleStatementHandler.kt | 4 +- .../JoinDeclarationAndAssignmentHandler.kt | 5 +- .../k2jsrun/K2JSBrowserProgramRunner.java | 8 +- .../k2jsrun/K2JSConfigurationSettings.java | 4 +- .../idea}/k2jsrun/K2JSRunConfiguration.java | 4 +- .../k2jsrun/K2JSRunConfigurationEditor.form | 2 +- .../k2jsrun/K2JSRunConfigurationEditor.java | 4 +- .../k2jsrun/K2JSRunConfigurationType.java | 8 +- .../idea}/k2jsrun/K2JSRunnerUtils.java | 4 +- .../ktSignature/DeleteSignatureAction.java | 4 +- .../ktSignature/EditSignatureAction.java | 4 +- .../ktSignature/EditSignatureBalloon.java | 4 +- .../KotlinSignatureAnnotationIntention.java | 8 +- .../KotlinSignatureInJavaMarkerProvider.java | 18 +-- .../KotlinSignatureInJavaMarkerUpdater.java | 4 +- .../ktSignature/KotlinSignatureUtil.java | 4 +- .../ShowKotlinSignaturesAction.java | 4 +- .../JetLiveTemplatesProvider.java | 4 +- .../liveTemplates/JetTemplateContextType.java | 4 +- .../KotlinShortenFQNamesProcessor.kt | 4 +- .../AnonymousTemplateEditingListener.java | 8 +- .../macro/BaseJetVariableMacro.java | 6 +- .../macro/JetAnonymousSuperMacro.java | 6 +- .../macro/JetAnyVariableMacro.java | 4 +- .../macro/JetFunctionParametersMacro.java | 4 +- .../macro/JetIterableVariableMacro.java | 4 +- .../macro/JetPsiElementResult.java | 4 +- .../macro/JetSuggestVariableNameMacro.java | 4 +- .../JetFunctionParameterInfoHandler.java | 8 +- .../idea}/presentation/JetClassPresenter.java | 4 +- ...etDefaultNamedDeclarationPresentation.java | 8 +- .../presentation/JetFunctionPresenter.java | 6 +- .../JetLightClassListCellRenderer.java | 4 +- .../presentation/JetObjectPresenter.java | 4 +- .../presentation/JetParameterPresenter.java | 4 +- .../presentation/JetPropertyPresenter.java | 4 +- .../projectView/JetClassObjectTreeNode.java | 2 +- .../projectView/JetClassOrObjectTreeNode.java | 5 +- .../projectView/JetDeclarationTreeNode.java | 4 +- .../idea}/projectView/JetFileTreeNode.java | 2 +- .../projectView/JetProjectViewProvider.java | 4 +- .../idea}/projectView/JetProjectViewUtil.java | 2 +- .../idea/quickfix/AddNameToArgumentFix.java | 2 +- .../kotlin/idea/quickfix/AutoImportFix.kt | 4 +- .../IncorrectSourceRootNameNotification.java | 2 +- .../callableBuilder/CallableBuilder.kt | 2 +- .../idea/refactoring/JetRefactoringUtil.java | 2 +- .../ExtractKotlinFunctionHandler.kt | 4 +- .../ExtractableCodeDescriptor.kt | 2 +- .../extractFunction/ExtractionData.kt | 2 +- .../extractFunction/duplicateUtil.kt | 4 +- .../extractableAnalysisUtil.kt | 4 +- .../extractFunction/extractorUtil.kt | 14 +- .../KotlinIntroduceVariableHandler.java | 8 +- .../idea/refactoring/jetRefactoringUtil.kt | 4 +- .../rename/RenameKotlinFunctionProcessor.kt | 2 +- .../rename/RenameKotlinPropertyProcessor.kt | 2 +- .../idea}/reporter/KotlinReportSubmitter.java | 4 +- .../run/JetJUnitConfigurationProducer.java | 8 +- .../idea}/run/JetRunConfiguration.java | 8 +- .../idea}/run/JetRunConfigurationEditor.form | 2 +- .../idea}/run/JetRunConfigurationEditor.java | 4 +- .../run/JetRunConfigurationProducer.java | 10 +- .../idea}/run/JetRunConfigurationType.java | 6 +- .../run/JetTestNgConfigurationProducer.java | 8 +- .../idea}/util/DebuggerUtils.java | 10 +- .../idea}/util/InfinitePeriodicalTask.java | 4 +- .../idea}/util/JetPsiHeuristicsUtil.java | 14 +- .../idea}/util/LongRunningReadTask.java | 4 +- .../{jet/plugin => kotlin/idea}/util/Maybe.kt | 4 +- .../idea}/util/attachment/attachmentUtils.kt | 6 +- .../idea}/util/projectStructureUtil.kt | 5 +- .../util/psi/patternMatching/JetPsiRange.kt | 7 +- .../util/psi/patternMatching/JetPsiUnifier.kt | 10 +- .../plugin => kotlin/idea}/util/psiFilters.kt | 4 +- .../idea}/util/psiModificationUtil.kt | 4 +- .../idea}/versions/KotlinAbiVersionIndex.java | 4 +- .../versions/KotlinRuntimeLibraryUtil.java | 8 +- .../versions/KotlinUpdatePluginComponent.kt | 8 +- .../OutdatedKotlinRuntimeNotification.java | 6 +- ...edAbiVersionNotificationPanelProvider.java | 6 +- .../inspectionData/inspections.test | 2 +- .../inspectionData/inspections.test | 2 +- .../inspectionData/inspections.test | 2 +- .../inspectionData/inspections.test | 2 +- .../inspectionData/inspections.test | 2 +- .../asJava/FakeLightClassForPackageTest.java | 6 +- .../checkers/AbstractJetJsCheckerTest.java | 4 +- .../checkers/AbstractJetPsiCheckerTest.java | 2 +- .../checkers/KotlinAndJavaCheckerTest.java | 4 +- ...actCompiledKotlinInJavaCompletionTest.java | 4 +- .../AbstractJSBasicCompletionTest.java | 2 +- .../AbstractJvmBasicCompletionTest.java | 2 +- .../AbstractJvmSmartCompletionTest.java | 2 +- ...AbstractJvmWithLibBasicCompletionTest.java | 4 +- .../AbstractKeywordCompletionTest.kt | 2 +- ...tractKotlinSourceInJavaCompletionTest.java | 2 +- ...AbstractMultiFileJvmBasicCompletionTest.kt | 6 +- .../AbstractMultiFileSmartCompletionTest.kt | 6 +- .../completion/DataFlowValueRenderingTest.kt | 4 +- .../completion/ExpectedCompletionUtils.java | 2 +- .../JetFixtureCompletionBaseTestCase.java | 2 +- .../confidence/JetConfidenceTest.java | 2 +- .../handlers/CompletionHandlerTestBase.kt | 4 +- .../CompletionMultifileHandlerTest.java | 4 +- .../handlers/JavaCompletionHandlerTest.java | 4 +- .../SmartCompletionMultifileHandlerTest.java | 4 +- .../weighers/AbstractCompletionWeigherTest.kt | 6 +- .../findUsages/AbstractJetFindUsagesTest.java | 6 +- .../formatter/AbstractJetFormatterTest.java | 2 +- .../AbstractExpressionSelectionTest.java | 8 +- .../idea}/AbstractSmartSelectionTest.java | 8 +- .../idea}/DirectiveBasedActionUtils.java | 2 +- .../ExpressionSelectionTestGenerated.java | 2 +- .../JdkAndMockLibraryProjectDescriptor.java | 4 +- .../JetJdkAndLibraryProjectDescriptor.java | 5 +- .../JetLightCodeInsightFixtureTestCase.java | 2 +- .../idea}/JetLightProjectDescriptor.java | 4 +- .../idea}/JetStdJSProjectDescriptor.java | 4 +- ...thJdkAndRuntimeLightProjectDescriptor.java | 4 +- .../idea}/KotlinCodeInsightTestCase.java | 4 +- .../idea}/KotlinCompletionTestCase.java | 4 +- .../idea}/KotlinDaemonAnalyzerTestCase.java | 4 +- .../idea}/KotlinHierarchyViewTestBase.java | 4 +- .../idea}/KotlinLightQuickFixTestCase.java | 4 +- .../idea}/PluginTestCaseBase.java | 4 +- .../ProjectDescriptorWithStdlibSources.java | 4 +- .../idea}/SmartSelectionTestGenerated.java | 2 +- .../idea}/WordSelectionTest.java | 4 +- .../HighlightingWithDependentLibrariesTest.kt | 6 +- .../resolve/MultiModuleHighlightingTest.kt | 2 +- .../AbstractInsertImportOnPasteTest.java | 4 +- .../codeInsight/AbstractJetInspectionTest.kt | 2 +- .../codeInsight/AbstractLineMarkersTest.java | 6 +- .../AbstractOutOfBlockModificationTest.java | 4 +- .../AbstractOverrideImplementTest.java | 4 +- .../idea/codeInsight/LiveTemplatesTest.java | 6 +- .../codeInsight/OverrideImplementTest.java | 2 +- .../OverrideImplementWithLibTest.java | 4 +- .../codeInsight/smartEnter/SmartEnterTest.kt | 2 +- ...ctJavaToKotlinCopyPasteConversionTest.java | 8 +- ...otlinCopyPasteConversionTestGenerated.java | 2 +- .../AbstractKotlinCoverageOutputFilesTest.kt | 13 +- ...otlinCoverageOutputFilesTestGenerated.java | 2 +- .../AbstractJetPositionManagerTest.java | 2 +- .../debugger/AbstractKotlinSteppingTest.kt | 2 +- .../debugger/AbstractSmartStepIntoTest.kt | 4 +- .../idea/debugger/KotlinDebuggerTestBase.kt | 4 +- .../idea/debugger/KotlinDebuggerTestCase.java | 4 +- ...AbstractSelectExpressionForDebuggerTest.kt | 2 +- .../CodeFragmentCompletionInLibraryTest.kt | 4 +- .../AbstractInternalCompiledClassesTest.kt | 2 +- .../decompiler/InternalCompiledClassesTest.kt | 4 +- .../AbstractNavigateToLibraryTest.java | 2 +- .../NavigateFromLibrarySourcesTest.kt | 4 +- .../NavigateToDecompiledLibraryTest.java | 2 +- .../NavigateToLibraryRegressionTest.java | 2 +- .../NavigateToLibrarySourceTest.java | 4 +- .../NavigateToStdlibSourceRegressionTest.java | 2 +- .../stubBuilder/AbstractClsStubBuilderTest.kt | 2 +- .../stubBuilder/ClsStubConsistencyTest.kt | 4 +- .../ClsStubForWrongAbiVersionTest.kt | 2 +- .../textBuilder/AbstractDecompiledTextTest.kt | 8 +- .../DecompiledTextConsistencyTest.kt | 6 +- .../DecompiledTextForWrongAbiVersionTest.kt | 2 +- .../kotlin/idea/editor/JetCommenterTest.java | 2 +- .../AbstractJetQuickDocProviderTest.java | 4 +- .../idea}/filters/JetExceptionFilterTest.java | 6 +- .../folding/AbstractKotlinFoldingTest.java | 6 +- .../FoldingAfterOptimizeImportsTest.kt | 10 +- .../folding/KotlinFoldingTestGenerated.java | 2 +- .../hierarchy/AbstractHierarchyTest.java | 14 +- .../hierarchy/HierarchyTestGenerated.java | 2 +- .../AbstractDiagnosticMessageTest.java | 2 +- .../highlighter/AbstractHighlightingTest.java | 4 +- .../idea/highlighter/NoErrorsInStdlibTest.kt | 6 +- .../imports/AbstractOptimizeImportsTest.kt | 9 +- .../imports/OptimizeImportsOnFlyTest.java | 4 +- .../imports/OptimizeImportsTestGenerated.java | 2 +- .../intentions/AbstractIntentionTest.java | 4 +- .../idea}/javaFacade/JetJavaFacadeTest.java | 14 +- .../navigation/AbstractGotoSuperTest.java | 4 +- .../navigation/AbstractKotlinGotoTest.java | 6 +- .../navigation/GotoSuperTestGenerated.java | 2 +- .../JetGotoImplementationMultifileTest.java | 6 +- .../navigation/JetGotoImplementationTest.java | 6 +- .../navigation/KotlinGotoTestGenerated.java | 2 +- .../idea}/navigation/NavigationTestUtils.java | 4 +- .../AbstractFunctionParameterInfoTest.java | 4 +- .../FunctionParameterInfoTestGenerated.java | 2 +- .../MockCreateParameterInfoContext.java | 4 +- .../MockParameterInfoUIContext.java | 4 +- .../MockUpdateParameterInfoContext.java | 4 +- .../AbstractQuickFixMultiFileTest.java | 6 +- .../idea/quickfix/AbstractQuickFixTest.java | 6 +- .../AddOpenToClassDeclarationTest.java | 2 +- .../idea/quickfix/ImportClassHelperTest.java | 2 +- .../idea/refactoring/InplaceRenameTest.kt | 2 +- .../JetChangeSignatureTest.java | 4 +- .../inline/AbstractInlineTest.java | 4 +- .../AbstractJetExtractionTest.kt | 4 +- .../refactoring/move/AbstractJetMoveTest.kt | 4 +- .../nameSuggester/JetNameSuggesterTest.java | 2 +- .../refactoring/rename/AbstractRenameTest.kt | 2 +- .../rename/SimpleNameReferenceRenameTest.java | 2 +- .../BuiltInsReferenceResolverTest.java | 2 +- .../resolve/AbstractPartialBodyResolveTest.kt | 4 +- .../AbstractReferenceResolveInJavaTest.kt | 2 +- ...actReferenceResolveInLibrarySourcesTest.kt | 6 +- .../resolve/AbstractReferenceResolveTest.java | 2 +- .../AbstractReferenceResolveWithLibTest.java | 4 +- .../idea}/run/RunConfigurationTest.kt | 6 +- .../AbstractKotlinFileStructureTest.kt | 8 +- .../KotlinFileStructureTestGenerated.java | 2 +- .../structureView/StructureViewUtil.java | 4 +- .../AbstractMultiFileHighlightingTest.java | 8 +- .../stubs/AbstractResolveByStubTest.java | 6 +- .../idea}/stubs/AbstractStubBuilderTest.java | 8 +- .../idea}/stubs/AstAccessControl.kt | 4 +- .../idea}/stubs/DebugTextByStubTest.kt | 4 +- .../idea}/stubs/JetStubsTest.java | 6 +- .../MultiFileHighlightingTestGenerated.java | 2 +- .../stubs/ResolveByStubTestGenerated.java | 2 +- .../idea}/stubs/StubBuilderTestGenerated.java | 2 +- .../java/AbstractJavaTypeSubstitutorTest.java | 4 +- ...StringTemplateExpressionManipulatorTest.kt | 4 +- .../AbstractJetPsiUnifierTest.kt | 8 +- .../safeDelete/AbstractJetSafeDeleteTest.java | 6 +- .../kotlin/search/AbstractSearcherTest.java | 2 +- .../search/AnnotatedMembersSearchTest.java | 2 +- .../search/ClassInheritorsSearchTest.java | 2 +- .../search/JUnitMembersSearcherTest.java | 4 +- .../shortenRefs/AbstractShortenRefsTest.kt | 4 +- .../jetbrains/kotlin/test/ReferenceUtils.java | 2 +- ...tractJavaToKotlinConverterMultiFileTest.kt | 6 +- ...ractJavaToKotlinConverterSingleFileTest.kt | 6 +- 358 files changed, 843 insertions(+), 858 deletions(-) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetDescriptorIconProvider.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetIconProvider.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetIcons.java (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/inspections/AbstractKotlinInspection.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/inspections/IntentionBasedInspection.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/inspections/RemoveExplicitTypeArgsInspection.kt (90%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/inspections/SimplifyBinaryNegationInspection.kt (90%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/JetClsStructureViewBuilderProvider.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/JetStructureViewElement.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/JetStructureViewFactory.java (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/JetStructureViewModel.java (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/KotlinInheritedMembersNodeProvider.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/KotlinStructureElementPresentation.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/ApplicationUtils.kt (93%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/JetPsiPrecedences.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/ProjectRootsUtil.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/stringUtil.kt (91%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/versions/KotlinRuntimeLibraryCoreUtil.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/vfilefinder/IDEVirtualFileFinder.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/vfilefinder/IDEVirtualFileFinderFactory.java (93%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/vfilefinder/KotlinClassFileIndex.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/IdeModeProvider.java (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetCommenter.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetFileFactory.java (88%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetFoldingBuilder.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetGotoTargetRenderProvider.java (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetModuleTypeManagerImpl.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetPairMatcher.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetPluginUtil.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/JetQuickDocumentationProvider.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/PluginStartupComponent.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/conversion/copy/ConvertJavaCopyPastePostProcessor.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/conversion/copy/CopiedCode.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/conversion/copy/KotlinPasteFromJavaDialog.form (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/conversion/copy/KotlinPasteFromJavaDialog.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/conversion/copy/RangeUtils.kt (87%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/converters/JetRunConfigurationSettingsFormatConverterProvider.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/copyright/UpdateKotlinCopyright.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/copyright/UpdateKotlinCopyrightsProvider.java (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/coverage/KotlinCoverageExtension.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/filters/JetExceptionFilter.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/filters/JetExceptionFilterFactory.java (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/HierarchyUtils.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/KotlinTypeHierarchyProvider.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/calls/CalleeReferenceVisitorBase.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/calls/KotlinCallHierarchyBrowser.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/calls/KotlinCallHierarchyProvider.java (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/calls/KotlinCallTreeStructure.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/calls/KotlinCallerMethodsTreeStructure.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/overrides/KotlinOverrideTreeStructure.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/imports/ImportsUtils.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/imports/KotlinImportOptimizer.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/inspections/ExplicitGetInspection.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/inspections/IfThenToElvisInspection.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/inspections/IfThenToSafeAccessInspection.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/internal/KotlinBytecodeToolWindow.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/internal/Location.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/internal/makeBackup/CreateIncrementalCompilationBackup.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/internal/makeBackup/MakeBackupCompileTask.kt (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/internal/makeBackup/makeBackup.kt (86%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/j2k/IdeaResolverForConverter.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/j2k/J2kPostProcessor.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/joinLines/JoinBlockIntoSingleStatementHandler.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/joinLines/JoinDeclarationAndAssignmentHandler.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/k2jsrun/K2JSBrowserProgramRunner.java (88%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/k2jsrun/K2JSConfigurationSettings.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/k2jsrun/K2JSRunConfiguration.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/k2jsrun/K2JSRunConfigurationEditor.form (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/k2jsrun/K2JSRunConfigurationEditor.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/k2jsrun/K2JSRunConfigurationType.java (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/k2jsrun/K2JSRunnerUtils.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/ktSignature/DeleteSignatureAction.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/ktSignature/EditSignatureAction.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/ktSignature/EditSignatureBalloon.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/ktSignature/KotlinSignatureAnnotationIntention.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/ktSignature/KotlinSignatureInJavaMarkerProvider.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/ktSignature/KotlinSignatureInJavaMarkerUpdater.java (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/ktSignature/KotlinSignatureUtil.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/ktSignature/ShowKotlinSignaturesAction.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/JetLiveTemplatesProvider.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/JetTemplateContextType.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/KotlinShortenFQNamesProcessor.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/macro/AnonymousTemplateEditingListener.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/macro/BaseJetVariableMacro.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/macro/JetAnonymousSuperMacro.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/macro/JetAnyVariableMacro.java (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/macro/JetFunctionParametersMacro.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/macro/JetIterableVariableMacro.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/macro/JetPsiElementResult.java (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/liveTemplates/macro/JetSuggestVariableNameMacro.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/parameterInfo/JetFunctionParameterInfoHandler.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/presentation/JetClassPresenter.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/presentation/JetDefaultNamedDeclarationPresentation.java (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/presentation/JetFunctionPresenter.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/presentation/JetLightClassListCellRenderer.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/presentation/JetObjectPresenter.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/presentation/JetParameterPresenter.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/presentation/JetPropertyPresenter.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/projectView/JetClassObjectTreeNode.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/projectView/JetClassOrObjectTreeNode.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/projectView/JetDeclarationTreeNode.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/projectView/JetFileTreeNode.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/projectView/JetProjectViewProvider.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/projectView/JetProjectViewUtil.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/reporter/KotlinReportSubmitter.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/run/JetJUnitConfigurationProducer.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/run/JetRunConfiguration.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/run/JetRunConfigurationEditor.form (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/run/JetRunConfigurationEditor.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/run/JetRunConfigurationProducer.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/run/JetRunConfigurationType.java (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/run/JetTestNgConfigurationProducer.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/DebuggerUtils.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/InfinitePeriodicalTask.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/JetPsiHeuristicsUtil.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/LongRunningReadTask.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/Maybe.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/attachment/attachmentUtils.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/projectStructureUtil.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/psi/patternMatching/JetPsiRange.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/psi/patternMatching/JetPsiUnifier.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/psiFilters.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/util/psiModificationUtil.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/versions/KotlinAbiVersionIndex.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/versions/KotlinRuntimeLibraryUtil.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/versions/KotlinUpdatePluginComponent.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/versions/OutdatedKotlinRuntimeNotification.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/versions/UnsupportedAbiVersionNotificationPanelProvider.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/AbstractExpressionSelectionTest.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/AbstractSmartSelectionTest.java (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/DirectiveBasedActionUtils.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/ExpressionSelectionTestGenerated.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/JdkAndMockLibraryProjectDescriptor.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/JetJdkAndLibraryProjectDescriptor.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/JetLightCodeInsightFixtureTestCase.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/JetLightProjectDescriptor.java (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/JetStdJSProjectDescriptor.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/JetWithJdkAndRuntimeLightProjectDescriptor.java (92%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/KotlinCodeInsightTestCase.java (93%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/KotlinCompletionTestCase.java (93%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/KotlinDaemonAnalyzerTestCase.java (93%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/KotlinHierarchyViewTestBase.java (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/KotlinLightQuickFixTestCase.java (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/PluginTestCaseBase.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/ProjectDescriptorWithStdlibSources.java (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/SmartSelectionTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/WordSelectionTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java (91%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/coverage/AbstractKotlinCoverageOutputFilesTest.kt (74%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/coverage/KotlinCoverageOutputFilesTestGenerated.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/filters/JetExceptionFilterTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/folding/AbstractKotlinFoldingTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/folding/FoldingAfterOptimizeImportsTest.kt (92%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/folding/KotlinFoldingTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/AbstractHierarchyTest.java (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/hierarchy/HierarchyTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/imports/AbstractOptimizeImportsTest.kt (91%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/imports/OptimizeImportsOnFlyTest.java (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/imports/OptimizeImportsTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/javaFacade/JetJavaFacadeTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/navigation/AbstractGotoSuperTest.java (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/navigation/AbstractKotlinGotoTest.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/navigation/GotoSuperTestGenerated.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/navigation/JetGotoImplementationMultifileTest.java (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/navigation/JetGotoImplementationTest.java (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/navigation/KotlinGotoTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/navigation/NavigationTestUtils.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/parameterInfo/AbstractFunctionParameterInfoTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/parameterInfo/FunctionParameterInfoTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/parameterInfo/MockCreateParameterInfoContext.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/parameterInfo/MockParameterInfoUIContext.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/parameterInfo/MockUpdateParameterInfoContext.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/run/RunConfigurationTest.kt (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/AbstractKotlinFileStructureTest.kt (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/KotlinFileStructureTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/structureView/StructureViewUtil.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/AbstractMultiFileHighlightingTest.java (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/AbstractResolveByStubTest.java (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/AbstractStubBuilderTest.java (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/AstAccessControl.kt (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/DebugTextByStubTest.kt (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/JetStubsTest.java (93%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/MultiFileHighlightingTestGenerated.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/ResolveByStubTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/stubs/StubBuilderTestGenerated.java (99%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index f848508c9ad..7deff716d44 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -48,14 +48,14 @@ import org.jetbrains.kotlin.completion.AbstractKeywordCompletionTest import org.jetbrains.kotlin.completion.AbstractJvmSmartCompletionTest import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest import org.jetbrains.kotlin.completion.AbstractJvmWithLibBasicCompletionTest -import org.jetbrains.jet.plugin.navigation.AbstractGotoSuperTest +import org.jetbrains.kotlin.idea.navigation.AbstractGotoSuperTest import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixMultiFileTest import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingTest -import org.jetbrains.jet.plugin.folding.AbstractKotlinFoldingTest +import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest import org.jetbrains.kotlin.idea.codeInsight.surroundWith.AbstractSurroundWithTest import org.jetbrains.kotlin.idea.intentions.AbstractIntentionTest -import org.jetbrains.jet.plugin.AbstractSmartSelectionTest -import org.jetbrains.jet.plugin.hierarchy.AbstractHierarchyTest +import org.jetbrains.kotlin.idea.AbstractSmartSelectionTest +import org.jetbrains.kotlin.idea.hierarchy.AbstractHierarchyTest import org.jetbrains.kotlin.idea.codeInsight.moveUpDown.AbstractCodeMoverTest import org.jetbrains.kotlin.idea.refactoring.inline.AbstractInlineTest import org.jetbrains.kotlin.idea.codeInsight.unwrap.AbstractUnwrapRemoveTest @@ -75,7 +75,7 @@ import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.kotlin.idea.refactoring.rename.AbstractRenameTest import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel import org.jetbrains.kotlin.generators.tests.generator.TestClassModel -import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest +import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest import org.jetbrains.kotlin.completion.handlers.AbstractSmartCompletionHandlerTest import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil @@ -88,13 +88,13 @@ import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithStdLib import org.jetbrains.kotlin.idea.codeInsight.AbstractInsertImportOnPasteTest import org.jetbrains.kotlin.idea.codeInsight.AbstractLineMarkersTest import org.jetbrains.kotlin.idea.resolve.AbstractReferenceToJavaWithWrongFileStructureTest -import org.jetbrains.jet.plugin.navigation.AbstractKotlinGotoTest -import org.jetbrains.jet.plugin.AbstractExpressionSelectionTest +import org.jetbrains.kotlin.idea.navigation.AbstractKotlinGotoTest +import org.jetbrains.kotlin.idea.AbstractExpressionSelectionTest import org.jetbrains.kotlin.idea.refactoring.move.AbstractJetMoveTest import org.jetbrains.kotlin.cfg.AbstractDataFlowTest -import org.jetbrains.jet.plugin.imports.AbstractOptimizeImportsTest +import org.jetbrains.kotlin.idea.imports.AbstractOptimizeImportsTest import org.jetbrains.kotlin.idea.debugger.AbstractSmartStepIntoTest -import org.jetbrains.jet.plugin.stubs.AbstractStubBuilderTest +import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest import org.jetbrains.kotlin.idea.codeInsight.AbstractJetInspectionTest import org.jetbrains.kotlin.idea.debugger.AbstractKotlinSteppingTest import org.jetbrains.kotlin.idea.debugger.AbstractJetPositionManagerTest @@ -105,17 +105,17 @@ import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractKotlinEvaluateExpress import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractSelectExpressionForDebuggerTest import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractCodeFragmentCompletionTest import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractCodeFragmentHighlightingTest -import org.jetbrains.jet.plugin.stubs.AbstractResolveByStubTest -import org.jetbrains.jet.plugin.stubs.AbstractMultiFileHighlightingTest +import org.jetbrains.kotlin.idea.stubs.AbstractResolveByStubTest +import org.jetbrains.kotlin.idea.stubs.AbstractMultiFileHighlightingTest import org.jetbrains.kotlin.cfg.AbstractPseudoValueTest -import org.jetbrains.jet.plugin.structureView.AbstractKotlinFileStructureTest +import org.jetbrains.kotlin.idea.structureView.AbstractKotlinFileStructureTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest import org.jetbrains.kotlin.load.java.AbstractJavaTypeSubstitutorTest import org.jetbrains.kotlin.idea.intentions.declarations.AbstractJoinLinesTest import org.jetbrains.kotlin.codegen.AbstractScriptCodegenTest -import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest +import org.jetbrains.kotlin.idea.parameterInfo.AbstractFunctionParameterInfoTest import org.jetbrains.kotlin.psi.patternMatching.AbstractJetPsiUnifierTest import org.jetbrains.kotlin.completion.weighers.AbstractBasicCompletionWeigherTest import org.jetbrains.kotlin.completion.weighers.AbstractSmartCompletionWeigherTest @@ -133,7 +133,7 @@ import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest import org.jetbrains.kotlin.types.AbstractJetTypeBindingTest import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest -import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest +import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest import org.jetbrains.kotlin.js.test.semantics.AbstractDynamicTest import org.jetbrains.kotlin.js.test.semantics.AbstractMultiModuleTest import org.jetbrains.kotlin.completion.handlers.AbstractBasicCompletionHandlerTest diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetDescriptorIconProvider.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetDescriptorIconProvider.java index d0caafbafe8..3ba5626fb34 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetDescriptorIconProvider.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Iconable; @@ -31,7 +31,7 @@ import javax.swing.*; public final class JetDescriptorIconProvider { - private static final Logger LOG = Logger.getInstance("#org.jetbrains.jet.plugin.JetDescriptorIconProvider"); + private static final Logger LOG = Logger.getInstance("#org.jetbrains.kotlin.idea.JetDescriptorIconProvider"); private JetDescriptorIconProvider() { } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java index c2bda16ef66..065c44b46b6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.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; +package org.jetbrains.kotlin.idea; import com.intellij.ide.IconProvider; import com.intellij.openapi.project.DumbAware; @@ -28,11 +28,11 @@ import com.intellij.util.PlatformIcons; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; +import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.*; import javax.swing.*; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIcons.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIcons.java similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIcons.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIcons.java index c8cf3a33608..92b1e51c537 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIcons.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIcons.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.util.IconLoader; import com.intellij.util.PlatformIcons; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java index d3ce699ed62..ec37bcfa843 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java @@ -38,7 +38,6 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.*; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; @@ -49,6 +48,7 @@ import org.jetbrains.kotlin.idea.project.ResolveSessionForBodies; import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex; import org.jetbrains.kotlin.idea.stubindex.JetTopLevelClassByPackageIndex; import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt index 34e00592a6b..51ce5600bc9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.idea.project.TargetPlatformDetector import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.utils.keysToMap import com.intellij.openapi.roots.ProjectRootModificationTracker -import org.jetbrains.jet.plugin.util.ProjectRootsUtil +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt index 514dfa6a753..5cd362a610e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.roots.ModuleRootManager -import org.jetbrains.jet.plugin.util.ProjectRootsUtil +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil fun PsiElement.getModuleInfo(): IdeaModuleInfo { fun logAndReturnDefault(message: String): IdeaModuleInfo { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java index ce7a3e7182a..a879de63d9b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java @@ -21,10 +21,10 @@ import com.intellij.lang.annotation.Annotator; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.checkers.DebugInfoUtil; import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.psi.JetCodeFragment; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetReferenceExpression; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java index 659fd9c3a95..ae9e71ab143 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java @@ -22,11 +22,11 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.project.TargetPlatform; import org.jetbrains.kotlin.idea.project.TargetPlatformDetector; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt index 73b159a3969..9f0a985a14b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics -import org.jetbrains.jet.plugin.util.ProjectRootsUtil +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.quickfix.QuickFixes diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/AbstractKotlinInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractKotlinInspection.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/AbstractKotlinInspection.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractKotlinInspection.kt index 903290df6b4..74e8b4166c2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/AbstractKotlinInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/AbstractKotlinInspection.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.inspections +package org.jetbrains.kotlin.idea.inspections import com.intellij.codeInspection.LocalInspectionTool import com.intellij.codeInspection.CustomSuppressableInspectionTool diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt index 81ac6cd7592..8e69c7f3b80 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.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.inspections +package org.jetbrains.kotlin.idea.inspections import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetElement diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/RemoveExplicitTypeArgsInspection.kt similarity index 90% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/RemoveExplicitTypeArgsInspection.kt index 56bbbee5569..d76f047e502 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/RemoveExplicitTypeArgsInspection.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.inspections +package org.jetbrains.kotlin.idea.inspections import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments import org.jetbrains.kotlin.psi.JetTypeArgumentList diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/SimplifyBinaryNegationInspection.kt similarity index 90% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/SimplifyBinaryNegationInspection.kt index 4d2a08f8c5b..54b7fb9426e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/SimplifyBinaryNegationInspection.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.inspections +package org.jetbrains.kotlin.idea.inspections import org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionIntention import org.jetbrains.kotlin.psi.JetPrefixExpression diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java index 5aa047b14fb..617ae52dbed 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ProjectStructureUtil.java @@ -35,9 +35,9 @@ 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.versions.KotlinRuntimeLibraryCoreUtil; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.idea.framework.JsLibraryStdDetectionUtil; +import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryCoreUtil; import org.jetbrains.kotlin.psi.JetFile; import java.util.HashSet; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt index 3a24efce56d..d5908cf84ef 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.codeInspection.SuppressIntentionAction -import org.jetbrains.jet.plugin.util.JetPsiPrecedences +import org.jetbrains.kotlin.idea.util.JetPsiPrecedences import org.jetbrains.kotlin.idea.caches.resolve.analyze public class KotlinSuppressIntentionAction( diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java index b9d7ad838f2..ae8f103abad 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java @@ -25,11 +25,11 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.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.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.psi.*; public class KotlinReferencesSearcher extends QueryExecutorBase { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt index 2b939ee9ed4..94ff72fd7cb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/usagesSearch.kt @@ -46,7 +46,7 @@ import java.util.Collections import com.intellij.openapi.roots.FileIndexFacade import com.intellij.util.indexing.FileBasedIndex import com.intellij.psi.impl.cache.impl.id.IdIndex -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction import com.intellij.psi.search.TextOccurenceProcessor import com.intellij.psi.PsiManager import com.intellij.psi.impl.PsiManagerEx diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetClsStructureViewBuilderProvider.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetClsStructureViewBuilderProvider.kt index ed6ef0f4059..d37b7d308b0 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetClsStructureViewBuilderProvider.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.structureView +package org.jetbrains.kotlin.idea.structureView import com.intellij.ide.structureView.StructureViewBuilderProvider import com.intellij.openapi.fileTypes.FileType diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java index 2c7abb3bbdc..414faec45f5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.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.structureView; +package org.jetbrains.kotlin.idea.structureView; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.util.treeView.smartTree.TreeElement; @@ -31,8 +31,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.psi.*; import java.util.ArrayList; import java.util.Collections; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewFactory.java similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewFactory.java index 241da388f4a..493a969ab21 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewFactory.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewFactory.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.structureView; +package org.jetbrains.kotlin.idea.structureView; import com.intellij.ide.structureView.StructureViewBuilder; import com.intellij.ide.structureView.StructureViewModel; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewModel.java similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewModel.java index 62921cfd6a5..e9131813ba1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewModel.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewModel.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.structureView; +package org.jetbrains.kotlin.idea.structureView; import com.intellij.ide.structureView.StructureViewModelBase; import com.intellij.ide.util.treeView.smartTree.NodeProvider; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt index 9934244d474..dda046f9b95 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.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.structureView +package org.jetbrains.kotlin.idea.structureView import com.intellij.ide.util.InheritedMembersNodeProvider import com.intellij.ide.util.treeView.smartTree.TreeElement diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java index 00032718ca4..5afcb206425 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.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.structureView; +package org.jetbrains.kotlin.idea.structureView; import com.intellij.navigation.ColoredItemPresentation; import com.intellij.navigation.LocationPresentation; @@ -30,17 +30,17 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.idea.JetDescriptorIconProvider; import org.jetbrains.kotlin.psi.JetClassInitializer; import org.jetbrains.kotlin.psi.JetModifierListOwner; import org.jetbrains.kotlin.psi.JetPsiUtil; -import org.jetbrains.jet.plugin.JetDescriptorIconProvider; import javax.swing.*; import java.util.Set; -import static org.jetbrains.kotlin.resolve.OverrideResolver.filterOutOverridden; -import static org.jetbrains.kotlin.resolve.DescriptorUtils.getAllOverriddenDeclarations; import static org.jetbrains.kotlin.renderer.DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getAllOverriddenDeclarations; +import static org.jetbrains.kotlin.resolve.OverrideResolver.filterOutOverridden; class KotlinStructureElementPresentation implements ColoredItemPresentation, LocationPresentation { private final TextAttributesKey attributesKey; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java index 961b846ee74..4eee6d2373e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java @@ -23,8 +23,8 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.DelegatingGlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.idea.caches.resolve.JsProjectDetector; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; public class JetSourceFilterScope extends DelegatingGlobalSearchScope { @NotNull diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ApplicationUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt similarity index 93% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ApplicationUtils.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.kt index a226fde854b..0e932f65010 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ApplicationUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ApplicationUtils.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.util.application +package org.jetbrains.kotlin.idea.util.application import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.project.Project @@ -37,4 +37,4 @@ public fun Project.executeWriteCommand(name: String, command: () -> T): T { CommandProcessor.getInstance().executeCommand(this, { result = runWriteAction(command) }, name, null) [suppress("USELESS_CAST")] return result as T -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/JetPsiPrecedences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/util/JetPsiPrecedences.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt index f6a1f0fac7e..8ff99f7c01f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/JetPsiPrecedences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.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.util +package org.jetbrains.kotlin.idea.util import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.tree.IElementType diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt index 90e5970fc44..5ac0f8889ed 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.util +package org.jetbrains.kotlin.idea.util 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.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.configuration.JetModuleTypeManager import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/stringUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/stringUtil.kt similarity index 91% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/util/stringUtil.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/stringUtil.kt index 7cc5e4f1d74..bb7a738453c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/stringUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/stringUtil.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.util.string +package org.jetbrains.kotlin.idea.util.string fun String.collapseSpaces(): String { val builder = StringBuilder() @@ -32,4 +32,4 @@ fun String.collapseSpaces(): String { } } return builder.toString() -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryCoreUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryCoreUtil.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryCoreUtil.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryCoreUtil.java index d3e26dd2462..e3389f3c152 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryCoreUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryCoreUtil.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.versions; +package org.jetbrains.kotlin.idea.versions; import com.google.common.collect.ImmutableList; import com.intellij.openapi.application.ApplicationManager; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.java index 2072f841458..3d59e78f7f7 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.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.vfilefinder; +package org.jetbrains.kotlin.idea.vfilefinder; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinderFactory.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinderFactory.java similarity index 93% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinderFactory.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinderFactory.java index be041d29abe..45c9fae276d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinderFactory.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinderFactory.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.vfilefinder; +package org.jetbrains.kotlin.idea.vfilefinder; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinClassFileIndex.java similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinClassFileIndex.java index 474353da189..c4af58483b2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinClassFileIndex.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.vfilefinder; +package org.jetbrains.kotlin.idea.vfilefinder; import com.intellij.ide.highlighter.JavaClassFileType; import com.intellij.openapi.diagnostic.Logger; @@ -24,7 +24,6 @@ import com.intellij.util.io.KeyDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache; import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; -import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader; import org.jetbrains.kotlin.name.FqName; import java.io.DataInput; diff --git a/idea/src/META-INF/coverage.xml b/idea/src/META-INF/coverage.xml index ce1756d8453..266e0d4da81 100644 --- a/idea/src/META-INF/coverage.xml +++ b/idea/src/META-INF/coverage.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/idea/src/META-INF/junit.xml b/idea/src/META-INF/junit.xml index aee3e23b3ad..fe8cea18191 100644 --- a/idea/src/META-INF/junit.xml +++ b/idea/src/META-INF/junit.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/idea/src/META-INF/kotlin-copyright.xml b/idea/src/META-INF/kotlin-copyright.xml index 9c48036cf54..57c64761e7a 100644 --- a/idea/src/META-INF/kotlin-copyright.xml +++ b/idea/src/META-INF/kotlin-copyright.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 35d750421a8..2bedcfd6b0f 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -25,13 +25,13 @@ org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver - org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification + org.jetbrains.kotlin.idea.versions.OutdatedKotlinRuntimeNotification org.jetbrains.kotlin.idea.configuration.ui.NonConfiguredKotlinProjectComponent - org.jetbrains.jet.plugin.ktSignature.KotlinSignatureInJavaMarkerUpdater + org.jetbrains.kotlin.idea.ktSignature.KotlinSignatureInJavaMarkerUpdater org.jetbrains.kotlin.idea.configuration.ui.AbsentJdkAnnotationsComponent @@ -40,11 +40,11 @@ - org.jetbrains.jet.plugin.PluginStartupComponent + org.jetbrains.kotlin.idea.PluginStartupComponent - org.jetbrains.jet.plugin.versions.KotlinUpdatePluginComponent + org.jetbrains.kotlin.idea.versions.KotlinUpdatePluginComponent @@ -77,7 +77,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -137,13 +137,13 @@ serviceImplementation="org.jetbrains.kotlin.idea.stubindex.StubIndexServiceImpl"/> + serviceImplementation="org.jetbrains.kotlin.idea.IdeModeProvider"/> + serviceImplementation="org.jetbrains.kotlin.idea.JetModuleTypeManagerImpl"/> @@ -155,7 +155,7 @@ serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheService"/> + serviceImplementation="org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinderFactory"/> @@ -198,7 +198,7 @@ - + @@ -207,22 +207,22 @@ - + - + - + - + - - - + + + - + - + @@ -298,20 +298,20 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + @@ -334,30 +334,30 @@ - + - - - - - - + + + + + + - - + + - - - - - @@ -390,17 +390,17 @@ - + + implementationClass="org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallHierarchyProvider" /> + implementationClass="org.jetbrains.kotlin.idea.hierarchy.overrides.KotlinOverrideHierarchyProvider" /> @@ -423,11 +423,11 @@ - - + + - + @@ -438,10 +438,10 @@ - + - - + + - org.jetbrains.jet.plugin.ktSignature.KotlinSignatureAnnotationIntention + org.jetbrains.kotlin.idea.ktSignature.KotlinSignatureAnnotationIntention Kotlin @@ -791,42 +791,42 @@ Kotlin - - - - - - + diff --git a/idea/src/META-INF/testng-j.xml b/idea/src/META-INF/testng-j.xml index 765c8325ecd..c5a458056e6 100644 --- a/idea/src/META-INF/testng-j.xml +++ b/idea/src/META-INF/testng-j.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/idea/src/org/jetbrains/jet/plugin/IdeModeProvider.java b/idea/src/org/jetbrains/kotlin/idea/IdeModeProvider.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/IdeModeProvider.java rename to idea/src/org/jetbrains/kotlin/idea/IdeModeProvider.java index ec730abc280..12b74357ee4 100644 --- a/idea/src/org/jetbrains/jet/plugin/IdeModeProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/IdeModeProvider.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; +package org.jetbrains.kotlin.idea; import org.jetbrains.kotlin.OperationMode; import org.jetbrains.kotlin.OperationModeProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/JetCommenter.java b/idea/src/org/jetbrains/kotlin/idea/JetCommenter.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/JetCommenter.java rename to idea/src/org/jetbrains/kotlin/idea/JetCommenter.java index f2a940440b2..3146e4d32f2 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetCommenter.java +++ b/idea/src/org/jetbrains/kotlin/idea/JetCommenter.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; +package org.jetbrains.kotlin.idea; import com.intellij.lang.CodeDocumentationAwareCommenter; import com.intellij.psi.PsiComment; diff --git a/idea/src/org/jetbrains/jet/plugin/JetFileFactory.java b/idea/src/org/jetbrains/kotlin/idea/JetFileFactory.java similarity index 88% rename from idea/src/org/jetbrains/jet/plugin/JetFileFactory.java rename to idea/src/org/jetbrains/kotlin/idea/JetFileFactory.java index 47e34ff4611..58e0e5aac6f 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetFileFactory.java +++ b/idea/src/org/jetbrains/kotlin/idea/JetFileFactory.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,12 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.fileTypes.FileTypeConsumer; import com.intellij.openapi.fileTypes.FileTypeFactory; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.JetFileType; public class JetFileFactory extends FileTypeFactory { diff --git a/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java b/idea/src/org/jetbrains/kotlin/idea/JetFoldingBuilder.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java rename to idea/src/org/jetbrains/kotlin/idea/JetFoldingBuilder.java index 258786c2356..a015d596cd8 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java +++ b/idea/src/org/jetbrains/kotlin/idea/JetFoldingBuilder.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; +package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.folding.JavaCodeFoldingSettings; import com.intellij.lang.ASTNode; @@ -29,10 +29,10 @@ import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.kdoc.lexer.KDocTokens; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetImportDirective; import org.jetbrains.kotlin.psi.JetImportList; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.ArrayList; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/plugin/JetGotoTargetRenderProvider.java b/idea/src/org/jetbrains/kotlin/idea/JetGotoTargetRenderProvider.java similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/JetGotoTargetRenderProvider.java rename to idea/src/org/jetbrains/kotlin/idea/JetGotoTargetRenderProvider.java index e4f1b44e463..e4b55926d08 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetGotoTargetRenderProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/JetGotoTargetRenderProvider.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.navigation.GotoTargetHandler; import com.intellij.codeInsight.navigation.GotoTargetRendererProvider; import com.intellij.ide.util.PsiElementListCellRenderer; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.presentation.JetLightClassListCellRenderer; import org.jetbrains.kotlin.asJava.KotlinLightClass; +import org.jetbrains.kotlin.idea.presentation.JetLightClassListCellRenderer; public class JetGotoTargetRenderProvider implements GotoTargetRendererProvider { @Nullable diff --git a/idea/src/org/jetbrains/jet/plugin/JetModuleTypeManagerImpl.java b/idea/src/org/jetbrains/kotlin/idea/JetModuleTypeManagerImpl.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/JetModuleTypeManagerImpl.java rename to idea/src/org/jetbrains/kotlin/idea/JetModuleTypeManagerImpl.java index 3a577cc00f8..c27b7f1f38d 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetModuleTypeManagerImpl.java +++ b/idea/src/org/jetbrains/kotlin/idea/JetModuleTypeManagerImpl.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; +package org.jetbrains.kotlin.idea; import com.intellij.facet.Facet; import com.intellij.facet.FacetManager; diff --git a/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java b/idea/src/org/jetbrains/kotlin/idea/JetPairMatcher.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java rename to idea/src/org/jetbrains/kotlin/idea/JetPairMatcher.java index b31f1cf2fcd..266c33db5ff 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetPairMatcher.java +++ b/idea/src/org/jetbrains/kotlin/idea/JetPairMatcher.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; +package org.jetbrains.kotlin.idea; import com.intellij.lang.BracePair; import com.intellij.lang.PairedBraceMatcher; diff --git a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java b/idea/src/org/jetbrains/kotlin/idea/JetPluginUtil.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java rename to idea/src/org/jetbrains/kotlin/idea/JetPluginUtil.java index d5bc14801f9..6bf7c46f40f 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/JetPluginUtil.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; +package org.jetbrains.kotlin.idea; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/kotlin/idea/JetQuickDocumentationProvider.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java rename to idea/src/org/jetbrains/kotlin/idea/JetQuickDocumentationProvider.java index 2cd04742363..00631b51c39 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/JetQuickDocumentationProvider.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; +package org.jetbrains.kotlin.idea; import com.google.common.base.Predicate; import com.intellij.lang.documentation.AbstractDocumentationProvider; @@ -25,16 +25,16 @@ import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.asJava.KotlinLightMethod; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.kdoc.lexer.KDocTokens; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetPackageDirective; import org.jetbrains.kotlin.psi.JetReferenceExpression; -import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.asJava.KotlinLightMethod; +import org.jetbrains.kotlin.resolve.BindingContext; public class JetQuickDocumentationProvider extends AbstractDocumentationProvider { private static final Predicate SKIP_WHITESPACE_AND_EMPTY_PACKAGE = new Predicate() { diff --git a/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java rename to idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.java index 7be4ee9d569..ee8d6ef5535 100644 --- a/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/PluginStartupComponent.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.components.ApplicationComponent; diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt index c853b583455..d4343bcf469 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/JavaToKotlinAction.kt @@ -34,13 +34,13 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.psi.codeStyle.CodeStyleManager import java.io.IOException import com.intellij.openapi.ui.ex.MessagesEx -import org.jetbrains.jet.plugin.j2k.J2kPostProcessor +import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor import com.intellij.openapi.vfs.CharsetToolkit import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.utils.addIfNotNull import com.intellij.openapi.vfs.VfsUtilCore import com.intellij.openapi.vfs.VirtualFileVisitor -import org.jetbrains.jet.plugin.j2k.IdeaResolverForConverter +import org.jetbrains.kotlin.idea.j2k.IdeaResolverForConverter public class JavaToKotlinAction : AnAction() { override fun actionPerformed(e: AnActionEvent) { diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java index a5a19cd5572..e1c5b301fd1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java @@ -30,9 +30,9 @@ import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiFile; -import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.JetFileType; +import org.jetbrains.kotlin.idea.JetIcons; import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; import java.util.Map; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorClassMember.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorClassMember.java index 42ede32589d..2f3a0c09c6f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorClassMember.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorClassMember.java @@ -25,8 +25,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMember; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetDescriptorIconProvider; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.idea.JetDescriptorIconProvider; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetNamedDeclaration; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 4288c822562..17ddf225c7e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -50,7 +50,7 @@ import org.jetbrains.kotlin.idea.references.JetMultiReference import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetThisExpression import org.jetbrains.kotlin.psi.JetSuperExpression -import org.jetbrains.jet.plugin.conversion.copy.* +import org.jetbrains.kotlin.idea.conversion.copy.* import java.awt.datatransfer.UnsupportedFlavorException import java.io.IOException import com.intellij.openapi.diagnostic.Logger @@ -58,7 +58,7 @@ import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.JetUserType import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.kotlin.diagnostics.DiagnosticUtils -import org.jetbrains.jet.plugin.imports.* +import org.jetbrains.kotlin.idea.imports.* import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.utils.* import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/spellchecker/KotlinSpellcheckingStrategy.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/spellchecker/KotlinSpellcheckingStrategy.kt index bca2ad35902..070c11e293e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/spellchecker/KotlinSpellcheckingStrategy.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/spellchecker/KotlinSpellcheckingStrategy.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin +package org.jetbrains.kotlin.idea import com.intellij.spellchecker.tokenizer.SuppressibleSpellcheckingStrategy import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt index 18d3f1e8753..068a6d88965 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.JetDescriptorIconProvider +import org.jetbrains.kotlin.idea.JetDescriptorIconProvider import org.jetbrains.kotlin.idea.completion.handlers.* import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.psi.PsiClass diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt index 3d544e301d0..d73d9518bbe 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.JetCallElement import org.jetbrains.kotlin.idea.references.JetReference import org.jetbrains.kotlin.descriptors.FunctionDescriptor import com.intellij.codeInsight.lookup.LookupElementBuilder -import org.jetbrains.jet.plugin.JetIcons +import org.jetbrains.kotlin.idea.JetIcons import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.lookup.LookupElement @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetValueArgumentName import com.intellij.psi.filters.position.ParentElementFilter import com.intellij.psi.filters.OrFilter import com.intellij.psi.filters.ClassFilter -import org.jetbrains.jet.plugin.util.FirstChildInParentFilter +import org.jetbrains.kotlin.idea.util.FirstChildInParentFilter import org.jetbrains.kotlin.psi.psiUtil.getCallNameExpression import com.intellij.psi.PsiElement import com.intellij.codeInsight.completion.InsertHandler diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt index 766d7c92d85..1695cbf6abc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.idea.completion.ExpectedInfos import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade -import org.jetbrains.jet.plugin.util.application.runWriteAction +import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.refactoring.EmptyValidator import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt index 8ad218bd19b..a8978c11cfc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import java.util.HashSet import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.plugin.JetDescriptorIconProvider +import org.jetbrains.kotlin.idea.JetDescriptorIconProvider import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.idea.completion.PositionalArgumentExpectedInfo import java.util.ArrayList diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java index 22071a9089f..b40408bdfc3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.module.Module; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetPluginUtil; +import org.jetbrains.kotlin.idea.JetPluginUtil; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java index 7ccc51f6028..62351934d40 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.configuration; import com.intellij.openapi.module.Module; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetPluginUtil; +import org.jetbrains.kotlin.idea.JetPluginUtil; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java index 338befed9df..3fbf5b11232 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java @@ -24,10 +24,10 @@ 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.versions.KotlinRuntimeLibraryCoreUtil; import org.jetbrains.kotlin.idea.framework.JavaRuntimeLibraryDescription; import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider; import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; +import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryCoreUtil; import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java index 8b2bb43ad11..0343a35d870 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java @@ -42,8 +42,8 @@ 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.jet.plugin.JetPluginUtil; import org.jetbrains.kotlin.cli.common.KotlinVersion; +import org.jetbrains.kotlin.idea.JetPluginUtil; import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion; import java.util.List; diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java index 8092c2bbe19..65e95b325c4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java @@ -34,7 +34,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetPluginUtil; +import org.jetbrains.kotlin.idea.JetPluginUtil; import org.jetbrains.kotlin.idea.framework.ui.CreateLibraryDialogWithModules; import org.jetbrains.kotlin.idea.framework.ui.FileUIUtils; import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java index 8bdc23d99ef..d0010673d7f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/AbsentJdkAnnotationsComponent.java @@ -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.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 org.jetbrains.kotlin.idea.project.ProjectStructureUtil; +import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtil; import java.util.Collection; import java.util.List; diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt index 2cccb4269eb..13737e4f4a5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/AbsentSdkAnnotationsNotification.kt @@ -20,7 +20,7 @@ import com.intellij.notification.Notification import com.intellij.notification.NotificationListener import com.intellij.notification.NotificationType import com.intellij.openapi.projectRoots.Sdk -import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryUtil +import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtil import javax.swing.event.HyperlinkEvent import org.jetbrains.kotlin.idea.configuration.ui.AbsentJdkAnnotationsComponent diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt rename to idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt index 64b193e28a8..38c28f99e7e 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/ConvertJavaCopyPastePostProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.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.conversion.copy +package org.jetbrains.kotlin.idea.conversion.copy import com.intellij.codeInsight.editorActions.CopyPastePostProcessor import com.intellij.codeInsight.editorActions.TextBlockTransferableData @@ -33,8 +33,8 @@ import java.awt.datatransfer.Transferable import com.intellij.openapi.util.TextRange import com.intellij.psi.codeStyle.CodeStyleManager import com.intellij.lang.java.JavaLanguage -import org.jetbrains.jet.plugin.j2k.J2kPostProcessor -import org.jetbrains.jet.plugin.j2k.IdeaResolverForConverter +import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor +import org.jetbrains.kotlin.idea.j2k.IdeaResolverForConverter import com.intellij.openapi.project.DumbService public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor() { @@ -181,6 +181,6 @@ public class ConvertJavaCopyPastePostProcessor() : CopyPastePostProcessor -
+ diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/KotlinPasteFromJavaDialog.java b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/conversion/copy/KotlinPasteFromJavaDialog.java rename to idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java index 249b4766e4a..59e132dcfdb 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/KotlinPasteFromJavaDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.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.conversion.copy; +package org.jetbrains.kotlin.idea.conversion.copy; import com.intellij.CommonBundle; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/conversion/copy/RangeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/RangeUtils.kt similarity index 87% rename from idea/src/org/jetbrains/jet/plugin/conversion/copy/RangeUtils.kt rename to idea/src/org/jetbrains/kotlin/idea/conversion/copy/RangeUtils.kt index 01bc594ef51..05ef97d8a4e 100644 --- a/idea/src/org/jetbrains/jet/plugin/conversion/copy/RangeUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/RangeUtils.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.conversion.copy +package org.jetbrains.kotlin.idea.conversion.copy import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement @@ -28,4 +28,4 @@ public val TextRange.end: Int get() = getEndOffset() public val PsiElement.range: TextRange - get() = getTextRange()!! \ No newline at end of file + get() = getTextRange()!! diff --git a/idea/src/org/jetbrains/jet/plugin/converters/JetRunConfigurationSettingsFormatConverterProvider.java b/idea/src/org/jetbrains/kotlin/idea/converters/JetRunConfigurationSettingsFormatConverterProvider.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/converters/JetRunConfigurationSettingsFormatConverterProvider.java rename to idea/src/org/jetbrains/kotlin/idea/converters/JetRunConfigurationSettingsFormatConverterProvider.java index ca650a0280c..c1d1b62ec7a 100644 --- a/idea/src/org/jetbrains/jet/plugin/converters/JetRunConfigurationSettingsFormatConverterProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/converters/JetRunConfigurationSettingsFormatConverterProvider.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.converters; +package org.jetbrains.kotlin.idea.converters; import com.intellij.conversion.*; import org.jdom.Element; diff --git a/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyright.java b/idea/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyright.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyright.java rename to idea/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyright.java index 16435ec7ad2..164e4ef6047 100644 --- a/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyright.java +++ b/idea/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyright.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.copyright; +package org.jetbrains.kotlin.idea.copyright; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyrightsProvider.java b/idea/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyrightsProvider.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyrightsProvider.java rename to idea/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyrightsProvider.java index b26996f810e..44ad2700ec8 100644 --- a/idea/src/org/jetbrains/jet/plugin/copyright/UpdateKotlinCopyrightsProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/copyright/UpdateKotlinCopyrightsProvider.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.copyright; +package org.jetbrains.kotlin.idea.copyright; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.module.Module; diff --git a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt b/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt rename to idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt index 8f5db8daafb..ca2c2f35c90 100644 --- a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt +++ b/idea/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.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.coverage +package org.jetbrains.kotlin.idea.coverage import com.intellij.coverage.JavaCoverageEngineExtension import com.intellij.execution.configurations.RunConfigurationBase -import org.jetbrains.jet.plugin.run.JetRunConfiguration +import org.jetbrains.kotlin.idea.run.JetRunConfiguration import com.intellij.psi.PsiFile import com.intellij.openapi.vfs.VirtualFile import com.intellij.coverage.CoverageSuitesBundle diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt index 13880589b1c..eb9ad2f5469 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt @@ -49,13 +49,13 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.builtins.InlineUtil import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils -import org.jetbrains.jet.plugin.util.DebuggerUtils +import org.jetbrains.kotlin.idea.util.DebuggerUtils import java.util.* import org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction public class JetPositionManager(private val myDebugProcess: DebugProcess) : PositionManager { private val myTypeMappers = WeakHashMap, CachedValue>() diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt index 0d1a06f5075..5d945c9d510 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.caches.resolve.analyze public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() { diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt index fbce9d567bb..a4fc0351e12 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionCache.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.apache.log4j.Logger -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction class KotlinEvaluateExpressionCache(val project: Project) { diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt index d8b1217f9f5..67e855978dd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -59,7 +59,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import com.sun.jdi.VirtualMachine import org.jetbrains.kotlin.codegen.AsmUtil import com.sun.jdi.InvalidStackFrameException -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.analysisContext import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.resolve.jvm.JvmClassName @@ -73,9 +73,9 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.types.Flexibility import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.plugin.util.attachment.attachmentByPsiFile +import org.jetbrains.kotlin.idea.util.attachment.attachmentByPsiFile import com.intellij.openapi.diagnostic.Attachment -import org.jetbrains.jet.plugin.util.attachment.mergeAttachments +import org.jetbrains.kotlin.idea.util.attachment.mergeAttachments import com.sun.jdi.ClassType import com.sun.jdi.InvocationException diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt index 421aeecbb4e..8cfa6e61d15 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -29,14 +29,14 @@ import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.Stat import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil import org.jetbrains.kotlin.idea.refactoring.extractFunction.validate import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionOptions -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction import com.intellij.psi.PsiManager import com.intellij.psi.impl.PsiModificationTrackerImpl import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionGeneratorOptions import org.jetbrains.kotlin.idea.refactoring.extractFunction.generateDeclaration -import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange +import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode import org.jetbrains.kotlin.psi.psiUtil.replaced diff --git a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java b/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java rename to idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java index aa4dc1caa1b..46559f30067 100644 --- a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java +++ b/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.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.filters; +package org.jetbrains.kotlin.idea.filters; import com.intellij.execution.filters.ExceptionFilter; import com.intellij.execution.filters.Filter; @@ -27,11 +27,11 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.idea.util.DebuggerUtils; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.util.DebuggerUtils; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilterFactory.java b/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilterFactory.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilterFactory.java rename to idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilterFactory.java index a86dc7ac578..0162b063cee 100644 --- a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilterFactory.java +++ b/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilterFactory.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.filters; +package org.jetbrains.kotlin.idea.filters; import com.intellij.execution.filters.ExceptionFilterFactory; import com.intellij.execution.filters.Filter; 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 6448217f039..4e4a8befd00 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.idea.findUsages.toSearchTarget import org.jetbrains.kotlin.idea.findUsages.toClassHelper import org.jetbrains.kotlin.idea.findUsages.toClassDeclarationsHelper import org.jetbrains.kotlin.idea.search.usagesSearch.search -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction import java.util.Collections import com.intellij.find.findUsages.JavaFindUsagesHandler import com.intellij.find.findUsages.JavaFindUsagesHandlerFactory 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 054bc237374..d8b9e691f58 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinTypeParameterFindUsage import org.jetbrains.kotlin.idea.search.usagesSearch.DefaultSearchHelper import org.jetbrains.kotlin.idea.findUsages.toSearchTarget import org.jetbrains.kotlin.idea.search.usagesSearch.search -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction public class KotlinTypeParameterFindUsagesHandler( element: JetNamedDeclaration, diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDefferConfig.java b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDefferConfig.java index 2d01e651da7..3a78e7d2d3f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDefferConfig.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDefferConfig.java @@ -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.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 org.jetbrains.kotlin.idea.util.projectStructure.ProjectStructurePackage; import javax.swing.*; import java.io.File; diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java index b795f880173..8954708b043 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.FrameworkTypeEx; import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.kotlin.idea.JetIcons; import javax.swing.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdPresentationProvider.java b/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdPresentationProvider.java index d2436ee9b7c..7b927b762f5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdPresentationProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSLibraryStdPresentationProvider.java @@ -23,7 +23,7 @@ import com.intellij.openapi.roots.libraries.LibraryPresentationProvider; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.kotlin.idea.JetIcons; import org.jetbrains.kotlin.utils.LibraryUtils; import org.jetbrains.kotlin.utils.PathUtil; diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.java b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.java index de3c35b1cc5..efed3000c6b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.framework; import com.intellij.framework.FrameworkTypeEx; import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.kotlin.idea.JetIcons; import javax.swing.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimePresentationProvider.java b/idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimePresentationProvider.java index 85ac31ba61c..7a014f46d1d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimePresentationProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JavaRuntimePresentationProvider.java @@ -23,7 +23,7 @@ import com.intellij.openapi.roots.libraries.LibraryPresentationProvider; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.kotlin.idea.JetIcons; import org.jetbrains.kotlin.utils.LibraryUtils; import org.jetbrains.kotlin.utils.PathUtil; diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryPresentationProvider.java b/idea/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryPresentationProvider.java index 733de0063c1..6d861f042d2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryPresentationProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JsHeaderLibraryPresentationProvider.java @@ -22,7 +22,7 @@ import com.intellij.openapi.roots.libraries.LibraryPresentationProvider; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.kotlin.idea.JetIcons; import javax.swing.*; import java.util.List; diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt index 200155d2229..a1ef885df3e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt @@ -19,7 +19,7 @@ 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 org.jetbrains.jet.plugin.JetIcons +import org.jetbrains.kotlin.idea.JetIcons import org.jetbrains.kotlin.idea.project.TargetPlatform import com.intellij.openapi.roots.ui.configuration.ModulesProvider import com.intellij.ide.util.projectWizard.WizardContext diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt index 856c1779d44..4c3d1c4f527 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.framework import com.intellij.ide.util.projectWizard.WizardContext import com.intellij.platform.ProjectTemplatesFactory import com.intellij.platform.templates.BuilderBasedTemplate -import org.jetbrains.jet.plugin.JetIcons +import org.jetbrains.kotlin.idea.JetIcons import org.jetbrains.kotlin.idea.project.TargetPlatform public class KotlinTemplatesFactory : ProjectTemplatesFactory() { diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.java b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.java index 91f97f08bae..5c61d574766 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/ui/CreateLibraryDialogBase.java @@ -21,7 +21,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.ui.SeparatorWithText; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetPluginUtil; +import org.jetbrains.kotlin.idea.JetPluginUtil; import javax.swing.*; import java.awt.*; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java index e7cf39899cc..9985517735f 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.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.hierarchy; +package org.jetbrains.kotlin.idea.hierarchy; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.openapi.actionSystem.CommonDataKeys; @@ -25,12 +25,12 @@ import com.intellij.psi.*; import com.intellij.util.ArrayUtil; import kotlin.Function1; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; public class HierarchyUtils { public static final Function1 IS_CALL_HIERARCHY_ELEMENT = new Function1() { diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinTypeHierarchyProvider.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinTypeHierarchyProvider.java index 745963f166d..f802bbc221c 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinTypeHierarchyProvider.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.hierarchy; +package org.jetbrains.kotlin.idea.hierarchy; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.ide.hierarchy.type.JavaTypeHierarchyProvider; @@ -31,15 +31,15 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.kotlin.psi.JetNamedFunction; -import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper; import org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.types.JetType; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/CalleeReferenceVisitorBase.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/CalleeReferenceVisitorBase.java index 58ec0d81b36..83be2af0d7f 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/CalleeReferenceVisitorBase.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.hierarchy.calls; +package org.jetbrains.kotlin.idea.hierarchy.calls; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyBrowser.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyBrowser.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyBrowser.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyBrowser.java index fc3ed2e6cfc..3195215d8df 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyBrowser.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyBrowser.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.hierarchy.calls; +package org.jetbrains.kotlin.idea.hierarchy.calls; import com.intellij.ide.hierarchy.CallHierarchyBrowserBase; import com.intellij.ide.hierarchy.HierarchyNodeDescriptor; @@ -29,7 +29,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.ui.PopupHandler; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; +import org.jetbrains.kotlin.idea.hierarchy.HierarchyUtils; import javax.swing.*; import java.util.Comparator; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java index ecdccfc34b1..b8fdabb8eb5 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.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.hierarchy.calls; +package org.jetbrains.kotlin.idea.hierarchy.calls; import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; @@ -40,10 +40,10 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.BindingContext; import javax.swing.*; import java.awt.*; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyProvider.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyProvider.java index e03562200b7..dd76f561c10 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallHierarchyProvider.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.hierarchy.calls; +package org.jetbrains.kotlin.idea.hierarchy.calls; import com.intellij.codeInsight.TargetElementUtilBase; import com.intellij.ide.hierarchy.CallHierarchyBrowserBase; @@ -28,8 +28,8 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; -import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; +import org.jetbrains.kotlin.idea.hierarchy.HierarchyUtils; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; public class KotlinCallHierarchyProvider implements HierarchyProvider { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java index f8e58a01474..961a8cd4edc 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.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.hierarchy.calls; +package org.jetbrains.kotlin.idea.hierarchy.calls; import com.intellij.ide.hierarchy.HierarchyNodeDescriptor; import com.intellij.ide.hierarchy.HierarchyTreeStructure; @@ -29,9 +29,9 @@ import com.intellij.util.containers.HashMap; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.Map; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java index 2051705af4a..554b4e39047 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.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.hierarchy.calls; +package org.jetbrains.kotlin.idea.hierarchy.calls; import com.intellij.ide.hierarchy.HierarchyNodeDescriptor; import com.intellij.ide.hierarchy.call.CallHierarchyNodeDescriptor; @@ -25,9 +25,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.asJava.KotlinLightMethod; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.psi.*; import java.util.ArrayList; import java.util.HashMap; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index a617ab13e80..e1ef1b9e757 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.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.hierarchy.calls; +package org.jetbrains.kotlin.idea.hierarchy.calls; import com.google.common.collect.Maps; import com.intellij.ide.hierarchy.HierarchyNodeDescriptor; @@ -34,13 +34,13 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashMap; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; +import org.jetbrains.kotlin.idea.hierarchy.HierarchyUtils; import org.jetbrains.kotlin.idea.references.JetReference; import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchPackage; -import org.jetbrains.kotlin.asJava.LightClassUtil; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.Collections; import java.util.HashSet; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt index 3ea665caa77..e377b40cfd9 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.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,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.hierarchy.overrides +package org.jetbrains.kotlin.idea.hierarchy.overrides import com.intellij.ide.hierarchy.MethodHierarchyBrowserBase import com.intellij.psi.PsiElement import javax.swing.JPanel import com.intellij.ide.hierarchy.HierarchyTreeStructure import com.intellij.openapi.project.Project -import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils +import org.jetbrains.kotlin.idea.hierarchy.HierarchyUtils import org.jetbrains.kotlin.idea.JetBundle import com.intellij.ide.hierarchy.method.MethodHierarchyBrowser import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt index 566ff069d5d..53a6e3cad69 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideHierarchyProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyProvider.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,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.hierarchy.overrides +package org.jetbrains.kotlin.idea.hierarchy.overrides import com.intellij.ide.hierarchy.HierarchyProvider import com.intellij.openapi.actionSystem.DataContext import com.intellij.psi.PsiElement import com.intellij.ide.hierarchy.HierarchyBrowser import com.intellij.openapi.actionSystem.CommonDataKeys -import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils +import org.jetbrains.kotlin.idea.hierarchy.HierarchyUtils import com.intellij.ide.hierarchy.MethodHierarchyBrowserBase import com.intellij.ide.hierarchy.HierarchyBrowserBaseEx diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt rename to idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.kt index 73872a6309b..f6a37fb221f 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/overrides/KotlinOverrideTreeStructure.kt +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideTreeStructure.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.hierarchy.overrides +package org.jetbrains.kotlin.idea.hierarchy.overrides import com.intellij.ide.hierarchy.HierarchyTreeStructure import com.intellij.ide.hierarchy.HierarchyNodeDescriptor diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetColorSettingsPage.java index ae589aed254..19b07209831 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetColorSettingsPage.java +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetColorSettingsPage.java @@ -23,8 +23,8 @@ import com.intellij.openapi.options.colors.AttributesDescriptor; import com.intellij.openapi.options.colors.ColorDescriptor; import com.intellij.openapi.options.colors.ColorSettingsPage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.JetIcons; import org.jetbrains.kotlin.idea.JetLanguage; import javax.swing.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetLineMarkerProvider.java index 675815a2b0b..4e3ade01f74 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetLineMarkerProvider.java @@ -35,7 +35,6 @@ import com.intellij.util.NullableFunction; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.Modality; @@ -43,6 +42,7 @@ import org.jetbrains.kotlin.idea.highlighter.markers.MarkersPackage; import org.jetbrains.kotlin.idea.highlighter.markers.ResolveWithParentsResult; import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerNavigationHandler; import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerTooltip; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; diff --git a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt b/idea/src/org/jetbrains/kotlin/idea/imports/ImportsUtils.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt rename to idea/src/org/jetbrains/kotlin/idea/imports/ImportsUtils.kt index 5b4c2f1f96c..7a0fb595b20 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/imports/ImportsUtils.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.imports +package org.jetbrains.kotlin.idea.imports import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.name.FqName diff --git a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt rename to idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt index 4d620527672..26685316fcb 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.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.imports +package org.jetbrains.kotlin.idea.imports import com.intellij.lang.ImportOptimizer import com.intellij.openapi.application.ApplicationManager diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ExplicitGetInspection.kt similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt rename to idea/src/org/jetbrains/kotlin/idea/inspections/ExplicitGetInspection.kt index 317c44b77ee..06e3d6abf35 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ExplicitGetInspection.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.inspections +package org.jetbrains.kotlin.idea.inspections import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.idea.intentions.attributeCallReplacements.ReplaceGetIntention diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/IfThenToElvisInspection.kt similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt rename to idea/src/org/jetbrains/kotlin/idea/inspections/IfThenToElvisInspection.kt index 6c66ef612e6..180c777671e 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/IfThenToElvisInspection.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.inspections +package org.jetbrains.kotlin.idea.inspections import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisIntention import org.jetbrains.kotlin.psi.JetIfExpression diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/IfThenToSafeAccessInspection.kt similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt rename to idea/src/org/jetbrains/kotlin/idea/inspections/IfThenToSafeAccessInspection.kt index eea4539c8cd..e4762f4a9b1 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/IfThenToSafeAccessInspection.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.inspections +package org.jetbrains.kotlin.idea.inspections import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention import org.jetbrains.kotlin.psi.JetIfExpression diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt index b78ef648f1d..6ad32f18e6c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument -import org.jetbrains.jet.plugin.util.psiModificationUtil.moveInsideParentheses +import org.jetbrains.kotlin.idea.util.psiModificationUtil.moveInsideParentheses import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully public class MoveLambdaInsideParenthesesIntention : JetSelfTargetingIntention( diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt index 37a77a8cc2d..0443f313bca 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.util.psi.patternMatching.matches +import org.jetbrains.kotlin.idea.util.psi.patternMatching.matches import org.jetbrains.kotlin.idea.caches.resolve.analyze public class ReplaceWithOperatorAssignIntention : JetSelfTargetingIntention("replace.with.operator.assign.intention", javaClass()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt index 06c90b5c4a5..05c19d773f7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.plugin.util.JetPsiPrecedences +import org.jetbrains.kotlin.idea.util.JetPsiPrecedences import org.jetbrains.kotlin.lexer.JetTokens.* import org.jetbrains.kotlin.types.expressions.OperatorConventions diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt index 742206d3f87..726e2e5c78b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt @@ -27,9 +27,9 @@ import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument -import org.jetbrains.jet.plugin.util.Maybe -import org.jetbrains.jet.plugin.util.MaybeError -import org.jetbrains.jet.plugin.util.MaybeValue +import org.jetbrains.kotlin.idea.util.Maybe +import org.jetbrains.kotlin.idea.util.MaybeError +import org.jetbrains.kotlin.idea.util.MaybeValue import com.intellij.codeInsight.hint.HintManager import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.idea.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/branchedTransformationUtils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/branchedTransformationUtils.kt index cb94bc8c2a0..cccef8d0f4c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/branchedTransformationUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/branchedTransformationUtils.kt @@ -25,8 +25,8 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.psi.PsiWhiteSpace import java.util.Collections import com.intellij.util.containers.ContainerUtil -import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange -import org.jetbrains.jet.plugin.util.psi.patternMatching.matches +import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange +import org.jetbrains.kotlin.idea.util.psi.patternMatching.matches public val TRANSFORM_WITHOUT_CHECK: String = "Expression must be checked before applying transformation" diff --git a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java rename to idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java index bcdbdbcd79f..ffb3c5b44e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java +++ b/idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.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.internal; +package org.jetbrains.kotlin.idea.internal; import com.intellij.ide.highlighter.JavaFileType; import com.intellij.openapi.Disposable; @@ -36,19 +36,19 @@ import com.intellij.ui.content.ContentManager; import com.intellij.util.Alarm; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.codegen.ClassBuilderFactories; import org.jetbrains.kotlin.codegen.CompilationErrorHandler; import org.jetbrains.kotlin.codegen.KotlinCodegenFacade; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.Progress; import org.jetbrains.kotlin.diagnostics.DiagnosticSink; -import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.util.InfinitePeriodicalTask; -import org.jetbrains.jet.plugin.util.LongRunningReadTask; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; -import org.jetbrains.kotlin.backend.common.output.OutputFile; -import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.idea.util.InfinitePeriodicalTask; +import org.jetbrains.kotlin.idea.util.LongRunningReadTask; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; +import org.jetbrains.kotlin.psi.JetFile; import javax.swing.*; import java.awt.*; diff --git a/idea/src/org/jetbrains/jet/plugin/internal/Location.java b/idea/src/org/jetbrains/kotlin/idea/internal/Location.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/internal/Location.java rename to idea/src/org/jetbrains/kotlin/idea/internal/Location.java index 1de18718eb4..d83ed8324c5 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/Location.java +++ b/idea/src/org/jetbrains/kotlin/idea/internal/Location.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.internal; +package org.jetbrains.kotlin.idea.internal; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.EditorEx; diff --git a/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/CreateIncrementalCompilationBackup.kt b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/internal/makeBackup/CreateIncrementalCompilationBackup.kt rename to idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.kt index 03550c03b65..43a9e1f08a2 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/CreateIncrementalCompilationBackup.kt +++ b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/CreateIncrementalCompilationBackup.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.internal.makeBackup +package org.jetbrains.kotlin.idea.internal.makeBackup import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.actionSystem.AnActionEvent @@ -178,4 +178,4 @@ public class CreateIncrementalCompilationBackup: AnAction("Create backup for deb ) }, null, project) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/MakeBackupCompileTask.kt b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/MakeBackupCompileTask.kt similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/internal/makeBackup/MakeBackupCompileTask.kt rename to idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/MakeBackupCompileTask.kt index 0c88f3a1167..85f07a4d410 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/MakeBackupCompileTask.kt +++ b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/MakeBackupCompileTask.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.internal.makeBackup +package org.jetbrains.kotlin.idea.internal.makeBackup import com.intellij.history.LocalHistory import com.intellij.openapi.compiler.CompileTask import com.intellij.openapi.compiler.CompileContext import java.util.Random import com.intellij.openapi.util.Key -import com.intellij.compiler.CompilerWorkspaceConfiguration import com.intellij.openapi.project.Project import com.intellij.openapi.components.ServiceManager import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerWorkspaceSettings diff --git a/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/makeBackup.kt b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/makeBackup.kt similarity index 86% rename from idea/src/org/jetbrains/jet/plugin/internal/makeBackup/makeBackup.kt rename to idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/makeBackup.kt index 728b13d49ca..30ce5f03142 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/makeBackup/makeBackup.kt +++ b/idea/src/org/jetbrains/kotlin/idea/internal/makeBackup/makeBackup.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,6 +14,6 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.internal.makeBackup +package org.jetbrains.kotlin.idea.internal.makeBackup val HISTORY_LABEL_PREFIX = "build started " diff --git a/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaResolverForConverter.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt rename to idea/src/org/jetbrains/kotlin/idea/j2k/IdeaResolverForConverter.kt index beb063a4c24..42e531ce0f7 100644 --- a/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/j2k/IdeaResolverForConverter.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.j2k +package org.jetbrains.kotlin.idea.j2k import org.jetbrains.kotlin.j2k.ResolverForConverter import org.jetbrains.kotlin.psi.JetDeclaration diff --git a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt rename to idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt index 08d14f0e981..ba6948048e7 100644 --- a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.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.j2k +package org.jetbrains.kotlin.idea.j2k import org.jetbrains.kotlin.j2k.PostProcessor import org.jetbrains.kotlin.psi.* diff --git a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt b/idea/src/org/jetbrains/kotlin/idea/joinLines/JoinBlockIntoSingleStatementHandler.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/joinLines/JoinBlockIntoSingleStatementHandler.kt index 05f61178b75..d74227ecdad 100644 --- a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinBlockIntoSingleStatementHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/joinLines/JoinBlockIntoSingleStatementHandler.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.joinLines +package org.jetbrains.kotlin.idea.joinLines import com.intellij.codeInsight.editorActions.JoinRawLinesHandlerDelegate import com.intellij.openapi.editor.Document diff --git a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt b/idea/src/org/jetbrains/kotlin/idea/joinLines/JoinDeclarationAndAssignmentHandler.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/joinLines/JoinDeclarationAndAssignmentHandler.kt index 0d98cf35e13..b3eb6277618 100644 --- a/idea/src/org/jetbrains/jet/plugin/joinLines/JoinDeclarationAndAssignmentHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/joinLines/JoinDeclarationAndAssignmentHandler.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.joinLines +package org.jetbrains.kotlin.idea.joinLines import org.jetbrains.kotlin.psi.psiUtil.siblings import org.jetbrains.kotlin.psi.psiUtil.parents @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.psi.PsiWhiteSpace -import com.intellij.psi.PsiComment import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.openapi.util.text.StringUtil diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSBrowserProgramRunner.java similarity index 88% rename from idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java rename to idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSBrowserProgramRunner.java index 537bb255ced..d4a63baecea 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSBrowserProgramRunner.java +++ b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSBrowserProgramRunner.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.k2jsrun; +package org.jetbrains.kotlin.idea.k2jsrun; import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.RunProfile; @@ -26,8 +26,8 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.jetbrains.jet.plugin.k2jsrun.K2JSRunnerUtils.copyJSFileFromOutputToDestination; -import static org.jetbrains.jet.plugin.k2jsrun.K2JSRunnerUtils.openBrowser; +import static org.jetbrains.kotlin.idea.k2jsrun.K2JSRunnerUtils.copyJSFileFromOutputToDestination; +import static org.jetbrains.kotlin.idea.k2jsrun.K2JSRunnerUtils.openBrowser; public final class K2JSBrowserProgramRunner extends GenericProgramRunner { @Nullable diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSConfigurationSettings.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java rename to idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSConfigurationSettings.java index a8365885b25..ae94f711224 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSConfigurationSettings.java +++ b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSConfigurationSettings.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.k2jsrun; +package org.jetbrains.kotlin.idea.k2jsrun; import com.intellij.ide.browsers.BrowserFamily; import com.intellij.ide.browsers.WebBrowserManager; diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfiguration.java b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfiguration.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfiguration.java rename to idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfiguration.java index a1a6eea2173..52cc530d316 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfiguration.java +++ b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfiguration.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.k2jsrun; +package org.jetbrains.kotlin.idea.k2jsrun; import com.intellij.execution.DefaultExecutionResult; import com.intellij.execution.ExecutionException; diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.form b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationEditor.form similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.form rename to idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationEditor.form index b95bc4af039..b1146ccd666 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.form +++ b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationEditor.form @@ -1,5 +1,5 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationEditor.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java rename to idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationEditor.java index ad5fd0d19ff..c90172344c5 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationEditor.java +++ b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationEditor.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.k2jsrun; +package org.jetbrains.kotlin.idea.k2jsrun; import com.intellij.ide.browsers.BrowserFamily; import com.intellij.ide.browsers.WebBrowser; diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationType.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java rename to idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationType.java index d66e2469d42..73c9636816d 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunConfigurationType.java +++ b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationType.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.k2jsrun; +package org.jetbrains.kotlin.idea.k2jsrun; import com.intellij.execution.configurations.*; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.kotlin.idea.JetIcons; public final class K2JSRunConfigurationType extends ConfigurationTypeBase { public static K2JSRunConfigurationType getInstance() { @@ -40,4 +40,4 @@ public final class K2JSRunConfigurationType extends ConfigurationTypeBase { return new K2JSRunConfiguration("Kotlin to JavaScript", new RunConfigurationModule(project), this); } } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunnerUtils.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java rename to idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunnerUtils.java index f70cf37050a..848ceb82766 100644 --- a/idea/src/org/jetbrains/jet/plugin/k2jsrun/K2JSRunnerUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunnerUtils.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.k2jsrun; +package org.jetbrains.kotlin.idea.k2jsrun; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.runners.ExecutionEnvironment; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/DeleteSignatureAction.java b/idea/src/org/jetbrains/kotlin/idea/ktSignature/DeleteSignatureAction.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/ktSignature/DeleteSignatureAction.java rename to idea/src/org/jetbrains/kotlin/idea/ktSignature/DeleteSignatureAction.java index d283f42f128..c684d537b75 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/DeleteSignatureAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/ktSignature/DeleteSignatureAction.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.ktSignature; +package org.jetbrains.kotlin.idea.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.openapi.actionSystem.AnAction; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureAction.java b/idea/src/org/jetbrains/kotlin/idea/ktSignature/EditSignatureAction.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureAction.java rename to idea/src/org/jetbrains/kotlin/idea/ktSignature/EditSignatureAction.java index 9bb27eb2888..48ce95f75d6 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/ktSignature/EditSignatureAction.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.ktSignature; +package org.jetbrains.kotlin.idea.ktSignature; import com.intellij.codeInsight.navigation.NavigationUtil; import com.intellij.openapi.actionSystem.AnAction; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java b/idea/src/org/jetbrains/kotlin/idea/ktSignature/EditSignatureBalloon.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java rename to idea/src/org/jetbrains/kotlin/idea/ktSignature/EditSignatureBalloon.java index 46222ff4f1b..a2cb92a5ee5 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java +++ b/idea/src/org/jetbrains/kotlin/idea/ktSignature/EditSignatureBalloon.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.ktSignature; +package org.jetbrains.kotlin.idea.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.openapi.Disposable; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java b/idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureAnnotationIntention.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java rename to idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureAnnotationIntention.java index 5a1fe3b4fb7..1c19e0f79a5 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java +++ b/idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureAnnotationIntention.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.ktSignature; +package org.jetbrains.kotlin.idea.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsListener; import com.intellij.codeInsight.ExternalAnnotationsManager; @@ -33,12 +33,12 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetIcons; -import org.jetbrains.kotlin.idea.caches.resolve.JavaResolveExtension; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.JetIcons; +import org.jetbrains.kotlin.idea.caches.resolve.JavaResolveExtension; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.load.java.structure.impl.JavaConstructorImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaFieldImpl; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureInJavaMarkerProvider.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java rename to idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureInJavaMarkerProvider.java index a70631ac396..657a390f1d7 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureInJavaMarkerProvider.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.ktSignature; +package org.jetbrains.kotlin.idea.ktSignature; import com.intellij.codeHighlighting.Pass; import com.intellij.codeInsight.daemon.GutterIconNavigationHandler; @@ -39,17 +39,17 @@ import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.idea.JetIcons; +import org.jetbrains.kotlin.idea.caches.resolve.JavaResolveExtension; +import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; +import org.jetbrains.kotlin.idea.util.attachment.AttachmentPackage; import org.jetbrains.kotlin.load.java.JavaBindingContext; -import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; -import org.jetbrains.kotlin.resolve.jvm.JvmPackage; import org.jetbrains.kotlin.load.java.structure.impl.JavaConstructorImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaFieldImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl; -import org.jetbrains.jet.plugin.JetIcons; -import org.jetbrains.kotlin.idea.caches.resolve.JavaResolveExtension; -import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; -import org.jetbrains.jet.plugin.util.attachment.AttachmentPackage; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; import java.awt.event.MouseEvent; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerUpdater.java b/idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureInJavaMarkerUpdater.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerUpdater.java rename to idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureInJavaMarkerUpdater.java index 5365c21d448..4a1365f35fa 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerUpdater.java +++ b/idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureInJavaMarkerUpdater.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.ktSignature; +package org.jetbrains.kotlin.idea.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsListener; import com.intellij.codeInsight.ExternalAnnotationsManager; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java b/idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureUtil.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java rename to idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureUtil.java index 5dd4c5c94b6..0cfe7659ff5 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/ktSignature/KotlinSignatureUtil.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.ktSignature; +package org.jetbrains.kotlin.idea.ktSignature; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/ShowKotlinSignaturesAction.java b/idea/src/org/jetbrains/kotlin/idea/ktSignature/ShowKotlinSignaturesAction.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/ktSignature/ShowKotlinSignaturesAction.java rename to idea/src/org/jetbrains/kotlin/idea/ktSignature/ShowKotlinSignaturesAction.java index acb3644f446..66267f76fe4 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/ShowKotlinSignaturesAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/ktSignature/ShowKotlinSignaturesAction.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.ktSignature; +package org.jetbrains.kotlin.idea.ktSignature; import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplatesProvider.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetLiveTemplatesProvider.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplatesProvider.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetLiveTemplatesProvider.java index 7bb23a4f6a4..127010d521d 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplatesProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetLiveTemplatesProvider.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.liveTemplates; +package org.jetbrains.kotlin.idea.liveTemplates; import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetTemplateContextType.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetTemplateContextType.java index 12de37c2812..30dbfea44a1 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetTemplateContextType.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.liveTemplates; +package org.jetbrains.kotlin.idea.liveTemplates; import com.intellij.codeInsight.template.EverywhereContextType; import com.intellij.codeInsight.template.TemplateContextType; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/KotlinShortenFQNamesProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/KotlinShortenFQNamesProcessor.kt rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.kt index 2f103b055f7..cf7e594be7f 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/KotlinShortenFQNamesProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinShortenFQNamesProcessor.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.liveTemplates +package org.jetbrains.kotlin.idea.liveTemplates import com.intellij.codeInsight.template.impl.TemplateOptionalProcessor import com.intellij.openapi.project.Project diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.java index 75909687083..d7e0bd2bd52 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.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.liveTemplates.macro; +package org.jetbrains.kotlin.idea.liveTemplates.macro; import com.intellij.codeInsight.template.Template; import com.intellij.codeInsight.template.TemplateEditingAdapter; @@ -30,10 +30,10 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.kotlin.psi.JetReferenceExpression; -import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ImplementMethodsHandler; +import org.jetbrains.kotlin.psi.JetReferenceExpression; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.HashMap; import java.util.Map; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java index 8d96d92db69..25d6941d3b4 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.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.liveTemplates.macro; +package org.jetbrains.kotlin.idea.liveTemplates.macro; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; @@ -29,11 +29,11 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiNamedElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.di.InjectorForMacros; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.util.UtilPackage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnonymousSuperMacro.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnonymousSuperMacro.java index 4ef90612706..c0e7fee4847 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnonymousSuperMacro.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.liveTemplates.macro; +package org.jetbrains.kotlin.idea.liveTemplates.macro; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; @@ -30,11 +30,11 @@ import com.intellij.psi.PsiNamedElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnyVariableMacro.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnyVariableMacro.java index 1d7c787f10a..6ec4b7ce783 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnyVariableMacro.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.liveTemplates.macro; +package org.jetbrains.kotlin.idea.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetFunctionParametersMacro.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetFunctionParametersMacro.java index 047abd8cd9d..a25832de3f1 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetFunctionParametersMacro.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetFunctionParametersMacro.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.liveTemplates.macro; +package org.jetbrains.kotlin.idea.liveTemplates.macro; import com.intellij.codeInsight.template.*; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetIterableVariableMacro.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetIterableVariableMacro.java index 16c4efd16a2..00fe1f3f6cc 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetIterableVariableMacro.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.liveTemplates.macro; +package org.jetbrains.kotlin.idea.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetPsiElementResult.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetPsiElementResult.java similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetPsiElementResult.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetPsiElementResult.java index 2be1d5d3c1c..358f711b537 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetPsiElementResult.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetPsiElementResult.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.liveTemplates.macro; +package org.jetbrains.kotlin.idea.liveTemplates.macro; import com.intellij.codeInsight.template.JavaPsiElementResult; import com.intellij.psi.PsiNamedElement; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetSuggestVariableNameMacro.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetSuggestVariableNameMacro.java index 5106ef2eab7..4fb5d9ba0b7 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetSuggestVariableNameMacro.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.liveTemplates.macro; +package org.jetbrains.kotlin.idea.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java rename to idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.java index a009640df3e..6b1fb0299ba 100644 --- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.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.parameterInfo; +package org.jetbrains.kotlin.idea.parameterInfo; import com.google.common.collect.Iterables; import com.intellij.codeInsight.CodeInsightBundle; @@ -33,10 +33,10 @@ import com.intellij.util.ArrayUtil; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade; -import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.Name; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/JetClassPresenter.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java rename to idea/src/org/jetbrains/kotlin/idea/presentation/JetClassPresenter.java index d9ca2f45ffa..9308244c3f0 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetClassPresenter.java +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/JetClassPresenter.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.presentation; +package org.jetbrains.kotlin.idea.presentation; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java b/idea/src/org/jetbrains/kotlin/idea/presentation/JetDefaultNamedDeclarationPresentation.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java rename to idea/src/org/jetbrains/kotlin/idea/presentation/JetDefaultNamedDeclarationPresentation.java index d2e5007141d..ab193a88712 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/JetDefaultNamedDeclarationPresentation.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.presentation; +package org.jetbrains.kotlin.idea.presentation; import com.intellij.navigation.ColoredItemPresentation; import com.intellij.openapi.editor.colors.CodeInsightColors; import com.intellij.openapi.editor.colors.TextAttributesKey; +import org.jetbrains.kotlin.idea.JetIconProvider; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.psi.JetPsiUtil; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.JetIconProvider; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java rename to idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java index 80b316668cc..cbc530fcab9 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.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.presentation; +package org.jetbrains.kotlin.idea.presentation; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -22,10 +22,10 @@ import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; import org.apache.commons.lang.StringUtils; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetTypeReference; -import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java b/idea/src/org/jetbrains/kotlin/idea/presentation/JetLightClassListCellRenderer.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java rename to idea/src/org/jetbrains/kotlin/idea/presentation/JetLightClassListCellRenderer.java index 75784419c37..874334e0d24 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetLightClassListCellRenderer.java +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/JetLightClassListCellRenderer.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.presentation; +package org.jetbrains.kotlin.idea.presentation; import com.intellij.ide.util.PsiElementListCellRenderer; import com.intellij.psi.presentation.java.ClassPresentationUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetObjectPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/JetObjectPresenter.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/presentation/JetObjectPresenter.java rename to idea/src/org/jetbrains/kotlin/idea/presentation/JetObjectPresenter.java index dbdec273318..6e732ab5678 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetObjectPresenter.java +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/JetObjectPresenter.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.presentation; +package org.jetbrains.kotlin.idea.presentation; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetParameterPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/JetParameterPresenter.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/presentation/JetParameterPresenter.java rename to idea/src/org/jetbrains/kotlin/idea/presentation/JetParameterPresenter.java index fa0e748690a..e46e576505c 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetParameterPresenter.java +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/JetParameterPresenter.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.presentation; +package org.jetbrains.kotlin.idea.presentation; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetPropertyPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/JetPropertyPresenter.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/presentation/JetPropertyPresenter.java rename to idea/src/org/jetbrains/kotlin/idea/presentation/JetPropertyPresenter.java index 26afc54b61d..4b18c033573 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetPropertyPresenter.java +++ b/idea/src/org/jetbrains/kotlin/idea/presentation/JetPropertyPresenter.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.presentation; +package org.jetbrains.kotlin.idea.presentation; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.ItemPresentationProvider; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/JetClassObjectTreeNode.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java rename to idea/src/org/jetbrains/kotlin/idea/projectView/JetClassObjectTreeNode.java index 730f1495f71..3ac3c7db97d 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassObjectTreeNode.java +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/JetClassObjectTreeNode.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. diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/JetClassOrObjectTreeNode.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java rename to idea/src/org/jetbrains/kotlin/idea/projectView/JetClassOrObjectTreeNode.java index b480f6c82fb..3010af86cf4 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetClassOrObjectTreeNode.java +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/JetClassOrObjectTreeNode.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. @@ -23,10 +23,9 @@ import com.intellij.ide.projectView.impl.nodes.AbstractPsiBasedNode; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; +import org.jetbrains.kotlin.idea.JetIconProvider; import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPsiUtil; -import org.jetbrains.jet.plugin.JetIconProvider; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/JetDeclarationTreeNode.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java rename to idea/src/org/jetbrains/kotlin/idea/projectView/JetDeclarationTreeNode.java index 5cfccfa90e7..5c785bec4bb 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/JetDeclarationTreeNode.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. @@ -23,8 +23,8 @@ import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; -import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.idea.formatter.JetCodeStyleSettings; +import org.jetbrains.kotlin.psi.*; import java.util.Collection; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/JetFileTreeNode.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java rename to idea/src/org/jetbrains/kotlin/idea/projectView/JetFileTreeNode.java index e0f76aa62c9..9c65404fd8e 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/JetFileTreeNode.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. diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java b/idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewProvider.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java rename to idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewProvider.java index 4abf3305c76..48731f090fb 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewProvider.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. @@ -26,11 +26,11 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; +import org.jetbrains.kotlin.idea.JetIconProvider; import org.jetbrains.kotlin.psi.JetClassBody; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.plugin.JetIconProvider; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java b/idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewUtil.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java rename to idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewUtil.java index 46f41f0556e..38a44fd4ea4 100644 --- a/idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewUtil.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. diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java index 02d37d774e5..10c093f24fc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java @@ -30,11 +30,11 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.JetIcons; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetCallElement; import org.jetbrains.kotlin.psi.JetExpression; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt index 96cc532be53..2df343601c5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt @@ -41,13 +41,13 @@ import org.jetbrains.kotlin.idea.caches.JetShortNamesCache import org.jetbrains.kotlin.idea.caches.KotlinIndicesHelper import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.project.ProjectStructureUtil -import org.jetbrains.jet.plugin.util.JetPsiHeuristicsUtil +import org.jetbrains.kotlin.idea.util.JetPsiHeuristicsUtil import java.util.ArrayList import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.psi.PsiElement import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil import com.intellij.openapi.module.ModuleUtilCore -import org.jetbrains.jet.plugin.util.ProjectRootsUtil +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/IncorrectSourceRootNameNotification.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/IncorrectSourceRootNameNotification.java index b5e6cc5d089..83a254730f7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/IncorrectSourceRootNameNotification.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/IncorrectSourceRootNameNotification.java @@ -33,8 +33,8 @@ import com.intellij.ui.EditorNotificationPanel; import com.intellij.ui.EditorNotifications; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetPluginUtil; import org.jetbrains.kotlin.idea.JetFileType; +import org.jetbrains.kotlin.idea.JetPluginUtil; import java.io.IOException; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index cbb1308ff49..92ccc474935 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -51,7 +51,7 @@ import org.jetbrains.kotlin.idea.refactoring.CollectingValidator import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiElement import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.plugin.util.application.runWriteAction +import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.refactoring.isMultiLine import org.jetbrains.kotlin.types.checker.JetTypeChecker import com.intellij.psi.SmartPointerManager diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java index f42015d9276..51da16d4206 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java @@ -37,7 +37,6 @@ import com.intellij.util.containers.ContainerUtil; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.util.string.StringPackage; import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; @@ -48,6 +47,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; +import org.jetbrains.kotlin.idea.util.string.StringPackage; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt index c686fdccec0..08084e7703d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.JetElement import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.psi.psiUtil.getOutermostParentContainedIn import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively -import org.jetbrains.jet.plugin.util.application.executeWriteCommand +import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.JetBlockExpression import kotlin.test.fail import org.jetbrains.kotlin.idea.refactoring.extractFunction.AnalysisResult.Status @@ -45,7 +45,7 @@ import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsExcepti import com.intellij.ui.awt.RelativePoint import com.intellij.openapi.ui.popup.Balloon.Position import org.jetbrains.kotlin.psi.JetFunctionLiteral -import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange +import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange import org.jetbrains.kotlin.idea.refactoring.chooseContainerElementIfNecessary import org.jetbrains.kotlin.idea.refactoring.getExtractionContainers diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt index 07064554d1a..f339e24266c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt @@ -54,7 +54,7 @@ import org.jetbrains.kotlin.types.TypeUtils import kotlin.properties.Delegates import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.idea.util.isUnit diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractionData.kt index d3b81ef21da..4fb1d721b5a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractionData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractionData.kt @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetClassInitializer import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.idea.refactoring.compareDescriptors diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/duplicateUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/duplicateUtil.kt index 68fcb79629e..42902035c54 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/duplicateUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/duplicateUtil.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.refactoring.extractFunction -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.ui.Messages import com.intellij.openapi.project.Project @@ -32,7 +32,7 @@ import com.intellij.codeInsight.highlighting.HighlightManager import com.intellij.codeInsight.folding.CodeFoldingManager import com.intellij.ui.ReplacePromptDialog import com.intellij.find.FindManager -import org.jetbrains.jet.plugin.util.application.executeWriteCommand +import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import com.intellij.refactoring.util.duplicates.MethodDuplicatesHandler import com.intellij.refactoring.RefactoringBundle diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt index fbb6c84385a..092692052f7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.cfg.Label import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil -import org.jetbrains.jet.plugin.imports.canBeReferencedViaImport +import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor import org.jetbrains.kotlin.utils.DFS @@ -55,7 +55,7 @@ import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder import org.jetbrains.kotlin.resolve.bindingContextUtil.getTargetFunctionDescriptor import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsStatement import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.imports.importableFqNameSafe +import org.jetbrains.kotlin.idea.imports.importableFqNameSafe import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.Initializer import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ParameterUpdate import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValue.ExpressionValue diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt index 23aabf33d77..ff4295b869e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractorUtil.kt @@ -34,7 +34,7 @@ import java.util.LinkedHashMap import java.util.Collections import org.jetbrains.kotlin.psi.psiUtil.isFunctionLiteralOutsideParentheses import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument -import org.jetbrains.jet.plugin.util.psiModificationUtil.moveInsideParenthesesAndReplaceWith +import org.jetbrains.kotlin.idea.util.psiModificationUtil.moveInsideParenthesesAndReplaceWith import org.jetbrains.kotlin.psi.psiUtil.appendElement import org.jetbrains.kotlin.psi.psiUtil.replaced import org.jetbrains.kotlin.psi.JetBlockExpression @@ -47,13 +47,13 @@ import org.jetbrains.kotlin.idea.refactoring.JetNameValidatorImpl import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester import org.jetbrains.kotlin.idea.refactoring.isMultiLine import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValueBoxer.AsTuple -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier -import org.jetbrains.jet.plugin.util.psi.patternMatching.UnifierParameter +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier +import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnifierParameter import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Match -import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.WeaklyMatched -import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.StronglyMatched +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Match +import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.WeaklyMatched +import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.StronglyMatched import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.psi.psiUtil.parents import java.util.ArrayList diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 9cc9c0e5d2b..6f41c091949 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -34,10 +34,6 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange; -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier; -import org.jetbrains.jet.plugin.util.psi.patternMatching.PatternMatchingPackage; -import org.jetbrains.jet.plugin.util.psiModificationUtil.PsiModificationUtilPackage; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; @@ -52,6 +48,10 @@ import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.idea.refactoring.introduce.KotlinIntroduceHandlerBase; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange; +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier; +import org.jetbrains.kotlin.idea.util.psi.patternMatching.PatternMatchingPackage; +import org.jetbrains.kotlin.idea.util.psiModificationUtil.PsiModificationUtilPackage; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt index 7ae9a07a879..ebcac3c8936 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt @@ -62,7 +62,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.util.text.StringUtil import javax.swing.Icon -import org.jetbrains.jet.plugin.util.string.collapseSpaces +import org.jetbrains.kotlin.idea.util.string.collapseSpaces import org.jetbrains.kotlin.asJava.KotlinLightMethod import com.intellij.psi.PsiMethod import org.jetbrains.kotlin.idea.caches.resolve.analyze @@ -72,7 +72,7 @@ import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import com.intellij.psi.PsiPackage -import org.jetbrains.jet.plugin.util.ProjectRootsUtil +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.psi.psiUtil.parents fun PsiElement.getAndRemoveCopyableUserData(key: Key): T? { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt index dcda34b02a6..7d4ec76246c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction import com.intellij.refactoring.rename.RenameJavaMethodProcessor import org.jetbrains.kotlin.asJava.KotlinLightMethod import kotlin.properties.Delegates -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction public class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() { private val javaMethodProcessorInstance by Delegates.lazy { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt index 07d514f7097..c21988b1d12 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.resolve.OverrideResolver import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.caches.resolve.analyze public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() { diff --git a/idea/src/org/jetbrains/jet/plugin/reporter/KotlinReportSubmitter.java b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/reporter/KotlinReportSubmitter.java rename to idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.java index da32c54f27b..bde6e67ae8d 100644 --- a/idea/src/org/jetbrains/jet/plugin/reporter/KotlinReportSubmitter.java +++ b/idea/src/org/jetbrains/kotlin/idea/reporter/KotlinReportSubmitter.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.reporter; +package org.jetbrains.kotlin.idea.reporter; import com.intellij.diagnostic.ITNReporter; import com.intellij.openapi.diagnostic.IdeaLoggingEvent; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java b/idea/src/org/jetbrains/kotlin/idea/run/JetJUnitConfigurationProducer.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java rename to idea/src/org/jetbrains/kotlin/idea/run/JetJUnitConfigurationProducer.java index 66d92f2d0d6..ba6690c25bb 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetJUnitConfigurationProducer.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.run; +package org.jetbrains.kotlin.idea.run; import com.intellij.execution.JavaRunConfigurationExtensionManager; import com.intellij.execution.Location; @@ -33,9 +33,9 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.LightClassUtil; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; +import org.jetbrains.kotlin.psi.*; public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer { private JetElement myElement; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java rename to idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java index 513e13abcb7..25dc30f3135 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.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.run; +package org.jetbrains.kotlin.idea.run; import com.intellij.diagnostic.logging.LogConfigurationPanel; import com.intellij.execution.*; @@ -41,12 +41,12 @@ import kotlin.KotlinPackage; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.idea.MainFunctionDetector; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetDeclaration; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.form b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.form rename to idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form index ab95bf99ace..23783532227 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.form +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form @@ -1,5 +1,5 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.java rename to idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java index 6a8522c9239..2fd241402b1 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationEditor.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.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.run; +package org.jetbrains.kotlin.idea.run; import com.intellij.execution.ui.CommonJavaParametersPanel; import com.intellij.execution.ui.ConfigurationModuleSelector; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationProducer.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java rename to idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationProducer.java index 027fdac235a..42a86aac9a3 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationProducer.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.run; +package org.jetbrains.kotlin.idea.run; import com.intellij.execution.Location; import com.intellij.execution.RunnerAndConfigurationSettings; @@ -30,12 +30,12 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.idea.MainFunctionDetector; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; -import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -import org.jetbrains.kotlin.idea.MainFunctionDetector; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationType.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java rename to idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationType.java index b5067ed2012..4c3a3be8401 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationType.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.run; +package org.jetbrains.kotlin.idea.run; import com.intellij.execution.configurations.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetIcons; +import org.jetbrains.kotlin.idea.JetIcons; import org.jetbrains.kotlin.idea.JetLanguage; public class JetRunConfigurationType extends ConfigurationTypeBase { diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java b/idea/src/org/jetbrains/kotlin/idea/run/JetTestNgConfigurationProducer.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java rename to idea/src/org/jetbrains/kotlin/idea/run/JetTestNgConfigurationProducer.java index f732046f560..ce24a1025b5 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetTestNgConfigurationProducer.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.run; +package org.jetbrains.kotlin.idea.run; import com.intellij.execution.JavaRunConfigurationExtensionManager; import com.intellij.execution.Location; @@ -32,9 +32,9 @@ import com.theoryinpractice.testng.configuration.TestNGConfiguration; import com.theoryinpractice.testng.configuration.TestNGConfigurationProducer; import com.theoryinpractice.testng.util.TestNGUtil; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.LightClassUtil; +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; +import org.jetbrains.kotlin.psi.*; public class JetTestNgConfigurationProducer extends TestNGConfigurationProducer { @Override diff --git a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java b/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java rename to idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java index 96c3bef6e6c..748ed8b245c 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.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.util; +package org.jetbrains.kotlin.idea.util; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; @@ -26,12 +26,12 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; +import org.jetbrains.kotlin.idea.debugger.DebuggerPackage; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; -import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; -import org.jetbrains.kotlin.idea.debugger.DebuggerPackage; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/util/InfinitePeriodicalTask.java b/idea/src/org/jetbrains/kotlin/idea/util/InfinitePeriodicalTask.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/util/InfinitePeriodicalTask.java rename to idea/src/org/jetbrains/kotlin/idea/util/InfinitePeriodicalTask.java index 50233e0a1f2..87f4c60e301 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/InfinitePeriodicalTask.java +++ b/idea/src/org/jetbrains/kotlin/idea/util/InfinitePeriodicalTask.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.util; +package org.jetbrains.kotlin.idea.util; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Computable; diff --git a/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java b/idea/src/org/jetbrains/kotlin/idea/util/JetPsiHeuristicsUtil.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java rename to idea/src/org/jetbrains/kotlin/idea/util/JetPsiHeuristicsUtil.java index 31b1cde7334..3f5a296e7d7 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/util/JetPsiHeuristicsUtil.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,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.util; +package org.jetbrains.kotlin.idea.util; import com.intellij.psi.PsiMember; import com.intellij.psi.PsiModifier; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.NamePackage; -import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.NamePackage; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; public class JetPsiHeuristicsUtil { private JetPsiHeuristicsUtil() {} diff --git a/idea/src/org/jetbrains/jet/plugin/util/LongRunningReadTask.java b/idea/src/org/jetbrains/kotlin/idea/util/LongRunningReadTask.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/util/LongRunningReadTask.java rename to idea/src/org/jetbrains/kotlin/idea/util/LongRunningReadTask.java index 2d7e08c4552..7c6f3e83bf2 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/LongRunningReadTask.java +++ b/idea/src/org/jetbrains/kotlin/idea/util/LongRunningReadTask.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.util; +package org.jetbrains.kotlin.idea.util; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationAdapter; diff --git a/idea/src/org/jetbrains/jet/plugin/util/Maybe.kt b/idea/src/org/jetbrains/kotlin/idea/util/Maybe.kt similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/util/Maybe.kt rename to idea/src/org/jetbrains/kotlin/idea/util/Maybe.kt index bca829533bb..96fcfa6fc67 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/Maybe.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/Maybe.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.util +package org.jetbrains.kotlin.idea.util abstract class Maybe public class MaybeValue(public val value: V) : Maybe() diff --git a/idea/src/org/jetbrains/jet/plugin/util/attachment/attachmentUtils.kt b/idea/src/org/jetbrains/kotlin/idea/util/attachment/attachmentUtils.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/util/attachment/attachmentUtils.kt rename to idea/src/org/jetbrains/kotlin/idea/util/attachment/attachmentUtils.kt index 89cfc18f7b4..a6a0e1d1f69 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/attachment/attachmentUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/attachment/attachmentUtils.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.util.attachment +package org.jetbrains.kotlin.idea.util.attachment import com.intellij.psi.PsiFile import com.intellij.openapi.diagnostic.Attachment @@ -53,4 +53,4 @@ public fun mergeAttachments(vararg attachments: Attachment?): Attachment { } return Attachment("message.txt", builder.toString()) -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/util/projectStructureUtil.kt b/idea/src/org/jetbrains/kotlin/idea/util/projectStructureUtil.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/util/projectStructureUtil.kt rename to idea/src/org/jetbrains/kotlin/idea/util/projectStructureUtil.kt index 849df9f0631..58f436e0253 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/projectStructureUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/projectStructureUtil.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,12 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.util.projectStructure +package org.jetbrains.kotlin.idea.util.projectStructure import com.intellij.openapi.roots.libraries.Library import com.intellij.openapi.module.Module import com.intellij.openapi.roots.OrderEnumerator -import com.intellij.openapi.roots.OrderEntry import java.io.File import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.roots.OrderRootType diff --git a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiRange.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiRange.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiRange.kt rename to idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiRange.kt index b0efb4438cd..b5f7c68222c 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiRange.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiRange.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.util.psi.patternMatching +package org.jetbrains.kotlin.idea.util.psi.patternMatching import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetTreeVisitorVoid @@ -25,8 +25,7 @@ import com.intellij.psi.PsiComment import java.util.Collections import org.jetbrains.kotlin.psi.psiUtil.siblings import com.intellij.openapi.util.TextRange -import java.util.HashSet -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Match +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Match private val SIGNIFICANT_FILTER = { (e: PsiElement) -> e !is PsiWhiteSpace && e !is PsiComment && e.getTextLength() > 0 } diff --git a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt rename to idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt index 6f39292186e..887662fa908 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.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.util.psi.patternMatching +package org.jetbrains.kotlin.idea.util.psi.patternMatching import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.* -import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.Status.* +import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.* +import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.Status.* import java.util.HashMap import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetPsiUtil @@ -60,7 +60,7 @@ import org.jetbrains.kotlin.psi.JetCallableReferenceExpression import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.psi.JetThisExpression import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Empty +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Empty import org.jetbrains.kotlin.psi.JetMultiDeclaration import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.kotlin.psi.JetClassBody diff --git a/idea/src/org/jetbrains/jet/plugin/util/psiFilters.kt b/idea/src/org/jetbrains/kotlin/idea/util/psiFilters.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/util/psiFilters.kt rename to idea/src/org/jetbrains/kotlin/idea/util/psiFilters.kt index bc38eef663c..37ad2983cb5 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psiFilters.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/psiFilters.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.util +package org.jetbrains.kotlin.idea.util import com.intellij.psi.filters.position.PositionElementFilter import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt b/idea/src/org/jetbrains/kotlin/idea/util/psiModificationUtil.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt rename to idea/src/org/jetbrains/kotlin/idea/util/psiModificationUtil.kt index 118e062cc77..6408666d626 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/util/psiModificationUtil.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.util.psiModificationUtil +package org.jetbrains.kotlin.idea.util.psiModificationUtil import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument import org.jetbrains.kotlin.psi.JetCallExpression diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinAbiVersionIndex.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java rename to idea/src/org/jetbrains/kotlin/idea/versions/KotlinAbiVersionIndex.java index 6be7115562c..16af698dd9c 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinAbiVersionIndex.java +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinAbiVersionIndex.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.versions; +package org.jetbrains.kotlin.idea.versions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java rename to idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java index 11d496ea1f2..e993a671753 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinRuntimeLibraryUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.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.versions; +package org.jetbrains.kotlin.idea.versions; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; @@ -38,12 +38,12 @@ import com.intellij.util.indexing.FileBasedIndex; 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.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.load.java.AbiVersionUtil; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.utils.PathUtil; @@ -54,7 +54,7 @@ import java.util.Set; import static com.intellij.util.PathUtil.getLocalFile; import static com.intellij.util.PathUtil.getLocalPath; -import static org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification.showRuntimeJarNotFoundDialog; +import static org.jetbrains.kotlin.idea.versions.OutdatedKotlinRuntimeNotification.showRuntimeJarNotFoundDialog; public class KotlinRuntimeLibraryUtil { private KotlinRuntimeLibraryUtil() {} diff --git a/idea/src/org/jetbrains/jet/plugin/versions/KotlinUpdatePluginComponent.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/versions/KotlinUpdatePluginComponent.kt rename to idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt index 40731030763..2a812fe45c5 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/KotlinUpdatePluginComponent.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.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,20 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.versions +package org.jetbrains.kotlin.idea.versions import com.intellij.openapi.components.ApplicationComponent import org.jetbrains.kotlin.utils.PathUtil import com.intellij.openapi.vfs.JarFileSystem import com.intellij.ide.util.PropertiesComponent -import org.jetbrains.jet.plugin.JetPluginUtil +import org.jetbrains.kotlin.idea.JetPluginUtil import com.intellij.util.indexing.FileBasedIndex import com.intellij.openapi.vfs.LocalFileSystem import java.io.File import com.intellij.openapi.vfs.VirtualFileVisitor import com.intellij.openapi.vfs.newvfs.NewVirtualFile import com.intellij.openapi.vfs.VfsUtilCore -import org.jetbrains.jet.plugin.vfilefinder.KotlinClassFileIndex +import org.jetbrains.kotlin.idea.vfilefinder.KotlinClassFileIndex import com.intellij.openapi.application.ApplicationManager private val INSTALLED_KOTLIN_VERSION = "installed.kotlin.plugin.version" diff --git a/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java b/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeNotification.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java rename to idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeNotification.java index 1fec761deea..fa53fc731a2 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/OutdatedKotlinRuntimeNotification.java +++ b/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeNotification.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.versions; +package org.jetbrains.kotlin.idea.versions; import com.google.common.collect.Collections2; import com.google.common.collect.Lists; @@ -37,7 +37,7 @@ import com.intellij.util.Function; 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.kotlin.idea.JetPluginUtil; import org.jetbrains.kotlin.idea.framework.JSLibraryStdPresentationProvider; import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider; import org.jetbrains.kotlin.idea.framework.LibraryPresentationProviderUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java b/idea/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java rename to idea/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.java index 881f8353b3f..a4fd55a0dca 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/versions/UnsupportedAbiVersionNotificationPanelProvider.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.versions; +package org.jetbrains.kotlin.idea.versions; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; @@ -47,11 +47,11 @@ import com.intellij.ui.EditorNotifications; import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.idea.JetFileType; 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.*; import java.awt.*; diff --git a/idea/testData/intentions/attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test b/idea/testData/intentions/attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test index c7faacf242f..5cee3368289 100644 --- a/idea/testData/intentions/attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test +++ b/idea/testData/intentions/attributeCallReplacements/replaceGetIntention/inspectionData/inspections.test @@ -1 +1 @@ -// INSPECTION_CLASS: org.jetbrains.jet.plugin.inspections.ExplicitGetInspection \ No newline at end of file +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.ExplicitGetInspection diff --git a/idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test b/idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test index 4a2fe005169..438b9ee2032 100644 --- a/idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test +++ b/idea/testData/intentions/branched/ifThenToElvis/inspectionData/inspections.test @@ -1 +1 @@ -// INSPECTION_CLASS: org.jetbrains.jet.plugin.inspections.IfThenToElvisInspection +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.IfThenToElvisInspection diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test b/idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test index a2552cc8cc2..6281142229e 100644 --- a/idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test +++ b/idea/testData/intentions/branched/ifThenToSafeAccess/inspectionData/inspections.test @@ -1 +1 @@ -// INSPECTION_CLASS: org.jetbrains.jet.plugin.inspections.IfThenToSafeAccessInspection +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.IfThenToSafeAccessInspection diff --git a/idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test b/idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test index d174e685ea5..c614fb083cc 100644 --- a/idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test +++ b/idea/testData/intentions/removeExplicitTypeArguments/inspectionData/inspections.test @@ -1 +1 @@ -// INSPECTION_CLASS: org.jetbrains.jet.plugin.inspections.RemoveExplicitTypeArgsInspection \ No newline at end of file +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.RemoveExplicitTypeArgsInspection diff --git a/idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inspectionData/inspections.test b/idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inspectionData/inspections.test index a5c1a59273f..345cf87a012 100644 --- a/idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inspectionData/inspections.test +++ b/idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/inspectionData/inspections.test @@ -1 +1 @@ -// INSPECTION_CLASS: org.jetbrains.jet.plugin.inspections.SimplifyBinaryNegationInspection \ No newline at end of file +// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.SimplifyBinaryNegationInspection diff --git a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java index fe779d4d940..e28ef8ab5f6 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java +++ b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java @@ -22,10 +22,10 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetLightProjectDescriptor; +import org.jetbrains.kotlin.psi.JetFile; import java.util.Set; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java index 937695d57b7..aa0697de753 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetStdJSProjectDescriptor; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetStdJSProjectDescriptor; public abstract class AbstractJetJsCheckerTest extends JetLightCodeInsightFixtureTestCase { @NotNull diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java index f6440aaa7e2..204faa3584f 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java @@ -20,7 +20,7 @@ import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.spellchecker.inspections.SpellCheckingInspection; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.highlighter.JetPsiChecker; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java index 1eb0ac19705..730ebf545cf 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java @@ -21,9 +21,9 @@ import com.intellij.codeInspection.nullable.NullableStuffInspection; import com.intellij.openapi.projectRoots.Sdk; import com.siyeh.ig.bugs.StaticCallOnSubclassInspection; import com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection; +import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.test.JetTestCaseBuilder; -import org.jetbrains.jet.plugin.KotlinDaemonAnalyzerTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase { @Override diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java index 2ca9605e0c8..1e000d16239 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java @@ -20,8 +20,8 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractCompiledKotlinInJavaCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java index b4a7032554c..26056cc4c1d 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetStdJSProjectDescriptor; +import org.jetbrains.kotlin.idea.JetStdJSProjectDescriptor; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractJSBasicCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java index b275b88bd8f..4f264251432 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java index 2f78de33b5c..cb3d359c2a2 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java index cbdb76e6b4d..6672663ba6a 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.java @@ -20,8 +20,8 @@ import com.intellij.codeInsight.completion.CompletionType; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.project.TargetPlatform; public abstract class AbstractJvmWithLibBasicCompletionTest extends JetFixtureCompletionBaseTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt index 0ff4f4dd02a..63b45a72193 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.completion import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.lookup.LookupElement -import org.jetbrains.jet.plugin.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor import org.jetbrains.kotlin.idea.completion.KeywordLookupObject import org.jetbrains.kotlin.idea.project.TargetPlatform diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java b/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java index 8ba79fcf8c0..7ff835d5ec8 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java @@ -24,7 +24,7 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.project.TargetPlatform; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt index f9e7521d193..7f861d29772 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.completion import org.jetbrains.kotlin.completion.util.* -import org.jetbrains.jet.plugin.KotlinCompletionTestCase -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.KotlinCompletionTestCase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.jetbrains.kotlin.idea.project.TargetPlatform -import org.jetbrains.jet.plugin.stubs.AstAccessControl +import org.jetbrains.kotlin.idea.stubs.AstAccessControl public abstract class AbstractMultiFileJvmBasicCompletionTest : KotlinCompletionTestCase() { protected fun doTest(testPath: String) { diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt index ee558400c2c..6e9cb92bb67 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.completion import org.jetbrains.kotlin.completion.util.* -import org.jetbrains.jet.plugin.KotlinCompletionTestCase -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.KotlinCompletionTestCase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.jetbrains.kotlin.idea.project.TargetPlatform -import org.jetbrains.jet.plugin.stubs.AstAccessControl +import org.jetbrains.kotlin.idea.stubs.AstAccessControl import com.intellij.codeInsight.completion.CompletionType public abstract class AbstractMultiFileSmartCompletionTest : KotlinCompletionTestCase() { diff --git a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt index 1d0bfea1e1f..d8e7d26aac0 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt @@ -16,14 +16,14 @@ package org.jetbrains.kotlin.completion -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.idea.completion.renderDataFlowValue import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.openapi.util.io.FileUtil import java.io.File -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo diff --git a/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java index f2fad79af94..2cac6e172b3 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java +++ b/idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java @@ -31,8 +31,8 @@ import com.intellij.ui.JBColor; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.stubs.AstAccessControl; import org.jetbrains.kotlin.idea.project.TargetPlatform; +import org.jetbrains.kotlin.idea.stubs.AstAccessControl; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java index 4c1d7e2c639..b3a541a49f2 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java @@ -21,8 +21,8 @@ import com.intellij.openapi.util.io.FileUtil; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.completion.util.UtilPackage; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker; import org.jetbrains.kotlin.idea.project.TargetPlatform; diff --git a/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java b/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java index e273c2d329b..03ba1258f21 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java @@ -25,7 +25,7 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.text.StringUtil; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt index 7995bd861e2..2de468aabfc 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.completion.handlers -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.lookup.LookupElement import java.io.File -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.codeInsight.lookup.impl.LookupImpl import com.intellij.codeInsight.lookup.LookupEvent import com.intellij.openapi.command.WriteCommandAction diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java index d41bf5c3e98..537b316959a 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.completion.handlers; -import org.jetbrains.jet.plugin.KotlinCompletionTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.KotlinCompletionTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java index 107b03d22c7..117f9c85c9b 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.completion.handlers; -import org.jetbrains.jet.plugin.KotlinCompletionTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.KotlinCompletionTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java index 61550eb06dd..1b104eddc89 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.completion.handlers; import com.intellij.codeInsight.completion.CompletionType; -import org.jetbrains.jet.plugin.KotlinCompletionTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.KotlinCompletionTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt b/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt index f354513c26c..684d79cad7a 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.completion.weighers import com.intellij.codeInsight.completion.CompletionType import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.testng.Assert import org.jetbrains.kotlin.test.util.configureWithExtraFile -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor public abstract class AbstractCompletionWeigherTest(val completionType: CompletionType, val relativeTestDataPath: String) : JetLightCodeInsightFixtureTestCase() { fun doTest(path: String) { diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java index 282c0c7d8ea..282863830fd 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java @@ -48,9 +48,9 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions; import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions; import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions; diff --git a/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java index 1765afd2748..863bc6fc080 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java @@ -32,8 +32,8 @@ import com.intellij.testFramework.LightIdeaTestCase; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.idea.JetLanguage; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.SettingsConfigurator; diff --git a/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java rename to idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.java index bb734218234..44eaa9d0b1a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractExpressionSelectionTest.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; +import org.jetbrains.kotlin.test.JetTestUtils; public abstract class AbstractExpressionSelectionTest extends LightCodeInsightTestCase { diff --git a/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java rename to idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.java index 37b372c5eca..6382480d6a6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/AbstractSmartSelectionTest.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; +import org.jetbrains.kotlin.test.JetTestUtils; import java.util.ArrayList; import java.util.List; diff --git a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java b/idea/tests/org/jetbrains/kotlin/idea/DirectiveBasedActionUtils.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java rename to idea/tests/org/jetbrains/kotlin/idea/DirectiveBasedActionUtils.java index da4dbdb38ed..c5357c19676 100644 --- a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java +++ b/idea/tests/org/jetbrains/kotlin/idea/DirectiveBasedActionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.google.common.base.Function; import com.google.common.base.Predicate; diff --git a/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java index e83a5784d82..00303824cab 100644 --- a/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/JdkAndMockLibraryProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/JdkAndMockLibraryProjectDescriptor.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/JdkAndMockLibraryProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/JdkAndMockLibraryProjectDescriptor.java index bebaf8f7b8e..d0930f3a358 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JdkAndMockLibraryProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/JdkAndMockLibraryProjectDescriptor.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ContentEntry; diff --git a/idea/tests/org/jetbrains/jet/plugin/JetJdkAndLibraryProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/JetJdkAndLibraryProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java index 93e4d6eefe9..434364d9d2c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetJdkAndLibraryProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/JetJdkAndLibraryProjectDescriptor.java @@ -1,6 +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. @@ -15,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java rename to idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java index 55d911b077c..79f635bc412 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/JetLightCodeInsightFixtureTestCase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.openapi.actionSystem.*; diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/JetLightProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.java index 06e1b0397f9..c9ef2d61f00 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetLightProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/JetLightProjectDescriptor.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; diff --git a/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/JetStdJSProjectDescriptor.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/JetStdJSProjectDescriptor.java index 66e8f2f4f42..243515ebf46 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/JetStdJSProjectDescriptor.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; diff --git a/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java b/idea/tests/org/jetbrains/kotlin/idea/JetWithJdkAndRuntimeLightProjectDescriptor.java similarity index 92% rename from idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java rename to idea/tests/org/jetbrains/kotlin/idea/JetWithJdkAndRuntimeLightProjectDescriptor.java index 641d99dca02..60cee96deb3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetWithJdkAndRuntimeLightProjectDescriptor.java +++ b/idea/tests/org/jetbrains/kotlin/idea/JetWithJdkAndRuntimeLightProjectDescriptor.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; +package org.jetbrains.kotlin.idea; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java similarity index 93% rename from idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java rename to idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.java index d56bc6eafa0..d3fc805596d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinCodeInsightTestCase.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; +package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinCompletionTestCase.java similarity index 93% rename from idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java rename to idea/tests/org/jetbrains/kotlin/idea/KotlinCompletionTestCase.java index 075bbdc4840..7337a222a4b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinCompletionTestCase.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; +package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.completion.CompletionTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java similarity index 93% rename from idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java rename to idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java index 0b531df1c28..7aa438cdd84 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.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; +package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java rename to idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.java index 0bcbdc3a6b6..cbd472878ad 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinHierarchyViewTestBase.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java rename to idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java index 6d694de01b6..924a89ddab5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.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; +package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; diff --git a/idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java b/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java rename to idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.java index 23fdbcfb60f..ab47e5c7989 100644 --- a/idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/PluginTestCaseBase.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.SdkModificator; diff --git a/idea/tests/org/jetbrains/jet/plugin/ProjectDescriptorWithStdlibSources.java b/idea/tests/org/jetbrains/kotlin/idea/ProjectDescriptorWithStdlibSources.java similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/ProjectDescriptorWithStdlibSources.java rename to idea/tests/org/jetbrains/kotlin/idea/ProjectDescriptorWithStdlibSources.java index e4a3d650fc2..75bd12cb2a0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/ProjectDescriptorWithStdlibSources.java +++ b/idea/tests/org/jetbrains/kotlin/idea/ProjectDescriptorWithStdlibSources.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; +package org.jetbrains.kotlin.idea; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ContentEntry; diff --git a/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java index ed829a38fee..2dd91a2cb5b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.idea; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java rename to idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.java index 3c794fbf402..fdc0c071a51 100644 --- a/idea/tests/org/jetbrains/jet/plugin/WordSelectionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/WordSelectionTest.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; +package org.jetbrains.kotlin.idea; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.CodeInsightTestUtil; diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt index 06b43c756bb..66dc5e66b10 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt @@ -16,15 +16,15 @@ package org.jetbrains.kotlin.idea.caches.resolve -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.jetbrains.kotlin.test.MockLibraryUtil import com.intellij.openapi.roots.libraries.Library import java.io.File import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VfsUtil -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar -import org.jetbrains.jet.plugin.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor import com.intellij.openapi.module.Module import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ContentEntry diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt index d0827c373a6..037d2badb27 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.caches.resolve -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.roots.ModuleRootModificationUtil import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.java index 282a2821394..8c081545585 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.java @@ -21,13 +21,13 @@ import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.checkers.DebugInfoUtil; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetReferenceExpression; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt index 47ec419d5eb..32ce0b04336 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.codeInspection.LocalInspectionTool import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.jet.plugin.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor import com.intellij.codeInspection.ex.LocalInspectionToolWrapper import com.intellij.analysis.AnalysisScope import com.intellij.codeInspection.ex.InspectionManagerEx diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java index 2810e7fc166..6d976bc5950 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java @@ -29,10 +29,10 @@ import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.ExpectedHighlightingData; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.plugin.navigation.NavigationTestUtils; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerNavigationHandler; +import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.ReferenceUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java index 433cfe87027..0e576d45eb2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOutOfBlockModificationTest.java @@ -22,8 +22,8 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.PsiModificationTrackerImpl; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java index 7f223c5e5a2..bd2adb39319 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java @@ -31,11 +31,11 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.OverrideResolver; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java index 9e1e50dbaed..74ae97bcfea 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesTest.java @@ -32,9 +32,9 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.io.File; import java.util.ArrayList; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java index ec711bd1dde..55c5083bf74 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.codeInsight.CodeInsightSettings; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; public final class OverrideImplementTest extends AbstractOverrideImplementTest { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java index f6259dd9745..43568d14a9c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementWithLibTest.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; public final class OverrideImplementWithLibTest extends AbstractOverrideImplementTest { private static final String TEST_PATH = PluginTestCaseBase.getTestDataPathBase() + "/codeInsight/overrideImplement/withLib"; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt index b779912c645..b7c5c20627a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/smartEnter/SmartEnterTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.codeInsight.smartEnter -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.openapi.actionSystem.IdeActions import org.jetbrains.kotlin.idea.JetFileType import org.jetbrains.kotlin.test.util.trimIndent diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java similarity index 91% rename from idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java rename to idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java index 69e3a013771..20abd16aa8a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.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.conversion.copy; +package org.jetbrains.kotlin.idea.conversion.copy; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.testFramework.LightProjectDescriptor; 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.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.editor.JetEditorOptions; public abstract class AbstractJavaToKotlinCopyPasteConversionTest extends LightCodeInsightFixtureTestCase { diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java index 5a0582c8e49..13c2f0d38d6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.conversion.copy; +package org.jetbrains.kotlin.idea.conversion.copy; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt similarity index 74% rename from idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.kt index 88c66bbf44f..264b8b03046 100644 --- a/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/coverage/AbstractKotlinCoverageOutputFilesTest.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.coverage +package org.jetbrains.kotlin.idea.coverage -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.jetbrains.kotlin.psi.JetFile -import kotlin.test.assertNotNull -import com.intellij.openapi.util.io.FileUtil -import com.intellij.openapi.fileEditor.impl.LoadTextUtil -import kotlin.test.assertEquals import java.io.File -import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.test.JetTestUtils public abstract class AbstractKotlinCoverageOutputFilesTest(): JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/coverage/KotlinCoverageOutputFilesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/coverage/KotlinCoverageOutputFilesTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java index 442a270fe65..e6c4ca5707b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/coverage/KotlinCoverageOutputFilesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.coverage; +package org.jetbrains.kotlin.idea.coverage; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java index 534d663ec9d..df85ad159ac 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java @@ -36,11 +36,11 @@ import com.sun.jdi.Location; import com.sun.jdi.ReferenceType; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.state.GenerationState; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt index c342b1db66c..b1f6eab87cd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt @@ -23,7 +23,7 @@ import com.intellij.debugger.DebuggerManagerEx import com.intellij.debugger.ui.breakpoints.LineBreakpoint import com.intellij.debugger.actions.MethodSmartStepTarget import com.intellij.debugger.engine.BasicStepMethodFilter -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.test.InTextDirectivesUtils.* import com.intellij.openapi.util.io.FileUtil import java.io.File diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt index ef5ff31c994..21a3838911e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.actions.SmartStepTarget import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.debugger.actions.MethodSmartStepTarget import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.psi.util.PsiFormatUtil import com.intellij.psi.PsiSubstitutor import com.intellij.psi.util.PsiFormatUtilBase -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase public abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTestCase() { private val fixture: JavaCodeInsightTestFixture diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt index b113e960685..82294481568 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.SuspendContextImpl import com.intellij.debugger.engine.MethodFilter -import org.jetbrains.jet.plugin.util.application.runReadAction +import org.jetbrains.kotlin.idea.util.application.runReadAction import com.intellij.debugger.impl.PositionUtil import com.intellij.execution.process.ProcessOutputTypes import com.intellij.openapi.roots.libraries.LibraryUtil -import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor import com.intellij.openapi.roots.JdkOrderEntry import com.intellij.openapi.util.io.FileUtil import com.intellij.debugger.SourcePosition diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java index 6942c4d179a..8790fa1abf3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java @@ -33,11 +33,11 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt index 98c772b32e3..0c3eab00532 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.debugger.evaluate import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.debugger.KotlinEditorTextProvider -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.junit.Assert diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index ebfb1399c80..ffebe530ff4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.completion.util.testCompletion import org.jetbrains.kotlin.idea.project.TargetPlatform import com.intellij.codeInsight.completion.CompletionType -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.openapi.module.Module import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ContentEntry diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt index c14dcae7827..55d14772ccd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.decompiler -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.load.java.JvmAbi import com.intellij.psi.PsiManager diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt index c37e0f4a8af..ea3b245e621 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.idea.decompiler import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.psi.ClassFileViewProvider import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.* diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.java index e3ec1268e80..83c6e60f19a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; public abstract class AbstractNavigateToLibraryTest extends LightCodeInsightFixtureTestCase { protected static final String PACKAGE = "testData.libraries"; diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index ca2b198d88c..704b17f977a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.idea.decompiler.navigation import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.OrderRootType diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java index 5707a0173ba..3d3fbf12849 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java @@ -33,7 +33,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; import org.jetbrains.kotlin.idea.decompiler.JetClsFile; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java index 8c988d41092..8f02bf0b3b9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java @@ -24,9 +24,9 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.idea.JetLanguage; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTestCase { /** diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.java index 6fdc02cd6a1..493c47273bb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.java @@ -26,8 +26,8 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.jet.plugin.navigation.NavigationTestUtils; +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils; import org.jetbrains.kotlin.idea.references.JetReference; import org.jetbrains.kotlin.test.JetTestUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java index eacfd238251..4d4f549018e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.testFramework.LightPlatformTestCase; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; +import org.jetbrains.kotlin.idea.ProjectDescriptorWithStdlibSources; public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegressionTest { /** diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt index 3fcd4a18eec..42790f902ea 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt @@ -28,7 +28,7 @@ import com.intellij.psi.stubs.StubElement import com.google.common.io.Files import com.intellij.openapi.vfs.VirtualFile import org.junit.Assert -import org.jetbrains.jet.plugin.stubs.AbstractStubBuilderTest +import org.jetbrains.kotlin.idea.stubs.AbstractStubBuilderTest import java.util.LinkedHashSet import com.intellij.openapi.vfs.VfsUtilCore import org.jetbrains.kotlin.utils.addIfNotNull diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt index 759a323aeaa..1e3e8b25dd4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.util.indexing.FileContentImpl import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt index da358190907..f9975824c5d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor import java.io.File import org.jetbrains.kotlin.test.JetTestCaseBuilder import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt index e6b7389e175..150a3c7c12b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.psi.PsiManager import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.testFramework.UsefulTestCase.* import org.junit.Assert.* -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import org.jetbrains.jet.plugin.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest import com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.psi.PsiErrorElement diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index 8d9bcd50ea7..9031238a778 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.name.FqName import org.junit.Assert -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import com.intellij.openapi.project.Project import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index cb0fe58d868..c0d4c348901 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -20,7 +20,7 @@ import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.test.JetTestCaseBuilder import com.intellij.psi.PsiManager import org.junit.Assert -import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor import java.io.File import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java index 9d293522e0b..24c7ef15661 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.editor; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.EditorTestUtil; import com.intellij.testFramework.LightCodeInsightTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractJetQuickDocProviderTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractJetQuickDocProviderTest.java index df71a31c3e1..8cf596c1243 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractJetQuickDocProviderTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/AbstractJetQuickDocProviderTest.java @@ -24,8 +24,8 @@ import com.intellij.psi.PsiElement; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.ProjectDescriptorWithStdlibSources; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.util.UtilPackage; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java b/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java rename to idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java index dea9c86f03a..76344b70830 100644 --- a/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.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.filters; +package org.jetbrains.kotlin.idea.filters; import com.intellij.execution.filters.Filter; import com.intellij.execution.filters.HyperlinkInfo; @@ -30,8 +30,8 @@ import com.intellij.refactoring.MultiFileTestCase; import com.intellij.testFramework.PsiTestUtil; import kotlin.Function1; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/AbstractKotlinFoldingTest.java b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/folding/AbstractKotlinFoldingTest.java rename to idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java index 0d7faa0c85e..452ef3d1f6f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/folding/AbstractKotlinFoldingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.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.folding; +package org.jetbrains.kotlin.idea.folding; import com.google.common.base.Function; import com.intellij.codeInsight.folding.JavaCodeFoldingSettings; @@ -27,7 +27,7 @@ import com.intellij.testFramework.PlatformTestCase; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; import org.jetbrains.kotlin.test.SettingsConfigurator; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/FoldingAfterOptimizeImportsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt similarity index 92% rename from idea/tests/org/jetbrains/jet/plugin/folding/FoldingAfterOptimizeImportsTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt index 1bc2caf9990..6d9c3b8340a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/folding/FoldingAfterOptimizeImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.folding +package org.jetbrains.kotlin.idea.folding import com.intellij.codeInsight.folding.CodeFoldingManager import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.command.UndoConfirmationPolicy import com.intellij.openapi.editor.FoldRegion -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import java.io.File import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.plugin.folding.AbstractKotlinFoldingTest.doTestWithSettings -import org.jetbrains.jet.plugin.imports.KotlinImportOptimizer +import org.jetbrains.kotlin.idea.folding.AbstractKotlinFoldingTest.doTestWithSettings +import org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer class FoldingAfterOptimizeImportsTest : AbstractKotlinFoldingTest() { private val fixture: JavaCodeInsightTestFixture diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java index b60e34de310..dd14ca7cd99 100644 --- a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.folding; +package org.jetbrains.kotlin.idea.folding; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/hierarchy/AbstractHierarchyTest.java b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/hierarchy/AbstractHierarchyTest.java rename to idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.java index 5e049772f9a..6a7c2df804b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/hierarchy/AbstractHierarchyTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyTest.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.hierarchy; +package org.jetbrains.kotlin.idea.hierarchy; import com.intellij.ide.hierarchy.*; import com.intellij.ide.hierarchy.type.SubtypesHierarchyTreeStructure; @@ -34,11 +34,11 @@ import com.intellij.testFramework.MapDataContext; import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.KotlinHierarchyViewTestBase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.plugin.hierarchy.calls.KotlinCalleeMethodsTreeStructure; -import org.jetbrains.jet.plugin.hierarchy.calls.KotlinCallerMethodsTreeStructure; -import org.jetbrains.jet.plugin.hierarchy.overrides.KotlinOverrideTreeStructure; +import org.jetbrains.kotlin.idea.KotlinHierarchyViewTestBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCalleeMethodsTreeStructure; +import org.jetbrains.kotlin.idea.hierarchy.calls.KotlinCallerMethodsTreeStructure; +import org.jetbrains.kotlin.idea.hierarchy.overrides.KotlinOverrideTreeStructure; import java.io.File; import java.util.ArrayList; diff --git a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java index 614e25b9b40..cf97c3b3b26 100644 --- a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.hierarchy; +package org.jetbrains.kotlin.idea.hierarchy; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java index 84f563b2919..44bfeab0a46 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java @@ -22,13 +22,13 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java index 2e06c024cbe..0e6e8c1c732 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java @@ -22,8 +22,8 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.TagsTestDataUtil; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt index 2c2e6431deb..d992bd376c8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt @@ -17,18 +17,18 @@ package org.jetbrains.kotlin.idea.highlighter import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor +import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor import com.intellij.openapi.vfs.VfsUtil import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream import com.intellij.openapi.projectRoots.Sdk -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import kotlin.test.assertEquals import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.diagnostics.Severity import kotlin.test.assertTrue -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import java.io.File public class NoErrorsInStdlibTest : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/AbstractOptimizeImportsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt similarity index 91% rename from idea/tests/org/jetbrains/jet/plugin/imports/AbstractOptimizeImportsTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.kt index 3340f66b8e9..fb158dc42fa 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/AbstractOptimizeImportsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/AbstractOptimizeImportsTest.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,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.imports +package org.jetbrains.kotlin.idea.imports import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.command.UndoConfirmationPolicy -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import java.io.File import org.junit.Assert -import java.util.ArrayList -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase public abstract class AbstractOptimizeImportsTest() : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java rename to idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.java index 24a8f8e104b..34ea55fa88c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsOnFlyTest.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.imports; +package org.jetbrains.kotlin.idea.imports; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java index 8a8b14e5395..6b3c7203c0c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.imports; +package org.jetbrains.kotlin.idea.imports; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index 89c58093966..2e1ddf0ec57 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -24,8 +24,8 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.util.PathUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.DirectiveBasedActionUtils; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.ConfigLibraryUtil; import org.jetbrains.kotlin.test.InTextDirectivesUtils; diff --git a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java rename to idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java index 3812b56c9ac..88677701430 100644 --- a/idea/tests/org/jetbrains/jet/plugin/javaFacade/JetJavaFacadeTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.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,21 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.javaFacade; +package org.jetbrains.kotlin.idea.javaFacade; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetLightProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.asJava.KotlinLightClass; import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.asJava.LightClassUtil; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.psi.*; public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase { @NotNull diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoSuperTest.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java rename to idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoSuperTest.java index 65b22b22704..456f8a96f2d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractGotoSuperTest.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.navigation; +package org.jetbrains.kotlin.idea.navigation; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.openapi.actionSystem.ActionManager; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java rename to idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java index c60f5def7fb..079314c1ca6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.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.navigation; +package org.jetbrains.kotlin.idea.navigation; import com.google.common.base.Function; import com.google.common.collect.Lists; @@ -30,7 +30,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.ReferenceUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java index 23f550e3c22..f78748f543c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.navigation; +package org.jetbrains.kotlin.idea.navigation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationMultifileTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationMultifileTest.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationMultifileTest.java rename to idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationMultifileTest.java index 8c7a958b943..61dd2ba75dc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationMultifileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationMultifileTest.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.navigation; +package org.jetbrains.kotlin.idea.navigation; import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.codeInsight.navigation.GotoTargetHandler; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationTest.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationTest.java rename to idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationTest.java index f53156e5e49..9ef868055bf 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/JetGotoImplementationTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/JetGotoImplementationTest.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.navigation; +package org.jetbrains.kotlin.idea.navigation; import com.intellij.codeInsight.navigation.GotoTargetHandler; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java index c97002333b3..bf63c12ed1d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.navigation; +package org.jetbrains.kotlin.idea.navigation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/NavigationTestUtils.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java rename to idea/tests/org/jetbrains/kotlin/idea/navigation/NavigationTestUtils.java index 14a93581236..8d83db22dba 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/NavigationTestUtils.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.navigation; +package org.jetbrains.kotlin.idea.navigation; import com.google.common.base.Function; import com.google.common.collect.Lists; diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java rename to idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java index 68de0bbfec9..5ee3549a8ab 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractFunctionParameterInfoTest.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.parameterInfo; +package org.jetbrains.kotlin.idea.parameterInfo; import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/FunctionParameterInfoTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/parameterInfo/FunctionParameterInfoTestGenerated.java index 5de4d84a428..9c937ecaa0e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/FunctionParameterInfoTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.parameterInfo; +package org.jetbrains.kotlin.idea.parameterInfo; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockCreateParameterInfoContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockCreateParameterInfoContext.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockCreateParameterInfoContext.java rename to idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockCreateParameterInfoContext.java index aaa355c99c1..c06f9d20c0e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockCreateParameterInfoContext.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockCreateParameterInfoContext.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.parameterInfo; +package org.jetbrains.kotlin.idea.parameterInfo; import com.intellij.lang.parameterInfo.CreateParameterInfoContext; import com.intellij.lang.parameterInfo.ParameterInfoHandler; diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java rename to idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java index c11adf36d3a..09246703de6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockParameterInfoUIContext.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.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.parameterInfo; +package org.jetbrains.kotlin.idea.parameterInfo; import com.intellij.codeInsight.hint.HintUtil; import com.intellij.lang.parameterInfo.ParameterInfoUIContext; diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockUpdateParameterInfoContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockUpdateParameterInfoContext.java rename to idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java index c7f57920c6c..8b86162bbd0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/MockUpdateParameterInfoContext.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.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.parameterInfo; +package org.jetbrains.kotlin.idea.parameterInfo; import com.intellij.lang.parameterInfo.UpdateParameterInfoContext; import com.intellij.openapi.editor.Editor; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index fb3ba2e1cd6..5f573ceac5c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -31,9 +31,9 @@ import junit.framework.ComparisonFailure; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; -import org.jetbrains.jet.plugin.KotlinDaemonAnalyzerTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.DirectiveBasedActionUtils; +import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.ConfigLibraryUtil; import org.jetbrains.kotlin.test.InTextDirectivesUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java index a3270d75705..3d7faa943bf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java @@ -29,9 +29,9 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; -import org.jetbrains.jet.plugin.KotlinLightQuickFixTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.DirectiveBasedActionUtils; +import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.ConfigLibraryUtil; import org.jetbrains.kotlin.test.InTextDirectivesUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java index 8fe96ff2d66..8117f2f036b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDocumentManager; import com.intellij.testFramework.PsiTestUtil; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.test.LocalFileSystemUtils; public class AddOpenToClassDeclarationTest extends AbstractQuickFixMultiFileTest { diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java index df2191cd627..8337bd3540a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt index 8662aa0e890..b8ab30abb64 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt @@ -21,7 +21,7 @@ import com.intellij.testFramework.LightPlatformCodeInsightTestCase import com.intellij.testFramework.fixtures.CodeInsightTestUtil import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import kotlin.test.* -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.openapi.actionSystem.impl.SimpleDataContext import com.intellij.openapi.actionSystem.CommonDataKeys import org.jetbrains.kotlin.idea.refactoring.rename.RenameKotlinImplicitLambdaParameter diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java index 3085c0ded76..2630df29829 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java @@ -33,11 +33,11 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.VisibilityUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.Visibilities; +import org.jetbrains.kotlin.idea.KotlinCodeInsightTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.psi.JetElement; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java index 05781e6ddef..34f7a1d9d98 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/AbstractInlineTest.java @@ -23,8 +23,8 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt index b30b4e96c6b..4ce29a528d7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt @@ -31,13 +31,13 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.renderer.DescriptorRenderer import kotlin.test.assertEquals -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractKotlinFunctionHandlerHelper import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionGeneratorOptions import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractableCodeDescriptor import org.jetbrains.kotlin.test.ConfigLibraryUtil -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionData import org.jetbrains.kotlin.idea.refactoring.extractFunction.ExtractionOptions import org.jetbrains.kotlin.psi.JetDeclaration 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 4742f1de90a..8995f0f0dba 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.refactoring.move import com.intellij.openapi.util.io.FileUtil import com.intellij.psi.PsiElement -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import java.io.File import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions @@ -54,7 +54,7 @@ import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.JetFi import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.test.ConfigLibraryUtil -import org.jetbrains.jet.plugin.util.application.runWriteAction +import org.jetbrains.kotlin.idea.util.application.runWriteAction public abstract class AbstractJetMoveTest : MultiFileTestCase() { protected fun doTest(path: String) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java index eff5c36b15c..95c030e4e3d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/nameSuggester/JetNameSuggesterTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring.nameSuggester; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.idea.refactoring.EmptyValidator; import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; 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 7aa51959a72..c27c6aac2cf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt @@ -29,7 +29,7 @@ import com.intellij.refactoring.rename.RenameProcessor import com.intellij.refactoring.rename.RenamePsiElementProcessor import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.JavaPsiFacade import com.intellij.openapi.project.Project diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java index dd94c083d48..1d65d98987a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/SimpleNameReferenceRenameTest.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.rename.RenameProcessor; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; public class SimpleNameReferenceRenameTest extends LightCodeInsightTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java index c9ae4cefbcd..31cea23ab8a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.idea.references; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.ResolveTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt index 1c23e72f624..6213194e11b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.idea.resolve -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.test.JetTestCaseBuilder -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.HashSet diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt index 8f14218cc5c..55997fd9af4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInJavaTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.resolve -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase private val FILE_WITH_KOTLIN_CODE = PluginTestCaseBase.getTestDataPathBase() + "/resolve/referenceInJava/dependencies.kt" diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt index ad8acde6f32..da3c1b209ac 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.idea.resolve -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import org.jetbrains.jet.plugin.navigation.NavigationTestUtils +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import org.junit.Assert import junit.framework.AssertionFailedError diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java index bbab33abd96..dd739fc58de 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java @@ -28,7 +28,7 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.InTextDirectivesUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java index 7353bf46875..723f9d7c946 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.LightProjectDescriptor; -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; public abstract class AbstractReferenceResolveWithLibTest extends AbstractReferenceResolveTest { private static final String TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/resolve/referenceWithLib"; diff --git a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt index 53d1327734e..ffc893697db 100644 --- a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.run +package org.jetbrains.kotlin.idea.run import com.intellij.testFramework.PlatformTestCase import com.intellij.codeInsight.CodeInsightTestCase import com.intellij.testFramework.PsiTestUtil import com.intellij.psi.PsiDocumentManager -import org.jetbrains.jet.plugin.PluginTestCaseBase +import org.jetbrains.kotlin.idea.PluginTestCaseBase import com.intellij.testFramework.MapDataContext import com.intellij.execution.actions.ConfigurationContext import com.intellij.execution.PsiLocation @@ -38,7 +38,7 @@ import com.intellij.openapi.module.Module import java.io.File import com.intellij.openapi.roots.ModuleRootModificationUtil import org.jetbrains.kotlin.idea.search.allScope -import org.jetbrains.jet.plugin.util.application.runWriteAction +import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex import org.jetbrains.kotlin.psi.JetTreeVisitorVoid import org.jetbrains.kotlin.psi.JetNamedDeclaration diff --git a/idea/tests/org/jetbrains/jet/plugin/structureView/AbstractKotlinFileStructureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/structureView/AbstractKotlinFileStructureTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.kt index 73cfd0c98da..cb630b51120 100644 --- a/idea/tests/org/jetbrains/jet/plugin/structureView/AbstractKotlinFileStructureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/structureView/AbstractKotlinFileStructureTest.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.structureView +package org.jetbrains.kotlin.idea.structureView -import org.jetbrains.jet.plugin.PluginTestCaseBase -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.PluginTestCaseBase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.util.ui.tree.TreeUtil import com.intellij.openapi.util.io.FileUtil import java.io.File diff --git a/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java index 0de9aa22d43..0abc0242b6a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.structureView; +package org.jetbrains.kotlin.idea.structureView; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/structureView/StructureViewUtil.java b/idea/tests/org/jetbrains/kotlin/idea/structureView/StructureViewUtil.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/structureView/StructureViewUtil.java rename to idea/tests/org/jetbrains/kotlin/idea/structureView/StructureViewUtil.java index a6204ae46a6..05eb00f10f6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/structureView/StructureViewUtil.java +++ b/idea/tests/org/jetbrains/kotlin/idea/structureView/StructureViewUtil.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.structureView; +package org.jetbrains.kotlin.idea.structureView; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.ui.Queryable; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java rename to idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java index b54254db32a..8393b4622e0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractMultiFileHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.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.stubs; +package org.jetbrains.kotlin.idea.stubs; import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; import com.intellij.codeInsight.daemon.impl.HighlightInfo; @@ -30,8 +30,8 @@ import com.intellij.testFramework.ExpectedHighlightingData; import kotlin.Function0; import kotlin.Unit; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.KotlinCompletionTestCase; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.KotlinCompletionTestCase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import java.io.File; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java rename to idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java index 0bb117111cd..b28dd4b922f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.stubs; +package org.jetbrains.kotlin.idea.stubs; import com.intellij.openapi.module.Module; import com.intellij.openapi.roots.ContentEntry; @@ -25,10 +25,10 @@ import com.intellij.util.Consumer; import kotlin.Function0; import kotlin.Unit; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.KotlinCodeInsightTestCase; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractStubBuilderTest.java similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java rename to idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractStubBuilderTest.java index 2cec900bd3c..32d1f0de488 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractStubBuilderTest.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.stubs; +package org.jetbrains.kotlin.idea.stubs; import com.intellij.psi.impl.DebugUtil; import com.intellij.psi.stubs.StubElement; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder; -import org.jetbrains.kotlin.name.SpecialNames; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/AstAccessControl.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt rename to idea/tests/org/jetbrains/kotlin/idea/stubs/AstAccessControl.kt index dd0caebb225..e403b55724d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AstAccessControl.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.stubs +package org.jetbrains.kotlin.idea.stubs import com.intellij.psi.impl.PsiManagerImpl import com.intellij.psi.PsiManager diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/DebugTextByStubTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/stubs/DebugTextByStubTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.kt index 250a6527e47..7fa69e4117f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/DebugTextByStubTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/DebugTextByStubTest.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.stubs +package org.jetbrains.kotlin.idea.stubs import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/JetStubsTest.java similarity index 93% rename from idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java rename to idea/tests/org/jetbrains/kotlin/idea/stubs/JetStubsTest.java index 7cded46a840..578a9dc5bdd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/JetStubsTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/JetStubsTest.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,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.stubs; +package org.jetbrains.kotlin.idea.stubs; import com.intellij.psi.PsiFile; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import java.util.List; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java index 5cbf9b0ca50..ebbfb10a7fa 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.stubs; +package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/ResolveByStubTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/stubs/ResolveByStubTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java index a67ff7ca25f..640bf0331ac 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/ResolveByStubTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.stubs; +package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java index d5e4b0277f0..0d2485b227e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.stubs; +package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java b/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java index d64f9b45041..75b3ceb3940 100644 --- a/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java +++ b/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java @@ -21,8 +21,8 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; import org.jetbrains.kotlin.load.java.structure.JavaClassifierType; import org.jetbrains.kotlin.load.java.structure.JavaType; import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter; diff --git a/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt index d382b0df3b6..554b904679e 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.psi -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import org.jetbrains.jet.plugin.JetLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor import com.intellij.psi.ElementManipulators import org.junit.Assert.* import com.intellij.openapi.util.TextRange diff --git a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt index eee61600674..4fc9ecb130d 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt @@ -16,20 +16,20 @@ package org.jetbrains.kotlin.psi.patternMatching -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.psiUtil.parents import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier -import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier +import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange import java.io.File import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.kotlin.psi.JetWhenCondition -import org.jetbrains.jet.plugin.DirectiveBasedActionUtils +import org.jetbrains.kotlin.idea.DirectiveBasedActionUtils public abstract class AbstractJetPsiUnifierTest: JetLightCodeInsightFixtureTestCase() { public fun doTest(filePath: String) { diff --git a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java index aeb16c1ee03..1ca4c91c57d 100644 --- a/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java +++ b/idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java @@ -26,9 +26,9 @@ import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase; +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.psi.*; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java index 5fcd74bd19e..af913d0b2b0 100644 --- a/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java @@ -24,7 +24,7 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.util.Query; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLightProjectDescriptor; +import org.jetbrains.kotlin.idea.JetLightProjectDescriptor; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java b/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java index 337406b9611..d65f51d0356 100644 --- a/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.search; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.AnnotatedMembersSearch; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java b/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java index 4ac6c4b6423..64766304f9f 100644 --- a/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.search; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.ClassInheritorsSearch; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java index 45610ddb049..d0d75b0fd1c 100644 --- a/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java +++ b/idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java @@ -23,8 +23,8 @@ import com.intellij.psi.search.searches.AnnotatedMembersSearch; import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.JetJdkAndLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt b/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt index 177fd06b50e..b3030209e4c 100644 --- a/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt +++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.shortenRefs import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.openapi.application.ApplicationManager import java.io.File import com.intellij.openapi.command.CommandProcessor import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences import org.jetbrains.kotlin.test.JetTestCaseBuilder -import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase +import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase import com.intellij.codeInsight.CodeInsightSettings import org.jetbrains.kotlin.test.InTextDirectivesUtils diff --git a/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java index 1b90452e842..44abae5a02e 100644 --- a/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java +++ b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java @@ -25,7 +25,7 @@ import com.intellij.util.PathUtil; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.idea.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetObjectDeclaration; import org.junit.Assert; diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt index c91dcc67c10..c4f4bb1d91b 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt @@ -22,13 +22,13 @@ import com.intellij.psi.codeStyle.CodeStyleManager import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.openapi.project.Project import com.intellij.openapi.command.WriteCommandAction -import org.jetbrains.jet.plugin.j2k.J2kPostProcessor -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager import java.util.ArrayList import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.j2k.IdeaResolverForConverter +import org.jetbrains.kotlin.idea.j2k.IdeaResolverForConverter public abstract class AbstractJavaToKotlinConverterMultiFileTest : AbstractJavaToKotlinConverterTest() { public fun doTest(dirPath: String) { diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index 399a0b6a168..1e71ced1ad6 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -25,11 +25,11 @@ import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.openapi.project.Project import com.intellij.openapi.command.WriteCommandAction import org.jetbrains.kotlin.test.util.trimIndent -import org.jetbrains.jet.plugin.j2k.J2kPostProcessor -import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor +import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor +import org.jetbrains.kotlin.idea.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.psi.PsiJavaFile import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.j2k.IdeaResolverForConverter +import org.jetbrains.kotlin.idea.j2k.IdeaResolverForConverter public abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotlinConverterTest() { val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n")