From c342eaa22e172e1f51ef42860948e6a010fcfb1e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 1 Feb 2017 17:29:57 -0800 Subject: [PATCH] Adding more explicit returns --- src/vs/base/parts/ipc/test/node/ipc.test.ts | 8 ++++---- src/vs/base/parts/tree/browser/treeDefaults.ts | 2 ++ src/vs/editor/browser/standalone/colorizer.ts | 2 +- .../editor/browser/standalone/standaloneLanguages.ts | 4 ++-- src/vs/editor/common/controller/cursor.ts | 5 +++-- src/vs/editor/common/model/modelLine.ts | 1 + src/vs/editor/common/modes/languageSelector.ts | 1 + src/vs/editor/common/modes/snippetsRegistry.ts | 2 +- src/vs/editor/common/services/bulkEdit.ts | 1 + .../editor/common/services/editorWorkerServiceImpl.ts | 1 + src/vs/editor/common/viewModel/splitLinesCollection.ts | 2 +- src/vs/editor/contrib/format/common/format.ts | 2 ++ .../contrib/inPlaceReplace/common/inPlaceReplace.ts | 4 ++-- .../editor/contrib/indentation/common/indentation.ts | 8 ++++---- src/vs/editor/contrib/links/common/links.ts | 4 ++-- .../contrib/referenceSearch/browser/referenceSearch.ts | 8 ++++---- .../contrib/referenceSearch/common/referenceSearch.ts | 1 + src/vs/editor/contrib/rename/browser/rename.ts | 5 ++++- src/vs/editor/contrib/rename/common/rename.ts | 2 ++ src/vs/editor/contrib/suggest/common/suggest.ts | 5 +++-- .../contrib/wordHighlighter/common/wordHighlighter.ts | 2 ++ src/vs/editor/test/common/mocks/mockCodeEditor.ts | 2 +- src/vs/editor/test/node/model/modelBuilderAuto.test.ts | 4 +--- src/vs/platform/backup/common/backupIpc.ts | 1 + src/vs/platform/environment/node/argv.ts | 1 + src/vs/platform/environment/node/environmentService.ts | 2 +- .../extensionManagement/common/extensionNls.ts | 4 ++-- src/vs/platform/markers/common/markerService.ts | 1 + src/vs/platform/markers/common/problemMatcher.ts | 1 + src/vs/platform/telemetry/common/telemetryService.ts | 1 + src/vs/platform/telemetry/node/appInsightsAppender.ts | 1 + .../telemetry/node/workbenchCommonProperties.ts | 2 ++ src/vs/workbench/api/node/extHostDiagnostics.ts | 1 + src/vs/workbench/api/node/extHostDocuments.ts | 1 + src/vs/workbench/api/node/extHostExtensionService.ts | 2 ++ src/vs/workbench/api/node/extHostMessageService.ts | 1 + src/vs/workbench/api/node/extHostQuickOpen.ts | 2 ++ src/vs/workbench/api/node/extHostSCM.ts | 1 + src/vs/workbench/api/node/extHostTypeConverters.ts | 3 ++- src/vs/workbench/api/node/extHostTypes.ts | 3 ++- src/vs/workbench/api/node/mainThreadCommands.ts | 2 +- src/vs/workbench/api/node/mainThreadEditors.ts | 8 ++++++-- src/vs/workbench/api/node/mainThreadQuickOpen.ts | 1 + src/vs/workbench/api/node/mainThreadSaveParticipant.ts | 4 +++- src/vs/workbench/browser/actions/configureLocale.ts | 2 +- src/vs/workbench/browser/parts/compositePart.ts | 2 +- .../workbench/browser/parts/editor/sideBySideEditor.ts | 1 + src/vs/workbench/common/actionRegistry.ts | 2 +- src/vs/workbench/node/extensionHostProcess.ts | 1 + src/vs/workbench/parts/debug/browser/debugActions.ts | 1 + .../parts/debug/browser/debugEditorActions.ts | 1 + .../electron-browser/debugConfigurationManager.ts | 2 ++ src/vs/workbench/parts/emmet/node/emmetActions.ts | 3 ++- src/vs/workbench/parts/files/browser/fileActions.ts | 9 +++++++-- .../parts/git/browser/views/changes/changesViewer.ts | 10 ++++++---- src/vs/workbench/parts/git/common/gitModel.ts | 2 ++ .../workbench/parts/html/browser/html.contribution.ts | 2 +- src/vs/workbench/parts/html/browser/htmlPreviewPart.ts | 2 ++ .../parts/output/common/outputLinkComputer.ts | 2 +- .../parts/preferences/browser/preferencesService.ts | 1 + src/vs/workbench/parts/scm/browser/scmPreview.ts | 4 ++-- .../parts/search/browser/searchResultsView.ts | 4 ++++ .../parts/tasks/electron-browser/task.contribution.ts | 5 ++++- .../services/files/node/watcher/unix/watcherIpc.ts | 1 + .../test/electron-browser/quickopen.perf.test.ts | 3 ++- 65 files changed, 124 insertions(+), 55 deletions(-) diff --git a/src/vs/base/parts/ipc/test/node/ipc.test.ts b/src/vs/base/parts/ipc/test/node/ipc.test.ts index 4d9c11b36ba..d010ddbd133 100644 --- a/src/vs/base/parts/ipc/test/node/ipc.test.ts +++ b/src/vs/base/parts/ipc/test/node/ipc.test.ts @@ -25,7 +25,7 @@ suite('IPC', () => { test('createChannel', () => { if (process.env['VSCODE_PID']) { - return; // TODO@Ben find out why test fails when run from within VS Code + return undefined; // TODO@Ben find out why test fails when run from within VS Code } const client = createClient(); @@ -42,7 +42,7 @@ suite('IPC', () => { test('cancellation', () => { if (process.env['VSCODE_PID']) { - return; // TODO@Ben find out why test fails when run from within VS Code + return undefined; // TODO@Ben find out why test fails when run from within VS Code } const client = createClient(); @@ -62,7 +62,7 @@ suite('IPC', () => { test('events', () => { if (process.env['VSCODE_PID']) { - return; // TODO@Ben find out why test fails when run from within VS Code + return undefined; // TODO@Ben find out why test fails when run from within VS Code } const client = createClient(); @@ -88,7 +88,7 @@ suite('IPC', () => { test('event dispose', () => { if (process.env['VSCODE_PID']) { - return; // TODO@Ben find out why test fails when run from within VS Code + return undefined; // TODO@Ben find out why test fails when run from within VS Code } const client = createClient(); diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts index 54db926fecf..f3f9b23b96b 100644 --- a/src/vs/base/parts/tree/browser/treeDefaults.ts +++ b/src/vs/base/parts/tree/browser/treeDefaults.ts @@ -352,6 +352,7 @@ export class DefaultController implements _.IController { tree.focusParent(payload); return tree.reveal(tree.getFocus()); } + return undefined; }).done(null, errors.onUnexpectedError); } return true; @@ -369,6 +370,7 @@ export class DefaultController implements _.IController { tree.focusFirstChild(payload); return tree.reveal(tree.getFocus()); } + return undefined; }).done(null, errors.onUnexpectedError); } return true; diff --git a/src/vs/editor/browser/standalone/colorizer.ts b/src/vs/editor/browser/standalone/colorizer.ts index 6cff4f1f8a8..0822e696cd9 100644 --- a/src/vs/editor/browser/standalone/colorizer.ts +++ b/src/vs/editor/browser/standalone/colorizer.ts @@ -32,7 +32,7 @@ export class Colorizer { let mimeType = options.mimeType || domNode.getAttribute('lang') || domNode.getAttribute('data-lang'); if (!mimeType) { console.error('Mode not detected'); - return; + return undefined; } standaloneColorService.setTheme(theme); diff --git a/src/vs/editor/browser/standalone/standaloneLanguages.ts b/src/vs/editor/browser/standalone/standaloneLanguages.ts index cbe6b16b7f4..7a9eb227618 100644 --- a/src/vs/editor/browser/standalone/standaloneLanguages.ts +++ b/src/vs/editor/browser/standalone/standaloneLanguages.ts @@ -239,7 +239,7 @@ export function registerHoverProvider(languageId: string, provider: modes.HoverP return toThenable(provider.provideHover(model, position, token)).then((value) => { if (!value) { - return; + return undefined; } if (!value.range && word) { value.range = new Range(position.lineNumber, word.startColumn, position.column, word.endColumn); @@ -621,7 +621,7 @@ class SuggestAdapter { result.incomplete = list.isIncomplete; } else if (!value) { // undefined and null are valid results - return; + return undefined; } else { // warn about everything else console.warn('INVALID result from completion provider. expected CompletionItem-array or CompletionList but got:', value); diff --git a/src/vs/editor/common/controller/cursor.ts b/src/vs/editor/common/controller/cursor.ts index 0f0b58842d9..10762d2f01f 100644 --- a/src/vs/editor/common/controller/cursor.ts +++ b/src/vs/editor/common/controller/cursor.ts @@ -544,7 +544,7 @@ export class Cursor extends EventEmitter { private _collapseDeleteCommands(rawCmds: editorCommon.ICommand[], isAutoWhitespaceCommand: boolean[]): boolean { if (rawCmds.length === 1) { - return; + return false; } // Merge adjacent delete commands @@ -560,7 +560,7 @@ export class Cursor extends EventEmitter { }); if (!allAreDeleteCommands) { - return; + return false; } var commands = rawCmds; @@ -595,6 +595,7 @@ export class Cursor extends EventEmitter { previousCursor = cursors[i]; } } + return false; } private _internalExecuteCommands(commands: editorCommon.ICommand[], isAutoWhitespaceCommand: boolean[]): boolean { diff --git a/src/vs/editor/common/model/modelLine.ts b/src/vs/editor/common/model/modelLine.ts index a001a35c9d3..d9552f577d9 100644 --- a/src/vs/editor/common/model/modelLine.ts +++ b/src/vs/editor/common/model/modelLine.ts @@ -755,5 +755,6 @@ export class ModelLine { return i; } } + return undefined; } } diff --git a/src/vs/editor/common/modes/languageSelector.ts b/src/vs/editor/common/modes/languageSelector.ts index 1ca97e8c37c..1bea497e55b 100644 --- a/src/vs/editor/common/modes/languageSelector.ts +++ b/src/vs/editor/common/modes/languageSelector.ts @@ -77,4 +77,5 @@ export function score(selector: LanguageSelector, uri: URI, language: string): n return Math.max(valueLanguage, valueScheme, valuePattern); } + return undefined; } diff --git a/src/vs/editor/common/modes/snippetsRegistry.ts b/src/vs/editor/common/modes/snippetsRegistry.ts index 0c8b6178f4d..6803d097fe8 100644 --- a/src/vs/editor/common/modes/snippetsRegistry.ts +++ b/src/vs/editor/common/modes/snippetsRegistry.ts @@ -72,7 +72,7 @@ class SnippetsRegistry implements ISnippetsRegistry { public getSnippetCompletions(model: ITokenizedModel, position: IPosition): ISuggestion[] { const languageId = model.getLanguageIdAtPosition(position.lineNumber, position.column); if (!this._snippets[languageId]) { - return; + return undefined; } const result: ISnippetSuggestion[] = []; diff --git a/src/vs/editor/common/services/bulkEdit.ts b/src/vs/editor/common/services/bulkEdit.ts index bb877af77af..41abf04fd2c 100644 --- a/src/vs/editor/common/services/bulkEdit.ts +++ b/src/vs/editor/common/services/bulkEdit.ts @@ -310,6 +310,7 @@ export function createBulkEdit(textModelResolverService: ITextModelResolverServi if (names) { return nls.localize('conflict', "These files have changed in the meantime: {0}", names.join(', ')); } + return undefined; } function finish(): TPromise { diff --git a/src/vs/editor/common/services/editorWorkerServiceImpl.ts b/src/vs/editor/common/services/editorWorkerServiceImpl.ts index 5b5355c061d..15c2650d8cf 100644 --- a/src/vs/editor/common/services/editorWorkerServiceImpl.ts +++ b/src/vs/editor/common/services/editorWorkerServiceImpl.ts @@ -52,6 +52,7 @@ export class EditorWorkerServiceImpl implements IEditorWorkerService { if (configurationService.lookup('editor.wordBasedSuggestions').value) { return this._workerManager.withWorker().then(client => client.textualSuggest(model.uri, position)); } + return undefined; } }); this._registrations = [linkProvider, completionProvider]; diff --git a/src/vs/editor/common/viewModel/splitLinesCollection.ts b/src/vs/editor/common/viewModel/splitLinesCollection.ts index f33525a02ea..356beba8678 100644 --- a/src/vs/editor/common/viewModel/splitLinesCollection.ts +++ b/src/vs/editor/common/viewModel/splitLinesCollection.ts @@ -591,7 +591,7 @@ export class SplitLinesCollection { public onModelLineChanged(versionId: number, lineNumber: number, newText: string, emit: (evenType: string, payload: any) => void): boolean { if (versionId <= this._validModelVersionId) { - return; + return undefined; } this._validModelVersionId = versionId; let lineIndex = lineNumber - 1; diff --git a/src/vs/editor/contrib/format/common/format.ts b/src/vs/editor/contrib/format/common/format.ts index a66ecbf2227..e2e1fb84ec3 100644 --- a/src/vs/editor/contrib/format/common/format.ts +++ b/src/vs/editor/contrib/format/common/format.ts @@ -34,6 +34,7 @@ export function getDocumentRangeFormattingEdits(model: IReadOnlyModel, range: Ra }, onUnexpectedExternalError); }; } + return undefined; })).then(() => result); } @@ -54,6 +55,7 @@ export function getDocumentFormattingEdits(model: IReadOnlyModel, options: Forma }, onUnexpectedExternalError); }; } + return undefined; })).then(() => result); } diff --git a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts index 1415ee076d3..9a15562e3f8 100644 --- a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts +++ b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts @@ -147,7 +147,7 @@ class InPlaceReplaceUp extends EditorAction { public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): TPromise { let controller = InPlaceReplaceController.get(editor); if (!controller) { - return; + return undefined; } return controller.run(this.id, true); } @@ -172,7 +172,7 @@ class InPlaceReplaceDown extends EditorAction { public run(accessor: ServicesAccessor, editor: ICommonCodeEditor): TPromise { let controller = InPlaceReplaceController.get(editor); if (!controller) { - return; + return undefined; } return controller.run(this.id, false); } diff --git a/src/vs/editor/contrib/indentation/common/indentation.ts b/src/vs/editor/contrib/indentation/common/indentation.ts index 70299a7bb71..7b0ebbac800 100644 --- a/src/vs/editor/contrib/indentation/common/indentation.ts +++ b/src/vs/editor/contrib/indentation/common/indentation.ts @@ -42,12 +42,12 @@ export function unshiftIndent(tabSize: number, indentation: string, count?: numb export function getReindentEditOperations(model: ITokenizedModel, startLineNumber: number, endLineNumber: number, inheritedIndent?: string): IIdentifiedSingleEditOperation[] { if (model.getLineCount() === 1 && model.getLineMaxColumn(1) === 1) { // Model is empty - return; + return undefined; } let indentationRules = LanguageConfigurationRegistry.getIndentationRules(model.getLanguageIdentifier().id); if (!indentationRules) { - return; + return undefined; } endLineNumber = Math.min(endLineNumber, model.getLineCount()); @@ -67,7 +67,7 @@ export function getReindentEditOperations(model: ITokenizedModel, startLineNumbe } if (startLineNumber > endLineNumber - 1) { - return; + return undefined; } let { tabSize, insertSpaces } = model.getOptions(); @@ -209,7 +209,7 @@ export class ChangeIndentationSizeAction extends EditorAction { let model = editor.getModel(); if (!model) { - return; + return undefined; } let creationOpts = modelService.getCreationOptions(model.getLanguageIdentifier().language); diff --git a/src/vs/editor/contrib/links/common/links.ts b/src/vs/editor/contrib/links/common/links.ts index a4f2f2e7f6c..a716b96168f 100644 --- a/src/vs/editor/contrib/links/common/links.ts +++ b/src/vs/editor/contrib/links/common/links.ts @@ -125,12 +125,12 @@ CommandsRegistry.registerCommand('_executeLinkProvider', (accessor, ...args) => const [uri] = args; if (!(uri instanceof URI)) { - return; + return undefined; } const model = accessor.get(IModelService).getModel(uri); if (!model) { - return; + return undefined; } return getLinks(model); diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts index 5598090b65f..f9eebeabc37 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts @@ -103,12 +103,12 @@ let findReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour let control = editor.getControl(); if (!control || typeof control.getEditorType !== 'function') { - return; + return undefined; } let controller = ReferencesController.get(control); if (!controller) { - return; + return undefined; } let references = provideReferences(control.getModel(), Position.lift(position)).then(references => new ReferencesModel(references)); @@ -126,12 +126,12 @@ let showReferencesCommand: ICommandHandler = (accessor: ServicesAccessor, resour let control = editor.getControl(); if (!control || typeof control.getEditorType !== 'function') { - return; + return undefined; } let controller = ReferencesController.get(control); if (!controller) { - return; + return undefined; } return TPromise.as(controller.toggleWidget( diff --git a/src/vs/editor/contrib/referenceSearch/common/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/common/referenceSearch.ts index a3871998ca0..8b55b219e59 100644 --- a/src/vs/editor/contrib/referenceSearch/common/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/common/referenceSearch.ts @@ -23,6 +23,7 @@ export function provideReferences(model: IReadOnlyModel, position: Position): TP if (Array.isArray(result)) { return result; } + return undefined; }, err => { onUnexpectedExternalError(err); }); diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/browser/rename.ts index 249486f2b8f..9cdabb26e90 100644 --- a/src/vs/editor/contrib/rename/browser/rename.ts +++ b/src/vs/editor/contrib/rename/browser/rename.ts @@ -66,7 +66,7 @@ class RenameController implements IEditorContribution { word = this.editor.getModel().getWordAtPosition(selection.getStartPosition()); if (!word) { - return; + return undefined; } let lineNumber = selection.startLineNumber, @@ -102,6 +102,7 @@ class RenameController implements IEditorContribution { }, err => { if (typeof err === 'string') { this._messageService.show(Severity.Info, err); + return undefined; } else { this._messageService.show(Severity.Error, nls.localize('rename.failed', "Sorry, rename failed to execute.")); return TPromise.wrapError(err); @@ -118,6 +119,7 @@ class RenameController implements IEditorContribution { if (!isPromiseCanceledError(err)) { return TPromise.wrapError(err); } + return undefined; }); } @@ -172,6 +174,7 @@ export class RenameAction extends EditorAction { if (controller) { return controller.run(); } + return undefined; } } diff --git a/src/vs/editor/contrib/rename/common/rename.ts b/src/vs/editor/contrib/rename/common/rename.ts index 20cf763cdd0..818ecf7dc37 100644 --- a/src/vs/editor/contrib/rename/common/rename.ts +++ b/src/vs/editor/contrib/rename/common/rename.ts @@ -34,11 +34,13 @@ export function rename(model: IReadOnlyModel, position: Position, newName: strin } else { rejects.push(result.rejectReason); } + return undefined; }, err => { onUnexpectedExternalError(err); return TPromise.wrapError('provider failed'); }); } + return undefined; }; }); diff --git a/src/vs/editor/contrib/suggest/common/suggest.ts b/src/vs/editor/contrib/suggest/common/suggest.ts index 31683bb12a8..b6f55b74dc3 100644 --- a/src/vs/editor/contrib/suggest/common/suggest.ts +++ b/src/vs/editor/contrib/suggest/common/suggest.ts @@ -47,6 +47,7 @@ export const snippetSuggestSupport: ISuggestSupport = { if (suggestions) { return { suggestions }; } + return undefined; } }; @@ -72,13 +73,13 @@ export function provideSuggestionItems(model: IModel, position: Position, snippe return () => { // stop when we have a result if (hasResult) { - return; + return undefined; } // for each support in the group ask for suggestions return TPromise.join(supports.map(support => { if (!isFalsyOrEmpty(onlyFrom) && onlyFrom.indexOf(support) < 0) { - return; + return undefined; } return asWinJsPromise(token => support.provideCompletionItems(model, position, token)).then(container => { diff --git a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts index 4d610446b43..2076f3c822e 100644 --- a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts +++ b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts @@ -32,10 +32,12 @@ export function getOccurrencesAtPosition(model: editorCommon.IReadOnlyModel, pos foundResult = true; return data; } + return undefined; }, err => { onUnexpectedExternalError(err); }); } + return undefined; }; })).then(values => { return values[0]; diff --git a/src/vs/editor/test/common/mocks/mockCodeEditor.ts b/src/vs/editor/test/common/mocks/mockCodeEditor.ts index 9b645b213b2..c6946c44518 100644 --- a/src/vs/editor/test/common/mocks/mockCodeEditor.ts +++ b/src/vs/editor/test/common/mocks/mockCodeEditor.ts @@ -76,7 +76,7 @@ export class MockScopeLocation implements IContextKeyServiceTarget { setAttribute(attr: string, value: string): void { } removeAttribute(attr: string): void { } hasAttribute(attr: string): boolean { return false; } - getAttribute(attr: string): string { return; } + getAttribute(attr: string): string { return undefined; } } export function withMockCodeEditor(text: string[], options: editorCommon.ICodeEditorWidgetCreationOptions, callback: (editor: MockCodeEditor, cursor: Cursor) => void): void { diff --git a/src/vs/editor/test/node/model/modelBuilderAuto.test.ts b/src/vs/editor/test/node/model/modelBuilderAuto.test.ts index b69d305afda..cda822c1c42 100644 --- a/src/vs/editor/test/node/model/modelBuilderAuto.test.ts +++ b/src/vs/editor/test/node/model/modelBuilderAuto.test.ts @@ -36,9 +36,7 @@ function getRandomEOLSequence(): string { if (rnd === 2) { return '\r'; } - if (rnd === 3) { - return '\r\n'; - } + return '\r\n'; } function getRandomString(minLength: number, maxLength: number): string { diff --git a/src/vs/platform/backup/common/backupIpc.ts b/src/vs/platform/backup/common/backupIpc.ts index dd059060fee..0fdfdb86824 100644 --- a/src/vs/platform/backup/common/backupIpc.ts +++ b/src/vs/platform/backup/common/backupIpc.ts @@ -22,6 +22,7 @@ export class BackupChannel implements IBackupChannel { switch (command) { case 'getBackupPath': return this.service.getBackupPath(arg); } + return undefined; } } diff --git a/src/vs/platform/environment/node/argv.ts b/src/vs/platform/environment/node/argv.ts index c6f6cc136c5..1f07a92487c 100644 --- a/src/vs/platform/environment/node/argv.ts +++ b/src/vs/platform/environment/node/argv.ts @@ -68,6 +68,7 @@ function stripAppPath(argv: string[]): string[] { if (index > -1) { return [...argv.slice(0, index), ...argv.slice(index + 1)]; } + return undefined; } /** diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts index d61dce89ead..4596b70eb80 100644 --- a/src/vs/platform/environment/node/environmentService.ts +++ b/src/vs/platform/environment/node/environmentService.ts @@ -133,7 +133,7 @@ export function parseExtensionHostPort(args: ParsedArgs, isBuild: boolean): { po function parsePathArg(arg: string, process: NodeJS.Process): string { if (!arg) { - return; + return undefined; } // Determine if the arg is relative or absolute, if relative use the original CWD diff --git a/src/vs/platform/extensionManagement/common/extensionNls.ts b/src/vs/platform/extensionManagement/common/extensionNls.ts index 53ed6658d5a..517cf9c1bcb 100644 --- a/src/vs/platform/extensionManagement/common/extensionNls.ts +++ b/src/vs/platform/extensionManagement/common/extensionNls.ts @@ -17,13 +17,13 @@ export interface ITranslations { export function localizeManifest(manifest: IExtensionManifest, translations: ITranslations): IExtensionManifest { const patcher = value => { if (typeof value !== 'string') { - return; + return undefined; } const match = nlsRegex.exec(value); if (!match) { - return; + return undefined; } return translations[match[1]] || value; diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts index 16f6445955a..50a4d32ec30 100644 --- a/src/vs/platform/markers/common/markerService.ts +++ b/src/vs/platform/markers/common/markerService.ts @@ -23,6 +23,7 @@ namespace MapMap { if (map[key1]) { return map[key1][key2]; } + return undefined; } export function set(map: MapMap, key1: string, key2: string, value: V): void { diff --git a/src/vs/platform/markers/common/problemMatcher.ts b/src/vs/platform/markers/common/problemMatcher.ts index 05c47eb7164..52dbef2f045 100644 --- a/src/vs/platform/markers/common/problemMatcher.ts +++ b/src/vs/platform/markers/common/problemMatcher.ts @@ -245,6 +245,7 @@ class AbstractLineMatcher implements ILineMatcher { marker: marker }; } + return undefined; } protected getResource(filename: string): URI { diff --git a/src/vs/platform/telemetry/common/telemetryService.ts b/src/vs/platform/telemetry/common/telemetryService.ts index 40937bc571c..2b886246083 100644 --- a/src/vs/platform/telemetry/common/telemetryService.ts +++ b/src/vs/platform/telemetry/common/telemetryService.ts @@ -116,6 +116,7 @@ export class TelemetryService implements ITelemetryService { if (typeof value === 'string') { return this._cleanupInfo(value); } + return undefined; }); this._appender.log(eventName, data); diff --git a/src/vs/platform/telemetry/node/appInsightsAppender.ts b/src/vs/platform/telemetry/node/appInsightsAppender.ts index a6a3322cbb9..dacbf72bd1a 100644 --- a/src/vs/platform/telemetry/node/appInsightsAppender.ts +++ b/src/vs/platform/telemetry/node/appInsightsAppender.ts @@ -147,5 +147,6 @@ export class AppInsightsAppender implements ITelemetryAppender { }); }); } + return undefined; } } \ No newline at end of file diff --git a/src/vs/platform/telemetry/node/workbenchCommonProperties.ts b/src/vs/platform/telemetry/node/workbenchCommonProperties.ts index c434d105c2f..9773ebd0643 100644 --- a/src/vs/platform/telemetry/node/workbenchCommonProperties.ts +++ b/src/vs/platform/telemetry/node/workbenchCommonProperties.ts @@ -73,6 +73,7 @@ function getSqmUserId(storageService: IStorageService): TPromise { storageService.store('telemetry.sqm.userId', result); return result; } + return undefined; }); } @@ -86,6 +87,7 @@ function getSqmMachineId(storageService: IStorageService): TPromise { storageService.store('telemetry.sqm.machineId', result); return result; } + return undefined; }); } diff --git a/src/vs/workbench/api/node/extHostDiagnostics.ts b/src/vs/workbench/api/node/extHostDiagnostics.ts index 4285991a3a8..32c1a872bb8 100644 --- a/src/vs/workbench/api/node/extHostDiagnostics.ts +++ b/src/vs/workbench/api/node/extHostDiagnostics.ts @@ -168,6 +168,7 @@ export class DiagnosticCollection implements vscode.DiagnosticCollection { if (Array.isArray(result)) { return Object.freeze(result.slice(0)); } + return undefined; } has(uri: URI): boolean { diff --git a/src/vs/workbench/api/node/extHostDocuments.ts b/src/vs/workbench/api/node/extHostDocuments.ts index 1b977cf1f0b..07b30072f4e 100644 --- a/src/vs/workbench/api/node/extHostDocuments.ts +++ b/src/vs/workbench/api/node/extHostDocuments.ts @@ -456,5 +456,6 @@ export class ExtHostDocumentData extends MirrorModel2 { if (wordAtText) { return new Range(position.line, wordAtText.startColumn - 1, position.line, wordAtText.endColumn - 1); } + return undefined; } } diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index f18596af213..97ebc8f0ef1 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -123,6 +123,7 @@ class ExtensionStoragePath { if (this._value) { return paths.join(this._value, extension.id); } + return undefined; } private _getOrCreateWorkspaceStoragePath(): TPromise { @@ -311,6 +312,7 @@ export class ExtHostExtensionService extends AbstractExtensionService { this._proxy.$setError(err); @@ -109,5 +110,6 @@ export class ExtHostQuickOpen extends ExtHostQuickOpenShape { if (this._validateInput) { return TPromise.as(this._validateInput(input)); } + return undefined; } } diff --git a/src/vs/workbench/api/node/extHostSCM.ts b/src/vs/workbench/api/node/extHostSCM.ts index 05c0a16baf1..9010ae0ab43 100644 --- a/src/vs/workbench/api/node/extHostSCM.ts +++ b/src/vs/workbench/api/node/extHostSCM.ts @@ -21,6 +21,7 @@ function getIconPath(decorations: vscode.SCMResourceThemableDecorations) { } else if (decorations.iconPath) { return `${decorations.iconPath}`; } + return undefined; } export interface Cache { diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts index 85743f67748..22bfbfbd348 100644 --- a/src/vs/workbench/api/node/extHostTypeConverters.ts +++ b/src/vs/workbench/api/node/extHostTypeConverters.ts @@ -111,7 +111,7 @@ export function fromViewColumn(column?: vscode.ViewColumn): EditorPosition { export function toViewColumn(position?: EditorPosition): vscode.ViewColumn { if (typeof position !== 'number') { - return; + return undefined; } if (position === EditorPosition.ONE) { return types.ViewColumn.One; @@ -120,6 +120,7 @@ export function toViewColumn(position?: EditorPosition): vscode.ViewColumn { } else if (position === EditorPosition.THREE) { return types.ViewColumn.Three; } + return undefined; } function isDecorationOptions(something: any): something is vscode.DecorationOptions { diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts index 0913f814145..7f28a316015 100644 --- a/src/vs/workbench/api/node/extHostTypes.ts +++ b/src/vs/workbench/api/node/extHostTypes.ts @@ -279,7 +279,7 @@ export class Range { // this happens when there is no overlap: // |-----| // |----| - return; + return undefined; } return new Range(start, end); } @@ -937,6 +937,7 @@ export namespace TextEditorSelectionChangeKind { case 'mouse': return TextEditorSelectionChangeKind.Mouse; case 'api': return TextEditorSelectionChangeKind.Command; } + return undefined; } } diff --git a/src/vs/workbench/api/node/mainThreadCommands.ts b/src/vs/workbench/api/node/mainThreadCommands.ts index fe9a1cbbf26..160e3ae09ea 100644 --- a/src/vs/workbench/api/node/mainThreadCommands.ts +++ b/src/vs/workbench/api/node/mainThreadCommands.ts @@ -39,7 +39,7 @@ export class MainThreadCommands extends MainThreadCommandsShape { this._disposables[id].dispose(); delete this._disposables[id]; } - return; + return undefined; } $executeCommand(id: string, args: any[]): Thenable { diff --git a/src/vs/workbench/api/node/mainThreadEditors.ts b/src/vs/workbench/api/node/mainThreadEditors.ts index b5552b079ba..789d3056447 100644 --- a/src/vs/workbench/api/node/mainThreadEditors.ts +++ b/src/vs/workbench/api/node/mainThreadEditors.ts @@ -152,6 +152,7 @@ export class MainThreadEditors extends MainThreadEditorsShape { return workbenchEditor.position; } } + return undefined; } private _getTextEditorPositionData(): ITextEditorPositionData { @@ -183,9 +184,8 @@ export class MainThreadEditors extends MainThreadEditorsShape { }; return this._workbenchEditorService.openEditor(input, position).then(editor => { - if (!editor) { - return; + return undefined; } const findEditor = (): string => { @@ -196,6 +196,7 @@ export class MainThreadEditors extends MainThreadEditorsShape { return id; } } + return undefined; }; const syncEditorId = findEditor(); @@ -238,6 +239,7 @@ export class MainThreadEditors extends MainThreadEditorsShape { options: { preserveFocus: false } }, position).then(() => { return; }); } + return undefined; } $tryHideEditor(id: string): TPromise { @@ -253,6 +255,7 @@ export class MainThreadEditors extends MainThreadEditorsShape { } } } + return undefined; } $trySetSelections(id: string, selections: ISelection[]): TPromise { @@ -276,6 +279,7 @@ export class MainThreadEditors extends MainThreadEditorsShape { return TPromise.wrapError('TextEditor disposed'); } this._textEditorsMap[id].revealRange(range, revealType); + return undefined; } $trySetOptions(id: string, options: ITextEditorConfigurationUpdate): TPromise { diff --git a/src/vs/workbench/api/node/mainThreadQuickOpen.ts b/src/vs/workbench/api/node/mainThreadQuickOpen.ts index 928bdd972ae..ff1e2656049 100644 --- a/src/vs/workbench/api/node/mainThreadQuickOpen.ts +++ b/src/vs/workbench/api/node/mainThreadQuickOpen.ts @@ -51,6 +51,7 @@ export class MainThreadQuickOpen extends MainThreadQuickOpenShape { if (item) { return item.handle; } + return undefined; }, undefined, progress => { if (progress) { this._proxy.$onItemSelected((progress).handle); diff --git a/src/vs/workbench/api/node/mainThreadSaveParticipant.ts b/src/vs/workbench/api/node/mainThreadSaveParticipant.ts index 706ee72ce13..dbf970cbc76 100644 --- a/src/vs/workbench/api/node/mainThreadSaveParticipant.ts +++ b/src/vs/workbench/api/node/mainThreadSaveParticipant.ts @@ -143,7 +143,7 @@ class FormatOnSaveParticipant implements INamedSaveParticpant { const model = editorModel.textEditorModel; if (env.reason === SaveReason.AUTO || !this._configurationService.lookup('editor.formatOnSave', model.getLanguageIdentifier().language).value) { - return; + return undefined; } const versionNow = model.getVersionId(); @@ -180,6 +180,7 @@ class FormatOnSaveParticipant implements INamedSaveParticpant { return [new Selection(range.startLineNumber, range.startColumn, range.endLineNumber, range.endColumn)]; } } + return undefined; }); } @@ -212,6 +213,7 @@ class ExtHostSaveParticipant implements INamedSaveParticpant { return TPromise.wrapError('listener failed'); } } + return undefined; }).then(resolve, reject); }); } diff --git a/src/vs/workbench/browser/actions/configureLocale.ts b/src/vs/workbench/browser/actions/configureLocale.ts index 452cad675e1..02c70d9f47f 100644 --- a/src/vs/workbench/browser/actions/configureLocale.ts +++ b/src/vs/workbench/browser/actions/configureLocale.ts @@ -52,7 +52,7 @@ class ConfigureLocaleAction extends Action { return this.fileService.createFile(file, ConfigureLocaleAction.DEFAULT_CONTENT); }).then((stat) => { if (!stat) { - return; + return undefined; } return this.editorService.openEditor({ resource: stat.resource, diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts index 3065d9f8c6e..7858610818c 100644 --- a/src/vs/workbench/browser/parts/compositePart.ts +++ b/src/vs/workbench/browser/parts/compositePart.ts @@ -251,7 +251,7 @@ export abstract class CompositePart extends Part { // Make sure that the user meanwhile did not open another composite or closed the part containing the composite if (!this.activeComposite || composite.getId() !== this.activeComposite.getId()) { - return; + return undefined; } // Take Composite on-DOM and show diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts index 63b5dd54eed..5cccbe86e37 100644 --- a/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts +++ b/src/vs/workbench/browser/parts/editor/sideBySideEditor.ts @@ -118,6 +118,7 @@ export class SideBySideEditor extends BaseEditor { } else { this.detailsEditor.setInput(newInput.details); this.masterEditor.setInput(newInput.master, options); + return undefined; } } diff --git a/src/vs/workbench/common/actionRegistry.ts b/src/vs/workbench/common/actionRegistry.ts index fa3b8578ea4..e16dd395bcd 100644 --- a/src/vs/workbench/common/actionRegistry.ts +++ b/src/vs/workbench/common/actionRegistry.ts @@ -165,7 +165,7 @@ export function triggerAndDisposeAction(instantitationService: IInstantiationSer // don't run the action when not enabled if (!actionInstance.enabled) { actionInstance.dispose(); - return; + return undefined; } if (telemetryService) { diff --git a/src/vs/workbench/node/extensionHostProcess.ts b/src/vs/workbench/node/extensionHostProcess.ts index e95388af54f..811e78306f9 100644 --- a/src/vs/workbench/node/extensionHostProcess.ts +++ b/src/vs/workbench/node/extensionHostProcess.ts @@ -51,6 +51,7 @@ function createExtHostProtocol(): TPromise { } this._terminating = true; onTerminate(); + return false; }); send(msg: any): void { diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts index a5dd1ba9924..41768c18574 100644 --- a/src/vs/workbench/parts/debug/browser/debugActions.ts +++ b/src/vs/workbench/parts/debug/browser/debugActions.ts @@ -141,6 +141,7 @@ export class StartAction extends AbstractDebugAction { if (this.contextService.getWorkspace() && commandAndType) { return manager.openConfigFile(false, commandAndType.type); } + return undefined; }); }); } diff --git a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts index 87463492734..3dd37f88768 100644 --- a/src/vs/workbench/parts/debug/browser/debugEditorActions.ts +++ b/src/vs/workbench/parts/debug/browser/debugEditorActions.ts @@ -43,6 +43,7 @@ class ToggleBreakpointAction extends EditorAction { if (debugService.getConfigurationManager().canSetBreakpointsIn(editor.getModel())) { return debugService.addBreakpoints(modelUri, [{ lineNumber: position.lineNumber, column: position.column }]); } + return undefined; } } diff --git a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts index be1a7487944..868fbea41aa 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugConfigurationManager.ts @@ -383,6 +383,7 @@ export class ConfigurationManager implements debug.IConfigurationManager { type: adapter.type }; } + return undefined; }); } @@ -416,6 +417,7 @@ export class ConfigurationManager implements debug.IConfigurationManager { viewlet.focus(); }); } + return undefined; }); } diff --git a/src/vs/workbench/parts/emmet/node/emmetActions.ts b/src/vs/workbench/parts/emmet/node/emmetActions.ts index efa608ad7f0..d7b65bd4d70 100644 --- a/src/vs/workbench/parts/emmet/node/emmetActions.ts +++ b/src/vs/workbench/parts/emmet/node/emmetActions.ts @@ -149,6 +149,7 @@ class LazyEmmet { return TPromise.join([snippetsPromise, profilesPromise, preferencesPromise]); } this._messageService.show(Severity.Error, `The path set in emmet.extensionsPath "${LazyEmmet.extensionsPath}" does not exist.`); + return undefined; }); } } @@ -236,7 +237,7 @@ export abstract class EmmetEditorAction extends EditorAction { if (!editorAccessor.isEmmetEnabledMode()) { this.noExpansionOccurred(editor); - return; + return undefined; } return LazyEmmet.withConfiguredEmmet(configurationService, messageService, workspaceRoot, (_emmet) => { diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index 0683ed816c8..88fa9159443 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -203,6 +203,8 @@ export class TriggerRenameFileAction extends BaseFileAction { } }); }).done(null, errors.onUnexpectedError); + + return undefined; } } @@ -837,7 +839,7 @@ export class ImportFileAction extends BaseFileAction { } if (!overwrite) { - return; + return undefined; } // Run import in sequence @@ -872,6 +874,7 @@ export class ImportFileAction extends BaseFileAction { return sequence(importPromisesFactory); }); } + return undefined; }); return importPromise.then(() => { @@ -1018,6 +1021,7 @@ export class DuplicateFileAction extends BaseFileAction { if (!stat.isDirectory) { return this.editorService.openEditor({ resource: stat.resource, options: { pinned: true } }); } + return undefined; }, (error: any) => { this.onError(error); }); @@ -1379,7 +1383,7 @@ export abstract class BaseSaveFileAction extends BaseActionWithErrorReporting { return savePromise.then((target) => { if (!target || target.toString() === source.toString()) { - return; // save canceled or same resource used + return undefined; // save canceled or same resource used } const replaceWith: IResourceInput = { @@ -1527,6 +1531,7 @@ export abstract class BaseSaveAllAction extends BaseActionWithErrorReporting { if (untitledToReopen.length) { return this.editorService.openEditors(untitledToReopen).then(() => true); } + return undefined; }); } diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts b/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts index fb4d62e4f9d..75e8ab67fb0 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts @@ -100,6 +100,7 @@ export class DataSource implements tree.IDataSource { var statusGroup = element; return statusGroup.all().length > 0; } + return false; } public getChildren(tree: tree.ITree, element: any): winjs.Promise { @@ -691,6 +692,7 @@ export class AccessibilityProvider implements tree.IAccessibilityProvider { case git.StatusType.MERGE: return nls.localize('ariaLabelMerge', "Merge, Git"); } } + return undefined; } } @@ -724,14 +726,14 @@ export class Controller extends treedefaults.DefaultController { var focus = tree.getFocus(); if (!(focus instanceof gitmodel.FileStatus) || !(element instanceof gitmodel.FileStatus)) { - return; + return undefined; } var focusStatus = focus; var elementStatus = element; if (focusStatus.getType() !== elementStatus.getType()) { - return; + return undefined; } if (this.canSelect(tree, element)) { @@ -743,7 +745,7 @@ export class Controller extends treedefaults.DefaultController { } } - return; + return undefined; } tree.setFocus(element); @@ -753,7 +755,7 @@ export class Controller extends treedefaults.DefaultController { tree.toggleSelection(element, { origin: 'mouse', originalEvent: event }); } - return; + return undefined; } return super.onLeftClick(tree, element, event); diff --git a/src/vs/workbench/parts/git/common/gitModel.ts b/src/vs/workbench/parts/git/common/gitModel.ts index b36fbfaa982..adccb4f8d5e 100644 --- a/src/vs/workbench/parts/git/common/gitModel.ts +++ b/src/vs/workbench/parts/git/common/gitModel.ts @@ -245,6 +245,8 @@ export class StatusModel extends EventEmitter implements IStatusModel { case 'M': workingTree.push(new FileStatus(raw.path, raw.mimetype, Status.MODIFIED, raw.rename, isModifiedInIndex)); break; case 'D': workingTree.push(new FileStatus(raw.path, raw.mimetype, Status.DELETED, raw.rename)); break; } + + return undefined; }); this.indexStatus.update(index); diff --git a/src/vs/workbench/parts/html/browser/html.contribution.ts b/src/vs/workbench/parts/html/browser/html.contribution.ts index 1e37fff0a68..bc32062208e 100644 --- a/src/vs/workbench/parts/html/browser/html.contribution.ts +++ b/src/vs/workbench/parts/html/browser/html.contribution.ts @@ -57,7 +57,7 @@ CommandsRegistry.registerCommand('_workbench.htmlZone', function (accessor: Serv if (!codeEditor) { console.warn('NO matching editor found'); - return; + return undefined; } const textModelResolverService = accessor.get(ITextModelResolverService); diff --git a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts index 966a6903745..1830de3e826 100644 --- a/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts +++ b/src/vs/workbench/parts/html/browser/htmlPreviewPart.ts @@ -180,6 +180,8 @@ export class HtmlPreviewPart extends BaseEditor { this._modelChangeSubscription = this.model.onDidChangeContent(() => this.webview.contents = this.model.getLinesContent()); this.webview.baseUrl = resourceUri.toString(true); this.webview.contents = this.model.getLinesContent(); + + return undefined; }); }); } diff --git a/src/vs/workbench/parts/output/common/outputLinkComputer.ts b/src/vs/workbench/parts/output/common/outputLinkComputer.ts index 57bf8cba123..b1814e60e52 100644 --- a/src/vs/workbench/parts/output/common/outputLinkComputer.ts +++ b/src/vs/workbench/parts/output/common/outputLinkComputer.ts @@ -47,7 +47,7 @@ export class OutputLinkComputer { public computeLinks(uri: string): TPromise { let model = this._getModel(uri); if (!model) { - return; + return undefined; } let links: ILink[] = []; diff --git a/src/vs/workbench/parts/preferences/browser/preferencesService.ts b/src/vs/workbench/parts/preferences/browser/preferencesService.ts index 40f49414bbd..dc1d75a58b7 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesService.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesService.ts @@ -165,6 +165,7 @@ export class PreferencesService extends Disposable implements IPreferencesServic }); } else { this.openSettings(); + return undefined; } } diff --git a/src/vs/workbench/parts/scm/browser/scmPreview.ts b/src/vs/workbench/parts/scm/browser/scmPreview.ts index b7a11093b37..bafd1e34294 100644 --- a/src/vs/workbench/parts/scm/browser/scmPreview.ts +++ b/src/vs/workbench/parts/scm/browser/scmPreview.ts @@ -42,7 +42,7 @@ export class EnableSCMPreviewAction extends Action { const result = this.messageService.confirm({ message }); if (!result) { - return; + return undefined; } SCMPreview.enabled = true; @@ -69,7 +69,7 @@ export class DisableSCMPreviewAction extends Action { const result = this.messageService.confirm({ message }); if (!result) { - return; + return undefined; } SCMPreview.enabled = false; diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts index f9ecfc79080..df9ebdc4e1d 100644 --- a/src/vs/workbench/parts/search/browser/searchResultsView.ts +++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts @@ -81,6 +81,8 @@ export class SearchSorter implements ISorter { if (elementA instanceof Match && elementB instanceof Match) { return Range.compareRangesUsingStarts(elementA.range(), elementB.range()); } + + return undefined; } } @@ -213,6 +215,7 @@ export class SearchAccessibilityProvider implements IAccessibilityProvider { } return nls.localize('searchResultAria', "{0}, Search result", match.text()); } + return undefined; } } @@ -331,6 +334,7 @@ export class SearchController extends DefaultController { return this.onEnter(tree, event); } super.onSpace(tree, event); + return false; } private doSelectOnScroll(tree: ITree, focus: any, event: IKeyboardEvent): void { diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts index 0048563069f..78b03e8f017 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -356,19 +356,22 @@ class TerminateAction extends AbstractTaskAction { message: nls.localize('TerminateAction.terminalSystem', 'The tasks are executed in the integrated terminal. Use the terminal to manage the tasks.'), actions: [new ViewTerminalAction(this.terminalService), new CloseMessageAction()] }); + return undefined; } else { return this.taskService.isActive().then((active) => { if (active) { return this.taskService.terminate().then((response) => { if (response.success) { - return; + return undefined; } else if (response.code && response.code === TerminateResponseCode.ProcessNotFound) { this.messageService.show(Severity.Error, nls.localize('TerminateAction.noProcess', 'The launched process doesn\'t exist anymore. If the task spawned background tasks exiting VS Code might result in orphaned processes.')); + return undefined; } else { return Promise.wrapError(nls.localize('TerminateAction.failed', 'Failed to terminate running task')); } }); } + return undefined; }); } } diff --git a/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts b/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts index 5dec8d3210f..f949ab0e6fe 100644 --- a/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts +++ b/src/vs/workbench/services/files/node/watcher/unix/watcherIpc.ts @@ -22,6 +22,7 @@ export class WatcherChannel implements IWatcherChannel { switch (command) { case 'watch': return this.service.watch(arg); } + return undefined; } } diff --git a/src/vs/workbench/test/electron-browser/quickopen.perf.test.ts b/src/vs/workbench/test/electron-browser/quickopen.perf.test.ts index 9757c297a15..34df08013b4 100644 --- a/src/vs/workbench/test/electron-browser/quickopen.perf.test.ts +++ b/src/vs/workbench/test/electron-browser/quickopen.perf.test.ts @@ -139,7 +139,7 @@ suite('QuickOpen performance', () => { let i = n; return (function iterate(): TPromise { if (!i--) { - return; + return undefined; } return measure() .then(([uncachedEvent, cachedEvent]) => { @@ -154,6 +154,7 @@ suite('QuickOpen performance', () => { }); }); } + return undefined; }); }); });