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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Konstantin Bulenkov
2015-10-05 12:45:19 +01:00
parent 92c22bc863 c5d0d148e7
commit a13eefb799
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/fileTypes/FileTypeUsagesCollector.java
+8 -3
View File
@@ -58,6 +58,8 @@ public class FileTypeUsagesCollector extends AbstractApplicationUsagesCollector
if (project.isDisposed()) {
throw new CollectUsagesException("Project is disposed");
}
VirtualFile ideaDir = project.getBaseDir().findChild(Project.DIRECTORY_STORE_FOLDER);
final String ideaDirPath = ideaDir == null ? null : ideaDir.getPath();
ApplicationManager.getApplication().runReadAction(new Runnable() {
@Override
public void run() {
@@ -68,14 +70,17 @@ public class FileTypeUsagesCollector extends AbstractApplicationUsagesCollector
new FileBasedIndex.ValueProcessor<Void>() {
@Override
public boolean process(VirtualFile file, Void value) {
usedFileTypes.add(fileType);
return false;
//skip files from .idea directory otherwise 99% of projects would have XML and PLAIN_TEXT file types
if (ideaDirPath == null || !file.getPath().startsWith(ideaDirPath)) {
usedFileTypes.add(fileType);
return false;
}
return true;
}
}, GlobalSearchScope.projectScope(project));
}
});
}
usedFileTypes.add(UnknownFileType.INSTANCE);
return ContainerUtil.map2Set(usedFileTypes, new NotNullFunction<FileType, UsageDescriptor>() {
@NotNull
@Override
platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/FileTypeUsagesCollectorTest.java
+3 -3
View File
@@ -55,17 +55,17 @@ public class FileTypeUsagesCollectorTest extends LightPlatformCodeInsightFixture
}
public void testEmptyProject() throws CollectUsagesException {
doTest(Arrays.asList(UnknownFileType.INSTANCE));
doTest(Arrays.asList());
}
public void testSingleFileProject() throws CollectUsagesException {
myFixture.configureByText("a.txt", "");
doTest(Arrays.asList(UnknownFileType.INSTANCE, PlainTextFileType.INSTANCE));
doTest(Arrays.asList(PlainTextFileType.INSTANCE));
}
public void testSeveralSameFilesProject() throws CollectUsagesException {
myFixture.configureByText("a.txt", "");
myFixture.configureByText("b.txt", "");
doTest(Arrays.asList(UnknownFileType.INSTANCE, PlainTextFileType.INSTANCE));
doTest(Arrays.asList(PlainTextFileType.INSTANCE));
}
}