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

Refactor: rename KtLightClassForExplicitDeclaration -> KtLightClassForSourceDeclaration

Browse Source
This commit is contained in:
Pavel V. Talanov
2016-07-26 15:14:26 +03:00
parent b686b37cbf
commit 999c8e7486
16 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.kt
+2 -2
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiElement
import com.intellij.ui.RowIcon
import com.intellij.util.PlatformIcons
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
import org.jetbrains.kotlin.idea.caches.resolve.KtLightClassForDecompiledDeclaration
import org.jetbrains.kotlin.lexer.KtTokens
@@ -90,7 +90,7 @@ class KotlinIconProvider : IconProvider(), DumbAware {
//TODO (light classes for decompiled files): correct presentation
if (origin != null) origin.getBaseIcon() else KotlinIcons.CLASS
}
is KtLightClassForExplicitDeclaration -> navigationElement.getBaseIcon()
is KtLightClassForSourceDeclaration -> navigationElement.getBaseIcon()
is KtNamedFunction -> when {
receiverTypeReference != null -> KotlinIcons.EXTENSION_FUNCTION
getStrictParentOfType<KtNamedDeclaration>() is KtClass ->
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+3 -3
View File
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.asJava.builder.ClsWrapperStubPsiFactory
import org.jetbrains.kotlin.asJava.builder.LightClassConstructionContext
import org.jetbrains.kotlin.asJava.classes.FakeLightClassForFileOfPackage
import org.jetbrains.kotlin.asJava.classes.KtLightClass
import org.jetbrains.kotlin.asJava.classes.KtLightClassForExplicitDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForSourceDeclaration
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
import org.jetbrains.kotlin.descriptors.ClassDescriptor
@@ -145,7 +145,7 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
if (virtualFile != null) {
when {
ProjectRootsUtil.isProjectSourceFile(project, virtualFile) ->
return KtLightClassForExplicitDeclaration.create(classOrObject)
return KtLightClassForSourceDeclaration.create(classOrObject)
ProjectRootsUtil.isLibraryClassFile(project, virtualFile) ->
return getLightClassForDecompiledClassOrObject(classOrObject)
ProjectRootsUtil.isLibrarySourceFile(project, virtualFile) ->
@@ -154,7 +154,7 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
}
if (classOrObject.getContainingKtFile().analysisContext != null) {
// explicit request to create light class from dummy.kt
return KtLightClassForExplicitDeclaration.create(classOrObject)
return KtLightClassForSourceDeclaration.create(classOrObject)
}
return null
}