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

Revert "Fix readAccess in IDELightClassGenerationSupport on obtaining script"

Browse Source 
This reverts commit ba01678a
This commit is contained in:
Vladimir Dolzhenko
2019-10-25 14:11:46 +02:00
parent 210c354ae5
commit eb3f50dce7
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+15 -18
View File
@@ -32,7 +32,6 @@ import org.jetbrains.kotlin.idea.caches.lightClasses.LazyLightClassDataHolder
import org.jetbrains.kotlin.idea.project.languageVersionSettings
import org.jetbrains.kotlin.idea.resolve.frontendService
import org.jetbrains.kotlin.idea.stubindex.KotlinTypeAliasShortNameIndex
import org.jetbrains.kotlin.idea.util.application.runReadAction
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
@@ -128,27 +127,25 @@ class IDELightClassGenerationSupport(private val project: Project) : LightClassG
}
override fun createUltraLightClass(element: KtClassOrObject): KtUltraLightClass? {
return runReadAction {
if (element.shouldNotBeVisibleAsLightClass() ||
element is KtEnumEntry ||
element.containingKtFile.isScript()
) {
return@runReadAction null
}
if (element.shouldNotBeVisibleAsLightClass() ||
element is KtEnumEntry ||
element.containingKtFile.isScript()
) {
return null
}
KtUltraLightSupportImpl(element).let { support ->
when {
element is KtObjectDeclaration && element.isObjectLiteral() ->
KtUltraLightClassForAnonymousDeclaration(element, support)
return KtUltraLightSupportImpl(element).let { support ->
when {
element is KtObjectDeclaration && element.isObjectLiteral() ->
KtUltraLightClassForAnonymousDeclaration(element, support)
element.isLocal ->
KtUltraLightClassForLocalDeclaration(element, support)
element.isLocal ->
KtUltraLightClassForLocalDeclaration(element, support)
(element.hasModifier(KtTokens.INLINE_KEYWORD)) ->
KtUltraLightInlineClass(element, support)
(element.hasModifier(KtTokens.INLINE_KEYWORD)) ->
KtUltraLightInlineClass(element, support)
else -> KtUltraLightClass(element, support)
}
else -> KtUltraLightClass(element, support)
}
}
}