Merge 26cc16d into 09226f8

Groovy-Emacs-Modes · Oct 31, 2019 · fc10fbe · fc10fbe
2 parents 09226f8 + 26cc16d
commit fc10fbe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/groovy-mode.el b/groovy-mode.el
@@ -536,7 +536,7 @@ of the form /foo/)."
                   (or bol
                       (or "+" "-" "=" "+=" "-=" "==" "!="
                           "<" "<=" ">" ">=" "&&" "||" "?" "?:" ":"
-                          "=~" "==~" "<=>" "(" "~"))
+                          "=~" "==~" "<=>" "(" "~" ","))
                   (0+ whitespace)
                   "/"
                   eol)

diff --git a/test/groovy-unit-test.el b/test/groovy-unit-test.el
@@ -571,6 +571,12 @@ final int foo = -1;"
     (forward-char -1)
     (should (not (memq 'font-lock-string-face (faces-at-point))))))
 
+(ert-deftest groovy-highlight-slashy-string--comma ()
+  "Allow slashy strings as later arguments."
+  (with-highlighted-groovy "text.replaceAll(abc, /foo/)"
+    (search-forward "foo")
+    (should (memq 'font-lock-string-face (faces-at-point)))))
+
 (ert-deftest groovy-highlight-slashy-string--inner-dollar ()
   "Don't get confused by slashy-strings that contain $."
   (with-highlighted-groovy "x = /$ foo $/"