fix line run positions from the middle of lines

Author: QuietMisdreavus

Sources/Markdown/Parser/BlockDirectiveParser.swift

@@ -675,10 +675,11 @@ private enum ParseContainer: CustomStringConvertible {
             // We need to keep track of what we removed because cmark will report different source locations than what we
             // had in the source. We'll adjust those when we get them back.
             let trimmedIndentationAndLines = lines.map { line -> (line: TrimmedLine,
-                                                                  indentation: TrimmedLine.Lex?) in
+                                                                  indentation: Int) in
                 var trimmedLine = line
                 let trimmedWhitespace = trimmedLine.lexWhitespace(maxLength: indentationColumnCount)
-                return (trimmedLine, trimmedWhitespace)
+                let indentation = (trimmedWhitespace?.text.count ?? 0) + line.untrimmedText.distance(from: line.untrimmedText.startIndex, to: line.parseIndex)
+                return (trimmedLine, indentation)
             }
 
             // Build the logical block of text that cmark will see.

Sources/Markdown/Parser/RangeAdjuster.swift

@@ -19,18 +19,18 @@ struct RangeAdjuster: MarkupWalker {
 
     /// An array of whitespace spans that were removed for each line, indexed
     /// by line number. `nil` means that no whitespace was removed on that line.
-    var trimmedIndentationPerLine: [TrimmedLine.Lex?]
+    var trimmedIndentationPerLine: [Int]
 
     mutating func defaultVisit(_ markup: Markup) {
         /// This should only be used in the parser where ranges are guaranteed
         /// to be filled in from cmark.
         let adjustedRange = markup.range.map { range -> SourceRange in
             // Add back the offset to the column as if the indentation weren't stripped.
             let start = SourceLocation(line: startLine + range.lowerBound.line - 1,
-                                       column: range.lowerBound.column + (trimmedIndentationPerLine[range.lowerBound.line - 1]?.text.count ?? 0),
+                                       column: range.lowerBound.column + (trimmedIndentationPerLine[range.lowerBound.line - 1] ),
                                        source: range.lowerBound.source)
             let end = SourceLocation(line: startLine + range.upperBound.line - 1,
-                                     column: range.upperBound.column + (trimmedIndentationPerLine[range.upperBound.line - 1]?.text.count ?? 0),
+                                     column: range.upperBound.column + (trimmedIndentationPerLine[range.upperBound.line - 1]),
                                      source: range.upperBound.source)
             return start..<end
         }

Tests/MarkdownTests/Parsing/DoxygenCommandParserTests.swift

@@ -170,8 +170,8 @@ class DoxygenCommandParserTests: XCTestCase {
         let expectedDump = """
         Document @1:1-2:39
         └─ DoxygenParam @1:1-2:39 parameter: thing
-           └─ Paragraph @1:1-2:39
-              ├─ Text @1:1-1:11 "The thing."
+           └─ Paragraph @1:14-2:39
+              ├─ Text @1:14-1:24 "The thing."
               ├─ SoftBreak
               └─ Text @2:1-2:39 "This is the thing that is messed with."
         """