Remove double find

Aditya Thakral · Aditya Thakral · commit fe91c2b91002 · 2020-06-08T22:54:58.000-04:00
diff --git a/src/vs/base/common/types.ts b/src/vs/base/common/types.ts
@@ -64,6 +64,13 @@ export function isUndefined(obj: any): obj is undefined {
 	return (typeof obj === 'undefined');
 }
 
+/**
+ * @returns whether the provided parameter is defined.
+ */
+export function isDefined<T>(arg: T | null | undefined): arg is T {
+	return !isUndefinedOrNull(arg);
+}
+
 /**
  * @returns whether the provided parameter is undefined or null.
  */
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -30,7 +30,7 @@ import { Disposable, DisposableStore, dispose } from 'vs/base/common/lifecycle';
 import { isIOS } from 'vs/base/common/platform';
 import { ISpliceable } from 'vs/base/common/sequence';
 import { escapeRegExpCharacters, startsWith } from 'vs/base/common/strings';
-import { isArray } from 'vs/base/common/types';
+import { isArray, isDefined } from 'vs/base/common/types';
 import { localize } from 'vs/nls';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { ICommandService } from 'vs/platform/commands/common/commands';
@@ -131,11 +131,13 @@ function getObjectDisplayValue(element: SettingsTreeSettingElement): IObjectData
 
 		const keysWithSchema = Object.keys(data)
 			.filter(key => !!data[key] && !(key in (element.setting.objectProperties ?? {})))
-			.filter(key => patternsAndSchemas.find(({ pattern }) => pattern.test(key)))
 			.map(key => {
-				const { schema } = patternsAndSchemas.find(({ pattern }) => pattern.test(key))!;
-				return { key, schema };
-			});
+				const patternAndSchema = patternsAndSchemas.find(({ pattern }) => pattern.test(key));
+				return patternAndSchema
+					? { key, schema: patternAndSchema.schema }
+					: undefined;
+			})
+			.filter(isDefined);
 
 		items = items.concat(keysWithSchema.map(({ key, schema }) => {
 			const valueEnumOptions = getEnumOptionsFromSchema(schema);
