Skip to content

Commit

Permalink
Merge pull request #2750 from dotty-staging/vs-code-settings
Browse files Browse the repository at this point in the history
Add VSCode settings for the dotty project
  • Loading branch information
smarter authored Jul 12, 2017
2 parents 18b69a5 + eda5730 commit 5e05d3f
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 2 deletions.
21 changes: 21 additions & 0 deletions .vscode-template/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Place your settings in this file to overwrite default and user settings.
{
"editor.tabSize": 2,
"editor.insertSpaces": true,

"files.trimTrailingWhitespace": true,

"search.exclude": {
"**/*.class": true,
"**/*.hasTasty": true,
"**/target/": true,
"scala2-library/{doc,docs,lib,META-INF,scripts,spec,test,tools}/": true, // only allow scala-backend/src
"scala2-library/src/[abcefimprs]*": true, // only allow scala-backend/src/library
"scala-backend/{doc,docs,lib,META-INF,scripts,spec,test,tools}/": true, // only allow scala-backend/src
"scala-backend/src/[abefilmprs]*": true, // only allow scala-backend/src/compiler
"scala-backend/src/scala/reflect/": true,
"scala-backend/src/scala/tools/{ant,cmd,reflect,util}*": true,
"scala-backend/src/scala/tools/nsc/*.scala": true,
"scala-backend/src/scala/tools/nsc/[aijrstu]*": true // only allow scala-backend/src/scala/tools/nsc/backend
}
}
8 changes: 6 additions & 2 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ object Build {
settings(commonNonBootstrappedSettings).
settings(
triggeredMessage in ThisBuild := Watched.clearWhenTriggered,
submoduleChecks,
dottyProjectFolderChecks,

addCommandAlias("run", "dotty-compiler/run") ++
addCommandAlias("legacyTests", "dotty-compiler/testOnly dotc.tests")
Expand Down Expand Up @@ -1115,7 +1115,7 @@ object Build {
))
}

lazy val submoduleChecks = onLoad in Global := (onLoad in Global).value andThen { state =>
lazy val dottyProjectFolderChecks = onLoad in Global := (onLoad in Global).value andThen { state =>
val submodules = List(new File("scala-backend"), new File("scala2-library"), new File("collection-strawman"))
if (!submodules.forall(f => f.exists && f.listFiles().nonEmpty)) {
sLog.value.log(Level.Error,
Expand All @@ -1124,6 +1124,10 @@ object Build {
| > git submodule update --init
""".stripMargin)
}

// Copy default configuration from .vscode-template/ unless configuration files already exist in .vscode/
sbt.IO.copyDirectory(new File(".vscode-template/"), new File(".vscode/"), overwrite = false)

state
}

Expand Down

0 comments on commit 5e05d3f

Please sign in to comment.