Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit da09421

Browse files
committed
chore(package): upgrade to typescript 2.6.2
1 parent 982bf69 commit da09421

File tree

2 files changed

+26
-23
lines changed

2 files changed

+26
-23
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"rxjs": "^5.5.0",
5252
"semaphore-async-await": "^1.5.1",
5353
"string-similarity": "^1.1.0",
54-
"typescript": "2.4.2",
54+
"typescript": "~2.6.2",
5555
"vscode-jsonrpc": "^3.3.1",
5656
"vscode-languageserver": "^3.1.0",
5757
"vscode-languageserver-types": "^3.0.3"

src/typescript-service.ts

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -100,25 +100,25 @@ export interface Settings extends PluginSettings {
100100
/**
101101
* Maps string-based CompletionEntry::kind to enum-based CompletionItemKind
102102
*/
103-
const completionKinds: { [name: string]: CompletionItemKind } = {
104-
class: CompletionItemKind.Class,
105-
constructor: CompletionItemKind.Constructor,
106-
enum: CompletionItemKind.Enum,
107-
field: CompletionItemKind.Field,
108-
file: CompletionItemKind.File,
109-
function: CompletionItemKind.Function,
110-
interface: CompletionItemKind.Interface,
111-
keyword: CompletionItemKind.Keyword,
112-
method: CompletionItemKind.Method,
113-
module: CompletionItemKind.Module,
114-
property: CompletionItemKind.Property,
115-
reference: CompletionItemKind.Reference,
116-
snippet: CompletionItemKind.Snippet,
117-
text: CompletionItemKind.Text,
118-
unit: CompletionItemKind.Unit,
119-
value: CompletionItemKind.Value,
120-
variable: CompletionItemKind.Variable,
121-
}
103+
const completionKinds = new Map<string, CompletionItemKind>([
104+
[`class`, CompletionItemKind.Class],
105+
[`constructor`, CompletionItemKind.Constructor],
106+
[`enum`, CompletionItemKind.Enum],
107+
[`field`, CompletionItemKind.Field],
108+
[`file`, CompletionItemKind.File],
109+
[`function`, CompletionItemKind.Function],
110+
[`interface`, CompletionItemKind.Interface],
111+
[`keyword`, CompletionItemKind.Keyword],
112+
[`method`, CompletionItemKind.Method],
113+
[`module`, CompletionItemKind.Module],
114+
[`property`, CompletionItemKind.Property],
115+
[`reference`, CompletionItemKind.Reference],
116+
[`snippet`, CompletionItemKind.Snippet],
117+
[`text`, CompletionItemKind.Text],
118+
[`unit`, CompletionItemKind.Unit],
119+
[`value`, CompletionItemKind.Value],
120+
[`variable`, CompletionItemKind.Variable],
121+
])
122122

123123
/**
124124
* Handles incoming requests and return responses. There is a one-to-one-to-one
@@ -1182,7 +1182,7 @@ export class TypeScriptService {
11821182
params.position.line,
11831183
params.position.character
11841184
)
1185-
const completions = configuration.getService().getCompletionsAtPosition(fileName, offset)
1185+
const completions = configuration.getService().getCompletionsAtPosition(fileName, offset, undefined)
11861186

11871187
if (!completions) {
11881188
return []
@@ -1192,7 +1192,7 @@ export class TypeScriptService {
11921192
.map(entry => {
11931193
const item: CompletionItem = { label: entry.name }
11941194

1195-
const kind = completionKinds[entry.kind]
1195+
const kind = completionKinds.get(entry.kind)
11961196
if (kind) {
11971197
item.kind = kind
11981198
}
@@ -1233,7 +1233,10 @@ export class TypeScriptService {
12331233
const configuration = this.projectManager.getConfiguration(fileName)
12341234
configuration.ensureBasicFiles(span)
12351235

1236-
const details = configuration.getService().getCompletionEntryDetails(fileName, offset, entryName)
1236+
const details = configuration
1237+
.getService()
1238+
.getCompletionEntryDetails(fileName, offset, entryName, undefined, undefined)
1239+
12371240
if (details) {
12381241
item.documentation = ts.displayPartsToString(details.documentation)
12391242
item.detail = ts.displayPartsToString(details.displayParts)

0 commit comments

Comments
 (0)