Skip to content

Handle mutually recursive definitions in phrase detection #174

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
May 24, 2018
Merged

Handle mutually recursive definitions in phrase detection #174

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
15 changes: 9 additions & 6 deletions fsharp-mode-indent.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,11 +913,11 @@ NOMARK is not nil."
(found nil)
initial-indent)
(fsharp-goto-initial-line)
;; if on blank or non-indenting comment line, use the preceding stmt
(if (looking-at "[ \t]*\\($\\|//[^ \t\n]\\)")
(progn
(fsharp-goto-statement-at-or-above)
(setq found (fsharp-statement-opens-block-p))))
;; if on and (mutually recursive bindings), blank or non-indenting comment line, use the preceding stmt
(when (or (looking-at "[ \t]*\\($\\|//[^ \t\n]\\)")
(looking-at-p "[ \t]*and[ \t]+"))
(fsharp-goto-statement-at-or-above)
(setq found (fsharp-statement-opens-block-p)))
;; search back for colon line indented less
(setq initial-indent (current-indentation))
(if (zerop initial-indent)
Expand Down Expand Up @@ -1618,7 +1618,10 @@ This tells add-log.el how to find the current function/method/variable."
(forward-line -1))
(error
(progn (goto-char (point-max)))))
(end-of-line))
(end-of-line)
(when (looking-at-p "\n[ \t]*and[ \t]+")
(forward-line 1)
(fsharp-end-of-block)))
(goto-char (point-max))))

(provide 'fsharp-mode-indent)
Expand Down