Merge branch 'master' into master

Author: dragos

.gitignore

@@ -12,3 +12,4 @@ out/
 scala/server/ensimeServer-assembly*
 coursier
 .ensime
+.hydra

README.md

@@ -11,7 +11,7 @@ This is an experiment for building a Language Server for Scala, in Scala.
 - scala: A Typescript-based Scala extension (language client). Ideally it will be ported to Scala.js
 - ensime-lsp: An implementation of the Language Server based on Ensime
 
-The language server may be backed up by [ensime](http://ensime.github.io/) or directly by the presentation compiler. Ideally, the language server ca be used as a basis for implementing support for any language, not just Scala.
+The language server may be backed up by [ensime](http://ensime.github.io/) or directly by the presentation compiler. Ideally, the language server can be used as a basis for implementing support for any language, not just Scala.
 
 # How to try it out
 
@@ -41,7 +41,7 @@ $ npm install -g vsce typescript # if you don't have Typescript installed global
 $ vsce package
 ```
 
-You should see a file `ensime-scala-0.0.4.vsix` (or whatever version you are building). Now install it in Code by choosing `Install from VSIX` in the Extensions view.
+You should see a file `scala-lsp-x.x.x.vsix` (`x.x.x` representing the version you are building). Now install it in Code by choosing `Install from VSIX` in the Extensions view.
 
 
 The root Sbt project controls all the Scala parts of the build. The client is written in Typescript (it's really minimal) and lives under scala/. This one is built using Code's tools.
@@ -83,4 +83,4 @@ This setting is passed to the Language Server affecting the log level on the ser
 > sonatypeRelease
 ```
 
-Then `cd scala/` and run `vsce publish`
+Then `cd scala/` and run `vsce publish`

build.sbt

@@ -9,7 +9,6 @@ pomIncludeRepository := { _ => false }
 
 lazy val commonSettings = Seq(
   organization := "com.github.dragos",
-  version := "0.1.7-SNAPSHOT",
   resolvers += "dhpcs at bintray" at "https://dl.bintray.com/dhpcs/maven",
   libraryDependencies ++= Seq(
     "org.scalatest" %% "scalatest" % "3.0.1" % "test"
@@ -87,3 +86,8 @@ lazy val `ensime-lsp` = project.
       </developers>
     }
   )
+
+lazy val vscodeRoot = project
+  .in(file("."))
+  .settings(publishArtifact := false)
+  .aggregate(languageserver, `ensime-lsp`)

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

@@ -89,7 +89,7 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
     logger.debug(config)
     val fallback = ConfigFactory.parseString(config)
     ConfigFactory.load().withFallback(fallback)
-  }  
+  }
 
   private def initializeEnsime(rootPath: String): Try[EnsimeConfig] = {
     val ensimeFile = new File(s"$rootPath/.ensime")
@@ -100,7 +100,7 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
       val serverConfig: EnsimeServerConfig = parseServerConfig(config)
       val ensimeConfig = EnsimeConfigProtocol.parse(serverConfig.config.file.readString()(MessageReader.Utf8Charset))
       Canon.config = ensimeConfig
-      Canon.serverConfig = serverConfig      
+      Canon.serverConfig = serverConfig
       (ensimeConfig, serverConfig)
     }
 
@@ -119,7 +119,7 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
           fileStore = new TempFileStore(config.cacheDir.file.toString)
           ensimeActor = system.actorOf(Props(classOf[EnsimeActor], this, config, serverConfig), "server")
         }
-        t.recover{case e => 
+        t.recover{case e =>
           logger.error(s"initializeEnsime: ${e.getMessage}"); e.printStackTrace
           connection.showMessage(MessageType.Error, s"Error creating storage: ${e.getMessage}")
         }
@@ -172,7 +172,7 @@ class EnsimeLanguageServer(in: InputStream, out: OutputStream) extends LanguageS
   }
 
   override def onCloseTextDocument(td: TextDocumentIdentifier) = {
-    logger.debug("Removing ${td.uri} from Ensime.")
+    logger.debug(s"Removing ${td.uri} from Ensime.")
     val doc = documentManager.documentForUri(td.uri)
     doc.map(d => ensimeActor ! RemoveFileReq(d.toFile))
   }

scala/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Change Log
 
-## 0.1.x (MM DD, YYYY)
+## 0.2.1 (Oct 1, 2017)
+
+- Fix configuration path on Windows (#62)
+- Use placeholders in snippets (#64)
+
+## 0.2.0 (Sept 19, 2017)
+
+- Add Scala 2.12 support (based on Ensime 2.0-M4)
+- Customizable log level
+
+## 0.1.6 (June 20, 2017)
+
+- Only start the VSCode extension when a .ensime file exists (#47)
+- Added support for scalariformFormat (#44)
+
+## 0.1.4 (April 18, 2017)
 
 - add proxy settings for Coursier download. Use `"http.proxy": "http://host:port/"` in the VS Code settings file.
 

scala/README.md

@@ -12,6 +12,14 @@ If you find this useful, please file tickets and contribute fixes. I'm working o
 
 If you can't contribute your time but would like to donate, please [donate to the Ensime project](http://ensime.org/sponsor/) instead. This plugin delegates to Ensime for most of its features.
 
+# Setting up
+
+This extension is based on [Ensime](http://ensime.org), so you need to create an Ensime configuration file before you can use it. This file lists source directories, classpath entries and compiler arguments. If you have an Sbt project simply add the [sbt-ensime](http://ensime.org/build_tools/sbt/) plugin and follow the guide (other build tools are [supported](http://ensime.org/build_tools/)). Then just run `sbt ensimeConfig` and voilà! You're all set up.
+
+>Remember to regenerate this file everytime you change your build (adding/removing dependencies, compiler arguments, etc.).
+
+If you already started Code, it should detect that a new `.ensime` file was created and pick up the project.
+
 # Setting the JDK
 
 The path to the Java Development Kit is searched in the following order:

scala/package.json

@@ -3,7 +3,7 @@
 	"displayName": "Scala Language Server",
 	"description": "A Scala language server based on Ensime",
 	"icon": "images/scala-logo.png",
-	"version": "0.1.6",
+	"version": "0.2.1",
 	"repository": {
 		"url": "https://github.com/dragos/dragos-vscode-scala"
 	},
@@ -12,7 +12,7 @@
 	},
 	"publisher": "dragos",
 	"engines": {
-		"vscode": "^1.10.0"
+		"vscode": "^1.16.1"
 	},
 	"categories": [
 		"Languages"

scala/snippets/scala.json

@@ -10,17 +10,17 @@
 		"prefix": "resolvers",
 		"body": [
 			"resolvers += ",
-  		"	\"${name: Repository name}\" at \"${url: Url where the repository is defined}\""
+			"\"${1:Repository name}\" at \"${2:Url where the repository is defined}\""
 		]
 	},
 
 	"New ScalaTest suite": {
 		"prefix": "suite",
 		"body": [
-			"class ${MyTestSuite} extends FunSuite {",
-			"  test(\"${test name}\") {",
+			"class ${1:MyTestSuite} extends FunSuite {",
+			"  test(\"${2:Test name}\") {",
 			"  }",
 			"}"
 		]
 	}
-}
+}

scala/src/extension.ts

@@ -49,7 +49,7 @@ export async function activate(context: ExtensionContext) {
   let logLevelStr = ''
   if(logLevel != null) logLevelStr = logLevel.toString()
 
-  let coursierArgs = ['launch', '-r', 'https://dl.bintray.com/dhpcs/maven', '-r', 'sonatype:releases', '-J', toolsJar, 'com.github.dragos:ensime-lsp_2.12:0.1.7-SNAPSHOT', '-M', 'org.github.dragos.vscode.Main'];
+  let coursierArgs = ['launch', '-r', 'https://dl.bintray.com/dhpcs/maven', '-r', 'sonatype:releases', '-J', toolsJar, 'com.github.dragos:ensime-lsp_2.12:0.2.1', '-M', 'org.github.dragos.vscode.Main'];
   let javaArgs = proxyArgs.concat(['-Dvscode.workspace=' + workspace.rootPath,'-Dvscode.logLevel=' + logLevel, '-jar', coursierPath]).concat(coursierArgs);
   // The debug options for the server
   let debugOptions = ['-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000,quiet=y'];

sonatype.sbt

@@ -1 +1 @@
-//sonatypeProfileName := "dragos"
+sonatypeProfileName := "com.github.dragos"