From 55190b9f89235796d1f03865f80bdd5a0730585f Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Sat, 17 Jun 2017 19:56:29 +0200
Subject: [PATCH] Only start the Code extension when a .ensime file exists

The extension is useless without it, and this avoids conflicts with
other extensions like the Dotty Language Server (which will only start
when a .dotty-ide.json file is present after
https://github.com/lampepfl/dotty/pull/2777)
---
 scala/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scala/package.json b/scala/package.json
index a76fa67..09e9180 100644
--- a/scala/package.json
+++ b/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.4",
+	"version": "0.1.5",
 	"repository": {
 		"url": "https://github.com/dragos/dragos-vscode-scala"
 	},
@@ -18,7 +18,7 @@
 		"Languages"
 	],
 	"activationEvents": [
-		"onLanguage:scala",
+		"workspaceContains:.ensime",
 		"onCommand:sbt.update",
 		"onCommand:sbt.compile",
 		"onCommand:sbt.run",