Groovy: Minor improvements (#2036)

This makes some minor improvements to the Groovy language definition.

- Triple quoted strings now support backslash escapes
- A single `.` will now be highlighted as `punctuation` instead of `operator` to be consistent with other languages.

components/prism-groovy.js

@@ -1,21 +1,23 @@
 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/,
 	'string': [
 		{
-			pattern: /("""|''')[\s\S]*?\1|(?:\$\/)(?:\$\/\$|[\s\S])*?\/\$/,
+			pattern: /("""|''')(?:[^\\]|\\[\s\S])*?\1|\$\/(?:\$\/\$|[\s\S])*?\/\$/,
 			greedy: true
 		},
 		{
-			pattern: /(["'\/])(?:\\.|(?!\1)[^\\\r\n])*\1/,
+			// 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
 		}
 	],
+	'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/,
 	'number': /\b(?:0b[01_]+|0x[\da-f_]+(?:\.[\da-f_p\-]+)?|[\d_]+(?:\.[\d_]+)?(?:e[+-]?[\d]+)?)[glidf]?\b/i,
 	'operator': {
-		pattern: /(^|[^.])(?:~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.{1,2}(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,
+		pattern: /(^|[^.])(?:~|==?~?|\?[.:]?|\*(?:[.=]|\*=?)?|\.[@&]|\.\.<|\.\.(?!\.)|-[-=>]?|\+[+=]?|!=?|<(?:<=?|=>?)?|>(?:>>?=?|=)?|&[&=]?|\|[|=]?|\/=?|\^=?|%=?)/,
 		lookbehind: true
 	},
-	'punctuation': /\.+|[{}[\];(),:$]/
+	'punctuation': /\.+|[{}[\];(),.:$]/
 });
 
 Prism.languages.insertBefore('groovy', 'string', {
@@ -31,9 +33,9 @@ Prism.languages.insertBefore('groovy', 'punctuation', {
 
 Prism.languages.insertBefore('groovy', 'function', {
 	'annotation': {
-		alias: 'punctuation',
 		pattern: /(^|[^.])@\w+/,
-		lookbehind: true
+		lookbehind: true,
+		alias: 'punctuation'
 	}
 });
 

tests/languages/groovy/operator_feature.test

@@ -2,7 +2,7 @@
 = == =~ ==~
 ? ?. ?:
 * ** *. *= **=
-. .@ .&
+.@ .&
 5..8
 5..<8
 - -- -= ->
@@ -24,7 +24,7 @@
 	["operator", "="], ["operator", "=="], ["operator", "=~"], ["operator", "==~"],
 	["operator", "?"], ["operator", "?."], ["operator", "?:"],
 	["operator", "*"], ["operator", "**"], ["operator", "*."], ["operator", "*="], ["operator", "**="],
-	["operator", "."], ["operator", ".@"], ["operator", ".&"],
+	["operator", ".@"], ["operator", ".&"],
 	["number", "5"], ["operator", ".."], ["number", "8"],
 	["number", "5"], ["operator", "..<"], ["number", "8"],
 	["operator", "-"], ["operator", "--"], ["operator", "-="], ["operator", "->"],
@@ -42,4 +42,4 @@
 
 ----------------------------------------------------
 
-Checks for all operators.
+Checks for all operators.

tests/languages/groovy/string_feature.test

@@ -24,9 +24,11 @@ bar/$
 '''foo
 /* comment */
 bar'''
+'''hell\'''o'''
 """foo
 // comment
 bar"""
+"""hell\"""o"""
 
 ----------------------------------------------------
 
@@ -51,10 +53,12 @@ bar"""
 	["string", "\"foo /* comment */ bar\""],
 	["string", "'foo // bar'"],
 	["string", "'''foo\r\n/* comment */\r\nbar'''"],
-	["string", "\"\"\"foo\r\n// comment\r\nbar\"\"\""]
+	["string", "'''hell\\'''o'''"],
+	["string", "\"\"\"foo\r\n// comment\r\nbar\"\"\""],
+	["string", "\"\"\"hell\\\"\"\"o\"\"\""]
 ]
 
 ----------------------------------------------------
 
 Checks for single quoted, triple single quoted, double quoted,
-triple double quoted, slashy and dollar slashy strings.
+triple double quoted, slashy and dollar slashy strings.