From a6d129b0065a7ba8b3bc184ba1ed5a08458f9762 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 26 Apr 2016 17:37:01 +0300 Subject: [PATCH] Add write action for shorten references in finish template after building call (KT-12056) Write action was removed in idea 146 #KT-12056 Fixed --- .../callableBuilder/CallableBuilder.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index f7d9d33aca9..f6edf594e5e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -194,7 +194,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { ApplicationManager.getApplication().invokeLater { context.showDialogIfNeeded() } } else { - ShortenReferences.DEFAULT.process(elementsToShorten) + runWriteAction { ShortenReferences.DEFAULT.process(elementsToShorten) } } } @@ -992,13 +992,13 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { } CodeStyleManager.getInstance(project).reformat(newDeclaration) - } - // change short type names to fully qualified ones (to be shortened below) - val typeRefsToShorten = setupTypeReferencesForShortening(newDeclaration, parameterTypeExpressions) - if (!transformToJavaMemberIfApplicable(newDeclaration)) { - elementsToShorten.addAll(typeRefsToShorten) - setupEditor(newDeclaration) + // change short type names to fully qualified ones (to be shortened below) + val typeRefsToShorten = setupTypeReferencesForShortening(newDeclaration, parameterTypeExpressions) + if (!transformToJavaMemberIfApplicable(newDeclaration)) { + elementsToShorten.addAll(typeRefsToShorten) + setupEditor(newDeclaration) + } } } finally {