[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/scala-mode f88091a 191/217: `**` at end of multiline comme
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/scala-mode f88091a 191/217: `**` at end of multiline comment cause issue #140 (#141) |
Date: |
Sun, 29 Aug 2021 11:31:10 -0400 (EDT) |
branch: elpa/scala-mode
commit f88091ae035932cf74411cf3ccba1a3aef1feeb6
Author: Josef Vlach <vlach.josef@gmail.com>
Commit: Sam Halliday <sam.halliday@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"))
- [nongnu] elpa/scala-mode c48b479 113/217: Update README.md, (continued)
- [nongnu] elpa/scala-mode c48b479 113/217: Update README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode af2dc30 136/217: Removed Marmelade from README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 8d4d99b 156/217: Add optional flattening to creation of imenu index (again)., ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode aebed53 168/217: Mark a couple of indentation variables as safe (#105), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode ece95ca 170/217: use CI to compile PRs, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 37e7537 173/217: rename to scala-mode (#110), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 474a616 175/217: Merge ob-scala into scala-mode (#107), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode a0b73b2 177/217: add string interpolation (#116), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 4b492b9 179/217: Fix for fill-paragraph (#123), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 5ffaa1f 185/217: Merge pull request #129 from ensime/hvesalai-patch-94, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode f88091a 191/217: `**` at end of multiline comment cause issue #140 (#141),
ELPA Syncer <=
- [nongnu] elpa/scala-mode 44772cb 196/217: fixed some compilation warnings, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 9e5b8af 190/217: Operator characters ids cannot be adjoint to word constituent ids (#139), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode a82f186 192/217: Removed duplicated defconst, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode cc960f3 197/217: fixed some markdown syntax mistakes, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 9d3b56e 206/217: Merge pull request #161 from Kazark/scala3-keywords, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode a4ed6b4 073/217: Merge pull request #28 from non/bug/fix-colon-operators, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 27459c3 080/217: Merge pull request #32 from evnm/insert-asterisk-in-multiline-comment, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode e0341e9 199/217: Recognize worksheets as scala files, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 1ab5f64 212/217: fix comment indenting, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 2f7b335 065/217: Fixes indenting of else body, ELPA Syncer, 2021/08/29