diff --git a/extensions/typescript/npm-shrinkwrap.json b/extensions/typescript/npm-shrinkwrap.json index 85999a4875c..6d246f83d4e 100644 --- a/extensions/typescript/npm-shrinkwrap.json +++ b/extensions/typescript/npm-shrinkwrap.json @@ -13,7 +13,7 @@ "resolved": "https://registry.npmjs.org/vscode-extension-telemetry/-/vscode-extension-telemetry-0.0.5.tgz" }, "vscode-nls": { - "version": "2.0.0", + "version": "2.0.1", "from": "vscode-nls@>=1.0.4 <2.0.0", "resolved": "https://registry.npmjs.org/vscode-nls/-/vscode-nls-1.0.7.tgz" }, diff --git a/extensions/typescript/package.json b/extensions/typescript/package.json index 380021933e1..ed1d8493bc1 100644 --- a/extensions/typescript/package.json +++ b/extensions/typescript/package.json @@ -12,7 +12,7 @@ }, "dependencies": { "vscode-extension-telemetry": "^0.0.5", - "vscode-nls": "^2.0.0" + "vscode-nls": "^2.0.1" }, "scripts": { "vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../build/gulpfile.extensions.js compile-extension:typescript ./tsconfig.json", diff --git a/extensions/typescript/src/typescriptServiceClient.ts b/extensions/typescript/src/typescriptServiceClient.ts index a0d2ddb4765..3ccb8bfb924 100644 --- a/extensions/typescript/src/typescriptServiceClient.ts +++ b/extensions/typescript/src/typescriptServiceClient.ts @@ -320,8 +320,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient }, { title: localize('neverCheckLocalVesion', 'Never Check for Workspace Version'), - id: MessageAction.neverCheckLocalVersion, - isCloseAffordance: true + id: MessageAction.neverCheckLocalVersion } ).then((selected) => { if (!selected) { @@ -379,6 +378,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient const checkTscVersion = 'check.tscVersion'; if (!globalStateValue) { tsConfig.update(checkTscVersion, false, true); + this.globalState.update(doGlobalVersionCheckKey, true); } if (checkGlobalVersion && tsConfig.get(checkTscVersion)) { let tscVersion: string = undefined; @@ -401,8 +401,7 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient }, { title: localize('doNotCheckAgain', 'Don\'t Check Again'), - id: 2, - isCloseAffordance: true + id: 2 } ).then((selected) => { if (!selected) { diff --git a/package.json b/package.json index 37c755cc039..ac0713f3db3 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "gulp-replace": "^0.5.4", "gulp-shell": "^0.5.2", "gulp-sourcemaps": "^1.6.0", - "gulp-tsb": "^2.0.0", + "gulp-tsb": "^2.0.1", "gulp-tslint": "^4.3.0", "gulp-uglify": "^2.0.0", "gulp-util": "^3.0.6", @@ -88,12 +88,12 @@ "sinon": "^1.17.2", "source-map": "^0.4.4", "tslint": "^3.3.0", - "typescript": "^2.0.2", + "typescript": "^2.0.3", "uglify-js": "2.4.8", "underscore": "^1.8.2", "vinyl": "^0.4.5", "vinyl-fs": "^2.4.3", - "vscode-nls-dev": "^2.0.0" + "vscode-nls-dev": "^2.0.1" }, "repository": { "type": "git", diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index 2615b5447b8..601ad8fc9a3 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -149,23 +149,23 @@ export class ExtHostAPIImplementation { this.Selection = extHostTypes.Selection; this.CancellationTokenSource = CancellationTokenSource; this.Hover = extHostTypes.Hover; - this.SymbolKind = extHostTypes.SymbolKind; - this.SymbolInformation = extHostTypes.SymbolInformation; - this.DocumentHighlightKind = extHostTypes.DocumentHighlightKind; - this.DocumentHighlight = extHostTypes.DocumentHighlight; + this.SymbolKind = extHostTypes.SymbolKind; + this.SymbolInformation = extHostTypes.SymbolInformation; + this.DocumentHighlightKind = extHostTypes.DocumentHighlightKind; + this.DocumentHighlight = extHostTypes.DocumentHighlight; this.CodeLens = extHostTypes.CodeLens; this.ParameterInformation = extHostTypes.ParameterInformation; this.SignatureInformation = extHostTypes.SignatureInformation; this.SignatureHelp = extHostTypes.SignatureHelp; - this.CompletionItem = extHostTypes.CompletionItem; - this.CompletionItemKind = extHostTypes.CompletionItemKind; + this.CompletionItem = extHostTypes.CompletionItem; + this.CompletionItemKind = extHostTypes.CompletionItemKind; this.CompletionList = extHostTypes.CompletionList; this.DocumentLink = extHostTypes.DocumentLink; this.ViewColumn = extHostTypes.ViewColumn; - this.StatusBarAlignment = extHostTypes.StatusBarAlignment; - this.IndentAction = Modes.IndentAction; + this.StatusBarAlignment = extHostTypes.StatusBarAlignment; + this.IndentAction = Modes.IndentAction; this.OverviewRulerLane = EditorCommon.OverviewRulerLane; - this.TextEditorRevealType = extHostTypes.TextEditorRevealType; + this.TextEditorRevealType = extHostTypes.TextEditorRevealType; this.EndOfLine = extHostTypes.EndOfLine; this.TextEditorCursorStyle = EditorCommon.TextEditorCursorStyle; this.TextEditorSelectionChangeKind = extHostTypes.TextEditorSelectionChangeKind; diff --git a/src/vs/workbench/api/node/extHostApiCommands.ts b/src/vs/workbench/api/node/extHostApiCommands.ts index 62084d1a085..47dc9dc80f1 100644 --- a/src/vs/workbench/api/node/extHostApiCommands.ts +++ b/src/vs/workbench/api/node/extHostApiCommands.ts @@ -350,7 +350,7 @@ class ExtHostApiCommands { incomplete = item.container.incomplete || incomplete; items.push(typeConverters.Suggest.to(item.container, position, item.suggestion)); } - return new types.CompletionList(items, incomplete); + return new types.CompletionList(items, incomplete); } }); } diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index 048d4738bd7..3581d60e8e0 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -243,7 +243,7 @@ class DocumentHighlightAdapter { private static _convertDocumentHighlight(documentHighlight: vscode.DocumentHighlight): modes.DocumentHighlight { return { range: TypeConverters.fromRange(documentHighlight.range), - kind: documentHighlight.kind + kind: documentHighlight.kind }; } } @@ -583,8 +583,8 @@ class SuggestAdapter { if (!item) { return TPromise.as(suggestion); } - return asWinJsPromise(token => this._provider.resolveCompletionItem(item, token)).then(resolvedItem => { - return TypeConverters.Suggest.from(resolvedItem || item, this._disposables[id]); + return asWinJsPromise(token => this._provider.resolveCompletionItem(item, token)).then(resolvedItem => { + return TypeConverters.Suggest.from(resolvedItem || item, this._disposables[id]); }); } } diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts index 4751ac893ec..69f9ad75684 100644 --- a/src/vs/workbench/api/node/extHostTypeConverters.ts +++ b/src/vs/workbench/api/node/extHostTypeConverters.ts @@ -220,7 +220,7 @@ export namespace SymbolInformation { export function toOutlineEntry(symbol: vscode.SymbolInformation): modes.SymbolInformation { return { name: symbol.name, - kind: symbol.kind, + kind: symbol.kind, containerName: symbol.containerName, location: { uri: symbol.location.uri, @@ -317,7 +317,7 @@ export const Suggest = { const suggestion: modes.ISuggestion = { label: item.label, insertText: item.insertText || item.label, - type: CompletionItemKind.from(item.kind), + type: CompletionItemKind.from(item.kind), detail: item.detail, documentation: item.documentation, sortText: item.sortText, diff --git a/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts b/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts index 7f8c7da29f8..0e420335c0a 100644 --- a/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts +++ b/src/vs/workbench/api/node/mainThreadLanguageFeatures.ts @@ -238,10 +238,10 @@ export class MainThreadLanguageFeatures extends MainThreadLanguageFeaturesShape $setLanguageConfiguration(handle: number, languageId: string, configuration: vscode.LanguageConfiguration): TPromise { if (configuration.__characterPairSupport) { - ( configuration).autoClosingPairs = configuration.__characterPairSupport.autoClosingPairs; + ( configuration).autoClosingPairs = configuration.__characterPairSupport.autoClosingPairs; } - this._registrations[handle] = LanguageConfigurationRegistry.register(languageId, configuration); + this._registrations[handle] = LanguageConfigurationRegistry.register(languageId, configuration); return undefined; }