Groovy: Regexp optimisation + don't use captures if not needed

components/prism-groovy.js

@@ -1,18 +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|trait|transient|try|void|volatile|while)\b/,
+	'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|trait|transient|try|void|volatile|while)\b/,
 	'string': [
 		{
-			pattern: /("""|''')[\s\S]*?\1|(\$\/)(\$\/\$|[\s\S])*?\/\$/,
+			pattern: /("""|''')[\s\S]*?\1|(?:\$\/)(?:\$\/\$|[\s\S])*?\/\$/,
 			greedy: true
 		},
 		{
-			pattern: /("|'|\/)(?:\\?.)*?\1/,
+			pattern: /(["'\/])(?:\\.|(?!\1)[^\\\r\n])*\1/,
 			greedy: true
 		}
 	],
 	'number': /\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?[\d]+)?)[glidf]?\b/i,
 	'operator': {
-		pattern: /(^|[^.])(~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.{1,2}(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,
+		pattern: /(^|[^.])(?:~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.{1,2}(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,
 		lookbehind: true
 	},
 	'punctuation': /\.+|[{}[\];(),:$]/
@@ -26,7 +26,7 @@ Prism.languages.insertBefore('groovy', 'string', {
 });
 
 Prism.languages.insertBefore('groovy', 'punctuation', {
-	'spock-block': /\b(setup|given|when|then|and|cleanup|expect|where):/
+	'spock-block': /\b(?:setup|given|when|then|and|cleanup|expect|where):/
 });
 
 Prism.languages.insertBefore('groovy', 'function', {
@@ -43,9 +43,9 @@ Prism.hooks.add('wrap', function(env) {
 		var delimiter = env.content[0];
 
 		if (delimiter != "'") {
-			var pattern = /([^\\])(\$(\{.*?\}|[\w\.]+))/;
+			var pattern = /([^\\])(?:\$(?:\{.*?\}|[\w.]+))/;
 			if (delimiter === '$') {
-				pattern = /([^\$])(\$(\{.*?\}|[\w\.]+))/;
+				pattern = /([^\$])(?:\$(?:\{.*?\}|[\w.]+))/;
 			}
 
 			// To prevent double HTML-encoding we have to decode env.content first