Merge pull request #914 from DustinCampbell/missing-commits

A couple of commits that were missed from the future branch

Author: DustinCampbell

src/omnisharp/server.ts

@@ -60,6 +60,8 @@ export class OmniSharpServer {
     private static _nextId = 1;
     private static StartupTimeout = 1000 * 60;
 
+    private _debugMode: boolean = false;
+
     private _readLine: ReadLine;
     private _disposables: vscode.Disposable[] = [];
 
@@ -84,7 +86,12 @@ export class OmniSharpServer {
 
         this._channel = vscode.window.createOutputChannel('OmniSharp Log');
         this._logger = new Logger(message => this._channel.append(message));
-        this._requestQueue = new RequestQueueCollection(this._logger, 8, request => this._makeRequest(request));
+
+        const logger = this._debugMode
+            ? this._logger
+            : new Logger(message => { });
+
+        this._requestQueue = new RequestQueueCollection(logger, 8, request => this._makeRequest(request));
     }
 
     public isRunning(): boolean {
@@ -411,10 +418,6 @@ export class OmniSharpServer {
             };
 
             this._requestQueue.enqueue(request);
-
-            if (this._getState() === ServerState.Started) {
-                this._requestQueue.drain();
-            }
         });
 
         if (token) {
@@ -528,6 +531,8 @@ export class OmniSharpServer {
         else {
             request.onError(packet.Message || packet.Body);
         }
+
+        this._requestQueue.drain();
     }
 
     private _handleEventPacket(packet: protocol.WireProtocol.EventPacket): void {
@@ -551,7 +556,9 @@ export class OmniSharpServer {
             Arguments: request.data
         };
 
-        this._logger.appendLine(`Making request: ${request.command} (${id})`);
+        if (this._debugMode) {
+            this._logger.appendLine(`Making request: ${request.command} (${id})`);
+        }
 
         this._serverProcess.stdin.write(JSON.stringify(requestPacket) + '\n');
 
@@ -564,7 +571,7 @@ export class OmniSharpServer {
         const output = `[${logLevel}:${name}] ${message}`;
 
         // strip stuff like: /codecheck: 200 339ms
-        if (!timing200Pattern.test(output)) {
+        if (this._debugMode || !timing200Pattern.test(output)) {
             this._logger.appendLine(output);
         }
     }