Skip to content

Use scala-lang.scala for syntax highlighting #5105

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.

Sign up for GitHub

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 1 commit into from
Oct 2, 2018
Merged

Use scala-lang.scala for syntax highlighting #5105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,10 +992,10 @@ object Build {
val tsc = workingDir / "node_modules" / ".bin" / "tsc"
runProcess(Seq(tsc.getAbsolutePath, "--pretty", "--project", workingDir.getAbsolutePath), wait = true)

// Currently, vscode-dotty depends on daltonjorge.scala for syntax highlighting,
// vscode-dotty depends on scala-lang.scala for syntax highlighting,
// this is not automatically installed when starting the extension in development mode
// (--extensionDevelopmentPath=...)
installCodeExtension(codeCommand.value, "daltonjorge.scala")
installCodeExtension(codeCommand.value, "scala-lang.scala")

sbt.internal.inc.Analysis.Empty
}.dependsOn(managedResources in Compile).value,
Expand Down
2 changes: 1 addition & 1 deletion vscode-dotty/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"postinstall": "node ./node_modules/vscode/bin/install && curl -L -o out/coursier https://github.com/coursier/coursier/raw/v1.1.0-M7/coursier"
},
"extensionDependencies": [
"daltonjorge.scala"
"scala-lang.scala"
],
"dependencies": {
"child-process-promise": "^2.2.1",
Expand Down