From 44840d07a8d86afedc3264e373afe4ddcf8f9c97 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 18:44:23 +0300 Subject: [PATCH] Rename jet -> kotlin in idea: caches, findUsages, references, stubindex --- .../jetbrains/jet/plugin/JetIconProvider.java | 2 +- .../plugin/project/AnalyzerFacadeProvider.kt | 2 +- .../plugin/project/ResolveElementCache.java | 4 +- .../search/usagesSearch/searchHelpers.kt | 4 +- .../jet/plugin/search/usagesSearch/utils.kt | 8 +-- .../JetStructureViewElement.java | 2 +- .../KotlinInheritedMembersNodeProvider.kt | 2 +- .../jet/plugin/util/ProjectRootsUtil.kt | 2 +- .../idea}/caches/JetShortNamesCache.kt | 15 ++-- .../IDELightClassGenerationSupport.java | 28 ++++---- .../idea}/caches/resolve/IdeaModuleInfos.kt | 5 +- .../caches/resolve/JavaResolveExtension.kt | 4 +- .../idea}/caches/resolve/JsAnalyzerFacade.kt | 4 +- .../idea}/caches/resolve/JsProjectDetector.kt | 6 +- .../caches/resolve/KotlinCacheService.kt | 4 +- ...otlinLightClassForDecompiledDeclaration.kt | 4 +- .../caches/resolve/KotlinResolveCache.kt | 4 +- .../resolve/LibraryDependenciesCache.kt | 4 +- .../resolve/LibraryModificationTracker.kt | 4 +- .../caches/resolve/ModuleDependencyMapper.kt | 4 +- .../idea}/caches/resolve/ResolutionFacade.kt | 4 +- .../idea}/caches/resolve/cacheUtils.kt | 6 +- .../idea}/caches/resolve/getModuleInfo.kt | 4 +- .../caches/resolve/globalContextUtils.kt | 4 +- .../idea}/caches/resolve/moduleDependents.kt | 6 +- .../idea}/caches/resolve/resolutionApi.kt | 4 +- .../DescriptorToDeclarationUtil.kt | 2 +- .../codeInsight/JetFileReferencesResolver.kt | 2 +- .../idea/codeInsight/ShortenReferences.kt | 4 +- .../navigation/DecompiledNavigationUtils.java | 2 +- .../navigation/JetSourceNavigationHelper.java | 6 +- .../idea}/findUsages/JetFindUsagesProvider.kt | 4 +- .../idea}/findUsages/KotlinWordsScanner.kt | 5 +- .../idea}/findUsages/UsageTypeUtils.kt | 14 ++-- .../idea/highlighter/DebugInfoAnnotator.java | 2 +- .../DuplicateJvmSignatureAnnotator.java | 4 +- .../kotlin/idea/highlighter/JetPsiChecker.kt | 2 +- .../intentions/OperatorToFunctionIntention.kt | 2 +- .../intentions/RemoveExplicitTypeArguments.kt | 4 +- .../quickfix/KotlinSuppressIntentionAction.kt | 2 +- .../references/BuiltInsReferenceResolver.java | 16 ++--- .../references/JetArrayAccessReference.java | 6 +- .../idea}/references/JetForLoopInReference.kt | 4 +- .../JetInvokeFunctionReference.java | 6 +- .../JetMultiDeclarationReference.kt | 10 +-- .../JetPropertyDelegationMethodsReference.kt | 4 +- .../idea}/references/JetReference.kt | 6 +- .../references/JetReferenceContributor.kt | 4 +- .../references/JetSimpleNameReference.kt | 6 +- .../idea}/references/JetThisReference.java | 4 +- .../idea}/references/referenceUtil.kt | 4 +- .../idea}/stubindex/JetAnnotationsIndex.java | 4 +- .../stubindex/JetClassShortNameIndex.java | 4 +- .../stubindex/JetExactPackagesIndex.java | 4 +- .../stubindex/JetFullClassNameIndex.java | 4 +- .../stubindex/JetFunctionShortNameIndex.java | 4 +- ...ProbablyNothingFunctionShortNameIndex.java | 4 +- ...ProbablyNothingPropertyShortNameIndex.java | 4 +- .../stubindex/JetPropertyShortNameIndex.java | 4 +- .../idea}/stubindex/JetSourceFilterScope.java | 6 +- .../idea}/stubindex/JetSuperClassIndex.java | 4 +- .../JetTopLevelClassByPackageIndex.java | 4 +- .../JetTopLevelFunctionByPackageIndex.java | 4 +- .../JetTopLevelFunctionFqnNameIndex.java | 4 +- .../JetTopLevelPropertyByPackageIndex.java | 4 +- .../JetTopLevelPropertyFqnNameIndex.java | 4 +- .../idea}/stubindex/KotlinIndexUtil.java | 4 +- .../idea}/stubindex/PackageIndexUtil.kt | 4 +- .../idea}/stubindex/StubIndexServiceImpl.java | 10 +-- .../stubindex/SubpackagesIndexService.kt | 4 +- .../PluginDeclarationProviderFactory.kt | 6 +- ...PluginDeclarationProviderFactoryService.kt | 8 +-- ...ubBasedPackageMemberDeclarationProvider.kt | 18 ++--- idea/src/META-INF/plugin.xml | 68 +++++++++---------- .../plugin/JetQuickDocumentationProvider.java | 2 +- .../actions/KotlinQualifiedNameProvider.kt | 2 +- .../actions/ShowExpressionTypeAction.java | 2 +- .../internal/CheckPartialBodyResolveAction.kt | 4 +- .../internal/CopyAsDiagnosticTestAction.java | 2 +- .../internal/FindImplicitNothingAction.kt | 2 +- .../coverage/KotlinCoverageExtension.kt | 2 +- .../KotlinTypeHierarchyProvider.java | 4 +- .../KotlinCallHierarchyNodeDescriptor.java | 2 +- .../KotlinCalleeMethodsTreeStructure.java | 2 +- .../KotlinCallerMethodsTreeStructure.java | 4 +- .../plugin/imports/KotlinImportOptimizer.kt | 2 +- .../internal/KotlinBytecodeToolWindow.java | 2 +- .../plugin/j2k/IdeaResolverForConverter.kt | 2 +- .../jet/plugin/j2k/J2kPostProcessor.kt | 2 +- .../KotlinSignatureAnnotationIntention.java | 2 +- .../KotlinSignatureInJavaMarkerProvider.java | 2 +- .../AnonymousTemplateEditingListener.java | 2 +- .../macro/BaseJetVariableMacro.java | 2 +- .../macro/JetAnonymousSuperMacro.java | 2 +- .../JetFunctionParameterInfoHandler.java | 4 +- .../project/PluginJetFilesProvider.java | 4 +- .../jet/plugin/run/JetRunConfiguration.java | 4 +- .../run/JetRunConfigurationProducer.java | 4 +- .../KotlinAnnotatedElementsSearcher.java | 4 +- .../KotlinDirectInheritorsSearcher.kt | 4 +- .../jet/plugin/util/DebuggerUtils.java | 2 +- .../idea}/caches/JetGotoClassContributor.java | 10 +-- .../caches/JetGotoSymbolContributor.java | 10 +-- .../idea}/caches/KotlinIndicesHelper.kt | 8 +-- .../codeInsight/GotoSuperActionHandler.java | 2 +- .../JetFunctionPsiElementCellRenderer.java | 2 +- .../JetTypeDeclarationProvider.java | 2 +- .../KotlinCopyPasteReferenceProcessor.kt | 4 +- .../OverrideImplementMethodsHandler.java | 2 +- .../surroundWith/KotlinSurrounderUtils.java | 2 +- .../MoveDeclarationsOutHelper.java | 2 +- .../KotlinRuntimeTypeCastSurrounder.kt | 2 +- .../idea/completion/AllClassesCompletion.kt | 4 +- .../idea/completion/CompletionSession.kt | 6 +- .../DeclarationDescriptorLookupObject.kt | 2 +- .../kotlin/idea/completion/ExpectedInfos.kt | 2 +- .../completion/KotlinCompletionContributor.kt | 2 +- .../idea/completion/LookupElementFactory.kt | 2 +- .../completion/LookupElementsCollector.kt | 2 +- .../completion/NamedParametersCompletion.kt | 2 +- .../completion/PackageDirectiveCompletion.kt | 4 +- .../completion/handlers/GenerateLambda.kt | 2 +- .../handlers/KotlinClassInsertHandler.kt | 2 +- .../idea/completion/smart/SmartCompletion.kt | 4 +- .../idea/completion/smart/StaticMembers.kt | 2 +- .../smart/TypeInstantiationItems.kt | 6 +- .../kotlin/idea/completion/smart/Utils.kt | 2 +- .../idea/debugger/JetPositionManager.kt | 4 +- .../debugger/KotlinSmartStepIntoHandler.kt | 2 +- .../debugger/KotlinSourcePositionProvider.kt | 2 +- ...PositionManagerLibraryClassFileSearcher.kt | 2 +- .../evaluate/KotlinEvaluationBuilder.kt | 4 +- .../JetElementDescriptionProvider.kt | 4 +- .../findUsages/JetImportFilteringRule.kt | 7 +- .../idea}/findUsages/JetUsageTypeProvider.kt | 6 +- .../KotlinDeclarationGroupRuleProvider.kt | 5 +- .../KotlinFindUsagesHandlerFactory.kt | 14 ++-- .../dialogs/KotlinFindClassUsagesDialog.java | 8 +-- .../KotlinFindFunctionUsagesDialog.java | 8 +-- .../KotlinFindPropertyUsagesDialog.java | 6 +- .../KotlinTypeParameterFindUsagesDialog.java | 4 +- .../idea}/findUsages/dialogs/Utils.java | 6 +- .../idea}/findUsages/findUsagesOptions.kt | 7 +- .../DelegatingFindMemberUsagesHandler.kt | 11 ++- .../handlers/KotlinFindClassUsagesHandler.kt | 16 ++--- .../KotlinFindMemberUsagesHandler.java | 18 ++--- .../handlers/KotlinFindUsagesHandler.java | 6 +- .../KotlinTypeParameterFindUsagesHandler.kt | 10 +-- .../markers/SuperDeclarationMarker.kt | 2 +- .../ConvertAssertToIfWithThrowIntention.kt | 2 +- .../ConvertIfWithThrowToAssertIntention.kt | 2 +- .../ConvertToConcatenatedStringIntention.kt | 2 +- .../ConvertToExpressionBodyAction.kt | 2 +- .../ConvertToForEachLoopIntention.kt | 2 +- .../ConvertToStringTemplateIntention.kt | 2 +- .../intentions/InsertExplicitTypeArguments.kt | 2 +- .../MakeTypeExplicitInLambdaIntention.kt | 2 +- .../MoveLambdaInsideParenthesesIntention.kt | 2 +- .../ReconstructTypeInCastOrIsAction.java | 2 +- ...icitFunctionLiteralParamWithItIntention.kt | 2 +- ...thExplicitFunctionLiteralParamIntention.kt | 4 +- .../ReplaceWithInfixFunctionCallIntention.kt | 4 +- .../ReplaceWithOperatorAssignIntention.kt | 2 +- .../SimplifyBooleanWithConstantsIntention.kt | 2 +- .../SpecifyTypeExplicitlyAction.java | 2 +- .../jetbrains/kotlin/idea/intentions/Utils.kt | 2 +- .../AttributeCallReplacementIntention.kt | 2 +- .../branchedTransformations/IfThenUtils.kt | 2 +- .../ConvertMemberToExtension.java | 2 +- .../declarations/DeclarationUtils.java | 2 +- .../quickfix/AddFunctionParametersFix.java | 2 +- .../quickfix/AddFunctionToSupertypeFix.java | 2 +- .../idea/quickfix/AddNameToArgumentFix.java | 2 +- ...ddOverrideToEqualsHashCodeToStringFix.java | 2 +- .../kotlin/idea/quickfix/AutoImportFix.kt | 6 +- .../idea/quickfix/CastExpressionFix.java | 2 +- .../ChangeFunctionLiteralReturnTypeFix.java | 2 +- .../ChangeFunctionLiteralSignatureFix.java | 2 +- .../quickfix/ChangeFunctionReturnTypeFix.java | 2 +- .../quickfix/ChangeFunctionSignatureFix.java | 2 +- .../ChangeMemberFunctionSignatureFix.java | 2 +- .../ChangeToConstructorInvocationFix.java | 2 +- .../quickfix/ChangeVariableMutabilityFix.java | 2 +- .../idea/quickfix/ChangeVariableTypeFix.java | 2 +- .../quickfix/ChangeVisibilityModifierFix.java | 2 +- .../quickfix/MakeOverriddenMemberOpenFix.java | 2 +- .../quickfix/MapPlatformClassToKotlinFix.java | 2 +- .../QuickFixFactoryForTypeMismatchError.java | 2 +- .../kotlin/idea/quickfix/QuickFixUtil.java | 4 +- .../quickfix/RemoveFunctionParametersFix.java | 2 +- ...meParameterToMatchOverriddenMethodFix.java | 2 +- .../callableBuilder/CallableBuilder.kt | 2 +- .../callableBuilder/typeUtils.kt | 2 +- ...mCallWithConstructorCalleeActionFactory.kt | 2 +- ...teClassFromConstructorCallActionFactory.kt | 2 +- ...assFromReferenceExpressionActionFactory.kt | 2 +- ...eateClassFromTypeReferenceActionFactory.kt | 2 +- ...FunctionOrPropertyFromCallActionFactory.kt | 2 +- .../CreateIteratorFunctionActionFactory.kt | 2 +- ...ePropertyDelegateAccessorsActionFactory.kt | 2 +- .../CreateSetFunctionActionFactory.kt | 2 +- .../CreateParameterActionFactory.kt | 2 +- ...teParameterByNamedArgumentActionFactory.kt | 2 +- .../idea/refactoring/JetNameSuggester.java | 2 +- .../refactoring/JetNameValidatorImpl.java | 2 +- .../idea/refactoring/JetRefactoringUtil.java | 2 +- .../changeSignature/JetChangeInfo.kt | 2 +- .../changeSignature/JetChangeSignatureData.kt | 2 +- .../JetChangeSignatureHandler.java | 2 +- .../JetChangeSignatureUsageProcessor.java | 4 +- .../usages/JetFunctionDefinitionUsage.java | 2 +- .../ExtractableCodeDescriptor.kt | 4 +- .../extractableAnalysisUtil.kt | 4 +- .../inline/KotlinInlineValHandler.java | 4 +- .../KotlinIntroduceVariableHandler.java | 2 +- .../idea/refactoring/jetRefactoringUtil.kt | 2 +- .../MoveKotlinFileHandler.kt | 2 +- ...MoveKotlinTopLevelDeclarationsProcessor.kt | 2 +- .../kotlin/idea/refactoring/move/moveUtils.kt | 6 +- .../rename/RenameDynamicMemberHandler.kt | 2 +- .../rename/RenameKotlinPropertyProcessor.kt | 2 +- .../idea/refactoring/rename/renameUtil.kt | 2 +- .../KotlinJavaSafeDeleteDelegate.kt | 4 +- .../safeDelete/KotlinOverridingDialog.java | 2 +- .../safeDelete/KotlinSafeDeleteProcessor.kt | 4 +- .../SafeDeleteImportDirectiveUsageInfo.kt | 2 +- .../findWithFilteringImports.0.kt | 2 +- .../kotlinClassAllUsages.0.kt | 2 +- .../kotlinMethodUsages.0.kt | 2 +- .../kotlinPropertyUsages.0.kt | 2 +- .../jet/plugin/DirectiveBasedActionUtils.java | 8 +-- .../JetLightCodeInsightFixtureTestCase.java | 8 +-- .../AbstractFunctionParameterInfoTest.java | 8 +-- .../jet/plugin/run/RunConfigurationTest.kt | 4 +- .../stubs/AbstractResolveByStubTest.java | 12 ++-- .../completion/DataFlowValueRenderingTest.kt | 2 +- .../JetFixtureCompletionBaseTestCase.java | 2 +- .../findUsages/AbstractJetFindUsagesTest.java | 6 +- .../HighlightingWithDependentLibrariesTest.kt | 7 +- .../caches/resolve/IdeaModuleInfoTest.kt | 4 +- .../resolve/MultiModuleHighlightingTest.kt | 6 +- .../AbstractInsertImportOnPasteTest.java | 2 +- ...AbstractEditorForEvaluateExpressionTest.kt | 2 +- .../NavigateFromLibrarySourcesTest.kt | 2 +- .../NavigateToLibrarySourceTest.java | 2 +- .../idea/highlighter/NoErrorsInStdlibTest.kt | 2 +- .../JetChangeSignatureTest.java | 2 +- .../refactoring/rename/AbstractRenameTest.kt | 2 +- .../BuiltInsReferenceResolverTest.java | 12 ++-- .../resolve/AbstractPartialBodyResolveTest.kt | 2 +- .../resolve/AbstractReferenceResolveTest.java | 2 +- .../j2k/AbstractJavaToKotlinConverterTest.kt | 2 +- 252 files changed, 517 insertions(+), 533 deletions(-) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/JetShortNamesCache.kt (90%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/IDELightClassGenerationSupport.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/IdeaModuleInfos.kt (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/JavaResolveExtension.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/JsAnalyzerFacade.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/JsProjectDetector.kt (93%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/KotlinCacheService.kt (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/KotlinResolveCache.kt (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/LibraryDependenciesCache.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/LibraryModificationTracker.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/ModuleDependencyMapper.kt (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/ResolutionFacade.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/cacheUtils.kt (92%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/getModuleInfo.kt (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/globalContextUtils.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/moduleDependents.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/resolutionApi.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/JetFindUsagesProvider.kt (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/KotlinWordsScanner.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/UsageTypeUtils.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/BuiltInsReferenceResolver.java (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetArrayAccessReference.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetForLoopInReference.kt (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetInvokeFunctionReference.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetMultiDeclarationReference.kt (83%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetPropertyDelegationMethodsReference.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetReference.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetReferenceContributor.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetSimpleNameReference.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/JetThisReference.java (91%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/references/referenceUtil.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetAnnotationsIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetClassShortNameIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetExactPackagesIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetFullClassNameIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetFunctionShortNameIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetProbablyNothingFunctionShortNameIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetProbablyNothingPropertyShortNameIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetPropertyShortNameIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetSourceFilterScope.java (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetSuperClassIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetTopLevelClassByPackageIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetTopLevelFunctionByPackageIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetTopLevelFunctionFqnNameIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetTopLevelPropertyByPackageIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/JetTopLevelPropertyFqnNameIndex.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/KotlinIndexUtil.java (92%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/PackageIndexUtil.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/StubIndexServiceImpl.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/SubpackagesIndexService.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/resolve/PluginDeclarationProviderFactory.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/resolve/PluginDeclarationProviderFactoryService.kt (88%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt (85%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/JetGotoClassContributor.java (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/JetGotoSymbolContributor.java (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/caches/KotlinIndicesHelper.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/JetElementDescriptionProvider.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/JetImportFilteringRule.kt (84%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/JetUsageTypeProvider.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/KotlinDeclarationGroupRuleProvider.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/KotlinFindUsagesHandlerFactory.kt (85%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/dialogs/KotlinFindClassUsagesDialog.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/dialogs/Utils.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/findUsagesOptions.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/handlers/KotlinFindClassUsagesHandler.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/handlers/KotlinFindMemberUsagesHandler.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/handlers/KotlinFindUsagesHandler.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt (87%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/HighlightingWithDependentLibrariesTest.kt (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/IdeaModuleInfoTest.kt (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/caches/resolve/MultiModuleHighlightingTest.kt (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/references/BuiltInsReferenceResolverTest.java (94%) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java index ef2ea597441..c2bda16ef66 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetIconProvider.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration; +import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt index 6699535bf02..1c68e3abb9c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.analyzer.AnalyzerFacade import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.kotlin.analyzer.ResolverForModule import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade -import org.jetbrains.jet.plugin.caches.resolve.JsAnalyzerFacade +import org.jetbrains.kotlin.idea.caches.resolve.JsAnalyzerFacade public object AnalyzerFacadeProvider { //NOTE: it's convenient that JS backend doesn't have platform parameters (for now) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index c2e9c4fb7fa..ab611d973bb 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.*; -import org.jetbrains.jet.plugin.stubindex.JetProbablyNothingFunctionShortNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetProbablyNothingPropertyShortNameIndex; +import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingFunctionShortNameIndex; +import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingPropertyShortNameIndex; import org.jetbrains.kotlin.storage.LazyResolveStorageManager; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt index e46834a1fd0..e9c63aaaaf1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt @@ -36,10 +36,10 @@ import org.jetbrains.kotlin.lexer.JetSingleValueToken import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.plugin.references.* +import org.jetbrains.kotlin.idea.references.* import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.util.containers.ContainerUtil -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze val isTargetUsage = (PsiReference::matchesTarget).searchFilter diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt index 1ab940c5c6d..b3f37841810 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt @@ -27,10 +27,10 @@ import org.jetbrains.kotlin.codegen.PropertyCodegen import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.kotlin.resolve.OverrideResolver import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.references.* -import org.jetbrains.jet.plugin.findUsages.UsageTypeUtils -import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.references.* +import org.jetbrains.kotlin.idea.findUsages.UsageTypeUtils +import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum +import org.jetbrains.kotlin.idea.caches.resolve.analyze val JetDeclaration.descriptor: DeclarationDescriptor? get() = this.analyze().get(BindingContext.DECLARATION_TO_DESCRIPTOR, this) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java index d2d57585f7c..2c7abb3bbdc 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import java.util.ArrayList; import java.util.Collections; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt index 5931222bf47..9934244d474 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt @@ -25,7 +25,7 @@ import java.util.ArrayList import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import com.intellij.psi.NavigatablePsiElement import org.jetbrains.kotlin.psi.JetClassOrObject -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider() { override fun provideNodes(node: TreeElement): Collection { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt index 77a91f8a5cf..3486d90b7cd 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt @@ -25,7 +25,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiDirectory import com.intellij.ide.highlighter.JavaClassFileType -import org.jetbrains.jet.plugin.caches.resolve.JsProjectDetector +import org.jetbrains.kotlin.idea.caches.resolve.JsProjectDetector public object ProjectRootsUtil { platformStatic diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt similarity index 90% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt index 3bfd654646b..abe3bd07595 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.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,21 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.caches +package org.jetbrains.kotlin.idea.caches import com.intellij.util.containers.HashSet import com.intellij.psi.PsiMethod import com.intellij.psi.PsiField import com.intellij.psi.PsiClass -import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance -import org.jetbrains.jet.plugin.stubindex.JetFunctionShortNameIndex +import org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex +import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil +import org.jetbrains.kotlin.idea.stubindex.JetFunctionShortNameIndex // used in Upsource, what's why in idea-analysis module public class JetShortNamesCache(private val project: com.intellij.openapi.project.Project) : com.intellij.psi.search.PsiShortNamesCache() { class object { - public fun getKotlinInstance(project: com.intellij.openapi.project.Project): org.jetbrains.jet.plugin.caches.JetShortNamesCache + public fun getKotlinInstance(project: com.intellij.openapi.project.Project): org.jetbrains.kotlin.idea.caches.JetShortNamesCache = com.intellij.openapi.extensions.Extensions.getArea(project).getExtensionPoint(com.intellij.psi.search.PsiShortNamesCache.EP_NAME).getExtensions() .firstIsInstance() } @@ -36,7 +37,7 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec * Return kotlin class names from project sources which should be visible from java. */ override fun getAllClassNames(): Array { - val classNames = org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex.getInstance().getAllKeys(project) + val classNames = JetClassShortNameIndex.getInstance().getAllKeys(project) // package classes can not be indexed, since they have no explicit declarations val packageClassShortNames = PackageIndexUtil.getAllPossiblePackageClasses(project).keySet() @@ -65,7 +66,7 @@ public class JetShortNamesCache(private val project: com.intellij.openapi.projec } // Quick check for classes from getAllClassNames() - val classOrObjects = org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex.getInstance().get(name, project, scope) + val classOrObjects = org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex.getInstance().get(name, project, scope) if (classOrObjects.isEmpty()) { return result.copyToArray() } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java index d493826fd6a..0a2c1bc861f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.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.caches.resolve; +package org.jetbrains.kotlin.idea.caches.resolve; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -38,32 +38,32 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.plugin.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.jet.plugin.util.ProjectRootsUtil; +import org.jetbrains.kotlin.asJava.*; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper; -import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; -import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetTopLevelClassByPackageIndex; -import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; -import org.jetbrains.kotlin.asJava.*; import java.io.IOException; import java.util.*; import static kotlin.KotlinPackage.*; -import static org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope.kotlinSourceAndClassFiles; +import static org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope.kotlinSourceAndClassFiles; public class IDELightClassGenerationSupport extends LightClassGenerationSupport { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt index ad3abe4f757..14ce9f23ca3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.analyzer.ModuleInfo import com.intellij.psi.search.GlobalSearchScope @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.name.Name import java.util.LinkedHashSet import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.libraries.Library -import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.module.impl.scopes.LibraryScopeBase import com.intellij.openapi.roots.OrderRootType diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt index 0662331ce55..916cdc3fc08 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.jet.plugin.project.TargetPlatform import com.intellij.psi.PsiElement diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.kt index ab27ccd93ec..e4d22ea6f55 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsAnalyzerFacade.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.analyzer.ResolverForModule diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsProjectDetector.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt similarity index 93% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsProjectDetector.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.kt index b0fb4ac3d77..ff567c31fcc 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsProjectDetector.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JsProjectDetector.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.project.Project import com.intellij.openapi.module.ModuleManager @@ -32,4 +32,4 @@ public object JsProjectDetector { CachedValueProvider.Result(result, ProjectRootModificationTracker.getInstance(project)) } } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.kt index 058b6827d1b..db6fb9f6a7d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheService.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt index 6f4056dbb7e..284dd39dbd5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinLightClassForDecompiledDeclaration.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.asJava.KotlinWrappingLightClass import com.intellij.psi.PsiClass diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt index d2b33a0186b..05c9becb6eb 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/LibraryDependenciesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryDependenciesCache.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/LibraryDependenciesCache.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryDependenciesCache.kt index b5cec055a2c..bb3253c1754 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/LibraryDependenciesCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryDependenciesCache.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.project.Project import com.intellij.openapi.module.Module diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/LibraryModificationTracker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/LibraryModificationTracker.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.kt index e2ddeb0376d..da5d259c204 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/LibraryModificationTracker.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/LibraryModificationTracker.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.util.SimpleModificationTracker import com.intellij.openapi.project.Project diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt index 79fb1d2734c..93c6f933e86 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.project.Project import com.intellij.openapi.roots.ModuleRootManager diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacade.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacade.kt index 340043d2151..9a1d7c64867 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacade.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.resolve.BindingContext diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/cacheUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/cacheUtils.kt similarity index 92% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/cacheUtils.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/cacheUtils.kt index aa261678873..8cad566f8f5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/cacheUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/cacheUtils.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.project.Project import com.intellij.psi.util.CachedValuesManager @@ -31,4 +31,4 @@ class SynchronizedCachedValue(project: Project, provider: () -> CachedValuePr cachedValue.getValue() as V } } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt index 06fe4abd903..514dfa6a753 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/getModuleInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.psi.PsiElement import org.jetbrains.kotlin.asJava.KotlinLightElement diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.kt index 7e15bcd1055..44f73ee1758 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/globalContextUtils.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.context.GlobalContextImpl import org.jetbrains.kotlin.storage.LockBasedStorageManager diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/moduleDependents.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/moduleDependents.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/moduleDependents.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/moduleDependents.kt index b0f56c8efc1..9a71fab9743 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/moduleDependents.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/moduleDependents.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.module.Module import com.intellij.util.containers.MultiMap @@ -87,4 +87,4 @@ private fun getModuleIndex(project: Project): ModuleIndex { } CachedValueProvider.Result(index, ProjectRootModificationTracker.getInstance(project)) }!! -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt index fdf502d2f6a..80cf3ee942f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt index fa1e88ecbb2..ae33ed99d45 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/DescriptorToDeclarationUtil.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.idea.decompiler.navigation.DecompiledNavigationUtils -import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver +import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver import java.util.HashSet import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import com.intellij.psi.JavaPsiFacade diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/JetFileReferencesResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/JetFileReferencesResolver.kt index 9a396295450..9cf81fff190 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/JetFileReferencesResolver.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/JetFileReferencesResolver.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetSimpleNameExpression import java.util.Collections -import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.JetQualifiedExpression import java.util.LinkedHashMap diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/ShortenReferences.kt index 64fc90aacf8..6c0d64731c9 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/ShortenReferences.kt @@ -26,7 +26,7 @@ import java.util.HashSet; import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager -import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.resolve.DescriptorUtils import java.util.Collections import org.jetbrains.kotlin.analyzer.analyzeInContext @@ -35,7 +35,7 @@ import java.util.LinkedHashSet import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public object ShortenReferences { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java index 59d2959b364..cd9f337aa53 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java @@ -23,10 +23,10 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.idea.decompiler.DecompilerPackage; import org.jetbrains.kotlin.idea.decompiler.JetClsFile; +import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java index 70fbb6af431..5211e76547b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java @@ -36,9 +36,6 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertyFqnNameIndex; import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; @@ -48,6 +45,9 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.di.InjectorForLazyResolve; +import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex; +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex; +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelPropertyFqnNameIndex; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/JetFindUsagesProvider.kt similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/JetFindUsagesProvider.kt index f91beb218d4..0d2cfbf60f2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/JetFindUsagesProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/JetFindUsagesProvider.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.findUsages +package org.jetbrains.kotlin.idea.findUsages import com.intellij.lang.cacheBuilder.WordsScanner import com.intellij.lang.findUsages.FindUsagesProvider diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/KotlinWordsScanner.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinWordsScanner.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/KotlinWordsScanner.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinWordsScanner.kt index eb0bb6c1610..99c18e352b3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/KotlinWordsScanner.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinWordsScanner.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.findUsages +package org.jetbrains.kotlin.idea.findUsages import org.jetbrains.jet.plugin.search.usagesSearch.* import com.intellij.lang.cacheBuilder.WordsScanner @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.lexer.JetLexer import com.intellij.lang.cacheBuilder.WordOccurrence import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.lang.cacheBuilder.SimpleWordsScanner -import org.jetbrains.kotlin.types.expressions.OperatorConventions class KotlinWordsScanner() : WordsScanner { private val lexer = JetLexer() diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/UsageTypeUtils.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/UsageTypeUtils.kt index 291f12de39d..c80dea49640 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/UsageTypeUtils.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.findUsages +package org.jetbrains.kotlin.idea.findUsages import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetForExpression @@ -43,9 +43,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.jet.plugin.references.JetArrayAccessReference import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.references.JetInvokeFunctionReference import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.psi.JetAnnotationEntry import org.jetbrains.kotlin.psi.JetCallExpression @@ -59,9 +57,11 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import com.intellij.psi.PsiPackage import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum.* -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum.* +import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch +import org.jetbrains.kotlin.idea.references.JetArrayAccessReference +import org.jetbrains.kotlin.idea.references.JetInvokeFunctionReference public object UsageTypeUtils { public fun getUsageType(element: PsiElement?): UsageTypeEnum? { @@ -70,7 +70,7 @@ public object UsageTypeUtils { is JetMultiDeclaration -> return READ } - val refExpr = element?.getNonStrictParentOfType() + val refExpr = element.getNonStrictParentOfType() if (refExpr == null) return null val context = refExpr.analyze() 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 1f189a4db8f..e901dfe170d 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 @@ -22,9 +22,9 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.checkers.DebugInfoUtil; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; 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 f96428d99e7..927b6490374 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,17 +22,17 @@ 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.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.TargetPlatform; import org.jetbrains.jet.plugin.project.TargetPlatformDetector; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.asJava.AsJavaPackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; -import static org.jetbrains.jet.plugin.caches.resolve.ResolvePackage.getModuleInfo; +import static org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage.getModuleInfo; public class DuplicateJvmSignatureAnnotator implements Annotator { @Override 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 1971def975a..8b75ee5cfab 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 @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.jet.plugin.util.ProjectRootsUtil import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode -import org.jetbrains.jet.plugin.caches.resolve.* +import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.quickfix.QuickFixes import kotlin.platform.platformStatic diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt index 1b992706b2c..91dac12e458 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class OperatorToFunctionIntention : JetSelfTargetingIntention("operator.to.function", javaClass()) { class object { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt index df7cb2c4c1e..594fdf2ec5b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt @@ -34,8 +34,8 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes -import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class RemoveExplicitTypeArguments : JetSelfTargetingIntention( "remove.explicit.type.arguments", javaClass()) { 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 d77da14425c..3a24efce56d 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 @@ -26,7 +26,7 @@ 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.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class KotlinSuppressIntentionAction( private val suppressAt: JetExpression, diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.java similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.java index 030e4868a11..97b9c0f5690 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.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.references; +package org.jetbrains.kotlin.idea.references; import com.google.common.base.Predicates; import com.google.common.collect.Sets; @@ -36,21 +36,21 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; +import org.jetbrains.kotlin.asJava.LightClassUtil; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.context.ContextPackage; import org.jetbrains.kotlin.context.GlobalContextImpl; -import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.di.InjectorForLazyTopDownAnalyzerBasic; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.JetScope; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.utils.UtilsPackage; -import org.jetbrains.kotlin.asJava.LightClassUtil; -import org.jetbrains.kotlin.di.InjectorForLazyTopDownAnalyzerBasic; import java.io.File; import java.net.MalformedURLException; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetArrayAccessReference.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetArrayAccessReference.java index 96889d91d3c..25064420ee8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetArrayAccessReference.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.references; +package org.jetbrains.kotlin.idea.references; import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; @@ -25,11 +25,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetArrayAccessExpression; import org.jetbrains.kotlin.psi.JetContainerNode; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.kt index ed162737085..e4af8106997 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetForLoopInReference.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.references +package org.jetbrains.kotlin.idea.references import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetInvokeFunctionReference.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetInvokeFunctionReference.java index 11c6dd0d67d..0927939eb2d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetInvokeFunctionReference.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.references; +package org.jetbrains.kotlin.idea.references; import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; @@ -23,12 +23,12 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetMultiDeclarationReference.kt similarity index 83% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetMultiDeclarationReference.kt index e46f7f2e734..8f993e09e37 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetMultiDeclarationReference.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,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.references +package org.jetbrains.kotlin.idea.references import org.jetbrains.kotlin.psi.JetMultiDeclaration import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.openapi.util.TextRange -import java.util.Collections -import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.kotlin.resolve.source.PsiSourceElement -import org.jetbrains.kotlin.resolve.source.getPsi import com.intellij.psi.PsiElement import com.intellij.util.IncorrectOperationException -import org.jetbrains.kotlin.psi.JetNamedFunction -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor class JetMultiDeclarationReference(element: JetMultiDeclaration) : JetMultiReference(element) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetPropertyDelegationMethodsReference.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetPropertyDelegationMethodsReference.kt index 342a91f13a0..42c4ec145dd 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetPropertyDelegationMethodsReference.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.references +package org.jetbrains.kotlin.idea.references import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.kt index be79a269fff..de16df05bd9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReference.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.references +package org.jetbrains.kotlin.idea.references import com.intellij.psi.PsiPolyVariantReference import com.intellij.psi.PsiPolyVariantReferenceBase @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.utils.keysToMap -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public trait JetReference : PsiPolyVariantReference { public fun resolveToDescriptors(): Collection diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReferenceContributor.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReferenceContributor.kt index 0c591aca951..22ebb7dde04 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReferenceContributor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetReferenceContributor.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.references +package org.jetbrains.kotlin.idea.references import com.intellij.psi.* import org.jetbrains.kotlin.psi.* diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.kt index 77df737d10f..d2ad8587f38 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetSimpleNameReference.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.references +package org.jetbrains.kotlin.idea.references import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch public class JetSimpleNameReference( diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetThisReference.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetThisReference.java similarity index 91% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetThisReference.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetThisReference.java index d4ee2be304d..73c7ca8dbe2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetThisReference.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetThisReference.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.references; +package org.jetbrains.kotlin.idea.references; import com.intellij.openapi.util.TextRange; import org.jetbrains.kotlin.psi.JetThisReferenceExpression; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.kt index fcd4d5bc462..516955fd135 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/referenceUtil.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.references +package org.jetbrains.kotlin.idea.references import com.intellij.psi.PsiReference import com.intellij.psi.PsiElement diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetAnnotationsIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetAnnotationsIndex.java index 84195fbe271..ca3176940bd 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetAnnotationsIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetClassShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetClassShortNameIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetClassShortNameIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetClassShortNameIndex.java index b1268cdd866..b8030dc7f76 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetClassShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetClassShortNameIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetExactPackagesIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetExactPackagesIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetExactPackagesIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetExactPackagesIndex.java index f20f1ff952e..b7f8ea6d6ec 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetExactPackagesIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetExactPackagesIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFullClassNameIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFullClassNameIndex.java index 630bbd04ab6..9aa2bbd5e3b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFullClassNameIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetFunctionShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFunctionShortNameIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetFunctionShortNameIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFunctionShortNameIndex.java index f2a85237333..0b12d25f68a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetFunctionShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFunctionShortNameIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetProbablyNothingFunctionShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingFunctionShortNameIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetProbablyNothingFunctionShortNameIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingFunctionShortNameIndex.java index 53316bef4b8..4f6a64a74ee 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetProbablyNothingFunctionShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingFunctionShortNameIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetProbablyNothingPropertyShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingPropertyShortNameIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetProbablyNothingPropertyShortNameIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingPropertyShortNameIndex.java index 8eac5014511..b16f235118c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetProbablyNothingPropertyShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingPropertyShortNameIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetPropertyShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetPropertyShortNameIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetPropertyShortNameIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetPropertyShortNameIndex.java index e5f275c2e87..be37dd83695 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetPropertyShortNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetPropertyShortNameIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java index fac219cf931..961b846ee74 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; @@ -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.caches.resolve.JsProjectDetector; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; +import org.jetbrains.kotlin.idea.caches.resolve.JsProjectDetector; public class JetSourceFilterScope extends DelegatingGlobalSearchScope { @NotNull diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSuperClassIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSuperClassIndex.java index 66c7b5f1051..4519a754740 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSuperClassIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelClassByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelClassByPackageIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelClassByPackageIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelClassByPackageIndex.java index 7b671fe21d6..680c1fb2870 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelClassByPackageIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelClassByPackageIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionByPackageIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionByPackageIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionByPackageIndex.java index c26f0f186cf..2c85261bf54 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionByPackageIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionByPackageIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionFqnNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionFqnNameIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionFqnNameIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionFqnNameIndex.java index 2969809cb1e..059f97b9f92 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionFqnNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionFqnNameIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertyByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyByPackageIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertyByPackageIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyByPackageIndex.java index 174e2ed302c..623dc6c21d5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertyByPackageIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyByPackageIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertyFqnNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyFqnNameIndex.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertyFqnNameIndex.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyFqnNameIndex.java index f439349a55a..599684f6109 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertyFqnNameIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyFqnNameIndex.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/KotlinIndexUtil.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinIndexUtil.java similarity index 92% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/KotlinIndexUtil.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinIndexUtil.java index caec696c85a..58bf3df7510 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/KotlinIndexUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinIndexUtil.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.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.psi.PsiElement; import com.intellij.psi.stubs.StubIndexExtension; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt index 8bd158ac309..77c83de0381 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.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.stubindex +package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StubIndexServiceImpl.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StubIndexServiceImpl.java index 153d5d559ad..1a3f8394919 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StubIndexServiceImpl.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.stubindex; +package org.jetbrains.kotlin.idea.stubindex; import com.intellij.psi.stubs.IndexSink; import com.intellij.psi.stubs.StubElement; -import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.kotlin.psi.stubs.*; -import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.stubs.*; +import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService; public class StubIndexServiceImpl implements StubIndexService { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt index 8b575cb967b..7d3781d407f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.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.stubindex +package org.jetbrains.kotlin.idea.stubindex import com.intellij.openapi.project.Project import org.jetbrains.kotlin.name.FqName diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.kt index 572d839ebf2..5ea395f17af 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactory.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.stubindex.resolve +package org.jetbrains.kotlin.idea.stubindex.resolve import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.kotlin.resolve.lazy.declarations.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil +import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil public class PluginDeclarationProviderFactory( private val project: Project, diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactoryService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactoryService.kt similarity index 88% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactoryService.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactoryService.kt index 9b35db13d17..521324c4d87 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactoryService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactoryService.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.stubindex.resolve +package org.jetbrains.kotlin.idea.stubindex.resolve import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope -import org.jetbrains.jet.plugin.caches.resolve.JsProjectDetector +import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope +import org.jetbrains.kotlin.idea.caches.resolve.JsProjectDetector public class PluginDeclarationProviderFactoryService : DeclarationProviderFactoryService() { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt similarity index 85% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt index 30496417cad..1c8af0c3552 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.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.stubindex.resolve +package org.jetbrains.kotlin.idea.stubindex.resolve import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope @@ -22,19 +22,19 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex -import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil +import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex +import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils import java.util.ArrayList import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter -import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionByPackageIndex +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionByPackageIndex import com.intellij.psi.stubs.StringStubIndexExtension -import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertyByPackageIndex -import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertyFqnNameIndex -import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex -import org.jetbrains.jet.plugin.stubindex.JetTopLevelClassByPackageIndex +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelPropertyByPackageIndex +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelPropertyFqnNameIndex +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelClassByPackageIndex public class StubBasedPackageMemberDeclarationProvider( private val fqName: FqName, diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 44991952220..783a1abe285 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -22,7 +22,7 @@ org.jetbrains.jet.plugin.compiler.JetCompilerManager - org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver + org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver org.jetbrains.jet.plugin.versions.OutdatedKotlinRuntimeNotification @@ -134,7 +134,7 @@ + serviceImplementation="org.jetbrains.kotlin.idea.stubindex.StubIndexServiceImpl"/> @@ -151,14 +151,14 @@ - + + serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.IDELightClassGenerationSupport"/> @@ -190,13 +190,13 @@ serviceImplementation="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinEvaluateExpressionCache"/> + serviceImplementation="org.jetbrains.kotlin.idea.stubindex.resolve.PluginDeclarationProviderFactoryService"/> - + - + @@ -205,8 +205,8 @@ - - + + @@ -224,11 +224,11 @@ - + - - + + @@ -284,7 +284,7 @@ - + - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index c3626e33c84..2cd04742363 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -32,7 +32,7 @@ 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.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.asJava.KotlinLightMethod; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt b/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt index fc29970e438..7cc54ce6a18 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt @@ -23,7 +23,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetClassOrObject diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index 7bbca68e380..268a917579b 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java @@ -25,7 +25,7 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.JetLanguage; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt index b33e308a78e..7fcdd469330 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt @@ -45,8 +45,8 @@ import javax.swing.SwingUtilities import org.jetbrains.kotlin.psi.JetNameReferenceExpression import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade -import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.psi.JetContainerNode diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java index 3e77af6fbb7..084f7a2eec5 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.checkers.CheckerTestUtil; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import java.awt.*; import java.awt.datatransfer.Clipboard; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt index 0fe23fb8fb6..e82330fdc88 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt @@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFileVisitor import com.intellij.openapi.progress.ProgressManager import com.intellij.openapi.ui.Messages import javax.swing.SwingUtilities -import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns diff --git a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt b/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt index 180709785dc..8f5db8daafb 100644 --- a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt +++ b/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt @@ -25,7 +25,7 @@ import com.intellij.coverage.CoverageSuitesBundle import java.io.File import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.idea.debugger.JetPositionManager -import org.jetbrains.jet.plugin.caches.resolve.getModuleInfo +import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.openapi.roots.ProjectRootManager import org.jetbrains.kotlin.psi.JetTreeVisitorVoid diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index e37970833db..745963f166d 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -36,9 +36,9 @@ 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.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper; -import org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex; +import org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java index 9a96a2c5518..ecdccfc34b1 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java @@ -42,7 +42,7 @@ 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.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java index b6e4c654ca9..2051705af4a 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java @@ -26,7 +26,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.asJava.KotlinLightMethod; import java.util.ArrayList; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index 9e5056b92a5..dacae681bf9 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java @@ -36,9 +36,9 @@ import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; -import org.jetbrains.jet.plugin.references.JetReference; +import org.jetbrains.kotlin.idea.references.JetReference; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchPackage; import org.jetbrains.kotlin.asJava.LightClassUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt index 9e1e225221d..4d620527672 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt @@ -24,7 +24,7 @@ import com.intellij.psi.PsiFile import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.name.* -import org.jetbrains.jet.plugin.references.JetReference +import org.jetbrains.kotlin.idea.references.JetReference import java.util.HashSet import java.util.ArrayList import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper diff --git a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java index b2f56e53ef5..bcdbdbcd79f 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java @@ -43,7 +43,7 @@ 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.jet.plugin.caches.resolve.ResolvePackage; +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; diff --git a/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt b/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt index 7f8a8fe8b88..beb063a4c24 100644 --- a/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt +++ b/idea/src/org/jetbrains/jet/plugin/j2k/IdeaResolverForConverter.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.j2k import org.jetbrains.kotlin.j2k.ResolverForConverter import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor public object IdeaResolverForConverter : ResolverForConverter { override fun resolveToDescriptor(declaration: JetDeclaration) = declaration.resolveToDescriptor() diff --git a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt index 53a88d03eb7..08d14f0e981 100644 --- a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.j2k.PostProcessor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments -import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import java.util.ArrayList import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java index b9172d62e36..5a1fe3b4fb7 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java @@ -34,7 +34,7 @@ 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.jet.plugin.caches.resolve.JavaResolveExtension; +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; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java index cc6d9bbb12e..91da0a0cd01 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -47,7 +47,7 @@ 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.jet.plugin.caches.resolve.JavaResolveExtension; +import org.jetbrains.kotlin.idea.caches.resolve.JavaResolveExtension; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.jet.plugin.util.attachment.AttachmentPackage; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java index 2c0c13755a8..75909687083 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java @@ -32,7 +32,7 @@ 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.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ImplementMethodsHandler; import java.util.HashMap; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java index 0ad3324b1b2..8d96d92db69 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java @@ -29,7 +29,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiNamedElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +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; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java index 163f2863e78..4ef90612706 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java @@ -30,7 +30,7 @@ import com.intellij.psi.PsiNamedElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +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; diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java index 7643de89d37..a009640df3e 100644 --- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java @@ -33,8 +33,8 @@ import com.intellij.util.ArrayUtil; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +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.codeInsight.ReferenceVariantsHelper; diff --git a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java index b8f7f1986c3..b75c9148cf5 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java @@ -20,8 +20,8 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.plugin.stubindex.JetExactPackagesIndex; -import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; +import org.jetbrains.kotlin.idea.stubindex.JetExactPackagesIndex; +import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index 6458c4391f3..513e13abcb7 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java @@ -41,8 +41,8 @@ import kotlin.KotlinPackage; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex; +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; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java index 278909716f8..151f46d22c6 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java @@ -30,8 +30,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java index 13042855add..d77e0f758e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java @@ -41,8 +41,8 @@ import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.stubindex.JetAnnotationsIndex; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.stubindex.JetAnnotationsIndex; import org.jetbrains.kotlin.asJava.LightClassUtil; import java.util.ArrayList; diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt index d0b47f2ee85..11ec1a707e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt @@ -23,9 +23,9 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.DirectClassInheritorsSearch import com.intellij.util.Processor import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper -import org.jetbrains.jet.plugin.stubindex.JetSuperClassIndex +import org.jetbrains.kotlin.idea.stubindex.JetSuperClassIndex import org.jetbrains.jet.plugin.search.fileScope -import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope +import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope public open class KotlinDirectInheritorsSearcher() : QueryExecutorBase(true) { public override fun processQuery(queryParameters: DirectClassInheritorsSearch.SearchParameters, consumer: Processor) { diff --git a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java b/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java index acc4dd8b349..96c3bef6e6c 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.idea.debugger.DebuggerPackage; import java.util.Collection; -import static org.jetbrains.jet.plugin.stubindex.PackageIndexUtil.findFilesWithExactPackage; +import static org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil.findFilesWithExactPackage; public class DebuggerUtils { private DebuggerUtils() { diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java b/idea/src/org/jetbrains/kotlin/idea/caches/JetGotoClassContributor.java similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java rename to idea/src/org/jetbrains/kotlin/idea/caches/JetGotoClassContributor.java index c357a154ffb..4b38a9718cb 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java +++ b/idea/src/org/jetbrains/kotlin/idea/caches/JetGotoClassContributor.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.caches; +package org.jetbrains.kotlin.idea.caches; import com.intellij.navigation.GotoClassContributor; import com.intellij.navigation.NavigationItem; @@ -22,12 +22,12 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex; +import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetEnumEntry; import org.jetbrains.kotlin.psi.JetNamedDeclaration; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoSymbolContributor.java b/idea/src/org/jetbrains/kotlin/idea/caches/JetGotoSymbolContributor.java similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/caches/JetGotoSymbolContributor.java rename to idea/src/org/jetbrains/kotlin/idea/caches/JetGotoSymbolContributor.java index 0b1cdf1542d..8abde9972a0 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoSymbolContributor.java +++ b/idea/src/org/jetbrains/kotlin/idea/caches/JetGotoSymbolContributor.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.caches; +package org.jetbrains.kotlin.idea.caches; import com.google.common.base.Predicates; import com.google.common.collect.Collections2; @@ -25,9 +25,9 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.StubIndex; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.stubindex.JetFunctionShortNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetPropertyShortNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; +import org.jetbrains.kotlin.idea.stubindex.JetFunctionShortNameIndex; +import org.jetbrains.kotlin.idea.stubindex.JetPropertyShortNameIndex; +import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/kotlin/idea/caches/KotlinIndicesHelper.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt rename to idea/src/org/jetbrains/kotlin/idea/caches/KotlinIndicesHelper.kt index a1df134e95e..42caef2b31d 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/caches/KotlinIndicesHelper.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,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.caches +package org.jetbrains.kotlin.idea.caches import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.plugin.stubindex.* import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* @@ -32,12 +31,13 @@ import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver.LookupMode import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import com.intellij.psi.stubs.StringStubIndexExtension -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.util.substituteExtensionIfCallable import org.jetbrains.kotlin.idea.util.CallType import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.jetbrains.kotlin.idea.util.getImplicitReceiversWithInstance +import org.jetbrains.kotlin.idea.stubindex.* public class KotlinIndicesHelper( private val project: Project, diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.java index 5f1786af302..bcf798d53f5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.java @@ -32,10 +32,10 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.OverrideResolver; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetFunctionPsiElementCellRenderer.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetFunctionPsiElementCellRenderer.java index 5fd92ecc0c7..169b5b84d06 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetFunctionPsiElementCellRenderer.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetFunctionPsiElementCellRenderer.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.ide.util.DefaultPsiElementCellRenderer; import com.intellij.psi.PsiElement; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetTypeDeclarationProvider.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetTypeDeclarationProvider.java index a74305413b8..1540574a657 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetTypeDeclarationProvider.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetTypeDeclarationProvider.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.codeInsight.navigation.actions.TypeDeclarationProvider; import com.intellij.psi.PsiElement; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 0fc4cf07f51..4288c822562 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -35,7 +35,7 @@ import com.intellij.openapi.application.ApplicationManager import java.awt.datatransfer.Transferable import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.editorActions.CopyPastePostProcessor -import org.jetbrains.jet.plugin.references.JetReference +import org.jetbrains.kotlin.idea.references.JetReference import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.openapi.util.TextRange import java.util.Collections @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.psi.JetImportDirective import org.jetbrains.kotlin.psi.JetPackageDirective -import org.jetbrains.jet.plugin.references.JetMultiReference +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 diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java index d35ff77947f..78830894d37 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementMethodsHandler.java @@ -31,9 +31,9 @@ import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.quickfix.QuickfixPackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/KotlinSurrounderUtils.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/KotlinSurrounderUtils.java index 60eef3c221e..23c72924283 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/KotlinSurrounderUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/KotlinSurrounderUtils.java @@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; import org.jetbrains.kotlin.psi.JetBlockExpression; import org.jetbrains.kotlin.psi.JetExpression; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java index df8ce15fefc..15f04d88766 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java @@ -25,8 +25,8 @@ import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt index ee692ed4e96..0c6564136f4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.jet.plugin.caches.resolve.analyzeFully +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.checker.JetTypeChecker diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt index 6b975dff1fc..6ab4209950f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt @@ -22,11 +22,11 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.project.ProjectStructureUtil -import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper +import org.jetbrains.kotlin.idea.caches.KotlinIndicesHelper import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.descriptors.ModuleDescriptor class AllClassesCompletion(val parameters: CompletionParameters, diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt index 06ce64b2eaf..3345c0f2274 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt @@ -23,11 +23,11 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.caches.resolve.* +import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper import org.jetbrains.kotlin.idea.completion.smart.SmartCompletion -import org.jetbrains.jet.plugin.references.JetSimpleNameReference -import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference +import org.jetbrains.kotlin.idea.caches.KotlinIndicesHelper import com.intellij.openapi.project.Project import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.openapi.vfs.VirtualFile diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt b/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt index 0078646ca2c..c2e16abfa1a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.completion import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade /** * Stores information about resolved descriptor and position of that descriptor. diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.kt b/idea/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.kt index 53e4789960b..76c7bb6bf4f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.kt @@ -66,7 +66,7 @@ import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt index 47caabf2bb3..e643394bcff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt @@ -57,7 +57,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode public class KotlinCompletionContributor : CompletionContributor() { diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt index 95ecce5d1dd..18d3f1e8753 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.asJava.KotlinLightClass import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import com.intellij.codeInsight.lookup.DefaultLookupItemRenderer import org.jetbrains.kotlin.types.TypeUtils import com.intellij.codeInsight.lookup.impl.LookupCellRenderer diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt index 2321be35c60..569460afdfc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt @@ -29,7 +29,7 @@ import com.intellij.codeInsight.completion.CompletionResultSet import org.jetbrains.kotlin.descriptors.FunctionDescriptor import com.intellij.openapi.util.TextRange import com.intellij.codeInsight.completion.CompletionParameters -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade class LookupElementsCollector( private val prefixMatcher: PrefixMatcher, diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt index 3d5cf3c23bb..3d544e301d0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.completion import org.jetbrains.kotlin.psi.JetValueArgument import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetCallElement -import org.jetbrains.jet.plugin.references.JetReference +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 diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/PackageDirectiveCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/PackageDirectiveCompletion.kt index d1f77e11863..0d7f774ea5e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/PackageDirectiveCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/PackageDirectiveCompletion.kt @@ -21,9 +21,9 @@ import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.patterns.PlatformPatterns import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetPackageDirective -import org.jetbrains.jet.plugin.caches.resolve.* +import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper -import org.jetbrains.jet.plugin.references.JetSimpleNameReference +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference /** * Performs completion in package directive. Should suggest only packages and avoid showing fake package produced by 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 cb934cfb3fd..766d7c92d85 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt @@ -36,7 +36,7 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.idea.completion.ExpectedInfos import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.jet.plugin.util.application.runWriteAction import org.jetbrains.kotlin.idea.refactoring.EmptyValidator import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt index 7f6e60bf9ae..a43fd13dc89 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.idea.completion.qualifiedNameForSourceCode import com.intellij.psi.PsiClass import org.jetbrains.kotlin.psi.JetNameReferenceExpression -import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.idea.completion.isAfterDot diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt index d4b51b1e771..a907d6d22d8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt @@ -30,12 +30,12 @@ import org.jetbrains.kotlin.idea.util.makeNotNullable import org.jetbrains.kotlin.idea.util.makeNullable import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf import org.jetbrains.kotlin.idea.util.FuzzyType import org.jetbrains.kotlin.idea.util.fuzzyReturnType -import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression trait InheritanceItemsSearcher { diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt index 6c71e2ded88..a64d26bf393 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.completion.ExpectedInfo import org.jetbrains.kotlin.idea.completion.qualifiedNameForSourceCode import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.completion.LookupElementFactory import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.idea.util.fuzzyReturnType diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt index 57331e821cd..4f91e1cd251 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope @@ -46,7 +46,7 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch import org.jetbrains.kotlin.asJava.KotlinLightClass import org.jetbrains.kotlin.types.TypeProjection import org.jetbrains.kotlin.utils.addIfNotNull -import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension +import org.jetbrains.kotlin.idea.caches.resolve.JavaResolveExtension import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.psi.JetClassOrObject @@ -61,7 +61,7 @@ import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf -import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration +import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration class TypeInstantiationItems( val resolutionFacade: ResolutionFacade, diff --git a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt index de447ef6558..2ffaf781c20 100644 --- a/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import com.intellij.openapi.util.Key import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.types.TypeSubstitutor import java.util.ArrayList import java.util.HashMap diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt index 675aa011835..13880589b1c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt @@ -47,14 +47,14 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.builtins.InlineUtil -import org.jetbrains.jet.plugin.caches.resolve.* +import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.jet.plugin.util.DebuggerUtils import java.util.* import org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass -import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil +import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil import org.jetbrains.jet.plugin.util.application.runReadAction public class JetPositionManager(private val myDebugProcess: DebugProcess) : PositionManager { diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt index 168793c56b5..0d1a06f5075 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt @@ -39,7 +39,7 @@ 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.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() { diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt index 62f6511b3c3..53e6733edaf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt @@ -36,7 +36,7 @@ import com.intellij.debugger.ui.tree.FieldDescriptor import com.intellij.debugger.ui.tree.LocalVariableDescriptor import com.intellij.debugger.impl.PositionUtil import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt index 85c8fac5422..cdecca37088 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -37,7 +37,7 @@ import com.intellij.openapi.roots.JdkOrderEntry import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.descriptorUtil.module -import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor private val LOG = Logger.getInstance("org.jetbrains.kotlin.idea.debugger") 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 3bf677281af..d8b1217f9f5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -44,7 +44,7 @@ import org.jetbrains.eval4j.jdi.asValue import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.codegen.ClassFileFactory import org.jetbrains.kotlin.backend.common.output.OutputFileCollection -import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode import com.intellij.openapi.diagnostic.Logger @@ -66,7 +66,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import com.intellij.psi.JavaPsiFacade import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension +import org.jetbrains.kotlin.idea.caches.resolve.JavaResolveExtension import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import com.intellij.openapi.project.Project import org.jetbrains.kotlin.resolve.DescriptorUtils diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt index 89d23f4fa34..75e14566d0b 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.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.findUsages +package org.jetbrains.kotlin.idea.findUsages import com.intellij.psi.ElementDescriptionLocation import com.intellij.psi.ElementDescriptionProvider diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetImportFilteringRule.kt similarity index 84% rename from idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/JetImportFilteringRule.kt index 390e63c2059..f272322eb83 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetImportFilteringRule.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetImportFilteringRule.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,14 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.findUsages +package org.jetbrains.kotlin.idea.findUsages -import com.intellij.psi.PsiElement -import com.intellij.psi.util.PsiTreeUtil import com.intellij.usages.Usage import com.intellij.usages.rules.ImportFilteringRule import com.intellij.usages.rules.PsiElementUsage -import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetImportDirective import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt index 8ca94242e18..2f00e03c519 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.findUsages +package org.jetbrains.kotlin.idea.findUsages import com.intellij.psi.PsiElement import com.intellij.usages.UsageTarget import com.intellij.usages.impl.rules.UsageType import com.intellij.usages.impl.rules.UsageTypeProviderEx import org.jetbrains.kotlin.idea.JetBundle -import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum.* +import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum.* public object JetUsageTypeProvider : UsageTypeProviderEx { public override fun getUsageType(element: PsiElement?): UsageType? { diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinDeclarationGroupRuleProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/findUsages/KotlinDeclarationGroupRuleProvider.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.kt index 6b49d9e211f..bc9eb472f30 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinDeclarationGroupRuleProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinDeclarationGroupRuleProvider.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.findUsages +package org.jetbrains.kotlin.idea.findUsages import com.intellij.usages.rules.PsiElementUsage import com.intellij.usages.UsageGroup @@ -26,7 +26,6 @@ import com.intellij.usages.PsiNamedElementUsageGroupBase import org.jetbrains.kotlin.psi.JetFile import com.intellij.usages.impl.FileStructureGroupRuleProvider import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.psi.JetNamedFunction public class KotlinDeclarationGroupRuleProvider : FileStructureGroupRuleProvider { public class KotlinDeclarationGroupingRule : UsageGroupingRule { diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindUsagesHandlerFactory.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt similarity index 85% rename from idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindUsagesHandlerFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.kt index 4f15fa1fd54..bfb450cecff 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/KotlinFindUsagesHandlerFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesHandlerFactory.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,27 +14,25 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.findUsages +package org.jetbrains.kotlin.idea.findUsages import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.find.findUsages.FindUsagesHandlerFactory import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetNamedFunction -import org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindClassUsagesHandler -import org.jetbrains.jet.plugin.findUsages.handlers.KotlinFindMemberUsagesHandler +import org.jetbrains.kotlin.idea.findUsages.handlers.KotlinFindClassUsagesHandler +import org.jetbrains.kotlin.idea.findUsages.handlers.KotlinFindMemberUsagesHandler import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil import org.jetbrains.kotlin.psi.JetProperty import com.intellij.find.findUsages.FindUsagesOptions import org.jetbrains.kotlin.psi.JetTypeParameter -import org.jetbrains.jet.plugin.findUsages.handlers.KotlinTypeParameterFindUsagesHandler +import org.jetbrains.kotlin.idea.findUsages.handlers.KotlinTypeParameterFindUsagesHandler import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.psi.JetClassOrObject -import com.intellij.find.findUsages.FindUsagesManager import com.intellij.find.findUsages.JavaFindUsagesHandlerFactory -import com.intellij.psi.PsiMethod -import org.jetbrains.jet.plugin.findUsages.handlers.DelegatingFindMemberUsagesHandler +import org.jetbrains.kotlin.idea.findUsages.handlers.DelegatingFindMemberUsagesHandler public class KotlinFindUsagesHandlerFactory(project: Project) : FindUsagesHandlerFactory() { val javaHandlerFactory = JavaFindUsagesHandlerFactory(project) diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java rename to idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java index 267299ce7ad..d88847f1cd1 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindClassUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.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.findUsages.dialogs; +package org.jetbrains.kotlin.idea.findUsages.dialogs; import com.intellij.find.FindBundle; import com.intellij.find.findUsages.FindClassUsagesDialog; @@ -26,10 +26,10 @@ import com.intellij.psi.PsiClass; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.StateRestoringCheckBox; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions; +import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java rename to idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java index 638fccefd32..61caf22cb5d 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.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.findUsages.dialogs; +package org.jetbrains.kotlin.idea.findUsages.dialogs; import com.intellij.find.FindBundle; import com.intellij.find.FindSettings; @@ -24,9 +24,9 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiMethod; import com.intellij.ui.SimpleColoredComponent; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions; -import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions; +import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java rename to idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java index 228359da7d3..e180048c0a1 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.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.findUsages.dialogs; +package org.jetbrains.kotlin.idea.findUsages.dialogs; import com.intellij.find.FindBundle; import com.intellij.find.FindSettings; @@ -26,8 +26,8 @@ import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.StateRestoringCheckBox; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetNamedDeclaration; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java rename to idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java index 8d25d24a273..8ee489a29b1 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinTypeParameterFindUsagesDialog.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.findUsages.dialogs; +package org.jetbrains.kotlin.idea.findUsages.dialogs; import com.intellij.find.findUsages.CommonFindUsagesDialog; import com.intellij.find.findUsages.FindUsagesHandler; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java rename to idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java index 5cff29c3bc9..f028e73ec34 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/dialogs/Utils.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.findUsages.dialogs; +package org.jetbrains.kotlin.idea.findUsages.dialogs; import com.intellij.ui.SimpleColoredComponent; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchPackage; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/findUsagesOptions.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/findUsagesOptions.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/findUsages/findUsagesOptions.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/findUsagesOptions.kt index 06303c65f97..db031c979c7 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/findUsagesOptions.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/findUsagesOptions.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.findUsages +package org.jetbrains.kotlin.idea.findUsages import com.intellij.find.findUsages.JavaMethodFindUsagesOptions import com.intellij.openapi.project.Project @@ -25,12 +25,9 @@ import com.intellij.psi.PsiNamedElement import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchLocation import com.intellij.find.findUsages.FindUsagesOptions import org.jetbrains.jet.plugin.search.usagesSearch.PropertyUsagesSearchHelper -import com.intellij.find.findUsages.JavaFindUsagesOptions import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.plugin.search.usagesSearch.ClassDeclarationsUsagesSearchHelper import org.jetbrains.jet.plugin.search.usagesSearch.FunctionUsagesSearchHelper -import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchHelper -import kotlin.test.fail import com.intellij.find.findUsages.JavaVariableFindUsagesOptions public class KotlinClassFindUsagesOptions(project: Project) : JavaClassFindUsagesOptions(project) { diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt index 71d8a7fca2d..5c63c7b65d7 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/DelegatingFindMemberUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/DelegatingFindMemberUsagesHandler.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,21 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.findUsages.handlers +package org.jetbrains.kotlin.idea.findUsages.handlers import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.psi.PsiElement import com.intellij.usageView.UsageInfo import com.intellij.util.Processor import com.intellij.find.findUsages.FindUsagesOptions -import org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory +import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory import kotlin.properties.Delegates import org.jetbrains.kotlin.psi.JetNamedDeclaration import com.intellij.psi.PsiMethod import com.intellij.find.findUsages.JavaFindUsagesHandler -import com.intellij.find.findUsages.JavaMethodFindUsagesOptions -import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions -import org.jetbrains.jet.plugin.findUsages.toJavaMethodOptions +import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions +import org.jetbrains.kotlin.idea.findUsages.toJavaMethodOptions import com.intellij.openapi.actionSystem.DataContext class DelegatingFindMemberUsagesHandler( diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt index 84d4bf17f5b..8baa681b938 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.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.findUsages.handlers +package org.jetbrains.kotlin.idea.findUsages.handlers import com.intellij.find.findUsages.AbstractFindUsagesDialog import com.intellij.find.findUsages.FindUsagesOptions @@ -27,14 +27,14 @@ import com.intellij.usageView.UsageInfo import com.intellij.util.Processor import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.psi.JetClassOrObject -import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions -import org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory -import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinFindClassUsagesDialog +import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions +import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory +import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinFindClassUsagesDialog import org.jetbrains.jet.plugin.search.declarationsSearch.HierarchySearchRequest import org.jetbrains.jet.plugin.search.declarationsSearch.searchInheritors -import org.jetbrains.jet.plugin.findUsages.toSearchTarget -import org.jetbrains.jet.plugin.findUsages.toClassHelper -import org.jetbrains.jet.plugin.findUsages.toClassDeclarationsHelper +import org.jetbrains.kotlin.idea.findUsages.toSearchTarget +import org.jetbrains.kotlin.idea.findUsages.toClassHelper +import org.jetbrains.kotlin.idea.findUsages.toClassDeclarationsHelper import org.jetbrains.jet.plugin.search.usagesSearch.search import org.jetbrains.jet.plugin.util.application.runReadAction import java.util.Collections diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java rename to idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.java index 79e8a594535..66821323cdf 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindMemberUsagesHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.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.findUsages.handlers; +package org.jetbrains.kotlin.idea.findUsages.handlers; import com.intellij.find.findUsages.AbstractFindUsagesDialog; import com.intellij.find.findUsages.FindUsagesOptions; @@ -30,19 +30,19 @@ import com.intellij.usageView.UsageInfo; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.psi.JetNamedDeclaration; -import org.jetbrains.kotlin.psi.JetNamedFunction; -import org.jetbrains.kotlin.psi.JetParameter; -import org.jetbrains.kotlin.psi.JetProperty; -import org.jetbrains.jet.plugin.findUsages.*; -import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinFindFunctionUsagesDialog; -import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinFindPropertyUsagesDialog; import org.jetbrains.jet.plugin.search.declarationsSearch.DeclarationsSearchPackage; import org.jetbrains.jet.plugin.search.declarationsSearch.HierarchySearchRequest; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearch; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchHelper; import org.jetbrains.jet.plugin.search.usagesSearch.UsagesSearchRequest; import org.jetbrains.kotlin.asJava.LightClassUtil; +import org.jetbrains.kotlin.idea.findUsages.*; +import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinFindFunctionUsagesDialog; +import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinFindPropertyUsagesDialog; +import org.jetbrains.kotlin.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.psi.JetProperty; import java.util.Collection; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindUsagesHandler.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindUsagesHandler.java rename to idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.java index 4280a1efb04..70623dfe233 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindUsagesHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.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.findUsages.handlers; +package org.jetbrains.kotlin.idea.findUsages.handlers; import com.intellij.find.findUsages.FindUsagesHandler; import com.intellij.find.findUsages.FindUsagesOptions; @@ -26,7 +26,7 @@ import com.intellij.psi.search.SearchScope; import com.intellij.usageView.UsageInfo; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory; +import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory; import java.util.Collection; import java.util.Collections; diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt similarity index 87% rename from idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt index 11b5340d8fb..5f6f9ec9fba 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.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.findUsages.handlers +package org.jetbrains.kotlin.idea.findUsages.handlers import com.intellij.find.findUsages.AbstractFindUsagesDialog import com.intellij.find.findUsages.FindUsagesOptions @@ -23,10 +23,10 @@ import com.intellij.psi.PsiElement import com.intellij.usageView.UsageInfo import com.intellij.util.Processor import org.jetbrains.kotlin.psi.JetNamedDeclaration -import org.jetbrains.jet.plugin.findUsages.KotlinFindUsagesHandlerFactory -import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinTypeParameterFindUsagesDialog +import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory +import org.jetbrains.kotlin.idea.findUsages.dialogs.KotlinTypeParameterFindUsagesDialog import org.jetbrains.jet.plugin.search.usagesSearch.DefaultSearchHelper -import org.jetbrains.jet.plugin.findUsages.toSearchTarget +import org.jetbrains.kotlin.idea.findUsages.toSearchTarget import org.jetbrains.jet.plugin.search.usagesSearch.search import org.jetbrains.jet.plugin.util.application.runReadAction diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt index 9d13f53fa95..bcbf71a78f0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt @@ -36,7 +36,7 @@ import java.util.ArrayList import com.intellij.util.Function import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze object SuperDeclarationMarkerTooltip: Function { override fun `fun`(jetDeclaration: JetDeclaration?): String? { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt index a50c4808f3a..ac823c359af 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.kotlin.psi.psiUtil.replaced -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention( "convert.assert.to.if.with.throw", javaClass()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt index f20a79c2a96..f7c42f56298 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isNullExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class ConvertIfWithThrowToAssertIntention : JetSelfTargetingIntention("convert.if.with.throw.to.assert", javaClass()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt index d8ec0f5359e..b18ec5f7fff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetBlockExpression -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class ConvertToConcatenatedStringIntention : JetSelfTargetingIntention("convert.to.concatenated.string.intention", javaClass()) { override fun isApplicableTo(element: JetStringTemplateExpression): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt index f6430f399a0..8e940c49fd7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ConvertToExpressionBodyAction : PsiElementBaseIntentionAction() { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachLoopIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachLoopIntention.kt index be5c1bef56d..0af08cacda7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachLoopIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachLoopIntention.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class ConvertToForEachLoopIntention : JetSelfTargetingIntention("convert.to.for.each.loop.intention", javaClass()) { private fun getFunctionLiteralArgument(element: JetExpression): JetFunctionLiteralExpression? { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt index a1519840ee2..ac05b85fc98 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.util.PsiUtilCore import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class ConvertToStringTemplateIntention : JetSelfTargetingIntention("convert.to.string.template", javaClass()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt index dd2ce2748aa..910891b1166 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.JetTypeArgumentList import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class InsertExplicitTypeArguments : JetSelfTargetingIntention( "insert.explicit.type.arguments", javaClass()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt index d5eee809dea..d975d523e03 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiWhiteSpace import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class MakeTypeExplicitInLambdaIntention : JetSelfTargetingIntention( "make.type.explicit.in.lambda", javaClass()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt index da7999ddf7b..b78ef648f1d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt @@ -19,7 +19,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.jet.plugin.caches.resolve.analyzeFully +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully public class MoveLambdaInsideParenthesesIntention : JetSelfTargetingIntention( "move.lambda.inside.parentheses", javaClass()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java b/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java index 197b10b0f0a..3d8880d17fa 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java @@ -22,8 +22,8 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt index 31078ca314c..ea86e612953 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.idea.JetBundle import com.intellij.psi.codeStyle.CodeStyleManager import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor -import org.jetbrains.jet.plugin.references.JetReference +import org.jetbrains.kotlin.idea.references.JetReference import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt index 2b5ff5acff7..642e0f47a1b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt @@ -29,9 +29,9 @@ import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.psi.JetFunctionLiteral -import org.jetbrains.jet.plugin.references.JetReference +import org.jetbrains.kotlin.idea.references.JetReference import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ReplaceItWithExplicitFunctionLiteralParamIntention() : PsiElementBaseIntentionAction() { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithInfixFunctionCallIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithInfixFunctionCallIntention.kt index 23f0dab3976..8339445cbc4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithInfixFunctionCallIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithInfixFunctionCallIntention.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetCallExpression import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetDotQualifiedExpression -import org.jetbrains.jet.plugin.caches.resolve.analyzeFully +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.psi.JetValueArgument @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetPsiUnparsingUtils import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.codeInsight.hint.HintManager import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public open class ReplaceWithInfixFunctionCallIntention : JetSelfTargetingIntention("replace.with.infix.function.call.intention", javaClass()) { override fun isApplicableTo(element: JetCallExpression): Boolean { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt index 3e147bbb1df..37a77a8cc2d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt @@ -25,7 +25,7 @@ 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.jet.plugin.caches.resolve.analyze +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/SimplifyBooleanWithConstantsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt index ad1269abfe1..ec7bed9c430 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt @@ -28,7 +28,7 @@ import com.intellij.psi.tree.IElementType import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.psiUtil.copied import org.jetbrains.kotlin.psi.psiUtil.replaced -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingIntention( "simplify.boolean.with.constants", javaClass()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java index fc087bdd8da..0af61475d42 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java @@ -30,12 +30,12 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt index 140d2d263cd..566adeb230c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences import org.jetbrains.kotlin.JetNodeTypes import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze fun specifyTypeExplicitly(declaration: JetNamedFunction, typeText: String) { specifyTypeExplicitly(declaration, JetPsiFactory(declaration).createType(typeText)) 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 423e65bf8fb..742206d3f87 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt @@ -32,7 +32,7 @@ import org.jetbrains.jet.plugin.util.MaybeError import org.jetbrains.jet.plugin.util.MaybeValue import com.intellij.codeInsight.hint.HintManager import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze // Internal because you shouldn't construct this manually. You can end up with an inconsistant CallDescription. public class CallDescription internal ( diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt index 7bff7053f11..3b16c746068 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsStatement import org.jetbrains.kotlin.psi.JetProperty -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze val NULL_PTR_EXCEPTION = "NullPointerException" val NULL_PTR_EXCEPTION_FQ = "java.lang.NullPointerException" diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.java b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.java index c781084b6e9..de6481137da 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.java @@ -31,10 +31,10 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; 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/intentions/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java index c81f8eb6a7a..65152c95c75 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.declarations; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java index ceffbf46611..bed815642f4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java @@ -24,11 +24,11 @@ import com.intellij.psi.PsiReference; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.JetNameValidator; import org.jetbrains.kotlin.idea.refactoring.SimpleCollectingValidator; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureConfiguration; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java index f5218b3af8d..c222f5ad4dc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java @@ -25,11 +25,11 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedFunction; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java index 6bfec927256..02d37d774e5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java @@ -31,11 +31,11 @@ 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.jet.plugin.caches.resolve.ResolvePackage; 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.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetCallElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java index 7b0453af7ad..bd29dfe45ab 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java @@ -23,11 +23,11 @@ import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.PluginJetFilesProvider; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.*; import java.util.Collection; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt index 53e61f746bc..faee5ae6f45 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt @@ -37,9 +37,9 @@ import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.jet.plugin.actions.JetAddImportAction -import org.jetbrains.jet.plugin.caches.JetShortNamesCache -import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper -import org.jetbrains.jet.plugin.caches.resolve.* +import org.jetbrains.kotlin.idea.caches.JetShortNamesCache +import org.jetbrains.kotlin.idea.caches.KotlinIndicesHelper +import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.jet.plugin.project.ProjectStructureUtil import org.jetbrains.jet.plugin.util.JetPsiHeuristicsUtil import java.util.ArrayList diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java index a3d2215859b..c130d391ad8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java @@ -23,11 +23,11 @@ import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java index 6a2015a8221..d393b00f96f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -24,12 +24,12 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java index 1c711f31926..98a03639b24 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java @@ -20,9 +20,9 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester; import org.jetbrains.kotlin.idea.refactoring.JetNameValidator; import org.jetbrains.kotlin.idea.refactoring.SimpleCollectingValidator; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java index e7c089b2701..00e0a7af151 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java @@ -25,12 +25,12 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java index f39576f5599..c7a6d313007 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java @@ -23,7 +23,6 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; @@ -34,6 +33,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.JetNameSuggester; import org.jetbrains.kotlin.idea.refactoring.JetNameValidator; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java index f9fc936834b..89a9c3c5648 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java @@ -36,10 +36,10 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.name.Name; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToConstructorInvocationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToConstructorInvocationFix.java index ea1b6e45108..1b8ce014eb4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToConstructorInvocationFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToConstructorInvocationFix.java @@ -21,12 +21,12 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.java index f4ffb73f84d..5d3c02701fd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.java @@ -24,9 +24,9 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java index 4781b626739..849a8c31ba1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java @@ -25,12 +25,12 @@ import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java index 99bde466876..897a173353b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java @@ -23,13 +23,13 @@ import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.java index 95a54d6b480..988695ba0a3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.java @@ -27,11 +27,11 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetCallableDeclaration; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java index 8ad0b60b894..b4d024a2a9e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java @@ -29,13 +29,13 @@ import com.intellij.refactoring.rename.inplace.MyLookupExpression; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetBundle; +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; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java index c3c68fc7758..fe0cdc500ff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java @@ -22,13 +22,13 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +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/kotlin/idea/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixUtil.java index 1380472eede..7a3c27d7367 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixUtil.java @@ -27,13 +27,13 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; +import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.UtilPackage; import org.jetbrains.kotlin.name.FqName; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java index 935160bff16..3da4f05c56d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java @@ -20,10 +20,10 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureConfiguration; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureData; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java index 5e4cfeb2f55..533800fdf8a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java @@ -24,11 +24,11 @@ import com.intellij.refactoring.rename.RenameProcessor; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.resolve.BindingContext; 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 f637d751de8..cbb1308ff49 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 @@ -44,7 +44,7 @@ import java.util.Collections import java.util.HashMap import java.util.ArrayList import java.util.Properties -import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.idea.refactoring.EmptyValidator import org.jetbrains.kotlin.idea.refactoring.CollectingValidator diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt index 276f80dc747..abde7cccc51 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetVariableDeclaration import org.jetbrains.kotlin.psi.JetNamedDeclaration import com.intellij.refactoring.psi.SearchUtils -import org.jetbrains.jet.plugin.references.JetSimpleNameReference +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference import java.util.HashSet import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.TypeUtils diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt index 25e2ece0433..3fd4118463a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetCallElement import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression import java.util.Collections -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public object CreateClassFromCallWithConstructorCalleeActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt index 6f5cf63eb7d..58614ce2661 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory -import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetAnnotationEntry import java.util.Collections diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt index 4dd0d444922..fb7093419c0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetImportDirective -import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.resolve.calls.callUtil.getCall import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.resolve.BindingContext diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt index fbb592b7e96..b988eae22e7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public object CreateClassFromTypeReferenceActionFactory: JetIntentionActionsFactory() { override fun doCreateActions(diagnostic: Diagnostic): List { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt index 89ab98a24e6..ced58951414 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetTypeReference import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetAnnotationEntry -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze object CreateFunctionOrPropertyFromCallActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt index 62ecf07fbb5..2355505fdd5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.caches.resolve.analyzeFully +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.types.TypeProjectionImpl import java.util.Collections import org.jetbrains.kotlin.types.JetTypeImpl diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt index 058f90b4b42..208d7284f9b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.CallableInfo import com.intellij.util.SmartList import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze object CreatePropertyDelegateAccessorsActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt index 22e450062f1..14c479cadd2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.types.ErrorUtils -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze object CreateSetFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt index 1cbb57f1150..03f976e86a3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess -import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull object CreateParameterActionFactory: JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt index 4a36aa7805d..2926aa9d318 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.kotlin.builtins.KotlinBuiltIns diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameSuggester.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameSuggester.java index dc5ed23057b..547c0693673 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameSuggester.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameSuggester.java @@ -21,10 +21,10 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.lexer.JetLexer; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.Name; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameValidatorImpl.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameValidatorImpl.java index 5c56f263d18..382fca1383b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameValidatorImpl.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetNameValidatorImpl.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring; import com.intellij.openapi.util.Ref; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java index d58c3dfbbe6..f42015d9276 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.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.string.StringPackage; import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.jetbrains.kotlin.asJava.KotlinLightMethod; @@ -45,6 +44,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +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; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt index db72c63ec53..026c486e951 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.idea.JetLanguage -import org.jetbrains.jet.plugin.caches.resolve.* +import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetFunctionDefinitionUsage import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import java.util.HashMap diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt index 8f2e24bb592..8656b98fec8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.plugin.caches.resolve.* +import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetFunctionDefinitionUsage diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureHandler.java index 15fed79ddcb..296d5066b45 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureHandler.java @@ -33,12 +33,12 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.asJava.AsJavaPackage; 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.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToDeclarationUtil; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index 813e5083c1d..cbde0824d92 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -34,12 +34,12 @@ import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.references.JetSimpleNameReference; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.RefactoringPackage; import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.*; +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference; import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java index e2e9bac49bd..67792dd9b9c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java @@ -26,12 +26,12 @@ import kotlin.KotlinPackage; import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenPackage; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePackage; 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 015e3bd755d..07064554d1a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/ExtractableCodeDescriptor.kt @@ -24,9 +24,9 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.util.containers.MultiMap import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetThisExpression -import org.jetbrains.jet.plugin.references.JetSimpleNameReference +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference.ShorteningMode import org.jetbrains.kotlin.psi.psiUtil.replaced import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.psi.JetTypeParameter 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 edd295d9820..fbb6c84385a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/extractFunction/extractableAnalysisUtil.kt @@ -64,8 +64,8 @@ import org.jetbrains.kotlin.cfg.pseudocodeTraverser.traverseFollowingInstruction import org.jetbrains.kotlin.idea.refactoring.extractFunction.OutputValueBoxer.AsList import org.jetbrains.kotlin.idea.refactoring.getContextForContainingDeclarationBody import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor +import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.idea.refactoring.comparePossiblyOverridingDescriptors import org.jetbrains.kotlin.idea.util.makeNullable diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java index 1846299747f..b9fcb333101 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java @@ -45,8 +45,6 @@ import com.intellij.util.Function; import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; @@ -54,6 +52,8 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.idea.JetLanguage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.lexer.JetTokens; 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 acd3cd884bd..9cc9c0e5d2b 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,7 +34,6 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; 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; @@ -42,6 +41,7 @@ import org.jetbrains.jet.plugin.util.psiModificationUtil.PsiModificationUtilPack import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences; import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyAction; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt index fcc940ea896..7ae9a07a879 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt @@ -65,7 +65,7 @@ import javax.swing.Icon import org.jetbrains.jet.plugin.util.string.collapseSpaces import org.jetbrains.kotlin.asJava.KotlinLightMethod import com.intellij.psi.PsiMethod -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.resolve.OverridingUtil diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt index d237ee62f13..d71c9553c7c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt @@ -26,7 +26,7 @@ import com.intellij.psi.PsiCompiledElement import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.plugin.references.JetSimpleNameReference +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference import org.jetbrains.kotlin.psi.psiUtil.getPackage import org.jetbrains.kotlin.idea.refactoring.move.PackageNameInfo import org.jetbrains.kotlin.idea.refactoring.move.getInternalReferencesToUpdateOnPackageNameChange diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index b629fd719f9..352b65d6ef0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -68,7 +68,7 @@ import org.jetbrains.jet.plugin.search.projectScope import org.jetbrains.kotlin.idea.refactoring.move.getInternalReferencesToUpdateOnPackageNameChange import org.jetbrains.kotlin.idea.refactoring.move.createMoveUsageInfo import org.jetbrains.kotlin.idea.refactoring.move.postProcessMoveUsages -import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference.ShorteningMode import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.idea.refactoring.move.MoveRenameUsageInfoForExtension import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt index 9db42af0b34..e5b1185f2b5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor -import org.jetbrains.jet.plugin.references.JetSimpleNameReference +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetElement @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.refactoring.util.MoveRenameUsageInfo -import org.jetbrains.jet.plugin.references.JetReference +import org.jetbrains.kotlin.idea.references.JetReference import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetImportDirective @@ -48,7 +48,7 @@ import com.intellij.refactoring.util.NonCodeUsageInfo import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper import org.jetbrains.kotlin.idea.refactoring.fqName.getKotlinFqName import org.jetbrains.kotlin.psi.JetThisExpression -import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode +import org.jetbrains.kotlin.idea.references.JetSimpleNameReference.ShorteningMode import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.util.Comparing import java.util.Comparator diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt index 949b905e8cb..d18f81c7701 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameDynamicMemberHandler.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.openapi.project.Project import com.intellij.openapi.actionSystem.DataContext import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic 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 267c6ae834e..07d514f7097 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -41,7 +41,7 @@ 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.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() { override fun canProcessElement(element: PsiElement): Boolean = element.namedUnwrappedElement is JetProperty diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt index 0e1c03fa124..d6dbfc7f1dd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/renameUtil.kt @@ -22,7 +22,7 @@ import java.util.ArrayList import com.intellij.refactoring.util.MoveRenameUsageInfo import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle -import org.jetbrains.jet.plugin.references.AbstractJetReference +import org.jetbrains.kotlin.idea.references.AbstractJetReference fun checkConflictsAndReplaceUsageInfos(result: MutableList) { val usagesToAdd = ArrayList() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt index f4395b1b6b0..7239de3827b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt @@ -25,12 +25,12 @@ import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.references.JetReference +import org.jetbrains.kotlin.idea.references.JetReference import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.psi.psiUtil.parameterIndex import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class KotlinJavaSafeDeleteDelegate : JavaSafeDeleteDelegate { override fun createUsageInfoForParameter( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java index 051492c1dd2..c7ec77f5ff7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java @@ -33,11 +33,11 @@ import com.intellij.usages.UsageViewPresentation; import com.intellij.usages.impl.UsagePreviewPanel; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.JetElement; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt index f0d1777cffc..46796f8866d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -40,11 +40,11 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.idea.JetBundle import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil -import org.jetbrains.jet.plugin.references.JetReference +import org.jetbrains.kotlin.idea.references.JetReference import java.util.* import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.deleteElementAndCleanParent -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() { override fun handlesElement(element: PsiElement): Boolean = element.canDeleteElement() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt index 26363d7ebc5..17acf326773 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.refactoring.safeDelete import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze public class SafeDeleteImportDirectiveUsageInfo( importDirective: JetImportDirective, declaration: JetDeclaration diff --git a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt index d2563ba9ea1..12bcd662319 100644 --- a/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt +++ b/idea/testData/findUsages/kotlin/findWithFilteringImports/findWithFilteringImports.0.kt @@ -1,5 +1,5 @@ // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass -// FILTERING_RULES: org.jetbrains.jet.plugin.findUsages.JetImportFilteringRule +// FILTERING_RULES: org.jetbrains.kotlin.idea.findUsages.JetImportFilteringRule // OPTIONS: usages, constructorUsages package testing diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt index 27df6c04cd4..4d33d788b84 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinClassAllUsages.0.kt @@ -1,5 +1,5 @@ // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetClass -// GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule +// GROUPING_RULES: org.jetbrains.kotlin.idea.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // OPTIONS: usages, constructorUsages package server diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt index b1da5e9aa88..b0171305122 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinMethodUsages.0.kt @@ -1,5 +1,5 @@ // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetNamedFunction -// GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule +// GROUPING_RULES: org.jetbrains.kotlin.idea.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // OPTIONS: usages package server diff --git a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt index 60ab121858f..96be0452c77 100644 --- a/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt +++ b/idea/testData/findUsages/kotlin/findWithStructuralGrouping/kotlinPropertyUsages.0.kt @@ -1,5 +1,5 @@ // PSI_ELEMENT: org.jetbrains.kotlin.psi.JetProperty -// GROUPING_RULES: org.jetbrains.jet.plugin.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule +// GROUPING_RULES: org.jetbrains.kotlin.idea.findUsages.KotlinDeclarationGroupRuleProvider$KotlinDeclarationGroupingRule // OPTIONS: usages package server diff --git a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java index be70613d82f..da4dbdb38ed 100644 --- a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java +++ b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.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. @@ -25,12 +25,12 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Severity; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.highlighter.IdeErrorMessages; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.util.Arrays; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java index 2820ff2a844..fe2d55c75a0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.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. @@ -31,11 +31,11 @@ import com.intellij.psi.impl.file.impl.FileManager; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; +import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.JetTestCaseBuilder; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; -import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java index b337ecc9853..68de0bbfec9 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.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. @@ -19,12 +19,12 @@ package org.jetbrains.jet.plugin.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.caches.resolve.ResolutionFacade; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetValueArgumentList; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; public abstract class AbstractFunctionParameterInfoTest extends LightCodeInsightFixtureTestCase { @Override diff --git a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt index fa3a75635cd..f03300b5a46 100644 --- a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.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. @@ -39,7 +39,7 @@ import java.io.File import com.intellij.openapi.roots.ModuleRootModificationUtil import org.jetbrains.jet.plugin.search.allScope import org.jetbrains.jet.plugin.util.application.runWriteAction -import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex +import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex import org.jetbrains.kotlin.psi.JetTreeVisitorVoid import org.jetbrains.kotlin.psi.JetNamedDeclaration import java.util.ArrayList diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java index ca72fb576bd..0bb117111cd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.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. @@ -25,13 +25,13 @@ import com.intellij.util.Consumer; import kotlin.Function0; import kotlin.Unit; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.descriptors.ModuleDescriptor; -import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt index 6ae9b204bb5..1d0bfea1e1f 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo -import org.jetbrains.jet.plugin.caches.resolve.analyze +import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public abstract class AbstractDataFlowValueRenderingTest: JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java index feffb6c5d08..325a89e5607 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java @@ -22,9 +22,9 @@ import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.caches.resolve.LibraryModificationTracker; import org.jetbrains.jet.plugin.project.TargetPlatform; import org.jetbrains.kotlin.completion.util.UtilPackage; +import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java index aeb8f02de84..282c0c7d8ea 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java @@ -51,9 +51,9 @@ 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.jet.plugin.findUsages.KotlinClassFindUsagesOptions; -import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions; -import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions; +import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions; +import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions; +import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.JetTestUtils; diff --git a/idea/tests/org/jetbrains/jet/plugin/caches/resolve/HighlightingWithDependentLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/caches/resolve/HighlightingWithDependentLibrariesTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt index 061116f4837..06b43c756bb 100644 --- a/idea/tests/org/jetbrains/jet/plugin/caches/resolve/HighlightingWithDependentLibrariesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.jet.plugin.PluginTestCaseBase import org.jetbrains.kotlin.test.MockLibraryUtil import com.intellij.openapi.roots.libraries.Library -import com.intellij.openapi.command.WriteCommandAction import java.io.File import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.vfs.VfsUtil @@ -55,4 +54,4 @@ public class HighlightingWithDependentLibrariesTest : JetLightCodeInsightFixture myFixture.configureByFile("$TEST_DATA_PATH/module/usingLibs.kt") myFixture.checkHighlighting(false, false, false) } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfoTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt index 4bbdc2e1b7d..7cc0d6a6c64 100644 --- a/idea/tests/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.testFramework.ModuleTestCase import com.intellij.openapi.module.StdModuleTypes diff --git a/idea/tests/org/jetbrains/jet/plugin/caches/resolve/MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/caches/resolve/MultiModuleHighlightingTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.kt index 0ce456c31d3..837c3a83d68 100644 --- a/idea/tests/org/jetbrains/jet/plugin/caches/resolve/MultiModuleHighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleHighlightingTest.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.caches.resolve +package org.jetbrains.kotlin.idea.caches.resolve import org.jetbrains.jet.plugin.PluginTestCaseBase import com.intellij.openapi.module.StdModuleTypes @@ -112,4 +112,4 @@ class MultiModuleHighlightingTest : DaemonAnalyzerTestCase() { dependencyScope: DependencyScope = DependencyScope.COMPILE, exported: Boolean = false ) = ModuleRootModificationUtil.addDependency(this, other, dependencyScope, exported) -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.java index 25546562c72..282a2821394 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInsertImportOnPasteTest.java @@ -23,12 +23,12 @@ 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.jet.plugin.caches.resolve.ResolvePackage; 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.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index d834c0f2a23..7da926fed5f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -29,7 +29,7 @@ import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.psi.JetCodeFragment -import org.jetbrains.jet.plugin.caches.resolve.analyzeFully +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.psi.JetTypeReference import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.resolve.BindingContext 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 153becff09b..ca2b198d88c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -33,7 +33,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.asJava.LightClassUtil import kotlin.test.assertTrue -import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration +import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration public class NavigateFromLibrarySourcesTest: LightCodeInsightFixtureTestCase() { public fun testJdkClass() { 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 cddce2cad3d..6fdc02cd6a1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.java @@ -28,7 +28,7 @@ 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.jet.plugin.references.JetReference; +import org.jetbrains.kotlin.idea.references.JetReference; import org.jetbrains.kotlin.test.JetTestUtils; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt index a5db8317948..2c2e6431deb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStrea import com.intellij.openapi.projectRoots.Sdk import org.jetbrains.jet.plugin.PluginTestCaseBase import kotlin.test.assertEquals -import org.jetbrains.jet.plugin.caches.resolve.analyzeFully +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.diagnostics.Severity import kotlin.test.assertTrue import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase 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 1e7afb166ae..3085c0ded76 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java @@ -35,10 +35,10 @@ 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.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.Visibilities; +import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.resolve.BindingContext; 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 7fd424458ab..9e6def9c6c3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.name.isSubpackageOf import org.jetbrains.kotlin.idea.refactoring.move.getString import org.jetbrains.kotlin.idea.refactoring.move.getNullableString import org.jetbrains.jet.plugin.search.allScope -import org.jetbrains.jet.plugin.caches.resolve.analyzeFully +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintException diff --git a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java rename to idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.java index 9a74ae08739..c9ae4cefbcd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolverTest.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,17 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.references; +package org.jetbrains.kotlin.idea.references; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.ResolveTestCase; -import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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 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 7a44d5da84d..1c23e72f624 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractPartialBodyResolveTest.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade +import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.psiUtil.parents import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.command.CommandProcessor diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java index 0146cbb52db..bbab33abd96 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveTest.java @@ -29,7 +29,7 @@ import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCa import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; +import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.JetTestCaseBuilder; diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt index de819dc5f1a..684b8a92aaf 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt @@ -26,7 +26,7 @@ import com.intellij.openapi.util.Computable import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult +import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.test.JetTestCaseBuilder import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess