Refactoring: show using ProcessCancelException in method name
This commit is contained in:
@@ -21,8 +21,7 @@ import com.intellij.openapi.progress.ProgressManager
|
|||||||
import com.intellij.openapi.progress.util.ProgressIndicatorUtils
|
import com.intellij.openapi.progress.util.ProgressIndicatorUtils
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
|
|
||||||
|
fun <T : Any> runInReadActionWithWriteActionPriorityWithPCE(f: () -> T): T {
|
||||||
fun <T : Any> runInReadActionWithWriteActionPriority(f: () -> T): T {
|
|
||||||
var r: T? = null
|
var r: T? = null
|
||||||
val complete = ProgressIndicatorUtils.runInReadActionWithWriteActionPriority {
|
val complete = ProgressIndicatorUtils.runInReadActionWithWriteActionPriority {
|
||||||
r = f()
|
r = f()
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.idea.debugger.BinaryCacheKey
|
|||||||
import org.jetbrains.kotlin.idea.debugger.BytecodeDebugInfo
|
import org.jetbrains.kotlin.idea.debugger.BytecodeDebugInfo
|
||||||
import org.jetbrains.kotlin.idea.debugger.WeakBytecodeDebugInfoStorage
|
import org.jetbrains.kotlin.idea.debugger.WeakBytecodeDebugInfoStorage
|
||||||
import org.jetbrains.kotlin.idea.debugger.evaluate.classLoading.ClassToLoad
|
import org.jetbrains.kotlin.idea.debugger.evaluate.classLoading.ClassToLoad
|
||||||
import org.jetbrains.kotlin.idea.runInReadActionWithWriteActionPriority
|
import org.jetbrains.kotlin.idea.runInReadActionWithWriteActionPriorityWithPCE
|
||||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||||
import org.jetbrains.kotlin.psi.KtCodeFragment
|
import org.jetbrains.kotlin.psi.KtCodeFragment
|
||||||
import org.jetbrains.kotlin.psi.KtElement
|
import org.jetbrains.kotlin.psi.KtElement
|
||||||
@@ -177,12 +177,12 @@ class KotlinDebuggerCaches(project: Project) {
|
|||||||
runReadAction { element as? KtElement ?: PsiTreeUtil.getParentOfType(element, KtElement::class.java)!! }
|
runReadAction { element as? KtElement ?: PsiTreeUtil.getParentOfType(element, KtElement::class.java)!! }
|
||||||
|
|
||||||
private fun createTypeMapperForLibraryFile(element: KtElement, file: KtFile): KotlinTypeMapper =
|
private fun createTypeMapperForLibraryFile(element: KtElement, file: KtFile): KotlinTypeMapper =
|
||||||
runInReadActionWithWriteActionPriority {
|
runInReadActionWithWriteActionPriorityWithPCE {
|
||||||
createTypeMapper(file, element.analyzeAndGetResult())
|
createTypeMapper(file, element.analyzeAndGetResult())
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun createTypeMapperForSourceFile(file: KtFile): KotlinTypeMapper =
|
private fun createTypeMapperForSourceFile(file: KtFile): KotlinTypeMapper =
|
||||||
runInReadActionWithWriteActionPriority {
|
runInReadActionWithWriteActionPriorityWithPCE {
|
||||||
createTypeMapper(file, file.analyzeFullyAndGetResult().apply(AnalysisResult::throwIfError))
|
createTypeMapper(file, file.analyzeFullyAndGetResult().apply(AnalysisResult::throwIfError))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ import org.jetbrains.kotlin.idea.debugger.evaluate.classLoading.ClassToLoad
|
|||||||
import org.jetbrains.kotlin.idea.debugger.evaluate.compilingEvaluator.loadClasses
|
import org.jetbrains.kotlin.idea.debugger.evaluate.compilingEvaluator.loadClasses
|
||||||
import org.jetbrains.kotlin.idea.debugger.evaluate.compilingEvaluator.loadClassesSafely
|
import org.jetbrains.kotlin.idea.debugger.evaluate.compilingEvaluator.loadClassesSafely
|
||||||
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionResult
|
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionResult
|
||||||
import org.jetbrains.kotlin.idea.runInReadActionWithWriteActionPriority
|
import org.jetbrains.kotlin.idea.runInReadActionWithWriteActionPriorityWithPCE
|
||||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||||
import org.jetbrains.kotlin.idea.util.attachment.attachmentByPsiFile
|
import org.jetbrains.kotlin.idea.util.attachment.attachmentByPsiFile
|
||||||
import org.jetbrains.kotlin.idea.util.attachment.mergeAttachments
|
import org.jetbrains.kotlin.idea.util.attachment.mergeAttachments
|
||||||
@@ -526,7 +526,7 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, val sourcePosition: Sour
|
|||||||
|
|
||||||
// contextFile must be NotNull when analyzeInlineFunctions = true
|
// contextFile must be NotNull when analyzeInlineFunctions = true
|
||||||
private fun KtFile.checkForErrors(analyzeInlineFunctions: Boolean = false, contextFile: KtFile? = null): ExtendedAnalysisResult {
|
private fun KtFile.checkForErrors(analyzeInlineFunctions: Boolean = false, contextFile: KtFile? = null): ExtendedAnalysisResult {
|
||||||
return runInReadActionWithWriteActionPriority {
|
return runInReadActionWithWriteActionPriorityWithPCE {
|
||||||
try {
|
try {
|
||||||
AnalyzingUtils.checkForSyntacticErrors(this)
|
AnalyzingUtils.checkForSyntacticErrors(this)
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.core.replaced
|
|||||||
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
|
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
|
||||||
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.ErrorMessage
|
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.ErrorMessage
|
||||||
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.Status
|
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.AnalysisResult.Status
|
||||||
import org.jetbrains.kotlin.idea.runInReadActionWithWriteActionPriority
|
import org.jetbrains.kotlin.idea.runInReadActionWithWriteActionPriorityWithPCE
|
||||||
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
import org.jetbrains.kotlin.idea.util.application.runReadAction
|
||||||
import org.jetbrains.kotlin.idea.util.attachment.attachmentByPsiFile
|
import org.jetbrains.kotlin.idea.util.attachment.attachmentByPsiFile
|
||||||
import org.jetbrains.kotlin.idea.util.attachment.mergeAttachments
|
import org.jetbrains.kotlin.idea.util.attachment.mergeAttachments
|
||||||
@@ -154,7 +154,7 @@ private fun KtFile.findContextElement(): KtElement? {
|
|||||||
private var PsiElement.DEBUG_SMART_CAST: PsiElement? by CopyableUserDataProperty(Key.create("DEBUG_SMART_CAST"))
|
private var PsiElement.DEBUG_SMART_CAST: PsiElement? by CopyableUserDataProperty(Key.create("DEBUG_SMART_CAST"))
|
||||||
|
|
||||||
private fun KtCodeFragment.markSmartCasts() {
|
private fun KtCodeFragment.markSmartCasts() {
|
||||||
val bindingContext = runInReadActionWithWriteActionPriority { analyzeFully() }
|
val bindingContext = runInReadActionWithWriteActionPriorityWithPCE { analyzeFully() }
|
||||||
val factory = KtPsiFactory(project)
|
val factory = KtPsiFactory(project)
|
||||||
|
|
||||||
getContentElement()?.forEachDescendantOfType<KtExpression> { expression ->
|
getContentElement()?.forEachDescendantOfType<KtExpression> { expression ->
|
||||||
|
|||||||
Reference in New Issue
Block a user