-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Groovy: Added string interpolation without hook (#3366)
- Loading branch information
1 parent
1c533f4
commit 5617765
Showing
6 changed files
with
213 additions
and
182 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,65 @@ | ||
| Prism.languages.groovy = Prism.languages.extend('clike', { | ||
| 'string': [ | ||
| { | ||
| (function (Prism) { | ||
|
|
||
| var interpolation = { | ||
| pattern: /((?:^|[^\\$])(?:\\{2})*)\$(?:\w+|\{[^{}]*\})/, | ||
| lookbehind: true, | ||
| inside: { | ||
| 'interpolation-punctuation': { | ||
| pattern: /^\$\{?|\}$/, | ||
| alias: 'punctuation' | ||
| }, | ||
| 'expression': { | ||
| pattern: /[\s\S]+/, | ||
| inside: null // see below | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| Prism.languages.groovy = Prism.languages.extend('clike', { | ||
| 'string': { | ||
| // https://groovy-lang.org/syntax.html#_dollar_slashy_string | ||
| pattern: /("""|''')(?:[^\\]|\\[\s\S])*?\1|\$\/(?:[^/$]|\$(?:[/$]|(?![/$]))|\/(?!\$))*\/\$/, | ||
| pattern: /'''(?:[^\\]|\\[\s\S])*?'''|'(?:\\.|[^\\'\r\n])*'/, | ||
| greedy: true | ||
| }, | ||
| { | ||
| 'keyword': /\b(?:abstract|as|assert|boolean|break|byte|case|catch|char|class|const|continue|def|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|in|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/, | ||
| 'number': /\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?\d+)?)[glidf]?\b/i, | ||
| 'operator': { | ||
| pattern: /(^|[^.])(?:~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.\.(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/, | ||
| lookbehind: true | ||
| }, | ||
| 'punctuation': /\.+|[{}[\];(),:$]/ | ||
| }); | ||
|
|
||
| Prism.languages.insertBefore('groovy', 'string', { | ||
| 'shebang': { | ||
| pattern: /#!.+/, | ||
| alias: 'comment', | ||
| greedy: true | ||
| }, | ||
| 'interpolation-string': { | ||
| // TODO: Slash strings (e.g. /foo/) can contain line breaks but this will cause a lot of trouble with | ||
| // simple division (see JS regex), so find a fix maybe? | ||
| pattern: /(["'/])(?:\\.|(?!\1)[^\\\r\n])*\1/, | ||
| greedy: true | ||
| pattern: /"""(?:[^\\]|\\[\s\S])*?"""|(["/])(?:\\.|(?!\1)[^\\\r\n])*\1|\$\/(?:[^/$]|\$(?:[/$]|(?![/$]))|\/(?!\$))*\/\$/, | ||
| greedy: true, | ||
| inside: { | ||
| 'interpolation': interpolation, | ||
| 'string': /[\s\S]+/ | ||
| } | ||
| } | ||
| ], | ||
| 'keyword': /\b(?:abstract|as|assert|boolean|break|byte|case|catch|char|class|const|continue|def|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|in|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|trait|transient|try|void|volatile|while)\b/, | ||
| 'number': /\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?\d+)?)[glidf]?\b/i, | ||
| 'operator': { | ||
| pattern: /(^|[^.])(?:~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.\.(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/, | ||
| lookbehind: true | ||
| }, | ||
| 'punctuation': /\.+|[{}[\];(),:$]/ | ||
| }); | ||
|
|
||
| Prism.languages.insertBefore('groovy', 'string', { | ||
| 'shebang': { | ||
| pattern: /#!.+/, | ||
| alias: 'comment' | ||
| } | ||
| }); | ||
|
|
||
| Prism.languages.insertBefore('groovy', 'punctuation', { | ||
| 'spock-block': /\b(?:and|cleanup|expect|given|setup|then|when|where):/ | ||
| }); | ||
|
|
||
| Prism.languages.insertBefore('groovy', 'function', { | ||
| 'annotation': { | ||
| pattern: /(^|[^.])@\w+/, | ||
| lookbehind: true, | ||
| alias: 'punctuation' | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| // Handle string interpolation | ||
| Prism.hooks.add('wrap', function (env) { | ||
| if (env.language === 'groovy' && env.type === 'string') { | ||
| var delimiter = env.content[0]; | ||
| Prism.languages.insertBefore('groovy', 'punctuation', { | ||
| 'spock-block': /\b(?:and|cleanup|expect|given|setup|then|when|where):/ | ||
| }); | ||
|
|
||
| if (delimiter != "'") { | ||
| var pattern = /([^\\])(?:\$(?:\{.*?\}|[\w.]+))/; | ||
| if (delimiter === '$') { | ||
| pattern = /([^\$])(?:\$(?:\{.*?\}|[\w.]+))/; | ||
| } | ||
|
|
||
| // To prevent double HTML-encoding we have to decode env.content first | ||
| env.content = env.content.replace(/</g, '<').replace(/&/g, '&'); | ||
| Prism.languages.insertBefore('groovy', 'function', { | ||
| 'annotation': { | ||
| pattern: /(^|[^.])@\w+/, | ||
| lookbehind: true, | ||
| alias: 'punctuation' | ||
| } | ||
| }); | ||
|
|
||
| env.content = Prism.highlight(env.content, { | ||
| 'expression': { | ||
| pattern: pattern, | ||
| lookbehind: true, | ||
| inside: Prism.languages.groovy | ||
| } | ||
| }); | ||
| interpolation.inside.expression.inside = Prism.languages.groovy; | ||
|
|
||
| env.classes.push(delimiter === '/' ? 'regex' : 'gstring'); | ||
| } | ||
| } | ||
| }); | ||
| }(Prism)); |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.