Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: lib/src/prism/components/prism-makefile.js

Issue 1418513006: update elements and fix some bugs (Closed) Base URL: git@github.com:dart-lang/polymer_elements.git@master
Patch Set: code review updates Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/src/prism/components/prism-lolcode.min.js ('k') | lib/src/prism/components/prism-makefile.min.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/src/prism/components/prism-makefile.js
diff --git a/lib/src/prism/components/prism-makefile.js b/lib/src/prism/components/prism-makefile.js
index a678fabac83863effa1f647a5a250ab519b93494..a2b47a46ebf68604938e86df02e5365bf62fa254 100644
--- a/lib/src/prism/components/prism-makefile.js
+++ b/lib/src/prism/components/prism-makefile.js
@@ -1,9 +1,9 @@
Prism.languages.makefile = {
'comment': {
- pattern: /(^|[^\\])#(?:\\[\s\S]|.)*/,
+ pattern: /(^|[^\\])#(?:\\(?:\r\n|[\s\S])|.)*/,
lookbehind: true
},
- 'string': /(["'])(?:\\[\s\S]|(?!\1)[^\\\r\n])*\1/,
+ 'string': /(["'])(?:\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,
// Built-in target names
'builtin': /\.[A-Z][^:#=\s]+(?=\s*:(?!=))/,
@@ -19,7 +19,7 @@ Prism.languages.makefile = {
'keyword': [
// Directives
- /\b(?:define|else|endef|endif|export|ifn?def|ifn?eq|-?include|override|private|sinclude|undefine|unexport|vpath)\b/,
+ /-include\b|\b(?:define|else|endef|endif|export|ifn?def|ifn?eq|include|override|private|sinclude|undefine|unexport|vpath)\b/,
// Functions
{
pattern: /(\()(?:addsuffix|abspath|and|basename|call|dir|error|eval|file|filter(?:-out)?|findstring|firstword|flavor|foreach|guile|if|info|join|lastword|load|notdir|or|origin|patsubst|realpath|shell|sort|strip|subst|suffix|value|warning|wildcard|word(?:s|list)?)(?=[ \t])/,
« no previous file with comments | « lib/src/prism/components/prism-lolcode.min.js ('k') | lib/src/prism/components/prism-makefile.min.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698