[nongnu] elpa/scala-mode f88091a 191/217: `**` at end of multiline comment cause issue #140 (#141)

[ELPA Syncer]

branch: elpa/scala-mode
commit f88091ae035932cf74411cf3ccba1a3aef1feeb6
Author: Josef Vlach <vlach.jo...@gmail.com>
Commit: Sam Halliday <sam.halli...@gmail.com>

    `**` at end of multiline comment cause issue #140 (#141)
---
 scala-mode-syntax.el    |  3 ++-
 test/scala-mode-test.el | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/scala-mode-syntax.el b/scala-mode-syntax.el
index a37f812..918425b 100644
--- a/scala-mode-syntax.el
+++ b/scala-mode-syntax.el
@@ -608,7 +608,8 @@ symbol constituents (syntax 3)."
             (match-end (match-end 0))
             (match (match-string 0)))
         (unless (or
-                 (member match '("/*" "//" "/**" "</" "*/"))
+                 (member match '("</"))
+                 (member 0 (mapcar (lambda (regexp) (string-match regexp 
match)) '("^*+/$" "^//.*$" "^/\\*+$")))
                  (equal 2 (syntax-class (syntax-after match-end)))
                  (equal 2 (syntax-class (syntax-after (1- match-beg)))))
           (put-text-property match-beg match-end 'syntax-table '(3 . nil)))))))
diff --git a/test/scala-mode-test.el b/test/scala-mode-test.el
index eb1fb1c..9b51b85 100644
--- a/test/scala-mode-test.el
+++ b/test/scala-mode-test.el
@@ -117,3 +117,33 @@ object Ensime {
    "class X[T <: Mapper[T]](t: T){}"
    "2222202420330222222425542102545"
    "KKKKK-T-C-KK-CCCCCC-C----K-T---"))
+
+(ert-deftest smt:syntax-class-and-font-lock-test-15 ()
+  (smt:test
+   "val c = /* hello */ 20"
+   "2220201011022222011022"
+   "KKK-V-K-DDDOOOOOOOO-CC"))
+
+(ert-deftest smt:syntax-class-and-font-lock-test-16 ()
+  (smt:test
+   "val c = /* hello **/ 20"
+   "22202010110222220111022"
+   "KKK-V-K-DDDOOOOOOOOO-CC"))
+
+(ert-deftest smt:syntax-class-and-font-lock-test-17 ()
+  (smt:test
+   "val c = /**** hello */ 20"
+   "2220201011111022222011022"
+   "KKK-V-K-DDDDDDOOOOOOOO-CC"))
+
+(ert-deftest smt:syntax-class-and-font-lock-test-18 ()
+  (smt:test
+   "val c = //**** hello */ 20"
+   "22202010111111022222011022"
+   "KKK-V-K-DDOOOOOOOOOOOOOOOO"))
+
+(ert-deftest smt:syntax-class-and-font-lock-test-19 ()
+  (smt:test
+   "val c = 1 /////////// big comment"
+   "222020102011111111111022202222222"
+   "KKK-V-K-C-DDDDDDDDDDDDOOOOOOOOOOO"))