Fix "Create Project" flow losing options (#3116)

microsoft · Apr 19, 2022 · f68e470 · f68e470
1 parent fe1f344
commit f68e470
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/commands/createFunction/createFunction.ts b/src/commands/createFunction/createFunction.ts
@@ -14,6 +14,7 @@ import { getContainingWorkspace } from '../../utils/workspace';
 import * as api from '../../vscode-azurefunctions.api';
 import { getWorkspaceSetting } from '../../vsCodeConfig/settings';
 import { verifyInitForVSCode } from '../../vsCodeConfig/verifyInitForVSCode';
+import { createNewProjectInternal } from '../createNewProject/createNewProject';
 import { verifyAndPromptToCreateProject } from '../createNewProject/verifyIsProject';
 import { FunctionListStep } from './FunctionListStep';
 import { IFunctionWizardContext } from './IFunctionWizardContext';
@@ -44,7 +45,7 @@ export async function createFunctionInternal(context: IActionContext, options: a
     let workspaceFolder: WorkspaceFolder | undefined;
     let workspacePath: string | undefined = options.folderPath;
     if (workspacePath === undefined) {
-        workspaceFolder = await getWorkspaceFolder(context);
+        workspaceFolder = await getWorkspaceFolder(context, options);
         workspacePath = workspaceFolder.uri.fsPath;
     } else {
         workspaceFolder = getContainingWorkspace(workspacePath);
@@ -67,7 +68,7 @@ export async function createFunctionInternal(context: IActionContext, options: a
     await wizard.execute();
 }
 
-async function getWorkspaceFolder(context: IActionContext): Promise<WorkspaceFolder> {
+async function getWorkspaceFolder(context: IActionContext, options: api.ICreateFunctionOptions): Promise<WorkspaceFolder> {
     let folder: WorkspaceFolder | undefined;
     if (!workspace.workspaceFolders || workspace.workspaceFolders.length === 0) {
         const message: string = localize('noWorkspaceWarning', 'You must have a project open to create a function.');
@@ -77,7 +78,7 @@ async function getWorkspaceFolder(context: IActionContext): Promise<WorkspaceFol
 
         if (result === newProject) {
             // don't wait
-            void commands.executeCommand('azureFunctions.createNewProject');
+            void createNewProjectInternal(context, options);
             context.telemetry.properties.noWorkspaceResult = 'createNewProject';
         } else {
             const uri: Uri[] = await context.ui.showOpenDialog({