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:
Alexander Lobas
2012-02-17 23:31:06 +04:00
parent 862fe5f76e 29dc2cdc18
commit bb5d1122a3
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/psi/search/ProjectScope.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ProjectScope {
@NotNull
public static GlobalSearchScope getContentScope(@NotNull Project project) {
GlobalSearchScope cached = project.getUserData(LIBRARIES_SCOPE_KEY);
GlobalSearchScope cached = project.getUserData(CONTENT_SCOPE_KEY);
return cached != null ? cached : ((UserDataHolderEx)project).putUserDataIfAbsent(CONTENT_SCOPE_KEY, ProjectScopeBuilder.getInstance(project).buildContentScope());
}
}
platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java
Vendored
-2
View File
@@ -20,7 +20,6 @@ import com.intellij.lang.Language;
import com.intellij.lang.LanguageParserDefinitions;
import com.intellij.lang.ParserDefinition;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypeManager;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.fileTypes.impl.AbstractFileType;
import com.intellij.openapi.project.ProjectUtil;
@@ -111,7 +110,6 @@ public class TodoIndex extends FileBasedIndexExtension<TodoIndexEntry, Integer>
};
private final FileBasedIndex.InputFilter myInputFilter = new FileBasedIndex.InputFilter() {
private final FileTypeManager myFtManager = FileTypeManager.getInstance();
@Override
public boolean acceptInput(final VirtualFile file) {
if (!(file.getFileSystem() instanceof LocalFileSystem)) {