Replace !isFalsyOrEmpty with isNonEmptyArray

mjbvz · mjbvz · commit 30b2a5fd9448 · 2018-11-14T16:06:13.000-08:00
This new call works as a type guard and can help avoid writing double negations

Avoid either call in cases where we were iterating over the possibly undefined value. Use `|| []` for these
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as nls from 'vs/nls';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { Emitter, Event } from 'vs/base/common/event';
 import { MarkdownString } from 'vs/base/common/htmlContent';
 import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
@@ -212,9 +212,9 @@ class ModelMarkerHandler {
 
 			hoverMessage = new MarkdownString().appendCodeblock('_', message);
 
-			if (!isFalsyOrEmpty(relatedInformation)) {
+			if (isNonEmptyArray(relatedInformation)) {
 				hoverMessage.appendMarkdown('\n');
-				for (const { message, resource, startLineNumber, startColumn } of relatedInformation!) {
+				for (const { message, resource, startLineNumber, startColumn } of relatedInformation) {
 					hoverMessage.appendMarkdown(
 						`* [${basename(resource.path)}(${startLineNumber}, ${startColumn})](${resource.toString(false)}#${startLineNumber},${startColumn}): `
 					);
diff --git a/src/vs/editor/contrib/documentSymbols/outlineModel.ts b/src/vs/editor/contrib/documentSymbols/outlineModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { binarySearch, isFalsyOrEmpty, coalesceInPlace } from 'vs/base/common/arrays';
+import { binarySearch, coalesceInPlace } from 'vs/base/common/arrays';
 import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
 import { first, forEach, size } from 'vs/base/common/collections';
 import { onUnexpectedExternalError } from 'vs/base/common/errors';
@@ -301,10 +301,8 @@ export class OutlineModel extends TreeElement {
 			let group = new OutlineGroup(id, result, provider, index);
 
 			return Promise.resolve(provider.provideDocumentSymbols(result.textModel, token)).then(result => {
-				if (!isFalsyOrEmpty(result)) {
-					for (const info of result) {
-						OutlineModel._makeOutlineElement(info, group);
-					}
+				for (const info of result || []) {
+					OutlineModel._makeOutlineElement(info, group);
 				}
 				return group;
 			}, err => {
diff --git a/src/vs/editor/contrib/format/format.ts b/src/vs/editor/contrib/format/format.ts
@@ -5,7 +5,7 @@
 
 import { illegalArgument, onUnexpectedExternalError } from 'vs/base/common/errors';
 import { URI } from 'vs/base/common/uri';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { Range } from 'vs/editor/common/core/range';
 import { ITextModel } from 'vs/editor/common/model';
 import { registerDefaultLanguageCommand, registerLanguageCommand } from 'vs/editor/browser/editorExtensions';
@@ -39,7 +39,7 @@ export function getDocumentRangeFormattingEdits(model: ITextModel, range: Range,
 	return first(providers.map(provider => () => {
 		return Promise.resolve(provider.provideDocumentRangeFormattingEdits(model, range, options, token))
 			.then(undefined, onUnexpectedExternalError);
-	}), result => !isFalsyOrEmpty(result));
+	}), isNonEmptyArray);
 }
 
 export function getDocumentFormattingEdits(model: ITextModel, options: FormattingOptions, token: CancellationToken): Promise<TextEdit[] | null | undefined> {
@@ -53,7 +53,7 @@ export function getDocumentFormattingEdits(model: ITextModel, options: Formattin
 	return first(providers.map(provider => () => {
 		return Promise.resolve(provider.provideDocumentFormattingEdits(model, options, token))
 			.then(undefined, onUnexpectedExternalError);
-	}), result => !isFalsyOrEmpty(result));
+	}), isNonEmptyArray);
 }
 
 export function getOnTypeFormattingEdits(model: ITextModel, position: Position, ch: string, options: FormattingOptions): Promise<TextEdit[] | null | undefined> {
diff --git a/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts b/src/vs/editor/contrib/gotoError/gotoErrorWidget.ts
@@ -21,7 +21,7 @@ import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElemen
 import { ScrollbarVisibility } from 'vs/base/common/scrollable';
 import { ScrollType } from 'vs/editor/common/editorCommon';
 import { getBaseLabel, getPathLabel } from 'vs/base/common/labels';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { Event, Emitter } from 'vs/base/common/event';
 
 class MessageWidget {
@@ -94,11 +94,11 @@ class MessageWidget {
 
 		dom.clearNode(this._relatedBlock);
 
-		if (!isFalsyOrEmpty(relatedInformation)) {
+		if (isNonEmptyArray(relatedInformation)) {
 			this._relatedBlock.style.paddingTop = `${Math.floor(this._editor.getConfiguration().lineHeight * .66)}px`;
 			this._lines += 1;
 
-			for (const related of relatedInformation || []) {
+			for (const related of relatedInformation) {
 
 				let container = document.createElement('div');
 
diff --git a/src/vs/editor/contrib/suggest/suggest.ts b/src/vs/editor/contrib/suggest/suggest.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { first } from 'vs/base/common/async';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { assign } from 'vs/base/common/objects';
 import { onUnexpectedExternalError, canceled } from 'vs/base/common/errors';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
@@ -80,16 +80,16 @@ export function provideSuggestionItems(
 		// for each support in the group ask for suggestions
 		return Promise.all(supports.map(support => {
 
-			if (!isFalsyOrEmpty(onlyFrom) && onlyFrom!.indexOf(support) < 0) {
+			if (isNonEmptyArray(onlyFrom) && onlyFrom.indexOf(support) < 0) {
 				return undefined;
 			}
 
 			return Promise.resolve(support.provideCompletionItems(model, position, suggestConext, token)).then(container => {
 
 				const len = allSuggestions.length;
 
-				if (container && !isFalsyOrEmpty(container.suggestions)) {
-					for (let suggestion of container.suggestions) {
+				if (container) {
+					for (let suggestion of container.suggestions || []) {
 						if (acceptSuggestion(suggestion)) {
 
 							// fill in default range when missing
diff --git a/src/vs/editor/contrib/suggest/suggestModel.ts b/src/vs/editor/contrib/suggest/suggestModel.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { TimeoutTimer } from 'vs/base/common/async';
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -193,10 +193,7 @@ export class SuggestModel implements IDisposable {
 
 		const supportsByTriggerCharacter: { [ch: string]: Set<CompletionItemProvider> } = Object.create(null);
 		for (const support of CompletionProviderRegistry.all(this._editor.getModel())) {
-			if (isFalsyOrEmpty(support.triggerCharacters)) {
-				continue;
-			}
-			for (const ch of support.triggerCharacters) {
+			for (const ch of support.triggerCharacters || []) {
 				let set = supportsByTriggerCharacter[ch];
 				if (!set) {
 					set = supportsByTriggerCharacter[ch] = new Set();
@@ -411,7 +408,7 @@ export class SuggestModel implements IDisposable {
 				return;
 			}
 
-			if (!isFalsyOrEmpty(existingItems)) {
+			if (isNonEmptyArray(existingItems)) {
 				const cmpFn = getSuggestionComparator(this._editor.getConfiguration().contribInfo.suggest.snippets);
 				items = items.concat(existingItems).sort(cmpFn);
 			}
diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
 import { ContextKeyAndExpr, ContextKeyExpr, IContext } from 'vs/platform/contextkey/common/contextkey';
@@ -322,7 +322,7 @@ export class KeybindingResolver {
 			}
 			const command = CommandsRegistry.getCommand(id);
 			if (command && typeof command.description === 'object'
-				&& !isFalsyOrEmpty((<ICommandHandlerDescription>command.description).args)) { // command with args
+				&& isNonEmptyArray((<ICommandHandlerDescription>command.description).args)) { // command with args
 				return;
 			}
 			unboundCommands.push(id);
diff --git a/src/vs/platform/markers/common/markerService.ts b/src/vs/platform/markers/common/markerService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isFalsyOrEmpty, isNonEmptyArray } from 'vs/base/common/arrays';
 import { Schemas } from 'vs/base/common/network';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { isEmptyObject } from 'vs/base/common/types';
@@ -146,10 +146,8 @@ export class MarkerService implements IMarkerService {
 	}
 
 	remove(owner: string, resources: URI[]): void {
-		if (!isFalsyOrEmpty(resources)) {
-			for (const resource of resources) {
-				this.changeOne(owner, resource, []);
-			}
+		for (const resource of resources || []) {
+			this.changeOne(owner, resource, []);
 		}
 	}
 
@@ -238,7 +236,7 @@ export class MarkerService implements IMarkerService {
 		}
 
 		// add new markers
-		if (!isFalsyOrEmpty(data)) {
+		if (isNonEmptyArray(data)) {
 
 			// group by resource
 			const groups: { [resource: string]: IMarker[] } = Object.create(null);
diff --git a/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts b/src/vs/workbench/api/electron-browser/mainThreadSaveParticipant.ts
@@ -24,7 +24,7 @@ import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerServ
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IProgressService2, ProgressLocation } from 'vs/platform/progress/common/progress';
 import { localize } from 'vs/nls';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { ILogService } from 'vs/platform/log/common/log';
 import { shouldSynchronizeModel } from 'vs/editor/common/services/modelService';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
@@ -251,7 +251,7 @@ class FormatOnSaveParticipant implements ISaveParticipantParticipant {
 			});
 
 		}).then(edits => {
-			if (!isFalsyOrEmpty(edits) && versionNow === model.getVersionId()) {
+			if (isNonEmptyArray(edits) && versionNow === model.getVersionId()) {
 				const editor = findEditor(model, this._editorService);
 				if (editor) {
 					this._editsWithEditor(editor, edits);
diff --git a/src/vs/workbench/api/node/extHostCommands.ts b/src/vs/workbench/api/node/extHostCommands.ts
@@ -10,7 +10,7 @@ import * as extHostTypeConverter from 'vs/workbench/api/node/extHostTypeConverte
 import { cloneAndChange } from 'vs/base/common/objects';
 import { MainContext, MainThreadCommandsShape, ExtHostCommandsShape, ObjectIdentifier, IMainContext } from './extHost.protocol';
 import { ExtHostHeapService } from 'vs/workbench/api/node/extHostHeapService';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import * as modes from 'vs/editor/common/modes';
 import * as vscode from 'vscode';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -189,7 +189,7 @@ export class CommandsConverter {
 			title: command.title
 		};
 
-		if (command.command && !isFalsyOrEmpty(command.arguments)) {
+		if (command.command && isNonEmptyArray(command.arguments)) {
 			// we have a contributed command with arguments. that
 			// means we don't want to send the arguments around
 
diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts
@@ -19,7 +19,7 @@ import { MainContext, MainThreadLanguageFeaturesShape, ExtHostLanguageFeaturesSh
 import { regExpLeadsToEndlessLoop } from 'vs/base/common/strings';
 import { IPosition } from 'vs/editor/common/core/position';
 import { IRange, Range as EditorRange } from 'vs/editor/common/core/range';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isFalsyOrEmpty, isNonEmptyArray } from 'vs/base/common/arrays';
 import { isObject } from 'vs/base/common/types';
 import { ISelection, Selection } from 'vs/editor/common/core/selection';
 import { IExtensionDescription } from 'vs/workbench/services/extensions/common/extensions';
@@ -433,7 +433,7 @@ class NavigateTypeAdapter {
 	provideWorkspaceSymbols(search: string, token: CancellationToken): Thenable<WorkspaceSymbolsDto> {
 		const result: WorkspaceSymbolsDto = IdObject.mixin({ symbols: [] });
 		return asThenable(() => this._provider.provideWorkspaceSymbols(search, token)).then(value => {
-			if (!isFalsyOrEmpty(value)) {
+			if (isNonEmptyArray(value)) {
 				for (const item of value) {
 					if (!item) {
 						// drop
diff --git a/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts b/src/vs/workbench/parts/extensions/electron-browser/runtimeExtensionsEditor.ts
@@ -29,7 +29,7 @@ import { IWindowService, IWindowsService } from 'vs/platform/windows/common/wind
 import { writeFile } from 'vs/base/node/pfs';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
 import { memoize } from 'vs/base/common/decorators';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { Event } from 'vs/base/common/event';
 import { DisableForWorkspaceAction, DisableGloballyAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -362,7 +362,7 @@ export class RuntimeExtensionsEditor extends BaseEditor {
 					}, "Activated on {0}", activationTimes.activationEvent);
 				}
 				data.activationTime.title = title;
-				if (!isFalsyOrEmpty(element.status.runtimeErrors)) {
+				if (isNonEmptyArray(element.status.runtimeErrors)) {
 					data.msgIcon.className = 'octicon octicon-bug';
 					data.msgLabel.textContent = nls.localize('errors', "{0} uncaught errors", element.status.runtimeErrors.length);
 				} else if (element.status.messages && element.status.messages.length > 0) {
diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { basename, extname, join } from 'path';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
 import { combinedDisposable, dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { values } from 'vs/base/common/map';
@@ -281,10 +280,8 @@ class SnippetsService implements ISnippetsService {
 		let addFolderSnippets = () => {
 			disposables = dispose(disposables);
 			return this._fileService.resolveFile(folder).then(stat => {
-				if (!isFalsyOrEmpty(stat.children)) {
-					for (const entry of stat.children) {
-						disposables.push(this._addSnippetFile(entry.resource, source));
-					}
+				for (const entry of stat.children || []) {
+					disposables.push(this._addSnippetFile(entry.resource, source));
 				}
 			}, err => {
 				this._logService.error(`Failed snippets from folder '${folder.toString()}'`, err);
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensionService.ts b/src/vs/workbench/services/extensions/electron-browser/extensionService.ts
@@ -7,7 +7,7 @@ import * as nls from 'vs/nls';
 import * as os from 'os';
 import * as path from 'path';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { Barrier, runWhenIdle } from 'vs/base/common/async';
 import * as errors from 'vs/base/common/errors';
 import { Emitter, Event } from 'vs/base/common/event';
@@ -658,7 +658,7 @@ export class ExtensionService extends Disposable implements IExtensionService {
 	}
 
 	private _updateEnableProposedApi(extension: IExtensionDescription, enableProposedApiForAll: boolean, enableProposedApiFor: string | string[]): IExtensionDescription {
-		if (!isFalsyOrEmpty(product.extensionAllowedProposedApi)
+		if (isNonEmptyArray(product.extensionAllowedProposedApi)
 			&& product.extensionAllowedProposedApi.indexOf(extension.id) >= 0
 		) {
 			// fast lane -> proposed api is available to all extensions
diff --git a/src/vs/workbench/services/files/electron-browser/remoteFileService.ts b/src/vs/workbench/services/files/electron-browser/remoteFileService.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { flatten, isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { flatten, isNonEmptyArray } from 'vs/base/common/arrays';
 import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
 import { TernarySearchTree } from 'vs/base/common/map';
 import { Schemas } from 'vs/base/common/network';
@@ -76,7 +76,7 @@ export function toDeepIFileStat(provider: IFileSystemProvider, tuple: [URI, ISta
 	const trie = TernarySearchTree.forPaths<true>();
 	trie.set(tuple[0].toString(), true);
 
-	if (!isFalsyOrEmpty(to)) {
+	if (isNonEmptyArray(to)) {
 		to.forEach(uri => trie.set(uri.toString(), true));
 	}
 
diff --git a/src/vs/workbench/services/timer/electron-browser/timerService.ts b/src/vs/workbench/services/timer/electron-browser/timerService.ts
@@ -13,7 +13,7 @@ import { IWindowService, IWindowsService } from 'vs/platform/windows/common/wind
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { isFalsyOrEmpty } from 'vs/base/common/arrays';
+import { isNonEmptyArray } from 'vs/base/common/arrays';
 import { IUpdateService } from 'vs/platform/update/common/update';
 import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
 import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
@@ -430,7 +430,7 @@ export function didUseCachedData(): boolean {
 	// whenever cached data is produced or rejected a onNodeCachedData-callback is invoked. That callback
 	// stores data in the `MonacoEnvironment.onNodeCachedData` global. See:
 	// https://github.com/Microsoft/vscode/blob/efe424dfe76a492eab032343e2fa4cfe639939f0/src/vs/workbench/electron-browser/bootstrap/index.js#L299
-	if (!isFalsyOrEmpty(MonacoEnvironment.onNodeCachedData)) {
+	if (isNonEmptyArray(MonacoEnvironment.onNodeCachedData)) {
 		return false;
 	}
 	return true;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* Licensed under the MIT License. See License.txt in the project root for license information.`
`4`	`4`	`--------------------------------------------------------------------------------------------/`
`5`	`5`
`6`		`-import { isFalsyOrEmpty } from 'vs/base/common/arrays';`
	`6`	`+import { isFalsyOrEmpty, isNonEmptyArray } from 'vs/base/common/arrays';`
`7`	`7`	`import { Schemas } from 'vs/base/common/network';`
`8`	`8`	`import { IDisposable } from 'vs/base/common/lifecycle';`
`9`	`9`	`import { isEmptyObject } from 'vs/base/common/types';`
`@@ -146,10 +146,8 @@ export class MarkerService implements IMarkerService {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`remove(owner: string, resources: URI[]): void {`
`149`		`- if (!isFalsyOrEmpty(resources)) {`
`150`		`- for (const resource of resources) {`
`151`		`- this.changeOne(owner, resource, []);`
`152`		`- }`
	`149`	`+ for (const resource of resources \|\| []) {`
	`150`	`+ this.changeOne(owner, resource, []);`
`153`	`151`	`}`
`154`	`152`	`}`
`155`	`153`
`@@ -238,7 +236,7 @@ export class MarkerService implements IMarkerService {`
`238`	`236`	`}`
`239`	`237`
`240`	`238`	`// add new markers`
`241`		`- if (!isFalsyOrEmpty(data)) {`
	`239`	`+ if (isNonEmptyArray(data)) {`
`242`	`240`
`243`	`241`	`// group by resource`
`244`	`242`	`const groups: { [resource: string]: IMarker[] } = Object.create(null);`