Merge pull request #102 from DustinCampbell/cleanup

Lots of code clean up

Author: DustinCampbell

package.json

@@ -28,7 +28,7 @@ export function installCoreClrDebug(context: vscode.ExtensionContext) {
 
     if (!isOnPath('dotnet')) {
         // TODO: In a future release, this should be an error. For this release, we will let it go
-        console.log("The .NET CLI tools are not installed. .NET Core debugging will not be enabled.")
+        console.log("The .NET CLI tools are not installed. .NET Core debugging will not be enabled.");
         return;
     }
 
@@ -38,7 +38,7 @@ export function installCoreClrDebug(context: vscode.ExtensionContext) {
     // Create our log file and override _channel.append to also outpu to the log
     _installLog = fs.createWriteStream(path.join(_coreClrDebugDir, 'install.log'));
     (function() {
-        var proxied = _channel.append;
+        let proxied = _channel.append;
         _channel.append = function(val: string) {
             _installLog.write(val);
             proxied.apply(this, arguments);
@@ -48,8 +48,8 @@ export function installCoreClrDebug(context: vscode.ExtensionContext) {
     _channel.appendLine("Downloading and configuring the .NET Core Debugger...");
     _channel.show(vscode.ViewColumn.Three);
 
-    var installStage = 'dotnet restore';
-    var installError = '';
+    let installStage = 'dotnet restore';
+    let installError = '';
 
     spawnChildProcess('dotnet', ['--verbose', 'restore', '--configfile', 'NuGet.config'], _channel, _coreClrDebugDir)
     .then(function() {
@@ -59,8 +59,8 @@ export function installCoreClrDebug(context: vscode.ExtensionContext) {
         installStage = "ensureAd7";
         return ensureAd7EngineExists(_channel, _debugAdapterDir);
     }).then(function() {
-        installStage = "additionalTasks"
-        var promises: Promise<void>[] = [];
+        installStage = "additionalTasks";
+        let promises: Promise<void>[] = [];
 
         promises.push(renameDummyEntrypoint());
         promises.push(removeLibCoreClrTraceProvider());
@@ -86,7 +86,7 @@ export function installCoreClrDebug(context: vscode.ExtensionContext) {
 
 function initializeTelemetry(context: vscode.ExtensionContext) {
     // parse our own package.json into json
-    var packageJson = JSON.parse(fs.readFileSync(path.join(context.extensionPath, 'package.json')).toString());
+    const packageJson = JSON.parse(fs.readFileSync(path.join(context.extensionPath, 'package.json')).toString());
 
     let extensionId = packageJson["publisher"] + "." + packageJson["name"];
     let extensionVersion = packageJson["version"];
@@ -116,13 +116,13 @@ function writeCompletionFile() : Promise<void> {
 }
 
 function renameDummyEntrypoint() : Promise<void> {
-    var src = path.join(_debugAdapterDir, 'dummy');
-    var dest = path.join(_debugAdapterDir, 'OpenDebugAD7');
+    let src = path.join(_debugAdapterDir, 'dummy');
+    let dest = path.join(_debugAdapterDir, 'OpenDebugAD7');
 
     src += getPlatformExeExtension();
     dest += getPlatformExeExtension();
 
-    var promise = new Promise<void>(function(resolve, reject) {
+    const promise = new Promise<void>(function(resolve, reject) {
        fs.rename(src, dest, function(err) {
            if (err) {
                reject(err.code);
@@ -137,7 +137,7 @@ function renameDummyEntrypoint() : Promise<void> {
 
 function removeLibCoreClrTraceProvider() : Promise<void>
 {
-    var filePath = path.join(_debugAdapterDir, 'libcoreclrtraceptprovider' + getPlatformLibExtension());
+    const filePath = path.join(_debugAdapterDir, 'libcoreclrtraceptprovider' + getPlatformLibExtension());
 
     if (!existsSync(filePath)) {
         return Promise.resolve();
@@ -204,11 +204,12 @@ function isOnPath(command : string) : boolean {
     }
 
     let pathSegments: string[] = pathValue.split(seperatorChar);
-    for (var segment of pathSegments) {
+    for (let segment of pathSegments) {
         if (segment.length === 0 || !path.isAbsolute(segment)) {
             continue;
         }
-        var segmentPath = path.join(segment, fileName);
+        
+        const segmentPath = path.join(segment, fileName);
         if (existsSync(segmentPath)) {
             return true;
         }
@@ -236,7 +237,7 @@ function ensureAd7EngineExists(channel: vscode.OutputChannel, outputDirectory: s
 }
 
 function spawnChildProcess(process: string, args: string[], channel: vscode.OutputChannel, workingDirectory: string) : Promise<void> {
-    var promise = new Promise<void>( function (resolve, reject) {
+    const promise = new Promise<void>(function(resolve, reject) {
         const child = child_process.spawn(process, args, {cwd: workingDirectory});
 
         child.stdout.on('data', (data) => {

src/coreclr-debug.ts

@@ -7,7 +7,7 @@
 
 import {Disposable, Uri, workspace} from 'vscode';
 import {OmnisharpServer} from '../omnisharpServer';
-import * as proto from '../protocol';
+import * as serverUtils from '../omnisharpUtils';
 
 function forwardDocumentChanges(server: OmnisharpServer): Disposable {
 
@@ -22,10 +22,7 @@ function forwardDocumentChanges(server: OmnisharpServer): Disposable {
 			return;
 		}
 
-		server.makeRequest(proto.UpdateBuffer, <proto.Request>{
-			Buffer: document.getText(),
-			Filename: document.fileName
-		}).catch(err => {
+		serverUtils.updateBuffer(server, {Buffer: document.getText(), Filename: document.fileName}).catch(err => {
 			console.error(err);
 			return err;
 		});
@@ -38,9 +35,11 @@ function forwardFileChanges(server: OmnisharpServer): Disposable {
 		if (!server.isRunning()) {
 			return;
 		}
+        
 		let req = { Filename: uri.fsPath };
-		server.makeRequest<boolean>(proto.FilesChanged, [req]).catch(err => {
-			console.warn('[o] failed to forward file change event for ' + uri.fsPath, err);
+        
+        serverUtils.filesChanged(server, [req]).catch(err => {
+			console.warn(`[o] failed to forward file change event for ${uri.fsPath}`, err);
 			return err;
 		});
 	}

src/features/changeForwarding.ts

@@ -8,8 +8,9 @@
 import {CodeActionProvider, CodeActionContext, Command, CancellationToken, TextDocument, WorkspaceEdit, TextEdit, Range, Uri, workspace, commands} from 'vscode';
 import {OmnisharpServer} from '../omnisharpServer';
 import AbstractProvider from './abstractProvider';
-import {TextChange, V2} from '../protocol';
+import * as protocol from '../protocol';
 import {toRange2} from '../typeConvertion';
+import * as serverUtils from '../omnisharpUtils';
 
 export default class OmnisharpCodeActionProvider extends AbstractProvider implements CodeActionProvider {
 
@@ -37,32 +38,32 @@ export default class OmnisharpCodeActionProvider extends AbstractProvider implem
 			return;
 		}
 
-		let req: V2.GetCodeActionsRequest = {
+		let req: protocol.V2.GetCodeActionsRequest = {
 			Filename: document.fileName,
 			Selection: OmnisharpCodeActionProvider._asRange(range)
-		}
+		};
 
-		return this._server.makeRequest<V2.GetCodeActionsResponse>(V2.GetCodeActions, req, token).then(response => {
-			return response.CodeActions.map(ca => {
+		return serverUtils.getCodeActions(this._server, req, token).then(response => {
+			return response.CodeActions.map(codeAction => {
 				return {
-					title: ca.Name,
+					title: codeAction.Name,
 					command: this._commandId,
-					arguments: [<V2.RunCodeActionRequest>{
+					arguments: [<protocol.V2.RunCodeActionRequest>{
 						Filename: document.fileName,
 						Selection: OmnisharpCodeActionProvider._asRange(range),
-						Identifier: ca.Identifier,
+						Identifier: codeAction.Identifier,
 						WantsTextChanges: true
 					}]
 				};
 			});
 		}, (error) => {
-			return Promise.reject('Problem invoking \'GetCodeActions\' on OmniSharp server: ' + error);
+			return Promise.reject(`Problem invoking 'GetCodeActions' on OmniSharp server: ${error}`);
 		});
 	}
 
-	private _runCodeAction(req: V2.RunCodeActionRequest): Promise<any> {
+	private _runCodeAction(req: protocol.V2.RunCodeActionRequest): Promise<any> {
 
-		return this._server.makeRequest<V2.RunCodeActionResponse>(V2.RunCodeAction, req).then(response => {
+		return serverUtils.runCodeAction(this._server, req).then(response => {
 
 			if (response && Array.isArray(response.Changes)) {
 
@@ -86,7 +87,7 @@ export default class OmnisharpCodeActionProvider extends AbstractProvider implem
 		});
 	}
 
-	private static _asRange(range: Range): V2.Range {
+	private static _asRange(range: Range): protocol.V2.Range {
 		let {start, end} = range;
 		return {
 			Start: { Line: start.line + 1, Column: start.character + 1 },

src/features/codeActionProvider.ts

@@ -5,10 +5,11 @@
 
 'use strict';
 
-import {CancellationToken, CodeLens, SymbolKind, Range, Uri, TextDocument, CodeLensProvider, Position} from 'vscode';
-import {createRequest, toRange, toLocation} from '../typeConvertion';
+import {CancellationToken, CodeLens, Range, Uri, TextDocument, CodeLensProvider} from 'vscode';
+import {toRange, toLocation} from '../typeConvertion';
 import AbstractSupport from './abstractProvider';
-import * as proto from '../protocol';
+import * as protocol from '../protocol';
+import * as serverUtils from '../omnisharpUtils';
 
 class OmniSharpCodeLens extends CodeLens {
 
@@ -31,16 +32,14 @@ export default class OmniSharpCodeLensProvider extends AbstractSupport implement
 
 	provideCodeLenses(document: TextDocument, token: CancellationToken): CodeLens[] | Thenable<CodeLens[]> {
 
-		return this._server.makeRequest<proto.CurrentFileMembersAsTreeResponse>(proto.CurrentFileMembersAsTree, {
-			Filename: document.fileName
-		}, token).then(tree => {
-			var ret: CodeLens[] = [];
+		return serverUtils.currentFileMembersAsTree(this._server, { Filename: document.fileName }, token).then(tree => {
+			let ret: CodeLens[] = [];
 			tree.TopLevelTypeDefinitions.forEach(node => OmniSharpCodeLensProvider._convertQuickFix(ret, document.fileName, node));
 			return ret;
 		});
 	}
 
-	private static _convertQuickFix(bucket: CodeLens[], fileName:string, node: proto.Node): void {
+	private static _convertQuickFix(bucket: CodeLens[], fileName:string, node: protocol.Node): void {
 
 		if (node.Kind === 'MethodDeclaration' && OmniSharpCodeLensProvider.filteredSymbolNames[node.Location.Text]) {
 			return;
@@ -57,18 +56,19 @@ export default class OmniSharpCodeLensProvider extends AbstractSupport implement
 	resolveCodeLens(codeLens: CodeLens, token: CancellationToken): Thenable<CodeLens> {
 		if (codeLens instanceof OmniSharpCodeLens) {
 
-			let req = <proto.FindUsagesRequest>{
+			let req = <protocol.FindUsagesRequest>{
 				Filename: codeLens.fileName,
 				Line: codeLens.range.start.line + 1,
 				Column: codeLens.range.start.character + 1,
 				OnlyThisFile: false,
 				ExcludeDefinition: true
 			};
 
-			return this._server.makeRequest<proto.QuickFixResponse>(proto.FindUsages, req, token).then(res => {
+			return serverUtils.findUsages(this._server, req, token).then(res => {
 				if (!res || !Array.isArray(res.QuickFixes)) {
 					return;
 				}
+                
 				let len = res.QuickFixes.length;
 				codeLens.command = {
 					title: len === 1 ? '1 reference' : `${len} references`,