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

if dependency analysys finds affected files inside annotation processor-generated sources, rebuild the module to ensure all necessary sources are re-generated (IDEA-190622)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2018-04-23 12:05:56 +02:00
parent a8700c1171
commit 4dd5d2721c
1 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/builders/java/JavaBuilderUtil.java
+38 -2
View File
@@ -10,6 +10,7 @@ import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.ModuleChunk;
import org.jetbrains.jps.ProjectPaths;
import org.jetbrains.jps.builders.BuildRootIndex;
import org.jetbrains.jps.builders.BuildTarget;
import org.jetbrains.jps.builders.BuildTargetIndex;
@@ -27,6 +28,8 @@ import org.jetbrains.jps.model.JpsProject;
import org.jetbrains.jps.model.java.JavaModuleIndex;
import org.jetbrains.jps.model.java.JpsJavaExtensionService;
import org.jetbrains.jps.model.java.JpsJavaSdkType;
import org.jetbrains.jps.model.java.compiler.JpsJavaCompilerConfiguration;
import org.jetbrains.jps.model.java.compiler.ProcessorConfigProfile;
import org.jetbrains.jps.model.library.JpsTypedLibrary;
import org.jetbrains.jps.model.library.sdk.JpsSdk;
import org.jetbrains.jps.model.library.sdk.JpsSdkReference;
@@ -252,8 +255,21 @@ public class JavaBuilderUtil {
FSOperations.markDirtyIfNotDeleted(context, markDirtyRound, file);
}
}
if (targetsToMark == null || !targetsToMark.contains(chunk.representativeTarget())) {
// additionally check whether annotation-processor generated files from this chunk are affected
if (containsProcessorGeneratedFiles(chunk, newlyAffectedFiles)) {
// If among affected files are those processor-generated, then we need to re-generate them before compiling.
// To achieve this, we need to recompile the whole chunk which will cause processors to re-generated these affected files
if (targetsToMark == null) {
targetsToMark = new THashSet<>(); // lazy init
}
targetsToMark.addAll(chunk.getTargets());
}
}
boolean currentChunkAfected = false;
if (targetsToMark != null) {
boolean currentChunkAfected = false;
for (ModuleBuildTarget target : targetsToMark) {
if (chunk.getTargets().contains(target)) {
currentChunkAfected = true;
@@ -272,7 +288,7 @@ public class JavaBuilderUtil {
FSOperations.markDirty(context, markDirtyRound, chunk, null);
}
}
additionalPassRequired = compilingIncrementally && moduleBasedFilter.containsFilesFromCurrentTargetChunk(newlyAffectedFiles);
additionalPassRequired = compilingIncrementally && (currentChunkAfected || moduleBasedFilter.containsFilesFromCurrentTargetChunk(newlyAffectedFiles));
}
}
else {
@@ -331,6 +347,26 @@ public class JavaBuilderUtil {
}
}
private static boolean containsProcessorGeneratedFiles(ModuleChunk chunk, Collection<File> files) {
final JpsModule module = chunk.representativeTarget().getModule();
final JpsJavaCompilerConfiguration compilerConfig = JpsJavaExtensionService.getInstance().getCompilerConfiguration(module.getProject());
assert compilerConfig != null;
final ProcessorConfigProfile profile = compilerConfig.getAnnotationProcessingProfile(module);
if (!profile.isEnabled()) {
return false;
}
final File outputDir = ProjectPaths.getAnnotationProcessorGeneratedSourcesOutputDir(module, chunk.containsTests(), profile);
if (outputDir == null) {
return false;
}
for (File file : files) {
if (FileUtil.isAncestor(outputDir, file, true)) {
return true;
}
}
return false;
}
@Nullable
public static File findModuleInfoFile(CompileContext context, ModuleBuildTarget target) {
return getJavaModuleIndex(context).getModuleInfoFile(target.getModule(), target.isTests());