MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

sql tests

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-09-01 14:22:34 +04:00
parent 25327e75a7
commit 002b9cb3cb
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/psi/impl/source/text/DiffLog.java
+11 -2
View File
@@ -33,6 +33,7 @@ import com.intellij.psi.impl.source.PsiFileImpl;
import com.intellij.psi.impl.source.tree.CompositeElement;
import com.intellij.psi.impl.source.tree.FileElement;
import com.intellij.psi.impl.source.tree.TreeElement;
import com.intellij.psi.impl.source.tree.TreeUtil;
import com.intellij.util.IncorrectOperationException;
import com.intellij.util.diff.DiffTreeChangeBuilder;
import org.jetbrains.annotations.NotNull;
@@ -148,7 +149,7 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> {
event.setParent(psiParent);
event.setFile(file);
event.setOldChild(psiOldChild);
PsiElement psiNewChild = newNode.getPsi();
PsiElement psiNewChild = getPsi(newNode, file);
event.setNewChild(psiNewChild);
((PsiManagerEx)file.getManager()).beforeChildReplacement(event);
}
@@ -224,7 +225,7 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> {
}
PsiElement psiParent = myOldParent.getPsi();
PsiElement psiChild = file.isPhysical() ? myNewNode.getPsi() : null;
PsiElement psiChild = getPsi(myNewNode, file);
if (psiParent != null && psiChild != null) {
PsiTreeChangeEventImpl event = new PsiTreeChangeEventImpl(file.getManager());
event.setParent(psiParent);
@@ -253,6 +254,14 @@ public class DiffLog implements DiffTreeChangeBuilder<ASTNode,ASTNode> {
DebugUtil.checkTreeStructure(myOldParent);
}
}
private static PsiElement getPsi(ASTNode node, PsiFile file) {
node.putUserData(TreeUtil.CONTAINING_FILE_KEY_AFTER_REPARSE, ((PsiFileImpl)file).getTreeElement());
PsiElement psiChild = file.isPhysical() ? node.getPsi() : null;
node.putUserData(TreeUtil.CONTAINING_FILE_KEY_AFTER_REPARSE, null);
return psiChild;
}
private static class ReplaceFileElement extends LogEntry {
platform/lang-impl/src/com/intellij/psi/impl/source/tree/TreeUtil.java
+6 -1
View File
@@ -228,10 +228,15 @@ public class TreeUtil {
return nextLeaf((TreeElement)node, null);
}
public static FileElement getFileElement(TreeElement parent) {
public static Key<FileElement> CONTAINING_FILE_KEY_AFTER_REPARSE = Key.create("CONTAINING_FILE_KEY_AFTER_REPARSE");
public static FileElement getFileElement(TreeElement element) {
TreeElement parent = element;
while (parent != null && !(parent instanceof FileElement)) {
parent = parent.getTreeParent();
}
if (parent == null) {
parent = element.getUserData(CONTAINING_FILE_KEY_AFTER_REPARSE);
}
return (FileElement)parent;
}