azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not wrap empty scope and fix kotlinSourceAndClassFiles()

Browse Source
This commit is contained in:
Nikolay Krasko
2014-12-24 18:19:38 +03:00
parent cdeaa484bc
commit 5041f00fea
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/JetSourceFilterScope.java
+27 -10
View File
@@ -29,26 +29,38 @@ import org.jetbrains.jet.plugin.util.ProjectRootsUtil;
public class JetSourceFilterScope extends DelegatingGlobalSearchScope {
@NotNull
public static GlobalSearchScope kotlinSourcesAndLibraries(@NotNull GlobalSearchScope delegate, @NotNull Project project) {
if (delegate instanceof JetSourceFilterScope) {
return delegate;
}
return new JetSourceFilterScope(delegate, true, true, project);
return create(delegate, true, true, project);
}
@NotNull
public static GlobalSearchScope kotlinSourceAndClassFiles(@NotNull GlobalSearchScope delegate, @NotNull Project project) {
if (delegate instanceof JetSourceFilterScope) {
delegate = ((JetSourceFilterScope) delegate).myBaseScope;
}
return new JetSourceFilterScope(delegate, false, true, project);
return create(delegate, false, true, project);
}
@NotNull
public static GlobalSearchScope kotlinSources(@NotNull GlobalSearchScope delegate, @NotNull Project project) {
return create(delegate, false, false, project);
}
@NotNull
private static GlobalSearchScope create(
@NotNull GlobalSearchScope delegate,
boolean includeLibrarySourceFiles,
boolean includeClassFiles,
@NotNull Project project
) {
if (delegate == GlobalSearchScope.EMPTY_SCOPE) return delegate;
if (delegate instanceof JetSourceFilterScope) {
delegate = ((JetSourceFilterScope) delegate).myBaseScope;
JetSourceFilterScope wrappedDelegate = (JetSourceFilterScope) delegate;
boolean doIncludeLibrarySourceFiles = wrappedDelegate.includeLibrarySourceFiles && includeLibrarySourceFiles;
boolean doIncludeClassFiles = wrappedDelegate.includeClassFiles && includeClassFiles;
return new JetSourceFilterScope(wrappedDelegate.myBaseScope, doIncludeLibrarySourceFiles, doIncludeClassFiles, project);
}
return new JetSourceFilterScope(delegate, false, false, project);
return new JetSourceFilterScope(delegate, includeLibrarySourceFiles, includeClassFiles, project);
}
private final ProjectFileIndex index;
@@ -72,6 +84,11 @@ public class JetSourceFilterScope extends DelegatingGlobalSearchScope {
this.isJsProject = JsProjectDetector.isJsProject(project);
}
@Override
public Project getProject() {
return project;
}
@Override
public boolean contains(@NotNull VirtualFile file) {
if (!super.contains(file)) {