unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: jaseemabid@gmail.com
To: gnu.emacs.bug@googlegroups.com
Cc: 8576@debbugs.gnu.org
Subject: bug#8576: 23.2; ,	js-mode doesn't support multi-line variable declarations
Date: Thu, 5 Jul 2012 18:23:07 -0700 (PDT)	[thread overview]
Message-ID: <98492e27-9d98-4a92-9704-3d0ea14e7795@googlegroups.com> (raw)
In-Reply-To: <mailman.4157.1341536766.855.bug-gnu-emacs@gnu.org>

On Friday, 6 July 2012 06:22:23 UTC+5:30, Dmitry Gutov  wrote:
> > When the first var is staring with an offset, like inside a nested
> > function or something, this is failing. It feels like the second line
> > is indented wrt to coloumn 0 and not wrt to the "var" statement.
> 
> Reproduced when `indent-tabs-mode' is t.
> 
> Here's the updated patch for trunk.
> 
> -- Dmitry
> 
> 
> diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
> index 2e943be..98883a9 100644
> --- a/lisp/progmodes/js.el
> +++ b/lisp/progmodes/js.el
> @@ -1680,6 +1680,9 @@ This performs fontification according to `js--class-styles'."
>            (js--regexp-opt-symbol '("in" "instanceof")))
>    "Regexp matching operators that affect indentation of continued expressions.")
>  
> +(defconst js--declaration-keyword-re
> +  (regexp-opt '("var" "let" "const") 'words)
> +  "Regular matching variable declaration keywords.")
>  
>  (defun js--looking-at-operator-p ()
>    "Return non-nil if point is on a JavaScript operator, other than a comma."
> @@ -1759,6 +1762,42 @@ nil."
>           (list (cons 'c js-comment-lineup-func))))
>      (c-get-syntactic-indentation (list (cons symbol anchor)))))
>  
> +(defun js--multiline-decl-indentation ()
> +  "Returns the declaration indentation column if the current line belongs
> +to a multiline declaration statement.  All declarations are lined up vertically:
> +
> +var a = 10,
> +    b = 20,
> +    c = 30;
> +"
> +  (let (at-opening-bracket)
> +    (save-excursion
> +      (back-to-indentation)
> +      (when (not (looking-at js--declaration-keyword-re))
> +        (when (looking-at js--indent-operator-re)
> +          (goto-char (match-end 0)))
> +        (while (and (not at-opening-bracket)
> +                    (not (bobp))
> +                    (let ((pos (point)))
> +                      (save-excursion
> +                        (js--backward-syntactic-ws)
> +                        (or (eq (char-before) ?,)
> +                            (and (not (eq (char-before) ?\;))
> +                                 (and
> +                                  (prog2
> +                                      (skip-chars-backward "[[:punct:]]")
> +                                      (looking-at js--indent-operator-re)
> +                                    (js--backward-syntactic-ws))
> +                                  (not (eq (char-before) ?\;))))
> +                            (and (>= pos (point-at-bol))
> +                                 (<= pos (point-at-eol)))))))
> +          (condition-case err
> +              (backward-sexp)
> +            (scan-error (setq at-opening-bracket t))))
> +        (when (looking-at js--declaration-keyword-re)
> +          (goto-char (match-end 0))
> +          (1+ (current-column)))))))
> +
>  (defun js--proper-indentation (parse-status)
>    "Return the proper indentation for the current line."
>    (save-excursion
> @@ -1769,6 +1808,7 @@ nil."
>            ((js--ctrl-statement-indentation))
>            ((eq (char-after) ?#) 0)
>            ((save-excursion (js--beginning-of-macro)) 4)
> +          ((js--multiline-decl-indentation))
>            ((nth 1 parse-status)
>  	   ;; A single closing paren/bracket should be indented at the
>  	   ;; same level as the opening statement. Same goes for

In the mean while, I tried js2-mode. Reported the same issue there. 
Fixed it here : https://github.com/mooz/js2-mode/commit/3ee849316253121ec4ee51268bc814ab60d63b2f





  parent reply	other threads:[~2012-07-06  1:23 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-28  7:22 bug#8576: 23.2; js-mode doesn't support multi-line variable declarations Felix H. Dahlke
2011-06-19 20:38 ` Daniel Colascione
2012-02-15 12:32   ` Felix H. Dahlke
2012-02-15 18:58     ` Stefan Monnier
2012-02-15 19:04       ` Glenn Morris
2012-02-15 19:25       ` Daniel Colascione
2012-02-15 20:41         ` Stefan Monnier
2012-04-04 11:26         ` Felix H. Dahlke
2012-06-01  7:30           ` Felix H. Dahlke
     [not found]           ` <mailman.2065.1338535901.855.bug-gnu-emacs@gnu.org>
2012-07-05 14:53             ` jaseemabid
2012-02-24  2:16 ` Dmitry Gutov
2012-03-03  1:46 ` bug#8576: " Zeth
2012-03-03  4:51   ` Daniel Colascione
2012-06-07 23:04 ` bug#8576: 23.2; " Dmitry Gutov
2012-06-08  3:13   ` Felix H. Dahlke
2012-07-17  3:16   ` Felix H. Dahlke
2012-07-05 23:02 ` bug#8576: 23.2; , " Dmitry Gutov
2012-07-06  0:52 ` Dmitry Gutov
     [not found] ` <mailman.4157.1341536766.855.bug-gnu-emacs@gnu.org>
2012-07-06  1:23   ` jaseemabid [this message]
2012-07-17  4:21 ` bug#8576: 23.2; " Dmitry Gutov
2012-07-17  4:37   ` Felix H. Dahlke
2012-07-17  5:00 ` Dmitry Gutov
2012-07-17  6:32   ` Stefan Monnier
2012-07-17  8:24     ` Felix H. Dahlke
2012-07-17  9:50       ` Stefan Monnier
2012-07-17  9:51         ` Felix H. Dahlke
2012-07-17 17:33         ` Felix H. Dahlke
2013-01-10  3:48           ` Felix H. Dahlke
2013-01-11 23:25             ` Stefan Monnier
2013-01-12  2:59               ` Felix H. Dahlke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=98492e27-9d98-4a92-9704-3d0ea14e7795@googlegroups.com \
    --to=jaseemabid@gmail.com \
    --cc=8576@debbugs.gnu.org \
    --cc=gnu.emacs.bug@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).