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

fixed detection for already added facets (EA-26990, EA-31952) [rev. by Dmitry A.]

Browse Source
This commit is contained in:
nik
2011-11-25 17:39:09 +04:00
parent 54f10fcbd3
commit eb5345ba44
2 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/framework/detection/impl/DetectedFrameworksData.java
+2 -4
View File
@@ -40,13 +40,11 @@ import java.util.*;
*/
public class DetectedFrameworksData {
private static final Logger LOG = Logger.getInstance("#com.intellij.framework.detection.impl.DetectedFrameworksData");
private final Project myProject;
private PersistentHashMap<Integer,TIntHashSet> myExistentFrameworkFiles;
private TIntObjectHashMap<TIntHashSet> myNewFiles;
private MultiMap<Integer, DetectedFrameworkDescription> myDetectedFrameworks;
public DetectedFrameworksData(Project project) {
myProject = project;
myDetectedFrameworks = new MultiMap<Integer, DetectedFrameworkDescription>();
File file = new File(FrameworkDetectorRegistryImpl.getDetectionDirPath() + File.separator + project.getName() + "." + project.getLocationHash() +
File.separator + "files");
@@ -105,8 +103,8 @@ public class DetectedFrameworksData {
return newFiles;
}
public MultiMap<Integer, DetectedFrameworkDescription> getDetectedFrameworks() {
return myDetectedFrameworks;
public Set<Integer> getDetectorsForDetectedFrameworks() {
return myDetectedFrameworks.keySet();
}
public Collection<? extends DetectedFrameworkDescription> updateFrameworksList(Integer detectorId,
platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java
+3 -23
View File
@@ -44,7 +44,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.util.containers.MultiMap;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.util.ui.update.MergingUpdateQueue;
import com.intellij.util.ui.update.Update;
@@ -264,31 +263,12 @@ public class FrameworkDetectionManager extends AbstractProjectComponent implemen
}
private List<? extends DetectedFrameworkDescription> getValidDetectedFrameworks() {
final MultiMap<Integer,DetectedFrameworkDescription> frameworksMap = myDetectedFrameworksData.getDetectedFrameworks();
final Set<Integer> detectors = myDetectedFrameworksData.getDetectorsForDetectedFrameworks();
List<DetectedFrameworkDescription> descriptions = new ArrayList<DetectedFrameworkDescription>();
final FileBasedIndex index = FileBasedIndex.getInstance();
final DetectionExcludesConfiguration excludesConfiguration = DetectionExcludesConfiguration.getInstance(myProject);
for (Integer id : frameworksMap.keySet()) {
final Collection<VirtualFile> acceptedFiles = index.getContainingFiles(FrameworkDetectionIndex.NAME, id,
GlobalSearchScope.projectScope(myProject));
boolean obsolete = false;
for (DetectedFrameworkDescription description : frameworksMap.get(id)) {
if (!acceptedFiles.containsAll(description.getRelatedFiles())) {
if (LOG.isDebugEnabled()) {
LOG.debug("Some files from " + description.getRelatedFiles() + " aren't accepted by detector any more (accepted = " + acceptedFiles + ")");
}
obsolete = true;
break;
}
}
final Collection<? extends DetectedFrameworkDescription> frameworks;
if (obsolete) {
frameworks = runDetector(id, index, excludesConfiguration, false);
}
else {
frameworks = frameworksMap.get(id);
}
for (Integer id : detectors) {
final Collection<? extends DetectedFrameworkDescription> frameworks = runDetector(id, index, excludesConfiguration, false);
for (DetectedFrameworkDescription framework : frameworks) {
descriptions.add(framework);
}