From c3c1e8d7e7d6f526adc0a6affe97738442182b02 Mon Sep 17 00:00:00 2001 From: Willems Date: Fri, 10 Aug 2018 10:37:42 +0200 Subject: [PATCH] feat(TypeScript3): Upgrade the TypeScript dependency to 3.0.1. --- package-lock.json | 25 ++++++++++++++++++------- package.json | 6 +++--- src/test/typescript-service-helpers.ts | 21 +++++---------------- src/typescript-service.ts | 21 +++++++++++---------- 4 files changed, 37 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4403f449e..b9f9f7a8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7386,9 +7386,9 @@ "dev": true }, "tslint": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.10.0.tgz", - "integrity": "sha1-EeJrzLiK+gLdDZlWyuPUVAtfVMM=", + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz", + "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=", "dev": true, "requires": { "babel-code-frame": "^6.22.0", @@ -7402,7 +7402,18 @@ "resolve": "^1.3.2", "semver": "^5.3.0", "tslib": "^1.8.0", - "tsutils": "^2.12.1" + "tsutils": "^2.27.2" + }, + "dependencies": { + "tsutils": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + } } }, "tslint-config-prettier": { @@ -7450,9 +7461,9 @@ "dev": true }, "typescript": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz", - "integrity": "sha512-K7g15Bb6Ra4lKf7Iq2l/I5/En+hLIHmxWZGq3D4DIRNFxMNV6j2SHSvDOqs2tGd4UvD/fJvrwopzQXjLrT7Itw==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz", + "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==" }, "uglify-js": { "version": "2.8.29", diff --git a/package.json b/package.json index ea8435273..cea4ce9f3 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "rxjs": "^5.5.0", "semaphore-async-await": "^1.5.1", "string-similarity": "^1.1.0", - "typescript": "2.8.3", + "typescript": "3.0.1", "vscode-jsonrpc": "^3.3.1", "vscode-languageserver": "^4.2.1", "vscode-languageserver-types": "^3.0.3" @@ -82,8 +82,8 @@ "sinon": "^5.0.0", "source-map-support": "^0.5.0", "temp": "^0.8.3", - "tslint": "^5.8.0", - "tslint-language-service": "^0.9.6", + "tslint": "^5.11.0", + "tslint-language-service": "^0.9.9", "validate-commit-msg": "^2.12.2" }, "bin": { diff --git a/src/test/typescript-service-helpers.ts b/src/test/typescript-service-helpers.ts index 36458c42d..3377b3342 100644 --- a/src/test/typescript-service-helpers.ts +++ b/src/test/typescript-service-helpers.ts @@ -2325,18 +2325,7 @@ export function describeTypeScriptService( ' readonly COMMENT_NODE: number;', ' readonly DOCUMENT_FRAGMENT_NODE: number;', ' readonly DOCUMENT_NODE: number;', - ' readonly DOCUMENT_POSITION_CONTAINED_BY: number;', - ' readonly DOCUMENT_POSITION_CONTAINS: number;', - ' readonly DOCUMENT_POSITION_DISCONNECTED: number;', - ' readonly DOCUMENT_POSITION_FOLLOWING: number;', - ' readonly DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number;', - ' readonly DOCUMENT_POSITION_PRECEDING: number;', - ' readonly DOCUMENT_TYPE_NODE: number;', - ' readonly ELEMENT_NODE: number;', - ' readonly ENTITY_NODE: number;', - ' readonly ENTITY_REFERENCE_NODE: number;', - ' readonly NOTATION_NODE: number;', - ' readonly PROCESSING_INSTRUCTION_NODE: number;', + ' ... 12 more ...;', ' readonly TEXT_NODE: number;', '}', ].join('\n'), @@ -2367,11 +2356,11 @@ export function describeTypeScriptService( uri: 'git://github.com/Microsoft/TypeScript?v' + ts.version + '#lib/lib.dom.d.ts', range: { start: { - line: 9378, + line: 10275, character: 10, }, end: { - line: 9378, + line: 10275, character: 14, }, }, @@ -2380,11 +2369,11 @@ export function describeTypeScriptService( uri: 'git://github.com/Microsoft/TypeScript?v' + ts.version + '#lib/lib.dom.d.ts', range: { start: { - line: 9429, + line: 10326, character: 12, }, end: { - line: 9429, + line: 10326, character: 16, }, }, diff --git a/src/typescript-service.ts b/src/typescript-service.ts index 841d1ef28..38a14267a 100644 --- a/src/typescript-service.ts +++ b/src/typescript-service.ts @@ -1252,7 +1252,7 @@ export class TypeScriptService { const details = configuration .getService() - .getCompletionEntryDetails(fileName, offset, entryName, undefined, undefined) + .getCompletionEntryDetails(fileName, offset, entryName, undefined, undefined, undefined) if (details) { item.documentation = ts.displayPartsToString(details.documentation) @@ -1307,9 +1307,9 @@ export class TypeScriptService { params.position.character ) - const signatures: ts.SignatureHelpItems = configuration + const signatures: ts.SignatureHelpItems | undefined = configuration .getService() - .getSignatureHelpItems(filePath, offset) + .getSignatureHelpItems(filePath, offset, undefined) if (!signatures) { return { signatures: [], activeParameter: 0, activeSignature: 0 } } @@ -1382,7 +1382,7 @@ export class TypeScriptService { return ( configuration .getService() - .getCodeFixesAtPosition(filePath, start, end, errorCodes, this.settings.format || {}) || [] + .getCodeFixesAtPosition(filePath, start, end, errorCodes, this.settings.format || {}, {}) || [] ) }) .map((action: ts.CodeAction): Operation => ({ @@ -1496,7 +1496,7 @@ export class TypeScriptService { } return Observable.from( - configuration.getService().findRenameLocations(filePath, position, false, true) + configuration.getService().findRenameLocations(filePath, position, false, true) || [] ).map((location: ts.RenameLocation): [string, TextEdit] => { const sourceFile = this._getSourceFile(configuration, location.fileName, span) if (!sourceFile) { @@ -1585,12 +1585,13 @@ export class TypeScriptService { const tsDiagnostics = config .getService() .getSyntacticDiagnostics(fileName) - .concat(config.getService().getSemanticDiagnostics(fileName)) + .concat( + config + .getService() + .getSemanticDiagnostics(fileName) + .filter((e): e is ts.DiagnosticWithLocation => !!e.file) + ) const diagnostics = iterate(tsDiagnostics) - // TS can report diagnostics without a file and range in some cases - // These cannot be represented as LSP Diagnostics since the range and URI is required - // https://github.com/Microsoft/TypeScript/issues/15666 - .filter(diagnostic => !!diagnostic.file) .map(convertTsDiagnostic) .toArray() this.client.textDocumentPublishDiagnostics({ uri, diagnostics })