MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

more robust heuristic: compare text when deciding whether two nodes worth merging

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-04-20 13:24:41 +03:00
parent d58be68f2b
commit 6f521ff2d7
6 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/psi/impl/smartPointers/SmartPsiElementPointersTest.java
+6 -22
View File
@@ -19,6 +19,7 @@ import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.CodeInsightTestCase;
import com.intellij.ide.highlighter.HtmlFileType;
import com.intellij.ide.highlighter.JavaFileType;
import com.intellij.ide.highlighter.XmlFileType;
import com.intellij.lang.FileASTNode;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.editor.Document;
@@ -514,26 +515,12 @@ public class SmartPsiElementPointersTest extends CodeInsightTestCase {
}
public void testInXml2() {
final PsiFile file = configureByText(HtmlFileType.INSTANCE,
"<!DOCTYPE html>\n" +
final PsiFile file = configureByText(XmlFileType.INSTANCE,
"<html>\n" +
"<head>\n" +
" <title></title>\n" +
"</head>\n" +
"<body>\n" +
"<div class=\"cls\">\n" +
" <ul class=\"dropdown-menu\">\n" +
" <li><a href=\"#\">Action</a></li>\n" +
" <li><a href=\"#\">Another action</a></li>\n" +
" <li><a href=\"#\">Something else here</a></li>\n" +
" <li class=\"divider\"></li>\n" +
" <li class=\"dropdown-header\">Nav header</li>\n" +
" <li><a href=\"#\">Separated link</a></li>\n" +
" <li><a href=\"#\">One more separated link</a></li>\n" +
" </ul>\n" +
"<caret>\n" +
"</div>\n" +
"</body>\n" +
"</html>"
);
@@ -542,17 +529,14 @@ public class SmartPsiElementPointersTest extends CodeInsightTestCase {
assertEquals("ul", ul.getName());
assertEquals("dropdown-menu", ul.getAttributeValue("class"));
final SmartPsiElementPointer<XmlTag> ulPointer = SmartPointerManager.getInstance(getProject()).createSmartPsiElementPointer(
ul);
SmartPsiElementPointer<XmlTag> ulPointer = SmartPointerManager.getInstance(getProject()).createSmartPsiElementPointer(ul);
WriteCommandAction.runWriteCommandAction(getProject(), new Runnable() {
@Override
public void run() {
getEditor().getDocument().insertString(getEditor().getCaretModel().getOffset(), " <ul class=\"nav navbar-nav navbar-right\">\n" +
" <li><a href=\"../navbar/\">Default</a></li>\n" +
" <li class=\"active\"><a href=\"./\">Static top</a></li>\n" +
" <li><a href=\"../navbar-fixed-top/\">Fixed top</a></li>\n" +
" </ul>\n");
int offset = getEditor().getCaretModel().getOffset();
getEditor().getDocument().insertString(offset, " <ul class=\"nav navbar-nav navbar-right\">\n" +
" </ul>\n");
}
});