azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dropping package facades:

Browse Source 
- light classes: do not generate light class for package facade
- drop package facades as multifile classes compilation mode support
- get rid of some additional package facade fqName usages
- update tests for light classes
This commit is contained in:
Dmitry Petrov
2015-10-15 18:13:04 +03:00
parent e7fb7483c5
commit 149e70aa07
42 changed files with 60 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt
+3 -10
View File
@@ -21,14 +21,7 @@ import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider
import org.jetbrains.kotlin.psi.JetFile
public class CodegenFileClassesProvider(private val packageFacadesAsMultifileClasses: Boolean) : JvmFileClassesProvider {
override public fun getFileClassInfo(file: JetFile): JvmFileClassInfo {
val fileClassInfo = JvmFileClassUtil.getFileClassInfoNoResolve(file)
if (packageFacadesAsMultifileClasses && !fileClassInfo.withJvmMultifileClass) {
return JvmFileClassUtil.getMultifilePackageFacadePartInfo(file)
}
else {
return fileClassInfo
}
}
public class CodegenFileClassesProvider : JvmFileClassesProvider {
override public fun getFileClassInfo(file: JetFile): JvmFileClassInfo =
JvmFileClassUtil.getFileClassInfoNoResolve(file)
}
compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java
+4 -10
View File
@@ -61,7 +61,7 @@ public class KotlinCodegenFacade {
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
MultiMap<FqName, JetFile> filesInPackageClasses = new MultiMap<FqName, JetFile>();
MultiMap<FqName, JetFile> filesInPackages = new MultiMap<FqName, JetFile>();
MultiMap<FqName, JetFile> filesInMultifileClasses = new MultiMap<FqName, JetFile>();
for (JetFile file : state.getFiles()) {
@@ -72,14 +72,8 @@ public class KotlinCodegenFacade {
if (fileClassInfo.getWithJvmMultifileClass()) {
filesInMultifileClasses.putValue(fileClassInfo.getFacadeClassFqName(), file);
}
if (state.getPackageFacadesAsMultifileClasses()) {
if (!fileClassInfo.getWithJvmMultifileClass()) {
filesInMultifileClasses.putValue(PackageClassUtils.getPackageClassFqName(file.getPackageFqName()), file);
}
}
else {
filesInPackageClasses.putValue(file.getPackageFqName(), file);
filesInPackages.putValue(file.getPackageFqName(), file);
}
}
@@ -90,9 +84,9 @@ public class KotlinCodegenFacade {
}
Set<FqName> packagesWithObsoleteParts = new HashSet<FqName>(state.getPackagesWithObsoleteParts());
for (FqName packageFqName : Sets.union(packagesWithObsoleteParts, filesInPackageClasses.keySet())) {
for (FqName packageFqName : Sets.union(packagesWithObsoleteParts, filesInPackages.keySet())) {
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
generatePackage(state, packageFqName, filesInPackageClasses.get(packageFqName), errorHandler);
generatePackage(state, packageFqName, filesInPackages.get(packageFqName), errorHandler);
}
ProgressIndicatorAndCompilationCanceledStatus.checkCanceled();
compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java
+4 -3
View File
@@ -22,6 +22,7 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl;
import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl;
import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil;
import org.jetbrains.kotlin.incremental.components.NoLookupLocation;
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor;
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
@@ -169,16 +170,16 @@ public class SamWrapperCodegen {
@NotNull
private FqName getWrapperName(@NotNull JetFile containingFile) {
FqName packageClassFqName = PackageClassUtils.getPackageClassFqName(containingFile.getPackageFqName());
FqName fileClassFqName = JvmFileClassUtil.getFileClassInfoNoResolve(containingFile).getFileClassFqName();
JavaClassDescriptor descriptor = samType.getJavaClassDescriptor();
int hash = PackagePartClassUtils.getPathHashCode(containingFile.getVirtualFile()) * 31 +
DescriptorUtils.getFqNameSafe(descriptor).hashCode();
String shortName = String.format(
"%s$sam$%s$%08x",
packageClassFqName.shortName().asString(),
fileClassFqName.shortName().asString(),
descriptor.getName().asString(),
hash
);
return packageClassFqName.parent().child(Name.identifier(shortName));
return fileClassFqName.parent().child(Name.identifier(shortName));
}
}
compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.kt
+1 -3
View File
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.codegen.optimization.OptimizationClassBuilderFactory
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.ScriptDescriptor
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
import org.jetbrains.kotlin.modules.TargetId
import org.jetbrains.kotlin.name.FqName
@@ -53,7 +52,6 @@ public class GenerationState @JvmOverloads constructor(
disableInline: Boolean = false,
disableOptimization: Boolean = false,
public val useTypeTableInSerializer: Boolean = false,
public val packageFacadesAsMultifileClasses: Boolean = false,
public val diagnostics: DiagnosticSink = DiagnosticSink.DO_NOTHING,
public val packagesWithObsoleteParts: Collection<FqName> = emptySet(),
public val obsoleteMultifileClasses: Collection<FqName> = emptySet(),
@@ -86,7 +84,7 @@ public class GenerationState @JvmOverloads constructor(
}
}
public val fileClassesProvider: CodegenFileClassesProvider = CodegenFileClassesProvider(packageFacadesAsMultifileClasses)
public val fileClassesProvider: CodegenFileClassesProvider = CodegenFileClassesProvider()
private fun getIncrementalCacheForThisTarget() =
if (incrementalCompilationComponents != null && targetId != null)
compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
+8 -12
View File
@@ -43,7 +43,6 @@ import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialGenericSignature.
import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor;
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor;
import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageScope;
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider;
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache;
import org.jetbrains.kotlin.name.*;
@@ -148,18 +147,13 @@ public class JetTypeMapper {
@NotNull
public Type mapOwner(@NotNull DeclarationDescriptor descriptor) {
return mapOwner(descriptor, false);
}
@NotNull
private Type mapOwner(@NotNull DeclarationDescriptor descriptor, boolean isImplementation) {
if (isLocalFunction(descriptor)) {
return asmTypeForAnonymousClass(bindingContext, (FunctionDescriptor) descriptor);
}
DeclarationDescriptor container = descriptor.getContainingDeclaration();
if (container instanceof PackageFragmentDescriptor) {
return Type.getObjectType(internalNameForPackageMemberOwner((CallableMemberDescriptor) descriptor, isImplementation));
return Type.getObjectType(internalNameForPackageMemberOwner((CallableMemberDescriptor) descriptor));
}
else if (container instanceof ClassDescriptor) {
return mapClass((ClassDescriptor) container);
@@ -184,7 +178,8 @@ public class JetTypeMapper {
if (isImplementation ||
descriptor instanceof PropertyDescriptor ||
Visibilities.isPrivate(visibility) ||
isAccessor/*Cause of KT-9603*/) {
isAccessor/*Cause of KT-9603*/
) {
return FileClasses.getFileClassInternalName(fileClassesProvider, file);
}
else {
@@ -199,8 +194,8 @@ public class JetTypeMapper {
if (facadeFqName != null) return facadeFqName;
}
throw new RuntimeException("Unreachable state");
//return PackageClassUtils.getPackageClassInternalName(packageFragment.getFqName());
throw new RuntimeException("Could not find package member for " + descriptor +
" in package fragment " + descriptor.getContainingDeclaration());
}
public static class ContainingClassesInfo {
@@ -268,6 +263,8 @@ public class JetTypeMapper {
return JvmClassName.byClassId(containingClasses.getFacadeClassId()).getInternalName();
}
private static final ClassId FAKE_CLASS_ID_FOR_BUILTINS = ClassId.topLevel(new FqName("kotlin.KotlinPackage"));
@Nullable
private ContainingClassesInfo getPackageMemberContainingClassesInfo(@NotNull DeserializedCallableMemberDescriptor descriptor) {
// XXX This method is a dirty hack.
@@ -279,8 +276,7 @@ public class JetTypeMapper {
PackageFragmentDescriptor packageFragmentDescriptor = (PackageFragmentDescriptor) containingDeclaration;
if (packageFragmentDescriptor instanceof BuiltinsPackageFragment) {
ClassId builtinsFacadeClassId = ClassId.topLevel(PackageClassUtils.getPackageClassFqName(packageFragmentDescriptor.getFqName()));
return new ContainingClassesInfo(builtinsFacadeClassId, builtinsFacadeClassId);
return new ContainingClassesInfo(FAKE_CLASS_ID_FOR_BUILTINS, FAKE_CLASS_ID_FOR_BUILTINS);
}
Name implClassName = JvmFileClassUtil.getImplClassName(descriptor);
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java
-3
View File
@@ -62,9 +62,6 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments {
@Argument(value = "Xno-optimize", description = "Disable optimizations")
public boolean noOptimize;
@Argument(value = "Xmultifile-package-facades", description = "Compile package facade classes as multifile classes")
public boolean packageFacadesAsMultifileClasses;
@Argument(value = "Xreport-perf", description = "Report detailed performance statistics")
public boolean reportPerf;
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
-1
View File
@@ -272,7 +272,6 @@ public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
configuration.put(JVMConfigurationKeys.DISABLE_PARAM_ASSERTIONS, arguments.noParamAssertions)
configuration.put(JVMConfigurationKeys.DISABLE_INLINE, arguments.noInline)
configuration.put(JVMConfigurationKeys.DISABLE_OPTIMIZATION, arguments.noOptimize)
configuration.put(JVMConfigurationKeys.PACKAGE_FACADES_AS_MULTIFILE_CLASSES, arguments.packageFacadesAsMultifileClasses);
}
private fun getClasspath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): List<File> {
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
-11
View File
@@ -142,17 +142,6 @@ public class CliLightClassGenerationSupport(project: Project) : LightClassGenera
return KotlinLightClassForExplicitDeclaration.create(psiManager, classOrObject)
}
override fun getPackageClasses(packageFqName: FqName, scope: GlobalSearchScope): Collection<PsiClass> {
val filesInPackage = findFilesForPackage(packageFqName, scope)
val filesWithCallables = PackagePartClassUtils.getFilesWithCallables(filesInPackage)
if (filesWithCallables.isEmpty()) return emptyList()
return emptyOrSingletonList<PsiClass>(
KotlinLightClassForFacade.createForPackageFacade(psiManager, packageFqName, scope, filesWithCallables)
)
}
override fun resolveClassToDescriptor(classOrObject: JetClassOrObject): ClassDescriptor? {
return bindingContext.get(BindingContext.CLASS, classOrObject)
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+2 -2
View File
@@ -44,6 +44,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.config.ContentRootsKt;
import org.jetbrains.kotlin.context.ModuleContext;
import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil;
import org.jetbrains.kotlin.idea.MainFunctionDetector;
import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager;
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
@@ -205,7 +206,7 @@ public class KotlinToJVMBytecodeCompiler {
return null;
}
FqName fqName = file.getPackageFqName();
mainClass = PackageClassUtils.getPackageClassFqName(fqName);
mainClass = JvmFileClassUtil.getFileClassInfoNoResolve(file).getFacadeClassFqName();
}
}
return mainClass;
@@ -399,7 +400,6 @@ public class KotlinToJVMBytecodeCompiler {
configuration.get(JVMConfigurationKeys.DISABLE_INLINE, false),
configuration.get(JVMConfigurationKeys.DISABLE_OPTIMIZATION, false),
/* useTypeTableInSerializer = */ false,
configuration.get(JVMConfigurationKeys.PACKAGE_FACADES_AS_MULTIFILE_CLASSES, false),
diagnosticHolder,
packagesWithObsoleteParts,
obsoleteMultifileClasses,
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java
-2
View File
@@ -39,8 +39,6 @@ public class JVMConfigurationKeys {
CompilerConfigurationKey.create("disable inline");
public static final CompilerConfigurationKey<Boolean> DISABLE_OPTIMIZATION =
CompilerConfigurationKey.create("disable optimization");
public static final CompilerConfigurationKey<Boolean> PACKAGE_FACADES_AS_MULTIFILE_CLASSES =
CompilerConfigurationKey.create("compile package facades as multifile classes");
public static final CompilerConfigurationKey<IncrementalCompilationComponents> INCREMENTAL_COMPILATION_COMPONENTS =
CompilerConfigurationKey.create("incremental cache provider");
compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
-9
View File
@@ -93,15 +93,6 @@ public object JvmFileClassUtil {
public fun getHiddenPartFqName(file: JetFile, jvmFileClassAnnotations: ParsedJmvFileClassAnnotations): FqName =
file.packageFqName.child(Name.identifier(manglePartName(jvmFileClassAnnotations.name, file.name)))
@JvmStatic
public fun getMultifilePackageFacadePartInfo(file: JetFile): JvmFileClassInfo {
val packageFqName = file.packageFqName
val packageFacadeFqName = PackageClassUtils.getPackageClassFqName(packageFqName)
val filePartName = manglePartName(packageFacadeFqName.shortName().asString(), file.name)
val filePartFqName = packageFqName.child(Name.identifier(filePartName))
return JvmMultifileClassPartInfo(filePartFqName, packageFacadeFqName)
}
@JvmStatic
public fun manglePartName(facadeName: String, fileName: String): String =
"${facadeName}__${PackagePartClassUtils.getFilePartShortName(fileName)}"
compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java
-6
View File
@@ -120,10 +120,6 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
answer.addAll(lightClassGenerationSupport.getFacadeClasses(qualifiedName, scope));
if (PackageClassUtils.isPackageClassFqName(qualifiedName)) {
answer.addAll(lightClassGenerationSupport.getPackageClasses(qualifiedName.parent(), scope));
}
return sortByClasspath(answer, scope).toArray(new PsiClass[answer.size()]);
}
@@ -171,7 +167,6 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
Collection<JetClassOrObject> declarations = lightClassGenerationSupport.findClassOrObjectDeclarationsInPackage(packageFQN, scope);
Set<String> answer = Sets.newHashSet();
answer.add(PackageClassUtils.getPackageClassName(packageFQN));
answer.addAll(lightClassGenerationSupport.getFacadeNames(packageFQN, scope));
for (JetClassOrObject declaration : declarations) {
@@ -224,7 +219,6 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
List<PsiClass> answer = new SmartList<PsiClass>();
FqName packageFQN = new FqName(psiPackage.getQualifiedName());
answer.addAll(lightClassGenerationSupport.getPackageClasses(packageFQN, scope));
answer.addAll(lightClassGenerationSupport.getFacadeClassesInPackage(packageFQN, scope));
Collection<JetClassOrObject> declarations = lightClassGenerationSupport.findClassOrObjectDeclarationsInPackage(packageFQN, scope);
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
-1
View File
@@ -435,7 +435,6 @@ public class KotlinJavaFileStubProvider<T extends WithFileStubAndExtraDiagnostic
/*disableInline=*/false,
/*disableOptimization=*/false,
/*useTypeTableInSerializer=*/false,
/*packageFacadesAsMultifileClasses=*/false,
forExtraDiagnostics
);
KotlinCodegenFacade.prepareForCompilation(state);
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt
-18
View File
@@ -30,7 +30,6 @@ import com.intellij.psi.util.PsiModificationTracker
import com.intellij.util.containers.SLRUCache
import org.jetbrains.annotations.NonNls
import org.jetbrains.kotlin.idea.KotlinLanguage
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetClassOrObject
import org.jetbrains.kotlin.psi.JetFile
@@ -237,23 +236,6 @@ public class KotlinLightClassForFacade private constructor(
}
companion object Factory {
public fun createForPackageFacade(
manager: PsiManager,
packageFqName: FqName,
searchScope: GlobalSearchScope,
files: Collection<JetFile> // this is redundant, but computing it multiple times is costly
): KotlinLightClassForFacade? {
if (files.any { LightClassUtil.belongsToKotlinBuiltIns(it) }) {
return null
}
assert(files.isNotEmpty()) { "No files for package $packageFqName" }
val packageClassFqName = PackageClassUtils.getPackageClassFqName(packageFqName)
val lightClassDataCache = PackageFacadeStubCache.getInstance(manager.project).get(packageFqName, searchScope)
return KotlinLightClassForFacade(manager, packageClassFqName, searchScope, lightClassDataCache, files, true)
}
public fun createForFacade(
manager: PsiManager,
facadeClassFqName: FqName,
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java
-3
View File
@@ -70,9 +70,6 @@ public abstract class LightClassGenerationSupport {
@Nullable
public abstract PsiClass getPsiClass(@NotNull JetClassOrObject classOrObject);
@NotNull
public abstract Collection<PsiClass> getPackageClasses(@NotNull FqName packageFqName, @NotNull GlobalSearchScope scope);
@Nullable
public abstract ClassDescriptor resolveClassToDescriptor(@NotNull JetClassOrObject classOrObject);
compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java
+3 -17
View File
@@ -50,7 +50,6 @@ public class StubClassBuilder extends AbstractClassBuilder {
private final StubElement parent;
private StubBuildingVisitor v;
private final Stack<StubElement> parentStack;
private boolean isPackageClass = false;
public StubClassBuilder(@NotNull Stack<StubElement> parentStack) {
this.parentStack = parentStack;
@@ -79,18 +78,7 @@ public class StubClassBuilder extends AbstractClassBuilder {
super.defineClass(origin, version, access, name, signature, superName, interfaces);
if (origin instanceof JetFile) {
FqName packageName = ((JetFile) origin).getPackageFqName();
String packageClassName = PackageClassUtils.getPackageClassName(packageName);
if (name.equals(packageClassName) || name.endsWith("/" + packageClassName)) {
isPackageClass = true;
}
}
if (!isPackageClass) {
parentStack.push(v.getResult());
}
parentStack.push(v.getResult());
((StubBase) v.getResult()).putUserData(ClsWrapperStubPsiFactory.ORIGIN_ELEMENT, origin);
}
@@ -149,10 +137,8 @@ public class StubClassBuilder extends AbstractClassBuilder {
@Override
public void done() {
if (!isPackageClass) {
StubElement pop = parentStack.pop();
assert pop == v.getResult();
}
StubElement pop = parentStack.pop();
assert pop == v.getResult();
super.done();
}
}
compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java
-4
View File
@@ -38,10 +38,6 @@ public class AnnotationGenTest extends CodegenTestCase {
return generateAndCreateClassLoader();
}
private Class<?> getPackageClass(@NotNull ClassLoader loader) throws ClassNotFoundException {
return loader.loadClass(PackageClassUtils.getPackageClassName(myFiles.getPsiFile().getPackageFqName()));
}
private Class<?> getPackageSrcClass(@NotNull ClassLoader loader) throws ClassNotFoundException {
return loader.loadClass(PackagePartClassUtils.getPackagePartInternalName(myFiles.getPsiFile()));
}
compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java
-1
View File
@@ -68,7 +68,6 @@ public class CodegenTestUtil {
configuration.get(JVMConfigurationKeys.DISABLE_INLINE, false),
configuration.get(JVMConfigurationKeys.DISABLE_OPTIMIZATION, false),
/* useTypeTableInSerializer = */ false,
configuration.get(JVMConfigurationKeys.PACKAGE_FACADES_AS_MULTIFILE_CLASSES, false),
forExtraDiagnostics
);
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java
+2 -10
View File
@@ -50,16 +50,8 @@ public class SyntheticMethodForAnnotatedPropertyGenTest extends CodegenTestCase
public void testTopLevel() {
loadFile();
String packageClassName = PackageClassUtils.getPackageClassName(FqName.ROOT);
for (OutputFile outputFile : generateClassesInFile().asList()) {
String filPath = outputFile.getRelativePath();
if (filPath.startsWith(packageClassName) && !filPath.equals(packageClassName + ".class")) {
// This should be package$src class
Class<?> a = generateClass(filPath.substring(0, filPath.length() - ".class".length()));
assertAnnotatedSyntheticMethodExistence(true, a);
}
}
Class<?> a = generateClass("TopLevelKt");
assertAnnotatedSyntheticMethodExistence(true, a);
}
public void testInTrait() throws ClassNotFoundException {
compiler/tests/org/jetbrains/kotlin/name/PackageClassNameTest.java
-68
View File
@@ -1,68 +0,0 @@
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.name;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassName;
import static org.junit.Assert.assertEquals;
public class PackageClassNameTest {
@Test
public void testPackageName1() {
doTest("kotlin", "KotlinPackage", "_DefaultPackage");
}
@Test
public void testPackageName2() {
doTest("kotlin.io", "IoPackage", "KotlinPackage");
}
@Test
public void testPackageName3() {
doTest("kotlin.io.foo", "FooPackage", "IoPackage");
}
@Test
public void testPackageName4() {
doTest("kotlinTest.ioTest", "IoTestPackage", "KotlinTestPackage");
}
@Test
public void testPackageName5() {
doTest(FqName.ROOT, "_DefaultPackage", null);
}
@Test
public void testPackageName6() {
doTest(FqName.ROOT.child(Name.identifier("kotlin")), "KotlinPackage", "_DefaultPackage");
}
private static void doTest(@NotNull String name, @NotNull String expectedForChild, @Nullable String expectedForParent) {
doTest(new FqName(name), expectedForChild, expectedForParent);
}
private static void doTest(@NotNull FqName name, @NotNull String expectedForChild, @Nullable String expectedForParent) {
assertEquals("Wrong result for child [" + name + "].", expectedForChild, getPackageClassName(name));
if (expectedForParent != null) {
assertEquals("Wrong result for parent [" + name + "].", expectedForParent, getPackageClassName(name.parent()));
}
}
}
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/PackageClassUtils.java
+1 -1
View File
@@ -31,7 +31,7 @@ public final class PackageClassUtils {
// ex. <root> -> _DefaultPackage, a -> APackage, a.b -> BPackage
@NotNull
public static String getPackageClassName(@NotNull FqName packageFQN) {
private static String getPackageClassName(@NotNull FqName packageFQN) {
if (packageFQN.isRoot()) {
return DEFAULT_PACKAGE_CLASS_NAME;
}
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
-35
View File
@@ -133,41 +133,6 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
return KotlinLightClassForExplicitDeclaration.create(psiManager, classOrObject)
}
override fun getPackageClasses(packageFqName: FqName, scope: GlobalSearchScope): Collection<PsiClass> {
val filesWithCallables = PackagePartClassUtils.getFilesWithCallables(findFilesForPackage(packageFqName, scope))
val filesByModule = filesWithCallables.groupBy { it.getModuleInfo() }
return filesByModule.flatMap {
createLightClassForPackageFacade(it.value, it.key, packageFqName)
}
}
private fun createLightClassForPackageFacade(
files: List<JetFile>,
moduleInfo: IdeaModuleInfo,
packageFqName: FqName
): List<PsiClass> {
if (moduleInfo is ModuleSourceInfo) {
val lightClassForFacade = KotlinLightClassForFacade.createForPackageFacade(
psiManager, packageFqName, moduleInfo.contentScope(), files
)
return withFakeLightClasses(lightClassForFacade, files)
}
else {
val packageClassName = PackageClassUtils.getPackageClassName(packageFqName)
val virtualFileForPackageClass = files.asSequence().map {
it.virtualFile?.parent?.findChild("$packageClassName.class")
}.firstOrNull { it != null } ?: return emptyList()
val clsClassFromPackageClass = createClsJavaClassFromVirtualFile(
mirrorFile = files.first(),
classFile = virtualFileForPackageClass,
correspondingClassOrObject = null
) ?: return emptyList()
return listOf(KotlinLightClassForDecompiledDeclaration(clsClassFromPackageClass, null))
}
}
private fun withFakeLightClasses(
lightClassForFacade: KotlinLightClassForFacade?,
facadeFiles: List<JetFile>
idea/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.java
-1
View File
@@ -240,7 +240,6 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
!enableInline,
!enableOptimization,
/*useTypeTableInSerializer=*/false,
/*packageFacadesAsMultifileClasses=*/false,
sink);
KotlinCodegenFacade.compileCorrectFiles(state, CompilationErrorHandler.THROW_EXCEPTION);
}
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
+1 -2
View File
@@ -301,8 +301,7 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<RunConfigurati
if (StringUtil.isEmpty(MAIN_CLASS_NAME)) {
return null;
}
return StringUtil.trimEnd(MAIN_CLASS_NAME,
"." + PackageClassUtils.getPackageClassName(new FqName(MAIN_CLASS_NAME).parent()));
return MAIN_CLASS_NAME;
}
@NotNull
idea/testData/decompiler/lightClassesOrder/packageClassOneFile/file.kt → idea/testData/decompiler/lightClassesOrder/fileClass/file.kt
Vendored
View File
idea/testData/decompiler/lightClassesOrder/packageClassTwoFiles/file1.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package test3
fun foo() {
}
idea/testData/decompiler/lightClassesOrder/packageClassTwoFiles/file2.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
package test3
fun bar() {
}
idea/testData/fakeLightClassForPackage/1.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package test
fun foo() = 42
idea/testData/fakeLightClassForPackage/2.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
package test
fun bar() = 239 + foo()
idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.2.java
Vendored
+3 -3
View File
@@ -1,11 +1,11 @@
package client;
import server.ServerPackage;
import server.KotlintopLevelMethodUsages_0Kt;
class JClient {
String s = ServerPackage.processRequest();
String s = KotlintopLevelMethodUsages_0Kt.processRequest();
String sendRequest() {
return ServerPackage.processRequest();
return KotlintopLevelMethodUsages_0Kt.processRequest();
}
}
idea/testData/findUsages/kotlin/findFunctionUsages/kotlinTopLevelMethodUsages.3.java
Vendored
-11
View File
@@ -1,11 +0,0 @@
package client;
import server.KotlinTopLevelMethodUsages_0Kt;
class JClient {
String s = KotlinTopLevelMethodUsages_0Kt.processRequest();
String sendRequest() {
return KotlinTopLevelMethodUsages_0Kt.processRequest();
}
}
idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.2.java
Vendored
+4 -4
View File
@@ -1,11 +1,11 @@
package client;
import server.ServerPackage;
import server.KotlinTopLevelPropertyUsages_0Kt;
class JClient {
void fooBar() {
System.out.println("foo = " + ServerPackage.getFoo());
System.out.println("length: " + ServerPackage.getFoo().length());
ServerPackage.setFoo("");
System.out.println("foo = " + KotlinTopLevelPropertyUsages_0Kt.getFoo());
System.out.println("length: " + KotlinTopLevelPropertyUsages_0Kt.getFoo().length());
KotlinTopLevelPropertyUsages_0Kt.setFoo("");
}
}
idea/testData/findUsages/kotlin/findPropertyUsages/kotlinTopLevelPropertyUsages.3.java
Vendored
-11
View File
@@ -1,11 +0,0 @@
package client;
import server.KotlinTopLevelPropertyUsages_0Kt;
class JClient {
void fooBar() {
System.out.println("foo = " + KotlinTopLevelPropertyUsages_0Kt.getFoo());
System.out.println("length: " + KotlinTopLevelPropertyUsages_0Kt.getFoo().length());
KotlinTopLevelPropertyUsages_0Kt.setFoo("");
}
}
idea/testData/inspections/unusedSymbol/property/usedInJava.java
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@ import foo.Obj;
class usedInJava {
public static void main(String[] args) {
FooPackage.getUsedByGetter();
FooPackage.setUsedBySetter(":|");
UsedInJavaKt.getUsedByGetter();
UsedInJavaKt.setUsedBySetter(":|");
System.out.println(Obj.CONST);
}
}
idea/testData/kotlinAndJavaChecker/AssignMappedKotlinType.java
Vendored
+11 -11
View File
@@ -2,22 +2,22 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import test.TestPackage;
import test.*;
class AssignMappedKotlinType {
void test() {
int i1 = TestPackage.getInt();
Integer i2 = TestPackage.getInt();
Number number = TestPackage.getNumber();
String str = TestPackage.getString();
int i1 = AssignMappedKotlinTypeKt.getInt();
Integer i2 = AssignMappedKotlinTypeKt.getInt();
Number number = AssignMappedKotlinTypeKt.getNumber();
String str = AssignMappedKotlinTypeKt.getString();
Collection<Integer> intCollection = TestPackage.getList();
List<Integer> intList = TestPackage.getList();
Collection<Integer> intCollection = AssignMappedKotlinTypeKt.getList();
List<Integer> intList = AssignMappedKotlinTypeKt.getList();
Collection<Integer> intMutableCollection = TestPackage.getMutableList();
List<Integer> intMutableList = TestPackage.getMutableList();
Collection<Integer> intMutableCollection = AssignMappedKotlinTypeKt.getMutableList();
List<Integer> intMutableList = AssignMappedKotlinTypeKt.getMutableList();
Collection<String> stringsCollection = TestPackage.getArrayList();
ArrayList<String> arrayListCollection = TestPackage.getArrayList();
Collection<String> stringsCollection = AssignMappedKotlinTypeKt.getArrayList();
ArrayList<String> arrayListCollection = AssignMappedKotlinTypeKt.getArrayList();
}
}
idea/testData/kotlinAndJavaChecker/JvmOverloadsFunctions.java
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
import test.kotlin.A;
import static test.kotlin.KotlinPackage.foo;
import static test.kotlin.JvmOverloadsFunctionsKt.foo;
class JvmOverloadsFunctions {
public static void main(String[] args) {
idea/testData/kotlinAndJavaChecker/TopLevelFunctionInDataFlowInspection.java
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
package test;
import org.jetbrains.annotations.NotNull;
import test.kotlin.KotlinPackage;
import test.kotlin.*;
public class TopLevelFunctionInDataFlowInspection {
void other(@NotNull Object some) {
Object foo = KotlinPackage.foo(some);
Object foo = TopLevelFunctionInDataFlowInspectionKt.foo(some);
}
}
idea/testData/kotlinAndJavaChecker/UsingKotlinPackageDeclarations.java
Vendored
+4 -4
View File
@@ -1,10 +1,10 @@
import test.TestPackage;
package test;
// Check absence of 'Static method reference via subclass warning' for kotlin usages
public class UsingKotlinPackageDeclarations {
public static int test() {
TestPackage.foo();
TestPackage.setBar(15);
return TestPackage.getBar();
UsingKotlinPackageDeclarationsKt.foo();
UsingKotlinPackageDeclarationsKt.setBar(15);
return UsingKotlinPackageDeclarationsKt.getBar();
}
}
idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java
-62
View File
@@ -1,62 +0,0 @@
/*
* 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.asJava;
import com.google.common.collect.Sets;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiFile;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.JetFile;
import java.util.Set;
public class FakeLightClassForPackageTest extends JetLightCodeInsightFixtureTestCase {
private static final String TEST_DATA_PATH = "idea/testData/fakeLightClassForPackage/";
public void testMultiFile() {
myFixture.configureByFiles(TEST_DATA_PATH + "1.kt", TEST_DATA_PATH + "2.kt");
GlobalSearchScope searchScope = GlobalSearchScope.allScope(getProject());
PsiClass[] classes = JavaElementFinder.getInstance(getProject()).findClasses("test.TestPackage", searchScope);
assertEquals(3, classes.length);
assertInstanceOf(classes[0], KotlinLightClassForFacade.class);
Set<JetFile> expectedFiles = Sets.newHashSet(
LightClassGenerationSupport.getInstance(getProject()).findFilesForPackage(new FqName("test"), searchScope)
);
Set<PsiFile> actualFiles = Sets.newHashSet();
for (int i = 1; i < classes.length; i++) {
assertInstanceOf(classes[i], FakeLightClassForFileOfPackage.class);
actualFiles.add(((FakeLightClassForFileOfPackage) classes[i]).getContainingFile());
}
assertEquals(expectedFiles, actualFiles);
}
@NotNull
@Override
protected LightProjectDescriptor getProjectDescriptor() {
return JetLightProjectDescriptor.INSTANCE;
}
}
idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt
+2 -6
View File
@@ -31,12 +31,8 @@ class LightClassesClasspathSortingTest : KotlinCodeInsightTestCase() {
doTest("test1.A")
}
fun testPackageClassOneFile() {
doTest("test2.Test2Package")
}
fun testPackageClassTwoFiles() {
doTest("test3.Test3Package")
fun testFileClass() {
doTest("test2.FileKt")
}
private fun doTest(fqName: String) {
idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java
-4
View File
@@ -60,10 +60,6 @@ public class NavigateToDecompiledLibraryTest extends LightCodeInsightFixtureTest
doTest();
}
public void testLibrariesPackage() {
doTest();
}
public void testSimpleClass() {
doTest();
}
idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt
+2 -3
View File
@@ -33,7 +33,6 @@ import com.intellij.testFramework.PsiTestUtil
import junit.framework.TestCase
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassName
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.test.MockLibraryUtil
@@ -109,11 +108,11 @@ public class JetExceptionFilterTest : MultiFileTestCase() {
}
public fun testBreakpointReachedAt() {
doTest("breakpointReachedAt.kt", 2, { getPackageClassName(FqName.ROOT) }, linePrefix = "Breakpoint reached at ")
doTest("breakpointReachedAt.kt", 2, { "BreakpointReachedAtKt" }, linePrefix = "Breakpoint reached at ")
}
public fun testSimple() {
doTest("simple.kt", 2, { getPackageClassName(FqName.ROOT) })
doTest("simple.kt", 2, { "SimpleKt" })
}
public fun testKt2489() {