fix for backwards compatibility with sbe

house-of-abbey · Sep 4, 2023 · ff746f5 · ff746f5
1 parent 9870369
commit ff746f5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/scratch-vhdl-vscode/sbe.schema.json b/scratch-vhdl-vscode/sbe.schema.json
@@ -74,7 +74,8 @@
         "entity",
         "signals",
         "constants",
-        "aliases"
+        "aliases",
+        "libraries"
       ],
       "additionalProperties": false
     }

diff --git a/scratch-vhdl-vscode/src/types.ts b/scratch-vhdl-vscode/src/types.ts
@@ -26,7 +26,7 @@ export type WebviewToBackMessageResponse = (
 export interface Entity {
   name?: string;
   entity: Record<string, [string, string]>;
-  signals: Record<string, [string, string]>;
+  signals: Record<string, string | [string, string]>;
   constants: Record<string, [string, string]>;
   aliases: Record<string, string>;
   command?: string;

diff --git a/scratch-vhdl-vscode/src/webview/VHDLGenerator.ts b/scratch-vhdl-vscode/src/webview/VHDLGenerator.ts
@@ -413,8 +413,12 @@ export function generate(
           '\n  signal ' +
           n +
           ' : ' +
-          signals[n][0] +
-          (signals[n][1] ? ' := ' + signals[n][1] : '') +
+          (signals[n] instanceof Array
+            ? signals[n][0] +
+              (signals[n][1] && signals[n][1] != ''
+                ? ' := ' + signals[n][1]
+                : '')
+            : signals[n]) +
           ';'
       )
       .join('');

diff --git a/scratch-vhdl-vscode/src/webview/main.ts b/scratch-vhdl-vscode/src/webview/main.ts
@@ -425,7 +425,9 @@ Blockly.ContextMenuRegistry.registry.register({
     editable(
       grid,
       ['Name', 'Type', 'Initial'],
-      Object.entries(entity.signals).map(([x, y]) => [x, ...y])
+      Object.entries(entity.signals).map(([x, y]) =>
+        y instanceof Array ? [x, ...y] : [x, y, '']
+      )
     );
     modal.addEventListener('close', () => {
       modal.remove();