提交 bf993214 编写于 作者: M Matt Bierner

Pick up new TS insiders

上级 b9459731
......@@ -109,7 +109,7 @@ export function getJavaScriptMode(documentRegions: LanguageModelCache<HTMLDocume
},
doResolve(document: TextDocument, item: CompletionItem): CompletionItem {
updateCurrentTextDocument(document);
let details = jsLanguageService.getCompletionEntryDetails(FILE_NAME, item.data.offset, item.label, undefined, undefined);
let details = jsLanguageService.getCompletionEntryDetails(FILE_NAME, item.data.offset, item.label, undefined, undefined, undefined);
if (details) {
item.detail = ts.displayPartsToString(details.displayParts);
item.documentation = ts.displayPartsToString(details.documentation);
......
......@@ -3,7 +3,7 @@
"version": "0.0.1",
"description": "Dependencies shared by all extensions",
"dependencies": {
"typescript": "2.8.3"
"typescript": "2.9.0-insiders.20180503"
},
"scripts": {
"postinstall": "node ./postinstall"
......
......@@ -9,9 +9,6 @@ import * as Proto from '../protocol';
import { ITypeScriptServiceClient } from '../typescriptService';
import * as languageIds from '../utils/languageModeIds';
// TODO: for TS 2.8
type UserPreferences = any;
function objsAreEqual<T>(a: T, b: T): boolean {
let keys = Object.keys(a);
for (let i = 0; i < keys.length; i++) {
......@@ -25,7 +22,7 @@ function objsAreEqual<T>(a: T, b: T): boolean {
interface FileConfiguration {
formatOptions: Proto.FormatCodeSettings;
preferences: UserPreferences;
preferences: Proto.UserPreferences;
}
function areFileConfigurationsEqual(a: FileConfiguration, b: FileConfiguration): boolean {
......@@ -146,7 +143,7 @@ export default class FileConfigurationManager {
};
}
private getPreferences(document: TextDocument): UserPreferences {
private getPreferences(document: TextDocument): Proto.UserPreferences {
if (!this.client.apiVersion.has290Features()) {
return {};
}
......
......@@ -201,16 +201,16 @@ export default class TypeScriptQuickFixProvider implements vscode.CodeActionProv
document: vscode.TextDocument,
file: string,
diagnostic: vscode.Diagnostic,
tsAction: Proto.CodeFixAction
tsAction: Proto.CodeAction
): Promise<Iterable<vscode.CodeAction>> {
const singleFix = this.getSingleFixForTsCodeAction(diagnostic, tsAction);
const fixAll = await this.getFixAllForTsCodeAction(document, file, diagnostic, tsAction);
const fixAll = await this.getFixAllForTsCodeAction(document, file, diagnostic, tsAction as Proto.CodeFixAction);
return fixAll ? [singleFix, fixAll] : [singleFix];
}
private getSingleFixForTsCodeAction(
diagnostic: vscode.Diagnostic,
tsAction: Proto.CodeFixAction
tsAction: Proto.CodeAction
): vscode.CodeAction {
const codeAction = new vscode.CodeAction(tsAction.description, vscode.CodeActionKind.QuickFix);
codeAction.edit = getEditForCodeAction(this.client, tsAction);
......
......@@ -2,6 +2,6 @@
# yarn lockfile v1
typescript@2.8.3:
version "2.8.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
typescript@2.9.0-insiders.20180503:
version "2.9.0-insiders.20180503"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.0-insiders.20180503.tgz#dc5363403e7b384ad85b1a74a96412c36ea238a4"
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册