From 37cec1d5e164774257046db7980ac07ef5a2d79b Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Wed, 19 Sep 2018 16:12:10 +0200
Subject: [PATCH 1/2] vscode-dotty: don't show the output channel on server
 error

Most of the time, the server can recover from errors, so displaying the
stack trace to the user will only confuse him.
---
 vscode-dotty/src/extension.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vscode-dotty/src/extension.ts b/vscode-dotty/src/extension.ts
index 3ce21b10fcdc..52921936017a 100644
--- a/vscode-dotty/src/extension.ts
+++ b/vscode-dotty/src/extension.ts
@@ -7,7 +7,8 @@ import * as cpp from 'child-process-promise';
 
 import { ExtensionContext } from 'vscode';
 import * as vscode from 'vscode';
-import { LanguageClient, LanguageClientOptions, ServerOptions } from 'vscode-languageclient';
+import { LanguageClient, LanguageClientOptions, RevealOutputChannelOn,
+         ServerOptions } from 'vscode-languageclient';
 
 let extensionContext: ExtensionContext
 let outputChannel: vscode.OutputChannel
@@ -156,7 +157,8 @@ function run(serverOptions: ServerOptions) {
     ],
     synchronize: {
       configurationSection: 'dotty'
-    }
+    },
+    revealOutputChannelOn: RevealOutputChannelOn.Never
   }
 
   outputChannel.dispose()

From ff01801c4ef7a3ef13b8b935497f3073ebed9faa Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Wed, 19 Sep 2018 16:38:28 +0200
Subject: [PATCH 2/2] Upgrade coursier to 1.1.0-M7

I've seen weird errors with the version we have that seem to be resolved
with an upgrade.
---
 vscode-dotty/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vscode-dotty/package.json b/vscode-dotty/package.json
index 3b9e55110114..09601ac80b2d 100644
--- a/vscode-dotty/package.json
+++ b/vscode-dotty/package.json
@@ -51,7 +51,7 @@
     "vscode:prepublish": "npm install && ./node_modules/.bin/tsc -p ./",
     "compile": "./node_modules/.bin/tsc -p ./",
     "test": "node ./node_modules/vscode/bin/test",
-    "postinstall": "node ./node_modules/vscode/bin/install && curl -L -o out/coursier https://github.com/coursier/coursier/raw/v1.0.3/coursier"
+    "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"