emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/scala: fix comment continuation #1515

Browse source 
On Doom's modded newline-and-indent.
This commit is contained in:
Henrik Lissner 2019-06-27 23:56:17 +02:00
parent c3d48e286b
commit 08e125d3d0
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/lang/scala/autoload.el Normal file
View file

@ -0,0 +1,35 @@
;;; lang/scala/autoload.el -*- lexical-binding: t; -*-
;;;###autoload
(defun +scala-comment-indent-new-line (&rest _)
"Continue the commnt on the current line.
Meant to be used for `scala-mode's `comment-line-break-function'."
(let* ((state (syntax-ppss))
(comment-start-pos (nth 8 state)))
(save-match-data
(cond ((and (integerp (nth 4 state))
;; Ensure that we're inside a scaladoc comment
(string-match-p "^/\\*\\*?[^\\*]?"
(buffer-substring-no-properties
comment-start-pos
(min (+ comment-start-pos 4)
(point-max))))
(progn
(setq prev-line (buffer-substring-no-properties
(line-beginning-position 0)
(line-end-position 0)))
(or (string-match "^\\s-*\\*" prev-line)
(string-match "\\s-*/*" prev-line))))
(newline nil t)
(indent-according-to-mode)
(insert (make-string (max 0 (- (1- (match-end 0))
(match-beginning 0)))
? )
"*")
(scala-indent:indent-on-scaladoc-asterisk))
((nth 4 state) ; for line comments
(call-interactively #'comment-indent-new-line))
(t
(newline nil t)
(indent-according-to-mode))))))