Skip to content

Fix issue #5124 #5125

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

Merged
merged 2 commits into from
Sep 20, 2018
Merged

Fix issue #5124 #5125

merged 2 commits into from
Sep 20, 2018

Conversation

melekhove
Copy link
Contributor

This patch provides small fix for #5124. After applying it all language-server tests pass OK on Windows.

Copy link
Member

@dottybot dottybot left a comment

Choose a reason for hiding this comment

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

Hello, and thank you for opening this PR! 🎉

All contributors have signed the CLA, thank you! ❤️

Have an awesome day! ☀️

Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM, thanks!

val dottyIdeJson: String =
s"""[ {
| "id" : "dotty-ide-test",
| "compilerVersion" : "${BuildInfo.ideTestsCompilerVersion}",
| "compilerArguments" : ${showSeq(BuildInfo.ideTestsCompilerArguments)},
| "sourceDirectories" : ${showSeq(BuildInfo.ideTestsSourceDirectories)},
| "dependencyClasspath" : ${showSeq(BuildInfo.ideTestsDependencyClasspath)},
| "classDirectory" : "${BuildInfo.ideTestsClassDirectory}"
| "classDirectory" : "${BuildInfo.ideTestsClassDirectory.toString().replace('\\','/')}"
Copy link
Member

Choose a reason for hiding this comment

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

No need for the parentheses after toString

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry, Java habits. Will fix.
Should I amend or just new commit is OK?

@smarter
Copy link
Member

smarter commented Sep 19, 2018

New commit is fine here, in general we don't have a strong policy for commits, but I personally prefer having a clean history when possible.

@smarter smarter merged commit e34bb2d into scala:master Sep 20, 2018
@melekhove melekhove deleted the issue/5124 branch September 20, 2018 12:54
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