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

fix "compiler excludes are ignored in resource roots" (IDEA-167954)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2017-02-09 14:52:27 +01:00
parent 466f4075b3
commit 7d827dfe3a
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/builders/java/ResourceRootDescriptor.java
+17
View File
@@ -19,8 +19,12 @@ import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jps.builders.BuildRootDescriptor;
import org.jetbrains.jps.incremental.ResourcesTarget;
import org.jetbrains.jps.model.JpsProject;
import org.jetbrains.jps.model.java.JpsJavaExtensionService;
import org.jetbrains.jps.model.java.compiler.JpsCompilerExcludes;
import java.io.File;
import java.io.FileFilter;
import java.util.Set;
/**
@@ -61,6 +65,19 @@ public class ResourceRootDescriptor extends BuildRootDescriptor {
return myPackagePrefix;
}
@NotNull
@Override
public FileFilter createFileFilter() {
final JpsProject project = getTarget().getModule().getProject();
final JpsCompilerExcludes excludes = JpsJavaExtensionService.getInstance().getOrCreateCompilerConfiguration(project).getCompilerExcludes();
return new FileFilter() {
@Override
public boolean accept(File file) {
return !excludes.isExcluded(file);
}
};
}
@Override
public boolean isGenerated() {
return false;
jps/jps-builders/testSrc/org/jetbrains/jps/builders/resources/ResourceCopyingTest.java
+13
View File
@@ -15,6 +15,7 @@
*/
package org.jetbrains.jps.builders.resources;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.PathUtil;
import org.jetbrains.jps.builders.JpsBuildTestCase;
import org.jetbrains.jps.model.java.JavaResourceRootType;
@@ -73,4 +74,16 @@ public class ResourceCopyingTest extends JpsBuildTestCase {
rebuildAllModules();
assertOutput(m, fs().file("A.java", "xxx"));
}
public void testExcludesInResourceRoot() {
String file = createFile("res/A.java", "xxx");
String excludedFile = createFile("res/excluded.java", "XXX");
JpsModule m = addModule("m");
m.addSourceRoot(JpsPathUtil.pathToUrl(PathUtil.getParentPath(file)), JavaResourceRootType.RESOURCE);
JpsJavaExtensionService.getInstance().getOrCreateCompilerConfiguration(myProject).getCompilerExcludes().addExcludedFile(
"file://" + FileUtil.toSystemIndependentName(excludedFile)
);
rebuildAllModules();
assertOutput(m, fs().file("A.java", "xxx"));
}
}