Skip to content

enh(nsis) improve highlighter rules and tests #3822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

enh(nsis) improve highlighter rules and tests #3822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9ddeb93
enh(nsis) add test for macro definitions
idleberg Jul 16, 2023
1304b23
enh(nsis) add test for runtime condition
idleberg Jul 16, 2023
dfdccd7
enh(nsis) fix expected markup for !ifdef keyword
idleberg Jul 16, 2023
a7b99b3
fix(nsis) indent !error in expected result for runtime condition
idleberg Jul 16, 2023
10da6f1
fix(nsis) fix issues caused by multi-line editing
idleberg Jul 16, 2023
ad829af
fix(nsis) remove unused import
idleberg Jul 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/languages/nsis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ Author: Jan T. Sott <jan.sott@gmail.com>
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 = [
Expand Down Expand Up @@ -107,7 +105,8 @@ export default function(hljs) {
"READONLY",
"SHCTX",
"SHELL_CONTEXT",
"SYSTEM|TEMPORARY",
"SYSTEM",
"TEMPORARY",
];

const COMPILER_FLAGS = [
Expand Down Expand Up @@ -348,7 +347,7 @@ export default function(hljs) {
"ManifestSupportedOS",
"MessageBox",
"MiscButtonText",
"Name|0",
"Name",
"Nop",
"OutFile",
"Page",
Expand Down
12 changes: 11 additions & 1 deletion test/markup/nsis/default.expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,23 @@
<span class="hljs-comment">; Defines</span>
<span class="hljs-keyword">!define</span> x64 <span class="hljs-string">&quot;true&quot;</span>

<span class="hljs-comment">; Macros</span>
<span class="hljs-keyword">!macro</span> Greeter Name
<span class="hljs-keyword">DetailPrint</span> <span class="hljs-string">&quot;Hello <span class="hljs-variable">${Name}</span>&quot;</span>
<span class="hljs-keyword">!macroend</span>

<span class="hljs-comment">; Runtime Condition</span>
<span class="hljs-keyword">!if</span> <span class="hljs-literal">true</span> == <span class="hljs-literal">false</span>
<span class="hljs-keyword">!error</span>
<span class="hljs-keyword">!endif</span>

<span class="hljs-comment">; Settings</span>
<span class="hljs-keyword">Name</span> <span class="hljs-string">&quot;installer_name&quot;</span>
<span class="hljs-keyword">OutFile</span> <span class="hljs-string">&quot;installer_name.exe&quot;</span>
<span class="hljs-keyword">RequestExecutionLevel</span> <span class="hljs-literal">user</span>
<span class="hljs-keyword">CRCCheck</span> <span class="hljs-literal">on</span>

<span class="hljs-keyword">!if</span>def <span class="hljs-variable">${x64}</span>
<span class="hljs-keyword">!ifdef</span> <span class="hljs-variable">${x64}</span>
<span class="hljs-keyword">InstallDir</span> <span class="hljs-string">&quot;<span class="hljs-variable constant_">$PROGRAMFILES64</span>\installer_name&quot;</span>
<span class="hljs-keyword">!else</span>
<span class="hljs-keyword">InstallDir</span> <span class="hljs-string">&quot;<span class="hljs-variable constant_">$PROGRAMFILES</span>\installer_name&quot;</span>
Expand Down
10 changes: 10 additions & 0 deletions test/markup/nsis/default.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,16 @@
; Defines
!define x64 "true"

; Macros
!macro Greeter Name
DetailPrint "Hello ${Name}"
!macroend

; Runtime Condition
!if true == false
!error
!endif

; Settings
Name "installer_name"
OutFile "installer_name.exe"
Expand Down