From 9ddeb935bf4c611b0d6e43c791ee85cd2eb17ea3 Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Sun, 16 Jul 2023 22:33:03 +0200 Subject: [PATCH 1/6] enh(nsis) add test for macro definitions --- test/markup/nsis/default.expect.txt | 5 +++++ test/markup/nsis/default.txt | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/test/markup/nsis/default.expect.txt b/test/markup/nsis/default.expect.txt index a67e76f04c..c64589b351 100644 --- a/test/markup/nsis/default.expect.txt +++ b/test/markup/nsis/default.expect.txt @@ -11,6 +11,11 @@ ; Defines !define x64 "true" +; Macros +!macro Greeter Name + DetailPrint "Hello ${Name}" +!macroend + ; Settings Name "installer_name" OutFile "installer_name.exe" diff --git a/test/markup/nsis/default.txt b/test/markup/nsis/default.txt index 01655ba227..4c65c00589 100644 --- a/test/markup/nsis/default.txt +++ b/test/markup/nsis/default.txt @@ -11,6 +11,11 @@ ; Defines !define x64 "true" +; Macros +!macro Greeter Name + DetailPrint "Hello ${Name}" +!macroend + ; Settings Name "installer_name" OutFile "installer_name.exe" From 1304b23bb392fc68d24e22a3d29644f131cf0e6f Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Sun, 16 Jul 2023 22:35:53 +0200 Subject: [PATCH 2/6] enh(nsis) add test for runtime condition --- test/markup/nsis/default.expect.txt | 5 +++++ test/markup/nsis/default.txt | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/test/markup/nsis/default.expect.txt b/test/markup/nsis/default.expect.txt index c64589b351..7deec438f5 100644 --- a/test/markup/nsis/default.expect.txt +++ b/test/markup/nsis/default.expect.txt @@ -16,6 +16,11 @@ DetailPrint "Hello ${Name}" !macroend +; Runtime Condition +!if true == false +!error +!endif + ; Settings Name "installer_name" OutFile "installer_name.exe" diff --git a/test/markup/nsis/default.txt b/test/markup/nsis/default.txt index 4c65c00589..6c84f9a8dc 100644 --- a/test/markup/nsis/default.txt +++ b/test/markup/nsis/default.txt @@ -16,6 +16,11 @@ DetailPrint "Hello ${Name}" !macroend +; Runtime Condition +!if true == false + !error +!endif + ; Settings Name "installer_name" OutFile "installer_name.exe" From dfdccd7151a8d830ce411582e49851749b97b8d1 Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Sun, 16 Jul 2023 22:36:40 +0200 Subject: [PATCH 3/6] enh(nsis) fix expected markup for !ifdef keyword --- test/markup/nsis/default.expect.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/markup/nsis/default.expect.txt b/test/markup/nsis/default.expect.txt index 7deec438f5..ee120904d8 100644 --- a/test/markup/nsis/default.expect.txt +++ b/test/markup/nsis/default.expect.txt @@ -27,7 +27,7 @@ RequestExecutionLevel user CRCCheck on -!ifdef ${x64} +!ifdef ${x64} InstallDir "$PROGRAMFILES64\installer_name" !else InstallDir "$PROGRAMFILES\installer_name" From a7b99b33e252eca3d4d2a6a0726d043964727998 Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Sun, 16 Jul 2023 22:38:18 +0200 Subject: [PATCH 4/6] fix(nsis) indent !error in expected result for runtime condition --- test/markup/nsis/default.expect.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/markup/nsis/default.expect.txt b/test/markup/nsis/default.expect.txt index ee120904d8..12b2eed726 100644 --- a/test/markup/nsis/default.expect.txt +++ b/test/markup/nsis/default.expect.txt @@ -18,7 +18,7 @@ ; Runtime Condition !if true == false -!error + !error !endif ; Settings From 10da6f1ab3ff0d707c6d6ad533ac3eb079d23ec9 Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Sun, 16 Jul 2023 23:00:05 +0200 Subject: [PATCH 5/6] fix(nsis) fix issues caused by multi-line editing --- src/languages/nsis.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/languages/nsis.js b/src/languages/nsis.js index 19021043dd..618a46730a 100644 --- a/src/languages/nsis.js +++ b/src/languages/nsis.js @@ -107,7 +107,8 @@ export default function(hljs) { "READONLY", "SHCTX", "SHELL_CONTEXT", - "SYSTEM|TEMPORARY", + "SYSTEM", + "TEMPORARY", ]; const COMPILER_FLAGS = [ @@ -348,7 +349,7 @@ export default function(hljs) { "ManifestSupportedOS", "MessageBox", "MiscButtonText", - "Name|0", + "Name", "Nop", "OutFile", "Page", From ad829afc1883c5a45030f86bbd5a8bbc825e6395 Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Sun, 16 Jul 2023 23:00:23 +0200 Subject: [PATCH 6/6] fix(nsis) remove unused import --- src/languages/nsis.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/languages/nsis.js b/src/languages/nsis.js index 618a46730a..e5aaafc282 100644 --- a/src/languages/nsis.js +++ b/src/languages/nsis.js @@ -5,8 +5,6 @@ Author: Jan T. Sott Website: https://nsis.sourceforge.io/Main_Page */ -import * as regex from '../lib/regex.js'; - export default function(hljs) { const regex = hljs.regex; const LANGUAGE_CONSTANTS = [