fix: bunch of fixes for ScalaCli scripts import #4455
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dos65
force-pushed
the
scala-cli_fix
branch
from
50ee78b
to
ce96287
Compare
tanishiking
reviewed
Sep 29, 2022
metals/src/main/scala/scala/meta/internal/metals/MetalsLanguageServer.scala
Outdated
Show resolved
Hide resolved
metals/src/main/scala/scala/meta/internal/metals/MetalsLanguageServer.scala
Show resolved
Hide resolved
| def start(roots: Seq[AbsolutePath]): Future[Unit] = { | ||
| ifConnectedOrElse(st => | ||
| st.path == path || path.toNIO.startsWith(st.path.toNIO) | ||
| )(false) | ||
|
|
There was a problem hiding this comment.
[nit]
Suggested change
| /** | |
| * @param path a directory or a scalacli script's file path to import | |
| */ |
metals/src/main/scala/scala/meta/internal/metals/scalacli/ScalaCli.scala
Show resolved
Hide resolved
metals/src/main/scala/scala/meta/internal/metals/scalacli/ScalaCli.scala
Show resolved
Hide resolved
metals/src/main/scala/scala/meta/internal/metals/scalacli/ScalaCli.scala
Show resolved
Hide resolved
metals/src/main/scala/scala/meta/internal/metals/scalacli/ScalaCli.scala
Show resolved
Hide resolved
tanishiking
reviewed
Sep 29, 2022
| val dir = path.parent | ||
| val nioDir = dir.toNIO | ||
| val conflictsWithMainBsp = | ||
| buildTargets.sourceItems.filter(_.exists).exists { item => |
There was a problem hiding this comment.
Maybe we should wait for the indexing here, before indexing, buildTargets.sourceItems is empty and scalaCliDirOrFile returns the parent directory.
There was a problem hiding this comment.
We might want to wait for indexing here
metals/metals/src/main/scala/scala/meta/internal/metals/MetalsLanguageServer.scala
Lines 1121 to 1122 in f48987e
sc files that belongs to some buildTargets.
There was a problem hiding this comment.
Good idea, we should wait for indexing just in case.
There was a problem hiding this comment.
Thx, good suggestion. Changed!
tgodzik
reviewed
Sep 29, 2022
Fixes scalameta#4447 - use correct semanticdb root for bsp connection. Also don't import a full directory if it conflicts with the sourceItems from the main build tool
dos65
force-pushed
the
scala-cli_fix
branch
from
ce96287
to
6e7b463
Compare
…eServer.scala Co-authored-by: Rikito Taniguchi <rikiriki1238@gmail.com>
tanishiking
approved these changes
Sep 29, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4447 - use correct semanticdb root for bsp connection.
Also don't import a full directory if it conflicts with the sourceItems from the main build tool