From e2f49536f561c3b34f30c0724c7e3cec6fe6187d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 19 Jan 2016 18:51:36 +0300 Subject: [PATCH] Move OldPackageFacadeClassUtils to module light-classes --- .../jetbrains/kotlin/asJava}/OldPackageFacadeClassUtils.java | 4 ++-- .../src/org/jetbrains/kotlin/asJava/StubClassBuilder.java | 1 - .../idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt | 2 +- .../stubBuilder/KotlinJavaScriptStubConsistencyTest.kt | 2 +- .../KotlinJavaScriptDecompiledTextConsistencyTest.kt | 2 +- .../idea/decompiler/textBuilder/TextConsistencyBaseTest.kt | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) rename {core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin => compiler/light-classes/src/org/jetbrains/kotlin/asJava}/OldPackageFacadeClassUtils.java (95%) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/OldPackageFacadeClassUtils.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/OldPackageFacadeClassUtils.java similarity index 95% rename from core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/OldPackageFacadeClassUtils.java rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/OldPackageFacadeClassUtils.java index 5c9cfe87fe2..5923e665209 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/OldPackageFacadeClassUtils.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/OldPackageFacadeClassUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.load.kotlin; +package org.jetbrains.kotlin.asJava; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.ClassId; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java index 32ea92e15d6..d9a7547da8e 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java @@ -25,7 +25,6 @@ import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AbstractClassBuilder; -import org.jetbrains.kotlin.load.kotlin.OldPackageFacadeClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt index a9450eec26e..d11b09fd6c7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/KotlinJavaScriptMetaFileDecompiler.kt @@ -21,13 +21,13 @@ import com.intellij.psi.FileViewProvider import com.intellij.psi.PsiManager import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.psi.compiled.ClsStubBuilder +import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText import org.jetbrains.kotlin.idea.decompiler.textBuilder.ResolverForDecompiler import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText import org.jetbrains.kotlin.idea.decompiler.textBuilder.defaultDecompilerRendererOptions -import org.jetbrains.kotlin.load.kotlin.OldPackageFacadeClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt index 460beb14cd5..af7baf659d3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubConsistencyTest.kt @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder import com.intellij.openapi.vfs.VirtualFile +import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptStubBuilder import org.jetbrains.kotlin.idea.decompiler.js.buildDecompiledTextFromJsMetadata import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor import org.jetbrains.kotlin.idea.vfilefinder.JsVirtualFileFinder -import org.jetbrains.kotlin.load.kotlin.OldPackageFacadeClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.kotlin.name.FqName diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt index b18270e5863..0b0fa4e4edd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.openapi.vfs.VirtualFile +import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor @@ -24,7 +25,6 @@ import org.jetbrains.kotlin.idea.decompiler.js.buildDecompiledTextFromJsMetadata import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor import org.jetbrains.kotlin.idea.vfilefinder.JsVirtualFileFinder import org.jetbrains.kotlin.js.resolve.JsPlatform -import org.jetbrains.kotlin.load.kotlin.OldPackageFacadeClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt index eb925934e03..fbaa3b8c8e2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/TextConsistencyBaseTest.kt @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.openapi.vfs.VirtualFile +import org.jetbrains.kotlin.asJava.OldPackageFacadeClassUtils import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.incremental.components.NoLookupLocation -import org.jetbrains.kotlin.load.kotlin.OldPackageFacadeClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName