still support prompt overrides even when preset disables a completion…

… parameter
nvms · Dec 5, 2023 · 253362c · 253362c
1 parent 15b28c7
commit 253362c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/extension/dist/extension.umd.js b/extension/dist/extension.umd.js
diff --git a/extension/src/command.ts b/extension/src/command.ts
@@ -7,10 +7,9 @@ export async function createPrompt(prompt: PromptDefinition & { promptId: string
   const editor = vscode.window.activeTextEditor;
   const readable = getHumanReadableLanguageName(languageid(editor), extension(editor));
   const selection = getSelectionInfo(editor);
+  const activeModeCompletionParams = getActiveModeActivePresetKeyValue("completionParams") as Preset["completionParams"];
   const completionParams = Object.fromEntries(
-    Object.entries(
-      getActiveModeActivePresetKeyValue("completionParams") as Preset["completionParams"]
-    )
+    Object.entries(activeModeCompletionParams)
       .filter(([_, value]) => value != null)
   ) as unknown as Preset["completionParams"];
 
@@ -60,7 +59,9 @@ export async function createPrompt(prompt: PromptDefinition & { promptId: string
           const paramName = matchGroups[1];
           const paramValue = matchGroups[2];
 
-          if (Object.hasOwnProperty.call(completionParams, paramName)) {
+          // Check against activeModeCompletionParams, because this particular param may have been stripped
+          // at the Preset level (see assignment to `completionParams`), but we still want the prompt to be able to override this value.
+          if (Object.hasOwnProperty.call(activeModeCompletionParams, paramName)) {
             const numberRegex = /^[0-9]+(\.[0-9]+)?$/;
             completionParams[paramName] = numberRegex.test(paramValue) ? Number(paramValue) : paramValue;
           }