[Fix emacs-ess#265] Indentation of else following curly

e3bo · Nov 3, 2015 · a2c55c7 · a2c55c7
1 parent e1a49f7
commit a2c55c7
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 1 deletion.
diff --git a/lisp/ess-r-syntax.el b/lisp/ess-r-syntax.el
@@ -776,7 +776,7 @@ expression."
   (cond
    ;; Climb braced body
    ((ess-save-excursion-when-nil
-      (and (when (progn (ess-skip-blanks-backward)
+      (and (when (progn (ess-skip-blanks-backward t)
                         (eq (char-before) ?\}))
              (prog1 t (forward-char -1)))
            (ess-up-list -1))))

diff --git a/test/styles/C++.R b/test/styles/C++.R
@@ -754,6 +754,17 @@ if (condition) {
     (stuff)
 }
 
+## 26
+{
+    if (condition1)
+        stuff1
+    else if (condition2) {
+        stuff2
+    }
+    else if (condition3)
+        stuff3
+}
+
 
 ### Continuation lines
 

diff --git a/test/styles/RRR+.R b/test/styles/RRR+.R
@@ -754,6 +754,17 @@ if (condition) {
     (stuff)
 }
 
+## 26
+{
+    if (condition1)
+        stuff1
+    else if (condition2) {
+        stuff2
+    }
+    else if (condition3)
+        stuff3
+}
+
 
 ### Continuation lines
 

diff --git a/test/styles/RRR.R b/test/styles/RRR.R
@@ -754,6 +754,17 @@ if (condition) {
     (stuff)
 }
 
+## 26
+{
+    if (condition1)
+        stuff1
+    else if (condition2) {
+        stuff2
+    }
+    else if (condition3)
+        stuff3
+}
+
 
 ### Continuation lines
 

diff --git a/test/styles/RStudio-.R b/test/styles/RStudio-.R
@@ -754,6 +754,17 @@ if (condition) {
   (stuff)
 }
 
+## 26
+{
+  if (condition1)
+    stuff1
+  else if (condition2) {
+    stuff2
+  }
+  else if (condition3)
+    stuff3
+}
+
 
 ### Continuation lines
 

diff --git a/test/styles/misc1.R b/test/styles/misc1.R
@@ -754,6 +754,17 @@ if (condition) {
    (stuff)
 }
 
+## 26
+{
+   if (condition1)
+      stuff1
+   else if (condition2) {
+      stuff2
+   }
+   else if (condition3)
+      stuff3
+}
+
 
 ### Continuation lines