code review 5728063: misc/emacs: fix extra indentation after comments that e...

misc/emacs: fix extra indentation after comments that end with a period
in emacs go mode.  Thanks Alex Shinn for the patch.

[Sameer Ajmani, 2012-03-05 17:24:46]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2012-03-05 17:25:59]

LGTM
 On Mar 5, 2012 9:24 AM, <sameer@golang.org> wrote:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> misc/emacs: fix extra indentation after comments that end with a period
> in emacs go mode.  Thanks Alex Shinn for the patch.
>
> Please review this at
http://codereview.appspot.com/**5728063/<http://codereview.appspot.com/5728063/>
>
> Affected files:
>  M misc/emacs/go-mode.el
>
>
> Index: misc/emacs/go-mode.el
> ==============================**==============================**=======
> --- a/misc/emacs/go-mode.el
> +++ b/misc/emacs/go-mode.el
> @@ -406,6 +406,22 @@
>        (when (/= (skip-chars-backward "[:word:]_") 0)
>          (not (looking-at go-mode-non-terminating-**keywords-regexp)))))))
>
> +(defun go-mode-backward-skip-comments ()
> +  "Skip backward over comments and whitespace."
> +  (when (not (bobp))
> +    (backward-char))
> +  (while (and (not (bobp))
> +              (or (eq 32 (char-syntax (char-after (point))))
> +                  (go-mode-cs)))
> +    (skip-syntax-backward "-")
> +    (when (and (not (bobp)) (eq 32 (char-syntax (char-after (point)))))
> +      (backward-char))
> +    (when (go-mode-cs)
> +      (let ((pos (previous-single-property-**change (point)
> 'go-mode-cs)))
> +        (if pos (goto-char pos) (goto-char (point-min))))))
> +  (when (and (not (go-mode-cs)) (eq 32 (char-syntax (char-after (1+
> (point))))))
> +    (forward-char 1)))
> +
>  (defun go-mode-indentation ()
>   "Compute the ideal indentation level of the current line.
>
> @@ -451,7 +467,8 @@
>                    (incf indent tab-width))
>                   ((?\()
>                    (goto-char (car nest))
> -                   (forward-comment (- (buffer-size)))
> +                   (beginning-of-line)
> +                   (go-mode-backward-skip-**comments)
>                    ;; Really just want the token before
>                    (when (looking-back "\\<import\\|const\\|var\\|**type"
>                                        (max (- (point) 7) (point-min)))
> @@ -465,7 +482,8 @@
>             (decf indent tab-width))
>
>           ;; Continuation lines are indented 1 level
> -          (forward-comment (- (buffer-size)))
> +          (beginning-of-line)
> +          (go-mode-backward-skip-**comments)
>           (when (case (char-before)
>                   ((nil ?\{ ?:)
>                    ;; At the beginning of a block or the statement
>
>
>

[Sameer Ajmani, 2012-03-05 19:59:02]

*** Submitted as http://code.google.com/p/go/source/detail?r=7edc1081439f ***

misc/emacs: fix extra indentation after comments that end with a period
in emacs go mode.  Thanks Alex Shinn for the patch.

R=golang-dev, bradfitz
CC=golang-dev
http://codereview.appspot.com/5728063