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

Allow resolve write action check for all plugins when enabled in registry

Browse Source
This commit is contained in:
Nikolay Krasko
2019-03-20 15:56:45 +03:00
parent 7f08ecee39
commit 026fc998c1
2 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolveInWriteActionManager.kt
+4 -23
View File
@@ -6,29 +6,8 @@
package org.jetbrains.kotlin.idea.caches.resolve package org.jetbrains.kotlin.idea.caches.resolve
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.diagnostic.ControlFlowException
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.module.ModuleUtil import com.intellij.openapi.util.registry.Registry
import com.intellij.openapi.project.IndexNotReadyException
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiNamedElement
import org.jetbrains.kotlin.analyzer.AnalysisResult
import org.jetbrains.kotlin.analyzer.ModuleInfo
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.idea.KotlinPluginUtil
import org.jetbrains.kotlin.idea.caches.project.IdeaModuleInfo
import org.jetbrains.kotlin.idea.caches.project.getNullableModuleInfo
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.psi.KtDeclaration
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments
/** /**
* Temporary allow resolve in write action. * Temporary allow resolve in write action.
@@ -53,7 +32,9 @@ internal object ResolveInWriteActionManager {
if (!application.isWriteAccessAllowed) return if (!application.isWriteAccessAllowed) return
if (application.isUnitTestMode) return if (application.isUnitTestMode) return
if (application.isInternal && !KotlinPluginUtil.isSnapshotVersion()) return
@Suppress("InvalidBundleOrProperty")
if (!Registry.`is`("kotlin.write.resolve.check", false)) return
LOG.error("Resolve is not allowed under the write action!") LOG.error("Resolve is not allowed under the write action!")
} }
idea/resources/META-INF/plugin-common.xml
+6
View File
@@ -361,6 +361,12 @@
<errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/> <errorHandler implementation="org.jetbrains.kotlin.idea.reporter.KotlinReportSubmitter"/>
<registryKey
key="kotlin.write.resolve.check"
description="Whether to enable the check for resolve activated from the write action"
defaultValue="false"
restartRequired="false"/>
<internalFileTemplate name="Kotlin File"/> <internalFileTemplate name="Kotlin File"/>
<internalFileTemplate name="Kotlin Class"/> <internalFileTemplate name="Kotlin Class"/>
<internalFileTemplate name="Kotlin Enum"/> <internalFileTemplate name="Kotlin Enum"/>