MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 06:39:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-191394 XML qiuck fixes result in PSI-text inconsistency in JSP

Browse Source
This commit is contained in:
peter
2018-05-04 18:08:24 +02:00
parent f95979ec23
commit 55845a4d2c
2 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
xml/impl/src/com/intellij/codeInsight/completion/ExtendedTagInsertHandler.java
View File

@@ -17,6 +17,7 @@ package com.intellij.codeInsight.completion;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -25,12 +26,13 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.xml.XmlChildRole;
import com.intellij.psi.xml.XmlFile;
import com.intellij.psi.xml.XmlTag;
import com.intellij.util.IncorrectOperationException;
import com.intellij.xml.XmlNamespaceHelper;
import com.intellij.xml.XmlElementDescriptor;
import com.intellij.xml.XmlExtension;
import com.intellij.xml.XmlNamespaceHelper;
import com.intellij.xml.XmlSchemaProvider;
import com.intellij.xml.impl.schema.AnyXmlElementDescriptor;
import org.jetbrains.annotations.Nullable;
@@ -84,15 +86,13 @@ public class ExtendedTagInsertHandler extends XmlTagInsertHandler {
@Override
public void run(final String namespacePrefix) {
PsiDocumentManager.getInstance(project).commitDocument(document);
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document);
final PsiElement element = file.findElementAt(context.getStartOffset());
if (element != null) {
qualifyWithPrefix(namespacePrefix, element, document);
PsiDocumentManager.getInstance(project).commitDocument(document);
}
editor.getCaretModel().moveToOffset(caretMarker.getEndOffset());
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document);
doDefault(context, item);
}
};
@@ -159,12 +159,17 @@ public class ExtendedTagInsertHandler extends XmlTagInsertHandler {
if (tag instanceof XmlTag) {
final String prefix = ((XmlTag)tag).getNamespacePrefix();
if (!prefix.equals(namespacePrefix) && StringUtil.isNotEmpty(namespacePrefix)) {
final String name = namespacePrefix + ":" + ((XmlTag)tag).getLocalName();
try {
((XmlTag)tag).setName(name);
String toInsert = namespacePrefix + ":";
Document document = element.getContainingFile().getViewProvider().getDocument();
assert document != null;
ASTNode startTagName = XmlChildRole.START_TAG_NAME_FINDER.findChild(tag.getNode());
ASTNode endTagName = XmlChildRole.CLOSING_TAG_NAME_FINDER.findChild(tag.getNode());
if (endTagName != null) {
document.insertString(endTagName.getStartOffset(), toInsert);
}
catch (IncorrectOperationException e) {
LOG.error(e);
if (startTagName != null) {
document.insertString(startTagName.getStartOffset(), toInsert);
}
}
}

30
xml/xml-analysis-impl/src/com/intellij/xml/util/XmlDeclareIdInCommentAction.java
View File

@@ -21,19 +21,20 @@ import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.lang.Commenter;
import com.intellij.lang.Language;
import com.intellij.lang.LanguageCommenters;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiComment;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiFileFactory;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.xml.XmlTag;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
/**
* @author spleaner
*/
@@ -97,26 +98,11 @@ public class XmlDeclareIdInCommentAction implements LocalQuickFix {
final Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(language);
if (commenter == null) return;
final PsiFile tempFile = PsiFileFactory.getInstance(project).createFileFromText("dummy", language.getAssociatedFileType(),
commenter.getBlockCommentPrefix() +
"@declare id=\"" +
myId +
"\"" +
commenter.getBlockCommentSuffix() +
"\n");
final XmlTag parent = tag.getParentTag();
if (parent != null && parent.isValid()) {
final XmlTag[] tags = parent.getSubTags();
if (tags.length > 0) {
final PsiFile psi = tempFile.getViewProvider().getPsi(language);
if (psi != null) {
final PsiElement element = psi.findElementAt(1);
if (element instanceof PsiComment) {
parent.getNode().addChild(element.getNode(), tags[0].getNode());
}
}
}
String commentText = commenter.getBlockCommentPrefix() + "@declare id=\"" + myId + "\"" + commenter.getBlockCommentSuffix();
XmlTag parent = tag.getParentTag();
if (parent != null) {
Document document = Objects.requireNonNull(psiFile.getViewProvider().getDocument());
document.insertString(parent.getSubTags()[0].getTextRange().getStartOffset(), commentText);
}
});
}