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

[r=nik] forced file recompilation fix

Browse Source
This commit is contained in:
Eugene Zhuravlev
2013-03-25 11:53:57 +04:00
parent 9845be270a
commit dbce639756
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+7 -7
View File
@@ -466,14 +466,14 @@ public class CompileDriver {
final CompileScope scope = compileContext.getCompileScope();
final Collection<String> paths = CompileScopeUtil.fetchFiles(compileContext);
List<TargetTypeBuildScope> scopes = new ArrayList<TargetTypeBuildScope>();
final boolean forceBuild = !compileContext.isMake();
if (!compileContext.isRebuild() && !CompileScopeUtil.allProjectModulesAffected(compileContext)) {
CompileScopeUtil.addScopesForModules(Arrays.asList(scope.getAffectedModules()), scopes, forceBuild);
}
else {
scopes.addAll(CmdlineProtoUtil.createAllModulesScopes(forceBuild));
}
if (paths.isEmpty()) {
boolean forceBuild = !compileContext.isMake();
if (!compileContext.isRebuild() && !CompileScopeUtil.allProjectModulesAffected(compileContext)) {
CompileScopeUtil.addScopesForModules(Arrays.asList(scope.getAffectedModules()), scopes, forceBuild);
}
else {
scopes.addAll(CmdlineProtoUtil.createAllModulesScopes(forceBuild));
}
for (BuildTargetScopeProvider provider : BuildTargetScopeProvider.EP_NAME.getExtensions()) {
scopes = CompileScopeUtil.mergeScopes(scopes, provider.getBuildTargetScopes(scope, myCompilerFilter, myProject, forceBuild));
}
jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java
+4 -4
View File
@@ -86,11 +86,11 @@ public class CompileScopeImpl extends CompileScope {
if (myFiles.isEmpty()) {//optimization
return true;
}
if (myTypes.contains(target.getTargetType()) || myTargets.contains(target) || isAffectedByAssociatedModule(target)) {
return true;
}
final Set<File> files = myFiles.get(target);
return files != null && files.contains(file);
if (files != null) {
return files.contains(file);
}
return myTypes.contains(target.getTargetType()) || myTargets.contains(target) || isAffectedByAssociatedModule(target);
}
private boolean isAffectedByAssociatedModule(BuildTarget<?> target) {