wat

Author: aaronik

lua/treewalker/lines.lua

@@ -50,19 +50,14 @@ end
 ---@param line string
 ---@return integer
 function M.get_start_col(line)
-  local tabwidth = vim.opt.tabstop:get()
-  local count = 1 -- 1 indexed
-  for i = 1, #line do
-    local c = line:sub(i, i)
-    if c == "\t" then
-      count = math.floor((count + tabwidth) / tabwidth) * tabwidth
-    elseif c == " " then
-      count = count + 1
-    else
-      break
-    end
+  if not line or line == "" then
+    return 1
   end
-  return count
+  local first = line:find("%S")
+  if not first then
+    return 1
+  end
+  return first
 end
 
 return M

tests/treewalker/lines_spec.lua

@@ -74,5 +74,15 @@ describe("lines", function()
       local indent = lines.get_start_col("  local line = lines.get_indent()")
       assert.equals(3, indent)
     end)
+
+    it("treats tabs as single characters", function()
+      local indent = lines.get_start_col("\tlocal line = lines.get_indent()")
+      assert.equals(2, indent)
+    end)
+
+    it("falls back to the first column when the line is blank", function()
+      local indent = lines.get_start_col("    ")
+      assert.equals(1, indent)
+    end)
   end)
 end)