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

Rename LightClassGenerationSupport.getPsiClass -> getLightClass and make it return KtLightClass

Browse Source
This commit is contained in:
Pavel V. Talanov
2016-01-21 16:49:31 +03:00
parent 06215ca932
commit 2972dbca00
6 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+2 -5
View File
@@ -25,10 +25,7 @@ import com.intellij.util.Function
import com.intellij.util.SmartList
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration
import org.jetbrains.kotlin.asJava.KtLightClassForFacade
import org.jetbrains.kotlin.asJava.LightClassConstructionContext
import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
import org.jetbrains.kotlin.asJava.*
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
@@ -140,7 +137,7 @@ class CliLightClassGenerationSupport(project: Project) : LightClassGenerationSup
})
}
override fun getPsiClass(classOrObject: KtClassOrObject): PsiClass? {
override fun getLightClass(classOrObject: KtClassOrObject): KtLightClass? {
return KtLightClassForExplicitDeclaration.create(classOrObject)
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java
+1 -1
View File
@@ -68,7 +68,7 @@ public abstract class LightClassGenerationSupport {
public abstract Collection<FqName> getSubPackages(@NotNull FqName fqn, @NotNull GlobalSearchScope scope);
@Nullable
public abstract PsiClass getPsiClass(@NotNull KtClassOrObject classOrObject);
public abstract KtLightClass getLightClass(@NotNull KtClassOrObject classOrObject);
@Nullable
public abstract ClassDescriptor resolveClassToDescriptor(@NotNull KtClassOrObject classOrObject);
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
+4 -3
View File
@@ -48,9 +48,10 @@ object LightClassUtil {
return null
}/*package*/
fun getPsiClass(classOrObject: KtClassOrObject?): PsiClass? {
if (classOrObject == null) return null
return LightClassGenerationSupport.getInstance(classOrObject.project).getPsiClass(classOrObject)
fun getPsiClass(classOrObject: KtClassOrObject?): KtLightClass? {
return classOrObject?.let {
return LightClassGenerationSupport.getInstance(it.project).getLightClass(it)
}
}
fun getLightClassAccessorMethod(accessor: KtPropertyAccessor): PsiMethod? =
compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
+1 -1
View File
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.singletonList
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
import java.util.*
fun KtClassOrObject.toLightClass(): KtLightClass? = LightClassUtil.getPsiClass(this) as KtLightClass?
fun KtClassOrObject.toLightClass(): KtLightClass? = LightClassUtil.getPsiClass(this)
fun KtFile.findFacadeClass(): KtLightClass? {
return LightClassGenerationSupport.getInstance(project)