Fix ktlint issues for new default rules

detekt · Apr 22, 2023 · b921d46 · b921d46
1 parent 1bedc03
commit b921d46
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Config.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Config.kt
@@ -37,7 +37,7 @@ interface Config {
     /**
      * Is thrown when loading a configuration results in errors.
      */
-    class InvalidConfigurationError(throwable: Throwable? = null /* nullable to not break signature */) :
+    class InvalidConfigurationError(throwable: Throwable? = null) :
         RuntimeException(
             "Provided configuration file is invalid: Structure must be from type Map<String,Any>!" +
                 throwable?.let { "\n" + it.message }.orEmpty(),

diff --git a/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/CliArgs.kt b/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/CliArgs.kt
@@ -153,7 +153,7 @@ class CliArgs {
         The following @Parameters are used for type resolution. When additional parameters are required the
         names should mirror the names found in this file (e.g. "classpath", "language-version", "jvm-target"):
         https://github.com/JetBrains/kotlin/blob/master/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.kt
-    */
+     */
     @Parameter(
         names = ["--classpath", "-cp"],
         description = "EXPERIMENTAL: Paths where to find user class files and depending jar files. " +

diff --git a/.../src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressorSpec.kt b/.../src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressorSpec.kt
@@ -24,7 +24,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) {
     inner class AnnotationSuppressorFactory {
         @Test
         fun `Factory returns null if ignoreAnnotated is not set`() {
-            val suppressor = annotationSuppressorFactory(buildConfigAware(/* empty */), BindingContext.EMPTY)
+            val suppressor = annotationSuppressorFactory(buildConfigAware(), BindingContext.EMPTY)
 
             assertThat(suppressor).isNull()
         }

diff --git a/...re/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressorSpec.kt b/...re/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressorSpec.kt
@@ -18,7 +18,7 @@ class FunctionSuppressorSpec {
         @Test
         fun `Factory returns null if ignoreFunction is not set`() {
             val suppressor = functionSuppressorFactory(
-                buildConfigAware(/* empty */),
+                buildConfigAware(),
                 BindingContext.EMPTY,
             )
 

diff --git a/...generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleVisitor.kt b/...generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleVisitor.kt
@@ -171,10 +171,10 @@ internal class RuleVisitor : DetektVisitor() {
             // which needs detekt-formatting.jar,
             // which needs :detekt-formatting:processResources task output,
             // which needs output of this class.
-            /*io.gitlab.arturbosch.detekt.api.Rule*/ "Rule",
-            /*io.gitlab.arturbosch.detekt.formatting.FormattingRule*/ "FormattingRule",
-            /*io.gitlab.arturbosch.detekt.api.ThresholdRule*/ "ThresholdRule",
-            /*io.gitlab.arturbosch.detekt.rules.empty.EmptyRule*/ "EmptyRule",
+            "Rule", // io.gitlab.arturbosch.detekt.api.Rule
+            "FormattingRule", // io.gitlab.arturbosch.detekt.formatting.FormattingRule
+            "ThresholdRule", // io.gitlab.arturbosch.detekt.api.ThresholdRule
+            "EmptyRule", // io.gitlab.arturbosch.detekt.rules.empty.EmptyRule
         )
 
         private const val ISSUE_ARGUMENT_SIZE = 4

diff --git a/...kt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/ClassLoaderCache.kt b/...kt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/ClassLoaderCache.kt
@@ -19,7 +19,7 @@ internal class DefaultClassLoaderCache : ClassLoaderCache {
         return classpathFilesHashWithLoaders.getOrPut(classpathHashCode) {
             URLClassLoader(
                 classpathFiles.map { it.toURI().toURL() }.toTypedArray(),
-                null /* isolate detekt environment */
+                null // isolate detekt environment
             )
         }
     }

diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxLineLength.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxLineLength.kt
@@ -78,7 +78,7 @@ class MaxLineLength(config: Config = Config.empty) : Rule(config) {
                 report(CodeSmell(issue, Entity.from(ktElement, location), issue.description))
             }
 
-            offset += 1 /* '\n' */
+            offset += 1 // '\n'
         }
     }
 

diff --git a/...rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrailingWhitespace.kt b/...rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrailingWhitespace.kt
@@ -47,7 +47,7 @@ class TrailingWhitespace(config: Config = Config.empty) : Rule(config) {
                     report(CodeSmell(issue, entity, createMessage(index)))
                 }
             }
-            offset += 1 /* '\n' */
+            offset += 1 // '\n'
         }
     }