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

Use special index to record files corresponding to static facade classes.

Browse Source
This commit is contained in:
Dmitry Petrov
2015-08-06 10:44:27 +03:00
committed by Michael Bogdanov
parent ab8b5d05ed
commit 83336553df
7 changed files with 96 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java
+3 -2
View File
@@ -214,8 +214,7 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport
@NotNull
@Override
public Collection<PsiClass> getFacadeClasses(@NotNull FqName facadeFqName, @NotNull GlobalSearchScope scope) {
Collection<JetFile> filesInPackage = findFilesForPackage(facadeFqName.parent(), scope);
List<JetFile> filesForFacade = PackagePartClassUtils.getFilesForFacade(facadeFqName, filesInPackage);
Collection<JetFile> filesForFacade = findFilesForFacade(facadeFqName, scope);
if (filesForFacade.isEmpty()) return Collections.emptyList();
//noinspection RedundantTypeArguments
@@ -226,6 +225,8 @@ public class CliLightClassGenerationSupport extends LightClassGenerationSupport
@NotNull
@Override
public Collection<JetFile> findFilesForFacade(@NotNull FqName facadeFqName, @NotNull GlobalSearchScope scope) {
// TODO We need a way to plug some platform-dependent stuff into LazyTopDownAnalyzer.
// It already performs some ad hoc stuff for packages->files mapping, anyway.
Collection<JetFile> filesInPackage = findFilesForPackage(facadeFqName.parent(), scope);
return PackagePartClassUtils.getFilesForFacade(facadeFqName, filesInPackage);
}
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.java
+9 -3
View File
@@ -77,8 +77,14 @@ public class PackagePartClassUtils {
@NotNull
public static FqName getPackagePartFqName(@NotNull FqName facadeFqName, @NotNull VirtualFile file, @Nullable JetFile jetFile) {
String fileName = FileUtil.getNameWithoutExtension(PathUtil.getFileName(file.getName()));
return facadeFqName.parent().child(Name.identifier(getSanitizedClassNameBase(fileName) + FACADE_CLASS_NAME_SUFFIX));
String fileName = file.getName();
return getStaticFacadeClassFqNameForFile(facadeFqName.parent(), fileName);
}
@NotNull
private static FqName getStaticFacadeClassFqNameForFile(@NotNull FqName packageFqName, String fileName) {
String nameWithoutExtension = FileUtil.getNameWithoutExtension(PathUtil.getFileName(fileName));
return packageFqName.child(Name.identifier(getSanitizedClassNameBase(nameWithoutExtension) + FACADE_CLASS_NAME_SUFFIX));
}
public static boolean isFacadeClassFqName(@NotNull FqName classFqName) {
@@ -98,7 +104,7 @@ public class PackagePartClassUtils {
@NotNull
public static FqName getPackagePartFqName(@NotNull JetFile file) {
return getPackagePartFqName(getPackageClassFqName(file.getPackageFqName()), file.getVirtualFile(), file);
return getStaticFacadeClassFqNameForFile(file.getPackageFqName(), file.getName());
}
@NotNull