From b10a4f2471eb8b5e028b85e252932dce601dc570 Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 20 Jul 2012 16:18:35 +0200 Subject: [PATCH] IDEA-88174 <java.lang.Object> inserted instead of generic argument in JSP code. --- .../intellij/codeInsight/completion/JavaCompletionUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java index 623f24cbaad2..9a73085ab26b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java @@ -23,7 +23,7 @@ import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler; import com.intellij.codeInsight.daemon.impl.quickfix.StaticImportMethodFix; import com.intellij.codeInsight.guess.GuessManager; import com.intellij.codeInsight.lookup.*; -import com.intellij.ide.highlighter.XmlLikeFileType; +import com.intellij.lang.StdLanguages; import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; @@ -948,8 +948,8 @@ public class JavaCompletionUtil { } public static String escapeXmlIfNeeded(InsertionContext context, String generics) { - if (context.getFile().getFileType() instanceof XmlLikeFileType) { - generics = StringUtil.escapeXml(generics); + if (context.getFile().getViewProvider().getBaseLanguage() == StdLanguages.JSPX) { + return StringUtil.escapeXml(generics); } return generics; }