From 4fcb0d9593eb66919e3f4e6b683a263fa9c693d8 Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Fri, 3 Dec 2021 02:26:03 +0100 Subject: [PATCH 1/6] enh(nsis) Update defines pattern Defines can include `!`-characters, as seen in this example: https://nsis.sourceforge.io/Check_if_a_file_exists_at_compile_time --- src/languages/nsis.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/nsis.js b/src/languages/nsis.js index fa3b2e547f..fd64106d27 100644 --- a/src/languages/nsis.js +++ b/src/languages/nsis.js @@ -153,7 +153,7 @@ export default function(hljs) { const DEFINES = { // ${defines} className: 'variable', - begin: /\$+\{[\w.:-]+\}/ + begin: /\$+\{[\!\w.:-]+\}/ }; const VARIABLES = { From dc5f6ab2c8a2993927857f251f390fef16bc5224 Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Fri, 3 Dec 2021 02:36:51 +0100 Subject: [PATCH 2/6] Update CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index a0b1160598..ee7d34d547 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ Grammars: - enh(clojure) Add `regex` mode to regex literal - fix(clojure) Remove inconsistent/broken highlighting for metadata - enh(clojure) Add `punctuation` mode for commas. + - enh(nsis) Update defines pattern (#3417) [idleberg][] Developer Tools: From 21b2853675545b6219ded47755a0941f3455dd4d Mon Sep 17 00:00:00 2001 From: Josh Goebel Date: Fri, 3 Dec 2021 12:06:04 -0500 Subject: [PATCH 3/6] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index ee7d34d547..8ecf1660ae 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,7 +16,7 @@ Grammars: - enh(clojure) Add `regex` mode to regex literal - fix(clojure) Remove inconsistent/broken highlighting for metadata - enh(clojure) Add `punctuation` mode for commas. - - enh(nsis) Update defines pattern (#3417) [idleberg][] +- enh(nsis) Update defines pattern to allow `!` (#3417) [idleberg][] Developer Tools: From 4cb23c8d718872c0d09ba10c0471da24f76fc7cd Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Fri, 3 Dec 2021 18:45:23 +0100 Subject: [PATCH 4/6] fix: indent changelog correctly --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 8ecf1660ae..5fac2fe0e6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,7 +16,7 @@ Grammars: - enh(clojure) Add `regex` mode to regex literal - fix(clojure) Remove inconsistent/broken highlighting for metadata - enh(clojure) Add `punctuation` mode for commas. -- enh(nsis) Update defines pattern to allow `!` (#3417) [idleberg][] + - enh(nsis) Update defines pattern to allow `!` (#3417) [idleberg][] Developer Tools: From b070f2259b3de4ad4205d9d3ad2e566913d9184c Mon Sep 17 00:00:00 2001 From: "Jan T. Sott" Date: Fri, 3 Dec 2021 18:46:05 +0100 Subject: [PATCH 5/6] fix: add missing markdown link --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 5fac2fe0e6..d15426a50d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -32,7 +32,7 @@ Themes: [Björn Ebbinghaus]: https://github.com/MrEbbinghaus [Josh Goebel]: https://github.com/joshgoebel [Samia Ali]: https://github.com/samiaab1990 - +[idleberg]: https://github.com/idleberg ## Version 11.3.1 From d26342175c9ff3eb4e2291816934350c1024a0d9 Mon Sep 17 00:00:00 2001 From: Josh Goebel Date: Fri, 3 Dec 2021 12:50:43 -0500 Subject: [PATCH 6/6] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index d15426a50d..7d6636393f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ Grammars: - enh(swift) add SE-0290 unavailability condition (#3382) [Bradley Mackey][] - fix(fsharp) Highlight operators, match type names only in type annotations, support quoted identifiers, and other smaller fixes. [Melvyn Laïly][] - enh(java) add `sealed` and `non-sealed` keywords (#3386) [Bradley Mackey][] +- enh(nsis) Update defines pattern to allow `!` (#3417) [idleberg][] - fix(clojure) Several issues with Clojure highlighting (#3397) [Björn Ebbinghaus][] - fix(clojure) `comment` macro catches more than it should (#3395) - fix(clojure) `$` in symbol breaks highlighting @@ -16,7 +17,6 @@ Grammars: - enh(clojure) Add `regex` mode to regex literal - fix(clojure) Remove inconsistent/broken highlighting for metadata - enh(clojure) Add `punctuation` mode for commas. - - enh(nsis) Update defines pattern to allow `!` (#3417) [idleberg][] Developer Tools: