Set offset of max-line-length violation to the last position at whi…

…ch a newline can be inserted to fix the violation (#2419)
pinterest · Dec 11, 2023 · 8b51fb9 · 8b51fb9
1 parent d8955a6
commit 8b51fb9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/MaxLineLengthRule.kt b/...standard/src/main/kotlin/com/pinterest/ktlint/ruleset/standard/rules/MaxLineLengthRule.kt
@@ -83,8 +83,10 @@ public class MaxLineLengthRule :
             ?.takeUnless { it.isPartOfRawMultiLineString() }
             ?.takeUnless { it.isLineOnlyContainingComment() }
             ?.let { lastNodeOnLine ->
+                // Calculate the offset at the last possible position at which the newline should be inserted on the line
+                val offset = node.leavesOnLine().first().startOffset + maxLineLength + 1
                 emit(
-                    lastNodeOnLine.startOffset + lastNodeOnLine.textLength - 1,
+                    offset,
                     "Exceeded max line length ($maxLineLength)",
                     false,
                 )

diff --git a/...dard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/rules/MaxLineLengthRuleTest.kt b/...dard/src/test/kotlin/com/pinterest/ktlint/ruleset/standard/rules/MaxLineLengthRuleTest.kt
@@ -27,7 +27,7 @@ class MaxLineLengthRuleTest {
             .setMaxLineLength()
             .hasLintViolationsWithoutAutoCorrect(
                 LintViolation(2, 47, "Exceeded max line length (46)"),
-                LintViolation(3, 61, "Exceeded max line length (46)"),
+                LintViolation(3, 47, "Exceeded max line length (46)"),
                 LintViolation(5, 47, "Exceeded max line length (46)"),
             )
     }
@@ -159,7 +159,7 @@ class MaxLineLengthRuleTest {
                 .withEditorConfigOverride(IGNORE_BACKTICKED_IDENTIFIER_PROPERTY to true)
                 .hasLintViolationsWithoutAutoCorrect(
                     // Note that no error was generated on line 2 with the long fun name but on another line
-                    LintViolation(3, 91, "Exceeded max line length (37)"),
+                    LintViolation(3, 38, "Exceeded max line length (37)"),
                     LintViolation(4, 38, "Exceeded max line length (37)"),
                 )
         }