Improve SemanticDB integration using Bloop's newest features #852

tgodzik · 2019-08-05T14:56:18Z

Previously, adding semanticDB plugin would require a lot of fragile configuration in Gradle and sbt.

Thanks to the change in Bloop, we now are able to define what semanticDB plugin we need when initializing and Bloop takes care of finding it and applying to scalac options.

Fixes #808

metals/src/main/scala/scala/meta/internal/builds/GradleBuildTool.scala

tgodzik · 2019-08-08T17:07:13Z

I wonder if we should cleanup project/metals.sbt file after running the command, any opinions?

jvican

Preliminary comments from a few days ago, will finish review tomorrow!

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala

docs/build-tools/gradle.md

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala

metals/src/main/scala/scala/meta/internal/metals/BuildServerConnection.scala

gabro

🎉 this is wonderful news as it removes a lot of complexity from Metals!

I've left some minor comments here and there :)

gabro · 2019-08-12T12:44:26Z

build.sbt

-  val gradleBloop = bloop
+  val bloop = "1.3.2+125-2d6bf327"
+  val sbtBloop = "1.3.2"
+  val gradleBloop = "1.3.2"


reminder to re-instate the bloop shared variable before merging

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala

docs/build-tools/gradle.md

tgodzik · 2019-08-12T15:33:34Z

Had to tidy up a bit and squashed the commits, but I applied all the suggestions and added some more tests for .gitignore modification

metals/src/main/scala/scala/meta/internal/builds/GradleBuildTool.scala

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala

tgodzik · 2019-08-13T12:23:15Z

Fixed some last things, but we are waiting for the newest Bloop release - @jvican wants to make sure that is all stable. When it's released I will replace the version to use the same bloop version everwhere.

olafurpg

This PR looks amazing! I can't wait for the next release of Bloop so we can merge this 👍

Great work @tgodzik cleaning up redundant code and adding test cases against the new fatal warnings implementation.

olafurpg · 2019-08-25T17:46:14Z

build.sbt

@@ -274,32 +276,6 @@ lazy val metals = project
  .dependsOn(mtags)
  .enablePlugins(BuildInfoPlugin)

-lazy val `sbt-metals` = project


olafurpg · 2019-08-25T17:51:52Z

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala

-    val resolvers =
-      if (BuildInfo.metalsVersion.endsWith("-SNAPSHOT")) {
-        """|resolvers ++= {
-           |  if (System.getenv("METALS_ENABLED") == "true") {


I'm very excited to get rid of this here :D

olafurpg · 2019-08-25T17:56:28Z

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala

-        ""
-      }
+  private def sbtPlugin(bloopSbtVersion: String): String = {
+    val isSnapshotVersion = bloopSbtVersion.contains("+")


Suggested change

val isSnapshotVersion = bloopSbtVersion.contains("+")

val isPreReleaseVersion = bloopSbtVersion.contains("+") || bloopSbtVersion.contains("-")

Strictly speaking, a snapshot version should end with -SNAPSHOT. Including - also guards us if bloop changes it's usage of + versions. Some filesystems require weird encodings for filenames with +.

I don't think bloop ever releases with version-SNAPSHOT, but I can add it here, just don't think it will change much.

Fair point.

olafurpg · 2019-08-25T20:58:05Z

tests/slow/src/test/scala/tests/mill/MillSlowSuite.scala

        """.stripMargin
      )
+      // we should still have references despite fatal warning


olafurpg · 2019-08-25T21:02:59Z

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala

+
+  private def gitignoreMetals(workspace: AbsolutePath) = {
+    val gitignore = workspace.resolve(".gitignore")
+    val gitIgnoreContents = "project/metals.sbt"


What do you think about adding the following entries as well?

.metals/ .bloop/

These entries should ideally be in the workspace .gitignore instead of the global .gitignore because VS Code only uses the workspace gitignore in "Open file".

I was thinking about it, but decided not to do in this PR, but I can for sure do it here.

It can be done as a separate PR.

olafurpg · 2019-10-02T12:02:27Z

Bloop v1.3.3 is out now unblocking this PR 🎉

…onfiguration in Gradle and sbt. Thanks to the change in Bloop, we now are able to define what semanticDB plugin we need when initializing and Bloop takes care of finding it and applying to scalaca options.

Previously, we removed fatal-warnings from scalac options in order to have everything properly compiled. Now, fatal warnings are handled by Bloop and are reported as errors while still producing compilation artifacts.

olafurpg · 2019-10-03T07:59:04Z

🎉

gabro · 2019-10-03T08:11:31Z

😍

Baccata · 2019-10-03T08:12:21Z

🥇

Bloop 1.3.3 can assume the responsibility of finding the semanticdb plugin and setting the relevant options in the compiler, which means we don't have to do it ourselves anymore to accommodate metals users. See scalameta/metals#852

tgodzik commented Aug 5, 2019

View reviewed changes

metals/src/main/scala/scala/meta/internal/builds/GradleBuildTool.scala Outdated Show resolved Hide resolved

megri mentioned this pull request Aug 6, 2019

Metals support tindzk/seed#15

Open

tgodzik force-pushed the update-semanticDB-integration branch from 260612c to f230cd3 Compare August 8, 2019 17:52

jvican reviewed Aug 8, 2019

View reviewed changes

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala Show resolved Hide resolved

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala Show resolved Hide resolved

tgodzik force-pushed the update-semanticDB-integration branch 3 times, most recently from 1b240e8 to feffda8 Compare August 12, 2019 11:47

tgodzik changed the title ~~WiP Update SemanticDb integration~~ Improve SemanticDB integration using Bloop's newest features Aug 12, 2019

tgodzik requested review from jvican and mzarnowski August 12, 2019 11:51

mzarnowski reviewed Aug 12, 2019

View reviewed changes

gabro approved these changes Aug 12, 2019

View reviewed changes

gabro reviewed Aug 12, 2019

View reviewed changes

docs/build-tools/gradle.md Outdated Show resolved Hide resolved

tgodzik force-pushed the update-semanticDB-integration branch from 02f7eb1 to 82050fc Compare August 12, 2019 15:29

tgodzik requested a review from mzarnowski August 12, 2019 15:33

tgodzik force-pushed the update-semanticDB-integration branch from 82050fc to f9b1684 Compare August 12, 2019 16:29

mzarnowski approved these changes Aug 12, 2019

View reviewed changes

metals/src/main/scala/scala/meta/internal/builds/GradleBuildTool.scala Outdated Show resolved Hide resolved

tgodzik force-pushed the update-semanticDB-integration branch from f9b1684 to f677706 Compare August 12, 2019 16:48

gabro reviewed Aug 13, 2019

View reviewed changes

metals/src/main/scala/scala/meta/internal/builds/SbtBuildTool.scala Outdated Show resolved Hide resolved

tgodzik force-pushed the update-semanticDB-integration branch from f677706 to d90d195 Compare August 13, 2019 12:01

olafurpg approved these changes Aug 25, 2019

View reviewed changes

tgodzik mentioned this pull request Sep 6, 2019

Scala Metals for Emacs: Unresolved Dependencies #903

Closed

tgodzik added 3 commits October 2, 2019 15:50

Previously, adding semanticDB plugin would require a lot of fragile c…

2fe08c8

…onfiguration in Gradle and sbt. Thanks to the change in Bloop, we now are able to define what semanticDB plugin we need when initializing and Bloop takes care of finding it and applying to scalaca options.

Fix tests with fatal warnings to include change in bloop.

ddc62ff

Previously, we removed fatal-warnings from scalac options in order to have everything properly compiled. Now, fatal warnings are handled by Bloop and are reported as errors while still producing compilation artifacts.

Fix Maven tests since they work with SemanticDB now

7291505

tgodzik force-pushed the update-semanticDB-integration branch from d90d195 to ebba0ed Compare October 2, 2019 14:49

Update bloop to 1.3.3

21f992f

tgodzik force-pushed the update-semanticDB-integration branch from ebba0ed to 21f992f Compare October 2, 2019 17:05

tgodzik merged commit 3b04294 into scalameta:master Oct 3, 2019

tgodzik deleted the update-semanticDB-integration branch October 3, 2019 06:46

Baccata mentioned this pull request Oct 3, 2019

Remove semanticdb settings com-lihaoyi/mill#705

Merged

olafurpg mentioned this pull request Oct 3, 2019

sbt-metals plugin, manual global install fails #958

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve SemanticDB integration using Bloop's newest features #852

Improve SemanticDB integration using Bloop's newest features #852

tgodzik commented Aug 5, 2019

tgodzik commented Aug 8, 2019

jvican left a comment

gabro left a comment

gabro Aug 12, 2019

tgodzik commented Aug 12, 2019

tgodzik commented Aug 13, 2019

olafurpg left a comment

olafurpg Aug 25, 2019

olafurpg Aug 25, 2019

olafurpg Aug 25, 2019

tgodzik Aug 28, 2019

olafurpg Aug 28, 2019

olafurpg Aug 25, 2019

olafurpg Aug 25, 2019

tgodzik Aug 28, 2019

olafurpg Aug 28, 2019

olafurpg commented Oct 2, 2019

olafurpg commented Oct 3, 2019

gabro commented Oct 3, 2019

Baccata commented Oct 3, 2019

	val isSnapshotVersion = bloopSbtVersion.contains("+")
	val isPreReleaseVersion = bloopSbtVersion.contains("+") \|\| bloopSbtVersion.contains("-")

Improve SemanticDB integration using Bloop's newest features #852

Improve SemanticDB integration using Bloop's newest features #852

Conversation

tgodzik commented Aug 5, 2019

tgodzik commented Aug 8, 2019

jvican left a comment

Choose a reason for hiding this comment

gabro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tgodzik commented Aug 12, 2019

tgodzik commented Aug 13, 2019

olafurpg left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

olafurpg commented Oct 2, 2019

olafurpg commented Oct 3, 2019

gabro commented Oct 3, 2019

Baccata commented Oct 3, 2019