Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle upcoming mill embedded BSP and fix mill BSP install #572

Merged
merged 1 commit into from
Oct 30, 2020

Conversation

joan38
Copy link
Contributor

@joan38 joan38 commented Oct 26, 2020

BSP support is now integrated in Mill by default.
This PR handle backcompat with older versions of Mill but not super proud of the code. anyway this is temporary and we'll be able to drop all of this when dropping support for older Mill version.

This is also fixing the generation of the bsp config from mill that got broken for some reason.

Thanks

@joan38 joan38 changed the title Handle upcoming mill embedded BSP Handle upcoming mill embedded BSP and fix mill BSP install Oct 27, 2020
@jastice jastice self-requested a review October 28, 2020 11:44
@jastice jastice self-assigned this Oct 28, 2020
Copy link
Member

@jastice jastice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great to see Mill is going full BSP now, I didn't even notice!

Copy link
Member

@jastice jastice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noticed compile error :)

@@ -103,9 +103,6 @@ object bspConfigSteps {
builder.setPreImportConfig(NoPreImport)
// server config to be set in next step
SbtConfigSetup(workspace)
case bspConfigSteps.MillSetup =>
builder.setPreImportConfig(NoPreImport)
MillConfigSetup(workspace)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Taking this case out causes a compile error since we have fatal warnings now. Should it just be an empty case, or the MillSetup object removed?

[error] /Users/jast/workspace/scalaUltimate/community/bsp/src/org/jetbrains/bsp/project/importing/bspConfigSteps.scala:89:12: match may not be exhaustive.
[error] It would fail on the following input: MillSetup
[error]     } else configSetup match {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed a new implementation which is much better actually.

@JetBrainsTeamCity JetBrainsTeamCity merged commit 6fabb9e into JetBrains:idea203.x Oct 30, 2020
@joan38
Copy link
Contributor Author

joan38 commented Oct 30, 2020

Thanks @jastice

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants