From 63a68ee7c034b799b0aed495e0d2f45acabbc5f1 Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Wed, 19 Jan 2005 15:09:55 +0300 Subject: [PATCH] (no message) --- openapi/src/com/intellij/psi/GenericsUtil.java | 4 ++++ .../codeInsight/daemon/impl/quickfix/VariableTypeFix.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/openapi/src/com/intellij/psi/GenericsUtil.java b/openapi/src/com/intellij/psi/GenericsUtil.java index 9daaf8c9cf73..51df2548556a 100644 --- a/openapi/src/com/intellij/psi/GenericsUtil.java +++ b/openapi/src/com/intellij/psi/GenericsUtil.java @@ -159,4 +159,8 @@ public class GenericsUtil { return true; } + + public static boolean isFromExternalTypeLanguage (PsiType type) { + return type.getInternalCanonicalText().equals(type.getCanonicalText()); + } } diff --git a/source/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java b/source/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java index 3e0407cd0897..3b8b05f6bf0e 100644 --- a/source/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java +++ b/source/com/intellij/codeInsight/daemon/impl/quickfix/VariableTypeFix.java @@ -8,6 +8,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiType; import com.intellij.psi.PsiVariable; +import com.intellij.psi.GenericsUtil; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.util.IncorrectOperationException; @@ -57,7 +58,7 @@ public class VariableTypeFix implements IntentionAction { && myReturnType.isValid() && !TypeConversionUtil.isNullType(myReturnType) && !TypeConversionUtil.isVoidType(myReturnType) - ; + && GenericsUtil.isFromExternalTypeLanguage(myReturnType); } public void invoke(Project project, Editor editor, PsiFile file) {