Use helper functions directly from ktlint instead of copies

These functions formerly were private but are public now, see pinterest/ktlint#725.
sschuberth · Jun 3, 2020 · 21e90e6 · 21e90e6
1 parent e8bc08a
commit 21e90e6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 78 deletions.
diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/FormattingRule.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/FormattingRule.kt
@@ -44,7 +44,7 @@ abstract class FormattingRule(config: Config) : Rule(config) {
     override fun visit(root: KtFile) {
         this.root = root
         root.node.putUserData(KtLint.ANDROID_USER_DATA_KEY, isAndroid)
-        positionByOffset = calculateLineColByOffset(normalizeText(root.text))
+        positionByOffset = KtLint.calculateLineColByOffset(KtLint.normalizeText(root.text))
         editorConfigUpdater()?.let { updateFunc ->
             val oldEditorConfig = root.node.getUserData(KtLint.EDITOR_CONFIG_USER_DATA_KEY)
             root.node.putUserData(KtLint.EDITOR_CONFIG_USER_DATA_KEY, updateFunc(oldEditorConfig))

diff --git a/...-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/OffsetsToLineColumn.kt b/...-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/OffsetsToLineColumn.kt