Skip to content

Commit 4e6114d

Browse files
committed
addressed review comments
1 parent ae6975d commit 4e6114d

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

base/src/com/google/idea/blaze/base/sync/aspects/BlazeIdeInterfaceAspectsImpl.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,9 @@ && shouldIgnoreTarget(
451451
}
452452

453453
ignoredLanguages.retainAll(
454-
LanguageSupport.availableAdditionalLanguages(languageSettings.getWorkspaceType()));
455-
warnIgnoredLanguages(context, ignoredLanguages);
454+
LanguageSupport.availableAdditionalLanguages(
455+
languageSettings.getWorkspaceType()));
456+
warnIgnoredLanguages(project, context, ignoredLanguages);
456457

457458
return Result.of(
458459
new TargetMapAndInterfaceState(
@@ -505,12 +506,12 @@ private static TargetIdeInfo protoToTarget(
505506
return null;
506507
}
507508

508-
private static void warnIgnoredLanguages(BlazeContext context, Set<LanguageClass> ignoredLangs) {
509+
private static void warnIgnoredLanguages(
510+
Project project, BlazeContext context, Set<LanguageClass> ignoredLangs) {
509511
if (ignoredLangs.isEmpty()) {
510512
return;
511513
}
512-
513-
final var sorted = new ArrayList<>(ignoredLangs);
514+
List<LanguageClass> sorted = new ArrayList<>(ignoredLangs);
514515
sorted.sort(Ordering.usingToString());
515516

516517
String msg =

cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,23 @@ private static ImmutableMap<TargetIdeInfo, List<TargetKey>> buildToolchainDepsTa
100100
continue;
101101
}
102102

103-
final var toolchain = target.getDependencies().stream()
103+
final var toolchainCandidates = target.getDependencies().stream()
104104
.filter(it -> it.getDependencyType() == DependencyType.TOOLCHAIN)
105105
.map(Dependency::getTargetKey)
106106
.filter(toolchains::containsKey)
107-
.findFirst();
107+
.collect(toImmutableList());
108108

109-
if (toolchain.isPresent()) {
110-
toolchainDepsTable.put(target, List.of(toolchain.get()));
109+
if (!toolchainCandidates.isEmpty()) {
110+
toolchainDepsTable.put(target, toolchainCandidates);
111111
continue;
112112
}
113113

114-
final var candidates = target.getDependencies().stream()
114+
final var fallbackCandidates = target.getDependencies().stream()
115115
.map(Dependency::getTargetKey)
116116
.filter(toolchains::containsKey)
117117
.collect(toImmutableList());
118118

119-
toolchainDepsTable.put(target, candidates);
119+
toolchainDepsTable.put(target, fallbackCandidates);
120120
}
121121

122122
return toolchainDepsTable.build();

0 commit comments

Comments
 (0)