File tree 4 files changed +12
-9
lines changed
test/scala/tests/troubleshoot
4 files changed +12
-9
lines changed Original file line number Diff line number Diff line change @@ -56,7 +56,7 @@ abstract class BaseLspSuite(
56
56
protected def useVirtualDocuments = useVirtualDocs
57
57
58
58
protected def mtagsResolver : MtagsResolver =
59
- new TestMtagsResolver
59
+ new TestMtagsResolver (checkCoursier = true )
60
60
61
61
override def afterAll (): Unit = {
62
62
if (server != null ) {
Original file line number Diff line number Diff line change @@ -10,16 +10,19 @@ import scala.meta.internal.metals.ScalaVersions
10
10
* For `unit` we don't publish mtags at all but there are some tests that trigger docker check.
11
11
* So for these cases, do fallback on previous mechanic by checking declared supported versions.
12
12
*/
13
- class TestMtagsResolver extends MtagsResolver {
13
+ class TestMtagsResolver ( checkCoursier : Boolean ) extends MtagsResolver {
14
14
15
15
val default : MtagsResolver = MtagsResolver .default()
16
16
17
+ private def localCheck (scalaVersion : String ) =
18
+ if (ScalaVersions .isSupportedAtReleaseMomentScalaVersion(scalaVersion))
19
+ Some (MtagsBinaries .BuildIn )
20
+ else None
21
+
17
22
override def resolve (scalaVersion : String ): Option [MtagsBinaries ] = {
18
- default.resolve(scalaVersion).orElse {
19
- if (ScalaVersions .isSupportedAtReleaseMomentScalaVersion(scalaVersion))
20
- Some (MtagsBinaries .BuildIn )
21
- else None
22
- }
23
+ if (checkCoursier)
24
+ default.resolve(scalaVersion).orElse(localCheck(scalaVersion))
25
+ else localCheck(scalaVersion)
23
26
}
24
27
25
28
override def isSupportedInOlderVersion (version : String ): Boolean =
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ object TestScala3Compiler {
19
19
def compiler (name : String , input : InputProperties )(implicit
20
20
ec : ExecutionContext
21
21
): Option [PresentationCompiler ] = {
22
- val resolver = new TestMtagsResolver ()
22
+ val resolver = new TestMtagsResolver (checkCoursier = true )
23
23
resolver.resolve(V .scala3) match {
24
24
case Some (mtags : MtagsBinaries .Artifacts ) =>
25
25
val time = new FakeTime
Original file line number Diff line number Diff line change @@ -228,7 +228,7 @@ class ProblemResolverSuite extends FunSuite {
228
228
229
229
val problemResolver = new ProblemResolver (
230
230
AbsolutePath (workspace),
231
- new TestMtagsResolver ,
231
+ new TestMtagsResolver (checkCoursier = false ) ,
232
232
() => None ,
233
233
() => javaHome,
234
234
() => isTestExplorerProvider,
You can’t perform that action at this time.
0 commit comments