Fix MultilineRawStringIndentation

TWiStErRob · Nov 26, 2022 · 79ffdd6 · 79ffdd6
1 parent d98a248
commit 79ffdd6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
@@ -82,8 +82,7 @@ style:
     excludeCommentStatements: true
 
   MultilineRawStringIndentation:
-    # TODEL https://github.com/detekt/detekt/issues/5564
-    active: false
+    indentSize: 1
 
   ReturnCount:
     # Default 2 is not enough, usually a single guard and a condition simply violates this.

diff --git a/test/src/main/kotlin/net/twisterrob/gradle/test/BuildResultExtensions.kt b/test/src/main/kotlin/net/twisterrob/gradle/test/BuildResultExtensions.kt
@@ -55,7 +55,7 @@ fun BuildResult.assertNoOutputLine(reason: String?, unexpectedLine: String) {
 }
 
 private fun BuildResult.assertRegex(reason: String?, regex: Regex, positive: Boolean = true) {
-	val message = """
+	val message = @Suppress("MultilineRawStringIndentation") """
 		${reason.orEmpty()}
 		Expected:
 		${if (positive) "" else "No match for "}${regex}

diff --git a/test/src/main/kotlin/net/twisterrob/gradle/test/GradleRunnerRule.kt b/test/src/main/kotlin/net/twisterrob/gradle/test/GradleRunnerRule.kt
@@ -157,7 +157,7 @@ open class GradleRunnerRule : TestRule {
 		val java = "${javaVendor} ${javaRuntimeName} ${javaVersion} (${javaRuntimeVersion} ${javaVersionDate})"
 		@Suppress("ForbiddenMethodCall") // TODO abstract logging.
 		println(
-			"""
+			@Suppress("MultilineRawStringIndentation") """
 				${gradleVersion} worker #${gradleTestWorkerId} at ${testKitDir?.absolutePath}.
 				Java: ${java} from ${javaHome}.
 				Gradle properties:
@@ -195,7 +195,7 @@ ${buildContentForLogging().prependIndent("\t\t\t\t")}
 				"classpath files('${it.absolutePath.replace("\\", "\\\\")}')"
 			}
 		@Language("gradle")
-		val buildscript = """
+		val buildscript = @Suppress("MultilineRawStringIndentation") """
 			buildscript {
 				dependencies {
 ${classPaths.prependIndent("\t\t\t\t\t")}