From 1a55281f03b8d35f9fd81feffb45ec4be236ab2e Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Fri, 17 Feb 2012 22:05:29 +0400 Subject: [PATCH 1/2] fix bug in copy paste --- platform/core-api/src/com/intellij/psi/search/ProjectScope.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/core-api/src/com/intellij/psi/search/ProjectScope.java b/platform/core-api/src/com/intellij/psi/search/ProjectScope.java index 6c502aba52d8..39a239a4cbd8 100644 --- a/platform/core-api/src/com/intellij/psi/search/ProjectScope.java +++ b/platform/core-api/src/com/intellij/psi/search/ProjectScope.java @@ -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()); } } From 6841d109ce66fbb2976e3ab80b6b8fe0bab263b7 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Fri, 17 Feb 2012 22:08:34 +0400 Subject: [PATCH 2/2] clean up --- .../src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java index a652d9baee97..a3285115ea8b 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java @@ -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 }; 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)) {