Fix tab stop calculation

mchakravarty · Jan 18, 2025 · 2b53241 · 2b53241
1 parent f63c421
commit 2b53241
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Sources/CodeEditorView/CodeEditing.swift b/Sources/CodeEditorView/CodeEditing.swift
@@ -654,10 +654,14 @@ extension CodeView {
     }
 
     func insertTab(in range: NSRange) -> NSRange {
+      guard let firstLine   = codeStorageDelegate.lineMap.lineOf(index: range.location),
+            let lineInfo    = codeStorageDelegate.lineMap.lookup(line: firstLine)
+      else { return range }
 
-      let nextTabStopIndex = (range.location / indentation.tabWidth + 1) * indentation.tabWidth
-      let replacementString = if indentation.preference == .preferTabs { "\t" }
-                              else { String(repeating: " ", count: nextTabStopIndex - range.location) }
+      let column            = range.location - lineInfo.range.location,
+          nextTabStopIndex  = (column / indentation.tabWidth + 1) * indentation.tabWidth,
+          replacementString = if indentation.preference == .preferTabs { "\t" }
+                              else { String(repeating: " ", count: nextTabStopIndex - column) }
       codeStorage.replaceCharacters(in: range, with: replacementString)
 
       return NSRange(location: range.location + replacementString.utf16.count, length: 0)