From 627b6314c8eaef310f33ff639c81e94930d1a822 Mon Sep 17 00:00:00 2001
From: Georgi Kirilov <>
Date: Wed, 13 Oct 2021 20:41:21 +0300
Subject: [PATCH] better naming

---
 edit.lua | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/edit.lua b/edit.lua
index 223ebf5..edc351f 100644
--- a/edit.lua
+++ b/edit.lua
@@ -36,7 +36,7 @@ local function trailing_space(s, deltas, adj, parent, i, has_eol, keep_electric_
 	return adj
 end
 
-local function indentation(s, deltas, adj, parent, i, pstart, base_indent, last_distinguished, first_argument,
+local function indentation(s, deltas, adj, parent, i, pstart, base_indent, last_distinguished, first_noncomment_argument,
 	op_adj, indent_adj)
 	if s.indent then
 		local delta = base_indent - s.indent
@@ -44,13 +44,13 @@ local function indentation(s, deltas, adj, parent, i, pstart, base_indent, last_
 		if last_distinguished and i > 1 then
 			delta = delta + 1
 			if i - 1 <= last_distinguished then
-				if parent[first_argument + 1].indent then
+				if parent[first_noncomment_argument + 1].indent then
 					delta = delta + 2
 				else
 					delta = firstarg_delta
 				end
 			elseif last_distinguished < 0
-				and i > first_argument + 1 and not parent[first_argument + 1].indent then
+				and i > first_noncomment_argument + 1 and not parent[first_noncomment_argument + 1].indent then
 				delta = firstarg_delta
 			end
 		elseif i == 1 then
@@ -61,7 +61,7 @@ local function indentation(s, deltas, adj, parent, i, pstart, base_indent, last_
 			and not parent[1].is_string  -- a string can't have arguments
 			--and not parent[1].is_list  -- wrong, GNU Emacs compatible behaviour
 			then
-			if i > first_argument + 1 and not parent[first_argument + 1].indent then
+			if i > first_noncomment_argument + 1 and not parent[first_noncomment_argument + 1].indent then
 				delta = firstarg_delta
 			end
 			if delta < 0 then delta = math.max(-s.indent, delta) end
@@ -90,7 +90,7 @@ function M.new(parser, walker, fmt, write, delete, eol_at)
 			return deltas
 		end
 		local last_distinguished = fmt:last_distinguished(parent)
-		local first_argument = 1
+		local first_noncomment_argument = 1
 		if #parent > 2 and parent[1].is_list and #parent[1] > 1 then
 			local op = parent[1]
 			local nearest_indented = op[#op].indent and op[#op] or walker.indented_before(op[#op])
@@ -108,13 +108,13 @@ function M.new(parser, walker, fmt, write, delete, eol_at)
 					last_distinguished = last_distinguished + 1
 				end
 				-- do not let early comments influence the indentation of real expressions:
-			elseif i <= first_argument + 1 and s.is_comment then
-				first_argument = first_argument + 1
+			elseif i <= first_noncomment_argument + 1 and s.is_comment then
+				first_noncomment_argument = first_noncomment_argument + 1
 			end
 			local has_eol = s.is_line_comment
 			adj = leading_space(s, deltas, adj, parent, i, pstart, has_eol)
 			adj = trailing_space(s, deltas, adj, parent, i, has_eol, keep_electric_space)
-			adj = indentation(s, deltas, adj, parent, i, pstart, base_indent, last_distinguished, first_argument,
+			adj = indentation(s, deltas, adj, parent, i, pstart, base_indent, last_distinguished, first_noncomment_argument,
 				op_adj, indent_adj)
 			if i == 1 then
 				op_adj = adj
-- 
2.11.4.GIT