typescript-language-server 0.6.2 → 0.7.0

package/lib/lsp-server.spec.js

@@ -39,11 +39,12 @@ 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 assert = chai.assert;
 const diagnostics = new Map();
 let server;
 before(() => __awaiter(void 0, void 0, void 0, function* () {
-    server = yield test_utils_1.createServer({
+    server = yield (0, test_utils_1.createServer)({
         rootUri: null,
         publishDiagnostics: args => diagnostics.set(args.uri, args)
     });
@@ -59,7 +60,7 @@ after(() => {
 describe('completion', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -71,7 +72,7 @@ describe('completion', () => {
         server.didOpenTextDocument({
             textDocument: doc
         });
-        const pos = test_utils_1.position(doc, 'console');
+        const pos = (0, test_utils_1.position)(doc, 'console');
         const proposals = yield server.completion({ textDocument: doc, position: pos });
         assert.isNotNull(proposals);
         assert.isAtLeast(proposals.items.length, 800);
@@ -84,7 +85,7 @@ describe('completion', () => {
     })).timeout(10000);
     it('simple JS test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.js'),
+            uri: (0, test_utils_1.uri)('bar.js'),
             languageId: 'javascript',
             version: 1,
             text: `
@@ -96,7 +97,7 @@ describe('completion', () => {
         server.didOpenTextDocument({
             textDocument: doc
         });
-        const pos = test_utils_1.position(doc, 'console');
+        const pos = (0, test_utils_1.position)(doc, 'console');
         const proposals = yield server.completion({ textDocument: doc, position: pos });
         assert.isNotNull(proposals);
         assert.isAtLeast(proposals.items.length, 800);
@@ -117,7 +118,7 @@ describe('completion', () => {
     })).timeout(10000);
     it('deprecated by JSDoc', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -135,7 +136,7 @@ describe('completion', () => {
         server.didOpenTextDocument({
             textDocument: doc
         });
-        const pos = test_utils_1.position(doc, 'foo(); // call me');
+        const pos = (0, test_utils_1.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');
@@ -148,7 +149,7 @@ describe('completion', () => {
     })).timeout(10000);
     it('incorrect source location', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -160,20 +161,20 @@ describe('completion', () => {
         server.didOpenTextDocument({
             textDocument: doc
         });
-        const pos = test_utils_1.position(doc, 'foo');
+        const pos = (0, test_utils_1.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: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: 'pathex'
         };
         server.didOpenTextDocument({ textDocument: doc });
-        const proposals = yield server.completion({ textDocument: doc, position: test_utils_1.position(doc, 'ex') });
+        const proposals = yield server.completion({ textDocument: doc, position: (0, test_utils_1.position)(doc, 'ex') });
         assert.isNotNull(proposals);
         const pathExistsCompletion = proposals.items.find(completion => completion.label === 'pathExists');
         assert.isDefined(pathExistsCompletion);
@@ -181,7 +182,7 @@ describe('completion', () => {
     })).timeout(10000);
     it('includes completions with invalid identifier names', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -194,7 +195,7 @@ describe('completion', () => {
             `
         };
         server.didOpenTextDocument({ textDocument: doc });
-        const proposals = yield server.completion({ textDocument: doc, position: test_utils_1.positionAfter(doc, '.i') });
+        const proposals = yield server.completion({ textDocument: doc, position: (0, test_utils_1.positionAfter)(doc, '.i') });
         assert.isNotNull(proposals);
         const completion = proposals.items.find(completion => completion.label === 'invalid-identifier-name');
         assert.isDefined(completion);
@@ -202,11 +203,57 @@ describe('completion', () => {
         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'),
+            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') });
+        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'),
+            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') });
+        assert.isNotNull(proposals);
+        const completion = proposals.items.find(completion => completion.label === 'readFile');
+        assert.isDefined(completion);
+        const resolvedItem = yield server.completionResolve(completion);
+        assert.deepEqual(resolvedItem.additionalTextEdits, [
+            {
+                newText: 'import { readFile } from "fs";\n\n',
+                range: {
+                    end: {
+                        character: 0,
+                        line: 0
+                    },
+                    start: {
+                        character: 0,
+                        line: 0
+                    }
+                }
+            }
+        ]);
+        server.didCloseTextDocument({ textDocument: doc });
+    })).timeout(10000);
 });
 describe('diagnostics', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('diagnosticsBar.ts'),
+            uri: (0, test_utils_1.uri)('diagnosticsBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -228,7 +275,7 @@ describe('diagnostics', () => {
     })).timeout(10000);
     it('supports diagnostic tags', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('diagnosticsBar.ts'),
+            uri: (0, test_utils_1.uri)('diagnosticsBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -257,7 +304,7 @@ describe('diagnostics', () => {
     })).timeout(10000);
     it('multiple files test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('multipleFileDiagnosticsBar.ts'),
+            uri: (0, test_utils_1.uri)('multipleFileDiagnosticsBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -267,7 +314,7 @@ describe('diagnostics', () => {
 `
         };
         const doc2 = {
-            uri: test_utils_1.uri('multipleFileDiagnosticsFoo.ts'),
+            uri: (0, test_utils_1.uri)('multipleFileDiagnosticsFoo.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -296,7 +343,7 @@ describe('diagnostics', () => {
 describe('document symbol', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -322,7 +369,7 @@ Foo
     })).timeout(10000);
     it('merges interfaces correctly', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -352,7 +399,7 @@ Box
     })).timeout(10000);
     it('duplication test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -409,7 +456,7 @@ function symbolsAsString(symbols, indentation = '') {
 describe('editing', () => {
     it('open and change', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('openAndChangeBar.ts'),
+            uri: (0, test_utils_1.uri)('openAndChangeBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -441,8 +488,42 @@ describe('editing', () => {
         assert.equal("Cannot find name 'missing'.", fileDiagnostics[0].message);
     })).timeout(10000);
 });
+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'),
+            languageId: 'typescript',
+            version: 1,
+            text: `
+                export function foo(): void {
+                  console.log('test')
+                }
+            `
+        };
+        server.didOpenTextDocument({
+            textDocument: doc
+        });
+        server.didChangeConfiguration({
+            settings: {
+                typescript: {
+                    format: {
+                        insertSpaceAfterCommaDelimiter: true
+                    }
+                },
+                javascript: {
+                    format: {
+                        insertSpaceAfterCommaDelimiter: false
+                    }
+                }
+            }
+        });
+        const file = (0, test_utils_1.filePath)('bar.ts');
+        const settings = server.getWorkspacePreferencesForDocument(file);
+        assert.deepEqual(settings, { format: { insertSpaceAfterCommaDelimiter: true } });
+    }));
+});
 describe('formatting', () => {
-    const uriString = test_utils_1.uri('bar.ts');
+    const uriString = (0, test_utils_1.uri)('bar.ts');
     const languageId = 'typescript';
     const version = 1;
     it('full document formatting', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -493,6 +574,32 @@ describe('formatting', () => {
         const result = vscode_languageserver_textdocument_1.TextDocument.applyEdits(vscode_languageserver_textdocument_1.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 = {
+            uri: uriString, languageId, version, text
+        };
+        server.didOpenTextDocument({ textDocument });
+        server.didChangeConfiguration({
+            settings: {
+                typescript: {
+                    format: {
+                        newLineCharacter: '\n',
+                        placeOpenBraceOnNewLineForFunctions: true
+                    }
+                }
+            }
+        });
+        const edits = yield server.documentFormatting({
+            textDocument,
+            options: {
+                tabSize: 4,
+                insertSpaces: false
+            }
+        });
+        const result = vscode_languageserver_textdocument_1.TextDocument.applyEdits(vscode_languageserver_textdocument_1.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 = {
@@ -523,7 +630,7 @@ describe('formatting', () => {
 describe('signatureHelp', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -536,19 +643,19 @@ describe('signatureHelp', () => {
         });
         let result = (yield server.signatureHelp({
             textDocument: doc,
-            position: test_utils_1.position(doc, 'param1')
+            position: (0, test_utils_1.position)(doc, 'param1')
         }));
         assert.equal('bar: string', result.signatures[result.activeSignature].parameters[result.activeParameter].label);
         result = (yield server.signatureHelp({
             textDocument: doc,
-            position: test_utils_1.position(doc, 'param2')
+            position: (0, test_utils_1.position)(doc, 'param2')
         }));
         assert.equal('baz?: boolean', result.signatures[result.activeSignature].parameters[result.activeParameter].label);
     })).timeout(10000);
 });
 describe('code actions', () => {
     const doc = {
-        uri: test_utils_1.uri('bar.ts'),
+        uri: (0, test_utils_1.uri)('bar.ts'),
         languageId: 'typescript',
         version: 1,
         text: `import { something } from "something";
@@ -590,7 +697,7 @@ describe('code actions', () => {
                         documentChanges: [
                             {
                                 textDocument: {
-                                    uri: test_utils_1.uri('bar.ts'),
+                                    uri: (0, test_utils_1.uri)('bar.ts'),
                                     version: 1
                                 },
                                 edits: [
@@ -624,7 +731,7 @@ describe('code actions', () => {
                 command: '_typescript.applyRefactoring',
                 arguments: [
                     {
-                        file: test_utils_1.filePath('bar.ts'),
+                        file: (0, test_utils_1.filePath)('bar.ts'),
                         startLine: 2,
                         startOffset: 26,
                         endLine: 2,
@@ -667,7 +774,7 @@ describe('code actions', () => {
                             action: 'Convert parameters to destructured object',
                             endLine: 2,
                             endOffset: 50,
-                            file: test_utils_1.filePath('bar.ts'),
+                            file: (0, test_utils_1.filePath)('bar.ts'),
                             refactor: 'Convert parameters to destructured object',
                             startLine: 2,
                             startOffset: 26
@@ -681,7 +788,39 @@ describe('code actions', () => {
             }
         ]);
     })).timeout(10000);
+    it('does not provide organize imports when there are errors', () => __awaiter(void 0, void 0, void 0, function* () {
+        server.didOpenTextDocument({
+            textDocument: doc
+        });
+        const result = (yield server.codeAction({
+            textDocument: doc,
+            range: {
+                start: { line: 1, character: 29 },
+                end: { line: 1, character: 53 }
+            },
+            context: {
+                diagnostics: [{
+                        range: {
+                            start: { line: 1, character: 25 },
+                            end: { line: 1, character: 49 }
+                        },
+                        code: 6133,
+                        message: 'unused arg'
+                    }],
+                only: [commands_1.CodeActions.SourceOrganizeImportsTsLs]
+            }
+        }));
+        assert.deepEqual(result, []);
+    })).timeout(10000);
     it('can provide 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'),
+            languageId: 'typescript',
+            version: 1,
+            text: `import { existsSync } from 'fs';
+import { accessSync } from 'fs';
+existsSync('t');`
+        };
         server.didOpenTextDocument({
             textDocument: doc
         });
@@ -700,18 +839,51 @@ describe('code actions', () => {
                         code: 6133,
                         message: 'unused arg'
                     }],
-                only: ['source.organizeImports']
+                only: [commands_1.CodeActions.SourceOrganizeImportsTsLs]
             }
         }));
         assert.deepEqual(result, [
             {
-                command: {
-                    arguments: [test_utils_1.filePath('bar.ts')],
-                    command: '_typescript.organizeImports',
-                    title: ''
-                },
-                kind: 'source.organizeImports',
-                title: 'Organize imports'
+                kind: commands_1.CodeActions.SourceOrganizeImportsTsLs,
+                title: 'Organize imports',
+                edit: {
+                    documentChanges: [
+                        {
+                            edits: [
+                                {
+                                    newText: "import { accessSync, existsSync } from 'fs';\n",
+                                    range: {
+                                        end: {
+                                            character: 0,
+                                            line: 1
+                                        },
+                                        start: {
+                                            character: 0,
+                                            line: 0
+                                        }
+                                    }
+                                },
+                                {
+                                    newText: '',
+                                    range: {
+                                        end: {
+                                            character: 0,
+                                            line: 2
+                                        },
+                                        start: {
+                                            character: 0,
+                                            line: 1
+                                        }
+                                    }
+                                }
+                            ],
+                            textDocument: {
+                                uri: (0, test_utils_1.uri)('bar.ts'),
+                                version: 1
+                            }
+                        }
+                    ]
+                }
             }
         ]);
     })).timeout(10000);
@@ -719,7 +891,7 @@ describe('code actions', () => {
 describe('documentHighlight', () => {
     it('simple test', () => __awaiter(void 0, void 0, void 0, function* () {
         const barDoc = {
-            uri: test_utils_1.uri('bar.d.ts'),
+            uri: (0, test_utils_1.uri)('bar.d.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -732,7 +904,7 @@ describe('documentHighlight', () => {
             textDocument: barDoc
         });
         const fooDoc = {
-            uri: test_utils_1.uri('bar.ts'),
+            uri: (0, test_utils_1.uri)('bar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -746,7 +918,7 @@ describe('documentHighlight', () => {
         });
         const result = yield server.documentHighlight({
             textDocument: fooDoc,
-            position: test_utils_1.lastPosition(fooDoc, 'Bar')
+            position: (0, test_utils_1.lastPosition)(fooDoc, 'Bar')
         });
         assert.equal(2, result.length, JSON.stringify(result, undefined, 2));
     })).timeout(10000);
@@ -769,7 +941,7 @@ describe('calls', () => {
         return out.join('\n');
     }
     const doDoc = {
-        uri: test_utils_1.uri('do.ts'),
+        uri: (0, test_utils_1.uri)('do.ts'),
         languageId: 'typescript',
         version: 1,
         text: `
@@ -787,7 +959,7 @@ export function three() {
 `
     };
     const fooDoc = {
-        uri: test_utils_1.uri('foo.ts'),
+        uri: (0, test_utils_1.uri)('foo.ts'),
         languageId: 'typescript',
         version: 1,
         text: `import { doStuff } from './do';
@@ -866,17 +1038,17 @@ describe('diagnostics (no client support)', () => {
     before(() => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         // Remove the "textDocument.publishDiagnostics" client capability.
-        const clientCapabilitiesOverride = test_utils_1.getDefaultClientCapabilities();
+        const clientCapabilitiesOverride = (0, test_utils_1.getDefaultClientCapabilities)();
         (_a = clientCapabilitiesOverride.textDocument) === null || _a === void 0 ? true : delete _a.publishDiagnostics;
-        server = yield test_utils_1.createServer({
+        server = yield (0, test_utils_1.createServer)({
             rootUri: null,
             publishDiagnostics: args => diagnostics.set(args.uri, args),
             clientCapabilitiesOverride
         });
     }));
-    it('no diagnostics are published', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('diagnostics are published', () => __awaiter(void 0, void 0, void 0, function* () {
         const doc = {
-            uri: test_utils_1.uri('diagnosticsBar.ts'),
+            uri: (0, test_utils_1.uri)('diagnosticsBar.ts'),
             languageId: 'typescript',
             version: 1,
             text: `
@@ -891,7 +1063,82 @@ describe('diagnostics (no client support)', () => {
         yield server.requestDiagnostics();
         yield new Promise(resolve => setTimeout(resolve, 200));
         const resultsForFile = diagnostics.get(doc.uri);
-        assert.isUndefined(resultsForFile, 'Unexpected diagnostics received');
+        assert.isDefined(resultsForFile);
+        assert.strictEqual(resultsForFile === null || resultsForFile === void 0 ? void 0 : resultsForFile.diagnostics.length, 1);
+    })).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
+        }
+      `
+        };
+        server.initialize({
+            initializationOptions: {
+                preferences: {
+                    includeInlayFunctionLikeReturnTypeHints: true
+                }
+            },
+            processId: null,
+            capabilities: (0, test_utils_1.getDefaultClientCapabilities)(),
+            workspaceFolders: [],
+            rootUri: ''
+        });
+        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);
+    it('inlayHints options set through workspace configuration ', () => __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
+        }
+      `
+        };
+        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
+        });
+        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