bug#19263: 25.0.50; scss-mode: interpolated variable indentation

bug#19263: 25.0.50; scss-mode: interpolated variable indentation

[Simen Heggestøyl]

[-- Attachment #1: Type: text/plain, Size: 3201 bytes --]

The following Sassy CSS block is indented wrongly by `scss-mode':

div {
    p.#{$hyphenated-var} {
    color: #f00;
}
}

The following indentation was expected:

div {
    p.#{$hyphenated-var} {
        color: #f00;
    }
}

The code gets indented correctly if any of these changes are made to
the block:

 * Un-hyphenate the interpolated variable [1], for instance to `$var'.

 * Add any property to the parent `div'.


[1] 
http://sass-lang.com/documentation/file.SASS_REFERENCE.html#interpolation_


In GNU Emacs 25.0.50.1 (x86_64-unknown-linux-gnu, GTK+ Version 3.14.4)
 of 2014-12-03 on x240
Repository revision: e148a1eacaaa6d6e67db09188f66dab06937ae0d
Windowing system distributor `The X.Org Foundation', version 
11.0.11601901
System Description:	Debian GNU/Linux testing (jessie)

Configured using:
 `configure --without-makeinfo'

Configured features:
XPM JPEG TIFF GIF PNG SOUND DBUS GSETTINGS NOTIFY LIBXML2 FREETYPE XFT
ZLIB

Important settings:
  value of $LANG: en_US.UTF-8
  locale-coding-system: utf-8-unix

Major mode: SCSS

Minor modes in effect:
  tooltip-mode: t
  global-eldoc-mode: t
  electric-indent-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  blink-cursor-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t

Recent messages:
Quit
Mark set [2 times]
Indenting region...done
Quit
Undo!
Mark set
Quit
Mark set
Indenting region...done
Making completion list...

Load-path shadows:
None found.

Features:
(shadow sort gnus-util mail-extr emacsbug message format-spec rfc822 mml
mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev
gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util
mail-prsvr mail-utils css-mode smie js advice help-fns byte-opt bytecomp
byte-compile cl-extra cl-loaddefs cl-lib cconv json imenu thingatpt
cc-mode cc-fonts easymenu cc-guess cc-menus cc-cmds cc-styles cc-align
cc-engine cc-vars cc-defs misearch multi-isearch dired-aux dired
time-date tooltip eldoc electric uniquify ediff-hook vc-hooks
lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt
fringe tabulated-list newcomment elisp-mode lisp-mode prog-mode register
page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock
font-lock syntax facemenu font-core frame cham georgian utf-8-lang
misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew
greek romanian slovak czech european ethiopic indian cyrillic chinese
case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer nadvice
loaddefs button faces cus-face macroexp files text-properties overlay
sha1 md5 base64 format env code-pages mule custom widget
hashtable-print-readable backquote make-network-process dbusbind
gfilenotify dynamic-setting system-font-setting font-render-setting
move-toolbar gtk x-toolkit x multi-tty emacs)

Memory information:
((conses 16 106367 7206)
 (symbols 48 21399 0)
 (miscs 40 78 372)
 (strings 32 21229 3819)
 (string-bytes 1 729005)
 (vectors 16 13860)
 (vector-slots 8 429380 2421)
 (floats 8 73 231)
 (intervals 56 382 10)
 (buffers 976 15)
 (heap 1024 35855 1014))



[-- Attachment #2: Type: text/html, Size: 4757 bytes --]

bug#19263: 25.0.50; scss-mode: interpolated variable indentation

[Simen Heggestøyl]

[-- Attachment #1: Type: text/plain, Size: 883 bytes --]

The bug seems to be fixed by the following patch:

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 1759643..e94b11f 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -450,7 +450,7 @@
 (defun scss-smie--not-interpolation-p ()
   (save-excursion
     (forward-char -1)
-    (or (zerop (skip-chars-backward "[:alnum:]"))
+    (or (zerop (skip-chars-backward "-[:alnum:]"))
         (not (looking-back "#{\\$" (- (point) 3))))))

 ;;;###autoload (add-to-list 'auto-mode-alist '("\\.scss\\'" . 
scss-mode))

I wanted to add a test case for this as well, but I couldn't
understand how the indentation tests work. Are the files in
‘test/indent/’ supposed to exemplify correct indentation? In that
case, the indentation in ‘test/indent/scss-mode.scss’ seems to be
wrong given the default indent offset of 4.

[-- Attachment #2: Type: text/html, Size: 1164 bytes --]

bug#19263: 25.0.50; scss-mode: interpolated variable indentation

[Stefan Monnier]

> -    (or (zerop (skip-chars-backward "[:alnum:]"))
> +    (or (zerop (skip-chars-backward "-[:alnum:]"))

Thanks, that looks right.  I'll check to see if other places need
similar fixes,


        Stefan

bug#19263: 25.0.50; scss-mode: interpolated variable indentation

[Simen Heggestøyl]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

Hi again.

Did you find any other places needing similar fixes?

-- Simen

On Sun, Dec 14, 2014 at 5:40 AM, Stefan Monnier 
<monnier@iro.umontreal.ca> wrote:
>>  -    (or (zerop (skip-chars-backward "[:alnum:]"))
>>  +    (or (zerop (skip-chars-backward "-[:alnum:]"))
> 
> Thanks, that looks right.  I'll check to see if other places need
> similar fixes,
> 
> 
>         Stefan

[-- Attachment #2: Type: text/html, Size: 565 bytes --]

bug#19263: 25.0.50; scss-mode: interpolated variable indentation

[Stefan Monnier]

> Did you find any other places needing similar fixes?

No, that looked like the only place, thanks, installed.


        Stefan