Skip to content

Fix issue introduced in #585 #587

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

Merged
merged 1 commit into from
Nov 11, 2019
Merged

Fix issue introduced in #585 #587

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
9 changes: 4 additions & 5 deletions php-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,11 +653,10 @@ might be to handle switch and goto labels differently."
(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)))))
(when (re-search-backward php-mode--re-return-typed-closure (cdr langelem) t)
(goto-char (match-beginning 1))
(when (not (php-in-string-or-comment-p))
(setq in-return-typed-closure t))))))
(unless in-return-typed-closure
(c-lineup-arglist langelem))))

Expand Down