fix: circular import for "replaceVscodeVars"

Author: justinmk3

src/lambda/commands/createNewSamApp.ts

@@ -32,7 +32,7 @@ import { addFolderToWorkspace, tryGetAbsolutePath } from '../../shared/utilities
 import { goRuntimes } from '../models/samLambdaRuntime'
 import { eventBridgeStarterAppTemplate } from '../models/samTemplates'
 import { CreateNewSamAppWizard, CreateNewSamAppWizardForm } from '../wizards/samInitWizard'
-import { LaunchConfiguration, replaceVscodeVars } from '../../shared/debug/launchConfiguration'
+import { LaunchConfiguration } from '../../shared/debug/launchConfiguration'
 import { SamDebugConfigProvider } from '../../shared/sam/debugger/awsSamDebugger'
 import { ExtContext } from '../../shared/extensions'
 import { isTemplateTargetProperties } from '../../shared/sam/debugger/awsSamDebugConfiguration'
@@ -48,7 +48,7 @@ import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { LambdaArchitecture, Result, Runtime } from '../../shared/telemetry/telemetry'
 import { getTelemetryReason, getTelemetryResult } from '../../shared/errors'
-import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import { openUrl, replaceVscodeVars } from '../../shared/utilities/vsCodeUtils'
 
 export const samInitTemplateFiles: string[] = ['template.yaml', 'template.yml']
 export const samInitReadmeFile: string = 'README.TOOLKIT.md'

src/shared/debug/launchConfiguration.ts

@@ -204,13 +204,3 @@ export async function getReferencedHandlerPaths(launchConfig: LaunchConfiguratio
         .thru(array => new Set(array))
         .value()
 }
-
-/**
- * Replaces magic vscode variables in a launch config value.
- */
-export function replaceVscodeVars(val: string, workspaceFolder?: string): string {
-    if (!workspaceFolder) {
-        return val
-    }
-    return val.replace('${workspaceFolder}', workspaceFolder)
-}

src/shared/sam/debugger/awsSamDebugConfigurationValidator.ts

@@ -8,7 +8,7 @@ import * as fs from 'fs'
 import * as path from 'path'
 import { samImageLambdaRuntimes, samZipLambdaRuntimes } from '../../../lambda/models/samLambdaRuntime'
 import * as CloudFormation from '../../cloudformation/cloudformation'
-import { localize } from '../../utilities/vsCodeUtils'
+import { localize, replaceVscodeVars } from '../../utilities/vsCodeUtils'
 import {
     awsSamDebugRequestTypes,
     awsSamDebugTargetTypes,
@@ -20,7 +20,6 @@ import {
 } from './awsSamDebugConfiguration'
 import { tryGetAbsolutePath } from '../../utilities/workspaceUtils'
 import { CloudFormationTemplateRegistry } from '../../fs/templateRegistry'
-import { replaceVscodeVars } from '../../debug/launchConfiguration'
 
 export interface ValidationResult {
     isValid: boolean

src/shared/utilities/vsCodeUtils.ts

@@ -231,3 +231,13 @@ export async function openUrl(url: vscode.Uri): Promise<boolean> {
 export function isToolkitActive(): boolean {
     return isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit)
 }
+
+/**
+ * Replaces magic vscode variables in a (launch config) user value.
+ */
+export function replaceVscodeVars(val: string, workspaceFolder?: string): string {
+    if (!workspaceFolder) {
+        return val
+    }
+    return val.replace('${workspaceFolder}', workspaceFolder)
+}