Skip to content
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

Jump to bottom

Add support for NSIS 3.03 #1288

Merged
merged 6 commits into from
Feb 9, 2018
Merged

Add support for NSIS 3.03 #1288

merged 6 commits into from
Feb 9, 2018

Conversation

idleberg
Copy link
Contributor

@idleberg idleberg commented Feb 9, 2018

  • add NSIS 3.03 commands
  • fix: add missing separator between !getdllversion and !system
  • update & alphabetize test

@idleberg idleberg mentioned this pull request Feb 9, 2018
Closed
@Golmote
Copy link
Contributor

Golmote commented Feb 9, 2018

Thanks and sorry for the all the confusion in #1285 ^^
Can you please remove yarn.lock from this PR (because it is unrelated to the NSIS changes) and run gulp to generate the minified version of the component?

@idleberg
Copy link
Contributor Author

idleberg commented Feb 9, 2018

Can you please remove yarn.lock from this PR

Whoops, sorry about that

Golmote
Golmote reviewed Feb 9, 2018
View reviewed changes
Copy link
Contributor

@Golmote Golmote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there. It appears you removed some tests and I don't understand why. Could you explain the reason? Or restore them if they were removed by mistake?

tests/languages/nsis/important_feature.test Outdated
@@ -22,9 +23,9 @@
!macro
!makensis
!packhdr
!pragma
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you removed this test by mistake.

tests/languages/nsis/important_feature.test Outdated
@@ -57,9 +59,9 @@
["important", "!macro"],
["important", "!makensis"],
["important", "!packhdr"],
["important", "!pragma"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

tests/languages/nsis/keyword_feature.test
@@ -41,7 +41,6 @@ EnumRegValue
Exch
Exec
ExecShell
ExecShellWait
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here. This keyword still exists in the pattern, so it should be tested.

tests/languages/nsis/keyword_feature.test Outdated
@@ -207,8 +213,6 @@ WriteINIStr
WriteRegBin
WriteRegDWORD
WriteRegExpandStr
WriteRegMultiStr
WriteRegNone
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

tests/languages/nsis/keyword_feature.test
@@ -259,7 +263,6 @@ XPStyle
["keyword", "Exch"],
["keyword", "Exec"],
["keyword", "ExecShell"],
["keyword", "ExecShellWait"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

tests/languages/nsis/keyword_feature.test Outdated
@@ -425,8 +435,6 @@ XPStyle
["keyword", "WriteRegBin"],
["keyword", "WriteRegDWORD"],
["keyword", "WriteRegExpandStr"],
["keyword", "WriteRegMultiStr"],
["keyword", "WriteRegNone"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

@Golmote
Copy link
Contributor

Golmote commented Feb 9, 2018

Great, LGTM! Thanks for contributing!

@Golmote Golmote merged commit bd1e98b into PrismJS:gh-pages Feb 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Golmote Golmote Golmote left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@idleberg @Golmote