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

1. do not index files which are out of project content

Browse Source 
2. Faster Ant internal structures cleanup on VirtualFile deletion
This commit is contained in:
Eugene Zhuravlev
2009-02-10 19:00:18 +03:00
parent 5a0c3a45bd
commit 52bbedc904
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang-impl/src/com/intellij/util/fileIndex/FileIndexRefreshCacheUpdater.java
+6 -6
View File
@@ -8,13 +8,13 @@ import com.intellij.ide.startup.CacheUpdater;
import com.intellij.ide.startup.FileContent;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.vfs.*;
import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
import com.intellij.openapi.vfs.ex.VirtualFileManagerEx;
import com.intellij.openapi.vfs.newvfs.NewVirtualFile;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.Collection;
import java.util.Arrays;
/**
* @author nik
@@ -88,10 +88,10 @@ public class FileIndexRefreshCacheUpdater extends VirtualFileAdapter implements
}
private void handleCreateDeleteFile(final VirtualFile file, final boolean fromRefresh, final boolean create) {
if (!myFileIndex.getProjectFileIndex().isInContent(file)) {
return;
}
if (file.isDirectory()) {
if (!myFileIndex.getProjectFileIndex().isInContent(file)) {
return;
}
final Collection<VirtualFile> children = create ? Arrays.asList(file.getChildren()) : ((NewVirtualFile)file).getCachedChildren();
for (VirtualFile child : children) {
handleCreateDeleteFile(child, fromRefresh, create);
plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java
+20 -15
View File
@@ -98,6 +98,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
private final Map<ExecutionEvent, Pair<AntBuildFile, String>> myEventToTargetMap =
new HashMap<ExecutionEvent, Pair<AntBuildFile, String>>();
private final List<AntBuildFile> myBuildFiles = new ArrayList<AntBuildFile>();
private AntBuildFile[] myBuildFilesArray = null; // cached result of call to myBuildFiles.toArray()
private final Map<AntBuildFile, AntBuildModelBase> myModelToBuildFileMap = new HashMap<AntBuildFile, AntBuildModelBase>();
private final Map<VirtualFile, VirtualFile> myAntFileToContextFileMap = new java.util.HashMap<VirtualFile, VirtualFile>();
private final EventDispatcher<AntConfigurationListener> myEventDispatcher = EventDispatcher.create(AntConfigurationListener.class);
@@ -144,20 +145,17 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
VirtualFileManager.getInstance().addVirtualFileListener(new VirtualFileAdapter() {
public void beforeFileDeletion(final VirtualFileEvent event) {
final VirtualFile vFile = event.getFile();
final AntFile antFile = AntSupport.toAntFile(vFile, AntConfigurationImpl.this.getProject());
if (antFile != null) {
// cleanup
for (AntBuildFile file : getBuildFiles()) {
if (antFile.equals(file.getAntFile())) {
removeBuildFile(file);
break;
}
// cleanup
for (AntBuildFile file : getBuildFiles()) {
if (vFile.equals(file.getVirtualFile())) {
removeBuildFile(file);
break;
}
for (Iterator<VirtualFile> it = myAntFileToContextFileMap.keySet().iterator(); it.hasNext();) {
final VirtualFile file = it.next();
if (vFile.equals(file) || vFile.equals(myAntFileToContextFileMap.get(file))) {
it.remove();
}
}
for (Iterator<Map.Entry<VirtualFile,VirtualFile>> it = myAntFileToContextFileMap.entrySet().iterator(); it.hasNext();) {
final Map.Entry<VirtualFile, VirtualFile> entry = it.next();
if (vFile.equals(entry.getKey()) || vFile.equals(entry.getValue())) {
it.remove();
}
}
}
@@ -195,7 +193,10 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
public AntBuildFile[] getBuildFiles() {
synchronized (myBuildFiles) {
return myBuildFiles.toArray(new AntBuildFile[myBuildFiles.size()]);
if (myBuildFilesArray == null) {
myBuildFilesArray = myBuildFiles.toArray(new AntBuildFile[myBuildFiles.size()]);
}
return myBuildFilesArray;
}
}
@@ -362,7 +363,9 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
@Nullable
public AntBuildModel getModelIfRegistered(final AntBuildFile buildFile) {
synchronized (myBuildFiles) {
if (!myBuildFiles.contains(buildFile)) return null;
if (!myBuildFiles.contains(buildFile)) {
return null;
}
}
return getModel(buildFile);
}
@@ -535,6 +538,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
final AntBuildFileImpl buildFile = new AntBuildFileImpl(antFile, this);
antFile.getSourceElement().putCopyableUserData(AntFileImpl.ANT_BUILD_FILE, buildFile);
synchronized (myBuildFiles) {
myBuildFilesArray = null;
myBuildFiles.add(buildFile);
}
return buildFile;
@@ -596,6 +600,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis
xmlFile.putCopyableUserData(AntFileImpl.ANT_BUILD_FILE, null);
AntSupport.markFileAsAntFile(xmlFile.getVirtualFile(), xmlFile.getViewProvider(), false);
synchronized (myBuildFiles) {
myBuildFilesArray = null;
myBuildFiles.remove(buildFile);
}
myModelToBuildFileMap.remove(buildFile);