[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/scala-mode 5d28cb3 210/217: feat: support trailing commas
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/scala-mode 5d28cb3 210/217: feat: support trailing commas (>= Scala 2.12.2) |
Date: |
Sun, 29 Aug 2021 11:31:14 -0400 (EDT) |
branch: elpa/scala-mode
commit 5d28cb3257d922c800e0ecea81e15e9a91aae254
Author: Keith Pinson <keith.pinson@banno.com>
Commit: Keith Pinson <keith.pinson@banno.com>
feat: support trailing commas (>= Scala 2.12.2)
Trailing commas were added in Scala
[2.12.2](https://github.com/scala/scala/releases/tag/v2.12.2).
Thought that before I jumped all the way in on the Scala 3 upgrade I would
try
patching something that has been bugging me w.r.t. the Scala 2
implementation.
Not 100% sure this is the most surgical fix. Will be testing locally and
would
love feedback.
---
scala-mode-indent.el | 2 +-
scala-mode-syntax.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scala-mode-indent.el b/scala-mode-indent.el
index d2237bd..486ae65 100644
--- a/scala-mode-indent.el
+++ b/scala-mode-indent.el
@@ -479,7 +479,7 @@ special word found. Special words include 'yield', 'else',
(defun scala-indent:goto-list-anchor (&optional point)
"Moves back to the point whose column will be used to indent
-list rows at current point (or point 'point'). Returns the new
+list rows at current point (or point `point'). Returns the new
point or nil if the point is not in a list element > 1."
(let ((list-beg (scala-syntax:list-p point)))
(when list-beg
diff --git a/scala-mode-syntax.el b/scala-mode-syntax.el
index 995485b..edab1ab 100644
--- a/scala-mode-syntax.el
+++ b/scala-mode-syntax.el
@@ -943,7 +943,7 @@ not. A list must be either enclosed in parentheses or start
with
;; first check that the previous line ended with ','
(when point (goto-char point))
(scala-syntax:beginning-of-code-line)
- (when (scala-syntax:looking-back-token "," 1)
+ (when (and (scala-syntax:looking-back-token "," 1) (not (looking-at-p
")")))
(goto-char (match-beginning 0))
(let ((parenpoint (nth 1 (syntax-ppss))))
(if (and parenpoint (or (= (char-after parenpoint) ?\()
- [nongnu] elpa/scala-mode 4b6ee77 166/217: point to new documentation website, (continued)
- [nongnu] elpa/scala-mode 4b6ee77 166/217: point to new documentation website, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 84850e7 167/217: remove CI badge, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode ee375b9 172/217: idiomatic emacs lisp cleanups, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode c90bbde 176/217: Added a few prettify rules for cats/scalaz operators (#112), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 9b8db62 181/217: upgrade CI (#127), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode b67029a 184/217: fix #120, align according to forms, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 970d88e 187/217: make keywords match case sensitive (#133), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 5209142 189/217: Support for identifiers consisting from operator characters (#138), ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 6f49104 193/217: scala-syntax:propertize-dollar, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 2a7b0fd 195/217: Moved ensime/emacs-scala-mode back to hvesalai/emacs-scala-mode, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 5d28cb3 210/217: feat: support trailing commas (>= Scala 2.12.2),
ELPA Syncer <=
- [nongnu] elpa/scala-mode b21befd 211/217: Fix README.md indenting, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode d837c96 203/217: doc: supports both Scala 2 and 3 (to some extent), not just 2.9, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 2bf5621 207/217: Update README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 402d6df 209/217: Merge pull request #165 from fommil/sbtn, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode ac8106f 025/217: Update README.md, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode d81bc28 028/217: indenting code lines also removes trailing whitespace, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 26cd0b7 040/217: merged from align-parameters, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 884795f 052/217: more fixes to strings, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 7113976 059/217: Indenting for multi-line strings with margin, fixed row comment indent, ELPA Syncer, 2021/08/29
- [nongnu] elpa/scala-mode 8d4f34f 058/217: Use font-lock-doc-face for scaladoc comments, ELPA Syncer, 2021/08/29