refactor(stepfunctions): replace vscode.openWith with openWithWorkflowStudio

Author: anthonyting

packages/core/src/stepFunctions/activation.ts

@@ -75,7 +75,7 @@ export const previewStateMachineCommand = Commands.declare(
                 throw new ToolkitError('No active text editor or document found')
             }
 
-            await vscode.commands.executeCommand('vscode.openWith', input, WorkflowStudioEditorProvider.viewType, {
+            await WorkflowStudioEditorProvider.openWithWorkflowStudio(input, {
                 preserveFocus: true,
                 viewColumn: vscode.ViewColumn.Beside,
             })

packages/core/src/stepFunctions/commands/downloadStateMachineDefinition.ts

@@ -40,15 +40,10 @@ export async function downloadStateMachineDefinition(params: {
             })
 
             const textEditor = await vscode.window.showTextDocument(doc)
-            await vscode.commands.executeCommand(
-                'vscode.openWith',
-                textEditor.document.uri,
-                WorkflowStudioEditorProvider.viewType,
-                {
-                    preserveFocus: true,
-                    viewColumn: vscode.ViewColumn.Beside,
-                }
-            )
+            await WorkflowStudioEditorProvider.openWithWorkflowStudio(textEditor.document.uri, {
+                preserveFocus: true,
+                viewColumn: vscode.ViewColumn.Beside,
+            })
         } else {
             const wsPath = vscode.workspace.workspaceFolders
                 ? vscode.workspace.workspaceFolders[0].uri.fsPath

packages/core/src/stepFunctions/workflowStudio/activation.ts

@@ -17,7 +17,7 @@ export async function activate(): Promise<void> {
     // Open the file with Workflow Studio editor in a new tab, or focus on the tab with WFS if it is already open
     globals.context.subscriptions.push(
         Commands.register('aws.stepfunctions.openWithWorkflowStudio', async (uri: vscode.Uri) => {
-            await vscode.commands.executeCommand('vscode.openWith', uri, WorkflowStudioEditorProvider.viewType)
+            await WorkflowStudioEditorProvider.openWithWorkflowStudio(uri)
         })
     )
 
@@ -26,7 +26,7 @@ export async function activate(): Promise<void> {
     globals.context.subscriptions.push(
         Commands.register('aws.stepfunctions.switchToWorkflowStudio', async (uri: vscode.Uri) => {
             await vscode.commands.executeCommand('workbench.action.closeActiveEditor')
-            await vscode.commands.executeCommand('vscode.openWith', uri, WorkflowStudioEditorProvider.viewType)
+            await WorkflowStudioEditorProvider.openWithWorkflowStudio(uri)
         })
     )
 }

packages/core/src/stepFunctions/workflowStudio/workflowStudioEditorProvider.ts

@@ -31,6 +31,13 @@ let clientId = ''
 export class WorkflowStudioEditorProvider implements vscode.CustomTextEditorProvider {
     public static readonly viewType = 'workflowStudio.asl'
 
+    public static async openWithWorkflowStudio(
+        uri: vscode.Uri,
+        params?: Parameters<typeof vscode.window.createWebviewPanel>[2]
+    ) {
+        await vscode.commands.executeCommand('vscode.openWith', uri, WorkflowStudioEditorProvider.viewType, params)
+    }
+
     /**
      * Registers a new custom editor provider for asl files.
      * @remarks This should only be called once per extension.