From a9a15978e0a22463fa152342388f73c744035f30 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 18:17:16 +0300 Subject: [PATCH] Rename jet -> kotlin in idea: completion, debugger, decompiler, highlighter org.jetbrains.jet.plugin.* -> org.jetbrains.kotlin.idea.* --- .../kotlin/generators/tests/GenerateTests.kt | 24 +++++----- .../IDELightClassGenerationSupport.java | 2 +- .../JetClsStructureViewBuilderProvider.kt | 4 +- .../DescriptorToDeclarationUtil.kt | 2 +- .../idea}/decompiler/DecompiledUtils.kt | 4 +- .../decompiler/JetClassFileDecompiler.java | 6 +-- .../decompiler/JetClassFileViewProvider.kt | 4 +- .../idea}/decompiler/JetClsFile.kt | 10 ++-- .../navigation/DecompiledNavigationUtils.java | 14 +++--- .../navigation/JetSourceNavigationHelper.java | 28 +++++------ .../KotlinDeclarationNavigationPolicyImpl.kt | 4 +- .../decompiler/navigation/MemberMatching.java | 12 ++--- .../stubBuilder/CallableClsStubBuilder.kt | 6 +-- .../stubBuilder/ClassClsStubBuilder.kt | 6 +-- .../stubBuilder/ClsStubBuilderContext.kt | 4 +- .../stubBuilder/KotlinClsStubBuilder.kt | 12 ++--- .../stubBuilder/TypeClsStubBuilder.kt | 4 +- .../decompiler/stubBuilder/clsStubBuilding.kt | 4 +- .../textBuilder/DecompiledTextFactory.kt | 4 +- .../textBuilder/DeserializerForDecompiler.kt | 5 +- .../textBuilder/LocalClassFinder.kt | 6 +-- .../textBuilder/LoggingErrorReporter.kt | 4 +- .../textBuilder/ResolverForDecompiler.kt | 4 +- .../textBuilder/missingDependencies.kt | 4 +- .../AfterAnalysisHighlightingVisitor.java | 4 +- .../idea}/highlighter/DebugInfoAnnotator.java | 10 ++-- .../DeprecatedAnnotationVisitor.java | 14 +++--- .../DuplicateJvmSignatureAnnotator.java | 12 ++--- .../FunctionsHighlightingVisitor.java | 6 +-- .../highlighter/HighlightingVisitor.java | 4 +- .../HtmlTabledDescriptorRenderer.java | 12 ++--- .../idea}/highlighter/IdeErrorMessages.java | 8 ++-- .../idea}/highlighter/IdeRenderers.java | 10 ++-- .../idea}/highlighter/JetHighlighter.java | 4 +- .../highlighter/JetHighlightingColors.java | 4 +- .../highlighter/JetHighlightingLexer.java | 4 +- .../idea}/highlighter/JetPsiChecker.kt | 4 +- .../JetSyntaxHighlighterFactory.java | 4 +- .../KotlinProblemHighlightFilter.kt | 4 +- .../KotlinSuppressableWarningProblemGroup.kt | 4 +- .../LabelsHighlightingVisitor.java | 4 +- .../PropertiesHighlightingVisitor.java | 6 +-- .../SoftKeywordsHighlightingVisitor.java | 6 +-- .../TypeKindHighlightingVisitor.java | 4 +- .../VariablesHighlightingVisitor.java | 6 +-- .../idea}/highlighter/renderersUtil.kt | 6 +-- idea/src/META-INF/extensions/ide.xml | 2 +- idea/src/META-INF/javaScriptDebug.xml | 4 +- idea/src/META-INF/plugin.xml | 48 +++++++++---------- .../jet/plugin/PluginStartupComponent.java | 2 +- .../coverage/KotlinCoverageExtension.kt | 2 +- .../KotlinTypeHierarchyProvider.java | 2 +- .../KotlinDirectInheritorsSearcher.kt | 2 +- .../jet/plugin/util/DebuggerUtils.java | 2 +- .../KotlinRuntimeTypeCastSurrounder.kt | 2 +- .../idea}/completion/AllClassesCompletion.kt | 4 +- .../idea}/completion/CompletionSession.kt | 6 +-- .../idea}/completion/CompletionSorting.kt | 12 ++--- .../idea}/completion/CompletionUtils.kt | 8 ++-- .../DataFlowInfoUtilForCompletion.kt | 4 +- .../DeclarationDescriptorLookupObject.kt | 4 +- .../idea}/completion/ExpectedInfos.kt | 6 +-- .../idea}/completion/KeywordCompletion.kt | 9 ++-- .../completion/KotlinCompletionCharFilter.kt | 5 +- .../completion/KotlinCompletionContributor.kt | 6 +-- .../idea}/completion/LeafElementFilter.kt | 4 +- .../idea}/completion/LookupElementFactory.kt | 6 +-- .../completion/LookupElementsCollector.kt | 6 +-- .../completion/NamedParametersCompletion.kt | 6 +-- .../completion/PackageDirectiveCompletion.kt | 4 +- .../completion/ToFromOriginalFileMapper.kt | 4 +- .../UnfocusedPossibleFunctionParameter.java | 4 +- .../handlers/BaseDeclarationInsertHandler.kt | 6 +-- .../completion/handlers/GenerateLambda.kt | 6 +-- .../handlers/KotlinCallableInsertHandler.kt | 10 ++-- .../handlers/KotlinClassInsertHandler.kt | 10 ++-- .../handlers/KotlinKeywordInsertHandler.kt | 4 +- .../handlers/WithTailInsertHandler.kt | 8 ++-- .../idea}/completion/smart/KeywordValues.kt | 8 ++-- .../idea}/completion/smart/LambdaItems.kt | 13 +++-- .../smart/MultipleArgumentsItemProvider.kt | 14 +++--- .../idea}/completion/smart/NameSimilarity.kt | 6 +-- .../idea}/completion/smart/SmartCompletion.kt | 6 +-- .../idea}/completion/smart/StaticMembers.kt | 12 ++--- .../smart/TypeInstantiationItems.kt | 10 ++-- .../completion/smart/TypesWithSmartCasts.kt | 4 +- .../idea}/completion/smart/Utils.kt | 8 ++-- .../DiagnosticSuppressorForDebugger.kt | 4 +- .../idea}/debugger/JetPositionManager.kt | 18 +------ .../debugger/JetPositionManagerFactory.java | 4 +- .../idea}/debugger/KotlinDebuggerSettings.kt | 9 ++-- .../debugger/KotlinEditorTextProvider.kt | 4 +- .../KotlinJavaScriptBreakpointAware.java | 4 +- .../debugger/KotlinSmartStepIntoHandler.kt | 4 +- .../debugger/KotlinSourcePositionProvider.kt | 7 +-- .../KotlinSteppingConfigurableUi.form | 2 +- .../KotlinSteppingConfigurableUi.java | 6 +-- .../idea}/debugger/MockSourcePosition.kt | 6 +-- ...PositionManagerLibraryClassFileSearcher.kt | 6 +-- .../evaluate/KotlinCodeFragmentFactory.kt | 6 +-- .../evaluate/KotlinEvaluateExpressionCache.kt | 4 +- .../evaluate/KotlinEvaluationBuilder.kt | 8 ++-- .../evaluate/KotlinRuntimeTypeEvaluator.kt | 5 +- .../extractFunctionForDebuggerUtil.kt | 4 +- .../debugger/filter/DebuggerFiltersUtil.kt | 6 +-- ...inDebuggerInternalClassesFilterProvider.kt | 6 +-- .../DelegatedPropertyFieldDescriptor.kt | 18 ++++++- ...otlinClassWithDelegatedPropertyRenderer.kt | 4 +- ...orDuringFileAnalyzeNotificationProvider.kt | 4 +- .../highlighter/JetColorSettingsPage.java | 4 +- .../highlighter/JetLineMarkerProvider.java | 22 ++++----- .../JetPsiCheckerAndHighlightingUpdater.java | 4 +- .../idea}/highlighter/markers/JavaPsiUtils.kt | 4 +- .../markers/OverridenFunctionMarker.kt | 4 +- .../markers/OverridenPropertyMarker.kt | 6 +-- .../markers/SuperDeclarationMarker.kt | 4 +- .../kotlin/idea/quickfix/AutoImportFix.kt | 2 +- .../conflictingSubstitutions.kt | 2 +- .../jet/plugin/DirectiveBasedActionUtils.java | 2 +- .../checkers/AbstractJetPsiCheckerTest.java | 2 +- .../AbstractKeywordCompletionTest.kt | 2 +- .../completion/DataFlowValueRenderingTest.kt | 2 +- .../codeInsight/AbstractLineMarkersTest.java | 2 +- .../AbstractJetPositionManagerTest.java | 12 ++--- .../debugger/AbstractKotlinSteppingTest.kt | 8 ++-- .../debugger/AbstractSmartStepIntoTest.kt | 5 +- .../JetPositionManagerTestGenerated.java | 2 +- .../idea}/debugger/KotlinDebuggerTestBase.kt | 6 +-- .../debugger/KotlinDebuggerTestCase.java | 4 +- .../debugger/KotlinSteppingTestGenerated.java | 2 +- .../idea}/debugger/MockLocation.java | 4 +- .../idea}/debugger/MockReferenceType.java | 4 +- .../idea}/debugger/MockVirtualMachine.java | 4 +- .../debugger/SmartStepIntoTestGenerated.java | 2 +- ...AbstractEditorForEvaluateExpressionTest.kt | 4 +- .../AbstractKotlinEvaluateExpressionTest.kt | 6 +-- ...AbstractSelectExpressionForDebuggerTest.kt | 8 ++-- ...ragmentCompletionHandlerTestGenerated.java | 2 +- .../CodeFragmentCompletionInLibraryTest.kt | 4 +- .../CodeFragmentCompletionTestGenerated.java | 2 +- ...CodeFragmentHighlightingTestGenerated.java | 2 +- ...KotlinEvaluateExpressionTestGenerated.java | 2 +- ...ectExpressionForDebuggerTestGenerated.java | 2 +- .../AbstractInternalCompiledClassesTest.kt | 10 ++-- .../decompiler/InternalCompiledClassesTest.kt | 4 +- .../AbstractNavigateToLibraryTest.java | 4 +- .../NavigateFromLibrarySourcesTest.kt | 4 +- .../NavigateToDecompiledLibraryTest.java | 9 ++-- .../NavigateToLibraryRegressionTest.java | 4 +- .../NavigateToLibrarySourceTest.java | 10 ++-- .../NavigateToStdlibSourceRegressionTest.java | 4 +- .../stubBuilder/AbstractClsStubBuilderTest.kt | 4 +- .../ClsStubBuilderTestGenerated.java | 2 +- .../stubBuilder/ClsStubConsistencyTest.kt | 6 +-- .../ClsStubForWrongAbiVersionTest.kt | 8 ++-- .../textBuilder/AbstractDecompiledTextTest.kt | 8 ++-- .../DecompiledTextConsistencyTest.kt | 6 +-- .../DecompiledTextForWrongAbiVersionTest.kt | 12 ++--- .../DecompiledTextTestGenerated.java | 2 +- .../AbstractDiagnosticMessageTest.java | 16 +++---- .../highlighter/AbstractHighlightingTest.java | 4 +- .../DiagnosticMessageTestGenerated.java | 2 +- .../idea}/highlighter/FormatHtmlUtil.kt | 6 +-- .../HighlightingTestGenerated.java | 2 +- .../idea}/highlighter/NoErrorsInStdlibTest.kt | 4 +- 165 files changed, 503 insertions(+), 520 deletions(-) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/DecompiledUtils.kt (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/JetClassFileDecompiler.java (90%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/JetClassFileViewProvider.kt (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/JetClsFile.kt (85%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/DecompiledNavigationUtils.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/JetSourceNavigationHelper.java (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt (92%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/MemberMatching.java (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/CallableClsStubBuilder.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/ClassClsStubBuilder.kt (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/ClsStubBuilderContext.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/KotlinClsStubBuilder.kt (90%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/TypeClsStubBuilder.kt (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/clsStubBuilding.kt (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/DecompiledTextFactory.kt (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/DeserializerForDecompiler.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/LocalClassFinder.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/LoggingErrorReporter.kt (93%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/ResolverForDecompiler.kt (90%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/missingDependencies.kt (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/AfterAnalysisHighlightingVisitor.java (91%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/DebugInfoAnnotator.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/DeprecatedAnnotationVisitor.java (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/DuplicateJvmSignatureAnnotator.java (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/FunctionsHighlightingVisitor.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/HighlightingVisitor.java (90%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/HtmlTabledDescriptorRenderer.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/IdeErrorMessages.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/IdeRenderers.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/JetHighlighter.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/JetHighlightingColors.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/JetHighlightingLexer.java (92%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/JetPsiChecker.kt (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/JetSyntaxHighlighterFactory.java (91%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/KotlinProblemHighlightFilter.kt (92%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/KotlinSuppressableWarningProblemGroup.kt (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/LabelsHighlightingVisitor.java (93%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/PropertiesHighlightingVisitor.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/SoftKeywordsHighlightingVisitor.java (97%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/TypeKindHighlightingVisitor.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/VariablesHighlightingVisitor.java (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/renderersUtil.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/AllClassesCompletion.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/CompletionSession.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/CompletionSorting.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/CompletionUtils.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/DataFlowInfoUtilForCompletion.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/DeclarationDescriptorLookupObject.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/ExpectedInfos.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/KeywordCompletion.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/KotlinCompletionCharFilter.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/KotlinCompletionContributor.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/LeafElementFilter.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/LookupElementFactory.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/LookupElementsCollector.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/NamedParametersCompletion.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/PackageDirectiveCompletion.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/ToFromOriginalFileMapper.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/confidence/UnfocusedPossibleFunctionParameter.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/handlers/BaseDeclarationInsertHandler.kt (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/handlers/GenerateLambda.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/handlers/KotlinCallableInsertHandler.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/handlers/KotlinClassInsertHandler.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/handlers/KotlinKeywordInsertHandler.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/handlers/WithTailInsertHandler.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/KeywordValues.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/LambdaItems.kt (86%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/MultipleArgumentsItemProvider.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/NameSimilarity.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/SmartCompletion.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/StaticMembers.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/TypeInstantiationItems.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/TypesWithSmartCasts.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/completion/smart/Utils.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/DiagnosticSuppressorForDebugger.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/JetPositionManager.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/JetPositionManagerFactory.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinDebuggerSettings.kt (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinEditorTextProvider.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinJavaScriptBreakpointAware.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinSmartStepIntoHandler.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinSourcePositionProvider.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinSteppingConfigurableUi.form (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinSteppingConfigurableUi.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/MockSourcePosition.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/PositionManagerLibraryClassFileSearcher.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/KotlinCodeFragmentFactory.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/KotlinEvaluateExpressionCache.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/KotlinEvaluationBuilder.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/extractFunctionForDebuggerUtil.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/filter/DebuggerFiltersUtil.kt (88%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/filter/KotlinDebuggerInternalClassesFilterProvider.kt (88%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/render/DelegatedPropertyFieldDescriptor.kt (71%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/JetColorSettingsPage.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/JetLineMarkerProvider.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/JetPsiCheckerAndHighlightingUpdater.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/markers/JavaPsiUtils.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/markers/OverridenFunctionMarker.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/markers/OverridenPropertyMarker.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/markers/SuperDeclarationMarker.kt (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/AbstractJetPositionManagerTest.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/AbstractKotlinSteppingTest.kt (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/AbstractSmartStepIntoTest.kt (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/JetPositionManagerTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinDebuggerTestBase.kt (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinDebuggerTestCase.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/KotlinSteppingTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/MockLocation.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/MockReferenceType.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/MockVirtualMachine.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/SmartStepIntoTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt (90%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/CodeFragmentCompletionTestGenerated.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/AbstractInternalCompiledClassesTest.kt (91%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/InternalCompiledClassesTest.kt (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/AbstractNavigateToLibraryTest.java (90%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/NavigateFromLibrarySourcesTest.kt (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/NavigateToDecompiledLibraryTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/NavigateToLibraryRegressionTest.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/NavigateToLibrarySourceTest.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/ClsStubConsistencyTest.kt (92%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt (88%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/AbstractDecompiledTextTest.kt (91%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/DecompiledTextConsistencyTest.kt (94%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt (85%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/decompiler/textBuilder/DecompiledTextTestGenerated.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/AbstractDiagnosticMessageTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/AbstractHighlightingTest.java (96%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/DiagnosticMessageTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/FormatHtmlUtil.kt (93%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/HighlightingTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/highlighter/NoErrorsInStdlibTest.kt (97%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 4f2c4a6a0ac..2366127720b 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -50,7 +50,7 @@ import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest import org.jetbrains.kotlin.completion.AbstractJvmWithLibBasicCompletionTest import org.jetbrains.jet.plugin.navigation.AbstractGotoSuperTest import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixMultiFileTest -import org.jetbrains.jet.plugin.highlighter.AbstractHighlightingTest +import org.jetbrains.kotlin.idea.highlighter.AbstractHighlightingTest import org.jetbrains.jet.plugin.folding.AbstractKotlinFoldingTest import org.jetbrains.kotlin.idea.codeInsight.surroundWith.AbstractSurroundWithTest import org.jetbrains.kotlin.idea.intentions.AbstractIntentionTest @@ -66,7 +66,7 @@ import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveWithLibTest import org.jetbrains.kotlin.findUsages.AbstractJetFindUsagesTest import org.jetbrains.jet.plugin.configuration.AbstractConfigureProjectByChangingFileTest import org.jetbrains.kotlin.formatter.AbstractJetFormatterTest -import org.jetbrains.jet.plugin.highlighter.AbstractDiagnosticMessageTest +import org.jetbrains.kotlin.idea.highlighter.AbstractDiagnosticMessageTest import org.jetbrains.kotlin.idea.codeInsight.AbstractOutOfBlockModificationTest import org.jetbrains.kotlin.completion.AbstractDataFlowValueRenderingTest import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationParameterTest @@ -93,18 +93,18 @@ import org.jetbrains.jet.plugin.AbstractExpressionSelectionTest import org.jetbrains.kotlin.idea.refactoring.move.AbstractJetMoveTest import org.jetbrains.kotlin.cfg.AbstractDataFlowTest import org.jetbrains.jet.plugin.imports.AbstractOptimizeImportsTest -import org.jetbrains.jet.plugin.debugger.AbstractSmartStepIntoTest +import org.jetbrains.kotlin.idea.debugger.AbstractSmartStepIntoTest import org.jetbrains.jet.plugin.stubs.AbstractStubBuilderTest import org.jetbrains.kotlin.idea.codeInsight.AbstractJetInspectionTest -import org.jetbrains.jet.plugin.debugger.AbstractKotlinSteppingTest -import org.jetbrains.jet.plugin.debugger.AbstractJetPositionManagerTest +import org.jetbrains.kotlin.idea.debugger.AbstractKotlinSteppingTest +import org.jetbrains.kotlin.idea.debugger.AbstractJetPositionManagerTest import org.jetbrains.kotlin.completion.AbstractMultiFileJvmBasicCompletionTest import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.AbstractJetExtractionTest import org.jetbrains.kotlin.formatter.AbstractJetTypingIndentationTestBase -import org.jetbrains.jet.plugin.debugger.evaluate.AbstractKotlinEvaluateExpressionTest -import org.jetbrains.jet.plugin.debugger.evaluate.AbstractSelectExpressionForDebuggerTest -import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionTest -import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentHighlightingTest +import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractKotlinEvaluateExpressionTest +import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractSelectExpressionForDebuggerTest +import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractCodeFragmentCompletionTest +import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractCodeFragmentHighlightingTest import org.jetbrains.jet.plugin.stubs.AbstractResolveByStubTest import org.jetbrains.jet.plugin.stubs.AbstractMultiFileHighlightingTest import org.jetbrains.kotlin.cfg.AbstractPseudoValueTest @@ -125,19 +125,19 @@ import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveInJavaTest import org.jetbrains.kotlin.js.test.semantics.AbstractBridgeTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterForWebDemoTest -import org.jetbrains.jet.plugin.decompiler.textBuilder.AbstractDecompiledTextTest +import org.jetbrains.kotlin.idea.decompiler.textBuilder.AbstractDecompiledTextTest import org.jetbrains.kotlin.completion.AbstractMultiFileSmartCompletionTest import org.jetbrains.kotlin.completion.handlers.AbstractCompletionCharFilterTest import org.jetbrains.kotlin.idea.resolve.AbstractPartialBodyResolveTest import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest import org.jetbrains.kotlin.types.AbstractJetTypeBindingTest -import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest +import org.jetbrains.kotlin.idea.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest import org.jetbrains.kotlin.js.test.semantics.AbstractDynamicTest import org.jetbrains.kotlin.js.test.semantics.AbstractMultiModuleTest import org.jetbrains.kotlin.completion.handlers.AbstractBasicCompletionHandlerTest -import org.jetbrains.jet.plugin.decompiler.stubBuilder.AbstractClsStubBuilderTest +import org.jetbrains.kotlin.idea.decompiler.stubBuilder.AbstractClsStubBuilderTest import org.jetbrains.kotlin.codegen.AbstractLineNumberTest import org.jetbrains.kotlin.completion.handlers.AbstractKeywordCompletionHandlerTest diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index c0c29ff0000..d493826fd6a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -51,7 +51,7 @@ 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.jet.plugin.decompiler.navigation.JetSourceNavigationHelper; +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; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt index 00d35d3b807..ed6ef0f4059 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetClsStructureViewBuilderProvider.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.project.Project import com.intellij.ide.structureView.StructureViewBuilder import com.intellij.psi.PsiManager -import org.jetbrains.jet.plugin.decompiler.JetClsFile +import org.jetbrains.kotlin.idea.decompiler.JetClsFile //TODO: workaround for bug in JavaClsStructureViewBuilderProvider, remove when IDEA api is updated public class JetClsStructureViewBuilderProvider : StructureViewBuilderProvider { @@ -30,4 +30,4 @@ public class JetClsStructureViewBuilderProvider : StructureViewBuilderProvider { val psiFile = PsiManager.getInstance(project).findFile(file) as? JetClsFile ?: return null return JetStructureViewFactory().getStructureViewBuilder(psiFile) } -} \ No newline at end of file +} 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 63bc5da0bef..fa1e88ecbb2 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 @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.decompiler.navigation.DecompiledNavigationUtils +import org.jetbrains.kotlin.idea.decompiler.navigation.DecompiledNavigationUtils import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver import java.util.HashSet import org.jetbrains.kotlin.descriptors.PackageViewDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/DecompiledUtils.kt similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/DecompiledUtils.kt index c405a4aa023..4ec5cd1407b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/DecompiledUtils.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.decompiler +package org.jetbrains.kotlin.idea.decompiler import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileDecompiler.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileDecompiler.java similarity index 90% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileDecompiler.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileDecompiler.java index 382d71066c9..a1d48055133 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileDecompiler.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileDecompiler.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.decompiler; +package org.jetbrains.kotlin.idea.decompiler; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.FileViewProvider; @@ -22,7 +22,7 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.compiled.ClassFileDecompilers; import com.intellij.psi.compiled.ClsStubBuilder; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.decompiler.stubBuilder.KotlinClsStubBuilder; +import org.jetbrains.kotlin.idea.decompiler.stubBuilder.KotlinClsStubBuilder; public class JetClassFileDecompiler extends ClassFileDecompilers.Full { private final ClsStubBuilder stubBuilder = new KotlinClsStubBuilder(); diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileViewProvider.kt similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileViewProvider.kt index cb62d792b77..68acd271535 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileViewProvider.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.decompiler +package org.jetbrains.kotlin.idea.decompiler import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.project.Project diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClsFile.kt similarity index 85% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClsFile.kt index 708427b5a58..6dfd7a0347d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClsFile.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.decompiler +package org.jetbrains.kotlin.idea.decompiler import com.intellij.openapi.util.TextRange -import com.intellij.psi.impl.compiled.ClsFileImpl import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetDeclaration -import com.intellij.psi.PsiElement -import org.jetbrains.jet.plugin.decompiler.textBuilder.buildDecompiledText -import org.jetbrains.jet.plugin.decompiler.textBuilder.descriptorToKey +import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText +import org.jetbrains.kotlin.idea.decompiler.textBuilder.descriptorToKey import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java index 54c9487e3d6..59d2959b364 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.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.decompiler.navigation; +package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; @@ -23,18 +23,18 @@ 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.psi.JetDeclaration; -import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.idea.decompiler.DecompilerPackage; +import org.jetbrains.kotlin.idea.decompiler.JetClsFile; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.plugin.decompiler.DecompilerPackage; -import org.jetbrains.jet.plugin.decompiler.JetClsFile; -import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java index 8902d4e2c31..70fbb6af431 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.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.decompiler.navigation; +package org.jetbrains.kotlin.idea.decompiler.navigation; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -36,13 +36,23 @@ 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; import org.jetbrains.kotlin.context.ContextPackage; import org.jetbrains.kotlin.context.GlobalContextImpl; -import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; 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.lexer.JetTokens; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.resolve.BindingTraceContext; @@ -53,24 +63,14 @@ import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.FqNameUnsafe; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.DynamicTypesSettings; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex; -import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertyFqnNameIndex; -import org.jetbrains.kotlin.asJava.LightClassUtil; -import org.jetbrains.kotlin.di.InjectorForLazyResolve; import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.plugin.decompiler.navigation.MemberMatching.*; +import static org.jetbrains.kotlin.idea.decompiler.navigation.MemberMatching.*; public class JetSourceNavigationHelper { private static boolean forceResolve = false; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt similarity index 92% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt index f8523d218e3..13e2b539ad0 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.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.decompiler.navigation +package org.jetbrains.kotlin.idea.decompiler.navigation import org.jetbrains.kotlin.psi.KotlinDeclarationNavigationPolicy import org.jetbrains.kotlin.psi.JetElement diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/MemberMatching.java similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/MemberMatching.java index 7bff4ef5fcc..e0c08487a5e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/MemberMatching.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.decompiler.navigation; +package org.jetbrains.kotlin.idea.decompiler.navigation; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -23,16 +23,16 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.kt index a77f04bbec9..6f5f05da430 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/CallableClsStubBuilder.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.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.psi.stubs.StubElement import com.intellij.psi.PsiElement @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.* +import org.jetbrains.kotlin.idea.decompiler.stubBuilder.FlagsToModifiers.* fun createCallableStub( parentStub: StubElement, diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt index 17bcc8cb2b9..3ddca543e70 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.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.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.serialization.Flags @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.serialization.ProtoBuf.Type -import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.* +import org.jetbrains.kotlin.idea.decompiler.stubBuilder.FlagsToModifiers.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt index d9cd2003101..1f5029b175e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.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.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.name.Name diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt similarity index 90% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.kt index 509ec33ad0c..afae5e356cb 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinClsStubBuilder.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.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.psi.compiled.ClsStubBuilder import com.intellij.util.cls.ClsFormatException @@ -26,11 +26,11 @@ import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassFinder -import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassDataFinder +import org.jetbrains.kotlin.idea.decompiler.textBuilder.LocalClassFinder +import org.jetbrains.kotlin.idea.decompiler.textBuilder.LocalClassDataFinder import com.intellij.openapi.diagnostic.Logger -import org.jetbrains.jet.plugin.decompiler.textBuilder.LoggingErrorReporter -import org.jetbrains.jet.plugin.decompiler.isKotlinInternalCompiledFile +import org.jetbrains.kotlin.idea.decompiler.textBuilder.LoggingErrorReporter +import org.jetbrains.kotlin.idea.decompiler.isKotlinInternalCompiledFile import org.jetbrains.kotlin.name.FqName public class KotlinClsStubBuilder : ClsStubBuilder() { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt index fb821ad5c3a..6ef988205d7 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.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.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.serialization.ProtoBuf diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.kt index 364f30e53f7..1b6e499b5f4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/clsStubBuilding.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.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.kt index 24c8d014db9..35e9b536912 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextFactory.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.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.openapi.util.TextRange import com.intellij.openapi.vfs.VirtualFile diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.kt index 8abd600f64a..538b414b44a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/DeserializerForDecompiler.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.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.storage.LockBasedStorageManager import java.util.Collections import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LocalClassFinder.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LocalClassFinder.kt index 63b6f2a28a6..cf81dba593f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LocalClassFinder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils -import org.jetbrains.jet.plugin.decompiler.isKotlinWithCompatibleAbiVersion +import org.jetbrains.kotlin.idea.decompiler.isKotlinWithCompatibleAbiVersion import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.name.FqName diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LoggingErrorReporter.kt similarity index 93% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LoggingErrorReporter.kt index 5b7d8ca4f57..98ff28e38a2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LoggingErrorReporter.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.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import org.jetbrains.kotlin.load.java.components.ErrorReporter import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/ResolverForDecompiler.kt similarity index 90% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/ResolverForDecompiler.kt index fb4a8361a7f..94a2068b2c3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/ResolverForDecompiler.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.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.ClassDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.kt index bd269aad98d..a2181cf326a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/missingDependencies.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.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.* diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.java similarity index 91% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.java index 95c002fdf2f..22fe16a5533 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/AfterAnalysisHighlightingVisitor.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java index 15da08842ab..1f189a4db8f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.Annotator; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.plugin.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.psi.JetCodeFragment; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.jet.plugin.util.ProjectRootsUtil; -import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; -import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; /** * Quick showing possible problems with Kotlin internals in IDEA with tooltips diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DeprecatedAnnotationVisitor.java similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DeprecatedAnnotationVisitor.java index acbff67ed3f..d2861e15c75 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DeprecatedAnnotationVisitor.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.openapi.editor.colors.CodeInsightColors; @@ -25,21 +25,21 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.JetNodeTypes; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; 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.resolve.constants.CompileTimeConstant; -import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.TypeUtils; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java index fbea2a52482..f96428d99e7 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.Annotator; @@ -22,15 +22,15 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -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 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.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; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java index 37b9d0d8d20..d183ea2a744 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; @@ -29,7 +30,6 @@ import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisitor { public FunctionsHighlightingVisitor(AnnotationHolder holder, BindingContext bindingContext) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.java similarity index 90% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HighlightingVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.java index 69649f9318a..d95cf955653 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HighlightingVisitor.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import org.jetbrains.kotlin.psi.JetVisitorVoid; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java index ec8307aa3fc..ebec50ef4ec 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.google.common.base.Predicate; import org.jetbrains.annotations.NotNull; @@ -25,19 +25,19 @@ import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; -import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition; -import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.kotlin.renderer.Renderer; +import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition; +import org.jetbrains.kotlin.types.JetType; import java.util.Iterator; import java.util.List; +import static org.jetbrains.kotlin.idea.highlighter.IdeRenderers.error; +import static org.jetbrains.kotlin.idea.highlighter.IdeRenderers.strong; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; -import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.error; -import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.strong; public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java index 5125f356e1a..34e18d31490 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; @@ -28,10 +28,10 @@ import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.RENDER_CLASS_OR_OBJECT; import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.STRING; import static org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TextElementType; +import static org.jetbrains.kotlin.idea.highlighter.HtmlTabledDescriptorRenderer.tableForTypes; +import static org.jetbrains.kotlin.idea.highlighter.IdeRenderers.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.ACCIDENTAL_OVERRIDE; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.CONFLICTING_JVM_DECLARATIONS; -import static org.jetbrains.jet.plugin.highlighter.HtmlTabledDescriptorRenderer.tableForTypes; -import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.*; /** diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.java index 83fb62fe89b..ddf86dda241 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.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,23 +14,23 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.Renderer; import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.renderer.Renderer; import java.util.Collection; import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.*; -import static org.jetbrains.jet.plugin.highlighter.renderersUtil.RenderersUtilPackage.renderResolvedCall; +import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderResolvedCall; public class IdeRenderers { private static final String RED_TEMPLATE = "%s"; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlighter.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlighter.java index 33f2608a0c0..e1b4ed0b000 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlighter.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlighter.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lexer.Lexer; import com.intellij.openapi.editor.colors.TextAttributesKey; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java index 68320d48dce..776e1ec14ce 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingColors.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.ide.highlighter.JavaHighlightingColors; import com.intellij.openapi.editor.DefaultLanguageHighlighterColors; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingLexer.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingLexer.java similarity index 92% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingLexer.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingLexer.java index 604926c4edc..2ae54d4d0dc 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetHighlightingLexer.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingLexer.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lexer.LayeredLexer; import com.intellij.psi.tree.IElementType; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt index 48f2619bc52..1971def975a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.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.highlighter +package org.jetbrains.kotlin.idea.highlighter import com.intellij.codeInsight.daemon.impl.HighlightRangeExtension import com.intellij.codeInsight.intention.EmptyIntentionAction diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetSyntaxHighlighterFactory.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetSyntaxHighlighterFactory.java similarity index 91% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetSyntaxHighlighterFactory.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetSyntaxHighlighterFactory.java index 41576158956..f28899827b9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetSyntaxHighlighterFactory.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetSyntaxHighlighterFactory.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory; import com.intellij.openapi.fileTypes.SyntaxHighlighter; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinProblemHighlightFilter.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinProblemHighlightFilter.kt similarity index 92% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinProblemHighlightFilter.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinProblemHighlightFilter.kt index b2c436ff1ab..ab3cceec4ef 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinProblemHighlightFilter.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinProblemHighlightFilter.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.highlighter +package org.jetbrains.kotlin.idea.highlighter import com.intellij.codeInsight.daemon.ProblemHighlightFilter import com.intellij.psi.PsiFile diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt index b48f7d1af31..80c79f25a62 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.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.highlighter +package org.jetbrains.kotlin.idea.highlighter import com.intellij.codeInspection.SuppressableProblemGroup import com.intellij.psi.PsiElement diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/LabelsHighlightingVisitor.java similarity index 93% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/LabelsHighlightingVisitor.java index 73f69d41962..ffc45c0accf 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/LabelsHighlightingVisitor.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import org.jetbrains.annotations.NotNull; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java index c739e35463c..54c587f0f84 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.psi.PsiElement; @@ -22,6 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; @@ -29,7 +30,6 @@ import org.jetbrains.kotlin.psi.JetThisExpression; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; -import org.jetbrains.kotlin.lexer.JetTokens; class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor { PropertiesHighlightingVisitor(AnnotationHolder holder, BindingContext bindingContext) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/SoftKeywordsHighlightingVisitor.java similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/SoftKeywordsHighlightingVisitor.java index af950e51690..b7a89f7a0cf 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/SoftKeywordsHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/SoftKeywordsHighlightingVisitor.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.ASTNode; import com.intellij.lang.annotation.AnnotationHolder; @@ -24,9 +24,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetFunctionLiteral; import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; -import org.jetbrains.kotlin.lexer.JetTokens; class SoftKeywordsHighlightingVisitor extends HighlightingVisitor { SoftKeywordsHighlightingVisitor(AnnotationHolder holder) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java index 6b8ded71ed2..70d3636198e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.openapi.editor.colors.TextAttributesKey; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java index 8104cce0057..c857db6f636 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.psi.PsiElement; @@ -24,11 +24,11 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.CaptureKind; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; import static org.jetbrains.kotlin.resolve.BindingContext.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.kt index ad1f75787e3..27ea467617c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/renderersUtil.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.highlighter.renderersUtil +package org.jetbrains.kotlin.idea.highlighter.renderersUtil import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.CallableDescriptor @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.resolve.calls.callUtil.* import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.plugin.highlighter.IdeRenderers +import org.jetbrains.kotlin.idea.highlighter.IdeRenderers import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor diff --git a/idea/src/META-INF/extensions/ide.xml b/idea/src/META-INF/extensions/ide.xml index 4bcf0a3e379..facaa577fcf 100644 --- a/idea/src/META-INF/extensions/ide.xml +++ b/idea/src/META-INF/extensions/ide.xml @@ -9,6 +9,6 @@ - + diff --git a/idea/src/META-INF/javaScriptDebug.xml b/idea/src/META-INF/javaScriptDebug.xml index 942117a878d..baaf7752b2f 100644 --- a/idea/src/META-INF/javaScriptDebug.xml +++ b/idea/src/META-INF/javaScriptDebug.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 7634dd8ce9c..44991952220 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -149,7 +149,7 @@ serviceImplementation="org.jetbrains.kotlin.idea.quickfix.ImportInsertHelperImpl"/> + serviceImplementation="org.jetbrains.kotlin.idea.decompiler.navigation.KotlinDeclarationNavigationPolicyImpl"/> @@ -186,8 +186,8 @@ - + @@ -215,7 +215,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -275,14 +275,14 @@ + implementationClass="org.jetbrains.kotlin.idea.completion.KotlinCompletionContributor"/> + implementationClass="org.jetbrains.kotlin.idea.completion.confidence.UnfocusedPossibleFunctionParameter"/> - + @@ -313,12 +313,12 @@ - - + + - - - + + + @@ -343,7 +343,7 @@ - + @@ -370,14 +370,14 @@ id="kotlinJavaSafeDeleteDelegate" language="jet" implementationClass="org.jetbrains.kotlin.idea.refactoring.safeDelete.KotlinJavaSafeDeleteDelegate"/> - - - - - - - - + + + + + + + + @@ -421,14 +421,14 @@ - + - + diff --git a/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java b/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java index 7208326f9ba..7be4ee9d569 100644 --- a/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java +++ b/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.components.ApplicationComponent; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.debugger.filter.FilterPackage; +import org.jetbrains.kotlin.idea.debugger.filter.FilterPackage; import org.jetbrains.kotlin.idea.quickfix.QuickFixRegistrar; import org.jetbrains.kotlin.utils.PathUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt b/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt index 5303c0fc272..180709785dc 100644 --- a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt +++ b/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt @@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.coverage.CoverageSuitesBundle import java.io.File import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.debugger.JetPositionManager +import org.jetbrains.kotlin.idea.debugger.JetPositionManager import org.jetbrains.jet.plugin.caches.resolve.getModuleInfo import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.openapi.roots.ProjectRootManager diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 7cfed48e800..e37970833db 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -37,7 +37,7 @@ 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.jet.plugin.decompiler.navigation.JetSourceNavigationHelper; +import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper; import org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex; import org.jetbrains.kotlin.renderer.DescriptorRenderer; 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 2f28f0c263f..d0b47f2ee85 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.DirectClassInheritorsSearch import com.intellij.util.Processor -import org.jetbrains.jet.plugin.decompiler.navigation.JetSourceNavigationHelper +import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper import org.jetbrains.jet.plugin.stubindex.JetSuperClassIndex import org.jetbrains.jet.plugin.search.fileScope import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope diff --git a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java b/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java index 2db0ce280cb..acc4dd8b349 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/util/DebuggerUtils.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; -import org.jetbrains.jet.plugin.debugger.DebuggerPackage; +import org.jetbrains.kotlin.idea.debugger.DebuggerPackage; import java.util.Collection; 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 06a6330d3db..ee692ed4e96 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 @@ -31,7 +31,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetCodeFragment -import org.jetbrains.jet.plugin.debugger.evaluate.KotlinRuntimeTypeEvaluator +import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinRuntimeTypeEvaluator import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences diff --git a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt index 06021d2033d..6b975dff1fc 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.codeInsight.completion.* import org.jetbrains.kotlin.asJava.KotlinLightClass diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt index 50f7460fa8b..06ce64b2eaf 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSession.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.codeInsight.completion.* import com.intellij.psi.PsiElement @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.* import org.jetbrains.kotlin.idea.codeInsight.ReferenceVariantsHelper -import org.jetbrains.jet.plugin.completion.smart.SmartCompletion +import org.jetbrains.kotlin.idea.completion.smart.SmartCompletion import org.jetbrains.jet.plugin.references.JetSimpleNameReference import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper import com.intellij.openapi.project.Project diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.kt index 55a7dbc2959..80f884266a7 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionSorting.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.codeInsight.completion.CompletionResultSet import com.intellij.codeInsight.completion.CompletionParameters @@ -23,16 +23,16 @@ import org.jetbrains.kotlin.psi.JetFile import com.intellij.codeInsight.lookup.LookupElementWeigher import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.WeighingContext -import org.jetbrains.jet.plugin.completion.* +import org.jetbrains.kotlin.idea.completion.* import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.name.isValidJavaFqName import org.jetbrains.kotlin.resolve.ImportPath import com.intellij.codeInsight.completion.CompletionType -import org.jetbrains.jet.plugin.completion.smart.NameSimilarityWeigher -import org.jetbrains.jet.plugin.completion.smart.SMART_COMPLETION_ITEM_PRIORITY_KEY -import org.jetbrains.jet.plugin.completion.smart.SmartCompletionItemPriority +import org.jetbrains.kotlin.idea.completion.smart.NameSimilarityWeigher +import org.jetbrains.kotlin.idea.completion.smart.SMART_COMPLETION_ITEM_PRIORITY_KEY +import org.jetbrains.kotlin.idea.completion.smart.SmartCompletionItemPriority import com.intellij.psi.PsiClass import java.util.HashSet import org.jetbrains.kotlin.name.FqName diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt index e0f460a0b75..e4bc9a20bdf 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.openapi.util.Key import com.intellij.codeInsight.lookup.LookupElement @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.Name import com.intellij.codeInsight.lookup.LookupElementPresentation import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.completion.InsertionContext -import org.jetbrains.jet.plugin.completion.handlers.CastReceiverInsertHandler +import org.jetbrains.kotlin.idea.completion.handlers.CastReceiverInsertHandler import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility @@ -64,7 +64,7 @@ import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler +import org.jetbrains.kotlin.idea.completion.handlers.WithTailInsertHandler import org.jetbrains.kotlin.psi.JetLoopExpression enum class ItemPriority { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/DataFlowInfoUtilForCompletion.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/DataFlowInfoUtilForCompletion.kt index a88ae2de0f1..6f989e65ad0 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/DataFlowInfoUtilForCompletion.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.completion +package org.jetbrains.kotlin.idea.completion import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DeclarationDescriptorLookupObject.kt b/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/completion/DeclarationDescriptorLookupObject.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.kt index d18d0cc1956..0078646ca2c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DeclarationDescriptorLookupObject.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/DeclarationDescriptorLookupObject.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt b/idea/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.kt index cc32f256783..53e4789960b 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/ExpectedInfos.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.completion +package org.jetbrains.kotlin.idea.completion import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.resolve.BindingContext @@ -61,7 +61,7 @@ import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.psi.JetReturnExpression import org.jetbrains.kotlin.resolve.bindingContextUtil.getTargetFunctionDescriptor -import org.jetbrains.jet.plugin.completion.smart.toList +import org.jetbrains.kotlin.idea.completion.smart.toList import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt index 2cbcedb91ac..e0a3fc6e8c4 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KeywordCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.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,20 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.psi.filters.* import com.intellij.psi.filters.position.LeftNeighbour import org.jetbrains.kotlin.psi.* import com.intellij.psi.PsiElement import com.intellij.psi.filters.position.PositionElementFilter -import com.intellij.codeInsight.completion.* -import org.jetbrains.jet.plugin.completion.handlers.KotlinFunctionInsertHandler +import org.jetbrains.kotlin.idea.completion.handlers.KotlinFunctionInsertHandler import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.psi.PsiErrorElement import org.jetbrains.kotlin.lexer.JetKeywordToken import com.intellij.openapi.project.Project -import org.jetbrains.jet.plugin.completion.handlers.KotlinKeywordInsertHandler +import org.jetbrains.kotlin.idea.completion.handlers.KotlinKeywordInsertHandler import org.jetbrains.kotlin.psi.psiUtil.siblings import org.jetbrains.kotlin.lexer.JetTokens.* diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.kt index 01f70ffbc19..d128933bbe5 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionCharFilter.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,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.codeInsight.lookup.CharFilter import com.intellij.codeInsight.lookup.Lookup import com.intellij.codeInsight.lookup.CharFilter.Result import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.util.Key -import org.jetbrains.kotlin.descriptors.VariableDescriptor public class KotlinCompletionCharFilter() : CharFilter() { class object { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt index e282c2eeee0..47caabf2bb3 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.codeInsight.completion.* import com.intellij.openapi.editor.Document @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.plugin.completion.smart.SmartCompletion +import org.jetbrains.kotlin.idea.completion.smart.SmartCompletion import com.intellij.patterns.PsiJavaPatterns.elementType import com.intellij.patterns.PsiJavaPatterns.psiElement diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LeafElementFilter.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/completion/LeafElementFilter.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.kt index ce34e80e9da..fb55ed942d3 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LeafElementFilter.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LeafElementFilter.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.psi.PsiElement import com.intellij.psi.filters.ClassFilter diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.kt index 8a50a123fd5..95ecce5d1dd 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementFactory.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.codeInsight.completion.InsertHandler import com.intellij.codeInsight.lookup.LookupElement @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.JetDescriptorIconProvider -import org.jetbrains.jet.plugin.completion.handlers.* +import org.jetbrains.kotlin.idea.completion.handlers.* import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.psi.PsiClass import org.jetbrains.kotlin.asJava.KotlinLightClass diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.kt index 351585f5a8b..2321be35c60 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/LookupElementsCollector.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.codeInsight.completion.InsertionContext import com.intellij.codeInsight.lookup.LookupElement @@ -22,7 +22,7 @@ import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.completion.handlers.* +import org.jetbrains.kotlin.idea.completion.handlers.* import com.intellij.codeInsight.completion.PrefixMatcher import java.util.ArrayList import com.intellij.codeInsight.completion.CompletionResultSet diff --git a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.kt index f6dc8564230..3d5cf3c23bb 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/NamedParametersCompletion.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.completion +package org.jetbrains.kotlin.idea.completion import org.jetbrains.kotlin.psi.JetValueArgument import org.jetbrains.kotlin.lexer.JetTokens @@ -38,7 +38,7 @@ import com.intellij.psi.PsiElement import com.intellij.codeInsight.completion.InsertHandler import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler +import org.jetbrains.kotlin.idea.completion.handlers.WithTailInsertHandler import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType object NamedParametersCompletion { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/PackageDirectiveCompletion.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/PackageDirectiveCompletion.kt index 01873f0d944..d1f77e11863 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/PackageDirectiveCompletion.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.completion +package org.jetbrains.kotlin.idea.completion import com.intellij.codeInsight.completion.* import com.intellij.openapi.progress.ProcessCanceledException diff --git a/idea/src/org/jetbrains/jet/plugin/completion/ToFromOriginalFileMapper.kt b/idea/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/ToFromOriginalFileMapper.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt index 0e93789da7c..e9a1486b1f0 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/ToFromOriginalFileMapper.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.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.completion +package org.jetbrains.kotlin.idea.completion import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetDeclaration diff --git a/idea/src/org/jetbrains/jet/plugin/completion/confidence/UnfocusedPossibleFunctionParameter.java b/idea/src/org/jetbrains/kotlin/idea/completion/confidence/UnfocusedPossibleFunctionParameter.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/completion/confidence/UnfocusedPossibleFunctionParameter.java rename to idea/src/org/jetbrains/kotlin/idea/completion/confidence/UnfocusedPossibleFunctionParameter.java index 29d5980c1c9..f0a81047b0e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/confidence/UnfocusedPossibleFunctionParameter.java +++ b/idea/src/org/jetbrains/kotlin/idea/completion/confidence/UnfocusedPossibleFunctionParameter.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.completion.confidence; +package org.jetbrains.kotlin.idea.completion.confidence; import com.intellij.codeInsight.completion.CompletionConfidence; import com.intellij.codeInsight.completion.CompletionParameters; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/BaseDeclarationInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/BaseDeclarationInsertHandler.kt similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/BaseDeclarationInsertHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/handlers/BaseDeclarationInsertHandler.kt index fd5ef728993..b330f2f0cfc 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/BaseDeclarationInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/BaseDeclarationInsertHandler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.handlers +package org.jetbrains.kotlin.idea.completion.handlers import com.intellij.codeInsight.completion.InsertHandler import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.completion.InsertionContext -import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject +import org.jetbrains.kotlin.idea.completion.DeclarationDescriptorLookupObject import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.kt index 0d70bb264d6..cb934cfb3fd 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/GenerateLambda.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.completion.handlers +package org.jetbrains.kotlin.idea.completion.handlers import com.intellij.openapi.command.CommandProcessor import com.intellij.codeInsight.completion.InsertionContext @@ -34,7 +34,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiDocumentManager import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.plugin.completion.ExpectedInfos +import org.jetbrains.kotlin.idea.completion.ExpectedInfos import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.jet.plugin.util.application.runWriteAction diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.kt index 4afc7abac95..f3456629d33 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinCallableInsertHandler.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.completion.handlers +package org.jetbrains.kotlin.idea.completion.handlers import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.completion.InsertionContext @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper import com.intellij.openapi.editor.Document import org.jetbrains.kotlin.types.JetType import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject +import org.jetbrains.kotlin.idea.completion.DeclarationDescriptorLookupObject import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetSimpleNameExpression @@ -43,11 +43,11 @@ import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode +import org.jetbrains.kotlin.idea.completion.qualifiedNameForSourceCode import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetTypeArgumentList import com.intellij.codeInsight.lookup.Lookup -import org.jetbrains.jet.plugin.completion.isAfterDot +import org.jetbrains.kotlin.idea.completion.isAfterDot public abstract class KotlinCallableInsertHandler : BaseDeclarationInsertHandler() { public override fun handleInsert(context: InsertionContext, item: LookupElement) { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt index c78df30664f..7f6e60bf9ae 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinClassInsertHandler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.handlers +package org.jetbrains.kotlin.idea.completion.handlers import com.intellij.codeInsight.completion.InsertionContext import com.intellij.codeInsight.lookup.LookupElement import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.idea.codeInsight.ShortenReferences -import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject +import org.jetbrains.kotlin.idea.completion.DeclarationDescriptorLookupObject import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode +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.resolve.BindingContext import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode -import org.jetbrains.jet.plugin.completion.isAfterDot +import org.jetbrains.kotlin.idea.completion.isAfterDot public object KotlinClassInsertHandler : BaseDeclarationInsertHandler() { override fun handleInsert(context: InsertionContext, item: LookupElement) { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinKeywordInsertHandler.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinKeywordInsertHandler.kt index 3db923ed920..dfe36cc40f0 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinKeywordInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinKeywordInsertHandler.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.completion.handlers +package org.jetbrains.kotlin.idea.completion.handlers import com.intellij.codeInsight.completion.InsertHandler import com.intellij.codeInsight.completion.InsertionContext diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandler.kt b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt index 3592a4c96e5..c932d6c5484 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/WithTailInsertHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/handlers/WithTailInsertHandler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.handlers +package org.jetbrains.kotlin.idea.completion.handlers import com.intellij.codeInsight.completion.* import com.intellij.codeInsight.lookup.LookupElement import com.intellij.psi.PsiDocumentManager import com.intellij.codeInsight.AutoPopupController import com.intellij.codeInsight.lookup.Lookup -import org.jetbrains.jet.plugin.completion.smart.SmartCompletion -import org.jetbrains.jet.plugin.completion.KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY +import org.jetbrains.kotlin.idea.completion.smart.SmartCompletion +import org.jetbrains.kotlin.idea.completion.KEEP_OLD_ARGUMENT_LIST_ON_TAB_KEY import com.intellij.openapi.util.TextRange class WithTailInsertHandler(val tailText: String, diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/KeywordValues.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/KeywordValues.kt index abae45988c0..ed73a776f65 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/KeywordValues.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.smart +package org.jetbrains.kotlin.idea.completion.smart import com.intellij.codeInsight.lookup.LookupElement -import org.jetbrains.jet.plugin.completion.ExpectedInfo +import org.jetbrains.kotlin.idea.completion.ExpectedInfo import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.kotlin.psi.* import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.completion.InsertionContext -import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler +import org.jetbrains.kotlin.idea.completion.handlers.WithTailInsertHandler import org.jetbrains.kotlin.types.TypeSubstitutor object KeywordValues { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/LambdaItems.kt similarity index 86% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/LambdaItems.kt index 5c44fdf292e..0164f7c3bd5 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/LambdaItems.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.smart +package org.jetbrains.kotlin.idea.completion.smart import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.completion.handlers.insertLambdaTemplate +import org.jetbrains.kotlin.idea.completion.handlers.insertLambdaTemplate import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.plugin.completion.KotlinCompletionCharFilter -import org.jetbrains.jet.plugin.completion.ExpectedInfo -import org.jetbrains.jet.plugin.completion.handlers.buildLambdaPresentation -import org.jetbrains.jet.plugin.completion.suppressAutoInsertion +import org.jetbrains.kotlin.idea.completion.ExpectedInfo +import org.jetbrains.kotlin.idea.completion.handlers.buildLambdaPresentation +import org.jetbrains.kotlin.idea.completion.suppressAutoInsertion object LambdaItems { public fun addToCollection(collection: MutableCollection, functionExpectedInfos: Collection) { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt index cf16c3d1d51..8ad218bd19b 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.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,25 +14,25 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.smart +package org.jetbrains.kotlin.idea.completion.smart -import org.jetbrains.jet.plugin.completion.ExpectedInfo +import org.jetbrains.kotlin.idea.completion.ExpectedInfo import org.jetbrains.kotlin.psi.JetExpression import com.intellij.codeInsight.lookup.LookupElement import com.intellij.ui.LayeredIcon import com.intellij.codeInsight.lookup.LookupElementBuilder -import org.jetbrains.jet.plugin.completion.Tail -import org.jetbrains.jet.plugin.completion.ItemPriority +import org.jetbrains.kotlin.idea.completion.Tail +import org.jetbrains.kotlin.idea.completion.ItemPriority import org.jetbrains.kotlin.resolve.BindingContext import java.util.HashSet import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.plugin.JetDescriptorIconProvider import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.plugin.completion.PositionalArgumentExpectedInfo +import org.jetbrains.kotlin.idea.completion.PositionalArgumentExpectedInfo import java.util.ArrayList import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.completion.assignPriority +import org.jetbrains.kotlin.idea.completion.assignPriority import com.intellij.codeInsight.lookup.Lookup import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.checker.JetTypeChecker diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/NameSimilarity.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/NameSimilarity.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/NameSimilarity.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/NameSimilarity.kt index 287944223e1..dc5f5782110 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/NameSimilarity.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/NameSimilarity.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.smart +package org.jetbrains.kotlin.idea.completion.smart import com.intellij.openapi.util.Key import com.intellij.codeInsight.lookup.LookupElementWeigher import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.WeighingContext -import org.jetbrains.jet.plugin.completion.ExpectedInfo +import org.jetbrains.kotlin.idea.completion.ExpectedInfo import com.intellij.psi.codeStyle.NameUtil val NAME_SIMILARITY_KEY = Key("NAME_SIMILARITY_KEY") diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.kt index c65560023bf..d4b51b1e771 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletion.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.completion.smart +package org.jetbrains.kotlin.idea.completion.smart import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.resolve.* @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.types.* import com.intellij.codeInsight.lookup.* import com.intellij.codeInsight.completion.* import java.util.* -import org.jetbrains.jet.plugin.completion.* +import org.jetbrains.kotlin.idea.completion.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.idea.util.makeNotNullable import org.jetbrains.kotlin.idea.util.makeNullable diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.kt index 1cc218545b2..6c71e2ded88 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/StaticMembers.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.completion.smart +package org.jetbrains.kotlin.idea.completion.smart import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.kotlin.types.TypeUtils @@ -25,16 +25,16 @@ import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.completion.InsertionContext import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.completion.ExpectedInfo -import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode +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.jet.plugin.completion.LookupElementFactory +import org.jetbrains.kotlin.idea.completion.LookupElementFactory import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.idea.util.fuzzyReturnType import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.plugin.completion.isVisible +import org.jetbrains.kotlin.idea.completion.isVisible // adds java static members, enum members and members from class object class StaticMembers( diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt index 588c0027589..57331e821cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.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.completion.smart +package org.jetbrains.kotlin.idea.completion.smart import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.kotlin.types.JetType @@ -28,9 +28,9 @@ import org.jetbrains.kotlin.idea.codeInsight.ImplementMethodsHandler import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation import com.intellij.codeInsight.completion.InsertionContext -import org.jetbrains.jet.plugin.completion.handlers.KotlinFunctionInsertHandler -import org.jetbrains.jet.plugin.completion.* -import org.jetbrains.jet.plugin.completion.handlers.CaretPosition +import org.jetbrains.kotlin.idea.completion.handlers.KotlinFunctionInsertHandler +import org.jetbrains.kotlin.idea.completion.* +import org.jetbrains.kotlin.idea.completion.handlers.CaretPosition import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.idea.util.makeNotNullable diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypesWithSmartCasts.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/TypesWithSmartCasts.kt index d0bd181131f..1bf064fc25c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/TypesWithSmartCasts.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.completion.smart +package org.jetbrains.kotlin.idea.completion.smart import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.types.JetType diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt rename to idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt index 3df863f7d89..de447ef6558 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/completion/smart/Utils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.completion.smart +package org.jetbrains.kotlin.idea.completion.smart import com.intellij.codeInsight.completion.InsertHandler import com.intellij.codeInsight.lookup.LookupElement @@ -28,9 +28,9 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.codeInsight.lookup.LookupElementPresentation -import org.jetbrains.jet.plugin.completion.* +import org.jetbrains.kotlin.idea.completion.* import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler +import org.jetbrains.kotlin.idea.completion.handlers.WithTailInsertHandler import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import com.intellij.openapi.util.Key diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/DiagnosticSuppressorForDebugger.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt rename to idea/src/org/jetbrains/kotlin/idea/debugger/DiagnosticSuppressorForDebugger.kt index 414f99644fb..cc12da6f41a 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/DiagnosticSuppressorForDebugger.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.debugger +package org.jetbrains.kotlin.idea.debugger import org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression import org.jetbrains.kotlin.diagnostics.Diagnostic diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt rename to idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt index b841e7d55e0..675aa011835 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.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,19 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger +package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.NoDataException import com.intellij.debugger.PositionManager import com.intellij.debugger.SourcePosition import com.intellij.debugger.engine.DebugProcess import com.intellij.debugger.requests.ClassPrepareRequestor -import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.project.DumbService -import com.intellij.openapi.project.Project import com.intellij.openapi.roots.libraries.LibraryUtil import com.intellij.openapi.util.Pair -import com.intellij.openapi.util.Ref import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.search.GlobalSearchScope @@ -36,39 +33,28 @@ import com.sun.jdi.Location import com.sun.jdi.ReferenceType import com.sun.jdi.request.ClassPrepareRequest import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.ClassBuilderFactories import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.codegen.state.JetTypeMapper import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.* -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall -import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument import org.jetbrains.kotlin.resolve.extension.InlineAnalyzerExtension 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.InlineStrategy import org.jetbrains.kotlin.builtins.InlineUtil -import org.jetbrains.jet.plugin.caches.resolve.IdeaModuleInfo -import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheService import org.jetbrains.jet.plugin.caches.resolve.* import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.jet.plugin.util.DebuggerUtils -import org.jetbrains.org.objectweb.asm.Type import java.util.* import org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import com.intellij.psi.stubs.StubElement import org.jetbrains.jet.plugin.util.application.runReadAction public class JetPositionManager(private val myDebugProcess: DebugProcess) : PositionManager { diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManagerFactory.java b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManagerFactory.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManagerFactory.java rename to idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManagerFactory.java index c90d53dfb6e..bc75e860f00 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManagerFactory.java +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManagerFactory.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.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.intellij.debugger.PositionManager; import com.intellij.debugger.PositionManagerFactory; diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinDebuggerSettings.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/debugger/KotlinDebuggerSettings.kt rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.kt index 1a316250151..3c76c3a8839 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinDebuggerSettings.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerSettings.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.debugger +package org.jetbrains.kotlin.idea.debugger import com.intellij.openapi.components.State @@ -28,9 +28,6 @@ import com.intellij.xdebugger.settings.DebuggerSettingsCategory import com.intellij.xdebugger.settings.XDebuggerSettings import com.intellij.xdebugger.XDebuggerUtil -import com.intellij.ui.classFilter.ClassFilter -import com.intellij.debugger.settings.DebuggerSettings -import java.util.Arrays State(name = "KotlinDebuggerSettings", storages = array(Storage(file = StoragePathMacros.APP_CONFIG + "/kotlin_debug.xml"))) public class KotlinDebuggerSettings : XDebuggerSettings("kotlin_debugger"), Getter { @@ -61,4 +58,4 @@ public class KotlinDebuggerSettings : XDebuggerSettings( override fun loadState(state: KotlinDebuggerSettings?) { if (state != null) XmlSerializerUtil.copyBean(state, this) } -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinEditorTextProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/debugger/KotlinEditorTextProvider.kt rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt index cc455394214..ff4ab6df90f 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinEditorTextProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.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.debugger +package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.impl.EditorTextProvider import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinJavaScriptBreakpointAware.java b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinJavaScriptBreakpointAware.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/debugger/KotlinJavaScriptBreakpointAware.java rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinJavaScriptBreakpointAware.java index a4892353b70..8e33f01b007 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinJavaScriptBreakpointAware.java +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinJavaScriptBreakpointAware.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.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.kt index d41ddc8bb63..168793c56b5 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSmartStepIntoHandler.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.debugger +package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.actions.JvmSmartStepIntoHandler import com.intellij.debugger.SourcePosition diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.kt index 72d9b4c7589..62f6511b3c3 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSourcePositionProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSourcePositionProvider.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.debugger +package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.engine.SourcePositionProvider import com.intellij.debugger.ui.tree.NodeDescriptor @@ -35,12 +35,9 @@ import com.sun.jdi.ClassNotPreparedException import com.intellij.debugger.ui.tree.FieldDescriptor import com.intellij.debugger.ui.tree.LocalVariableDescriptor import com.intellij.debugger.impl.PositionUtil -import com.intellij.psi.PsiVariable -import com.intellij.psi.PsiFile import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.resolve.BindingContextUtils diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.form b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.form similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.form rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.form index 6ab0aa6b9f7..ae4ed8d29f7 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.form +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.form @@ -1,5 +1,5 @@ -
+ diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.java b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.java rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.java index 5e674cfd6ca..5be66cba39c 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSteppingConfigurableUi.java +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinSteppingConfigurableUi.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.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.intellij.openapi.options.ConfigurableUi; @@ -47,4 +47,4 @@ public class KotlinSteppingConfigurableUi implements ConfigurableUi(5) diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt rename to idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt index 595d3d7df88..9d13f53fa95 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.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.highlighter.markers +package org.jetbrains.kotlin.idea.highlighter.markers import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.resolve.OverrideResolver diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt index 90107011200..53e61f746bc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt @@ -53,7 +53,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.diagnostics.Errors import com.intellij.psi.util.PsiModificationTracker -import org.jetbrains.jet.plugin.completion.isVisible +import org.jetbrains.kotlin.idea.completion.isVisible import org.jetbrains.kotlin.utils.CachedValueProperty /** diff --git a/idea/testData/diagnosticMessage/conflictingSubstitutions.kt b/idea/testData/diagnosticMessage/conflictingSubstitutions.kt index a3de9a1dab4..62000750f45 100644 --- a/idea/testData/diagnosticMessage/conflictingSubstitutions.kt +++ b/idea/testData/diagnosticMessage/conflictingSubstitutions.kt @@ -1,6 +1,6 @@ // !DIAGNOSTICS_NUMBER: 2 // !DIAGNOSTICS: TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS -// see org.jetbrains.jet.plugin.highlighter.DiagnosticMessageTest +// see DiagnosticMessageTest import java.io.Closeable diff --git a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java index d8822866206..be70613d82f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java +++ b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java @@ -30,7 +30,7 @@ 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.jet.plugin.highlighter.IdeErrorMessages; +import org.jetbrains.kotlin.idea.highlighter.IdeErrorMessages; import java.util.Arrays; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java index 60bd5626243..f6440aaa7e2 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java @@ -21,7 +21,7 @@ import com.intellij.spellchecker.inspections.SpellCheckingInspection; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.plugin.highlighter.JetPsiChecker; +import org.jetbrains.kotlin.idea.highlighter.JetPsiChecker; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt index c5f0c208b19..6592cdf9288 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.completion import com.intellij.codeInsight.completion.CompletionType import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.jet.plugin.JetLightProjectDescriptor -import org.jetbrains.jet.plugin.completion.KeywordLookupObject +import org.jetbrains.kotlin.idea.completion.KeywordLookupObject import org.jetbrains.jet.plugin.project.TargetPlatform public abstract class AbstractKeywordCompletionTest : JetFixtureCompletionBaseTestCase() { diff --git a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt index fd8fee2d923..6ae9b204bb5 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.completion import org.jetbrains.jet.plugin.PluginTestCaseBase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.plugin.completion.renderDataFlowValue +import org.jetbrains.kotlin.idea.completion.renderDataFlowValue import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.openapi.util.io.FileUtil import java.io.File diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java index 8a1a76efff1..2810e7fc166 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.java @@ -31,8 +31,8 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerNavigationHandler; import org.jetbrains.jet.plugin.navigation.NavigationTestUtils; +import org.jetbrains.kotlin.idea.highlighter.markers.SuperDeclarationMarkerNavigationHandler; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.ReferenceUtils; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java index d8f3ebae11f..c624cdd148c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractJetPositionManagerTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.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.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -36,14 +36,14 @@ import com.sun.jdi.Location; import com.sun.jdi.ReferenceType; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.jet.plugin.project.PluginJetFilesProvider; +import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.plugin.project.PluginJetFilesProvider; import org.jetbrains.kotlin.utils.UtilsPackage; -import org.jetbrains.kotlin.backend.common.output.OutputFile; -import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt index f3d4110408f..c342b1db66c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractKotlinSteppingTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger +package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.engine.SuspendContextImpl -import org.jetbrains.jet.plugin.debugger.KotlinSmartStepIntoHandler.KotlinMethodSmartStepTarget -import org.jetbrains.jet.plugin.debugger.KotlinSmartStepIntoHandler.KotlinBasicStepMethodFilter +import org.jetbrains.kotlin.idea.debugger.KotlinSmartStepIntoHandler.KotlinMethodSmartStepTarget +import org.jetbrains.kotlin.idea.debugger.KotlinSmartStepIntoHandler.KotlinBasicStepMethodFilter import com.intellij.debugger.DebuggerManagerEx import com.intellij.debugger.ui.breakpoints.LineBreakpoint import com.intellij.debugger.actions.MethodSmartStepTarget diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.kt index aa79d2826c1..ef5ff31c994 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractSmartStepIntoTest.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.debugger +package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.actions.SmartStepTarget import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase @@ -26,7 +26,6 @@ import com.intellij.psi.util.PsiFormatUtil import com.intellij.psi.PsiSubstitutor import com.intellij.psi.util.PsiFormatUtilBase import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import com.intellij.testFramework.LightProjectDescriptor public abstract class AbstractSmartStepIntoTest : JetLightCodeInsightFixtureTestCase() { private val fixture: JavaCodeInsightTestFixture diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/JetPositionManagerTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/JetPositionManagerTestGenerated.java index 3f8963014ca..d07908c2d37 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/JetPositionManagerTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt rename to idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt index 1b96f10ef92..b113e960685 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.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.debugger +package org.jetbrains.kotlin.idea.debugger import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.SuspendContextImpl @@ -83,4 +83,4 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() { resume(this) } } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java index b30e46ba4d2..6942c4d179a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.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.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.intellij.debugger.impl.DescriptorTestCase; import com.intellij.debugger.impl.OutputChecker; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java index 9c40061488d..7eec8b7f9eb 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/MockLocation.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/MockLocation.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/debugger/MockLocation.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/MockLocation.java index efab00694a3..bc229e7391a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/MockLocation.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/MockLocation.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.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.sun.jdi.*; import org.jetbrains.annotations.NotNull; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/MockReferenceType.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/MockReferenceType.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/debugger/MockReferenceType.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/MockReferenceType.java index 5841b268ea1..ab2a568c9be 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/MockReferenceType.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/MockReferenceType.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.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.sun.jdi.*; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/MockVirtualMachine.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/MockVirtualMachine.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/debugger/MockVirtualMachine.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/MockVirtualMachine.java index fc3ff63bca3..755e96ea34c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/MockVirtualMachine.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/MockVirtualMachine.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.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.sun.jdi.*; import com.sun.jdi.event.EventQueue; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java index 76a075b5c96..f2ea9b57f00 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger; +package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index dee54d403ac..d834c0f2a23 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.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.debugger.evaluate +package org.jetbrains.kotlin.idea.debugger.evaluate import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt index 8d04bf77156..e326cdc2def 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.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.debugger.evaluate +package org.jetbrains.kotlin.idea.debugger.evaluate import com.intellij.debugger.DebuggerInvocationUtil import com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilderImpl @@ -22,7 +22,7 @@ import com.intellij.debugger.engine.evaluation.TextWithImportsImpl import com.intellij.debugger.engine.evaluation.CodeFragmentKind import com.intellij.debugger.engine.ContextUtil import com.intellij.debugger.engine.SuspendContextImpl -import org.jetbrains.jet.plugin.debugger.* +import org.jetbrains.kotlin.idea.debugger.* import org.junit.Assert import org.jetbrains.kotlin.idea.JetFileType import com.intellij.openapi.util.io.FileUtil diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt similarity index 90% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt index 2371883ff98..98c772b32e3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger.evaluate +package org.jetbrains.kotlin.idea.debugger.evaluate import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.jet.plugin.debugger.KotlinEditorTextProvider +import org.jetbrains.kotlin.idea.debugger.KotlinEditorTextProvider import org.jetbrains.jet.plugin.PluginTestCaseBase import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.junit.Assert @@ -35,4 +35,4 @@ public abstract class AbstractSelectExpressionForDebuggerTest : LightCodeInsight } override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/debugger/selectExpression"; -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java index dcbeb4d6e9a..bed52d19677 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger.evaluate; +package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index b65bdecf3e2..31118bc3cab 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.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.debugger.evaluate +package org.jetbrains.kotlin.idea.debugger.evaluate import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest import com.intellij.openapi.vfs.LocalFileSystem diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java index 2f8e6dfae13..af2758c5fbf 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger.evaluate; +package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java index e10f827e62f..bcf15c5da9e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger.evaluate; +package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java index decf76b2ec0..d68fa5efd53 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger.evaluate; +package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java index b06f915a446..591ba38bd51 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.debugger.evaluate; +package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/AbstractInternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt similarity index 91% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/AbstractInternalCompiledClassesTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt index cb19363b403..c14dcae7827 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/AbstractInternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.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,25 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.decompiler +package org.jetbrains.kotlin.idea.decompiler import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor -import org.jetbrains.jet.plugin.PluginTestCaseBase import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.load.java.JvmAbi import com.intellij.psi.PsiManager import org.junit.Assert -import com.intellij.psi.ClassFileViewProvider import com.intellij.psi.impl.compiled.ClsFileImpl import com.intellij.psi.PsiCompiledFile import com.intellij.psi.PsiJavaFile import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.* import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache -import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest +import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest public abstract class AbstractInternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase() { private fun isSyntheticClassOfKind(kind: KotlinSyntheticClass.Kind) : VirtualFile.() -> Boolean = { diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.kt index c13437e65b3..c37e0f4a8af 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/InternalCompiledClassesTest.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.decompiler +package org.jetbrains.kotlin.idea.decompiler import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.java similarity index 90% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.java index 76a384d2f48..e3ec1268e80 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibraryTest.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.decompiler.navigation; +package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index 2163d8dfe9e..153becff09b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.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.decompiler.navigation +package org.jetbrains.kotlin.idea.decompiler.navigation import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java index a83762fd420..5707a0173ba 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.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.decompiler.navigation; +package org.jetbrains.kotlin.idea.decompiler.navigation; import com.google.common.collect.Maps; import com.intellij.openapi.editor.Document; @@ -29,15 +29,14 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; -import com.intellij.psi.impl.compiled.ClsFileImpl; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.kotlin.idea.decompiler.JetClsFile; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; -import org.jetbrains.jet.plugin.decompiler.JetClsFile; import java.util.Map; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.java index febd8a37f8a..8c988d41092 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibraryRegressionTest.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.decompiler.navigation; +package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.java index 6eadad1ae6b..cddce2cad3d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTest.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.decompiler.navigation; +package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.openapi.editor.Document; import com.intellij.openapi.roots.ProjectFileIndex; @@ -26,12 +26,14 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; import org.jetbrains.jet.plugin.navigation.NavigationTestUtils; import org.jetbrains.jet.plugin.references.JetReference; +import org.jetbrains.kotlin.test.JetTestUtils; -import java.util.*; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; /** * Attaching library with sources, and trying to navigate to its entities from source code. diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java index 1c8308290f1..eacfd238251 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.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.decompiler.navigation; +package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.openapi.application.ApplicationManager; import com.intellij.psi.PsiElement; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt index 11fe525c81f..3fcd4a18eec 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.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.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java index 16fb5eec19c..578dff7fa5e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.decompiler.stubBuilder; +package org.jetbrains.kotlin.idea.decompiler.stubBuilder; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt similarity index 92% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt index b12fbafeb2f..759a323aeaa 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.plugin.decompiler.textBuilder.buildDecompiledText +import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.util.indexing.FileContentImpl import org.jetbrains.kotlin.psi.JetPsiFactory diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt similarity index 88% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt index 08283ba99ed..da358190907 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.decompiler.stubBuilder +package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor import java.io.File import org.jetbrains.kotlin.test.JetTestCaseBuilder -import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest +import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { @@ -37,4 +37,4 @@ class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { override fun getProjectDescriptor(): LightProjectDescriptor { return JetJdkAndLibraryProjectDescriptor(File(JetTestCaseBuilder.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt similarity index 91% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt index 244f5bb9a53..e6b7389e175 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.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.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.psi.PsiManager import com.intellij.testFramework.LightProjectDescriptor @@ -24,12 +24,12 @@ import com.intellij.testFramework.UsefulTestCase.* import org.junit.Assert.* import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.JetLightProjectDescriptor -import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest +import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest import com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.psi.PsiErrorElement import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.psi.PsiFile -import org.jetbrains.jet.plugin.decompiler.JetClsFile +import org.jetbrains.kotlin.idea.decompiler.JetClsFile public abstract class AbstractDecompiledTextTest() : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index ebaa94abf24..8d9bcd50ea7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.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.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor @@ -37,8 +37,6 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.plugin.decompiler.stubBuilder.KotlinClsStubBuilder -import com.intellij.util.indexing.FileContentImpl public class DecompiledTextConsistencyTest : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt similarity index 85% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index 6459ffe4615..cb0fe58d868 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.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.decompiler.textBuilder +package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.test.JetTestCaseBuilder @@ -23,12 +23,12 @@ import org.junit.Assert import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor import java.io.File import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest +import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.ANONYMOUS_FUNCTION -import org.jetbrains.jet.plugin.decompiler.AbstractInternalCompiledClassesTest -import org.jetbrains.jet.plugin.decompiler.stubBuilder.findClassFileByName -import org.jetbrains.jet.plugin.decompiler.JetClsFile +import org.jetbrains.kotlin.idea.decompiler.AbstractInternalCompiledClassesTest +import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName +import org.jetbrains.kotlin.idea.decompiler.JetClsFile public class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest() { diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextTestGenerated.java index fb8fd1dc8f6..ef12fd2eaf7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.decompiler.textBuilder; +package org.jetbrains.kotlin.idea.decompiler.textBuilder; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java rename to idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java index 86604ef23de..84f563b2919 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.google.common.collect.Sets; import com.intellij.openapi.util.Condition; @@ -22,19 +22,19 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.JetLiteFixture; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.lang.reflect.Field; @@ -42,7 +42,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.plugin.highlighter.formatHtml.FormatHtmlPackage.formatHtml; +import static org.jetbrains.kotlin.idea.highlighter.formatHtml.FormatHtmlPackage.formatHtml; public abstract class AbstractDiagnosticMessageTest extends JetLiteFixture { private static final String DIAGNOSTICS_NUMBER_DIRECTIVE = "DIAGNOSTICS_NUMBER"; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java rename to idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java index 5f251a50df9..2e06c024cbe 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.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.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; import com.intellij.codeInsight.daemon.impl.HighlightInfo; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java index d6b75ddb58a..b4fa1ecff39 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/FormatHtmlUtil.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/FormatHtmlUtil.kt similarity index 93% rename from idea/tests/org/jetbrains/jet/plugin/highlighter/FormatHtmlUtil.kt rename to idea/tests/org/jetbrains/kotlin/idea/highlighter/FormatHtmlUtil.kt index d8660d5b0ba..99a0702bd38 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/FormatHtmlUtil.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/FormatHtmlUtil.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.highlighter.formatHtml +package org.jetbrains.kotlin.idea.highlighter.formatHtml private fun formatHtml(html: String): String { var message = html @@ -37,4 +37,4 @@ private fun formatHtml(html: String): String { message = message.replace("<", "<`").replace(">", ">") message = message.split("(\r|\n|\r\n)+").map { s -> s.trimTrailing() }.filter { s -> !s.isEmpty() }.makeString("\n") return message -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java index bfd580d980f..8377c6165ae 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.highlighter; +package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt rename to idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.kt index fee5456252d..a5db8317948 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/NoErrorsInStdlibTest.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.highlighter +package org.jetbrains.kotlin.idea.highlighter import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor