Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pick up ts 2.1.4 (#18061)

Browse Source
This commit is contained in:
Matt Bierner
2017-01-05 12:30:42 -08:00
committed by GitHub
parent 94f30c3e8b
commit 97ba3fddce
8 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/typescript/src/features/codeActionProvider.ts
View File

@@ -46,7 +46,7 @@ export default class TypeScriptCodeActionProvider implements CodeActionProvider
public provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): Thenable<Command[]> {
const file = this.client.asAbsolutePath(document.uri);
if (!file) {
return Promise.resolve(null);
return Promise.resolve<Command[]>([]);
}
const source: Source = {
@@ -99,7 +99,7 @@ export default class TypeScriptCodeActionProvider implements CodeActionProvider
private onCodeAction(source: Source, workspaceEdit: WorkspaceEdit) {
workspace.applyEdit(workspaceEdit).then(success => {
if (!success) {
return Promise.reject(null);
return Promise.reject<boolean>(false);
}
// TODO: Workaround for https://github.com/Microsoft/TypeScript/issues/12249
// apply formatting to the source range until TS returns formatted results

2
extensions/typescript/src/features/completionItemProvider.ts
View File

@@ -119,7 +119,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
public provideCompletionItems(document: TextDocument, position: Position, token: CancellationToken): Promise<CompletionItem[]> {
if (this.typingsStatus.isAcquiringTypings) {
return Promise.reject({
return Promise.reject<CompletionItem[]>({
label: localize('acquiringTypingsLabel', 'Acquiring typings...'),
detail: localize('acquiringTypingsDetail', 'Acquiring typings definitions for IntelliSense.')
});