bug#35143: 26.1; ada-mode 6.1.0 moves point twice after begin RET

bug#35143: 26.1; ada-mode 6.1.0 moves point twice after begin RET

[Ludovic Brenta]

X-Debbugs-CC: ada-mode-users@nongnu.org
Package: emacs, ada-mode
Version: 26.1
Severity: minor

Visit a file foo.adb consisting of:

procedure Foo is
begin
end Foo;

Now place point after "begin" and type RET.

ada-mode inserts a newline but also moves point an
additional line, on the "e" of "end".  A variant of
this bug is even more severe: go up one line (into the
empty line) and type:

declare RET
I : Integer; RET
begin RET

Now, point is not only moved one line down but also the
"end Foo;" is indented to the right.

-- 
Ludovic Brenta.

bug#35143: 26.1; ada-mode 6.1.0 moves point twice after begin RET

[Ludovic Brenta]

I forgot to mention that this bug is triggered by partial
parsing only; i.e. it is visible only when the buffer-local
variable wisi-partial-parse-threshold is zero.

-- 
Ludovic Brenta.

bug#35143: 26.1; ada-mode 6.1.0 moves point twice after begin RET

[Stephen Leake]

Fixed in development branch.
-- 
-- Stephe

bug#35143: 26.1; ada-mode 6.1.0 moves point twice after begin RET

[Stephen Leake]

Here is the current implementation of 'ada-indent-newline-indent': using
it fixes this bug, as well as some other bad behavior.

(defun ada-indent-newline-indent ()
  "insert a newline, indent the old and new lines."
  (interactive "*")
  ;; point may be in the middle of a word, so insert newline first,
  ;; then go back and indent.
  (insert "\n")
  (unless (and (wisi-partial-parse-p (line-beginning-position) (line-end-position))
	       (save-excursion (progn (forward-char -1)(looking-back "begin\\|else" (line-beginning-position)))))
    ;; Partial parse may think 'begin' is just the start of a
    ;; statement, when it's actually part of a larger declaration. So
    ;; don't indent 'begin'. Similarly for 'else'; error recovery will
    ;; probably insert 'if then' immediately before it
    (forward-char -1)
    (funcall indent-line-function)
    (forward-char 1))
  (funcall indent-line-function))

--
-- Stephe

bug#35143: Fixed in ada-mode 6.1.0

[Stephen Leake]

Fixed in ada-mode 6.1.0
-- 
-- Stephe

bug#35143: close

[Stephen Leake]

-- 
-- Stephe