MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-21 14:37:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-40911 JSPX: code completion inserts not escaped '<' and '>' for generic classes

Browse Source
This commit is contained in:
peter
2012-07-04 17:49:25 +02:00
parent c03ae530da
commit 0c9743b9d1
2 changed files with 953 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionUtil.java
+952 -942
View File
File diff suppressed because it is too large Load Diff
java/java-impl/src/com/intellij/codeInsight/lookup/PsiTypeLookupItem.java
+1 -6
View File
@@ -16,7 +16,6 @@
package com.intellij.codeInsight.lookup;
import com.intellij.codeInsight.completion.*;
import com.intellij.ide.highlighter.XmlLikeFileType;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.ScrollType;
import com.intellij.openapi.util.ClassConditionKey;
@@ -80,11 +79,7 @@ public class PsiTypeLookupItem extends LookupItem {
PsiElement position = context.getFile().findElementAt(context.getStartOffset());
assert position != null;
int genericsStart = context.getTailOffset();
String generics = calcGenerics(position, context);
if (context.getFile().getFileType() instanceof XmlLikeFileType) {
generics = StringUtil.escapeXml(generics);
}
context.getDocument().insertString(genericsStart, generics);
context.getDocument().insertString(genericsStart, JavaCompletionUtil.escapeXmlIfNeeded(context, calcGenerics(position, context)));
JavaCompletionUtil.shortenReference(context.getFile(), genericsStart - 1);
int tail = context.getTailOffset();