Skip to content

Commit ec4809b

Browse files
committed
refactor: start to use problem2
1 parent ab4a0c3 commit ec4809b

File tree

3 files changed

+24
-4
lines changed

3 files changed

+24
-4
lines changed

Diff for: project/Dependencies.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ object Dependencies {
2828
"com.vladsch.flexmark" % "flexmark-ext-yaml-front-matter" % flexmarkVersion,
2929
)
3030

31-
val compilerInterface = "org.scala-sbt" % "compiler-interface" % "1.9.0"
31+
val compilerInterface = "org.scala-sbt" % "compiler-interface" % "1.9.3"
3232
}

Diff for: sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java

+22-2
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,28 @@ synchronized public void run(VirtualFile[] sources, AnalysisCallback callback, L
136136
doCompile(compiler, sourcesBuffer.toList(), context);
137137

138138
for (xsbti.Problem problem: delegate.problems()) {
139-
callback.problem(problem.category(), problem.position(), problem.message(), problem.severity(),
140-
true);
139+
try {
140+
if (callback instanceof AnalysisCallback2) {
141+
AnalysisCallback2 callback2 = (AnalysisCallback2)callback;
142+
callback2.problem2(
143+
problem.category(),
144+
problem.position(),
145+
problem.message(),
146+
problem.severity(),
147+
true, // reported
148+
problem.rendered(),
149+
problem.diagnosticCode(),
150+
problem.diagnosticRelatedInformation(),
151+
problem.actions()
152+
);
153+
} else {
154+
callback.problem(problem.category(), problem.position(), problem.message(), problem.severity(),
155+
true);
156+
};
157+
} catch (NoClassDefFoundError e) {
158+
callback.problem(problem.category(), problem.position(), problem.message(), problem.severity(),
159+
true);
160+
}
141161
}
142162
} else {
143163
delegate.printSummary();

Diff for: sbt-bridge/test/xsbt/DependencySpecification.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,4 +209,4 @@ class DependencySpecification {
209209
compilerForTesting.extractDependenciesFromSrcs(srcA, srcB, srcC, srcD)
210210
classDependencies
211211
}
212-
}
212+
}

0 commit comments

Comments
 (0)