MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-01 17:03:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

module content search scopes

Browse Source
This commit is contained in:
Dmitry Avdeev
2012-01-20 16:25:03 +04:00
parent c7e6656033
commit 458dfcac1f
4 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/module/Module.java
+3
View File
@@ -124,6 +124,9 @@ public interface Module extends ComponentManager, AreaInstance, Disposable {
*/
GlobalSearchScope getModuleWithDependenciesScope();
GlobalSearchScope getModuleContentScope();
GlobalSearchScope getModuleContentWithDependenciesScope();
GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(boolean includeTests);
GlobalSearchScope getModuleWithDependentsScope();
GlobalSearchScope getModuleTestsWithDependentsScope();
platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleImpl.java
+10
View File
@@ -253,6 +253,16 @@ public class ModuleImpl extends ComponentManagerImpl implements Module {
return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS | ModuleWithDependenciesScope.MODULES);
}
@Override
public GlobalSearchScope getModuleContentScope() {
return getCachedScope(ModuleWithDependenciesScope.CONTENT);
}
@Override
public GlobalSearchScope getModuleContentWithDependenciesScope() {
return getCachedScope(ModuleWithDependenciesScope.CONTENT | ModuleWithDependenciesScope.MODULES);
}
public GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(boolean includeTests) {
return getCachedScope(ModuleWithDependenciesScope.COMPILE |
ModuleWithDependenciesScope.MODULES |
platform/testFramework/src/com/intellij/mock/MockModule.java
+11 -1
View File
@@ -21,7 +21,7 @@ public class MockModule extends MockComponentManager implements Module {
this(null, parentDisposable);
}
public MockModule(final Project project, @NotNull Disposable parentDisposable) {
public MockModule(@Nullable final Project project, @NotNull Disposable parentDisposable) {
super(project == null ? null : project.getPicoContainer(), parentDisposable);
myProject = project;
}
@@ -69,6 +69,16 @@ public class MockModule extends MockComponentManager implements Module {
return new MockGlobalSearchScope();
}
@Override
public GlobalSearchScope getModuleContentWithDependenciesScope() {
throw new UnsupportedOperationException("Method getModuleContentWithDependenciesScope is not yet implemented in " + getClass().getName());
}
@Override
public GlobalSearchScope getModuleContentScope() {
throw new UnsupportedOperationException("Method getModuleContentScope is not yet implemented in " + getClass().getName());
}
@Override
public GlobalSearchScope getModuleWithDependentsScope() {
throw new UnsupportedOperationException("Method getModuleWithDependentsScope is not yet implemented in " + getClass().getName());
plugins/devkit/src/inspections/quickfix/RegisterInspectionFix.java
+1 -3
View File
@@ -25,8 +25,6 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.module.impl.ModuleImpl;
import com.intellij.openapi.module.impl.scopes.ModuleWithDependenciesScope;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.ui.popup.JBPopupFactory;
@@ -87,7 +85,7 @@ class RegisterInspectionFix implements IntentionAction {
Module module = ModuleUtil.findModuleForPsiElement(file);
assert module != null;
List<DomFileElement<IdeaPlugin>> elements =
DomService.getInstance().getFileElements(IdeaPlugin.class, project, ((ModuleImpl)module).getCachedScope(ModuleWithDependenciesScope.CONTENT | ModuleWithDependenciesScope.MODULES));
DomService.getInstance().getFileElements(IdeaPlugin.class, project, module.getModuleContentWithDependenciesScope());
elements = ContainerUtil.filter(elements, new Condition<DomFileElement<IdeaPlugin>>() {
@Override