From ce25274012c51144f4cf341a79e28fee9654094a Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 11 Apr 2011 18:14:51 +0200 Subject: [PATCH] EA-26831 (check an expression) --- .../intention/impl/ConvertToBasicLatinAction.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java index e4b0467119e9..63363e5ccae5 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertToBasicLatinAction.java @@ -130,11 +130,14 @@ public class ConvertToBasicLatinAction extends PsiElementBaseIntentionAction { private static final Handler[] ourHandlers = { new MyLiteralHandler(), new MyDocCommentHandler(), new MyCommentHandler() }; private static class MyLiteralHandler extends Handler { - private static final TokenSet ourLiterals = TokenSet.create(JavaTokenType.CHARACTER_LITERAL, JavaTokenType.STRING_LITERAL); + private static final TokenSet LITERALS = TokenSet.create(JavaTokenType.CHARACTER_LITERAL, JavaTokenType.STRING_LITERAL); public PsiElement findApplicable(final PsiElement element) { - return element instanceof PsiJavaToken && ourLiterals.contains(((PsiJavaToken)element).getTokenType()) ? - element.getParent() : null; + final PsiElement parent = element.getParent(); + return element instanceof PsiJavaToken && + LITERALS.contains(((PsiJavaToken)element).getTokenType()) && + parent instanceof PsiLiteralExpression + ? parent : null; } public PsiElement createReplacement(final PsiElement element, final String newText) {