From 47d18511433c130370c263d639f4712591189aa7 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Tue, 14 Dec 2021 18:23:03 -0700 Subject: [PATCH] don't continue installing vsix if kvscode compile files --- .../kiss-vscode/src/commands/ExtensionTools.kiss | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/projects/kiss-vscode/src/commands/ExtensionTools.kiss b/projects/kiss-vscode/src/commands/ExtensionTools.kiss index 2f3ae09b..948aeee0 100644 --- a/projects/kiss-vscode/src/commands/ExtensionTools.kiss +++ b/projects/kiss-vscode/src/commands/ExtensionTools.kiss @@ -8,16 +8,22 @@ (object) **(throw error)) +(defMacro forceUpdateFailure [error] + `{ + (handleUpdateFailure ,error) + (return) + }) + (function :Void updateKissVscode [&opt _] - (trySpawnSync "haxe" ["build.hxml"] (options) handleUpdateFailure) + (trySpawnSync "haxe" ["build.hxml"] (options) forceUpdateFailure) (if (= "Windows" (Sys.systemName)) { - (trySpawnSync "cmd.exe" ["/c" "npm" "install"] (options) handleUpdateFailure) - (trySpawnSync "cmd.exe" ["/c" "vsce" "package"] (options) handleUpdateFailure) + (trySpawnSync "cmd.exe" ["/c" "npm" "install"] (options) forceUpdateFailure) + (trySpawnSync "cmd.exe" ["/c" "vsce" "package"] (options) forceUpdateFailure) } { - (trySpawnSync "npm" ["install"] (options) handleUpdateFailure) - (trySpawnSync "vsce" ["package"] (options) handleUpdateFailure) + (trySpawnSync "npm" ["install"] (options) forceUpdateFailure) + (trySpawnSync "vsce" ["package"] (options) forceUpdateFailure) }) (awaitLet [_ (executeCommand "workbench.extensions.command.installFromVSIX"