From 668f834374916c567aa3ef655ac5a8b30415121f Mon Sep 17 00:00:00 2001
From: Raymond Zhao <raymondzhao@microsoft.com>
Date: Mon, 14 Jun 2021 12:07:38 -0700
Subject: [PATCH] Fix #126177

---
 src/vs/workbench/contrib/preferences/browser/settingsTree.ts | 5 +++--
 .../workbench/contrib/preferences/browser/settingsWidgets.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
index 14c4a8f1887..99869643249 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsTree.ts
@@ -1080,9 +1080,10 @@ export class SettingArrayRenderer extends AbstractSettingRenderer implements ITr
 
 	protected renderValue(dataElement: SettingsTreeSettingElement, template: ISettingListItemTemplate, onChange: (value: string[] | undefined) => void): void {
 		const value = getListDisplayValue(dataElement);
+		const keySuggester = dataElement.setting.enum ? createArraySuggester(dataElement) : undefined;
 		template.listWidget.setValue(value, {
-			keySuggester: createArraySuggester(dataElement),
-			showAddButton: getShowAddButtonList(dataElement, value)
+			showAddButton: getShowAddButtonList(dataElement, value),
+			keySuggester
 		});
 		template.context = dataElement;
 
diff --git a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
index 963b8bdd204..b5c45b3eaca 100644
--- a/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
+++ b/src/vs/workbench/contrib/preferences/browser/settingsWidgets.ts
@@ -506,8 +506,8 @@ export abstract class AbstractListSettingWidget<TDataItem extends object> extend
 }
 
 interface IListSetValueOptions {
-	keySuggester: IObjectKeySuggester;
 	showAddButton: boolean;
+	keySuggester?: IObjectKeySuggester;
 }
 
 export interface IListDataItem {