Fix blank file scenario

Author: timheuer

esbuild.js

@@ -1,4 +1,4 @@
-const { build } = require("esbuild");
+const { build, context } = require("esbuild");
 
 const baseConfig = {
   bundle: true,
@@ -24,41 +24,30 @@ const webviewConfig = {
   outfile: "./out/webview.js",
 };
 
-const watchConfig = {
-    watch: {
-      onRebuild(error, result) {
-        console.log("[watch] build started");
-        if (error) {
-          error.errors.forEach(error =>
-            console.error(`> ${error.location.file}:${error.location.line}:${error.location.column}: error: ${error.text}`)
-          );
-        } else {
-          console.log("[watch] build finished");
-        }
-      },
-    },
-  };
-  
-  (async () => {
-    const args = process.argv.slice(2);
-    try {
-      if (args.includes("--watch")) {
-        // Build and watch source code
-        console.log("[watch] build started");
-        await build({
-          ...extensionConfig,
-          ...watchConfig,
-          ...webviewConfig
-        });
-        console.log("[watch] build finished");
-      } else {
-        // Build source code
-        await build(extensionConfig);
-        await build(webviewConfig);
-        console.log("build complete");
-      }
-    } catch (err) {
-      process.stderr.write(err.stderr);
-      process.exit(1);
+(async () => {
+  const args = process.argv.slice(2);
+  try {
+    if (args.includes("--watch")) {
+      // Build and watch source code
+      console.log("[watch] build started");
+
+      const extensionCtx = await context(extensionConfig);
+      const webviewCtx = await context(webviewConfig);
+
+      await Promise.all([
+        extensionCtx.watch(),
+        webviewCtx.watch()
+      ]);
+
+      console.log("[watch] watching...");
+    } else {
+      // Build source code
+      await build(extensionConfig);
+      await build(webviewConfig);
+      console.log("build complete");
     }
-  })();
+  } catch (err) {
+    process.stderr.write(err?.stderr || String(err));
+    process.exit(1);
+  }
+})();

src/addNewResource.ts

@@ -60,14 +60,10 @@ export async function newResourceInput(context: ExtensionContext) {
 	}
 
 	function shouldResume() {
-		// Could show a notification with the option to resume.
-		return new Promise<boolean>((resolve, reject) => {
-			// noop
-		});
+		return Promise.resolve(false);
 	}
 
-	async function validateNotNull(name: string) {
-		await new Promise(resolve => setTimeout(resolve, 1000));
+	async function validateNotNull(name: string): Promise<string | undefined> {
 		return name === '' ? 'Must not be empty' : undefined;
 	}
 
@@ -81,11 +77,10 @@ export async function newResourceInput(context: ExtensionContext) {
 // Helper code that wraps the API for the multi-step case.
 // -------------------------------------------------------
 
-
-class InputFlowAction {
-	static back = new InputFlowAction();
-	static cancel = new InputFlowAction();
-	static resume = new InputFlowAction();
+enum InputFlowAction {
+	back,
+	cancel,
+	resume
 }
 
 type InputStep = (input: MultiStepInput) => Thenable<InputStep | void>;

src/webview/webview.js

@@ -136,9 +136,14 @@ let currentRowData = null;
                 if (message.key) {
                     const index = grid.rowsData.findIndex(x => x.Key === message.key);
                     if (index === -1) {
+                        if (!grid.rowsData) {
+                            grid.rowsData = [];
+                        }
                         // eslint-disable-next-line @typescript-eslint/naming-convention
                         grid.rowsData.push({ Key: message.key, Value: message.value, Comment: message.comment });
                         refreshResxData();
+                        // Force grid to update by reassigning the rowsData
+                        grid.rowsData = [...grid.rowsData];
                     }
                     else {
                         // create vscode notification
@@ -176,38 +181,40 @@ let currentRowData = null;
     }
 
     function updateContent(/** @type {string} **/ text) {
-        if (text) {
-
-            var resxValues = [];
-
-            let json;
-            try {
-                json = JSON.parse(text);
-            }
-            catch
-            {
-                console.log("error parsing json");
-                return;
-            }
-
-            for (const node in json || []) {
-                if (node) {
-                    let res = json[node];
-                    // eslint-disable-next-line @typescript-eslint/naming-convention
-                    var item = { Key: node, "Value": res.value || '', "Comment": res.comment || '' };
-                    resxValues.push(item);
-                }
-                else {
-                    console.log('node is undefined or null');
-                }
-            }
+        var resxValues = [];
 
+        if (!text || text.trim() === '') {
+            // Handle blank file by initializing with empty data
             grid.rowsData = resxValues;
+            return;
         }
-        else {
-            console.log("text is null");
+
+        let json;
+        try {
+            json = JSON.parse(text);
+        }
+        catch (e) {
+            console.log("error parsing json:", e);
+            vscode.postMessage({
+                type: 'error',
+                message: 'Error parsing resource file content'
+            });
             return;
         }
+
+        for (const node in json || []) {
+            if (node) {
+                let res = json[node];
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                var item = { Key: node, "Value": res.value || '', "Comment": res.comment || '' };
+                resxValues.push(item);
+            }
+            else {
+                console.log('node is undefined or null');
+            }
+        }
+
+        grid.rowsData = resxValues;
     }
 
     const state = vscode.getState();