Upgrade to Scalameta v3.7

.travis.yml

@@ -18,7 +18,7 @@ jobs:
         - sbt ++2.11.12 jsonrpc/test
     - env: TEST="sbt test"
       script:
-        - sbt startServer metalsSetup test scalafixTest
+        - sbt startServer metalsSetup test
     - env: TEST="sbt-metals"
       script:
         - ./bin/run-scripted.sh

build.sbt

@@ -12,7 +12,6 @@ inThisBuild(
       // https://github.com/scala/bug/issues/10448
       "-Ywarn-unused-import"
     ),
-    scalafixEnabled := false,
     organization := "org.scalameta",
     licenses := Seq(
       "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")
@@ -79,7 +78,7 @@ lazy val V = new {
   val scala211 = MetalsPlugin.scala211
   val scala212 = MetalsPlugin.scala212
   val scalameta = MetalsPlugin.semanticdbVersion
-  val scalafix = "0.5.7"
+  val scalafix = "0.6.0-M5"
   val enumeratum = "1.5.12"
   val circe = "0.9.0"
   val cats = "1.0.1"
@@ -127,11 +126,6 @@ lazy val metals = project
   .enablePlugins(BuildInfoPlugin)
   .disablePlugins(ScriptedPlugin)
   .settings(
-    PB.targets.in(Compile) := Seq(
-      scalapb.gen(
-        flatPackage = true // Don't append filename to package
-      ) -> sourceManaged.in(Compile).value./("protobuf")
-    ),
     fork in Test := true, // required for jni interrop with leveldb.
     buildInfoKeys := Seq[BuildInfoKey](
       "testWorkspaceBaseDirectory" ->
@@ -149,7 +143,7 @@ lazy val metals = project
       "io.github.soc" % "directories" % "5", // for cache location
       "me.xdrop" % "fuzzywuzzy" % "1.1.9", // for workspace/symbol
       "org.fusesource.leveldbjni" % "leveldbjni-all" % "1.8", // for caching classpath index
-      "org.scalameta" %% "semanticdb-scalac" % V.scalameta cross CrossVersion.full,
+      "org.scalameta" % "interactive" % V.scalameta cross CrossVersion.full,
       "org.scalameta" %% "testkit" % V.scalameta % Test
     )
   )
@@ -178,7 +172,6 @@ lazy val testWorkspace = project
     scalacOptions += "-Ywarn-unused-import",
     scalacOptions -= "-Xlint"
   )
-  .disablePlugins(ScalafixPlugin)
 
 lazy val metalsRoot = project
   .in(file("."))

docs/overview.md

@@ -82,8 +82,8 @@ architecture as [Index-While-Building][] in XCode 9.
 * [x] Symbol outline in the sidebar as you type (`textDocument/documentSymbol`).
 * [ ] Goto implementation (`textDocument/implementation`)
 * [ ] Goto type definition (`textDocument/typeDefinition`)
-* [x] Show type of symbol at position (`textDocument/hover`). Requires
-      [semanticdb-scalac](#semanticdb-scalac).
+* [x] Show type of symbol at position (`textDocument/hover`).
+      Requires [`metalsSetup`](#metalssetup).
 * [ ] Show type of expression at position (`textDocument/hover`).
 
 ## Fast completions

lsp4s/src/main/scala/org/langmeta/lsp/Types.scala

@@ -14,7 +14,24 @@ import io.circe.generic.JsonCodec
 /**
  * A range in a text document.
  */
-@JsonCodec case class Range(start: Position, end: Position)
+@JsonCodec case class Range(start: Position, end: Position) {
+  def startLine = start.line
+  def startColumn = start.character
+  def endLine = end.line
+  def endColumn = end.character
+}
+
+object Range {
+  def apply(
+      startLine: Int,
+      startColumn: Int,
+      endLine: Int,
+      endColumn: Int
+  ): Range = Range(
+    start = Position(startLine, startColumn),
+    end = Position(endLine, endColumn)
+  )
+}
 
 /**
  * Represents a location inside a resource, such as a line

metals/src/main/scala/org/langmeta/languageserver/InputEnrichments.scala

@@ -1,9 +1,9 @@
 package org.langmeta.languageserver
 
-import org.langmeta.lsp
+import org.langmeta.{lsp => l}
 import org.langmeta.inputs.Input
 import org.langmeta.inputs.Position
-import scala.meta.metals.{index => i}
+import scala.meta.internal.semanticdb3
 
 object InputEnrichments {
   implicit class XtensionPositionOffset(val pos: Position) extends AnyVal {
@@ -24,13 +24,12 @@ object InputEnrichments {
     }
   }
   implicit class XtensionInputOffset(val input: Input) extends AnyVal {
-    def toIndexRange(start: Int, end: Int): i.Range = {
-      val pos = Position.Range(input, start, end)
-      i.Range(
-        startLine = pos.startLine,
-        startColumn = pos.startColumn,
-        endLine = pos.endLine,
-        endColumn = pos.endColumn
+    def toIndexRange(r: semanticdb3.Range): l.Range = {
+      l.Range(
+        startLine = r.startLine,
+        startColumn = r.startCharacter,
+        endLine = r.endLine,
+        endColumn = r.endCharacter
       )
     }
 
@@ -39,7 +38,7 @@ object InputEnrichments {
       Position.Range(input, offset, offset)
 
     /** Returns a scala.meta.Position from an index range. */
-    def toPosition(range: lsp.Range): Position = {
+    def toPosition(range: l.Range): Position = {
       toPosition(
         range.start.line,
         range.start.character,
@@ -48,17 +47,7 @@ object InputEnrichments {
       )
     }
 
-    /** Returns a scala.meta.Position from an index range. */
-    def toPosition(range: i.Range): Position = {
-      toPosition(
-        range.startLine,
-        range.startColumn,
-        range.endLine,
-        range.endColumn
-      )
-    }
-
-    def toOffset(pos: lsp.Position): Int =
+    def toOffset(pos: l.Position): Int =
       toOffset(pos.line, pos.character)
 
     /** Returns an offset for this input */

metals/src/main/scala/scala/meta/metals/Linter.scala

@@ -106,7 +106,7 @@ class Linter(configuration: Observable[Configuration], cwd: AbsolutePath)(
             case Parsed.Success(tree) =>
               val ctx = RuleCtx.applyInternal(tree, config)
               val patches = rule.fixWithNameInternal(ctx)
-              Patch.lintMessagesInternal(patches, ctx).map(_.toLSP)
+              Patch.lintMessagesInternal(patches, ctx, index).map(_.toLSP)
           }
 
           // megaCache needs to die, if we forget this we will read stale

metals/src/main/scala/scala/meta/metals/MetalsServices.scala

@@ -44,12 +44,15 @@ import monix.reactive.Observable
 import monix.reactive.Observer
 import monix.reactive.OverflowStrategy
 import org.langmeta.inputs.Input
-import org.langmeta.internal.semanticdb.XtensionDatabase
-import org.langmeta.internal.semanticdb.schema
+import scala.meta.internal.semanticdb3
+import scala.{meta => m}
 import org.langmeta.io.AbsolutePath
 import org.langmeta.languageserver.InputEnrichments._
 import org.langmeta.lsp.LanguageClient
-import org.langmeta.semanticdb
+import org.langmeta.internal.semanticdb._
+import scala.meta.metals.compiler.MetacpProvider
+import scala.meta.metals.compiler.SymtabProvider
+import scala.meta.metals.mtags.Mtags
 
 class MetalsServices(
     cwd: AbsolutePath,
@@ -87,7 +90,14 @@ class MetalsServices(
   val diagnosticsProvider =
     new DiagnosticsProvider(configurationPublisher, cwd)
   val scalacProvider = new ScalacProvider
-  val interactiveSemanticdbs: Observable[semanticdb.Database] =
+  val metacpProvider = new MetacpProvider
+  val symtabProvider =
+    new SymtabProvider(
+      symbolIndex.documentIndex,
+      scalacProvider,
+      metacpProvider
+    )
+  val interactiveSemanticdbs: Observable[m.Database] =
     sourceChangePublisher
       .debounce(FiniteDuration(1, "s"))
       .flatMap { input =>
@@ -97,9 +107,9 @@ class MetalsServices(
             .executeOn(presentationCompilerScheduler)
         } else Observable.empty
       }
-  val interactiveSchemaSemanticdbs: Observable[schema.Database] =
+  val interactiveSchemaSemanticdbs: Observable[semanticdb3.TextDocuments] =
     interactiveSemanticdbs.flatMap(db => Observable(db.toSchema(cwd)))
-  val metaSemanticdbs: Observable[semanticdb.Database] =
+  val metaSemanticdbs: Observable[m.Database] =
     Observable.merge(
       fileSystemSemanticdbsPublisher.map(_.toDb(sourcepath = None)),
       interactiveSemanticdbs
@@ -317,6 +327,7 @@ class MetalsServices(
       if (latestConfig().hover.enabled) {
         HoverProvider.hover(
           symbolIndex,
+          symtabProvider,
           Uri(params.textDocument),
           params.position.line,
           params.position.character
@@ -529,7 +540,7 @@ object MetalsServices extends LazyLogging {
     val path = AbsolutePath(
       ProjectDirectories.fromProjectName("metals").projectCacheDir
     )
-    Files.createDirectories(path.toNIO)
+    Files.createDirectories(path.resolve(Mtags.Version).toNIO)
     path
   }
 
@@ -565,7 +576,7 @@ object MetalsServices extends LazyLogging {
 
   def fileSystemSemanticdbStream(cwd: AbsolutePath)(
       implicit scheduler: Scheduler
-  ): (Observer.Sync[AbsolutePath], Observable[schema.Database]) = {
+  ): (Observer.Sync[AbsolutePath], Observable[semanticdb3.TextDocuments]) = {
     val (subscriber, publisher) = multicast[AbsolutePath]()
     val semanticdbPublisher = publisher
       .map(path => Semanticdbs.loadFromFile(semanticdbPath = path, cwd))