Skip to content

Commit 2612174

Browse files
simuonsWixBuildServer
authored andcommitted
bep: merge outout groups that comes from aspect and rule (#90)
Probably this is a bad idea. According to: - https://bazel.build/extending/aspects - https://bazel.build/extending/rules#requesting_output_files it's an error to return same output group from aspect and a rule need to migrate `intellij-info-generic` usages outside of intellij
1 parent da78018 commit 2612174

File tree

1 file changed

+1
-4
lines changed
  • base/src/com/google/idea/blaze/base/command/buildresult/bepparser

1 file changed

+1
-4
lines changed

base/src/com/google/idea/blaze/base/command/buildresult/bepparser/BepParser.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,7 @@ private class OutputGroupTargetConfigFileSetMap {
142142
}
143143

144144
fun setOutputGroupTargetConfig(outputGroup: String, target: String, config: String, fileSetNames: List<String>) {
145-
val previous = getOutputGroupTarget(outputGroup, target).put(config, fileSetNames.toList())
146-
if (previous != null) {
147-
error("$outputGroup:$target:$config already present")
148-
}
145+
getOutputGroupTarget(outputGroup, target).merge(config, fileSetNames.toList(), { a, b -> a + b })
149146
}
150147

151148
fun fileSetStream(): Sequence<OutputGroupTargetConfigFileSets> {

0 commit comments

Comments
 (0)