-
-
Notifications
You must be signed in to change notification settings - Fork 287
Fix diagnostic outputs for Scala 2.12.13 #1532
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
simuons
merged 6 commits into
bazel-contrib:master
from
aishfenton:aish/fixDiagnosticsInDepsReporter
Dec 19, 2023
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
329 changes: 329 additions & 0 deletions
329
.../scalac/deps_tracking_reporter/after_2_12_13_and_before_2_13_12/DepsTrackingReporter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,329 @@ | ||
package io.bazel.rulesscala.scalac.reporter; | ||
|
||
import io.bazel.rulesscala.deps.proto.ScalaDeps; | ||
import io.bazel.rulesscala.deps.proto.ScalaDeps.Dependency; | ||
import io.bazel.rulesscala.deps.proto.ScalaDeps.Dependency.Kind; | ||
import io.bazel.rulesscala.scalac.compileoptions.CompileOptions; | ||
import java.io.BufferedOutputStream; | ||
import java.io.IOException; | ||
import java.io.OutputStream; | ||
import java.nio.file.Files; | ||
import java.nio.file.Paths; | ||
import java.util.Arrays; | ||
import java.util.Collection; | ||
import java.util.HashMap; | ||
import java.util.HashSet; | ||
import java.util.Map; | ||
import java.util.Set; | ||
import java.util.jar.JarFile; | ||
import java.util.stream.Collectors; | ||
import scala.collection.immutable.List$; | ||
import scala.reflect.internal.util.NoPosition$; | ||
import scala.reflect.internal.util.Position; | ||
import scala.tools.nsc.Settings; | ||
import scala.tools.nsc.reporters.ConsoleReporter; | ||
import scala.tools.nsc.reporters.Reporter; | ||
import scala.tools.nsc.reporters.FilteringReporter; | ||
|
||
import javax.print.attribute.standard.Severity; | ||
|
||
public class DepsTrackingReporter extends ConsoleReporter { | ||
|
||
private static final String HJAR_JAR_SUFFIX = "-hjar.jar"; | ||
private static final String IJAR_JAR_SUFFIX = "-ijar.jar"; | ||
private final Set<String> usedJars = new HashSet<>(); | ||
|
||
private final Map<String, String> jarToTarget = new HashMap<>(); | ||
private final Map<String, String> indirectJarToTarget = new HashMap<>(); | ||
|
||
private final Set<String> ignoredTargets; | ||
private final Set<String> directTargets; | ||
|
||
private final CompileOptions ops; | ||
public final Reporter delegateReporter; | ||
private Set<String> astUsedJars = new HashSet<>(); | ||
|
||
public DepsTrackingReporter(Settings settings, CompileOptions ops, Reporter delegate) { | ||
super(settings); | ||
this.ops = ops; | ||
this.delegateReporter = delegate; | ||
|
||
if (ops.directJars.length == ops.directTargets.length) { | ||
for (int i = 0; i < ops.directJars.length; i++) { | ||
jarToTarget.put(ops.directJars[i], ops.directTargets[i]); | ||
} | ||
} else { | ||
throw new IllegalArgumentException( | ||
"mismatched size: directJars " + ops.directJars.length + " vs directTargets" | ||
+ ops.directTargets.length); | ||
} | ||
|
||
if (ops.indirectJars.length == ops.indirectTargets.length) { | ||
for (int i = 0; i < ops.indirectJars.length; i++) { | ||
indirectJarToTarget.put(ops.indirectJars[i], ops.indirectTargets[i]); | ||
} | ||
} else { | ||
throw new IllegalArgumentException( | ||
"mismatched size: indirectJars " + ops.directJars.length + " vs indirectTargets " | ||
+ ops.directTargets.length); | ||
} | ||
|
||
ignoredTargets = Arrays.stream(ops.unusedDepsIgnoredTargets).collect(Collectors.toSet()); | ||
directTargets = Arrays.stream(ops.directTargets).collect(Collectors.toSet()); | ||
} | ||
|
||
private boolean isDependencyTrackingOn() { | ||
return "ast-plus".equals(ops.dependencyTrackingMethod) | ||
&& (!"off".equals(ops.strictDepsMode) || !"off".equals(ops.unusedDependencyCheckerMode)); | ||
} | ||
|
||
@Override | ||
public void info0(Position pos, String msg, Severity severity, boolean force) { | ||
doReport(pos, msg, severity); | ||
} | ||
|
||
@Override | ||
public void doReport(Position pos, String msg, Severity severity) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note: Just |
||
if (msg.startsWith("DT:")) { | ||
if (isDependencyTrackingOn()) { | ||
parseOpenedJar(msg); | ||
} | ||
} else { | ||
if (delegateReporter != null) { | ||
if (delegateReporter instanceof FilteringReporter) { | ||
((FilteringReporter) delegateReporter).doReport(pos, msg, severity); | ||
} else { | ||
delegateReporter.info0(pos, msg, severity, false); | ||
} | ||
} else { | ||
super.doReport(pos, msg, severity); | ||
} | ||
} | ||
} | ||
|
||
private void parseOpenedJar(String msg) { | ||
String jar = msg.split(":")[1]; | ||
|
||
//normalize path separators (scalac passes os-specific path separators.) | ||
jar = jar.replace("\\", "/"); | ||
|
||
// track only jars from dependency targets | ||
// this should exclude things like rt.jar which come from JDK | ||
if (jarToTarget.containsKey(jar) || indirectJarToTarget.containsKey(jar)) { | ||
usedJars.add(jar); | ||
} | ||
} | ||
|
||
public void prepareReport() throws IOException { | ||
Set<String> usedTargets = new HashSet<>(); | ||
Set<Dependency> usedDeps = new HashSet<>(); | ||
|
||
for (String jar : usedJars) { | ||
String target = jarToTarget.get(jar); | ||
|
||
if (target == null) { | ||
target = indirectJarToTarget.get(jar); | ||
} | ||
|
||
if (target.startsWith("Unknown")) { | ||
target = jarLabel(jar); | ||
} | ||
|
||
if (target == null) { | ||
// probably a bug if we get here | ||
continue; | ||
} | ||
|
||
Dependency dep = buildDependency( | ||
jar, | ||
target, | ||
astUsedJars.contains(jar) ? Kind.EXPLICIT : Kind.IMPLICIT, | ||
ignoredTargets.contains(target) | ||
); | ||
|
||
usedTargets.add(target); | ||
usedDeps.add(dep); | ||
} | ||
|
||
Set<Dependency> unusedDeps = new HashSet<>(); | ||
for (int i = 0; i < ops.directTargets.length; i++) { | ||
String directTarget = ops.directTargets[i]; | ||
if (usedTargets.contains(directTarget)) { | ||
continue; | ||
} | ||
|
||
unusedDeps.add( | ||
buildDependency( | ||
ops.directJars[i], | ||
directTarget, | ||
Kind.UNUSED, | ||
ignoredTargets.contains(directTarget) || "off".equals(ops.unusedDependencyCheckerMode) | ||
) | ||
); | ||
} | ||
|
||
writeSdepsFile(usedDeps, unusedDeps); | ||
|
||
Reporter reporter = this.delegateReporter != null ? this.delegateReporter : this; | ||
reportDeps(usedDeps, unusedDeps, reporter); | ||
} | ||
|
||
private Dependency buildDependency(String jar, String target, Kind kind, boolean ignored) { | ||
ScalaDeps.Dependency.Builder dependecyBuilder = ScalaDeps.Dependency.newBuilder(); | ||
|
||
dependecyBuilder.setKind(kind); | ||
dependecyBuilder.setLabel(target); | ||
dependecyBuilder.setIjarPath(jar); | ||
dependecyBuilder.setPath(guessFullJarPath(jar)); | ||
dependecyBuilder.setIgnored(ignored); | ||
|
||
return dependecyBuilder.build(); | ||
} | ||
|
||
private void writeSdepsFile(Collection<Dependency> usedDeps, Collection<Dependency> unusedDeps) | ||
throws IOException { | ||
|
||
ScalaDeps.Dependencies.Builder builder = ScalaDeps.Dependencies.newBuilder(); | ||
builder.setRuleLabel(ops.currentTarget); | ||
builder.setDependencyTrackingMethod(ops.dependencyTrackingMethod); | ||
builder.addAllDependency(usedDeps); | ||
builder.addAllDependency(unusedDeps); | ||
|
||
try (OutputStream outputStream = new BufferedOutputStream( | ||
Files.newOutputStream(Paths.get(ops.scalaDepsFile)))) { | ||
outputStream.write(builder.build().toByteArray()); | ||
} | ||
} | ||
|
||
private void reportDeps(Collection<Dependency> usedDeps, Collection<Dependency> unusedDeps, | ||
Reporter reporter) { | ||
if (ops.dependencyTrackingMethod.equals("ast-plus")) { | ||
|
||
if (!ops.strictDepsMode.equals("off")) { | ||
boolean isWarning = ops.strictDepsMode.equals("warn"); | ||
StringBuilder strictDepsReport = new StringBuilder("Missing strict dependencies:\n"); | ||
StringBuilder compilerDepsReport = new StringBuilder("Missing compiler dependencies:\n"); | ||
int strictDepsCount = 0; | ||
int compilerDepsCount = 0; | ||
for (Dependency dep : usedDeps) { | ||
String depReport = addDepMessage(dep); | ||
if (dep.getIgnored()) { | ||
continue; | ||
} | ||
|
||
if (directTargets.contains(dep.getLabel())) { | ||
continue; | ||
} | ||
|
||
if (dep.getKind() == Kind.EXPLICIT) { | ||
strictDepsCount++; | ||
strictDepsReport | ||
.append(isWarning ? "warning: " : "error: ") | ||
.append(depReport); | ||
} else { | ||
compilerDepsCount++; | ||
compilerDepsReport | ||
.append(isWarning ? "warning: " : "error: ") | ||
.append(depReport); | ||
} | ||
} | ||
|
||
if (strictDepsCount > 0) { | ||
if (ops.strictDepsMode.equals("warn")) { | ||
reporter.warning(NoPosition$.MODULE$, strictDepsReport.toString()); | ||
} else { | ||
reporter.error(NoPosition$.MODULE$, strictDepsReport.toString()); | ||
} | ||
} | ||
|
||
if (!ops.compilerDepsMode.equals("off") && compilerDepsCount > 0) { | ||
if (ops.compilerDepsMode.equals("warn")) { | ||
reporter.warning(NoPosition$.MODULE$, compilerDepsReport.toString()); | ||
} else { | ||
reporter.error(NoPosition$.MODULE$, compilerDepsReport.toString()); | ||
} | ||
} | ||
} | ||
|
||
if (!ops.unusedDependencyCheckerMode.equals("off")) { | ||
boolean isWarning = ops.unusedDependencyCheckerMode.equals("warn"); | ||
StringBuilder unusedDepsReport = new StringBuilder("Unused dependencies:\n"); | ||
int count = 0; | ||
for (Dependency dep : unusedDeps) { | ||
if (dep.getIgnored()) { | ||
continue; | ||
} | ||
count++; | ||
unusedDepsReport | ||
.append(isWarning ? "warning: " : "error: ") | ||
.append(removeDepMessage(dep)); | ||
} | ||
if (count > 0) { | ||
if (isWarning) { | ||
reporter.warning(NoPosition$.MODULE$, unusedDepsReport.toString()); | ||
} else if (ops.unusedDependencyCheckerMode.equals("error")) { | ||
reporter.error(NoPosition$.MODULE$, unusedDepsReport.toString()); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
private String addDepMessage(Dependency dep) { | ||
String target = dep.getLabel(); | ||
String jar = dep.getPath(); | ||
|
||
String message = "Target '" + target + "' (via jar: ' " + jar + " ') " | ||
+ "is being used by " + ops.currentTarget | ||
+ " but is is not specified as a dependency, please add it to the deps.\n" | ||
+ "You can use the following buildozer command:\n"; | ||
String command = "buildozer 'add deps " + target + "' " + ops.currentTarget + "\n"; | ||
return message + command; | ||
} | ||
|
||
private String removeDepMessage(Dependency dep) { | ||
String target = dep.getLabel(); | ||
String jar = dep.getPath(); | ||
|
||
String message = "Target '" + target + "' (via jar: ' " + jar + " ') " | ||
+ "is specified as a dependency to " + ops.currentTarget | ||
+ " but isn't used, please remove it from the deps.\n" | ||
+ "You can use the following buildozer command:\n"; | ||
String command = "buildozer 'remove deps " + target + "' " + ops.currentTarget + "\n"; | ||
|
||
return message + command; | ||
} | ||
|
||
private String guessFullJarPath(String jar) { | ||
if (jar.endsWith(IJAR_JAR_SUFFIX)) { | ||
return stripIjarSuffix(jar, IJAR_JAR_SUFFIX); | ||
} else if (jar.endsWith(HJAR_JAR_SUFFIX)) { | ||
return stripIjarSuffix(jar, HJAR_JAR_SUFFIX); | ||
} else { | ||
return jar; | ||
} | ||
} | ||
|
||
private static String stripIjarSuffix(String jar, String suffix) { | ||
return jar.substring(0, jar.length() - suffix.length()) + ".jar"; | ||
} | ||
|
||
private String jarLabel(String path) throws IOException { | ||
try (JarFile jar = new JarFile(path)) { | ||
return jar.getManifest().getMainAttributes().getValue("Target-Label"); | ||
} | ||
} | ||
|
||
public void registerAstUsedJars(Set<String> jars) { | ||
astUsedJars = jars; | ||
} | ||
|
||
public void writeDiagnostics(String diagnosticsFile) throws IOException { | ||
if (delegateReporter == null) { | ||
return; | ||
} | ||
|
||
ProtoReporter protoReporter = (ProtoReporter) delegateReporter; | ||
protoReporter.writeTo(Paths.get(diagnosticsFile)); | ||
} | ||
} |
File renamed without changes.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.