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

Minor: remove some dead code

Browse Source
This commit is contained in:
Pavel V. Talanov
2016-02-04 16:30:58 +03:00
parent 909ced5fa2
commit f59a4c537e
4 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
-4
View File
@@ -76,10 +76,6 @@ class CliLightClassGenerationSupport(project: Project) : LightClassGenerationSup
trace.setKotlinCodeAnalyzer(codeAnalyzer)
}
override fun getContextForPackage(files: Collection<KtFile>): LightClassConstructionContext {
return LightClassConstructionContext(bindingContext, module)
}
override fun getContextForClassOrObject(classOrObject: KtClassOrObject): LightClassConstructionContext {
//force resolve companion for light class generation
bindingContext.get(BindingContext.CLASS, classOrObject)?.companionObjectDescriptor
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.kt
-4
View File
@@ -49,10 +49,6 @@ object PackagePartClassUtils {
else
"_$str"
@TestOnly
@JvmStatic fun getDefaultFileClassFqName(packageFqName: FqName, file: VirtualFile): FqName =
getPackagePartFqName(packageFqName, file.name)
@TestOnly
@JvmStatic fun getDefaultPartFqName(facadeClassFqName: FqName, file: VirtualFile): FqName =
getPackagePartFqName(facadeClassFqName.parent(), file.name)
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java
-3
View File
@@ -36,9 +36,6 @@ public abstract class LightClassGenerationSupport {
return ServiceManager.getService(project, LightClassGenerationSupport.class);
}
@NotNull
public abstract LightClassConstructionContext getContextForPackage(@NotNull Collection<KtFile> files);
@NotNull
public abstract LightClassConstructionContext getContextForClassOrObject(@NotNull KtClassOrObject classOrObject);
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+5 -15
View File
@@ -54,20 +54,6 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
private val scopeFileComparator = JavaElementFinder.byClasspathComparator(GlobalSearchScope.allScope(project))
private val psiManager: PsiManager = PsiManager.getInstance(project)
override fun getContextForPackage(files: Collection<KtFile>): LightClassConstructionContext {
assert(!files.isEmpty()) { "No files in package" }
return getContextForFiles(files)
}
private fun getContextForFiles(files: Collection<KtFile>): LightClassConstructionContext {
val sortedFiles = files.sortedWith(scopeFileComparator)
val file = sortedFiles.first()
val resolveSession = file.getResolutionFacade().getFrontendService(ResolveSession::class.java)
forceResolvePackageDeclarations(files, resolveSession)
return LightClassConstructionContext(resolveSession.bindingContext, resolveSession.moduleDescriptor)
}
override fun getContextForClassOrObject(classOrObject: KtClassOrObject): LightClassConstructionContext {
if (classOrObject.isLocal()) {
return getContextForLocalClassOrObject(classOrObject)
@@ -111,7 +97,11 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
override fun getContextForFacade(files: Collection<KtFile>): LightClassConstructionContext {
assert(!files.isEmpty()) { "No files in facade" }
return getContextForFiles(files)
val sortedFiles = files.sortedWith(scopeFileComparator)
val file = sortedFiles.first()
val resolveSession = file.getResolutionFacade().getFrontendService(ResolveSession::class.java)
forceResolvePackageDeclarations(files, resolveSession)
return LightClassConstructionContext(resolveSession.bindingContext, resolveSession.moduleDescriptor)
}
override fun findClassOrObjectDeclarations(fqName: FqName, searchScope: GlobalSearchScope): Collection<KtClassOrObject> {