emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/swift-mode 2b2e8581ba: Fix inner scope guard indent


From: ELPA Syncer
Subject: [nongnu] elpa/swift-mode 2b2e8581ba: Fix inner scope guard indent
Date: Thu, 31 Aug 2023 07:00:20 -0400 (EDT)

branch: elpa/swift-mode
commit 2b2e8581baada838a7ac667a244f61fcfdd647a9
Author: John Buckley <nhoj.buckley@gmail.com>
Commit: taku0 <taku0@users.noreply.github.com>

    Fix inner scope guard indent
---
 swift-mode-indent.el                     | 2 +-
 test/swift-files/indent/statements.swift | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/swift-mode-indent.el b/swift-mode-indent.el
index 1db26a69aa..3ab465e69f 100644
--- a/swift-mode-indent.el
+++ b/swift-mode-indent.el
@@ -912,7 +912,7 @@ OFFSET is extra offset if given."
   (let ((parent (swift-mode:backward-sexps-until
                  (append
                   (remove 'implicit-\; swift-mode:statement-parent-tokens)
-                  '("if")))))
+                  '("if" "guard")))))
     (if (equal (swift-mode:token:text parent) "if")
         (cond
          ;; Found "if" at the beginning of a line.  Align with it.
diff --git a/test/swift-files/indent/statements.swift 
b/test/swift-files/indent/statements.swift
index 59d9105851..45ada271f0 100644
--- a/test/swift-files/indent/statements.swift
+++ b/test/swift-files/indent/statements.swift
@@ -715,6 +715,14 @@ guard
 else {
 }
 
+// Inner scope guard
+
+func main() {
+    guard foo else {
+        bar()
+    }
+}
+
 // Switch statement
 
 switch foo



reply via email to

[Prev in Thread] Current Thread [Next in Thread]