unfork scalameta, update Metals (#1700)

Author: SethTisue

core/scalameta.conf

@@ -1,19 +1,17 @@
-// https://github.com/scalacommunitybuild/scalameta.git#community-build-2.13  # was scalameta, v4.8.3
+// https://github.com/scalameta/scalameta.git#main
 
-// we typically use a tag here rather than track a branch, in the
+// we often use a tag here rather than track a branch, in the
 // interest of stability.  whatever tag scalafmt and/or scalafix expect
 
-// temporarily forked (July 2023) for 2.13.12 change (scala/scala#10406)
-
 vars.proj.scalameta: ${vars.base} {
   name: "scalameta"
-  uri: "https://github.com/scalacommunitybuild/scalameta.git#4e53fe054ce99965a5a3d3bb021ffd9feb725346"
+  uri: "https://github.com/scalameta/scalameta.git#a5528cb7c2344aeed9ed5b815dedb6754819ed61"
 
   extra.projects: ["semanticdbScalacPlugin", "testkitJVM"]
   extra.commands: ${vars.default-commands} [
     // use right version-specific source directories regardless of our weird dbuild Scala version numbers
     """set common.jvm / Compile / unmanagedSourceDirectories += baseDirectory.value / "scalameta" / "common" / "shared" / "src" / "main" / "scala-2.13""""
     """set semanticdbScalacCore / Compile / unmanagedSourceDirectories += baseDirectory.value / "semanticdb" / "scalac" / "library" / "src" / "main" / "scala-2.13""""
-    """set semanticdbScalacCore / Compile / unmanagedSourceDirectories += baseDirectory.value / "semanticdb" / "scalac" / "library" / "src" / "main" / "scala-2.13.11""""
+    """set semanticdbScalacCore / Compile / unmanagedSourceDirectories += baseDirectory.value / "semanticdb" / "scalac" / "library" / "src" / "main" / "scala-2.13.12""""
   ]
 }

proj/metals.conf

@@ -5,7 +5,7 @@
 
 vars.proj.metals: ${vars.base} {
   name: "metals"
-  uri: "https://github.com/scalameta/metals.git#635956dab809a55c3fb89288fb607248cde26ee8"
+  uri: "https://github.com/scalameta/metals.git#9cb223954d49e1ab821d7c936c08381f45273a7b"
 
   // Vadim from Virtus writes:
   //
@@ -19,18 +19,14 @@ vars.proj.metals: ${vars.base} {
   // in mind if we start having problems with any of the other subprojects.
   // (As always, one option is to compile some tests but not run them.)
   extra.exclude: [
-    "sbt-metals", "input3", "mtags3", "bench", "docs", "slow"
+    "sbt-metals", "input3", "mtags3", "bench", "docs", "slow", "mtags3WithPresentationCompiler"
     // this depends on input3
     "unit"
   ]
-  // tests disabled until upstream adds 2.13.12 support; see
-  // https://github.com/scalameta/metals/issues/5438
-  extra.test-tasks: ["compile"]
   extra.commands: ${vars.default-commands} [
-    // CompletionSuite, HoverDocSuite: https://github.com/scalameta/metals/issues/4585
     // CompletionSnippetSuite: not investigated
+    """set cross / unmanagedSources / excludeFilter := HiddenFileFilter || "CompletionSnippetSuite.scala""""
     // HoverTermSuite: https://github.com/scalameta/metals/issues/5318
-    """set cross / unmanagedSources / excludeFilter := HiddenFileFilter || "CompletionSuite.scala" || "HoverDocSuite.scala" || "CompletionSnippetSuite.scala""""
     """set javapc / unmanagedSources / excludeFilter := HiddenFileFilter || "HoverTermSuite.scala""""
   ]
 }

proj/scapegoat.conf

@@ -1,17 +1,10 @@
 // https://github.com/scalacommunitybuild/scapegoat.git#community-build-2.13  # was scapegoat-scala, master
 
-// forked (August 2019; refreshed June 2023) because some
+// forked (August 2019; refreshed October 2023) because some
 // classpath-handling code didn't work under dbuild
 
 vars.proj.scapegoat: ${vars.base} {
   name: "scapegoat"
-  uri: "https://github.com/scalacommunitybuild/scapegoat.git#f3f327b07c28dca5cfe3c0c0077664c4b87e1be9"
+  uri: "https://github.com/scalacommunitybuild/scapegoat.git#dfd4de4c57a7b194e2dd9d50eaeb2aff26bc6f2f"
 
-  extra.commands: ${vars.default-commands} [
-    // test started failing on 2.13.12; see my remarks at
-    // https://github.com/scala/community-build/pull/1677#issuecomment-1614721682
-    """set Test / unmanagedSources / excludeFilter := HiddenFileFilter || "UnnecessaryConversionTest.scala""""
-    // because scala/scala#10439, until maintainers move to 2.13.12
-    "appendScalacOptions -Xmigration"
-  ]
 }