From 0f75c37a3925c1ed1bd50040c57efa7a9af50499 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 5 Dec 2017 15:59:11 -0800 Subject: [PATCH 1/5] chore(package): update prettier to version 1.9.1 (#416) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94ab9a7d4..ea0c8924f 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "husky": "^0.14.0", "mocha": "^4.0.0", "nyc": "^11.0.2", - "prettier": "1.9.0", + "prettier": "1.9.1", "rimraf": "^2.6.1", "semantic-release": "^10.0.1", "sinon": "^4.0.0", From c7d701b3f496f0cc9bbe244f47931c7b59518e29 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Fri, 22 Dec 2017 10:14:07 -0800 Subject: [PATCH 2/5] chore: remove bundled @semantic-release plugins --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index ea0c8924f..00310b53e 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,6 @@ "vscode-languageserver-types": "^3.0.3" }, "devDependencies": { - "@semantic-release/npm": "^2.0.0", - "@semantic-release/github": "^2.0.0", "@sourcegraph/prettierrc": "^2.0.0", "@sourcegraph/tsconfig": "^1.0.0", "@sourcegraph/tslint-config": "^9.0.2", From 5f7d2d81112896889e4c06ed0b96b8d271c024f0 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 18 Jan 2018 06:57:18 +0000 Subject: [PATCH 3/5] chore(package): update mocha to version 5.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 00310b53e..8f6ffcb84 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "commitizen": "^2.9.6", "cz-conventional-changelog": "^2.0.0", "husky": "^0.14.0", - "mocha": "^4.0.0", + "mocha": "^5.0.0", "nyc": "^11.0.2", "prettier": "1.9.1", "rimraf": "^2.6.1", From 982bf69136958eeae621ddaf5cac055bc1e2ec4e Mon Sep 17 00:00:00 2001 From: Beyang Liu Date: Fri, 2 Feb 2018 17:11:54 -0800 Subject: [PATCH 4/5] docs: README: add sublime --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3a99a8e33..7ab0fff58 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ This is a language server for JavaScript and TypeScript that adheres to the [Lan - In [Visual Studio Code](https://github.com/sourcegraph/vscode-javascript-typescript) (as an alternative to the built-in TypeScript integration) - In [Eclipse Che](https://eclipse.org/che/) - In [NeoVim](https://github.com/autozimu/LanguageClient-neovim) + - In [Sublime Text](https://lsp.readthedocs.io/en/latest/#javascripttypescript) ## Features From 2cac6cb67f906e7af7a1a7c850b8145a0ae6eb55 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Fri, 16 Feb 2018 13:04:20 -0800 Subject: [PATCH 5/5] feat(typescript): upgrade to typescript 2.6.2 (#430) --- package.json | 2 +- src/test/typescript-service-helpers.ts | 12 +++---- src/typescript-service.ts | 47 ++++++++++++++------------ 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 8f6ffcb84..bb607251d 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.4.2", + "typescript": "2.6.2", "vscode-jsonrpc": "^3.3.1", "vscode-languageserver": "^3.1.0", "vscode-languageserver-types": "^3.0.3" diff --git a/src/test/typescript-service-helpers.ts b/src/test/typescript-service-helpers.ts index 01813a0fc..8259ce18b 100644 --- a/src/test/typescript-service-helpers.ts +++ b/src/test/typescript-service-helpers.ts @@ -2297,11 +2297,11 @@ export function describeTypeScriptService( uri: 'git://github.com/Microsoft/TypeScript?v' + ts.version + '#lib/lib.dom.d.ts', range: { start: { - line: 8259, + line: 8428, character: 10, }, end: { - line: 8259, + line: 8428, character: 14, }, }, @@ -2310,11 +2310,11 @@ export function describeTypeScriptService( uri: 'git://github.com/Microsoft/TypeScript?v' + ts.version + '#lib/lib.dom.d.ts', range: { start: { - line: 8311, + line: 8480, character: 12, }, end: { - line: 8311, + line: 8480, character: 16, }, }, @@ -3028,7 +3028,7 @@ export function describeTypeScriptService( }, position: { line: 1, - character: 13, + character: 12, }, }) .reduce(applyReducer, null as any) @@ -3039,7 +3039,7 @@ export function describeTypeScriptService( { data: { entryName: 'bar', - offset: 51, + offset: 50, uri: rootUri + 'uses-reference.ts', }, label: 'bar', diff --git a/src/typescript-service.ts b/src/typescript-service.ts index a81bd068a..a6a6378af 100644 --- a/src/typescript-service.ts +++ b/src/typescript-service.ts @@ -100,25 +100,25 @@ export interface Settings extends PluginSettings { /** * Maps string-based CompletionEntry::kind to enum-based CompletionItemKind */ -const completionKinds: { [name: string]: CompletionItemKind } = { - class: CompletionItemKind.Class, - constructor: CompletionItemKind.Constructor, - enum: CompletionItemKind.Enum, - field: CompletionItemKind.Field, - file: CompletionItemKind.File, - function: CompletionItemKind.Function, - interface: CompletionItemKind.Interface, - keyword: CompletionItemKind.Keyword, - method: CompletionItemKind.Method, - module: CompletionItemKind.Module, - property: CompletionItemKind.Property, - reference: CompletionItemKind.Reference, - snippet: CompletionItemKind.Snippet, - text: CompletionItemKind.Text, - unit: CompletionItemKind.Unit, - value: CompletionItemKind.Value, - variable: CompletionItemKind.Variable, -} +const completionKinds = new Map([ + [`class`, CompletionItemKind.Class], + [`constructor`, CompletionItemKind.Constructor], + [`enum`, CompletionItemKind.Enum], + [`field`, CompletionItemKind.Field], + [`file`, CompletionItemKind.File], + [`function`, CompletionItemKind.Function], + [`interface`, CompletionItemKind.Interface], + [`keyword`, CompletionItemKind.Keyword], + [`method`, CompletionItemKind.Method], + [`module`, CompletionItemKind.Module], + [`property`, CompletionItemKind.Property], + [`reference`, CompletionItemKind.Reference], + [`snippet`, CompletionItemKind.Snippet], + [`text`, CompletionItemKind.Text], + [`unit`, CompletionItemKind.Unit], + [`value`, CompletionItemKind.Value], + [`variable`, CompletionItemKind.Variable], +]) /** * Handles incoming requests and return responses. There is a one-to-one-to-one @@ -1182,7 +1182,7 @@ export class TypeScriptService { params.position.line, params.position.character ) - const completions = configuration.getService().getCompletionsAtPosition(fileName, offset) + const completions = configuration.getService().getCompletionsAtPosition(fileName, offset, undefined) if (!completions) { return [] @@ -1192,7 +1192,7 @@ export class TypeScriptService { .map(entry => { const item: CompletionItem = { label: entry.name } - const kind = completionKinds[entry.kind] + const kind = completionKinds.get(entry.kind) if (kind) { item.kind = kind } @@ -1233,7 +1233,10 @@ export class TypeScriptService { const configuration = this.projectManager.getConfiguration(fileName) configuration.ensureBasicFiles(span) - const details = configuration.getService().getCompletionEntryDetails(fileName, offset, entryName) + const details = configuration + .getService() + .getCompletionEntryDetails(fileName, offset, entryName, undefined, undefined) + if (details) { item.documentation = ts.displayPartsToString(details.documentation) item.detail = ts.displayPartsToString(details.displayParts)