mirror of
https://github.com/microsoft/vscode.git
synced 2026-05-08 09:08:48 +01:00
Pick up TS 2.5.1 insiders
This commit is contained in:
Generated
+3
-3
@@ -3,9 +3,9 @@
|
||||
"version": "0.0.1",
|
||||
"dependencies": {
|
||||
"typescript": {
|
||||
"version": "2.4.2",
|
||||
"from": "typescript@2.4.2",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz"
|
||||
"version": "2.5.1-insiders.20170818",
|
||||
"from": "typescript@2.5.1-insiders.20170818",
|
||||
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.1-insiders.20170818.tgz"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"version": "0.0.1",
|
||||
"description": "Dependencies shared by all extensions",
|
||||
"dependencies": {
|
||||
"typescript": "2.4.2"
|
||||
"typescript": "2.5.1-insiders.20170818"
|
||||
},
|
||||
"scripts": {
|
||||
"postinstall": "node ./postinstall"
|
||||
|
||||
@@ -278,7 +278,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
|
||||
// Don't complete function calls inside of destructive assigments or imports
|
||||
return this.client.execute('quickinfo', args).then(infoResponse => {
|
||||
const info = infoResponse.body;
|
||||
switch (info && info.kind) {
|
||||
switch (info && info.kind as string) {
|
||||
case 'var':
|
||||
case 'let':
|
||||
case 'const':
|
||||
|
||||
@@ -71,7 +71,7 @@ export default class TypeScriptDocumentSymbolProvider implements DocumentSymbolP
|
||||
let key = `${realIndent}|${item.text}`;
|
||||
if (realIndent !== 0 && !foldingMap[key] && TypeScriptDocumentSymbolProvider.shouldInclueEntry(item.text)) {
|
||||
let result = new SymbolInformation(item.text,
|
||||
outlineTypeTable[item.kind] || SymbolKind.Variable,
|
||||
outlineTypeTable[item.kind as string] || SymbolKind.Variable,
|
||||
containerLabel ? containerLabel : '',
|
||||
new Location(resource, textSpan2Range(item.spans[0])));
|
||||
foldingMap[key] = result;
|
||||
@@ -86,7 +86,7 @@ export default class TypeScriptDocumentSymbolProvider implements DocumentSymbolP
|
||||
|
||||
private static convertNavTree(resource: Uri, bucket: SymbolInformation[], item: Proto.NavigationTree, containerLabel?: string): void {
|
||||
const result = new SymbolInformation(item.text,
|
||||
outlineTypeTable[item.kind] || SymbolKind.Variable,
|
||||
outlineTypeTable[item.kind as string] || SymbolKind.Variable,
|
||||
containerLabel ? containerLabel : '',
|
||||
new Location(resource, textSpan2Range(item.spans[0]))
|
||||
);
|
||||
|
||||
@@ -501,12 +501,12 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
|
||||
}
|
||||
|
||||
const compilerOptions: Proto.ExternalProjectCompilerOptions = {
|
||||
module: 'CommonJS',
|
||||
target: 'ES6',
|
||||
module: Proto.ModuleKind.CommonJS,
|
||||
target: Proto.ScriptTarget.ES6,
|
||||
allowSyntheticDefaultImports: true,
|
||||
allowNonTsExtensions: true,
|
||||
allowJs: true,
|
||||
jsx: 'Preserve'
|
||||
jsx: Proto.JsxEmit.Preserve
|
||||
};
|
||||
|
||||
if (this.apiVersion.has230Features()) {
|
||||
|
||||
Reference in New Issue
Block a user