Skip to content
This repository was archived by the owner on Jun 8, 2023. It is now read-only.

Commit 9c0aa49

Browse files
committed
Merge branch 'master' of github.com:dragos/dragos-vscode-scala
2 parents ad410ef + b01c3af commit 9c0aa49

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

ensime-lsp/src/main/scala/org/github/dragos/vscode/EnsimeLanguageServer.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
8484
}
8585

8686
def loadConfig(ensimeFile:File): Config = {
87-
val config = s"""ensime.config = "${ensimeFile.toString}" """
87+
val fileName = ensimeFile.getCanonicalFile.toString.replaceAllLiterally("\\","/")
88+
val config = s"""ensime.config = "$fileName" """
89+
logger.debug(config)
8890
val fallback = ConfigFactory.parseString(config)
8991
ConfigFactory.load().withFallback(fallback)
9092
}

scala/snippets/scala.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
"prefix": "resolvers",
1111
"body": [
1212
"resolvers += ",
13-
" \"${name: Repository name}\" at \"${url: Url where the repository is defined}\""
13+
"\"${1:Repository name}\" at \"${2:Url where the repository is defined}\""
1414
]
1515
},
1616

1717
"New ScalaTest suite": {
1818
"prefix": "suite",
1919
"body": [
20-
"class ${MyTestSuite} extends FunSuite {",
21-
" test(\"${test name}\") {",
20+
"class ${1:MyTestSuite} extends FunSuite {",
21+
" test(\"${2:Test name}\") {",
2222
" }",
2323
"}"
2424
]
2525
}
26-
}
26+
}

0 commit comments

Comments
 (0)