Rename and restructure plugin.libraries package

Rename: libraries -> decompiler
New subpackages: textBuilder, navigation

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<String>) {
     System.setProperty("java.awt.headless", "true")

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;

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

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

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));
     }
 }

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,

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) {
 

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

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;

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

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)) {

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;
     }
 

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;

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

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)

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

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.*

idea/src/META-INF/plugin.xml

@@ -396,8 +396,8 @@
     <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetAnnotationsIndex"/>
     <stubIndex implementation="org.jetbrains.jet.plugin.stubindex.JetTopLevelObjectShortNameIndex"/>
 
-    <psi.classFileDecompiler implementation="org.jetbrains.jet.plugin.libraries.JetClassFileDecompiler"/>
-    <psi.classFileDecompiler implementation="org.jetbrains.jet.plugin.libraries.JetDecompilerForWrongAbiVersion"/>
+    <psi.classFileDecompiler implementation="org.jetbrains.jet.plugin.decompiler.JetClassFileDecompiler"/>
+    <psi.classFileDecompiler implementation="org.jetbrains.jet.plugin.decompiler.JetDecompilerForWrongAbiVersion"/>
 
     <fileBasedIndex implementation="org.jetbrains.jet.plugin.versions.KotlinAbiVersionIndex"/>
     <fileBasedIndex implementation="org.jetbrains.jet.plugin.vfilefinder.KotlinClassFileIndex"/>

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;
 

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

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() {
 

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;

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

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);

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;

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;

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

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

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

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() {
 

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;