Move the fileprovider mock to its own file and add a doCompletion unit test

Author: iSorp

Diff for: server/src/macroLanguageService/test/completion.test.ts

@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Simon Waelti. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import * as assert from 'assert';
+import { Position } from 'vscode-languageserver-textdocument';
+import { FileProviderMock, documents } from './fileProviderMock';
+import {
+	LanguageService, 
+	getMacroLanguageService, 
+} from '../macroLanguageService';
+
+import {
+	TextDocument, 
+	LanguageSettings,
+	CompletionList
+} from '../macroLanguageTypes';
+
+import { 
+	Parser, 
+} from '../parser/macroParser';
+
+declare type completionFunction = (document, position, macroFile, settings) => CompletionList | null;
+
+function assertCompletion(service: LanguageService, input: string, position:Position, expected: string, f:completionFunction) {
+	
+	let settings:LanguageSettings = {
+		keywords:[],
+		sequence: {
+			base: 1000,
+			increment: 5
+		}
+	};
+	
+	let document = TextDocument.create(`test://test/test.src`, 'macro', 0, input);
+	let macroFile = service.parseMacroFile(document);
+	let result = f(document, position, macroFile, settings);
+	
+	assert.strictEqual(result.items[7].textEdit.newText, expected, input);
+}
+
+let fileProviderMock = new FileProviderMock();
+let service = getMacroLanguageService({ fileProvider: fileProviderMock });
+
+suite('Completion', () => {
+
+	test('N-Number completion', function () {
+
+		assertCompletion(service, 'O 100\nN10\nN\n', 
+			{ line:2,character:1}, 
+			'N${1:15} $0',
+			service.doComplete.bind(service)
+		);
+	});
+});
+
+

Diff for: server/src/macroLanguageService/test/fileProviderMock.ts

@@ -0,0 +1,58 @@
+import {
+	TextDocument,
+	MacroFileProvider,
+	MacroFileType,
+	MacroFileInfo, 
+	FileProviderParams,
+} from '../macroLanguageTypes';
+
+import { 
+	Parser, 
+} from '../parser/macroParser';
+
+export { FileProviderMock };
+
+export const documents: Map<string, TextDocument> = new Map<string, TextDocument>();
+
+class FileProviderMock implements MacroFileProvider {
+
+	constructor() {}
+
+	public get(file: string): MacroFileInfo | undefined {
+		const document = documents.get(file);
+		const macroFile =  new Parser(this).parseMacroFile(document);
+		return {
+			document: document,
+			macrofile: macroFile,
+			version: 1,
+			type: this.getMacroFileType(file)
+		};
+	}
+	
+	public getAll(param?:FileProviderParams) {
+		let types:MacroFileInfo[] = [];
+		for (const file of documents.keys()) {
+			let type = this.get(file);
+			if (type){
+				types.push(type);
+			}
+		}
+		return types;
+	}
+
+	public resolveReference(ref: string, base?: string): string | undefined {
+		return undefined;
+	}
+	
+	public getMacroFileType(file: string) : MacroFileType {
+		var fileExt = file.split('.').pop().toLocaleLowerCase();
+		switch(fileExt) {
+			case 'def':
+				return MacroFileType.DEF;
+			case 'lnk':
+				return MacroFileType.LNK;
+			default:
+				return MacroFileType.SRC;
+		}
+	} 
+}

Diff for: server/src/macroLanguageService/test/navigation.test.ts

@@ -6,17 +6,14 @@
 
 import * as assert from 'assert';
 import { Position } from 'vscode-languageserver-textdocument';
+import { FileProviderMock, documents } from './fileProviderMock';
 import {
 	LanguageService, 
 	getMacroLanguageService, 
 } from '../macroLanguageService';
 import {
 	TextDocument, 
-	MacroFileProvider,
 	Location,
-	MacroFileType,
-	MacroFileInfo, 
-	FileProviderParams,
 	Range
 } from '../macroLanguageTypes';
 
@@ -27,52 +24,6 @@ import {
 declare type locationFunction = (document, position, macroFile) => Location | null;
 declare type locationsFunction = (document, position, macroFile) => Location[];
 
-const documents: Map<string, TextDocument> = new Map<string, TextDocument>();
-
-class FileProviderMock implements MacroFileProvider {
-
-	constructor() {}
-
-	public get(file: string): MacroFileInfo | undefined {
-		const document = documents.get(file);
-		const macroFile =  new Parser(this).parseMacroFile(document);
-		return {
-			document: document,
-			macrofile: macroFile,
-			version: 1,
-			type: this.getMacroFileType(file)
-		};
-	}
-	
-	public getAll(param?:FileProviderParams) {
-		let types:MacroFileInfo[] = [];
-		for (const file of documents.keys()) {
-			let type = this.get(file);
-			if (type){
-				types.push(type);
-			}
-		}
-		return types;
-	}
-
-	public resolveReference(ref: string, base?: string): string | undefined {
-		return undefined;
-	}
-	
-	public getMacroFileType(file: string) : MacroFileType {
-		var fileExt = file.split('.').pop().toLocaleLowerCase();
-		switch(fileExt) {
-			case 'def':
-				return MacroFileType.DEF;
-			case 'lnk':
-				return MacroFileType.LNK;
-			default:
-				return MacroFileType.SRC;
-		}
-	} 
-}
-
-
 function assertLocation(service: LanguageService, input: string, position:Position, location:Location, f:locationFunction) {
 
 	let uri = 'test://test/test.src';