Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add php-c-lineup-arglist for unexpected indentation #585

Merged
merged 1 commit into from
Nov 10, 2019
Merged

Add php-c-lineup-arglist for unexpected indentation #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion php-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,34 @@ might be to handle switch and goto labels differently."
(c-lang-defconst c-opt-<>-sexp-key
php nil)

(defconst php-mode--re-return-typed-closure
(eval-when-compile
(rx symbol-start "function" symbol-end
(* (syntax whitespace))
"(" (* (not (any "("))) ")"
(* (syntax whitespace))
(? symbol-start "use" symbol-end
(* (syntax whitespace))
"(" (* (not (any "("))) ")"
(* (syntax whitespace)))
":" (+ (not (any "{}")))
(group "{"))))

(defun php-c-lineup-arglist (langelem)
"Line up the current argument line under the first argument using `c-lineup-arglist' LANGELEM."
(let (in-return-typed-closure)
(when (and (consp langelem)
(eq 'arglist-cont-nonempty (car langelem)))
(save-excursion
(save-match-data
(when (and (re-search-backward php-mode--re-return-typed-closure (cdr langelem) t)
(progn
(goto-char (match-data 1))
(not (php-in-string-or-comment-p))))
(setq in-return-typed-closure t)))))
(unless in-return-typed-closure
(c-lineup-arglist langelem))))

(defun php-lineup-cascaded-calls (langelem)
"Line up chained methods using `c-lineup-cascaded-calls',
but only if the setting is enabled"
Expand All @@ -644,7 +672,7 @@ but only if the setting is enabled"
`((c-basic-offset . 4)
(c-offsets-alist . ((arglist-close . php-lineup-arglist-close)
(arglist-cont . (first php-lineup-cascaded-calls 0))
(arglist-cont-nonempty . (first php-lineup-cascaded-calls c-lineup-arglist))
(arglist-cont-nonempty . (first php-lineup-cascaded-calls php-c-lineup-arglist))
(arglist-intro . php-lineup-arglist-intro)
(case-label . +)
(class-open . 0)
Expand Down