Skip to content

Commit e34bb2d

Browse files
authored
Merge pull request #5125 from melekhove/issue/5124
Fix issue #5124
2 parents e77a47f + a26b6f0 commit e34bb2d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

language-server/test/dotty/tools/languageserver/util/server/TestFile.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.nio.file.{Path, Paths}
55
import org.eclipse.lsp4j.TextDocumentIdentifier
66

77
class TestFile(val file: String) extends AnyVal {
8-
def uri: String = s"file://${TestFile.sourceDir}/$file"
8+
def uri: String = TestFile.sourceDir.resolve(file).toUri.toString
99
}
1010

1111
object TestFile {

language-server/test/dotty/tools/languageserver/util/server/TestServer.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,18 @@ class TestServer(testFolder: Path) {
1515

1616
private[this] def init(): InitializeResult = {
1717
// Fill the configuration with values populated by sbt
18-
def showSeq[T](lst: Seq[T]): String = lst.map(elem => '"' + elem.toString + '"').mkString("[ ", ", ", " ]")
18+
def showSeq[T](lst: Seq[T]): String =
19+
lst
20+
.map(elem => '"' + elem.toString.replace('\\', '/') + '"')
21+
.mkString("[ ", ", ", " ]")
1922
val dottyIdeJson: String =
2023
s"""[ {
2124
| "id" : "dotty-ide-test",
2225
| "compilerVersion" : "${BuildInfo.ideTestsCompilerVersion}",
2326
| "compilerArguments" : ${showSeq(BuildInfo.ideTestsCompilerArguments)},
2427
| "sourceDirectories" : ${showSeq(BuildInfo.ideTestsSourceDirectories)},
2528
| "dependencyClasspath" : ${showSeq(BuildInfo.ideTestsDependencyClasspath)},
26-
| "classDirectory" : "${BuildInfo.ideTestsClassDirectory}"
29+
| "classDirectory" : "${BuildInfo.ideTestsClassDirectory.toString.replace('\\','/')}"
2730
|}
2831
|]""".stripMargin
2932
val configFile = testFolder.resolve(DottyLanguageServer.IDE_CONFIG_FILE)

0 commit comments

Comments
 (0)