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

update patterns #1032

Merged
merged 7 commits into from
Oct 11, 2016
Merged

update patterns #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca319da
update patterns
idleberg Oct 9, 2016
599abcd
separate variables and constants
idleberg Oct 9, 2016
524ff00
Changes
idleberg Oct 10, 2016
ea711a7
Update prism-nsis.min.js
idleberg Oct 10, 2016
bf50d75
move constants to separate file
idleberg Oct 10, 2016
9c93b9a
update test cases
idleberg Oct 10, 2016
2e634af
update following suggestions
idleberg Oct 10, 2016
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
15 changes: 11 additions & 4 deletions components/prism-nsis.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion components/prism-nsis.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions tests/languages/nsis/constant_feature.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
$(myLicenseData)
${LANG_ENGLISH}
Copy link
Contributor

Choose a reason for hiding this comment

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

One of your changes in the component was to include . and : in the allowed characters. Could you add examples using those?

${AtLeastWin8.1}
${nsArray_Copy}
${xml::CreateNode}

----------------------------------------------------

[
["constant", "$(myLicenseData)"],
["constant", "${LANG_ENGLISH}"],
["constant", "${AtLeastWin8.1}"],
["constant", "${nsArray_Copy}"],
["constant", "${xml::CreateNode}"]
]

----------------------------------------------------

Checks for constants.
8 changes: 3 additions & 5 deletions tests/languages/nsis/variable_feature.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
$INTERNET_CACHE
$LANGUAGE
$(myLicenseData)
${LANG_ENGLISH}

----------------------------------------------------

[
["variable", "$LANGUAGE"],
["variable", "$(myLicenseData)"],
["variable", "${LANG_ENGLISH}"]
["variable", "$INTERNET_CACHE"],
["variable", "$LANGUAGE"]
]

----------------------------------------------------
Expand Down