From 62266a64eefd71c38adc127d6ac5c5a9fb8b58a2 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Wed, 20 Feb 2013 17:17:03 +0400 Subject: [PATCH] Move method: showErrorHint --- .../jet/plugin/codeInsight/CodeInsightUtils.java | 13 +++++++++++++ .../JetIntroduceVariableHandler.java | 6 ++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java index 97077608080..19b30c7c284 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java @@ -1,11 +1,15 @@ package org.jetbrains.jet.plugin.codeInsight; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiComment; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtilCore; +import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.psi.JetBlockExpression; @@ -152,6 +156,15 @@ public class CodeInsightUtils { return null; } + public static void showErrorHint( + @NotNull Project project, @NotNull Editor editor, + @NotNull String message, @NotNull String title, + @Nullable String helpId + ) { + if (ApplicationManager.getApplication().isUnitTestMode()) throw new RuntimeException(message); + CommonRefactoringUtil.showErrorHint(project, editor, message, title, helpId); + } + private CodeInsightUtils() { } } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java index c27e2cae5b2..c6c1e38df22 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java @@ -49,6 +49,7 @@ import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.lexer.JetTokens; +import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; import org.jetbrains.jet.plugin.codeInsight.ReferenceToClassesShortening; import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil; import org.jetbrains.jet.plugin.refactoring.*; @@ -568,10 +569,7 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase { } private static void showErrorHint(Project project, Editor editor, String message) { - if (ApplicationManager.getApplication().isUnitTestMode()) throw new RuntimeException(message); - CommonRefactoringUtil.showErrorHint(project, editor, message, - INTRODUCE_VARIABLE, - HelpID.INTRODUCE_VARIABLE); + CodeInsightUtils.showErrorHint(project, editor, message, INTRODUCE_VARIABLE, HelpID.INTRODUCE_VARIABLE); } @Override