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

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

[nongnu] elpa/lua-mode 98f7fb0 145/468: lua-calculate-indentation: remov


From: Philip Kaludercic
Subject: [nongnu] elpa/lua-mode 98f7fb0 145/468: lua-calculate-indentation: remove unneeded variables & "let" form
Date: Thu, 5 Aug 2021 04:58:25 -0400 (EDT)

branch: elpa/lua-mode
commit 98f7fb0a511ba1e23656572724909cd71fcc26bb
Author: immerrr <immerrr+lua@gmail.com>
Commit: immerrr <immerrr+lua@gmail.com>

    lua-calculate-indentation: remove unneeded variables & "let" form
---
 lua-mode.el | 48 +++++++++++++++++++++++-------------------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/lua-mode.el b/lua-mode.el
index 82fc2fd..0ee077d 100644
--- a/lua-mode.el
+++ b/lua-mode.el
@@ -981,31 +981,29 @@ to the left by the amount specified in lua-indent-level."
 
 (defun lua-calculate-indentation (&optional parse-start)
   "Return appropriate indentation for current line as Lua code."
-  (let ((pos (point))
-        (indent-amt 0))
-    (save-excursion
-      (let ((continuing-p (lua-is-continuing-statement-p)))
-        (or
-         ;; when calculating indentation, do the following:
-         ;; 1. check, if the line starts with indentation-modifier (open/close 
brace)
-         ;;    and if it should be indented/unindented in special way
-         (lua-calculate-indentation-override)
-
-         ;; 2. otherwise, use indentation modifiers from previous line + it's 
own indentation
-         ;; 3. if previous line doesn't contain indentation modifiers, 
additionally check
-         ;;    if current line is a continuation line and add lua-indent-level 
if it is
-         (when (lua-forward-line-skip-blanks 'back)
-              ;; the order of function calls here is important. block modifier
-              ;; call may change the point to another line
-              (let ((modifier
-                     (lua-calculate-indentation-block-modifier nil 
(line-end-position))))
-                (+ (if (and continuing-p (= 0 modifier))
-                       lua-indent-level
-                     modifier)
-                   (current-indentation))))
-
-         ;; 4. if there's no previous line, indentation is 0
-         0)))))
+  (save-excursion
+    (let ((continuing-p (lua-is-continuing-statement-p)))
+      (or
+       ;; when calculating indentation, do the following:
+       ;; 1. check, if the line starts with indentation-modifier (open/close 
brace)
+       ;;    and if it should be indented/unindented in special way
+       (lua-calculate-indentation-override)
+
+       ;; 2. otherwise, use indentation modifiers from previous line + it's 
own indentation
+       ;; 3. if previous line doesn't contain indentation modifiers, 
additionally check
+       ;;    if current line is a continuation line and add lua-indent-level 
if it is
+       (when (lua-forward-line-skip-blanks 'back)
+         ;; the order of function calls here is important. block modifier
+         ;; call may change the point to another line
+         (let ((modifier
+                (lua-calculate-indentation-block-modifier nil 
(line-end-position))))
+           (+ (if (and continuing-p (= 0 modifier))
+                  lua-indent-level
+                modifier)
+              (current-indentation))))
+
+       ;; 4. if there's no previous line, indentation is 0
+       0))))
 
 (defun lua-beginning-of-proc (&optional arg)
   "Move backward to the beginning of a lua proc (or similar).



reply via email to

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