This is an automated email from the ASF dual-hosted git repository.
shanedell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git
The following commit(s) were added to refs/heads/main by this push:
new ad1704a Update object variables in package.json to map properties.
ad1704a is described below
commit ad1704a2c97940a2a88a5239176a0495018a5423
Author: Shane Dell <[email protected]>
AuthorDate: Tue Jan 30 11:35:37 2024 -0500
Update object variables in package.json to map properties.
- This added better auto-completion for these variables.
- Such as when you are inside of "logging" in will suggest the properties
"level" and "file".
- Also updated some variables to be enums so when changing the value you
are shown the proper values.
- Such as "infosetOutput.type" will display a little menu where you can
select 'file', 'console' or 'none'.
Closes #955
---
package.json | 99 ++++++++++++++++++++++++++++++--
src/tests/suite/daffodilDebugger.test.ts | 2 +
src/tests/suite/utils.test.ts | 2 +-
src/utils.ts | 2 +-
4 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/package.json b/package.json
index 886de9e..d89a368 100644
--- a/package.json
+++ b/package.json
@@ -374,6 +374,20 @@
"infosetOutput": {
"type": "object",
"description": "Destination for final Infoset ('file' |
'console' | 'none')",
+ "required": ["type"],
+ "properties": {
+ "type": {
+ "type": "string",
+ "enum": ["file", "console", "none"],
+ "description": "Type of infoset output",
+ "default": "file"
+ },
+ "path": {
+ "type": "string",
+ "description": "Path to save infoset file to",
+ "default": "${workspaceFolder}/target/infoset.xml"
+ }
+ },
"default": {
"type": "file",
"path": "${workspaceFolder}/target/infoset.xml"
@@ -382,6 +396,30 @@
"tdmlConfig": {
"type": "object",
"description": "Configuration for TDML Actions",
+ "required": ["action"],
+ "properties": {
+ "action": {
+ "type": "string",
+ "enum": ["none", "generate", "append", "execute"],
+ "default": "generate",
+ "description": "TDML Case Action (none | generate | append
| exectute)"
+ },
+ "name": {
+ "type": "string",
+ "default": "${command:AskForTDMLName}",
+ "description": "TDML Case Name"
+ },
+ "description": {
+ "type": "string",
+ "default": "${command:AskForTDMLDescription}",
+ "description": "TDML Case Description"
+ },
+ "path": {
+ "type": "string",
+ "default": "${command:AskForTDMLPath}",
+ "description": "TDML Case Path"
+ }
+ },
"default": {
"action": "generate",
"name": "${command:AskForTDMLName}",
@@ -445,7 +483,35 @@
},
"dataEditor": {
"type": "object",
- "description": "Configuration for Data Editor. Settings are
port, logFile and logLevel",
+ "description": "Configuration for Data Editor. Settings are
port and logging details",
+ "properties": {
+ "port": {
+ "type": "number",
+ "default": 9000,
+ "description": "Port number to run the data editor on"
+ },
+ "logging": {
+ "type": "object",
+ "description": "Data Editor Logging Configuration",
+ "properties": {
+ "file": {
+ "type": "string",
+ "description": "Path to file to save logs at",
+ "default":
"${workspaceFolder}/dataEditor-${omegaEditPort}.log"
+ },
+ "level": {
+ "type": "string",
+ "enum": ["debug", "info", "warning", "error",
"critical"],
+ "description": "Data Editor Logging Level",
+ "default": "info"
+ }
+ },
+ "default": {
+ "file":
"${workspaceFolder}/dataEditor-${omegaEditPort}.log",
+ "level": "info"
+ }
+ }
+ },
"default": {
"port": 9000,
"logging": {
@@ -457,10 +523,33 @@
"dfdlDebugger": {
"type": "object",
"description": "Configuration for debugger. Settings are
logging (level and file)",
+ "properties": {
+ "logging": {
+ "type": "object",
+ "description": "DFDL Debugger Logging Configuration",
+ "properties": {
+ "file": {
+ "type": "string",
+ "description": "Path to file to save logs at",
+ "default": "${workspaceFolder}/daffodil-debugger.log"
+ },
+ "level": {
+ "type": "string",
+ "enum": ["DEBUG", "INFO", "WARNING", "ERROR",
"CRITICAL"],
+ "description": "DFL Debugger Logging Level",
+ "default": "INFO"
+ }
+ },
+ "default": {
+ "level": "INFO",
+ "file": "${workspaceFolder}/daffodil-debugger.log"
+ }
+ }
+ },
"default": {
"logging": {
"level": "INFO",
- "file": "/tmp/daffodil-debugger.log"
+ "file": "${workspaceFolder}/daffodil-debugger.log"
}
}
}
@@ -507,7 +596,7 @@
"dfdlDebugger": {
"logging": {
"level": "INFO",
- "file": "/tmp/daffodil-debugger.log"
+ "file": "${workspaceFolder}/daffodil-debugger.log"
}
}
}
@@ -555,7 +644,7 @@
"dfdlDebugger": {
"logging": {
"level": "INFO",
- "file": "/tmp/daffodil-debugger.log"
+ "file": "${workspaceFolder}/daffodil-debugger.log"
}
}
}
@@ -682,7 +771,7 @@
"default": {
"logging": {
"level": "INFO",
- "file": "/tmp/daffodil-debugger.log"
+ "file": "${workspaceFolder}/daffodil-debugger.log"
}
}
}
diff --git a/src/tests/suite/daffodilDebugger.test.ts
b/src/tests/suite/daffodilDebugger.test.ts
index 73ae761..a757365 100644
--- a/src/tests/suite/daffodilDebugger.test.ts
+++ b/src/tests/suite/daffodilDebugger.test.ts
@@ -122,6 +122,7 @@ suite('Daffodil Debugger', () => {
},
tdmlConfig: tdmlConf,
dataEditor: dataEditor,
+ dfdlDebugger: dfdlDebuggers[0],
}),
{
noDebug: true,
@@ -150,6 +151,7 @@ suite('Daffodil Debugger', () => {
},
tdmlConfig: tdmlConf,
dataEditor: dataEditor,
+ dfdlDebugger: dfdlDebuggers[1],
}),
{
noDebug: true,
diff --git a/src/tests/suite/utils.test.ts b/src/tests/suite/utils.test.ts
index a685fbb..eb795b3 100644
--- a/src/tests/suite/utils.test.ts
+++ b/src/tests/suite/utils.test.ts
@@ -63,7 +63,7 @@ suite('Utils Test Suite', () => {
dfdlDebugger: {
logging: {
level: 'INFO',
- file: '/tmp/daffodil-debugger.log',
+ file: '${workspaceFolder}/daffodil-debugger.log',
},
},
}
diff --git a/src/utils.ts b/src/utils.ts
index e487946..e16d97b 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -156,7 +156,7 @@ export function getConfig(jsonArgs: object):
vscode.DebugConfiguration {
dfdlDebugger: defaultConf.get('dfdlDebugger', {
logging: {
level: 'INFO',
- file: '/tmp/daffodil-debugger.log',
+ file: '${workspaceFolder}/daffodil-debugger.log',
},
}),
}
