diff --git a/build.sbt b/build.sbt index c1255907303..c1163fc0950 100644 --- a/build.sbt +++ b/build.sbt @@ -159,6 +159,7 @@ def lintingOptions(scalaVersion: String) = { "-Wconf:src=*.ScaladocParser.scala&msg=parameter (pos|message) in method reportError:silent", "-Wconf:src=*.TreeViewProvider.scala&msg=parameter params in method (children|parent) is never used:silent", "-Wconf:src=*.InheritanceContext.scala&msg=parameter ec in method getLocations is never used:silent", + "-Wconf:src=*.CompilerWrapper.scala&msg=parameter params in method compiler is never used:silent", // silence "The outer reference in this type test cannot be checked at run time." "-Wconf:src=.*(CompletionProvider|ArgCompletions|Completions|Keywords|IndentOnPaste).scala&msg=The outer reference:silent", ) diff --git a/metals/src/main/scala/scala/meta/internal/bsp/BspConfigGenerator.scala b/metals/src/main/scala/scala/meta/internal/bsp/BspConfigGenerator.scala index b4f98558b78..8f083a8ba8e 100644 --- a/metals/src/main/scala/scala/meta/internal/bsp/BspConfigGenerator.scala +++ b/metals/src/main/scala/scala/meta/internal/bsp/BspConfigGenerator.scala @@ -13,7 +13,6 @@ import scala.meta.internal.builds.ShellRunner import scala.meta.internal.metals.Directories import scala.meta.internal.metals.Messages.BspProvider import scala.meta.internal.metals.MetalsEnrichments._ -import scala.meta.internal.metals.StatusBar import scala.meta.internal.metals.UserConfiguration import scala.meta.internal.metals.clients.language.MetalsLanguageClient import scala.meta.io.AbsolutePath @@ -27,7 +26,6 @@ final class BspConfigGenerator( workspace: AbsolutePath, languageClient: MetalsLanguageClient, shellRunner: ShellRunner, - statusBar: StatusBar, userConfig: () => UserConfiguration, )(implicit ec: ExecutionContext) { def runUnconditionally( diff --git a/metals/src/main/scala/scala/meta/internal/implementation/Supermethods.scala b/metals/src/main/scala/scala/meta/internal/implementation/Supermethods.scala index 2bef1344c08..8832b96d805 100644 --- a/metals/src/main/scala/scala/meta/internal/implementation/Supermethods.scala +++ b/metals/src/main/scala/scala/meta/internal/implementation/Supermethods.scala @@ -137,7 +137,6 @@ class Supermethods( textDocument, ) symbolInformation <- findSymbol(symbolOcc.symbol) - docText = TextDocumentWithPath(textDocument, filePath) } yield SuperMethodProvider.getSuperMethodHierarchy( symbolInformation ) diff --git a/metals/src/main/scala/scala/meta/internal/metals/ClientConfiguration.scala b/metals/src/main/scala/scala/meta/internal/metals/ClientConfiguration.scala index fa676c7262e..efb57a805f5 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/ClientConfiguration.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/ClientConfiguration.scala @@ -158,7 +158,7 @@ final class ClientConfiguration( for { capabilities <- clientCapabilities textDocumentCapabilities <- Option(capabilities.getTextDocument()) - inlayHintsCapabilities <- Option(textDocumentCapabilities.getInlayHint()) + _ <- Option(textDocumentCapabilities.getInlayHint()) } yield true }.getOrElse(false) diff --git a/metals/src/main/scala/scala/meta/internal/metals/ProjectMetalsLspService.scala b/metals/src/main/scala/scala/meta/internal/metals/ProjectMetalsLspService.scala index 324c283e030..3e792122517 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/ProjectMetalsLspService.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/ProjectMetalsLspService.scala @@ -116,7 +116,6 @@ class ProjectMetalsLspService( folder, languageClient, shellRunner, - statusBar, () => userConfig, ) diff --git a/metals/src/main/scala/scala/meta/internal/metals/codelenses/RunTestCodeLens.scala b/metals/src/main/scala/scala/meta/internal/metals/codelenses/RunTestCodeLens.scala index 970712d6293..29bba0fec2b 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/codelenses/RunTestCodeLens.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/codelenses/RunTestCodeLens.scala @@ -91,7 +91,6 @@ final class RunTestCodeLens( isJVM = buildTarget.asScalaBuildTarget.forall( _.getPlatform == b.ScalaPlatform.JVM ) - connection <- buildTargets.buildServerOf(buildTargetId) // although hasDebug is already available in BSP capabilities // see https://github.com/build-server-protocol/build-server-protocol/pull/161 // most of the bsp servers such as bloop and sbt might not support it. diff --git a/metals/src/main/scala/scala/meta/internal/metals/testProvider/frameworks/ScalatestTestFinder.scala b/metals/src/main/scala/scala/meta/internal/metals/testProvider/frameworks/ScalatestTestFinder.scala index 633c7857420..c291a19dffc 100644 --- a/metals/src/main/scala/scala/meta/internal/metals/testProvider/frameworks/ScalatestTestFinder.scala +++ b/metals/src/main/scala/scala/meta/internal/metals/testProvider/frameworks/ScalatestTestFinder.scala @@ -65,7 +65,6 @@ class ScalatestTestFinder( case parentSymbol if !ScalatestStyle.baseSymbols.contains(parentSymbol) => for { definition <- symbolIndex.definition(mtags.Symbol(parentSymbol)) - tree <- trees.get(definition.path) doc <- semanticdbs() .textDocument(definition.path) .documentIncludingStale diff --git a/tests/slow/src/test/scala/tests/scalacli/ScalaCliSuite.scala b/tests/slow/src/test/scala/tests/scalacli/ScalaCliSuite.scala index e92d2e8eabd..fc8a3aada43 100644 --- a/tests/slow/src/test/scala/tests/scalacli/ScalaCliSuite.scala +++ b/tests/slow/src/test/scala/tests/scalacli/ScalaCliSuite.scala @@ -682,7 +682,7 @@ class ScalaCliSuite extends BaseScalaCliSuite(V.scala3) { _ <- debugServer.configurationDone _ <- debugServer.disconnect _ <- debugServer.shutdown - output <- debugServer.allOutput + _ <- debugServer.allOutput } yield () } diff --git a/tests/unit/src/main/scala/tests/TestingServer.scala b/tests/unit/src/main/scala/tests/TestingServer.scala index 591ad6595e8..439983cd0e9 100644 --- a/tests/unit/src/main/scala/tests/TestingServer.scala +++ b/tests/unit/src/main/scala/tests/TestingServer.scala @@ -955,7 +955,7 @@ final case class TestingServer( root: AbsolutePath = workspace, )(implicit loc: munit.Location): Future[Unit] = { for { - (text, params) <- onTypeParams( + (_, params) <- onTypeParams( filename, query, root, @@ -1511,7 +1511,7 @@ final case class TestingServer( root: AbsolutePath, ): Future[List[Location]] = { for { - (text, params) <- offsetParams(filename, query, root) + (_, params) <- offsetParams(filename, query, root) definition <- fullServer.definition(params).asScala } yield { definition.asScala.toList diff --git a/tests/unit/src/test/scala/tests/BaseNonCompilingLspSuite.scala b/tests/unit/src/test/scala/tests/BaseNonCompilingLspSuite.scala index f35b7ba9206..3b48fe4cb66 100644 --- a/tests/unit/src/test/scala/tests/BaseNonCompilingLspSuite.scala +++ b/tests/unit/src/test/scala/tests/BaseNonCompilingLspSuite.scala @@ -75,7 +75,7 @@ abstract class BaseNonCompilingLspSuite(name: String) | def completeThisUniqueName2(): String = 42 |}""".stripMargin } - - <- + _ <- if (saveAfterChanges) server.didSave("a/src/main/scala/b/B.scala")(identity) else Future.unit @@ -108,7 +108,7 @@ abstract class BaseNonCompilingLspSuite(name: String) _ <- server.didSave("a/src/main/scala/a/A.scala") { _ => newText.replace("<<", "").replace(">>", "") } - codeActions <- + _ <- server .assertCodeAction( "a/src/main/scala/a/A.scala", @@ -122,7 +122,7 @@ abstract class BaseNonCompilingLspSuite(name: String) _ <- server.didSave("a/src/main/scala/a/A.scala") { _ => input.replace("UniqueObjectOther", "UniqueObject") } - codeActions <- + _ <- server .assertCodeAction( "a/src/main/scala/a/A.scala", @@ -367,7 +367,7 @@ abstract class BaseNonCompilingLspSuite(name: String) input = newText.replace("<<", "").replace(">>", "") _ <- server.didChange("a/src/main/scala/a/A.scala")(_ => input) _ <- server.didSave("a/src/main/scala/a/A.scala")(identity) - codeActions <- + _ <- server .assertCodeAction( "a/src/main/scala/a/A.scala", diff --git a/tests/unit/src/test/scala/tests/DidFocusLspSuite.scala b/tests/unit/src/test/scala/tests/DidFocusLspSuite.scala index 82028556f37..8b9c4069de7 100644 --- a/tests/unit/src/test/scala/tests/DidFocusLspSuite.scala +++ b/tests/unit/src/test/scala/tests/DidFocusLspSuite.scala @@ -54,7 +54,7 @@ class DidFocusLspSuite extends BaseLspSuite("did-focus") { _ = assert(didCompile == Compiled) didCompile <- server.didFocus("b/src/main/scala/b/B.scala") _ = assert(didCompile == Compiled) - didCompile <- server.didFocus("c/src/main/scala/c/C.scala") + _ <- server.didFocus("c/src/main/scala/c/C.scala") // fake delete the diagnostic to see that `c` won't get recompiled _ = client.diagnostics(server.toPath("c/src/main/scala/c/C.scala")) = Seq.empty @@ -112,7 +112,7 @@ class DidFocusLspSuite extends BaseLspSuite("did-focus") { _ <- server.didOpen("b/src/main/scala/b/B.scala") _ = assertNoDiagnostics() _ = fakeTime.elapseSeconds(10) - didCompile <- server.didFocus("b/src/main/scala/b/B.scala") + _ <- server.didFocus("b/src/main/scala/b/B.scala") _ <- server.didSave("a/src/main/scala/a/A.scala")( _.replace("val x = 1", "val x = \"string\"") )