Skip to content

Commit 4516ba0

Browse files
committed
Remove Append as an Action for TDML in the launch wizard + VS Code settings and remove relevant scala code
Closes apache#1031
1 parent 7285b33 commit 4516ba0

File tree

5 files changed

+6
-23
lines changed

5 files changed

+6
-23
lines changed

debugger/src/main/scala/org.apache.daffodil.debugger.dap/Parse.scala

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ object Parse {
339339
// }
340340
//
341341
// The action field is parsed first.
342-
// If it is a valid action ('generate' | 'append' | 'execute' | 'none'), create a LaunchArgs object of the appropriate type
342+
// If it is a valid action ('generate' | 'execute' | 'none'), create a LaunchArgs object of the appropriate type
343343
// If it is 'none' or missing, create a LaunchArgs.Manual object. This will ignore any other fields in the tdmlConfig object.
344344
//
345345
// arguments: Launch config
@@ -375,21 +375,6 @@ object Parse {
375375
parseVariables(arguments),
376376
parseTunables(arguments)
377377
).parMapN(LaunchArgs.TDMLConfig.Generate.apply)
378-
case "append" =>
379-
(
380-
parseSchema(arguments),
381-
parseData(arguments),
382-
parseStopOnEntry(arguments),
383-
parseInfosetFormat(arguments),
384-
parseInfosetOutput(arguments, true),
385-
parseTDMLName(tdmlConfig),
386-
parseTDMLDescription(tdmlConfig),
387-
parseTDMLPath(tdmlConfig),
388-
parseRootName(arguments),
389-
parseRootNamespace(arguments),
390-
parseVariables(arguments),
391-
parseTunables(arguments)
392-
).parMapN(LaunchArgs.TDMLConfig.Append.apply)
393378
case "execute" =>
394379
(
395380
parseStopOnEntry(arguments),
@@ -417,7 +402,7 @@ object Parse {
417402
).parMapN(LaunchArgs.Manual.apply)
418403
case invalidType =>
419404
Left(
420-
s"invalid 'tdmlConfig.action': '$invalidType', must be 'generate', 'append', 'none', or 'execute'"
405+
s"invalid 'tdmlConfig.action': '$invalidType', must be 'generate', 'none', or 'execute'"
421406
).toEitherNel
422407
}
423408
}

debugger/src/test/scala/org.apache.daffodil.debugger/ParseSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class ParseSuite extends FunSuite {
138138
assertEquals(parseResult.isLeft, true)
139139
assertEquals(
140140
parseResult.left.get.head,
141-
"invalid 'tdmlConfig.action': 'InvalidAction', must be 'generate', 'append', 'none', or 'execute'"
141+
"invalid 'tdmlConfig.action': 'InvalidAction', must be 'generate', 'none', or 'execute'"
142142
)
143143
}
144144

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,11 +572,10 @@
572572
"enum": [
573573
"none",
574574
"generate",
575-
"append",
576575
"execute"
577576
],
578577
"default": "generate",
579-
"description": "TDML Case Action (none | generate | append | exectute)"
578+
"description": "TDML Case Action (none | generate | exectute)"
580579
},
581580
"name": {
582581
"type": "string",

src/launchWizard/launchWizard.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ class LaunchWizard {
496496
})
497497

498498
let tdmlActionSelect = 'none'
499-
let tdmlActions = ['none', 'generate', 'append', 'execute']
499+
let tdmlActions = ['none', 'generate', 'execute']
500500
let tdmlAction =
501501
'tdmlConfig' in defaultValues ? defaultValues.tdmlConfig['action'] : null
502502
let tdmlName =
@@ -733,7 +733,7 @@ class LaunchWizard {
733733
734734
<div id="tdmlActionDiv" class="setting-div">
735735
<p>TDML Action:</p>
736-
<p class="setting-description">TDML Action (none | generate | append | execute)</p>
736+
<p class="setting-description">TDML Action (none | generate | execute)</p>
737737
<select onChange="updateTDMLAction()" class="file-input" style="width: 200px;" id="tdmlAction">
738738
${tdmlActionSelect}
739739
</select>

src/launchWizard/script.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ function save() {
326326
break
327327
case 'generate':
328328
obj.configurations[0].tdmlConfig.path = configValues.tdmlPath
329-
case 'append':
330329
case 'execute':
331330
obj.configurations[0].tdmlConfig.name = configValues.tdmlName
332331
obj.configurations[0].tdmlConfig.description =

0 commit comments

Comments
 (0)