azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JPS: ignore excluded directories and files in compilation.

Browse Source 
#KT-4188 fixed

Original commit: b31e2d7421
This commit is contained in:
Zalim Bashorov
2013-11-12 15:44:51 +04:00
parent fcce7f25a7
commit 0ae7b9a6b0
1 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java
+39 -9
View File
@@ -16,7 +16,9 @@
package org.jetbrains.jet.jps.build;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.Function;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
@@ -25,7 +27,10 @@ import org.jetbrains.jps.builders.FileProcessor;
import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor;
import org.jetbrains.jps.incremental.ModuleBuildTarget;
import org.jetbrains.jps.model.java.JavaSourceRootType;
import org.jetbrains.jps.model.java.JpsJavaExtensionService;
import org.jetbrains.jps.model.java.compiler.JpsCompilerExcludes;
import org.jetbrains.jps.model.module.JpsModuleSourceRoot;
import org.jetbrains.jps.util.JpsPathUtil;
import java.io.File;
import java.io.IOException;
@@ -52,17 +57,42 @@ public class KotlinSourceFileCollector {
@NotNull
public static List<File> getAllKotlinSourceFiles(@NotNull ModuleBuildTarget target) {
final List<File> moduleExcludes = ContainerUtil.map(target.getModule().getExcludeRootsList().getUrls(), new Function<String, File>() {
@Override
public File fun(String url) {
return JpsPathUtil.urlToFile(url);
}
});
final JpsCompilerExcludes compilerExcludes =
JpsJavaExtensionService.getInstance().getOrCreateCompilerConfiguration(target.getModule().getProject()).getCompilerExcludes();
final List<File> result = ContainerUtil.newArrayList();
for (JpsModuleSourceRoot sourceRoot : getRelevantSourceRoots(target)) {
FileUtil.processFilesRecursively(sourceRoot.getFile(), new Processor<File>() {
@Override
public boolean process(File file) {
if (file.isFile() && isKotlinSourceFile(file)) {
result.add(file);
}
return true;
}
});
FileUtil.processFilesRecursively(
sourceRoot.getFile(),
new Processor<File>() {
@Override
public boolean process(File file) {
if (compilerExcludes.isExcluded(file)) return true;
if (file.isFile() && isKotlinSourceFile(file)) {
result.add(file);
}
return true;
}
},
new Processor<File>() {
@Override
public boolean process(final File dir) {
return ContainerUtil.find(moduleExcludes, new Condition<File>() {
@Override
public boolean value(File exclude) {
return FileUtil.filesEqual(exclude, dir);
}
}) == null;
}
});
}
return result;
}