From 913831702154fb6c532622fb50ab0d7aebceb3d9 Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sun, 10 Feb 2019 10:06:33 +0000
Subject: [PATCH] Add support for a seperate output channel for trace messages

---
 editors/code/package-lock.json | 14 +++++++-------
 editors/code/package.json      |  2 +-
 editors/code/src/server.ts     |  7 +++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 7c73922602a..144a46e2b4e 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -2507,18 +2507,18 @@
             "integrity": "sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="
         },
         "vscode-languageclient": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.2.1.tgz",
-            "integrity": "sha512-7jrS/9WnV0ruqPamN1nE7qCxn0phkH5LjSgSp9h6qoJGoeAKzwKz/PF6M+iGA/aklx4GLZg1prddhEPQtuXI1Q==",
+            "version": "5.3.0-next.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-5.3.0-next.1.tgz",
+            "integrity": "sha512-q5o6vHHDi+HjFOFUNC288Dee5jyAO4mEufoOaF2wKCjVP1qoJGbnBalTNGuakJThrdn0RDa0XdHZgXKFyZomCQ==",
             "requires": {
                 "semver": "^5.5.0",
-                "vscode-languageserver-protocol": "3.14.1"
+                "vscode-languageserver-protocol": "3.15.0-next.1"
             }
         },
         "vscode-languageserver-protocol": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz",
-            "integrity": "sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g==",
+            "version": "3.15.0-next.1",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.1.tgz",
+            "integrity": "sha512-LXF0d9s3vxFBxVQ4aKl/XghdEMAncGt3dh4urIYa9Is43g3MfIQL9fC44YZtP+XXOrI2rpZU8lRNN01U1V6CDg==",
             "requires": {
                 "vscode-jsonrpc": "^4.0.0",
                 "vscode-languageserver-types": "3.14.0"
diff --git a/editors/code/package.json b/editors/code/package.json
index 2b4299473c1..fc63d988b6a 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -31,7 +31,7 @@
         "singleQuote": true
     },
     "dependencies": {
-        "vscode-languageclient": "^5.2.1"
+        "vscode-languageclient": "^5.3.0-next.1"
     },
     "devDependencies": {
         "@types/mocha": "^5.2.5",
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 0d26327081b..7bb0e56ca3d 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -1,5 +1,6 @@
 import * as lc from 'vscode-languageclient';
 
+import { window } from 'vscode';
 import { Config } from './config';
 import { Highlighter } from './highlighting';
 
@@ -19,16 +20,18 @@ export class Server {
             run,
             debug: run
         };
+        const traceOutputChannel = window.createOutputChannel('Rust Analyzer Language Server Trace');
         const clientOptions: lc.LanguageClientOptions = {
             documentSelector: [{ scheme: 'file', language: 'rust' }],
             initializationOptions: {
                 publishDecorations: true
-            }
+            },
+            traceOutputChannel
         };
 
         Server.client = new lc.LanguageClient(
             'ra-lsp',
-            'rust-analyzer language server',
+            'Rust Analyzer Language Server',
             serverOptions,
             clientOptions
         );