updated groovy syntax to take advantage of language argument now being passed to wrap callback
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/components/prism-groovy.js b/components/prism-groovy.js
index f7b7319..e5ab3ac 100644
--- a/components/prism-groovy.js
+++ b/components/prism-groovy.js
@@ -1,21 +1,18 @@
Prism.languages.groovy = Prism.languages.extend('clike', {
'keyword': /\b(as|def|in|abstract|assert|boolean|break|byte|case|catch|char|class|const|continue|default|do|double|else|enum|extends|final|finally|float|for|goto|if|implements|import|instanceof|int|interface|long|native|new|package|private|protected|public|return|short|static|strictfp|super|switch|synchronized|this|throw|throws|transient|try|void|volatile|while)\b/g,
+ 'string': /("""|''')[\W\w]*?\1|("|'|\/)[\W\w]*?\2/g,
'number': /\b0b[01_]+\b|\b0x[\da-f_]+(\.[\da-f_p\-]+)?\b|\b[\d_]+(\.[\d_]+[e]?[\d]*)?[glidf]\b|[\d_]+(\.[\d_]+)?\b/gi,
'operator': /={0,2}~|\?\.|\*?\.@|\.&|\.(?=\w)|\.{2}(<)?(?=\w)|->|\?:|[-+]{1,2}|!|<=>|(>){1,3}|(<){1,2}|={1,2}|(&){1,2}|\|{1,2}|\?|\*{1,2}|\/|\^|%/g,
'punctuation': /\.+|[{}[\];(),:$]/g,
'annotation': /@\w+/
});
-Prism.languages.insertBefore('groovy', 'string', {
- 'gstring': /("""|''')[\W\w]*?\1|("|'|\/)[\W\w]*?\2/g
-});
-
Prism.languages.insertBefore('groovy', 'punctuation', {
'spock-block': /\b(setup|given|when|then|and|cleanup|expect|where):/g
});
Prism.hooks.add('wrap', function(env) {
- if (env.type === 'gstring') {
+ if (env.language === 'groovy' && env.type === 'string') {
var delimiter = env.content[0];
if (delimiter != "'") {
@@ -26,12 +23,8 @@ Prism.hooks.add('wrap', function(env) {
inside: Prism.languages.groovy
}
});
- }
- switch (delimiter) {
- case "'": env.classes = ['token', 'string']; break;
- case '"': env.classes = ['token', 'string', 'gstring']; break;
- case '/': env.classes = ['token', 'string', 'regex']; break;
+ env.classes.push(delimiter === '/' ? 'regex' : 'gstring');
}
}
});