typescript-language-server 0.11.2 → 1.0.0

package/lib/lsp-server.spec.js

@@ -1,33 +1,9 @@
-"use strict";
 /*
  * Copyright (C) 2017, 2018 TypeFox and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -37,20 +13,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai = __importStar(require("chai"));
-const fs = __importStar(require("fs-extra"));
-const lsp = __importStar(require("vscode-languageserver/node"));
-const lspcalls = __importStar(require("./lsp-protocol.calls.proposed"));
-const test_utils_1 = require("./test-utils");
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-const commands_1 = require("./commands");
-const types_1 = require("./utils/types");
+import * as chai from 'chai';
+import fs from 'fs-extra';
+import * as lsp from 'vscode-languageserver';
+import * as lspcalls from './lsp-protocol.calls.proposed.js';
+import { uri, createServer, position, lastPosition, filePath, getDefaultClientCapabilities, positionAfter, readContents, toPlatformEOL } from './test-utils.js';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { Commands } from './commands.js';
+import { CodeActionKind } from './utils/types.js';
 const assert = chai.assert;
 const diagnostics = new Map();
 let server;
 before(() => __awaiter(void 0, void 0, void 0, function* () {
-    server = yield (0, test_utils_1.createServer)({
+    server = yield createServer({
         rootUri: null,
         publishDiagnostics: args => diagnostics.set(args.uri, args)
     });
@@ -70,11 +45,12 @@ beforeEach(() => {
 });
 after(() => {
     server.closeAll();
+    server.shutdown();
 });
 describe('completion', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -86,7 +62,7 @@ describe('completion', () => {
         server.didOpenTextDocument({
             textDocument: doc
         });
-        const pos = (0, test_utils_1.position)(doc, 'console');
+        const pos = position(doc, 'console');
         const proposals = yield server.completion({ textDocument: doc, position: pos });
         assert.isNotNull(proposals);
         assert.isAtLeast(proposals.items.length, 800);
@@ -96,10 +72,10 @@ describe('completion', () => {
         assert.isNotTrue(resolvedItem.deprecated, 'resolved item is not deprecated');
         assert.isDefined(resolvedItem.detail);
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('simple JS test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.js'),
+            uri: uri('bar.js'),
             languageId: 'javascript',
             version: 1,
             text: `
@@ -111,7 +87,7 @@ describe('completion', () => {
         server.didOpenTextDocument({
             textDocument: doc
         });
-        const pos = (0, test_utils_1.position)(doc, 'console');
+        const pos = position(doc, 'console');
         const proposals = yield server.completion({ textDocument: doc, position: pos });
         assert.isNotNull(proposals);
         assert.isAtLeast(proposals.items.length, 800);
@@ -129,10 +105,10 @@ describe('completion', () => {
         }, false);
         assert.isFalse(containsInvalidCompletions);
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('deprecated by JSDoc', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -150,7 +126,7 @@ describe('completion', () => {
         server.didOpenTextDocument({
             textDocument: doc
         });
-        const pos = (0, test_utils_1.position)(doc, 'foo(); // call me');
+        const pos = position(doc, 'foo(); // call me');
         const proposals = yield server.completion({ textDocument: doc, position: pos });
         assert.isNotNull(proposals);
         const item = proposals.items.find(i => i.label === 'foo');
@@ -160,10 +136,10 @@ describe('completion', () => {
         assert.isArray(resolvedItem.tags);
         assert.include(resolvedItem.tags, lsp.CompletionItemTag.Deprecated, 'resolved item is deprecated');
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('incorrect source location', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -175,28 +151,28 @@ describe('completion', () => {
         server.didOpenTextDocument({
             textDocument: doc
         });
-        const pos = (0, test_utils_1.position)(doc, 'foo');
+        const pos = position(doc, 'foo');
         const proposals = yield server.completion({ textDocument: doc, position: pos });
         assert.isNull(proposals);
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('includes completions from global modules', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: 'pathex'
         };
         server.didOpenTextDocument({ textDocument: doc });
-        const proposals = yield server.completion({ textDocument: doc, position: (0, test_utils_1.position)(doc, 'ex') });
+        const proposals = yield server.completion({ textDocument: doc, position: position(doc, 'ex') });
         assert.isNotNull(proposals);
         const pathExistsCompletion = proposals.items.find(completion => completion.label === 'pathExists');
         assert.isDefined(pathExistsCompletion);
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('includes completions with invalid identifier names', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -209,39 +185,39 @@ describe('completion', () => {
             `
         };
         server.didOpenTextDocument({ textDocument: doc });
-        const proposals = yield server.completion({ textDocument: doc, position: (0, test_utils_1.positionAfter)(doc, '.i') });
+        const proposals = yield server.completion({ textDocument: doc, position: positionAfter(doc, '.i') });
         assert.isNotNull(proposals);
         const completion = proposals.items.find(completion => completion.label === 'invalid-identifier-name');
         assert.isDefined(completion);
         assert.isDefined(completion.textEdit);
         assert.equal(completion.textEdit.newText, '["invalid-identifier-name"]');
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('includes detail field with package name for auto-imports', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: 'readFile'
         };
         server.didOpenTextDocument({ textDocument: doc });
-        const proposals = yield server.completion({ textDocument: doc, position: (0, test_utils_1.positionAfter)(doc, 'readFile') });
+        const proposals = yield server.completion({ textDocument: doc, position: positionAfter(doc, 'readFile') });
         assert.isNotNull(proposals);
         const completion = proposals.items.find(completion => completion.label === 'readFile');
         assert.isDefined(completion);
         assert.strictEqual(completion.detail, 'fs');
         assert.strictEqual(completion.insertTextFormat, /* snippet */ 2);
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('resolves text edit for auto-import completion', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: 'readFile'
         };
         server.didOpenTextDocument({ textDocument: doc });
-        const proposals = yield server.completion({ textDocument: doc, position: (0, test_utils_1.positionAfter)(doc, 'readFile') });
+        const proposals = yield server.completion({ textDocument: doc, position: positionAfter(doc, 'readFile') });
         assert.isNotNull(proposals);
         const completion = proposals.items.find(completion => completion.label === 'readFile');
         assert.isDefined(completion);
@@ -262,7 +238,7 @@ describe('completion', () => {
             }
         ]);
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('resolves text edit for auto-import completion in right format', () => __awaiter(void 0, void 0, void 0, function* () {
         server.didChangeConfiguration({
             settings: {
@@ -275,13 +251,13 @@ describe('completion', () => {
             }
         });
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: 'readFile'
         };
         server.didOpenTextDocument({ textDocument: doc });
-        const proposals = yield server.completion({ textDocument: doc, position: (0, test_utils_1.positionAfter)(doc, 'readFile') });
+        const proposals = yield server.completion({ textDocument: doc, position: positionAfter(doc, 'readFile') });
         assert.isNotNull(proposals);
         const completion = proposals.items.find(completion => completion.label === 'readFile');
         assert.isDefined(completion);
@@ -315,10 +291,10 @@ describe('completion', () => {
                 }
             }
         });
-    })).timeout(10000);
+    }));
     it('resolves a snippet for method completion', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -327,7 +303,7 @@ describe('completion', () => {
             `
         };
         server.didOpenTextDocument({ textDocument: doc });
-        const proposals = yield server.completion({ textDocument: doc, position: (0, test_utils_1.positionAfter)(doc, 'readFile') });
+        const proposals = yield server.completion({ textDocument: doc, position: positionAfter(doc, 'readFile') });
         assert.isNotNull(proposals);
         const completion = proposals.items.find(completion => completion.label === 'readFile');
         assert.strictEqual(completion.insertTextFormat, lsp.InsertTextFormat.Snippet);
@@ -337,24 +313,24 @@ describe('completion', () => {
         // eslint-disable-next-line no-template-curly-in-string
         assert.strictEqual(resolvedItem.insertText, 'readFile(${1:path}, ${2:options}, ${3:callback})$0');
         server.didCloseTextDocument({ textDocument: doc });
-    })).timeout(10000);
+    }));
     it('includes textEdit for string completion', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
               function test(value: "fs/read" | "hello/world") {
                 return true;
               }
-              
+
               test("fs/")
             `
         };
         server.didOpenTextDocument({ textDocument: doc });
         const proposals = yield server.completion({
             textDocument: doc,
-            position: (0, test_utils_1.positionAfter)(doc, 'test("fs/'),
+            position: positionAfter(doc, 'test("fs/'),
             context: {
                 triggerCharacter: '/',
                 triggerKind: 2
@@ -370,12 +346,48 @@ describe('completion', () => {
             },
             newText: 'fs/read'
         });
-    })).timeout(10000);
+    }));
+    it('includes labelDetails with useLabelDetailsInCompletionEntries enabled', () => __awaiter(void 0, void 0, void 0, function* () {
+        const doc = {
+            uri: uri('foo.ts'),
+            languageId: 'typescript',
+            version: 1,
+            text: `
+              interface IFoo {
+                bar(x: number): void;
+              }
+              const obj: IFoo = {
+                /*a*/
+              }
+            `
+        };
+        server.didOpenTextDocument({ textDocument: doc });
+        const proposals = yield server.completion({
+            textDocument: doc,
+            position: positionAfter(doc, '/*a*/')
+        });
+        assert.isNotNull(proposals);
+        assert.lengthOf(proposals.items, 2);
+        assert.deepInclude(proposals.items[0], {
+            label: 'bar',
+            kind: 2,
+            insertTextFormat: 2
+        });
+        assert.deepInclude(proposals.items[1], {
+            label: 'bar',
+            labelDetails: {
+                detail: '(x)'
+            },
+            kind: 2,
+            insertTextFormat: 2,
+            insertText: toPlatformEOL('bar(x) {\n    $0\n},')
+        });
+    }));
 });
 describe('diagnostics', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('diagnosticsBar.ts'),
+            uri: uri('diagnosticsBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -394,10 +406,10 @@ describe('diagnostics', () => {
         const fileDiagnostics = resultsForFile.diagnostics;
         assert.equal(fileDiagnostics.length, 1);
         assert.equal("Cannot find name 'missing'.", fileDiagnostics[0].message);
-    })).timeout(10000);
+    }));
     it('supports diagnostic tags', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('diagnosticsBar.ts'),
+            uri: uri('diagnosticsBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -423,10 +435,10 @@ describe('diagnostics', () => {
         const deprecatedDiagnostic = fileDiagnostics.find(d => d.code === 6387);
         assert.isDefined(deprecatedDiagnostic);
         assert.deepEqual(deprecatedDiagnostic.tags, [lsp.DiagnosticTag.Deprecated]);
-    })).timeout(10000);
+    }));
     it('multiple files test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('multipleFileDiagnosticsBar.ts'),
+            uri: uri('multipleFileDiagnosticsBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -436,7 +448,7 @@ describe('diagnostics', () => {
 `
         };
         const doc2 = {
-            uri: (0, test_utils_1.uri)('multipleFileDiagnosticsFoo.ts'),
+            uri: uri('multipleFileDiagnosticsFoo.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -460,7 +472,7 @@ describe('diagnostics', () => {
         assert.isDefined(diagnosticsForDoc2);
         assert.equal(diagnosticsForDoc.diagnostics.length, 1, JSON.stringify(diagnostics));
         assert.equal(diagnosticsForDoc2.diagnostics.length, 1, JSON.stringify(diagnostics));
-    })).timeout(10000);
+    }));
     it('code 6133 (ununsed variable) is ignored', () => __awaiter(void 0, void 0, void 0, function* () {
         server.didChangeConfiguration({
             settings: {
@@ -470,7 +482,7 @@ describe('diagnostics', () => {
             }
         });
         const doc = {
-            uri: (0, test_utils_1.uri)('diagnosticsBar2.ts'),
+            uri: uri('diagnosticsBar2.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -489,12 +501,12 @@ describe('diagnostics', () => {
         assert.isDefined(diagnosticsForThisFile);
         const fileDiagnostics = diagnosticsForThisFile.diagnostics;
         assert.equal(fileDiagnostics.length, 0, JSON.stringify(fileDiagnostics));
-    })).timeout(10000);
+    }));
 });
 describe('document symbol', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -517,10 +529,10 @@ Foo
   foo
   myFunction
 `, symbolsAsString(symbols) + '\n');
-    })).timeout(10000);
+    }));
     it('merges interfaces correctly', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -547,10 +559,10 @@ Box
 Box
   scale
 `, symbolsAsString(symbols) + '\n');
-    })).timeout(10000);
+    }));
     it('duplication test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -586,7 +598,7 @@ Foo
         assert.deepEqual(symbols[0].range, { start: { line: 1, character: 8 }, end: { line: 5, character: 9 } });
         assert.deepEqual(symbols[1].selectionRange, symbols[1].range);
         assert.deepEqual(symbols[1].range, { start: { line: 6, character: 8 }, end: { line: 10, character: 9 } });
-    })).timeout(10000);
+    }));
 });
 function symbolsAsString(symbols, indentation = '') {
     return symbols.map(symbol => {
@@ -607,7 +619,7 @@ function symbolsAsString(symbols, indentation = '') {
 describe('editing', () => {
     it('open and change', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('openAndChangeBar.ts'),
+            uri: uri('openAndChangeBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -637,45 +649,44 @@ describe('editing', () => {
         const fileDiagnostics = resultsForFile.diagnostics;
         assert.isTrue(fileDiagnostics.length >= 1, fileDiagnostics.map(d => d.message).join(','));
         assert.equal("Cannot find name 'missing'.", fileDiagnostics[0].message);
-    })).timeout(10000);
+    }));
 });
 describe('references', () => {
     it('respects "includeDeclaration" in the request', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('foo.ts'),
+            uri: uri('foo.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
-                export let foo = 1;
-                foo++;
-                foo = 1;
+                function foo() {};
+                foo();
             `
         };
         server.didOpenTextDocument({
             textDocument: doc
         });
         // Without declaration/definition.
+        const position = lastPosition(doc, 'function foo()');
         let references = yield server.references({
             context: { includeDeclaration: false },
             textDocument: doc,
-            position: (0, test_utils_1.lastPosition)(doc, 'foo')
+            position
         });
-        assert.strictEqual(references.length, 2);
+        assert.strictEqual(references.length, 1);
         assert.strictEqual(references[0].range.start.line, 2);
-        assert.strictEqual(references[1].range.start.line, 3);
         // With declaration/definition.
         references = yield server.references({
             context: { includeDeclaration: true },
             textDocument: doc,
-            position: (0, test_utils_1.lastPosition)(doc, 'foo')
+            position
         });
-        assert.strictEqual(references.length, 3);
-    })).timeout(10000);
+        assert.strictEqual(references.length, 2);
+    }));
 });
 describe('workspace configuration', () => {
     it('receives workspace configuration notification', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -701,13 +712,13 @@ describe('workspace configuration', () => {
                 }
             }
         });
-        const file = (0, test_utils_1.filePath)('bar.ts');
+        const file = filePath('bar.ts');
         const settings = server.getWorkspacePreferencesForDocument(file);
         assert.deepEqual(settings, { format: { insertSpaceAfterCommaDelimiter: true } });
     }));
 });
 describe('formatting', () => {
-    const uriString = (0, test_utils_1.uri)('bar.ts');
+    const uriString = uri('bar.ts');
     const languageId = 'typescript';
     const version = 1;
     it('full document formatting', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -723,9 +734,9 @@ describe('formatting', () => {
                 insertSpaces: true
             }
         });
-        const result = vscode_languageserver_textdocument_1.TextDocument.applyEdits(vscode_languageserver_textdocument_1.TextDocument.create(uriString, languageId, version, text), edits);
+        const result = TextDocument.applyEdits(TextDocument.create(uriString, languageId, version, text), edits);
         assert.equal('export function foo(): void { }', result);
-    })).timeout(10000);
+    }));
     it('indent settings (3 spaces)', () => __awaiter(void 0, void 0, void 0, function* () {
         const text = 'function foo() {\n// some code\n}';
         const textDocument = {
@@ -739,9 +750,9 @@ describe('formatting', () => {
                 insertSpaces: true
             }
         });
-        const result = vscode_languageserver_textdocument_1.TextDocument.applyEdits(vscode_languageserver_textdocument_1.TextDocument.create(uriString, languageId, version, text), edits);
+        const result = TextDocument.applyEdits(TextDocument.create(uriString, languageId, version, text), edits);
         assert.equal('function foo() {\n   // some code\n}', result);
-    })).timeout(10000);
+    }));
     it('indent settings (tabs)', () => __awaiter(void 0, void 0, void 0, function* () {
         const text = 'function foo() {\n// some code\n}';
         const textDocument = {
@@ -755,9 +766,9 @@ describe('formatting', () => {
                 insertSpaces: false
             }
         });
-        const result = vscode_languageserver_textdocument_1.TextDocument.applyEdits(vscode_languageserver_textdocument_1.TextDocument.create(uriString, languageId, version, text), edits);
+        const result = TextDocument.applyEdits(TextDocument.create(uriString, languageId, version, text), edits);
         assert.equal('function foo() {\n\t// some code\n}', result);
-    })).timeout(10000);
+    }));
     it('formatting setting set through workspace configuration', () => __awaiter(void 0, void 0, void 0, function* () {
         const text = 'function foo() {\n// some code\n}';
         const textDocument = {
@@ -781,9 +792,9 @@ describe('formatting', () => {
                 insertSpaces: false
             }
         });
-        const result = vscode_languageserver_textdocument_1.TextDocument.applyEdits(vscode_languageserver_textdocument_1.TextDocument.create(uriString, languageId, version, text), edits);
+        const result = TextDocument.applyEdits(TextDocument.create(uriString, languageId, version, text), edits);
         assert.equal('function foo()\n{\n\t// some code\n}', result);
-    })).timeout(10000);
+    }));
     it('selected range', () => __awaiter(void 0, void 0, void 0, function* () {
         const text = 'function foo() {\nconst first = 1;\nconst second = 2;\nconst val = foo( "something" );\n//const fourth = 4;\n}';
         const textDocument = {
@@ -807,14 +818,14 @@ describe('formatting', () => {
                 insertSpaces: true
             }
         });
-        const result = vscode_languageserver_textdocument_1.TextDocument.applyEdits(vscode_languageserver_textdocument_1.TextDocument.create(uriString, languageId, version, text), edits);
+        const result = TextDocument.applyEdits(TextDocument.create(uriString, languageId, version, text), edits);
         assert.equal('function foo() {\nconst first = 1;\n    const second = 2;\n    const val = foo("something");\n//const fourth = 4;\n}', result);
-    })).timeout(10000);
+    }));
 });
 describe('signatureHelp', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -827,19 +838,19 @@ describe('signatureHelp', () => {
         });
         let result = (yield server.signatureHelp({
             textDocument: doc,
-            position: (0, test_utils_1.position)(doc, 'param1')
+            position: position(doc, 'param1')
         }));
         assert.equal('bar: string', result.signatures[result.activeSignature].parameters[result.activeParameter].label);
         result = (yield server.signatureHelp({
             textDocument: doc,
-            position: (0, test_utils_1.position)(doc, 'param2')
+            position: position(doc, 'param2')
         }));
         assert.equal('baz?: boolean', result.signatures[result.activeSignature].parameters[result.activeParameter].label);
-    })).timeout(10000);
+    }));
 });
 describe('code actions', () => {
     const doc = {
-        uri: (0, test_utils_1.uri)('bar.ts'),
+        uri: uri('bar.ts'),
         languageId: 'typescript',
         version: 1,
         text: `import { something } from "something";
@@ -881,7 +892,7 @@ describe('code actions', () => {
                         documentChanges: [
                             {
                                 textDocument: {
-                                    uri: (0, test_utils_1.uri)('bar.ts'),
+                                    uri: uri('bar.ts'),
                                     version: 1
                                 },
                                 edits: [
@@ -915,7 +926,7 @@ describe('code actions', () => {
                 command: '_typescript.applyRefactoring',
                 arguments: [
                     {
-                        file: (0, test_utils_1.filePath)('bar.ts'),
+                        file: filePath('bar.ts'),
                         startLine: 2,
                         startOffset: 26,
                         endLine: 2,
@@ -927,7 +938,7 @@ describe('code actions', () => {
             },
             kind: 'refactor'
         });
-    })).timeout(10000);
+    }));
     it('can filter quickfix code actions filtered by only', () => __awaiter(void 0, void 0, void 0, function* () {
         server.didOpenTextDocument({
             textDocument: doc
@@ -958,7 +969,7 @@ describe('code actions', () => {
                             action: 'Convert parameters to destructured object',
                             endLine: 2,
                             endOffset: 50,
-                            file: (0, test_utils_1.filePath)('bar.ts'),
+                            file: filePath('bar.ts'),
                             refactor: 'Convert parameters to destructured object',
                             startLine: 2,
                             startOffset: 26
@@ -971,7 +982,7 @@ describe('code actions', () => {
                 title: 'Convert parameters to destructured object'
             }
         ]);
-    })).timeout(10000);
+    }));
     it('does not provide organize imports when there are errors', () => __awaiter(void 0, void 0, void 0, function* () {
         server.didOpenTextDocument({
             textDocument: doc
@@ -993,14 +1004,14 @@ describe('code actions', () => {
                         code: 6133,
                         message: 'unused arg'
                     }],
-                only: [types_1.CodeActionKind.SourceOrganizeImportsTs.value]
+                only: [CodeActionKind.SourceOrganizeImportsTs.value]
             }
         }));
         assert.deepEqual(result, []);
-    })).timeout(10000);
+    }));
     it('provides "add missing imports" when explicitly requested in only', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: 'existsSync(\'t\');'
@@ -1018,12 +1029,12 @@ describe('code actions', () => {
             },
             context: {
                 diagnostics: [],
-                only: [types_1.CodeActionKind.SourceAddMissingImportsTs.value]
+                only: [CodeActionKind.SourceAddMissingImportsTs.value]
             }
         }));
         assert.deepEqual(result, [
             {
-                kind: types_1.CodeActionKind.SourceAddMissingImportsTs.value,
+                kind: CodeActionKind.SourceAddMissingImportsTs.value,
                 title: 'Add all missing imports',
                 edit: {
                     documentChanges: [
@@ -1045,7 +1056,7 @@ describe('code actions', () => {
                                 }
                             ],
                             textDocument: {
-                                uri: (0, test_utils_1.uri)('bar.ts'),
+                                uri: uri('bar.ts'),
                                 version: 1
                             }
                         }
@@ -1053,10 +1064,10 @@ describe('code actions', () => {
                 }
             }
         ]);
-    })).timeout(10000);
+    }));
     it('provides "fix all" when explicitly requested in only', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `function foo() {
@@ -1077,12 +1088,12 @@ describe('code actions', () => {
             },
             context: {
                 diagnostics: [],
-                only: [types_1.CodeActionKind.SourceFixAllTs.value]
+                only: [CodeActionKind.SourceFixAllTs.value]
             }
         }));
         assert.deepEqual(result, [
             {
-                kind: types_1.CodeActionKind.SourceFixAllTs.value,
+                kind: CodeActionKind.SourceFixAllTs.value,
                 title: 'Fix all',
                 edit: {
                     documentChanges: [
@@ -1103,7 +1114,7 @@ describe('code actions', () => {
                                 }
                             ],
                             textDocument: {
-                                uri: (0, test_utils_1.uri)('bar.ts'),
+                                uri: uri('bar.ts'),
                                 version: 1
                             }
                         }
@@ -1111,10 +1122,10 @@ describe('code actions', () => {
                 }
             }
         ]);
-    })).timeout(10000);
+    }));
     it('provides organize imports when explicitly requested in only', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `import { existsSync } from 'fs';
@@ -1139,12 +1150,12 @@ existsSync('t');`
                         code: 6133,
                         message: 'unused arg'
                     }],
-                only: [types_1.CodeActionKind.SourceOrganizeImportsTs.value]
+                only: [CodeActionKind.SourceOrganizeImportsTs.value]
             }
         }));
         assert.deepEqual(result, [
             {
-                kind: types_1.CodeActionKind.SourceOrganizeImportsTs.value,
+                kind: CodeActionKind.SourceOrganizeImportsTs.value,
                 title: 'Organize imports',
                 edit: {
                     documentChanges: [
@@ -1178,7 +1189,7 @@ existsSync('t');`
                                 }
                             ],
                             textDocument: {
-                                uri: (0, test_utils_1.uri)('bar.ts'),
+                                uri: uri('bar.ts'),
                                 version: 1
                             }
                         }
@@ -1186,10 +1197,10 @@ existsSync('t');`
                 }
             }
         ]);
-    })).timeout(10000);
+    }));
     it('provides "remove unused" when explicitly requested in only', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: 'import { existsSync } from \'fs\';'
@@ -1202,17 +1213,17 @@ existsSync('t');`
         const result = (yield server.codeAction({
             textDocument: doc,
             range: {
-                start: (0, test_utils_1.position)(doc, 'existsSync'),
-                end: (0, test_utils_1.positionAfter)(doc, 'existsSync')
+                start: position(doc, 'existsSync'),
+                end: positionAfter(doc, 'existsSync')
             },
             context: {
                 diagnostics: [],
-                only: [types_1.CodeActionKind.SourceRemoveUnusedTs.value]
+                only: [CodeActionKind.SourceRemoveUnusedTs.value]
             }
         }));
         assert.deepEqual(result, [
             {
-                kind: types_1.CodeActionKind.SourceRemoveUnusedTs.value,
+                kind: CodeActionKind.SourceRemoveUnusedTs.value,
                 title: 'Remove all unused code',
                 edit: {
                     documentChanges: [
@@ -1233,7 +1244,7 @@ existsSync('t');`
                                 }
                             ],
                             textDocument: {
-                                uri: (0, test_utils_1.uri)('bar.ts'),
+                                uri: uri('bar.ts'),
                                 version: 1
                             }
                         }
@@ -1241,10 +1252,10 @@ existsSync('t');`
                 }
             }
         ]);
-    })).timeout(10000);
+    }));
     it('only provides the "source.fixAll" kind if requested in only', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -1264,17 +1275,17 @@ existsSync('t');`
             textDocument: doc,
             range: {
                 start: { line: 0, character: 0 },
-                end: (0, test_utils_1.lastPosition)(doc, '}')
+                end: lastPosition(doc, '}')
             },
             context: {
                 diagnostics: [],
-                only: [types_1.CodeActionKind.SourceFixAllTs.value]
+                only: [CodeActionKind.SourceFixAllTs.value]
             }
         }));
         assert.strictEqual(result.length, 1, JSON.stringify(result, null, 2));
         assert.deepEqual(result, [
             {
-                kind: types_1.CodeActionKind.SourceFixAllTs.value,
+                kind: CodeActionKind.SourceFixAllTs.value,
                 title: 'Fix all',
                 edit: {
                     documentChanges: [
@@ -1295,7 +1306,7 @@ existsSync('t');`
                                 }
                             ],
                             textDocument: {
-                                uri: (0, test_utils_1.uri)('bar.ts'),
+                                uri: uri('bar.ts'),
                                 version: 1
                             }
                         }
@@ -1303,11 +1314,11 @@ existsSync('t');`
                 }
             }
         ]);
-    })).timeout(10000);
+    }));
 });
 describe('executeCommand', () => {
     it('apply refactoring (move to new file)', () => __awaiter(void 0, void 0, void 0, function* () {
-        const fooUri = (0, test_utils_1.uri)('foo.ts');
+        const fooUri = uri('foo.ts');
         const doc = {
             uri: fooUri,
             languageId: 'typescript',
@@ -1320,15 +1331,15 @@ describe('executeCommand', () => {
         const codeActions = (yield server.codeAction({
             textDocument: doc,
             range: {
-                start: (0, test_utils_1.position)(doc, 'newFn'),
-                end: (0, test_utils_1.position)(doc, 'newFn')
+                start: position(doc, 'newFn'),
+                end: position(doc, 'newFn')
             },
             context: {
                 diagnostics: []
             }
         }));
         // Find refactoring code action.
-        const applyRefactoringAction = codeActions.find(action => { var _a; return ((_a = action.command) === null || _a === void 0 ? void 0 : _a.command) === commands_1.Commands.APPLY_REFACTORING; });
+        const applyRefactoringAction = codeActions.find(action => { var _a; return ((_a = action.command) === null || _a === void 0 ? void 0 : _a.command) === Commands.APPLY_REFACTORING; });
         assert.isDefined(applyRefactoringAction);
         // Execute refactoring action.
         yield server.executeCommand({
@@ -1341,10 +1352,10 @@ describe('executeCommand', () => {
         assert.equal(2, Object.keys(changes).length);
         const change1 = changes[fooUri];
         assert.isDefined(change1);
-        const change2 = changes[(0, test_utils_1.uri)('newFn.ts')];
+        const change2 = changes[uri('newFn.ts')];
         assert.isDefined(change2);
         // Clean up file that is created on applying edit.
-        fs.unlink((0, test_utils_1.filePath)('newFn.ts'));
+        fs.unlinkSync(filePath('newFn.ts'));
         assert.deepEqual(change1, [
             {
                 range: {
@@ -1375,12 +1386,12 @@ describe('executeCommand', () => {
                 newText: 'export function newFn(): void { }\n'
             }
         ]);
-    })).timeout(10000);
+    }));
 });
 describe('documentHighlight', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const barDoc = {
-            uri: (0, test_utils_1.uri)('bar.d.ts'),
+            uri: uri('bar.d.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -1393,7 +1404,7 @@ describe('documentHighlight', () => {
             textDocument: barDoc
         });
         const fooDoc = {
-            uri: (0, test_utils_1.uri)('bar.ts'),
+            uri: uri('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -1407,10 +1418,10 @@ describe('documentHighlight', () => {
         });
         const result = yield server.documentHighlight({
             textDocument: fooDoc,
-            position: (0, test_utils_1.lastPosition)(fooDoc, 'Bar')
+            position: lastPosition(fooDoc, 'Bar')
         });
         assert.equal(2, result.length, JSON.stringify(result, undefined, 2));
-    })).timeout(10000);
+    }));
 });
 describe('calls', () => {
     function resultToString(callsResult, direction) {
@@ -1430,7 +1441,7 @@ describe('calls', () => {
         return out.join('\n');
     }
     const doDoc = {
-        uri: (0, test_utils_1.uri)('do.ts'),
+        uri: uri('do.ts'),
         languageId: 'typescript',
         version: 1,
         text: `
@@ -1448,7 +1459,7 @@ export function three() {
 `
     };
     const fooDoc = {
-        uri: (0, test_utils_1.uri)('foo.ts'),
+        uri: uri('foo.ts'),
         languageId: 'typescript',
         version: 1,
         text: `import { doStuff } from './do';
@@ -1465,18 +1476,14 @@ export function factory() {
 `
     };
     function openDocuments() {
-        server.didOpenTextDocument({
-            textDocument: doDoc
-        });
-        server.didOpenTextDocument({
-            textDocument: fooDoc
-        });
+        server.didOpenTextDocument({ textDocument: doDoc });
+        server.didOpenTextDocument({ textDocument: fooDoc });
     }
     it('callers: first step', () => __awaiter(void 0, void 0, void 0, function* () {
         openDocuments();
         const callsResult = yield server.calls({
             textDocument: fooDoc,
-            position: lsp.Position.create(3, 9)
+            position: position(fooDoc, 'doStuff();')
         });
         assert.equal(resultToString(callsResult, lspcalls.CallDirection.Incoming), `
 ↘ doStuff (do.ts#1)
@@ -1484,61 +1491,72 @@ export function factory() {
   ↘ doSomething (foo.ts#2) - foo.ts#3
   ↘ x (foo.ts#4) - foo.ts#4
             `.trim());
-    })).timeout(10000);
+    }));
     it('callers: second step', () => __awaiter(void 0, void 0, void 0, function* () {
         openDocuments();
         const callsResult = yield server.calls({
             textDocument: fooDoc,
-            position: lsp.Position.create(2, 5)
+            position: position(fooDoc, 'doSomething() {')
         });
         assert.equal(resultToString(callsResult, lspcalls.CallDirection.Incoming), `
 ↘ doSomething (foo.ts#2)
   ↘ factory (foo.ts#8) - foo.ts#9
             `.trim());
-    })).timeout(10000);
-    it('callees: first step', () => __awaiter(void 0, void 0, void 0, function* () {
+    }));
+    it.skip('callees: first step', () => __awaiter(void 0, void 0, void 0, function* () {
         openDocuments();
         const direction = lspcalls.CallDirection.Outgoing;
         const callsResult = yield server.calls({
             direction,
             textDocument: fooDoc,
-            position: lsp.Position.create(3, 9)
+            position: position(fooDoc, 'doStuff()')
         });
         assert.equal(resultToString(callsResult, direction), `
 ↖ doStuff (do.ts#1)
   ↖ two (do.ts#4) - do.ts#2
             `.trim());
-    })).timeout(10000);
-    it('callees: second step', () => __awaiter(void 0, void 0, void 0, function* () {
+    }));
+    it.skip('callees: second step', () => __awaiter(void 0, void 0, void 0, function* () {
         openDocuments();
         const direction = lspcalls.CallDirection.Outgoing;
         const callsResult = yield server.calls({
             direction,
             textDocument: doDoc,
-            position: lsp.Position.create(4, 17)
+            position: position(doDoc, 'function two()')
         });
         assert.equal(resultToString(callsResult, direction), `
 ↖ two (do.ts#4)
   ↖ three (do.ts#9) - do.ts#5
   ↖ ttt (do.ts#6) - do.ts#7
             `.trim());
-    })).timeout(10000);
+    }));
 });
 describe('diagnostics (no client support)', () => {
+    let localServer;
     before(() => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         // Remove the "textDocument.publishDiagnostics" client capability.
-        const clientCapabilitiesOverride = (0, test_utils_1.getDefaultClientCapabilities)();
+        const clientCapabilitiesOverride = getDefaultClientCapabilities();
         (_a = clientCapabilitiesOverride.textDocument) === null || _a === void 0 ? true : delete _a.publishDiagnostics;
-        server = yield (0, test_utils_1.createServer)({
+        localServer = yield createServer({
             rootUri: null,
             publishDiagnostics: args => diagnostics.set(args.uri, args),
             clientCapabilitiesOverride
         });
     }));
+    beforeEach(() => {
+        localServer.closeAll();
+        // "closeAll" triggers final publishDiagnostics with an empty list so clear last.
+        diagnostics.clear();
+        localServer.workspaceEdits = [];
+    });
+    after(() => {
+        localServer.closeAll();
+        localServer.shutdown();
+    });
     it('diagnostics are published', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('diagnosticsBar.ts'),
+            uri: uri('diagnosticsBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -1547,78 +1565,77 @@ describe('diagnostics (no client support)', () => {
         }
       `
         };
-        server.didOpenTextDocument({
+        localServer.didOpenTextDocument({
             textDocument: doc
         });
-        yield server.requestDiagnostics();
+        yield localServer.requestDiagnostics();
         yield new Promise(resolve => setTimeout(resolve, 200));
         const resultsForFile = diagnostics.get(doc.uri);
         assert.isDefined(resultsForFile);
         assert.strictEqual(resultsForFile === null || resultsForFile === void 0 ? void 0 : resultsForFile.diagnostics.length, 1);
-    })).timeout(10000);
+    }));
 });
 describe('jsx/tsx project', () => {
+    let localServer;
     before(() => __awaiter(void 0, void 0, void 0, function* () {
-        server = yield (0, test_utils_1.createServer)({
-            rootUri: (0, test_utils_1.uri)('jsx'),
+        localServer = yield createServer({
+            rootUri: uri('jsx'),
             publishDiagnostics: args => diagnostics.set(args.uri, args)
         });
     }));
+    beforeEach(() => {
+        localServer.closeAll();
+        // "closeAll" triggers final publishDiagnostics with an empty list so clear last.
+        diagnostics.clear();
+        localServer.workspaceEdits = [];
+    });
+    after(() => {
+        localServer.closeAll();
+        localServer.shutdown();
+    });
     it('includes snippet completion for element prop', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('jsx', 'app.tsx'),
+            uri: uri('jsx', 'app.tsx'),
             languageId: 'typescriptreact',
             version: 1,
-            text: (0, test_utils_1.readContents)((0, test_utils_1.filePath)('jsx', 'app.tsx'))
+            text: readContents(filePath('jsx', 'app.tsx'))
         };
-        server.didOpenTextDocument({
+        localServer.didOpenTextDocument({
             textDocument: doc
         });
-        const completion = yield server.completion({ textDocument: doc, position: (0, test_utils_1.position)(doc, 'title') });
+        const completion = yield localServer.completion({ textDocument: doc, position: position(doc, 'title') });
         assert.isNotNull(completion);
         const item = completion.items.find(i => i.label === 'title');
         assert.isDefined(item);
         assert.strictEqual(item === null || item === void 0 ? void 0 : item.insertTextFormat, 2);
-    })).timeout(10000);
+    }));
 });
 describe('inlayHints', () => {
-    it('inlayHints', () => __awaiter(void 0, void 0, void 0, function* () {
-        const doc = {
-            uri: (0, test_utils_1.uri)('module.ts'),
-            languageId: 'typescript',
-            version: 1,
-            text: `
-        export function foo() {
-          return 3
-        }
-      `
-        };
-        yield server.initialize({
-            initializationOptions: {
-                preferences: {
-                    includeInlayFunctionLikeReturnTypeHints: true
+    before(() => __awaiter(void 0, void 0, void 0, function* () {
+        server.didChangeConfiguration({
+            settings: {
+                typescript: {
+                    inlayHints: {
+                        includeInlayFunctionLikeReturnTypeHints: true
+                    }
                 }
-            },
-            processId: null,
-            capabilities: (0, test_utils_1.getDefaultClientCapabilities)(),
-            workspaceFolders: [],
-            rootUri: ''
-        });
-        server.didOpenTextDocument({
-            textDocument: doc
+            }
         });
-        const { inlayHints } = yield server.inlayHints({
-            textDocument: doc
+    }));
+    after(() => {
+        server.didChangeConfiguration({
+            settings: {
+                typescript: {
+                    inlayHints: {
+                        includeInlayFunctionLikeReturnTypeHints: false
+                    }
+                }
+            }
         });
-        assert.isDefined(inlayHints);
-        assert.strictEqual(inlayHints.length, 1);
-        assert.strictEqual(inlayHints[0].text, ': number');
-        assert.strictEqual(inlayHints[0].kind, 'Type');
-        assert.deepStrictEqual(inlayHints[0].position, { line: 1, character: 29 });
-    })).timeout(10000);
-    it('inlayHints options set through workspace configuration ', () => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    it('inlayHints', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: (0, test_utils_1.uri)('module.ts'),
+            uri: uri('module.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -1627,32 +1644,13 @@ describe('inlayHints', () => {
         }
       `
         };
-        yield server.initialize({
-            processId: null,
-            capabilities: (0, test_utils_1.getDefaultClientCapabilities)(),
-            workspaceFolders: [],
-            rootUri: ''
-        });
-        server.didChangeConfiguration({
-            settings: {
-                typescript: {
-                    inlayHints: {
-                        includeInlayFunctionLikeReturnTypeHints: true
-                    }
-                }
-            }
-        });
-        server.didOpenTextDocument({
-            textDocument: doc
-        });
-        const { inlayHints } = yield server.inlayHints({
-            textDocument: doc
-        });
+        server.didOpenTextDocument({ textDocument: doc });
+        const { inlayHints } = yield server.inlayHints({ textDocument: doc });
         assert.isDefined(inlayHints);
         assert.strictEqual(inlayHints.length, 1);
         assert.strictEqual(inlayHints[0].text, ': number');
         assert.strictEqual(inlayHints[0].kind, 'Type');
         assert.deepStrictEqual(inlayHints[0].position, { line: 1, character: 29 });
-    })).timeout(10000);
+    }));
 });
 //# sourceMappingURL=lsp-server.spec.js.map