From d2d9813e1280a6fa67adda5cc0280b233760f490 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 27 Oct 2014 18:37:17 +0300 Subject: [PATCH] Rename and restructure plugin.libraries package Rename: libraries -> decompiler New subpackages: textBuilder, navigation --- .../jetbrains/jet/generators/tests/GenerateTests.kt | 2 +- .../resolve/IDELightClassGenerationSupport.java | 2 +- .../codeInsight/DescriptorToDeclarationUtil.kt | 2 +- .../{libraries => decompiler}/DecompiledUtils.kt | 2 +- .../JetClassFileDecompiler.java | 6 +++--- .../JetClassFileViewProvider.kt | 3 ++- .../plugin/{libraries => decompiler}/JetClsFile.kt | 3 ++- .../JetDecompilerForWrongAbiVersion.kt | 2 +- .../JetDummyClassFileViewProvider.java | 2 +- .../KotlinClsStubBuilder.kt | 2 +- .../navigation}/DecompiledNavigationUtils.java | 6 ++++-- .../navigation}/JetSourceNavigationHelper.java | 6 +++--- .../navigation}/MemberMatching.java | 2 +- .../textBuilder}/DecompiledTextFactory.kt | 2 +- .../textBuilder}/DeserializerForDecompiler.kt | 3 ++- .../textBuilder}/ResolverForDecompiler.kt | 2 +- .../textBuilder}/missingDependencies.kt | 2 +- idea/src/META-INF/plugin.xml | 4 ++-- .../hierarchy/KotlinTypeHierarchyProvider.java | 2 +- .../ideaExtensions/KotlinDirectInheritorsSearcher.kt | 2 +- .../InternalCompiledClassesTest.kt | 3 ++- .../navigation}/AbstractNavigateToLibraryTest.java | 2 +- .../navigation}/NavigateFromLibrarySourcesTest.kt | 2 +- .../navigation}/NavigateToDecompiledLibraryTest.java | 7 ++++--- .../navigation}/NavigateToLibraryRegressionTest.java | 2 +- .../navigation}/NavigateToLibrarySourceTest.java | 2 +- .../NavigateToStdlibSourceRegressionTest.java | 12 +----------- .../textBuilder}/AbstractDecompiledTextTest.kt | 3 ++- .../textBuilder}/DecompiledTextConsistencyTest.kt | 2 +- .../DecompiledTextForWrongAbiVersionTest.kt | 4 +++- .../textBuilder}/DecompiledTextTestGenerated.java | 2 +- 31 files changed, 49 insertions(+), 49 deletions(-) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler}/DecompiledUtils.kt (97%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler}/JetClassFileDecompiler.java (89%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler}/JetClassFileViewProvider.kt (93%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler}/JetClsFile.kt (94%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler}/JetDecompilerForWrongAbiVersion.kt (96%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler}/JetDummyClassFileViewProvider.java (99%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler}/KotlinClsStubBuilder.kt (96%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/DecompiledNavigationUtils.java (95%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/JetSourceNavigationHelper.java (99%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/MemberMatching.java (99%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler/textBuilder}/DecompiledTextFactory.kt (99%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler/textBuilder}/DeserializerForDecompiler.kt (98%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler/textBuilder}/ResolverForDecompiler.kt (94%) rename idea/idea-analysis/src/org/jetbrains/jet/plugin/{libraries => decompiler/textBuilder}/missingDependencies.kt (98%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler}/InternalCompiledClassesTest.kt (97%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/AbstractNavigateToLibraryTest.java (94%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/NavigateFromLibrarySourcesTest.kt (98%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/NavigateToDecompiledLibraryTest.java (96%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/NavigateToLibraryRegressionTest.java (98%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/NavigateToLibrarySourceTest.java (98%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/navigation}/NavigateToStdlibSourceRegressionTest.java (84%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/textBuilder}/AbstractDecompiledTextTest.kt (94%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/textBuilder}/DecompiledTextConsistencyTest.kt (98%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/textBuilder}/DecompiledTextForWrongAbiVersionTest.kt (91%) rename idea/tests/org/jetbrains/jet/plugin/{libraries => decompiler/textBuilder}/DecompiledTextTestGenerated.java (98%) diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index 807334e96af..99e4fb44133 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -95,7 +95,6 @@ import org.jetbrains.jet.plugin.navigation.AbstractKotlinGotoTest import org.jetbrains.jet.plugin.AbstractExpressionSelectionTest import org.jetbrains.jet.plugin.refactoring.move.AbstractJetMoveTest import org.jetbrains.jet.cfg.AbstractDataFlowTest -import org.jetbrains.jet.plugin.libraries.AbstractDecompiledTextTest import org.jetbrains.jet.plugin.imports.AbstractOptimizeImportsTest import org.jetbrains.jet.plugin.debugger.AbstractSmartStepIntoTest import org.jetbrains.jet.plugin.stubs.AbstractStubBuilderTest @@ -129,6 +128,7 @@ import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest import org.jetbrains.k2js.test.semantics.AbstractBridgeTest import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterMultiFileTest import org.jetbrains.jet.j2k.test.AbstractJavaToKotlinConverterForWebDemoTest +import org.jetbrains.jet.plugin.decompiler.textBuilder.AbstractDecompiledTextTest fun main(args: Array) { System.setProperty("java.awt.headless", "true") 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 621e04044e4..be903346422 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 @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.plugin.libraries.JetSourceNavigationHelper; +import org.jetbrains.jet.plugin.decompiler.navigation.JetSourceNavigationHelper; import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.plugin.stubindex.JetClassByPackageIndex; import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt index 2bc22b6abb9..0582eed2ede 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.libraries.DecompiledNavigationUtils +import org.jetbrains.jet.plugin.decompiler.navigation.DecompiledNavigationUtils import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver import java.util.HashSet import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt index 448b076f38c..a2f262b15a4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClassFileDecompiler.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileDecompiler.java similarity index 89% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClassFileDecompiler.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileDecompiler.java index 3305db1ff83..86f9c3383ee 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClassFileDecompiler.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileDecompiler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.FileViewProvider; @@ -28,7 +28,7 @@ public class JetClassFileDecompiler extends ClassFileDecompilers.Full { @Override public boolean accepts(@NotNull VirtualFile file) { - return LibrariesPackage.isKotlinCompiledFile(file); + return DecompilerPackage.isKotlinCompiledFile(file); } @NotNull @@ -40,6 +40,6 @@ public class JetClassFileDecompiler extends ClassFileDecompilers.Full { @NotNull @Override public FileViewProvider createFileViewProvider(@NotNull VirtualFile file, @NotNull PsiManager manager, boolean physical) { - return new JetClassFileViewProvider(manager, file, physical, LibrariesPackage.isKotlinInternalCompiledFile(file)); + return new JetClassFileViewProvider(manager, file, physical, DecompilerPackage.isKotlinInternalCompiledFile(file)); } } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClassFileViewProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt similarity index 93% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClassFileViewProvider.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt index 6853d0a10cd..a65641c5719 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClassFileViewProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler import com.intellij.openapi.fileTypes.FileType import com.intellij.openapi.project.Project @@ -24,6 +24,7 @@ import com.intellij.psi.PsiManager import com.intellij.psi.SingleRootFileViewProvider import org.jetbrains.jet.plugin.JetLanguage import kotlin.properties.Delegates +import org.jetbrains.jet.plugin.decompiler.textBuilder.buildDecompiledText public class JetClassFileViewProvider( manager: PsiManager, diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClsFile.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClsFile.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt index e70a04b478a..214c014bfab 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetClsFile.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler import com.intellij.openapi.util.TextRange import com.intellij.psi.impl.compiled.ClsFileImpl @@ -23,6 +23,7 @@ import org.jetbrains.annotations.TestOnly import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.psi.JetDeclaration import kotlin.properties.Delegates +import org.jetbrains.jet.plugin.decompiler.textBuilder.descriptorToKey public class JetClsFile(val provider: JetClassFileViewProvider) : ClsFileImpl(provider) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetDecompilerForWrongAbiVersion.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetDecompilerForWrongAbiVersion.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetDecompilerForWrongAbiVersion.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetDecompilerForWrongAbiVersion.kt index 9c09dad4e05..6ca2526ddc5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetDecompilerForWrongAbiVersion.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetDecompilerForWrongAbiVersion.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.openapi.vfs.VirtualFile diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetDummyClassFileViewProvider.java similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetDummyClassFileViewProvider.java index 4d79215f1c2..bc3b02cffc2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetDummyClassFileViewProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetDummyClassFileViewProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler; import com.intellij.lang.Language; import com.intellij.openapi.editor.Document; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/KotlinClsStubBuilder.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/KotlinClsStubBuilder.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/KotlinClsStubBuilder.kt index f6289f5b89e..6e57e514535 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/KotlinClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/KotlinClsStubBuilder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.compiled.ClsStubBuilder diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java index 883dee38bfe..d2b2dc54fdf 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledNavigationUtils.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.navigation; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -31,6 +31,8 @@ import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; +import org.jetbrains.jet.plugin.decompiler.DecompilerPackage; +import org.jetbrains.jet.plugin.decompiler.JetClsFile; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; @@ -58,7 +60,7 @@ public final class DecompiledNavigationUtils { DeclarationDescriptor effectiveReferencedDescriptor = getEffectiveReferencedDescriptor(referencedDescriptor); VirtualFile virtualFile = findVirtualFileContainingDescriptor(project, effectiveReferencedDescriptor); - if (virtualFile == null || !LibrariesPackage.isKotlinCompiledFile(virtualFile)) return null; + if (virtualFile == null || !DecompilerPackage.isKotlinCompiledFile(virtualFile)) return null; PsiFile psiFile = PsiManager.getInstance(project).findFile(virtualFile); if (!(psiFile instanceof JetClsFile)) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java index 02da02edaeb..57c81134cba 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.navigation; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -69,7 +69,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.plugin.libraries.MemberMatching.*; +import static org.jetbrains.jet.plugin.decompiler.navigation.MemberMatching.*; public class JetSourceNavigationHelper { private static boolean forceResolve = false; @@ -361,7 +361,7 @@ public class JetSourceNavigationHelper { } @TestOnly - static void setForceResolve(boolean forceResolve) { + public static void setForceResolve(boolean forceResolve) { JetSourceNavigationHelper.forceResolve = forceResolve; } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java index 4f2875d875e..dd6454a6cf2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.navigation; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledTextFactory.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt index 2615d115264..886be1bab10 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DecompiledTextFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.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/libraries/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt index b757b833b36..d3184815624 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler.textBuilder import org.jetbrains.jet.lang.resolve.name.ClassId import org.jetbrains.jet.descriptors.serialization.ClassDataFinder @@ -37,6 +37,7 @@ import org.jetbrains.jet.lang.PlatformToKotlinClassMap import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.descriptors.serialization.ClassData import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl +import org.jetbrains.jet.plugin.decompiler.isKotlinCompiledFile public fun DeserializerForDecompiler(classFile: VirtualFile): DeserializerForDecompiler { val kotlinClass = KotlinBinaryClassCache.getKotlinBinaryClass(classFile) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/ResolverForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/ResolverForDecompiler.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt index 0a4100cd043..1fe47ba2520 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/ResolverForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler.textBuilder import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.descriptors.ClassDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/missingDependencies.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/missingDependencies.kt rename to idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt index 9abcd517f86..3377e29fb38 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/libraries/missingDependencies.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler.textBuilder import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.descriptors.* diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index a56227c17f3..4bdc64b1358 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -396,8 +396,8 @@ - - + + diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 3ebb8d522c1..621af519278 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.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.libraries.JetSourceNavigationHelper; +import org.jetbrains.jet.plugin.decompiler.navigation.JetSourceNavigationHelper; import org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex; import org.jetbrains.jet.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 91c8b741294..c729fc79778 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt @@ -23,7 +23,7 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.DirectClassInheritorsSearch import com.intellij.util.Processor import org.jetbrains.jet.lang.psi.JetClassOrObject -import org.jetbrains.jet.plugin.libraries.JetSourceNavigationHelper +import org.jetbrains.jet.plugin.decompiler.navigation.JetSourceNavigationHelper import org.jetbrains.jet.plugin.stubindex.JetSuperClassIndex import org.jetbrains.jet.lang.resolve.* import java.util.Collections diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt rename to idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt index c9721f961a2..ebf98cec0ab 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/InternalCompiledClassesTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor @@ -31,6 +31,7 @@ import com.intellij.psi.PsiJavaFile import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.* import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache +import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest public class InternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractNavigateToLibraryTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/libraries/AbstractNavigateToLibraryTest.java rename to idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java index 3d0ff321a51..1c98de0445e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractNavigateToLibraryTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/AbstractNavigateToLibraryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.navigation; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/libraries/NavigateFromLibrarySourcesTest.kt rename to idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index 178fe9f214d..9071c404954 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler.navigation import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToDecompiledLibraryTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToDecompiledLibraryTest.java rename to idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java index 9a15ffa94d8..f7a25e0144e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToDecompiledLibraryTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToDecompiledLibraryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.navigation; import com.google.common.collect.Maps; import com.intellij.openapi.editor.Document; @@ -37,6 +37,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetDeclaration; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; +import org.jetbrains.jet.plugin.decompiler.JetClsFile; import java.util.Map; @@ -155,7 +156,7 @@ public class NavigateToDecompiledLibraryTest extends AbstractNavigateToLibraryTe } @NotNull - /*package*/ static VirtualFile getClassFile( + public static VirtualFile getClassFile( @NotNull String packageName, @NotNull String className, @NotNull Module module @@ -170,7 +171,7 @@ public class NavigateToDecompiledLibraryTest extends AbstractNavigateToLibraryTe } @Nullable - /*package*/ static VirtualFile findTestLibraryRoot(@NotNull Module module) { + public static VirtualFile findTestLibraryRoot(@NotNull Module module) { for (OrderEntry orderEntry : ModuleRootManager.getInstance(module).getOrderEntries()) { if (orderEntry instanceof LibraryOrderEntry) { return findTestLibraryRoot((LibraryOrderEntry) orderEntry); diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibraryRegressionTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibraryRegressionTest.java rename to idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java index 7f8c1f6df1d..3fbbf6a0023 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibraryRegressionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.navigation; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibrarySourceTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibrarySourceTest.java rename to idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java index e556d317dd6..75eee7f39c0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToLibrarySourceTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.navigation; import com.intellij.openapi.editor.Document; import com.intellij.openapi.roots.ProjectFileIndex; diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java similarity index 84% rename from idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java rename to idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java index 0925dcee241..1c8308290f1 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/NavigateToStdlibSourceRegressionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java @@ -14,25 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.navigation; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.vfs.VfsUtil; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiReference; import com.intellij.testFramework.LightPlatformTestCase; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.psi.JetClass; -import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; -import java.io.File; -import java.io.IOException; - public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegressionTest { /** * Regression test against KT-3186 diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt similarity index 94% rename from idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt rename to idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt index b46f166f5c9..604b5172979 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/AbstractDecompiledTextTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler.textBuilder import com.intellij.psi.PsiManager import com.intellij.psi.impl.compiled.ClsFileImpl @@ -25,6 +25,7 @@ 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 com.intellij.psi.PsiRecursiveElementVisitor import com.intellij.psi.PsiErrorElement import org.jetbrains.jet.lang.psi.JetPsiUtil diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt rename to idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index 9d4a65659ea..64320f2c3c0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler.textBuilder import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt similarity index 91% rename from idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextForWrongAbiVersionTest.kt rename to idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index 2d49509a905..0b8022582f7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries +package org.jetbrains.jet.plugin.decompiler.textBuilder import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor @@ -27,6 +27,8 @@ import java.io.File import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiJavaFile import com.intellij.psi.impl.compiled.ClsFileImpl +import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest +import org.jetbrains.jet.plugin.decompiler.INCOMPATIBLE_ABI_VERSION_COMMENT public class DecompiledTextForWrongAbiVersionTest : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java rename to idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java index db972afdbdd..cdc5c25dca4 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.libraries; +package org.jetbrains.jet.plugin.decompiler.textBuilder; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners;