development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 21:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pick up new TS insiders

Browse source
This commit is contained in:
Matt Bierner 2018-05-03 16:51:46 -07:00
parent b9459731b0
commit bf99321408
5 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/html-language-features/server/src/modes/javascriptMode.ts
View file

@ -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);

2
extensions/package.json
View file

@ -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"

7
extensions/typescript-language-features/src/features/fileConfigurationManager.ts
View file

@ -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 {};
}

6
extensions/typescript-language-features/src/features/quickFixProvider.ts
View file

@ -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);

6
extensions/yarn.lock
View file

@ -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"