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

cleanup: get rid of usages of deprecated CompilerFilter class

Browse Source 
Provide a variant of BuildTargetScopeProvider::getBuildTargetScopes method which doesn't take CompilerFilter as a parameter and deprecate the old method.
This commit is contained in:
nik
2018-01-31 15:41:21 +03:00
parent f618c74db1
commit 3f17e9f036
5 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/BuildTargetScopeProvider.java
+10 -2
View File
@@ -35,19 +35,27 @@ public abstract class BuildTargetScopeProvider {
public static final ExtensionPointName<BuildTargetScopeProvider> EP_NAME = ExtensionPointName.create("com.intellij.compiler.buildTargetScopeProvider");
/**
* @deprecated override {@link #getBuildTargetScopes(com.intellij.openapi.compiler.CompileScope, com.intellij.openapi.compiler.CompilerFilter, com.intellij.openapi.project.Project, boolean)} instead
* @deprecated override {@link #getBuildTargetScopes(CompileScope, Project, boolean)} instead
*/
@SuppressWarnings("DeprecatedIsStillUsed")
@NotNull
public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter,
@NotNull Project project) {
return Collections.emptyList();
}
/**
* @deprecated override {@link #getBuildTargetScopes(CompileScope, Project, boolean)} instead
*/
@SuppressWarnings("DeprecatedIsStillUsed")
@NotNull
public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter,
@NotNull Project project, boolean forceBuild) {
return getBuildTargetScopes(baseScope, filter, project);
}
@NotNull
public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull Project project, boolean forceBuild) {
return getBuildTargetScopes(baseScope, CompilerFilter.ALL, project, forceBuild);
}
}
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+1 -2
View File
@@ -57,7 +57,6 @@ import com.intellij.psi.PsiDocumentManager;
import com.intellij.util.Chunk;
import com.intellij.util.ThrowableRunnable;
import com.intellij.util.containers.ContainerUtil;
import java.util.HashMap;
import com.intellij.util.containers.MultiMap;
import com.intellij.util.messages.MessageBus;
import com.intellij.util.text.DateFormatUtil;
@@ -213,7 +212,7 @@ public class CompileDriver {
for (BuildTargetScopeProvider provider : BuildTargetScopeProvider.EP_NAME.getExtensions()) {
List<TargetTypeBuildScope> providerScopes = ReadAction.compute(
() -> myProject.isDisposed() ? Collections.emptyList()
: provider.getBuildTargetScopes(scope, myCompilerFilter, myProject, forceBuild));
: provider.getBuildTargetScopes(scope, myProject, forceBuild));
scopes = CompileScopeUtil.mergeScopes(scopes, providerScopes);
}
return scopes;
java/compiler/impl/src/com/intellij/packaging/impl/compiler/ArtifactBuildTargetScopeProvider.java
+1 -6
View File
@@ -20,7 +20,6 @@ import com.intellij.compiler.impl.CompileScopeUtil;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.compiler.CompileScope;
import com.intellij.openapi.compiler.CompilerFilter;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.packaging.artifacts.Artifact;
@@ -40,12 +39,8 @@ import java.util.Set;
public class ArtifactBuildTargetScopeProvider extends BuildTargetScopeProvider {
@NotNull
@Override
public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull final CompileScope baseScope, @NotNull CompilerFilter filter,
public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull final CompileScope baseScope,
@NotNull final Project project, final boolean forceBuild) {
final ArtifactsCompiler compiler = ArtifactsCompiler.getInstance(project);
if (compiler == null || !filter.acceptCompiler(compiler)) {
return Collections.emptyList();
}
final List<TargetTypeBuildScope> scopes = new ArrayList<>();
new ReadAction() {
protected void run(@NotNull final Result result) {
plugins/devkit/src/build/PluginModuleBuildScopeProvider.java
+1 -3
View File
@@ -17,7 +17,6 @@ package org.jetbrains.idea.devkit.build;
import com.intellij.compiler.impl.BuildTargetScopeProvider;
import com.intellij.openapi.compiler.CompileScope;
import com.intellij.openapi.compiler.CompilerFilter;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
@@ -36,8 +35,7 @@ import java.util.List;
public class PluginModuleBuildScopeProvider extends BuildTargetScopeProvider {
@NotNull
@Override
public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull CompilerFilter filter,
@NotNull Project project, boolean forceBuild) {
public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope, @NotNull Project project, boolean forceBuild) {
List<String> pluginArtifactTargetIds = new ArrayList<>();
for (Module module : baseScope.getAffectedModules()) {
if (PluginModuleType.isOfType(module)) {
plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyTargetScopeProvider.java
-2
View File
@@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.compiler;
import com.intellij.compiler.impl.BuildTargetScopeProvider;
import com.intellij.openapi.compiler.CompileScope;
import com.intellij.openapi.compiler.CompilerFilter;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
@@ -46,7 +45,6 @@ public class GroovyTargetScopeProvider extends BuildTargetScopeProvider {
@NotNull
@Override
public List<TargetTypeBuildScope> getBuildTargetScopes(@NotNull CompileScope baseScope,
@NotNull CompilerFilter filter,
@NotNull Project project,
boolean forceBuild) {
Boolean checkResourcesRebuild = baseScope.getUserData(GroovyResourceChecker.CHECKING_RESOURCES_REBUILD);