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: Add support for a seperate output channel for trace messages

---
 editors/code/src/server.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'editors/code/src')

diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 0d2632708..7bb0e56ca 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
         );
-- 
cgit v1.2.3


From 28fd3683938ee74d4ef319b94ce6c9c3ff74a036 Mon Sep 17 00:00:00 2001
From: DJMcNab <36049421+DJMcNab@users.noreply.github.com>
Date: Sun, 10 Feb 2019 10:30:16 +0000
Subject: Fix trace and prettier

---
 editors/code/src/server.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'editors/code/src')

diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 7bb0e56ca..9ead87fae 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -20,7 +20,9 @@ export class Server {
             run,
             debug: run
         };
-        const traceOutputChannel = window.createOutputChannel('Rust Analyzer Language Server Trace');
+        const traceOutputChannel = window.createOutputChannel(
+            'Rust Analyzer Language Server Trace'
+        );
         const clientOptions: lc.LanguageClientOptions = {
             documentSelector: [{ scheme: 'file', language: 'rust' }],
             initializationOptions: {
@@ -30,7 +32,7 @@ export class Server {
         };
 
         Server.client = new lc.LanguageClient(
-            'ra-lsp',
+            'rust-analyzer',
             'Rust Analyzer Language Server',
             serverOptions,
             clientOptions
-- 
cgit v1.2.3