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

don't store references to XmlFile bunches between before/after deletion events, store them for dom files only

Browse Source
This commit is contained in:
peter
2011-04-11 15:40:06 +02:00
parent 3a2438e74f
commit e121ff8aaa
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/dom-impl/src/com/intellij/util/xml/impl/DomManagerImpl.java
+13 -20
View File
@@ -44,6 +44,7 @@ import org.jetbrains.annotations.Nullable;
import java.lang.ref.WeakReference;
import java.lang.reflect.Type;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -106,7 +107,7 @@ public final class DomManagerImpl extends DomManager {
final Runnable setupVfsListeners = new Runnable() {
public void run() {
final VirtualFileAdapter listener = new VirtualFileAdapter() {
private final List<XmlFile> myDeletedFiles = new SmartList<XmlFile>();
private final List<DomEvent> myDeletionEvents = new SmartList<DomEvent>();
public void contentsChanged(VirtualFileEvent event) {
if (event.isFromSave()) return;
@@ -119,12 +120,12 @@ public final class DomManagerImpl extends DomManager {
}
public void beforeFileDeletion(final VirtualFileEvent event) {
beforeFileDeletion(event.getFile());
if (!project.isDisposed()) {
beforeFileDeletion(event.getFile());
}
}
private void beforeFileDeletion(final VirtualFile file) {
if (project.isDisposed()) return;
if (file.isDirectory() && file instanceof NewVirtualFile) {
for (final VirtualFile child : ((NewVirtualFile)file).getCachedChildren()) {
beforeFileDeletion(child);
@@ -135,19 +136,19 @@ public final class DomManagerImpl extends DomManager {
if (file.isValid() && StdFileTypes.XML.equals(file.getFileType())) {
final PsiFile psiFile = psiManager.findFile(file);
if (psiFile instanceof XmlFile) {
myDeletedFiles.add((XmlFile)psiFile);
Collections.addAll(myDeletionEvents, recomputeFileElement((XmlFile)psiFile));
}
}
}
public void fileDeleted(VirtualFileEvent event) {
if (!myDeletedFiles.isEmpty()) {
if (!myDeletionEvents.isEmpty()) {
if (!project.isDisposed()) {
for (final XmlFile file : myDeletedFiles) {
processXmlFileChange(file, true);
for (DomEvent domEvent : myDeletionEvents) {
fireEvent(domEvent);
}
}
myDeletedFiles.clear();
myDeletionEvents.clear();
}
}
@@ -193,20 +194,12 @@ public final class DomManagerImpl extends DomManager {
private void processFileChange(final PsiFile file) {
if (file != null && StdFileTypes.XML.equals(file.getFileType()) && file instanceof XmlFile) {
processXmlFileChange((XmlFile)file, true);
for (final DomEvent event : recomputeFileElement((XmlFile)file)) {
fireEvent(event);
}
}
}
private boolean processXmlFileChange(@NotNull final XmlFile file, boolean fireChanged) {
if (!fireChanged) return false;
final DomEvent[] list = recomputeFileElement(file);
for (final DomEvent event : list) {
fireEvent(event);
}
return list.length > 0;
}
static DomEvent[] recomputeFileElement(final XmlFile file) {
final DomFileElementImpl oldElement = getCachedFileElement(file);
return oldElement == null ? DomEvent.EMPTY_ARRAY : new DomEvent[]{new DomEvent(oldElement, false)};