From 3c8e35fa3ac8ad28ed7e33bf74f280fc22aa8d75 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 22 Jul 2016 14:03:01 +0300 Subject: [PATCH] Remove psi modification tracker from pooled threads (EA-86038, KT-13163) IDEA 163 explicitly forbids such tricks with exceptions. #KT-13163 Fixed --- .../idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt | 4 ---- idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt | 2 -- 2 files changed, 6 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt index d2cca24673f..c18c9011d84 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -361,9 +361,5 @@ private fun replaceByRunFunction(expression: KtExpression): KtCallExpression { private fun wrapInRunFun(expression: KtExpression): PsiElement? { val replacedBody = replaceByRunFunction(expression) - - // Increment modification tracker to clear ResolveCache after changes in function body - (PsiManager.getInstance(expression.project).modificationTracker as PsiModificationTrackerImpl).incCounter() - return replacedBody.lambdaArguments.first().getLambdaExpression().bodyExpression?.firstChild } diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt index 7386c950bc8..29c532012a6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessor.kt @@ -67,8 +67,6 @@ class J2kPostProcessor(private val formatCode: Boolean) : PostProcessor { if (modificationStamp == file.modificationStamp) break - (PsiModificationTracker.SERVICE.getInstance(file.project) as? PsiModificationTrackerImpl)?.incOutOfCodeBlockModificationCounter() - elementToActions = collectAvailableActions(file, rangeMarker) }