Switch prompts for path from TDML generate to TDML execute in launch config.

Add Default Test Case name when adding config with the blue Add Configuration... button

Closes #1347

Author: JeremyYao

package.json

@@ -111,7 +111,6 @@
     "onCommand:extension.dfdl-debug.getSchemaName",
     "onCommand:extension.dfdl-debug.getDataName",
     "onCommand:extension.dfdl-debug.getTDMLName",
-    "onCommand:extension.dfdl-debug.getTDMLPath",
     "onCommand:extension.dfdl-debug.getValidatedTDMLPath",
     "onCommand:extension.dfdl-debug.getValidatedTDMLCopyPath"
   ],
@@ -576,7 +575,7 @@
                   },
                   "path": {
                     "type": "string",
-                    "default": "${command:AskForTDMLPath}",
+                    "default": "${command:AskForValidatedTDMLPath}",
                     "description": "TDML Case Path"
                   }
                 },
@@ -788,7 +787,8 @@
                 "path": "^\"\\${workspaceFolder}/target/infoset.xml\""
               },
               "tdmlConfig": {
-                "action": "generate"
+                "action": "generate",
+                "name": "Default Test Case"
               },
               "debugServer": 4711,
               "openDataEditor": false,
@@ -816,7 +816,6 @@
         "variables": {
           "AskForSchemaName": "extension.dfdl-debug.getSchemaName",
           "AskForDataName": "extension.dfdl-debug.getDataName",
-          "AskForTDMLPath": "extension.dfdl-debug.getTDMLPath",
           "AskForValidatedTDMLPath": "extension.dfdl-debug.getValidatedTDMLPath",
           "AskForValidatedTDMLCopyPath": "extension.dfdl-debug.getValidatedTDMLCopyPath"
         }

src/adapter/activateDaffodilDebug.ts

@@ -440,22 +440,6 @@ export function activateDaffodilDebug(
     )
   )
 
-  context.subscriptions.push(
-    vscode.commands.registerCommand(
-      'extension.dfdl-debug.getTDMLPath',
-      async (_) => {
-        return await vscode.window
-          .showInputBox({
-            prompt: 'TDML File: ',
-            value: '${workspaceFolder}/infoset.tdml',
-          })
-          .then((value) => {
-            return value
-          })
-      }
-    )
-  )
-
   // register a configuration provider for 'dfdl' debug type
   const provider = new DaffodilConfigurationProvider(context)
   context.subscriptions.push(

src/daffodilDebugger/debugger.ts

@@ -58,13 +58,18 @@ async function getTDMLConfig(
     config.data = ''
     config.schema.path = ''
 
-    config.tdmlConfig.path =
-      config.tdmlConfig.path ||
-      (await vscode.commands.executeCommand(
+    if (
+      config.tdmlConfig.path === '${command:AskForValidatedTDMLPath}' ||
+      !config.tdmlConfig.path
+    ) {
+      config.tdmlConfig.path = await vscode.commands.executeCommand(
         'extension.dfdl-debug.getValidatedTDMLPath'
-      ))
+      )
+    }
 
-    if (!config.tdmlConfig.path) return false
+    if (!config.tdmlConfig.path) {
+      return false
+    }
 
     config.tdmlConfig.name =
       config.tdmlConfig.name ||

src/launchWizard/launchWizard.ts

@@ -495,8 +495,16 @@ class LaunchWizard {
       }
     })
 
-    let tdmlActionSelect = 'none'
-    let tdmlActions = ['none', 'generate', 'execute']
+    const TDML_EXECUTE_ACTION = 'execute'
+    const TDML_NONE_ACTION = 'none'
+    const TDML_GENERATE_ACTION = 'generate'
+
+    let tdmlActionSelect = TDML_NONE_ACTION
+    let tdmlActions = [
+      TDML_NONE_ACTION,
+      TDML_GENERATE_ACTION,
+      TDML_EXECUTE_ACTION,
+    ]
     let tdmlAction =
       'tdmlConfig' in defaultValues ? defaultValues.tdmlConfig['action'] : null
     let tdmlName =
@@ -510,11 +518,11 @@ class LaunchWizard {
 
     // tdml items need 0 height and width when hidden so there is no large empty space
     let tdmlNameDesVisOrHiddenStyle =
-      tdmlAction !== null && tdmlAction !== 'none' // Hide TDML name and desc fields if tdmlAction is none
+      tdmlAction !== null && tdmlAction !== TDML_NONE_ACTION // Hide TDML name and desc fields if tdmlAction is none
         ? 'margin-top: 10px; visibility: visible;'
         : 'width: 0px; height: 0px; visibility: hidden'
     let tdmlPathVisOrHiddenStyle =
-      tdmlAction === 'generate'
+      tdmlAction === TDML_EXECUTE_ACTION
         ? 'margin-top: 10px; visibility: visible;'
         : 'width: 0px; height: 0px; visibility: hidden'
 
@@ -729,7 +737,7 @@ class LaunchWizard {
 
       <div id="tdmlActionDiv" class="setting-div">
         <p>TDML Action:</p>
-        <p class="setting-description">TDML Action (none | generate | execute)</p>
+        <p class="setting-description">TDML Action (${TDML_NONE_ACTION} | ${TDML_GENERATE_ACTION} | ${TDML_EXECUTE_ACTION})</p>
         <select onChange="updateTDMLAction()" class="file-input" style="width: 200px;" id="tdmlAction">
           ${tdmlActionSelect}
         </select>

src/launchWizard/script.js

@@ -226,11 +226,16 @@ function updateTDMLAction() {
       'width: 0px; height: 0px; visibility: hidden;'
   }
 
-  if (tdmlSelectedValue === 'generate') {
+  if (tdmlSelectedValue === 'execute') {
     document.getElementById('tdmlPathLabel').style =
       'margin-top: 10px; visibility: visible;'
     document.getElementById('tdmlPath').style =
       'margin-top: 10px; visibility: visible;'
+
+    // Catch case when we switch from another TDML action to execute and it shows undefined b/c path is not in tdmlConfig object
+    if (document.getElementById('tdmlPath').value === 'undefined') {
+      document.getElementById('tdmlPath').value = ''
+    }
   } else {
     document.getElementById('tdmlPathLabel').style =
       'width: 0px; height: 0px; visibility: hidden;'
@@ -314,9 +319,9 @@ function save() {
   switch (configValues.tdmlAction) {
     case 'none':
       break
-    case 'generate':
-      obj.configurations[0].tdmlConfig.path = configValues.tdmlPath
     case 'execute':
+      obj.configurations[0].tdmlConfig.path = configValues.tdmlPath
+    case 'generate':
       obj.configurations[0].tdmlConfig.name = configValues.tdmlName
       break
     default:

src/tests/suite/utils.test.ts

@@ -18,7 +18,6 @@
 import * as assert from 'assert'
 import * as utils from '../../utils'
 import { VSCodeLaunchConfigArgs } from '../../classes/vscode-launch'
-import { getTmpTDMLFilePath } from 'tdmlEditor/utilities/tdmlXmlUtils'
 
 suite('Utils Test Suite', () => {
   var name = 'Default Config'
@@ -44,7 +43,7 @@ suite('Utils Test Suite', () => {
     tdmlConfig: {
       action: 'generate',
       name: 'Default Test Case',
-      path: getTmpTDMLFilePath(),
+      path: '${command:AskForValidatedTDMLPath}',
     },
     stopOnEntry: true,
     useExistingServer: false,

src/utils.ts

@@ -22,7 +22,6 @@ import * as child_process from 'child_process'
 import path from 'path'
 import { VSCodeLaunchConfigArgs } from './classes/vscode-launch'
 import { InfosetOutput } from './daffodilDebugger'
-import { getTmpTDMLFilePath } from './tdmlEditor/utilities/tdmlXmlUtils'
 import { XMLParser } from 'fast-xml-parser'
 
 let currentConfig: vscode.DebugConfiguration
@@ -139,7 +138,7 @@ export function getConfig(jsonArgs: object): vscode.DebugConfiguration {
       ...{
         action: 'generate',
         name: 'Default Test Case',
-        path: getTmpTDMLFilePath(),
+        path: '${command:AskForValidatedTDMLPath}',
       },
       ...((defaultConf.get('tdmlConfig') as object) || {}),
     },