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

inline getPredefinedScopes() used only once

Browse Source
This commit is contained in:
Gregory.Shrago
2019-03-21 18:56:39 +03:00
parent 7e4383dd14
commit 3874a741fe
2 changed files with 15 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-impl/src/com/intellij/find/findUsages/FindUsagesOptions.java
+15 -19
View File
@@ -43,31 +43,27 @@ public class FindUsagesOptions implements Cloneable {
}
public FindUsagesOptions(@NotNull Project project, @Nullable final DataContext dataContext) {
this(calcScope(project, dataContext));
}
@NotNull
private static SearchScope calcScope(@NotNull Project project, @Nullable DataContext dataContext) {
String defaultScopeName = FindSettings.getInstance().getDefaultScopeName();
List<SearchScope> predefined = PredefinedSearchScopeProvider.getInstance().getPredefinedScopes(project, dataContext, true, false, false,
false);
SearchScope resultScope = null;
for (SearchScope scope : predefined) {
if (scope.getDisplayName().equals(defaultScopeName)) {
resultScope = scope;
break;
}
}
if (resultScope == null) {
resultScope = ProjectScope.getProjectScope(project);
}
return resultScope;
this(findScopeByName(project, dataContext, FindSettings.getInstance().getDefaultScopeName()));
}
public FindUsagesOptions(@NotNull SearchScope searchScope) {
this.searchScope = searchScope;
}
@NotNull
private static SearchScope findScopeByName(@NotNull Project project,
@Nullable DataContext dataContext,
@Nullable String scopeName) {
List<SearchScope> predefined = PredefinedSearchScopeProvider.getInstance().getPredefinedScopes(
project, dataContext, true, false, false, false, false);
for (SearchScope scope : predefined) {
if (scope.getDisplayName().equals(scopeName)) {
return scope;
}
}
return ProjectScope.getProjectScope(project);
}
@Override
public FindUsagesOptions clone() {
try {
platform/analysis-impl/src/com/intellij/psi/search/PredefinedSearchScopeProvider.java
-15
View File
@@ -28,19 +28,4 @@ public abstract class PredefinedSearchScopeProvider {
boolean currentSelection,
boolean usageView,
boolean showEmptyScopes);
public final List<SearchScope> getPredefinedScopes(@NotNull final Project project,
@Nullable final DataContext dataContext,
boolean suggestSearchInLibs,
boolean prevSearchFiles,
boolean currentSelection,
boolean usageView) {
return getPredefinedScopes(project,
dataContext,
suggestSearchInLibs,
prevSearchFiles,
currentSelection,
usageView,
false);
}
}