diff --git a/build-logic/src/main/kotlin/module.gradle.kts b/build-logic/src/main/kotlin/module.gradle.kts index d50783d7d01..d5217bb34b8 100644 --- a/build-logic/src/main/kotlin/module.gradle.kts +++ b/build-logic/src/main/kotlin/module.gradle.kts @@ -52,7 +52,7 @@ tasks.withType().configureEach { kotlinOptions { jvmTarget = Versions.JVM_TARGET freeCompilerArgs += listOf( - "-progressive", + "-progressive" ) allWarningsAsErrors = project.findProperty("warningsAsErrors") == "true" } diff --git a/build.gradle.kts b/build.gradle.kts index 67b953611db..9942f7d5992 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,7 +18,7 @@ allprojects { io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_SRC_DIR_JAVA, io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_TEST_SRC_DIR_JAVA, io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_SRC_DIR_KOTLIN, - io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_TEST_SRC_DIR_KOTLIN, + io.gitlab.arturbosch.detekt.extensions.DetektExtension.DEFAULT_TEST_SRC_DIR_KOTLIN ) buildUponDefaultConfig = true baseline = file("$rootDir/config/detekt/baseline.xml") diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/AnnotationExcluder.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/AnnotationExcluder.kt index a8bef2c5360..b054e0a81dc 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/AnnotationExcluder.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/AnnotationExcluder.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.resolve.BindingContext class AnnotationExcluder( root: KtFile, private val excludes: List, - private val context: BindingContext, + private val context: BindingContext ) { private val fullQualifiedNameGuesser = FullQualifiedNameGuesser(root) @@ -26,19 +26,19 @@ class AnnotationExcluder( root, excludes.mapAll { it } .map { it.replace(".", "\\.").replace("*", ".*").toRegex() }, - BindingContext.EMPTY, + BindingContext.EMPTY ) @Deprecated("Use AnnotationExcluder(List, KtFile) instead") constructor( root: KtFile, - excludes: List, + excludes: List ) : this( root, excludes.map { it.replace(".", "\\.").replace("*", ".*").toRegex() }, - BindingContext.EMPTY, + BindingContext.EMPTY ) /** diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/ConfigProperty.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/ConfigProperty.kt index 056cd9f6eaa..61d6d85be0f 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/ConfigProperty.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/ConfigProperty.kt @@ -86,7 +86,7 @@ fun configWithFallback( */ fun configWithAndroidVariants( defaultValue: T, - defaultAndroidValue: T, + defaultAndroidValue: T ): ReadOnlyProperty = configWithAndroidVariants(defaultValue, defaultAndroidValue) { it } /** diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Location.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Location.kt index e07dcec859a..3d2611ebd38 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Location.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/Location.kt @@ -44,7 +44,7 @@ constructor( source: SourceLocation, endSource: SourceLocation, text: TextLocation, - filePath: FilePath, + filePath: FilePath ) : this(source, text, filePath.absolutePath.toString(), filePath) { this.endSource = endSource } diff --git a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Configuration.kt b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Configuration.kt index 2412951004c..8335939cec1 100644 --- a/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Configuration.kt +++ b/detekt-api/src/main/kotlin/io/gitlab/arturbosch/detekt/api/internal/Configuration.kt @@ -7,5 +7,5 @@ package io.gitlab.arturbosch.detekt.api.internal @Target(AnnotationTarget.PROPERTY) @Retention(AnnotationRetention.RUNTIME) annotation class Configuration( - val description: String, + val description: String ) diff --git a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt b/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt index af82c994357..dd79a618a77 100644 --- a/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt +++ b/detekt-api/src/test/kotlin/io/gitlab/arturbosch/detekt/api/ConfigPropertySpec.kt @@ -97,7 +97,7 @@ class ConfigPropertySpec { "present" to listOf( mapOf("value" to "a", "reason" to "reasonA"), mapOf("value" to "b", "reason" to null), - mapOf("value" to "c"), + mapOf("value" to "c") ) ) { val present: ValuesWithReason by config(defaultValue) diff --git a/detekt-api/src/test/resources/library/Dummy.kt b/detekt-api/src/test/resources/library/Dummy.kt index 12cb8817a79..e8c70ca0e91 100644 --- a/detekt-api/src/test/resources/library/Dummy.kt +++ b/detekt-api/src/test/resources/library/Dummy.kt @@ -1,2 +1 @@ package cases.library - diff --git a/detekt-api/src/test/resources/library/Dummy2.kt b/detekt-api/src/test/resources/library/Dummy2.kt index 12cb8817a79..e8c70ca0e91 100644 --- a/detekt-api/src/test/resources/library/Dummy2.kt +++ b/detekt-api/src/test/resources/library/Dummy2.kt @@ -1,2 +1 @@ package cases.library - diff --git a/detekt-api/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/test/TestFactory.kt b/detekt-api/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/test/TestFactory.kt index 0a6625c6fad..17b2abd6993 100644 --- a/detekt-api/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/test/TestFactory.kt +++ b/detekt-api/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/test/TestFactory.kt @@ -22,7 +22,7 @@ fun createCorrectableFinding(ruleName: String = "TestSmell", fileName: String = fun createFinding( issue: Issue, entity: Entity, - message: String = entity.signature, + message: String = entity.signature ) = CodeSmell( issue = issue, entity = entity, diff --git a/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/runners/ConfigExporter.kt b/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/runners/ConfigExporter.kt index c2491bdc73b..86e2d1f9434 100644 --- a/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/runners/ConfigExporter.kt +++ b/detekt-cli/src/main/kotlin/io/gitlab/arturbosch/detekt/cli/runners/ConfigExporter.kt @@ -8,7 +8,7 @@ import java.nio.file.Paths class ConfigExporter( private val arguments: CliArgs, - private val outputPrinter: Appendable, + private val outputPrinter: Appendable ) : Executable { override fun execute() { diff --git a/detekt-cli/src/test/kotlin/io/gitlab/arturbosch/detekt/cli/MainSpec.kt b/detekt-cli/src/test/kotlin/io/gitlab/arturbosch/detekt/cli/MainSpec.kt index 3cd86067fc0..8aa03e8b244 100644 --- a/detekt-cli/src/test/kotlin/io/gitlab/arturbosch/detekt/cli/MainSpec.kt +++ b/detekt-cli/src/test/kotlin/io/gitlab/arturbosch/detekt/cli/MainSpec.kt @@ -30,7 +30,7 @@ class MainSpec { arguments(arrayOf("--run-rule", "RuleSet:Rule"), Runner::class), arguments(arrayOf("--print-ast"), AstPrinter::class), arguments(arrayOf("--version"), VersionPrinter::class), - arguments(emptyArray(), Runner::class), + arguments(emptyArray(), Runner::class) ) } diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/BindingContext.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/BindingContext.kt index a96d32e7ea7..0a29ff35480 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/BindingContext.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/BindingContext.kt @@ -18,7 +18,7 @@ internal fun generateBindingContext( classpath: List, files: List, debugPrinter: (() -> String) -> Unit, - warningPrinter: (String) -> Unit, + warningPrinter: (String) -> Unit ): BindingContext { if (classpath.isEmpty()) { return BindingContext.EMPTY @@ -27,13 +27,13 @@ internal fun generateBindingContext( val messageCollector = DetektMessageCollector( minSeverity = CompilerMessageSeverity.ERROR, debugPrinter = debugPrinter, - warningPrinter = warningPrinter, + warningPrinter = warningPrinter ) val analyzer = AnalyzerWithCompilerReport( messageCollector, environment.configuration.languageVersionSettings, - false, + false ) analyzer.analyzeAndReport(files) { TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration( @@ -54,7 +54,7 @@ internal fun generateBindingContext( internal class DetektMessageCollector( private val minSeverity: CompilerMessageSeverity, private val debugPrinter: (() -> String) -> Unit, - private val warningPrinter: (String) -> Unit, + private val warningPrinter: (String) -> Unit ) : MessageCollector by MessageCollector.NONE { private var messages = 0 diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineFilteredResult.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineFilteredResult.kt index 23ce026e006..a17d0b84c32 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineFilteredResult.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineFilteredResult.kt @@ -7,7 +7,7 @@ import io.gitlab.arturbosch.detekt.api.RuleSetId internal class BaselineFilteredResult( result: Detektion, - private val baseline: Baseline, + private val baseline: Baseline ) : Detektion by result { override val findings: Map> = result.findings diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/baseline/DefaultBaseline.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/baseline/DefaultBaseline.kt index eba4ddce0ee..ba3419f0b98 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/baseline/DefaultBaseline.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/baseline/DefaultBaseline.kt @@ -10,7 +10,7 @@ import java.nio.file.Path internal data class DefaultBaseline( override val manuallySuppressedIssues: FindingsIdList, - override val currentIssues: FindingsIdList, + override val currentIssues: FindingsIdList ) : Baseline { override fun contains(id: FindingId): Boolean = diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/AbstractYamlConfigValidator.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/AbstractYamlConfigValidator.kt index 9bb1270cf09..3b4fe692e69 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/AbstractYamlConfigValidator.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/AbstractYamlConfigValidator.kt @@ -15,7 +15,7 @@ internal abstract class AbstractYamlConfigValidator : ConfigValidator { "Only supported config is the $yamlConfigClass. Actual type is $actualClass" } val settings = ValidationSettings( - config.subConfig("config").valueOrDefault("checkExhaustiveness", false), + config.subConfig("config").valueOrDefault("checkExhaustiveness", false) ) return validate(config, settings) diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/ConfigValidation.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/ConfigValidation.kt index 3e6051077e3..5ba9bc945df 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/ConfigValidation.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/ConfigValidation.kt @@ -31,7 +31,7 @@ internal val DEFAULT_PROPERTY_EXCLUDES = setOf( ".*>.*>severity", "build>weights.*", ".*>.*>ignoreAnnotated", - ".*>.*>ignoreFunction", + ".*>.*>ignoreFunction" ).joinToString(",") internal fun checkConfiguration(settings: ProcessingSettings, baseline: Config) { diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/DefaultPropertiesConfigValidator.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/DefaultPropertiesConfigValidator.kt index 7578ad2fa72..c3beca23256 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/DefaultPropertiesConfigValidator.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/DefaultPropertiesConfigValidator.kt @@ -10,7 +10,7 @@ import io.gitlab.arturbosch.detekt.core.rules.RuleSetLocator internal class DefaultPropertiesConfigValidator( private val settings: ProcessingSettings, - private val baseline: Config, + private val baseline: Config ) : ConfigValidator { override fun validate(config: Config): Collection { diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/DeprecatedPropertiesConfigValidator.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/DeprecatedPropertiesConfigValidator.kt index a77d6c8b119..2eeebd860d2 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/DeprecatedPropertiesConfigValidator.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/DeprecatedPropertiesConfigValidator.kt @@ -5,7 +5,7 @@ import io.gitlab.arturbosch.detekt.api.internal.SimpleNotification import io.gitlab.arturbosch.detekt.core.config.YamlConfig internal class DeprecatedPropertiesConfigValidator( - private val deprecatedProperties: Map, + private val deprecatedProperties: Map ) : AbstractYamlConfigValidator() { override fun validate( configToValidate: YamlConfig, @@ -33,12 +33,12 @@ internal class DeprecatedPropertiesConfigValidator( private fun createNotification( propertyPath: List, - deprecationDescription: String, + deprecationDescription: String ): Notification { val prop = propertyPath.joinToString(">") return SimpleNotification( "Property '$prop' is deprecated. $deprecationDescription.", - Notification.Level.Warning, + Notification.Level.Warning ) } } diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/InvalidPropertiesConfigValidator.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/InvalidPropertiesConfigValidator.kt index f2c7c68528e..6fe4114af19 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/InvalidPropertiesConfigValidator.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/InvalidPropertiesConfigValidator.kt @@ -7,7 +7,7 @@ import io.gitlab.arturbosch.detekt.core.config.YamlConfig internal class InvalidPropertiesConfigValidator( private val baseline: YamlConfig, private val deprecatedProperties: Set, - private val excludePatterns: Set, + private val excludePatterns: Set ) : AbstractYamlConfigValidator() { override fun validate( @@ -83,7 +83,7 @@ internal class InvalidPropertiesConfigValidator( internal fun propertyShouldBeAnArray(prop: String): Notification = SimpleNotification( "Property '$prop' should be a YAML array instead of a comma-separated String.", - Notification.Level.Warning, + Notification.Level.Warning ) } } diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/MissingRulesConfigValidator.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/MissingRulesConfigValidator.kt index fe22e8ab2ff..2072f08a179 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/MissingRulesConfigValidator.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/MissingRulesConfigValidator.kt @@ -10,7 +10,7 @@ import java.util.ServiceLoader internal class MissingRulesConfigValidator( private val baseline: YamlConfig, - private val excludePatterns: Set, + private val excludePatterns: Set ) : AbstractYamlConfigValidator() { override fun validate( @@ -25,7 +25,7 @@ internal class MissingRulesConfigValidator( private fun validateRuleSet( ruleSet: String, - configToValidate: YamlConfig, + configToValidate: YamlConfig ): List { val ruleSetConfigToValidate = configToValidate.getSubMapOrNull(ruleSet) val ruleSetConfigFromBaseline = baseline.getSubMapOrNull(ruleSet) @@ -39,7 +39,7 @@ internal class MissingRulesConfigValidator( private fun checkForMissingRules( ruleSetName: String, ruleSetConfigToValidate: Map, - ruleSetConfigFromBaseline: Map, + ruleSetConfigFromBaseline: Map ): List { if (ruleSetConfigToValidate[Config.ACTIVE_KEY] == false) { return emptyList() @@ -54,13 +54,13 @@ internal class MissingRulesConfigValidator( private fun ruleMissing(ruleName: String, ruleSetName: String): Notification = SimpleNotification( "Rule '$ruleName' from the '$ruleSetName' rule set is missing in the configuration.", - Notification.Level.Warning, + Notification.Level.Warning ) private fun ruleSetMissing(ruleSetName: String): Notification = SimpleNotification( "Rule set '$ruleSetName' is missing in the configuration.", - Notification.Level.Warning, + Notification.Level.Warning ) @Suppress("UNCHECKED_CAST") diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/ValidationSettings.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/ValidationSettings.kt index a1ddf9d4a42..8c3b3a26cdb 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/ValidationSettings.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/ValidationSettings.kt @@ -1,5 +1,5 @@ package io.gitlab.arturbosch.detekt.core.config.validation internal data class ValidationSettings( - val checkExhaustiveness: Boolean = false, + val checkExhaustiveness: Boolean = false ) diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/settings/EnvironmentAware.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/settings/EnvironmentAware.kt index 7f671a9741f..34959b1b23f 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/settings/EnvironmentAware.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/settings/EnvironmentAware.kt @@ -34,7 +34,7 @@ internal class EnvironmentFacade( classpath, compilerSpec.parseLanguageVersion(), compilerSpec.parseJvmTarget(), - compilerSpec.jdkHome, + compilerSpec.jdkHome ) createKotlinCoreEnvironment(compilerConfiguration, disposable) } diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressor.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressor.kt index 9d80d212578..67dcc7d82ce 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressor.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressor.kt @@ -22,7 +22,7 @@ internal fun annotationSuppressorFactory(rule: ConfigAware, bindingContext: Bind Suppressor { finding -> val element = finding.entity.ktElement element != null && element.isAnnotatedWith( - AnnotationExcluder(element.containingKtFile, annotations, bindingContext), + AnnotationExcluder(element.containingKtFile, annotations, bindingContext) ) } } else { diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressor.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressor.kt index 3ec270897d6..85a6ed31ff1 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressor.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressor.kt @@ -36,14 +36,14 @@ internal fun functionSuppressorFactory(rule: ConfigAware, bindingContext: Bindin private fun functionSuppressor( element: KtElement, bindingContext: BindingContext, - functionMatchers: List, + functionMatchers: List ): Boolean { return element.isInFunctionNamed(bindingContext, functionMatchers) } private fun KtElement.isInFunctionNamed( bindingContext: BindingContext, - functionMatchers: List, + functionMatchers: List ): Boolean { return if (this is KtNamedFunction && functionMatchers.any { it.match(this, bindingContext) }) { true diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Suppressor.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Suppressor.kt index de90162281c..8e2e36de97f 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Suppressor.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Suppressor.kt @@ -16,7 +16,7 @@ fun interface Suppressor { private fun buildSuppressors(rule: ConfigAware, bindingContext: BindingContext): List { return listOfNotNull( annotationSuppressorFactory(rule, bindingContext), - functionSuppressorFactory(rule, bindingContext), + functionSuppressorFactory(rule, bindingContext) ) } diff --git a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/PerformanceMonitor.kt b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/PerformanceMonitor.kt index 065d07c154f..9064c743a40 100644 --- a/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/PerformanceMonitor.kt +++ b/detekt-core/src/main/kotlin/io/gitlab/arturbosch/detekt/core/util/PerformanceMonitor.kt @@ -17,7 +17,7 @@ class PerformanceMonitor { Binding, LoadingExtensions, Analyzer, - Reporting, + Reporting } data class Entry(val phase: Phase, val duration: Duration) diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/AnalyzerSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/AnalyzerSpec.kt index 952149dfcca..91d600335b9 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/AnalyzerSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/AnalyzerSpec.kt @@ -44,7 +44,7 @@ class AnalyzerSpec(val env: KotlinCoreEnvironment) { val testFile = path.resolve("Test.kt") val settings = createProcessingSettings( inputPath = testFile, - config = yamlConfig("configs/config-value-type-wrong.yml"), + config = yamlConfig("configs/config-value-type-wrong.yml") ) { execution { parallelParsing = true @@ -69,7 +69,7 @@ class AnalyzerSpec(val env: KotlinCoreEnvironment) { val settings = createProcessingSettings( testFile, yamlConfig("configs/config-value-type-correct.yml"), - outputChannel = output, + outputChannel = output ) val analyzer = Analyzer(settings, listOf(StyleRuleSetProvider()), emptyList()) @@ -86,7 +86,7 @@ class AnalyzerSpec(val env: KotlinCoreEnvironment) { val settings = createProcessingSettings( testFile, yamlConfig("configs/config-value-type-correct.yml"), - outputChannel = output, + outputChannel = output ) val analyzer = Analyzer(settings, listOf(StyleRuleSetProvider(30)), emptyList()) @@ -103,7 +103,7 @@ class AnalyzerSpec(val env: KotlinCoreEnvironment) { val settings = createProcessingSettings( testFile, yamlConfig("configs/config-value-type-correct.yml"), - outputChannel = output, + outputChannel = output ) val analyzer = Analyzer(settings, listOf(StyleRuleSetProvider(30)), emptyList()) val ktFile = compileForTest(testFile) @@ -120,7 +120,7 @@ class AnalyzerSpec(val env: KotlinCoreEnvironment) { val settings = createProcessingSettings( testFile, yamlConfig("configs/config-value-type-correct-ignore-annotated.yml"), - outputChannel = output, + outputChannel = output ) val analyzer = Analyzer(settings, listOf(StyleRuleSetProvider(18)), emptyList()) @@ -135,7 +135,7 @@ class AnalyzerSpec(val env: KotlinCoreEnvironment) { val settings = createProcessingSettings( testFile, yamlConfig("configs/config-value-type-correct.yml"), - outputChannel = output, + outputChannel = output ) val analyzer = Analyzer(settings, listOf(FaultyRuleSetProvider()), emptyList()) @@ -152,7 +152,7 @@ class AnalyzerSpec(val env: KotlinCoreEnvironment) { val settings = createProcessingSettings( testFile, yamlConfig("configs/config-value-type-correct.yml"), - outputChannel = output, + outputChannel = output ) val analyzer = Analyzer(settings, listOf(FaultyRuleNoStackTraceSetProvider()), emptyList()) @@ -170,7 +170,7 @@ private class StyleRuleSetProvider(private val threshold: Int? = null) : RuleSet ruleSetId, listOf( MaxLineLength(config, threshold), - RequiresTypeResolutionMaxLineLength(config, threshold), + RequiresTypeResolutionMaxLineLength(config, threshold) ) ) } diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/DetektMessageCollectorSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/DetektMessageCollectorSpec.kt index 205c59bf656..178f10533cb 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/DetektMessageCollectorSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/DetektMessageCollectorSpec.kt @@ -24,7 +24,7 @@ class DetektMessageCollectorSpec { subject = DetektMessageCollector( minSeverity = CompilerMessageSeverity.INFO, debugPrinter = debugPrinter, - warningPrinter = warningPrinter, + warningPrinter = warningPrinter ) } diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/ProcessingSettingsFactory.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/ProcessingSettingsFactory.kt index 3671c3f406d..7aa964983ab 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/ProcessingSettingsFactory.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/ProcessingSettingsFactory.kt @@ -20,7 +20,7 @@ fun createProcessingSettings( config: Config = Config.empty, reportPaths: Collection = emptyList(), outputChannel: PrintStream = NullPrintStream(), - init: ProcessingSpecBuilder.() -> Unit = { /* no-op */ }, + init: ProcessingSpecBuilder.() -> Unit = { /* no-op */ } ): ProcessingSettings { val spec = ProcessingSpec { project { @@ -48,7 +48,7 @@ fun createProcessingSettings( } fun createNullLoggingSpec( - init: ProcessingSpecBuilder.() -> Unit = { /* no-op */ }, + init: ProcessingSpecBuilder.() -> Unit = { /* no-op */ } ): ProcessingSpec = ProcessingSpec { logging { diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineFilteredResultSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineFilteredResultSpec.kt index b88431235ec..d641d5820da 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineFilteredResultSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineFilteredResultSpec.kt @@ -23,7 +23,7 @@ class BaselineFilteredResultSpec { mockk { every { id }.returns("FeatureEnvy") every { signature }.returns("Signature") - }, + } ) @Test diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineResultMappingSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineResultMappingSpec.kt index f70276934c3..a839c4e86a4 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineResultMappingSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/baseline/BaselineResultMappingSpec.kt @@ -45,7 +45,7 @@ class BaselineResultMappingSpec { fun `should not create a new baseline file when no findings occurred`() { val mapping = resultMapping( baselineFile = baselineFile, - createBaseline = true, + createBaseline = true ) mapping.transformFindings(emptyMap()) @@ -58,7 +58,7 @@ class BaselineResultMappingSpec { val existing = DefaultBaseline.load(existingBaselineFile) val mapping = resultMapping( baselineFile = existingBaselineFile, - createBaseline = false, + createBaseline = false ) mapping.transformFindings(findings) @@ -72,7 +72,7 @@ class BaselineResultMappingSpec { val existing = DefaultBaseline.load(existingBaselineFile) val mapping = resultMapping( baselineFile = existingBaselineFile, - createBaseline = null, + createBaseline = null ) mapping.transformFindings(findings) @@ -85,7 +85,7 @@ class BaselineResultMappingSpec { fun `should not create a new baseline file if no file is configured`() { val mapping = resultMapping( baselineFile = null, - createBaseline = false, + createBaseline = false ) mapping.transformFindings(findings) @@ -97,7 +97,7 @@ class BaselineResultMappingSpec { fun `should create a new baseline file if a file is configured`() { val mapping = resultMapping( baselineFile = baselineFile, - createBaseline = true, + createBaseline = true ) mapping.transformFindings(findings) @@ -111,7 +111,7 @@ class BaselineResultMappingSpec { val existing = DefaultBaseline.load(baselineFile) val mapping = resultMapping( baselineFile = baselineFile, - createBaseline = true, + createBaseline = true ) mapping.transformFindings(findings) diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/CheckConfigurationSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/CheckConfigurationSpec.kt index ba9f7c41fc7..3e44dedcd13 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/CheckConfigurationSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/CheckConfigurationSpec.kt @@ -30,7 +30,7 @@ class CheckConfigurationSpec { ) createProcessingSettings( testDir, - config, + config ) { config { shouldValidateBeforeAnalysis = false diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/InvalidPropertiesConfigValidatorSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/InvalidPropertiesConfigValidatorSpec.kt index 93617c8f048..dbc02072ff9 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/InvalidPropertiesConfigValidatorSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/InvalidPropertiesConfigValidatorSpec.kt @@ -147,7 +147,7 @@ internal class InvalidPropertiesConfigValidatorSpec { val subject = InvalidPropertiesConfigValidator(baseline, deprecatedProperties, patterns("complexity")) val result = subject.validate( - yamlConfig("config_validation/other-nested-property-names.yml") as YamlConfig, + yamlConfig("config_validation/other-nested-property-names.yml") as YamlConfig ) assertThat(result).isEmpty() } diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/MissingRulesConfigValidatorSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/MissingRulesConfigValidatorSpec.kt index 9b862d83f92..35a68ee5289 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/MissingRulesConfigValidatorSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/config/validation/MissingRulesConfigValidatorSpec.kt @@ -42,7 +42,7 @@ internal class MissingRulesConfigValidatorSpec { .containsExactlyInAnyOrder( "Rule set 'comments' is missing in the configuration.", "Rule 'LongMethod' from the 'complexity' rule set is missing in the configuration.", - "Rule 'WildcardImport' from the 'style' rule set is missing in the configuration.", + "Rule 'WildcardImport' from the 'style' rule set is missing in the configuration." ) } } diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/reporting/console/FindingsReportSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/reporting/console/FindingsReportSpec.kt index 1b0093bb318..cbd30849024 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/reporting/console/FindingsReportSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/reporting/console/FindingsReportSpec.kt @@ -79,8 +79,8 @@ class FindingsReportSpec { override val findings: Map> = mapOf( "Ruleset" to listOf( createFinding(createIssue("LongRule"), createEntity("File.kt"), longMessage), - createFinding(createIssue("MultilineRule"), createEntity("File.kt"), multilineMessage), - ), + createFinding(createIssue("MultilineRule"), createEntity("File.kt"), multilineMessage) + ) ) } assertThat(subject.render(detektion)?.decolorized()).isEqualTo(expectedContent) diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressorSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressorSpec.kt index 08483bf1f09..f343d1c0273 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressorSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/AnnotationSuppressorSpec.kt @@ -33,7 +33,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `Factory returns null if ignoreAnnotated is set to empty`() { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to emptyList()), - BindingContext.EMPTY, + BindingContext.EMPTY ) assertThat(suppressor).isNull() @@ -43,7 +43,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `Factory returns not null if ignoreAnnotated is set to a not empty list`() { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("Composable")), - BindingContext.EMPTY, + BindingContext.EMPTY ) assertThat(suppressor).isNotNull() @@ -54,7 +54,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { inner class AnnotationSuppressor { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("Composable")), - BindingContext.EMPTY, + BindingContext.EMPTY )!! @Test @@ -300,7 +300,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { annotation class Composable """.trimIndent() - ), + ) ) @Nested @@ -318,7 +318,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { val bindings = listOf( env.getContextForPaths(listOf(root, *composableFiles)), - BindingContext.EMPTY, + BindingContext.EMPTY ) @ParameterizedTest @@ -326,7 +326,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `Just name`(binding: BindingContext) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("Composable")), - binding, + binding )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -339,7 +339,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `Full qualified name name`(binding: BindingContext) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("androidx.compose.runtime.Composable")), - binding, + binding )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -353,7 +353,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun withGlobDoesntMatch(binding: BindingContext) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("*.Composable")), - binding, + binding )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -366,7 +366,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `With glob2`(binding: BindingContext) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("**.Composable")), - binding, + binding )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -379,7 +379,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `With glob3`(binding: BindingContext) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("Compo*")), - binding, + binding )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -392,7 +392,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `With glob4`(binding: BindingContext) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("*")), - binding, + binding )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -414,7 +414,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("androidx.compose.runtime.Composable")), - env.getContextForPaths(listOf(root, *composableFiles)), + env.getContextForPaths(listOf(root, *composableFiles)) )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -435,7 +435,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("androidx.compose.runtime.Composable")), - env.getContextForPaths(listOf(root, *composableFiles)), + env.getContextForPaths(listOf(root, *composableFiles)) )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -458,7 +458,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("androidx.compose.runtime.Composable")), - env.getContextForPaths(listOf(root, *composableFiles)), + env.getContextForPaths(listOf(root, *composableFiles)) )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -483,7 +483,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { annotation class Preview(showBackground: Boolean = true) """.trimIndent() - ), + ) ) val root = compileContentForTest( @@ -501,7 +501,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `suppress if it has parameters with type solving`() { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("Preview")), - env.getContextForPaths(listOf(root, *composableFiles)), + env.getContextForPaths(listOf(root, *composableFiles)) )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! @@ -513,7 +513,7 @@ class AnnotationSuppressorSpec(private val env: KotlinCoreEnvironment) { fun `suppress if it has parameters without type solving`() { val suppressor = annotationSuppressorFactory( buildConfigAware("ignoreAnnotated" to listOf("Preview")), - BindingContext.EMPTY, + BindingContext.EMPTY )!! val ktFunction = root.findChildByClass(KtFunction::class.java)!! diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Builders.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Builders.kt index a31c6a68414..506413d8811 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Builders.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/Builders.kt @@ -20,14 +20,14 @@ import java.nio.file.Paths internal fun buildFinding(element: KtElement?): Finding = CodeSmell( issue = Issue("RuleName", Severity.CodeSmell, "", Debt.FIVE_MINS), entity = element?.let { Entity.from(element) } ?: buildEmptyEntity(), - message = "", + message = "" ) private fun buildEmptyEntity(): Entity = Entity( name = "", signature = "", location = Location(SourceLocation(0, 0), TextLocation(0, 0), FilePath.fromAbsolute(Paths.get("/"))), - ktElement = null, + ktElement = null ) internal fun buildConfigAware( diff --git a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressorSpec.kt b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressorSpec.kt index dce66543ea2..2d665ab51e3 100644 --- a/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressorSpec.kt +++ b/detekt-core/src/test/kotlin/io/gitlab/arturbosch/detekt/core/suppressors/FunctionSuppressorSpec.kt @@ -19,7 +19,7 @@ class FunctionSuppressorSpec { fun `Factory returns null if ignoreFunction is not set`() { val suppressor = functionSuppressorFactory( buildConfigAware(/* empty */), - BindingContext.EMPTY, + BindingContext.EMPTY ) assertThat(suppressor).isNull() @@ -29,7 +29,7 @@ class FunctionSuppressorSpec { fun `Factory returns null if ignoreFunction is set to empty`() { val suppressor = functionSuppressorFactory( buildConfigAware("ignoreFunction" to emptyList()), - BindingContext.EMPTY, + BindingContext.EMPTY ) assertThat(suppressor).isNull() @@ -39,7 +39,7 @@ class FunctionSuppressorSpec { fun `Factory returns not null if ignoreFunction is set to a not empty list`() { val suppressor = functionSuppressorFactory( buildConfigAware("ignoreFunction" to listOf("toString")), - BindingContext.EMPTY, + BindingContext.EMPTY ) assertThat(suppressor).isNotNull() diff --git a/detekt-core/src/test/resources/cases/ComplexClass.kt b/detekt-core/src/test/resources/cases/ComplexClass.kt index fb036beebac..be824063bd8 100644 --- a/detekt-core/src/test/resources/cases/ComplexClass.kt +++ b/detekt-core/src/test/resources/cases/ComplexClass.kt @@ -3,11 +3,11 @@ package cases import org.jetbrains.kotlin.utils.sure @Suppress("unused") -class ComplexClass {// McCabe: 44, LLOC: 20 + 20 + 4x4 +class ComplexClass { // McCabe: 44, LLOC: 20 + 20 + 4x4 - class NestedClass { //14 - fun complex() { //1 + - try {//4 + class NestedClass { // 14 + fun complex() { // 1 + + try { // 4 while (true) { if (true) { when ("string") { @@ -16,7 +16,7 @@ class ComplexClass {// McCabe: 44, LLOC: 20 + 20 + 4x4 } } } - } catch (ex: Exception) { //1 + 3 + } catch (ex: Exception) { // 1 + 3 try { println() } catch (ex: Exception) { @@ -42,17 +42,17 @@ class ComplexClass {// McCabe: 44, LLOC: 20 + 20 + 4x4 } } (1..10).forEach { - //1 + // 1 println() } - for (i in 1..10) { //1 + for (i in 1..10) { // 1 println() } } } - fun complex() { //1 + - try {//4 + fun complex() { // 1 + + try { // 4 while (true) { if (true) { when ("string") { @@ -61,7 +61,7 @@ class ComplexClass {// McCabe: 44, LLOC: 20 + 20 + 4x4 } } } - } catch (ex: Exception) { //1 + 3 + } catch (ex: Exception) { // 1 + 3 try { println() } catch (ex: Exception) { @@ -87,15 +87,15 @@ class ComplexClass {// McCabe: 44, LLOC: 20 + 20 + 4x4 } } (1..10).forEach { - //1 + // 1 println() } - for (i in 1..10) { //1 + for (i in 1..10) { // 1 println() } } - fun manyClosures() {//4 + fun manyClosures() { // 4 true.let { true.apply { true.run { @@ -107,7 +107,7 @@ class ComplexClass {// McCabe: 44, LLOC: 20 + 20 + 4x4 } } - fun manyClosures2() {//4 + fun manyClosures2() { // 4 true.let { true.apply { true.run { @@ -119,7 +119,7 @@ class ComplexClass {// McCabe: 44, LLOC: 20 + 20 + 4x4 } } - fun manyClosures3() {//4 + fun manyClosures3() { // 4 true.let { true.apply { true.run { @@ -131,7 +131,7 @@ class ComplexClass {// McCabe: 44, LLOC: 20 + 20 + 4x4 } } - fun manyClosures4() {//4 + fun manyClosures4() { // 4 true.let { true.apply { true.run { diff --git a/detekt-core/src/test/resources/cases/KotlinScript.kts b/detekt-core/src/test/resources/cases/KotlinScript.kts index 6707d648bb9..c99444263e0 100644 --- a/detekt-core/src/test/resources/cases/KotlinScript.kts +++ b/detekt-core/src/test/resources/cases/KotlinScript.kts @@ -1,3 +1,3 @@ package test -println("Hello World") \ No newline at end of file +println("Hello World") diff --git a/detekt-formatting/build.gradle.kts b/detekt-formatting/build.gradle.kts index e1e318c934d..4265f91baf3 100644 --- a/detekt-formatting/build.gradle.kts +++ b/detekt-formatting/build.gradle.kts @@ -28,7 +28,7 @@ tasks.build { finalizedBy(":detekt-generator:generateDocumentation") } val depsToPackage = setOf( "org.ec4j.core", "com.pinterest.ktlint", - "io.github.microutils", + "io.github.microutils" ) tasks.jar { @@ -38,6 +38,6 @@ tasks.jar { configurations.runtimeClasspath.get() .filter { dependency -> depsToPackage.any { it in dependency.toString() } } .map { if (it.isDirectory) it else zipTree(it) }, - extraDepsToPackage.map { zipTree(it) }, + extraDepsToPackage.map { zipTree(it) } ) } diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt index 40459ae5044..ec3f80f6bad 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/KtLintMultiRule.kt @@ -117,8 +117,8 @@ class KtLintMultiRule(config: Config = Config.empty) : SpacingBetweenDeclarationsWithAnnotations(config), SpacingBetweenDeclarationsWithComments(config), StringTemplate(config), - TrailingCommaOnCallSite(config), // in standard ruleset but not enabled by default - TrailingCommaOnDeclarationSite(config), // in standard ruleset but not enabled by default + TrailingCommaOnCallSite(config), + TrailingCommaOnDeclarationSite(config), Wrapping(config), // Wrappers for ktlint-ruleset-experimental rules. Disabled by default. @@ -137,7 +137,7 @@ class KtLintMultiRule(config: Config = Config.empty) : SpacingBetweenFunctionNameAndOpeningParenthesis(config), TypeArgumentListSpacing(config), TypeParameterListSpacing(config), - UnnecessaryParenthesesBeforeTrailingLambda(config), + UnnecessaryParenthesesBeforeTrailingLambda(config) ) override fun visit(root: KtFile) { diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/CommentWrapping.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/CommentWrapping.kt index 3be8bb186b2..40ce15a35f8 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/CommentWrapping.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/CommentWrapping.kt @@ -23,6 +23,6 @@ class CommentWrapping(config: Config) : FormattingRule(config) { override fun overrideEditorConfigProperties(): Map, String> = mapOf( - DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString(), + DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString() ) } diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/FunctionSignature.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/FunctionSignature.kt index 5ce2ffc619c..f4405a37e43 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/FunctionSignature.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/FunctionSignature.kt @@ -38,6 +38,6 @@ class FunctionSignature(config: Config) : FormattingRule(config) { forceMultilineWhenParameterCountGreaterOrEqualThan.toString(), FunctionSignatureRule.functionBodyExpressionWrappingProperty to functionBodyExpressionWrapping, DefaultEditorConfigProperties.maxLineLengthProperty to maxLineLength.toString(), - DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString(), + DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString() ) } diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/Indentation.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/Indentation.kt index 5d3bec78765..387a1bf1ef5 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/Indentation.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/Indentation.kt @@ -32,6 +32,6 @@ class Indentation(config: Config) : FormattingRule(config) { override fun overrideEditorConfigProperties(): Map, String> = mapOf( - DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString(), + DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString() ) } diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/KdocWrapping.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/KdocWrapping.kt index 715b99abde4..ff701124efd 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/KdocWrapping.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/KdocWrapping.kt @@ -23,6 +23,6 @@ class KdocWrapping(config: Config) : FormattingRule(config) { override fun overrideEditorConfigProperties(): Map, String> = mapOf( - DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString(), + DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString() ) } diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/MaximumLineLength.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/MaximumLineLength.kt index db7e3d8ecf9..0344842eece 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/MaximumLineLength.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/MaximumLineLength.kt @@ -37,6 +37,6 @@ class MaximumLineLength(config: Config) : FormattingRule(config) { override fun overrideEditorConfigProperties(): Map, String> = mapOf( MaxLineLengthRule.ignoreBackTickedIdentifierProperty to ignoreBackTickedIdentifier.toString(), - DefaultEditorConfigProperties.maxLineLengthProperty to maxLineLength.toString(), + DefaultEditorConfigProperties.maxLineLengthProperty to maxLineLength.toString() ) } diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnCallSite.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnCallSite.kt index 855055f4831..8255addd200 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnCallSite.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnCallSite.kt @@ -4,6 +4,7 @@ import com.pinterest.ktlint.core.api.UsesEditorConfigProperties import com.pinterest.ktlint.ruleset.standard.TrailingCommaOnCallSiteRule import io.gitlab.arturbosch.detekt.api.Config import io.gitlab.arturbosch.detekt.api.config +import io.gitlab.arturbosch.detekt.api.internal.ActiveByDefault import io.gitlab.arturbosch.detekt.api.internal.AutoCorrectable import io.gitlab.arturbosch.detekt.api.internal.Configuration import io.gitlab.arturbosch.detekt.formatting.FormattingRule @@ -12,6 +13,7 @@ import io.gitlab.arturbosch.detekt.formatting.FormattingRule * See [ktlint docs](https://pinterest.github.io/ktlint/rules/standard/) for documentation. */ @AutoCorrectable(since = "1.22.0") +@ActiveByDefault(since = "1.22.0") class TrailingCommaOnCallSite(config: Config) : FormattingRule(config) { override val wrapping = TrailingCommaOnCallSiteRule() @@ -22,6 +24,6 @@ class TrailingCommaOnCallSite(config: Config) : FormattingRule(config) { override fun overrideEditorConfigProperties(): Map, String> = mapOf( - TrailingCommaOnCallSiteRule.allowTrailingCommaOnCallSiteProperty to useTrailingCommaOnCallSite.toString(), + TrailingCommaOnCallSiteRule.allowTrailingCommaOnCallSiteProperty to useTrailingCommaOnCallSite.toString() ) } diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnDeclarationSite.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnDeclarationSite.kt index 6c6bdb0c815..c4057eeba9c 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnDeclarationSite.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/TrailingCommaOnDeclarationSite.kt @@ -4,6 +4,7 @@ import com.pinterest.ktlint.core.api.UsesEditorConfigProperties import com.pinterest.ktlint.ruleset.standard.TrailingCommaOnDeclarationSiteRule import io.gitlab.arturbosch.detekt.api.Config import io.gitlab.arturbosch.detekt.api.config +import io.gitlab.arturbosch.detekt.api.internal.ActiveByDefault import io.gitlab.arturbosch.detekt.api.internal.AutoCorrectable import io.gitlab.arturbosch.detekt.api.internal.Configuration import io.gitlab.arturbosch.detekt.formatting.FormattingRule @@ -12,6 +13,7 @@ import io.gitlab.arturbosch.detekt.formatting.FormattingRule * See [ktlint docs](https://pinterest.github.io/ktlint/rules/standard/) for documentation. */ @AutoCorrectable(since = "1.22.0") +@ActiveByDefault(since = "1.22.0") class TrailingCommaOnDeclarationSite(config: Config) : FormattingRule(config) { override val wrapping = TrailingCommaOnDeclarationSiteRule() @@ -23,6 +25,6 @@ class TrailingCommaOnDeclarationSite(config: Config) : FormattingRule(config) { override fun overrideEditorConfigProperties(): Map, String> = mapOf( TrailingCommaOnDeclarationSiteRule.allowTrailingCommaProperty to - useTrailingCommaOnDeclarationSite.toString(), + useTrailingCommaOnDeclarationSite.toString() ) } diff --git a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/Wrapping.kt b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/Wrapping.kt index 55e4388f127..b77ed57020c 100644 --- a/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/Wrapping.kt +++ b/detekt-formatting/src/main/kotlin/io/gitlab/arturbosch/detekt/formatting/wrappers/Wrapping.kt @@ -25,6 +25,6 @@ class Wrapping(config: Config) : FormattingRule(config) { override fun overrideEditorConfigProperties(): Map, String> = mapOf( - DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString(), + DefaultEditorConfigProperties.indentSizeProperty to indentSize.toString() ) } diff --git a/detekt-formatting/src/main/resources/config/config.yml b/detekt-formatting/src/main/resources/config/config.yml index fdc9e9c2800..d0cca87ac15 100644 --- a/detekt-formatting/src/main/resources/config/config.yml +++ b/detekt-formatting/src/main/resources/config/config.yml @@ -180,11 +180,11 @@ formatting: active: true autoCorrect: true TrailingCommaOnCallSite: - active: false + active: true autoCorrect: true useTrailingCommaOnCallSite: false TrailingCommaOnDeclarationSite: - active: false + active: true autoCorrect: true useTrailingCommaOnDeclarationSite: false TypeArgumentListSpacing: diff --git a/detekt-formatting/src/test/resources/configTests/chain-wrapping-after.kt b/detekt-formatting/src/test/resources/configTests/chain-wrapping-after.kt index c858c9533f8..2fc0628d4a9 100644 --- a/detekt-formatting/src/test/resources/configTests/chain-wrapping-after.kt +++ b/detekt-formatting/src/test/resources/configTests/chain-wrapping-after.kt @@ -1,22 +1,22 @@ fun main() { - val anchor = owner.firstChild!!. - siblings(forward = true). - dropWhile { it is PsiComment || it is PsiWhiteSpace } - val s = foo() ?: - bar - val s = foo()?. - bar + val anchor = owner.firstChild!! + .siblings(forward = true) + .dropWhile { it is PsiComment || it is PsiWhiteSpace } + val s = foo() + ?: bar + val s = foo() + ?.bar val s = 1 - + 2 - val s = true - && false - val s = b.equals(o.b) - && g == o.g + +2 + val s = true && + false + val s = b.equals(o.b) && + g == o.g val d = 1 + -1 val d = 1 - + -1 - when (foo){ + +-1 + when (foo) { 0 -> { } 1 -> { @@ -28,20 +28,21 @@ fun main() { -3 == a() ) {} if ( - // comment + // comment -3 == a() ) {} if ( - /* comment */ + /* comment */ -3 == a() ) {} - if (c) + if (c) { -7 - else + } else { -8 + } try { fn() - } catch(e: Exception) { + } catch (e: Exception) { -9 } var x = @@ -49,18 +50,18 @@ fun main() { (2 + 2) -3 // https://github.com/shyiko/ktlint/pull/193 - var x = false // comment - && false - x = false + var x = false && // comment + false + x = false && /* comment */ // comment - && false - var y = false. // comment - call() - y = false. + false + var y = false // comment + .call() + y = false // comment - call() - y = false. // comment + .call() + y = false // comment /* comment */ - call() + .call() } diff --git a/detekt-formatting/src/test/resources/configTests/chain-wrapping-before.kt b/detekt-formatting/src/test/resources/configTests/chain-wrapping-before.kt index c858c9533f8..2fc0628d4a9 100644 --- a/detekt-formatting/src/test/resources/configTests/chain-wrapping-before.kt +++ b/detekt-formatting/src/test/resources/configTests/chain-wrapping-before.kt @@ -1,22 +1,22 @@ fun main() { - val anchor = owner.firstChild!!. - siblings(forward = true). - dropWhile { it is PsiComment || it is PsiWhiteSpace } - val s = foo() ?: - bar - val s = foo()?. - bar + val anchor = owner.firstChild!! + .siblings(forward = true) + .dropWhile { it is PsiComment || it is PsiWhiteSpace } + val s = foo() + ?: bar + val s = foo() + ?.bar val s = 1 - + 2 - val s = true - && false - val s = b.equals(o.b) - && g == o.g + +2 + val s = true && + false + val s = b.equals(o.b) && + g == o.g val d = 1 + -1 val d = 1 - + -1 - when (foo){ + +-1 + when (foo) { 0 -> { } 1 -> { @@ -28,20 +28,21 @@ fun main() { -3 == a() ) {} if ( - // comment + // comment -3 == a() ) {} if ( - /* comment */ + /* comment */ -3 == a() ) {} - if (c) + if (c) { -7 - else + } else { -8 + } try { fn() - } catch(e: Exception) { + } catch (e: Exception) { -9 } var x = @@ -49,18 +50,18 @@ fun main() { (2 + 2) -3 // https://github.com/shyiko/ktlint/pull/193 - var x = false // comment - && false - x = false + var x = false && // comment + false + x = false && /* comment */ // comment - && false - var y = false. // comment - call() - y = false. + false + var y = false // comment + .call() + y = false // comment - call() - y = false. // comment + .call() + y = false // comment /* comment */ - call() + .call() } diff --git a/detekt-formatting/src/test/resources/configTests/fixed.kt b/detekt-formatting/src/test/resources/configTests/fixed.kt index 6c0e945b062..5eae2c6e3ca 100644 --- a/detekt-formatting/src/test/resources/configTests/fixed.kt +++ b/detekt-formatting/src/test/resources/configTests/fixed.kt @@ -1,22 +1,22 @@ fun main() { - val anchor = owner.firstChild!!. - siblings(forward = true). - dropWhile { it is PsiComment || it is PsiWhiteSpace } - val s = foo() ?: - bar - val s = foo()?. - bar + val anchor = owner.firstChild!! + .siblings(forward = true) + .dropWhile { it is PsiComment || it is PsiWhiteSpace } + val s = foo() + ?: bar + val s = foo() + ?.bar val s = 1 - + 2 - val s = true - && false - val s = b.equals(o.b) - && g == o.g + +2 + val s = true && + false + val s = b.equals(o.b) && + g == o.g val d = 1 + -1 val d = 1 - + -1 - when (foo){ + +-1 + when (foo) { 0 -> { } 1 -> { @@ -25,27 +25,28 @@ fun main() { } } if ( - -3 == a() + -3 == a() ) {} if ( - // comment - -3 == a() + // comment + -3 == a() ) {} if ( - /* comment */ - -3 == a() + /* comment */ + -3 == a() ) {} - if (c) - -7 - else - -8 + if (c) { + -7 + } else { + -8 + } try { - fn() - } catch(e: Exception) { - -9 + fn() + } catch (e: Exception) { + -9 } var x = -2 > - (2 + 2) + (2 + 2) -3 } diff --git a/detekt-generator/build.gradle.kts b/detekt-generator/build.gradle.kts index 9c355eb7911..201f1b5fd83 100644 --- a/detekt-generator/build.gradle.kts +++ b/detekt-generator/build.gradle.kts @@ -43,7 +43,7 @@ val generateDocumentation by tasks.registering(JavaExec::class) { ruleModules.map { fileTree(it) }, fileTree("${rootProject.rootDir}/detekt-rules-ruleauthors/src/main/kotlin"), fileTree("${rootProject.rootDir}/detekt-formatting/src/main/kotlin"), - file("${rootProject.rootDir}/detekt-generator/build/libs/detekt-generator-${Versions.DETEKT}-all.jar"), + file("${rootProject.rootDir}/detekt-generator/build/libs/detekt-generator-${Versions.DETEKT}-all.jar") ) outputs.files( @@ -52,13 +52,13 @@ val generateDocumentation by tasks.registering(JavaExec::class) { file(formattingConfigFile), file(ruleauthorsConfigFile), file(deprecationFile), - file(cliOptionsFile), + file(cliOptionsFile) ) classpath( configurations.runtimeClasspath.get(), configurations.compileClasspath.get(), - sourceSets.main.get().output, + sourceSets.main.get().output ) mainClass.set("io.gitlab.arturbosch.detekt.generator.Main") args = listOf( @@ -72,7 +72,7 @@ val generateDocumentation by tasks.registering(JavaExec::class) { "--config", configDir, "--cli-options", - cliOptionsFile, + cliOptionsFile ) } diff --git a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/ConfigurationCollector.kt b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/ConfigurationCollector.kt index bc7a4b19dd0..0f05caa4f0f 100644 --- a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/ConfigurationCollector.kt +++ b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/ConfigurationCollector.kt @@ -104,7 +104,7 @@ class ConfigurationCollector { description = description, defaultValue = defaultValue, defaultAndroidValue = defaultAndroidValue, - deprecated = deprecationMessage, + deprecated = deprecationMessage ) } diff --git a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleSetProviderCollector.kt b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleSetProviderCollector.kt index 95fccaf208b..28a01843010 100644 --- a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleSetProviderCollector.kt +++ b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/collection/RuleSetProviderCollector.kt @@ -111,7 +111,7 @@ class RuleSetProviderVisitor : DetektVisitor() { description = property.firstAnnotationParameter(ConfigAnnotation::class), defaultValue = defaultValue, defaultAndroidValue = defaultValue, - deprecated = property.firstAnnotationParameterOrNull(Deprecated::class), + deprecated = property.firstAnnotationParameterOrNull(Deprecated::class) ) ) } diff --git a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/out/AbstractWriter.kt b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/out/AbstractWriter.kt index 835f47d94b1..c67c31c045c 100644 --- a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/out/AbstractWriter.kt +++ b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/out/AbstractWriter.kt @@ -5,7 +5,7 @@ import java.nio.file.Files import java.nio.file.Path internal abstract class AbstractWriter( - private val outputPrinter: PrintStream, + private val outputPrinter: PrintStream ) { protected abstract val ending: String diff --git a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/printer/defaultconfig/Exclusion.kt b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/printer/defaultconfig/Exclusion.kt index b2c6f392714..d68600416a9 100644 --- a/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/printer/defaultconfig/Exclusion.kt +++ b/detekt-generator/src/main/kotlin/io/gitlab/arturbosch/detekt/generator/printer/defaultconfig/Exclusion.kt @@ -39,7 +39,7 @@ private object TestExclusions : Exclusions() { "UndocumentedPublicFunction", "UndocumentedPublicProperty", "UnsafeCallOnNullableType", - "KDocReferencesNonPublicProperty", + "KDocReferencesNonPublicProperty" ) } @@ -63,6 +63,6 @@ private object LibraryExclusions : Exclusions() { override val rules = setOf( "ForbiddenPublicDataClass", "LibraryCodeMustSpecifyReturnType", - "LibraryEntitiesShouldNotBePublic", + "LibraryEntitiesShouldNotBePublic" ) } diff --git a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/config/DetektYmlConfigSpec.kt b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/config/DetektYmlConfigSpec.kt index 1107814389e..756b8269e1b 100644 --- a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/config/DetektYmlConfigSpec.kt +++ b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/config/DetektYmlConfigSpec.kt @@ -32,7 +32,7 @@ class DetektYmlConfigSpec { arguments("naming", "io.gitlab.arturbosch.detekt.rules.naming"), arguments("performance", "io.gitlab.arturbosch.detekt.rules.performance"), arguments("potential-bugs", "io.gitlab.arturbosch.detekt.rules.bugs"), - arguments("style", "io.gitlab.arturbosch.detekt.rules.style"), + arguments("style", "io.gitlab.arturbosch.detekt.rules.style") ) @ParameterizedTest diff --git a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/GeneratorSpec.kt b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/GeneratorSpec.kt index 0aa8c0d4e01..1f981e7ed9c 100644 --- a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/GeneratorSpec.kt +++ b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/GeneratorSpec.kt @@ -44,7 +44,7 @@ class GeneratorSpec { val args = arrayOf( "--generate-custom-rule-config", "--input", - "$tempDir1, $tempDir2", + "$tempDir1, $tempDir2" ) io.gitlab.arturbosch.detekt.generator.main(args) } diff --git a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/RulePrinterTest.kt b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/RulePrinterTest.kt index 8b604656f9e..2854c04a242 100644 --- a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/RulePrinterTest.kt +++ b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/RulePrinterTest.kt @@ -17,7 +17,7 @@ internal class RulePrinterTest { severity = "Defect", debt = "10min", aliases = "alias1, alias2", - parent = "", + parent = "" ) @Test diff --git a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/defaultconfig/RuleSetConfigPrinterTest.kt b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/defaultconfig/RuleSetConfigPrinterTest.kt index 70aa6a78e7c..0f4ff513909 100644 --- a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/defaultconfig/RuleSetConfigPrinterTest.kt +++ b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/printer/defaultconfig/RuleSetConfigPrinterTest.kt @@ -38,7 +38,7 @@ internal class RuleSetConfigPrinterTest { description = "description", defaultValue = DefaultValue.of(1), defaultAndroidValue = null, - deprecated = null, + deprecated = null ) @Nested @@ -217,7 +217,7 @@ internal class RuleSetConfigPrinterTest { valuesWithReason( "a" to "reason a", "b" to null, - "c" to "reason c", + "c" to "reason c" ) ) ) diff --git a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/util/RuleSetPageCreator.kt b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/util/RuleSetPageCreator.kt index 124d9004042..87e6409294b 100644 --- a/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/util/RuleSetPageCreator.kt +++ b/detekt-generator/src/test/kotlin/io/gitlab/arturbosch/detekt/generator/util/RuleSetPageCreator.kt @@ -73,7 +73,7 @@ internal fun createRules(): List { Configuration("conf2", "deprecated config", of(false), null, "use conf1 instead"), Configuration("conf3", "list config", of(listOf("a", "b")), null, null), Configuration("conf4", "deprecated list config", of(listOf("a", "b")), null, "use conf3 instead"), - Configuration("conf5", "rule with android variants", of(120), of(100), null), + Configuration("conf5", "rule with android variants", of(120), of(100), null) ) ) val rule2 = Rule( diff --git a/detekt-gradle-plugin/build.gradle.kts b/detekt-gradle-plugin/build.gradle.kts index 0199f3b7407..e0e1d369010 100644 --- a/detekt-gradle-plugin/build.gradle.kts +++ b/detekt-gradle-plugin/build.gradle.kts @@ -90,7 +90,7 @@ gradlePlugin { // Source sets that require the Gradle TestKit dependency testSourceSets( sourceSets["testFixtures"], - sourceSets["functionalTest"], + sourceSets["functionalTest"] ) } @@ -158,7 +158,7 @@ tasks.withType().configureEach kotlinOptions { apiVersion = "1.4" freeCompilerArgs += listOf( - "-Xsuppress-version-warnings", + "-Xsuppress-version-warnings" ) // Note: Currently there are warnings for detekt-gradle-plugin that seemingly can't be fixed // until Gradle releases an update (https://github.com/gradle/gradle/issues/16345) diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/CreateBaselineTaskDslSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/CreateBaselineTaskDslSpec.kt index 336076c1a7e..53288f262da 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/CreateBaselineTaskDslSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/CreateBaselineTaskDslSpec.kt @@ -21,7 +21,7 @@ class CreateBaselineTaskDslSpec { .withProjectLayout( ProjectLayout( numberOfSourceFilesInRootPerSourceDir = 1, - numberOfCodeSmellsInRootPerSourceDir = 1, + numberOfCodeSmellsInRootPerSourceDir = 1 ) ) .withDetektConfig(detektConfig) @@ -45,7 +45,7 @@ class CreateBaselineTaskDslSpec { .withProjectLayout( ProjectLayout( numberOfSourceFilesInRootPerSourceDir = 1, - numberOfCodeSmellsInRootPerSourceDir = 1, + numberOfCodeSmellsInRootPerSourceDir = 1 ) ) .withDetektConfig(detektConfig) @@ -69,7 +69,7 @@ class CreateBaselineTaskDslSpec { .withProjectLayout( ProjectLayout( numberOfSourceFilesInRootPerSourceDir = 1, - numberOfCodeSmellsInRootPerSourceDir = 1, + numberOfCodeSmellsInRootPerSourceDir = 1 ) ) .withDetektConfig(detektConfig) diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt index 96cbb66944f..2585ad2bb86 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektAndroidSpec.kt @@ -17,7 +17,7 @@ class DetektAndroidSpec { @Nested inner class `configures android tasks for android application` { val projectLayout = ProjectLayout( - numberOfSourceFilesInRootPerSourceDir = 0, + numberOfSourceFilesInRootPerSourceDir = 0 ).apply { addSubmodule( name = "app", @@ -36,7 +36,7 @@ class DetektAndroidSpec { "src/main/kotlin", "src/debug/kotlin", "src/test/kotlin", - "src/androidTest/kotlin", + "src/androidTest/kotlin" ), baselineFiles = listOf( "detekt-baseline.xml", @@ -276,7 +276,7 @@ class DetektAndroidSpec { fun libDetektMain() { gradleRunner.runTasksAndCheckResult( "--configuration-cache", - ":android_lib:detektMain", + ":android_lib:detektMain" ) { buildResult -> assertThat(buildResult.output).contains("Configuration cache") assertThat(buildResult.output).containsPattern("""--baseline \S*[/\\]detekt-baseline-release.xml """) @@ -286,7 +286,7 @@ class DetektAndroidSpec { assertThat(buildResult.output).doesNotContain("--report txt:") assertThat(buildResult.tasks.map { it.path }).containsAll( listOf( - ":android_lib:detektMain", + ":android_lib:detektMain" ) ) } @@ -297,7 +297,7 @@ class DetektAndroidSpec { fun libDetektTest() { gradleRunner.runTasksAndCheckResult( "--configuration-cache", - ":android_lib:detektTest", + ":android_lib:detektTest" ) { buildResult -> assertThat(buildResult.output).contains("Configuration cache") assertThat(buildResult.output).containsPattern( @@ -311,7 +311,7 @@ class DetektAndroidSpec { assertThat(buildResult.output).doesNotContain("--report txt:") assertThat(buildResult.tasks.map { it.path }).containsAll( listOf( - ":android_lib:detektTest", + ":android_lib:detektTest" ) ) } @@ -536,7 +536,7 @@ class DetektAndroidSpec { @Nested inner class `configures android tasks android tasks have javac intermediates on classpath` { val projectLayout = ProjectLayout( - numberOfSourceFilesInRootPerSourceDir = 0, + numberOfSourceFilesInRootPerSourceDir = 0 ).apply { addSubmodule( name = "app", @@ -546,7 +546,7 @@ class DetektAndroidSpec { $APP_PLUGIN_BLOCK $ANDROID_BLOCK_WITH_VIEW_BINDING """.trimIndent(), - srcDirs = listOf("src/main/java"), + srcDirs = listOf("src/main/java") ) } val gradleRunner = createGradleRunnerAndSetupProject(projectLayout, dryRun = false).also { @@ -692,7 +692,7 @@ private val SAMPLE_ACTIVITY_USING_VIEW_BINDING = """ private fun createGradleRunnerAndSetupProject( projectLayout: ProjectLayout, - dryRun: Boolean = true, + dryRun: Boolean = true ) = DslGradleRunner( projectLayout = projectLayout, buildFileName = "build.gradle.kts", @@ -705,5 +705,5 @@ private fun createGradleRunnerAndSetupProject( } } """.trimIndent(), - dryRun = dryRun, + dryRun = dryRun ).also { it.setupProject() } diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt index cabd2dd3758..11062c911eb 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/DetektMultiplatformSpec.kt @@ -105,7 +105,7 @@ class DetektMultiplatformSpec { "src/commonMain/kotlin", "src/commonTest/kotlin", "src/jvmBackendMain/kotlin", - "src/jvmEmbeddedMain/kotlin", + "src/jvmEmbeddedMain/kotlin" ), baselineFiles = listOf("detekt-baseline.xml", "detekt-baseline-main.xml") ) @@ -230,7 +230,7 @@ class DetektMultiplatformSpec { "src/commonMain/kotlin", "src/commonTest/kotlin", "src/jsMain/kotlin", - "src/jsTest/kotlin", + "src/jsTest/kotlin" ), baselineFiles = listOf("detekt-baseline.xml") ) @@ -282,7 +282,7 @@ class DetektMultiplatformSpec { "src/iosArm64Test/kotlin", "src/iosX64Main/kotlin", "src/iosX64Test/kotlin", - "src/iosMain/kotlin", + "src/iosMain/kotlin" ), baselineFiles = listOf("detekt-baseline.xml") ) diff --git a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt index 68e70ab4ae4..ad94031d680 100644 --- a/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt +++ b/detekt-gradle-plugin/src/functionalTest/kotlin/io/gitlab/arturbosch/detekt/report/ReportMergeSpec.kt @@ -110,7 +110,7 @@ class ReportMergeSpec { implementation(project(":lib")) } """.trimIndent(), - srcDirs = listOf("src/main/java", "src/debug/java", "src/test/java", "src/androidTest/java"), + srcDirs = listOf("src/main/java", "src/debug/java", "src/test/java", "src/androidTest/java") ) addSubmodule( name = "lib", diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt index cfcf4867252..c4114596eec 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/DetektGenerateConfigTask.kt @@ -76,7 +76,7 @@ abstract class DetektGenerateConfigTask @Inject constructor( DetektInvoker.create(task = this).invokeCli( arguments = arguments.get(), classpath = detektClasspath.plus(pluginClasspath), - taskName = name, + taskName = name ) } diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt index 6e2c9bd64a7..782bac0d538 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/extensions/DetektExtension.kt @@ -42,7 +42,7 @@ open class DetektExtension @Inject constructor(objects: ObjectFactory) : CodeQua DEFAULT_SRC_DIR_JAVA, DEFAULT_TEST_SRC_DIR_JAVA, DEFAULT_SRC_DIR_KOTLIN, - DEFAULT_TEST_SRC_DIR_KOTLIN, + DEFAULT_TEST_SRC_DIR_KOTLIN ) var baseline: File? = objects diff --git a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt index d86a76975ce..e87dbad9e0b 100644 --- a/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt +++ b/detekt-gradle-plugin/src/main/kotlin/io/gitlab/arturbosch/detekt/internal/DetektAndroid.kt @@ -129,7 +129,7 @@ internal fun Project.registerAndroidDetektTask( } }.files, bootClasspath, - javaCompileDestination(variant), + javaCompileDestination(variant) ) // If a baseline file is configured as input file, it must exist to be configured, otherwise the task fails. // We try to find the configured baseline or alternatively a specific variant matching this task. @@ -157,7 +157,7 @@ internal fun Project.registerAndroidCreateBaselineTask( } }.files, bootClasspath, - javaCompileDestination(variant), + javaCompileDestination(variant) ) val variantBaselineFile = extension.baseline?.addVariantName(variant.name) baseline.convention(project.layout.file(project.provider { variantBaselineFile })) @@ -169,7 +169,7 @@ private fun Project.javaCompileDestination(variant: BaseVariant): DirectoryPrope if (javaCompile == null) { logger.warn( "Unable to find Java compiler on variant '{}'. Detekt analysis can show false negatives.", - variant.name, + variant.name ) } return javaCompile?.destinationDirectory diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmSpec.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmSpec.kt index 8b99d3c8c06..86d9b1b552d 100644 --- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmSpec.kt +++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektJvmSpec.kt @@ -29,7 +29,7 @@ class DetektJvmSpec { it.jvmTarget = "1.8" it.languageVersion = "1.6" } - }, + } ).also(DslGradleRunner::setupProject) @Test diff --git a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainSpec.kt b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainSpec.kt index e5a9f496388..7e953b97759 100644 --- a/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainSpec.kt +++ b/detekt-gradle-plugin/src/test/kotlin/io/gitlab/arturbosch/detekt/DetektPlainSpec.kt @@ -29,7 +29,7 @@ class DetektPlainSpec { configure { } - }, + } ).also { it.setupProject() } @Test @@ -60,7 +60,7 @@ class DetektPlainSpec { reports.txt.required.set(false) } } - }, + } ).also { it.setupProject() } @Test diff --git a/detekt-gradle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt b/detekt-gradle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt index 6309690ed54..bec2a16c502 100644 --- a/detekt-gradle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt +++ b/detekt-gradle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/DslTestBuilder.kt @@ -62,7 +62,7 @@ abstract class DslTestBuilder { configFileOrNone = configFile, baselineFiles = baselineFile?.let { listOf(it) }.orEmpty(), gradleVersionOrNone = gradleVersion, - dryRun = dryRun, + dryRun = dryRun ) runner.setupProject() return runner diff --git a/detekt-gradle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/ProjectLayout.kt b/detekt-gradle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/ProjectLayout.kt index bf53f78ee7a..42410d7c4f5 100644 --- a/detekt-gradle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/ProjectLayout.kt +++ b/detekt-gradle-plugin/src/testFixtures/kotlin/io/gitlab/arturbosch/detekt/testkit/ProjectLayout.kt @@ -17,7 +17,7 @@ class ProjectLayout( numberOfCodeSmells: Int = 0, buildFileContent: String? = null, srcDirs: List = this.srcDirs, - baselineFiles: List = emptyList(), + baselineFiles: List = emptyList() ) { val submodule = Submodule( name = name, @@ -25,7 +25,7 @@ class ProjectLayout( numberOfCodeSmells = numberOfCodeSmells, buildFileContent = buildFileContent, srcDirs = srcDirs, - baselineFiles = baselineFiles, + baselineFiles = baselineFiles ) mutableSubmodules.add(submodule) } @@ -37,5 +37,5 @@ data class Submodule( val numberOfCodeSmells: Int, val buildFileContent: String?, val srcDirs: List, - val baselineFiles: List, + val baselineFiles: List ) diff --git a/detekt-parser/src/main/kotlin/io/github/detekt/parser/KotlinEnvironmentUtils.kt b/detekt-parser/src/main/kotlin/io/github/detekt/parser/KotlinEnvironmentUtils.kt index 19370df9ae6..5bfaa78d5ea 100644 --- a/detekt-parser/src/main/kotlin/io/github/detekt/parser/KotlinEnvironmentUtils.kt +++ b/detekt-parser/src/main/kotlin/io/github/detekt/parser/KotlinEnvironmentUtils.kt @@ -68,7 +68,7 @@ fun createCompilerConfiguration( classpath: List, languageVersion: LanguageVersion?, jvmTarget: JvmTarget, - jdkHome: Path?, + jdkHome: Path? ): CompilerConfiguration { val javaFiles = pathsToAnalyze.flatMap { path -> path.toFile().walk() diff --git a/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/internal/FullQualifiedNameGuesser.kt b/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/internal/FullQualifiedNameGuesser.kt index e146da1836e..9cb19cdf086 100644 --- a/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/internal/FullQualifiedNameGuesser.kt +++ b/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/internal/FullQualifiedNameGuesser.kt @@ -7,12 +7,12 @@ import kotlin.LazyThreadSafetyMode.NONE class FullQualifiedNameGuesser internal constructor( private val packageName: String?, - imports: List, + imports: List ) { constructor(root: KtFile) : this( packageName = root.packageDirective?.qualifiedName?.ifBlank { null }, - imports = root.importList?.imports.orEmpty(), + imports = root.importList?.imports.orEmpty() ) @Suppress("ClassOrdering") diff --git a/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/internal/KotlinNoImportClasses.kt b/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/internal/KotlinNoImportClasses.kt index 6b3e303fc70..af55cccd0e7 100644 --- a/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/internal/KotlinNoImportClasses.kt +++ b/detekt-psi-utils/src/main/kotlin/io/github/detekt/psi/internal/KotlinNoImportClasses.kt @@ -195,5 +195,5 @@ internal val defaultImportClasses = mapOf( "Unit" to "kotlin.Unit", "UnsafeVariance" to "kotlin.UnsafeVariance", "UnsupportedOperationException" to "kotlin.UnsupportedOperationException", - "UseExperimental" to "kotlin.UseExperimental", + "UseExperimental" to "kotlin.UseExperimental" ) diff --git a/detekt-psi-utils/src/test/kotlin/io/github/detekt/psi/internal/FullQualifiedNameGuesserSpec.kt b/detekt-psi-utils/src/test/kotlin/io/github/detekt/psi/internal/FullQualifiedNameGuesserSpec.kt index 50ef8f06b45..e30ff05a135 100644 --- a/detekt-psi-utils/src/test/kotlin/io/github/detekt/psi/internal/FullQualifiedNameGuesserSpec.kt +++ b/detekt-psi-utils/src/test/kotlin/io/github/detekt/psi/internal/FullQualifiedNameGuesserSpec.kt @@ -69,7 +69,7 @@ class FullQualifiedNameGuesserSpec { .containsExactlyInAnyOrder( "kotlin.jvm.JvmField", "foo.kotlin.jvm.JvmField", - "java.io.kotlin.jvm.JvmField", + "java.io.kotlin.jvm.JvmField" ) } } diff --git a/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexInterface.kt b/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexInterface.kt index 1f212f18d78..aa15b9738c0 100644 --- a/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexInterface.kt +++ b/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexInterface.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.psiUtil.isPrivate * to understand and implement. */ class ComplexInterface( - config: Config = Config.empty, + config: Config = Config.empty ) : Rule(config) { override val issue = Issue( diff --git a/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexMethod.kt b/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexMethod.kt index 4e271bbec2f..43ad4c464a7 100644 --- a/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexMethod.kt +++ b/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/ComplexMethod.kt @@ -109,7 +109,7 @@ class ComplexMethod(config: Config = Config.empty) : Rule(config) { "let", "run", "use", - "with", + "with" ) } } diff --git a/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedScopeFunctions.kt b/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedScopeFunctions.kt index 763fb81859d..7d2b043b23c 100644 --- a/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedScopeFunctions.kt +++ b/detekt-rules-complexity/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/complexity/NestedScopeFunctions.kt @@ -85,7 +85,7 @@ class NestedScopeFunctions(config: Config = Config.empty) : Rule(config) { "kotlin.run", "kotlin.with", "kotlin.let", - "kotlin.also", + "kotlin.also" ) } diff --git a/detekt-rules-complexity/src/test/resources/NestedClasses.kt b/detekt-rules-complexity/src/test/resources/NestedClasses.kt index 820d23a37d0..14f8d614aaf 100644 --- a/detekt-rules-complexity/src/test/resources/NestedClasses.kt +++ b/detekt-rules-complexity/src/test/resources/NestedClasses.kt @@ -32,7 +32,6 @@ class NestedClasses { } } } finally { - } fun nestedLocalMethod() { @@ -97,11 +96,10 @@ class NestedClasses { } } } - } +/** + * Top level members must be skipped for LargeClass rule + */ @Suppress("unused") - /** - * Top level members must be skipped for LargeClass rule - */ val aTopLevelPropertyOfNestedClasses = 0 diff --git a/detekt-rules-empty/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyCodeProvider.kt b/detekt-rules-empty/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyCodeProvider.kt index ad5b8c87137..967e38a3fab 100644 --- a/detekt-rules-empty/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyCodeProvider.kt +++ b/detekt-rules-empty/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/empty/EmptyCodeProvider.kt @@ -31,7 +31,7 @@ class EmptyCodeProvider : DefaultRuleSetProvider { EmptySecondaryConstructor(config), EmptyTryBlock(config), EmptyWhenBlock(config), - EmptyWhileBlock(config), + EmptyWhileBlock(config) ) ) } diff --git a/detekt-rules-empty/src/test/resources/Empty.kt b/detekt-rules-empty/src/test/resources/Empty.kt index 3fb9ce6271d..a0aebac4082 100644 --- a/detekt-rules-empty/src/test/resources/Empty.kt +++ b/detekt-rules-empty/src/test/resources/Empty.kt @@ -5,53 +5,38 @@ package cases class Empty : Runnable { init { - } constructor() { - } override fun run() { - } fun stuff() { try { - } catch (e: Exception) { - } catch (e: Exception) { - //no-op + // no-op } catch (e: Exception) { println() } catch (ignored: Exception) { - } catch (expected: Exception) { - } catch (_: Exception) { - } finally { - } if (true) { - } else { - } when (true) { - } for (i in 1..10) { - } while (true) { - } do { - } while (true) } } -class EmptyClass() {} +class EmptyClass() diff --git a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/DontDowncastCollectionTypes.kt b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/DontDowncastCollectionTypes.kt index 45c2ac7c167..53cc5b25ec5 100644 --- a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/DontDowncastCollectionTypes.kt +++ b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/DontDowncastCollectionTypes.kt @@ -93,7 +93,7 @@ class DontDowncastCollectionTypes(config: Config) : Rule(config) { "LinkedHashSet", "HashSet", "LinkedHashMap", - "HashMap", + "HashMap" ) } } diff --git a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/DoubleMutabilityForCollection.kt b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/DoubleMutabilityForCollection.kt index 50501ffba33..6ae526b51eb 100644 --- a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/DoubleMutabilityForCollection.kt +++ b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/DoubleMutabilityForCollection.kt @@ -88,7 +88,7 @@ class DoubleMutabilityForCollection(config: Config = Config.empty) : Rule(config "java.util.LinkedHashSet", "java.util.HashSet", "java.util.LinkedHashMap", - "java.util.HashMap", + "java.util.HashMap" ) } } diff --git a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/IgnoredReturnValue.kt b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/IgnoredReturnValue.kt index 410d8fa8989..d9d1094527f 100644 --- a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/IgnoredReturnValue.kt +++ b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/IgnoredReturnValue.kt @@ -76,8 +76,8 @@ class IgnoredReturnValue(config: Config = Config.empty) : Rule(config) { listOf( "kotlin.sequences.Sequence", "kotlinx.coroutines.flow.*Flow", - "java.util.stream.*Stream", - ), + "java.util.stream.*Stream" + ) ) { it.map(String::simplePatternToRegex) } @Configuration( diff --git a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/LateinitUsage.kt b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/LateinitUsage.kt index 1dd7c13e1f8..c3f718f63a0 100644 --- a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/LateinitUsage.kt +++ b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/LateinitUsage.kt @@ -63,7 +63,7 @@ class LateinitUsage(config: Config = Config.empty) : Rule(config) { val annotationExcluder = AnnotationExcluder( root, @Suppress("DEPRECATION") excludeAnnotatedProperties, - bindingContext, + bindingContext ) properties.filterNot { annotationExcluder.shouldExclude(it.annotationEntries) } diff --git a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/UnnecessaryNotNullCheck.kt b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/UnnecessaryNotNullCheck.kt index 1c7b7dafa6e..04c61cb943d 100644 --- a/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/UnnecessaryNotNullCheck.kt +++ b/detekt-rules-errorprone/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/bugs/UnnecessaryNotNullCheck.kt @@ -38,7 +38,7 @@ class UnnecessaryNotNullCheck(config: Config = Config.empty) : Rule(config) { "UnnecessaryNotNullCheck", Severity.Defect, "Remove unnecessary not-null checks on non-null types.", - Debt.FIVE_MINS, + Debt.FIVE_MINS ) override fun visitCallExpression(expression: KtCallExpression) { @@ -56,7 +56,7 @@ class UnnecessaryNotNullCheck(config: Config = Config.empty) : Rule(config) { CodeSmell( issue = issue, entity = Entity.from(expression), - message = "Using `$callName` on non-null `${argument.text}` is unnecessary", + message = "Using `$callName` on non-null `${argument.text}` is unnecessary" ) ) } diff --git a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/ExceptionRaisedInUnexpectedLocation.kt b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/ExceptionRaisedInUnexpectedLocation.kt index 05607c3f4d7..ea20148ddd3 100644 --- a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/ExceptionRaisedInUnexpectedLocation.kt +++ b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/ExceptionRaisedInUnexpectedLocation.kt @@ -46,7 +46,7 @@ class ExceptionRaisedInUnexpectedLocation(config: Config = Config.empty) : Rule( "equals", "finalize", "hashCode", - "toString", + "toString" ) ) diff --git a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/SwallowedException.kt b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/SwallowedException.kt index 25addbeaa0e..0febcae5e67 100644 --- a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/SwallowedException.kt +++ b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/SwallowedException.kt @@ -172,7 +172,7 @@ class SwallowedException(config: Config = Config.empty) : Rule(config) { "InterruptedException", "MalformedURLException", "NumberFormatException", - "ParseException", + "ParseException" ) } } diff --git a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/ThrowingExceptionsWithoutMessageOrCause.kt b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/ThrowingExceptionsWithoutMessageOrCause.kt index 7287df97760..006c4bce38a 100644 --- a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/ThrowingExceptionsWithoutMessageOrCause.kt +++ b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/ThrowingExceptionsWithoutMessageOrCause.kt @@ -59,7 +59,7 @@ class ThrowingExceptionsWithoutMessageOrCause(config: Config = Config.empty) : R "IndexOutOfBoundsException", "NullPointerException", "RuntimeException", - "Throwable", + "Throwable" ) ) diff --git a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/TooGenericExceptionCaught.kt b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/TooGenericExceptionCaught.kt index 493ea6cca82..8fd8c34cc2f 100644 --- a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/TooGenericExceptionCaught.kt +++ b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/TooGenericExceptionCaught.kt @@ -76,7 +76,7 @@ class TooGenericExceptionCaught(config: Config) : Rule(config) { "IndexOutOfBoundsException", "NullPointerException", "RuntimeException", - "Throwable", + "Throwable" ) } } diff --git a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/TooGenericExceptionThrown.kt b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/TooGenericExceptionThrown.kt index 9036951e70a..a1dc9d7ed75 100644 --- a/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/TooGenericExceptionThrown.kt +++ b/detekt-rules-exceptions/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/exceptions/TooGenericExceptionThrown.kt @@ -51,7 +51,7 @@ class TooGenericExceptionThrown(config: Config) : Rule(config) { "Error", "Exception", "RuntimeException", - "Throwable", + "Throwable" ) ) { it.toSet() } diff --git a/detekt-rules-naming/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/naming/LambdaParameterNaming.kt b/detekt-rules-naming/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/naming/LambdaParameterNaming.kt index 015a0c89b84..f9529e6bf03 100644 --- a/detekt-rules-naming/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/naming/LambdaParameterNaming.kt +++ b/detekt-rules-naming/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/naming/LambdaParameterNaming.kt @@ -38,7 +38,7 @@ class LambdaParameterNaming(config: Config = Config.empty) : Rule(config) { CodeSmell( issue, Entity.from(it), - message = "Lambda parameter names should match the pattern: $parameterPattern", + message = "Lambda parameter names should match the pattern: $parameterPattern" ) ) } diff --git a/detekt-rules-performance/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/performance/PerformanceProvider.kt b/detekt-rules-performance/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/performance/PerformanceProvider.kt index b453c23d1d5..5163d605063 100644 --- a/detekt-rules-performance/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/performance/PerformanceProvider.kt +++ b/detekt-rules-performance/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/performance/PerformanceProvider.kt @@ -21,7 +21,7 @@ class PerformanceProvider : DefaultRuleSetProvider { UnnecessaryTemporaryInstantiation(config), ArrayPrimitive(config), CouldBeSequence(config), - UnnecessaryPartOfBinaryExpression(config), + UnnecessaryPartOfBinaryExpression(config) ) ) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/CascadingCallWrapping.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/CascadingCallWrapping.kt index 3dba019a61a..3cc238dbecd 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/CascadingCallWrapping.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/CascadingCallWrapping.kt @@ -36,7 +36,7 @@ class CascadingCallWrapping(config: Config = Config.empty) : Rule(config) { id = javaClass.simpleName, severity = Severity.Style, description = "If a chained call is wrapped to a new line, subsequent chained calls should be as well.", - debt = Debt.FIVE_MINS, + debt = Debt.FIVE_MINS ) @Configuration("require trailing elvis expressions to be wrapped on a new line") diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCall.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCall.kt index 88d43e5cb55..13205f61e79 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCall.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCall.kt @@ -66,7 +66,7 @@ class ForbiddenMethodCall(config: Config = Config.empty) : Rule(config) { private val methods: List by config( valuesWithReason( "kotlin.io.print" to "print does not allow you to configure the output stream. Use a logger instead.", - "kotlin.io.println" to "println does not allow you to configure the output stream. Use a logger instead.", + "kotlin.io.println" to "println does not allow you to configure the output stream. Use a logger instead." ) ) { list -> list.map { Forbidden(fromFunctionSignature(it.value), it.reason) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenSuppress.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenSuppress.kt index 52c822816c7..46306c77120 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenSuppress.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenSuppress.kt @@ -65,7 +65,7 @@ class ForbiddenSuppress(config: Config = Config.empty) : Rule(config) { issue, Entity.from(annotationEntry), message = "Cannot @Suppress ${nonCompliantRules.formatMessage()} " + - "due to the current configuration.", + "due to the current configuration." ) ) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/FunctionOnlyReturningConstant.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/FunctionOnlyReturningConstant.kt index 8b71fcb982b..56237eef3a4 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/FunctionOnlyReturningConstant.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/FunctionOnlyReturningConstant.kt @@ -66,7 +66,7 @@ class FunctionOnlyReturningConstant(config: Config = Config.empty) : Rule(config annotationExcluder = AnnotationExcluder( root, @Suppress("DEPRECATION") excludeAnnotatedFunction, - bindingContext, + bindingContext ) super.visit(root) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxChainedCallsOnSameLine.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxChainedCallsOnSameLine.kt index 10040c68ff9..445faf3e837 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxChainedCallsOnSameLine.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxChainedCallsOnSameLine.kt @@ -37,7 +37,7 @@ class MaxChainedCallsOnSameLine(config: Config = Config.empty) : Rule(config) { id = javaClass.simpleName, severity = Severity.Style, description = "Chained calls beyond the maximum should be wrapped to a new line.", - debt = Debt.FIVE_MINS, + debt = Debt.FIVE_MINS ) @Configuration("maximum chained calls allowed on a single line") diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MultilineRawStringIndentation.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MultilineRawStringIndentation.kt index e51f41e0739..5229f10583b 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MultilineRawStringIndentation.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/MultilineRawStringIndentation.kt @@ -72,7 +72,7 @@ class MultilineRawStringIndentation(config: Config) : Rule(config) { CodeSmell( issue, Entity.from(expression), - "A multiline raw string should start with a break line and should end with another", + "A multiline raw string should start with a break line and should end with another" ) ) return @@ -90,7 +90,7 @@ class MultilineRawStringIndentation(config: Config) : Rule(config) { private fun KtStringTemplateExpression.checkIndentation( baseIndent: Int, firstLineNumber: Int, - lastLineNumber: Int, + lastLineNumber: Int ) { checkContent(desiredIndent = baseIndent + indentSize, (firstLineNumber + 1)..(lastLineNumber - 1)) checkClosing(baseIndent, lastLineNumber) @@ -98,7 +98,7 @@ class MultilineRawStringIndentation(config: Config) : Rule(config) { private fun KtStringTemplateExpression.checkContent( desiredIndent: Int, - lineNumberRange: IntRange, + lineNumberRange: IntRange ) { data class LineInformation(val lineNumber: Int, val line: String, val currentIndent: Int) @@ -123,13 +123,13 @@ class MultilineRawStringIndentation(config: Config) : Rule(config) { if (indentation.none { (_, _, currentIndent) -> currentIndent == desiredIndent }) { val location = containingFile.getLocation( SourceLocation(lineNumberRange.first, desiredIndent + 1), - SourceLocation(lineNumberRange.last, indentation.last().line.length + 1), + SourceLocation(lineNumberRange.last, indentation.last().line.length + 1) ) report( this, location, - message(desiredIndent, indentation.minOf { (_, _, indent) -> indent }), + message(desiredIndent, indentation.minOf { (_, _, indent) -> indent }) ) } } @@ -138,19 +138,19 @@ class MultilineRawStringIndentation(config: Config) : Rule(config) { private fun KtStringTemplateExpression.checkClosing( desiredIndent: Int, - lineNumber: Int, + lineNumber: Int ) { val currentIndent = containingFile.getLine(lineNumber).countIndent() if (currentIndent != desiredIndent) { val location = if (currentIndent < desiredIndent) { containingFile.getLocation( SourceLocation(lineNumber, currentIndent + 1), - SourceLocation(lineNumber, currentIndent + "\"\"\"".length + 1), + SourceLocation(lineNumber, currentIndent + "\"\"\"".length + 1) ) } else { containingFile.getLocation( SourceLocation(lineNumber, desiredIndent + 1), - SourceLocation(lineNumber, currentIndent + 1), + SourceLocation(lineNumber, currentIndent + 1) ) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/NullableBooleanCheck.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/NullableBooleanCheck.kt index af8be212bcd..95040b3eb3a 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/NullableBooleanCheck.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/NullableBooleanCheck.kt @@ -38,7 +38,7 @@ class NullableBooleanCheck(config: Config = Config.empty) : Rule(config) { javaClass.simpleName, Severity.Style, "Nullable boolean check should use `==` rather than `?:`", - Debt.FIVE_MINS, + Debt.FIVE_MINS ) override fun visitBinaryExpression(expression: KtBinaryExpression) { @@ -56,7 +56,7 @@ class NullableBooleanCheck(config: Config = Config.empty) : Rule(config) { CodeSmell( issue = issue, entity = Entity.from(expression), - message = "The nullable boolean check `${expression.text}` should use $messageSuffix", + message = "The nullable boolean check `${expression.text}` should use $messageSuffix" ) ) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/StyleGuideProvider.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/StyleGuideProvider.kt index cdab5191a92..a6f6b1cc0a6 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/StyleGuideProvider.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/StyleGuideProvider.kt @@ -104,7 +104,7 @@ class StyleGuideProvider : DefaultRuleSetProvider { UseAnyOrNoneInsteadOfFind(config), UnnecessaryBackticks(config), MaxChainedCallsOnSameLine(config), - AlsoCouldBeApply(config), + AlsoCouldBeApply(config) ) ) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrimMultilineRawString.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrimMultilineRawString.kt index fbd0f0278b0..3cc67bcd9f1 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrimMultilineRawString.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrimMultilineRawString.kt @@ -55,7 +55,7 @@ class TrimMultilineRawString(val config: Config) : Rule(config) { CodeSmell( issue, Entity.from(expression), - "Multiline raw strings should be followed by `trimMargin()` or `trimIndent()`", + "Multiline raw strings should be followed by `trimMargin()` or `trimIndent()`" ) ) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryAbstractClass.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryAbstractClass.kt index 95851efd42d..3d639fb1bf4 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryAbstractClass.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryAbstractClass.kt @@ -70,7 +70,7 @@ class UnnecessaryAbstractClass(config: Config = Config.empty) : Rule(config) { annotationExcluder = AnnotationExcluder( file, @Suppress("DEPRECATION") excludeAnnotatedClasses, - bindingContext, + bindingContext ) super.visitKtFile(file) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryFilter.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryFilter.kt index d0249a78eee..4c034520f7d 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryFilter.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryFilter.kt @@ -90,7 +90,7 @@ class UnnecessaryFilter(config: Config = Config.empty) : Rule(config) { companion object { private val filterFqNames = listOf( FqName("kotlin.collections.filter"), - FqName("kotlin.sequences.filter"), + FqName("kotlin.sequences.filter") ) private val secondCalls = listOf( @@ -98,7 +98,7 @@ class UnnecessaryFilter(config: Config = Config.empty) : Rule(config) { SecondCall(FqName("kotlin.collections.List.isEmpty"), "any"), SecondCall(FqName("kotlin.collections.isNotEmpty"), "none"), SecondCall(FqName("kotlin.collections.count")), - SecondCall(FqName("kotlin.sequences.count")), + SecondCall(FqName("kotlin.sequences.count")) ) } } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryParentheses.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryParentheses.kt index dd0042bcfc8..9873c717f30 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryParentheses.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryParentheses.kt @@ -91,24 +91,24 @@ class UnnecessaryParentheses(config: Config = Config.empty) : Rule(config) { Precedence.ELVIS to arrayOf( Precedence.EQUALITY, // (a ?: b) == c Precedence.COMPARISON, // (a ?: b) > c - Precedence.IN_OR_IS, // (a ?: b) in c + Precedence.IN_OR_IS // (a ?: b) in c ), Precedence.SIMPLE_NAME to arrayOf( Precedence.ELVIS, // a ?: (b to c) - Precedence.SIMPLE_NAME, // (a to b) to c + Precedence.SIMPLE_NAME // (a to b) to c ), Precedence.MULTIPLICATIVE to arrayOf( Precedence.ADDITIVE, // (a * b) + c - Precedence.RANGE, // (a / b)..(c * d) + Precedence.RANGE // (a / b)..(c * d) ), // (a + b)..(c + d) Precedence.ADDITIVE to arrayOf(Precedence.RANGE), // (a && b) || c - Precedence.CONJUNCTION to arrayOf(Precedence.DISJUNCTION), + Precedence.CONJUNCTION to arrayOf(Precedence.DISJUNCTION) ) .onEach { (child, parents) -> parents.forEach { check(child <= it) } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseDataClass.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseDataClass.kt index defda0c037c..021c817c095 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseDataClass.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseDataClass.kt @@ -68,7 +68,7 @@ class UseDataClass(config: Config = Config.empty) : Rule(config) { val annotationExcluder = AnnotationExcluder( root, @Suppress("DEPRECATION") excludeAnnotatedClasses, - bindingContext, + bindingContext ) root.forEachDescendantOfType { visitKlass(it, annotationExcluder) } } diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseIsNullOrEmpty.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseIsNullOrEmpty.kt index fc2b96a1aa2..7eea0d2257e 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseIsNullOrEmpty.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseIsNullOrEmpty.kt @@ -161,7 +161,7 @@ class UseIsNullOrEmpty(config: Config = Config.empty) : Rule(config) { StandardNames.FqNames.mutableList, StandardNames.FqNames.mutableSet, StandardNames.FqNames.mutableCollection, - StandardNames.FqNames.mutableMap, + StandardNames.FqNames.mutableMap ) private val arrayClass = StandardNames.FqNames.array.toSafe() diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseOrEmpty.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseOrEmpty.kt index 9e770cefb26..96b94454286 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseOrEmpty.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/UseOrEmpty.kt @@ -102,7 +102,7 @@ class UseOrEmpty(config: Config = Config.empty) : Rule(config) { "kotlin.collections.emptySet", "kotlin.collections.emptyMap", "kotlin.sequences.emptySequence", - "kotlin.emptyArray", + "kotlin.emptyArray" ).associate { val fqName = FqName(it) fqName.shortName().asString() to fqName @@ -113,7 +113,7 @@ class UseOrEmpty(config: Config = Config.empty) : Rule(config) { "kotlin.collections.setOf", "kotlin.collections.mapOf", "kotlin.sequences.sequenceOf", - "kotlin.arrayOf", + "kotlin.arrayOf" ).associate { val fqName = FqName(it) fqName.shortName().asString() to fqName diff --git a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/VarCouldBeVal.kt b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/VarCouldBeVal.kt index da8c7c62ba8..a778da3caf8 100644 --- a/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/VarCouldBeVal.kt +++ b/detekt-rules-style/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/style/VarCouldBeVal.kt @@ -162,7 +162,7 @@ class VarCouldBeVal(config: Config = Config.empty) : Rule(config) { private fun evaluateAssignmentExpression( descriptor: DeclarationDescriptor, - rightExpression: KtExpression, + rightExpression: KtExpression ) { when (rightExpression) { is KtObjectLiteralExpression -> { diff --git a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenImportSpec.kt b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenImportSpec.kt index 6631f7caedd..72323491170 100644 --- a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenImportSpec.kt +++ b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenImportSpec.kt @@ -49,7 +49,7 @@ class ForbiddenImportSpec { .extracting("message") .containsExactlyInAnyOrder( "The import `kotlin.jvm.JvmField` has been forbidden in the detekt config.", - "The import `kotlin.SinceKotlin` has been forbidden in the detekt config.", + "The import `kotlin.SinceKotlin` has been forbidden in the detekt config." ) } diff --git a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCallSpec.kt b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCallSpec.kt index dadc3f2d679..b2f496e1cb3 100644 --- a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCallSpec.kt +++ b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ForbiddenMethodCallSpec.kt @@ -28,12 +28,12 @@ class ForbiddenMethodCallSpec(val env: KotlinCoreEnvironment) { .hasSize(2) .hasStartSourceLocations( SourceLocation(2, 5), - SourceLocation(3, 5), + SourceLocation(3, 5) ) .extracting("message") .containsExactly( "The method `kotlin.io.print` has been forbidden: print does not allow you to configure the output stream. Use a logger instead.", - "The method `kotlin.io.println` has been forbidden: println does not allow you to configure the output stream. Use a logger instead.", + "The method `kotlin.io.println` has been forbidden: println does not allow you to configure the output stream. Use a logger instead." ) } diff --git a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxLineLengthSpec.kt b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxLineLengthSpec.kt index 4c211bc3988..1f31ac7756b 100644 --- a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxLineLengthSpec.kt +++ b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/MaxLineLengthSpec.kt @@ -26,7 +26,7 @@ class MaxLineLengthSpec { fun `should report no errors when maxLineLength is set to 200`() { val rule = MaxLineLength( TestConfig( - MAX_LINE_LENGTH to "200", + MAX_LINE_LENGTH to "200" ) ) @@ -46,7 +46,7 @@ class MaxLineLengthSpec { fun `should report all errors with default maxLineLength including raw strings`() { val rule = MaxLineLength( TestConfig( - EXCLUDE_RAW_STRINGS to false, + EXCLUDE_RAW_STRINGS to false ) ) @@ -94,7 +94,7 @@ class MaxLineLengthSpec { fun `should not report the package statement and import statements by default`() { val rule = MaxLineLength( TestConfig( - MAX_LINE_LENGTH to "60", + MAX_LINE_LENGTH to "60" ) ) @@ -108,7 +108,7 @@ class MaxLineLengthSpec { TestConfig( MAX_LINE_LENGTH to "60", EXCLUDE_PACKAGE_STATEMENTS to "false", - EXCLUDE_IMPORT_STATEMENTS to "false", + EXCLUDE_IMPORT_STATEMENTS to "false" ) ) @@ -122,7 +122,7 @@ class MaxLineLengthSpec { TestConfig( MAX_LINE_LENGTH to "60", EXCLUDE_PACKAGE_STATEMENTS to "true", - EXCLUDE_IMPORT_STATEMENTS to "true", + EXCLUDE_IMPORT_STATEMENTS to "true" ) ) @@ -139,7 +139,7 @@ class MaxLineLengthSpec { fun `should report the package statement, import statements, line and comments by default`() { val rule = MaxLineLength( TestConfig( - MAX_LINE_LENGTH to "60", + MAX_LINE_LENGTH to "60" ) ) @@ -154,7 +154,7 @@ class MaxLineLengthSpec { MAX_LINE_LENGTH to "60", EXCLUDE_PACKAGE_STATEMENTS to "false", EXCLUDE_IMPORT_STATEMENTS to "false", - EXCLUDE_COMMENT_STATEMENTS to "false", + EXCLUDE_COMMENT_STATEMENTS to "false" ) ) @@ -167,7 +167,7 @@ class MaxLineLengthSpec { val rule = MaxLineLength( TestConfig( MAX_LINE_LENGTH to "60", - EXCLUDE_COMMENT_STATEMENTS to "true", + EXCLUDE_COMMENT_STATEMENTS to "true" ) ) @@ -194,7 +194,7 @@ class MaxLineLengthSpec { fun `should only the function line by default`() { val rule = MaxLineLength( TestConfig( - MAX_LINE_LENGTH to "60", + MAX_LINE_LENGTH to "60" ) ) @@ -208,7 +208,7 @@ class MaxLineLengthSpec { TestConfig( MAX_LINE_LENGTH to "60", EXCLUDE_PACKAGE_STATEMENTS to "false", - EXCLUDE_IMPORT_STATEMENTS to "false", + EXCLUDE_IMPORT_STATEMENTS to "false" ) ) @@ -222,7 +222,7 @@ class MaxLineLengthSpec { TestConfig( MAX_LINE_LENGTH to "60", EXCLUDE_PACKAGE_STATEMENTS to "true", - EXCLUDE_IMPORT_STATEMENTS to "true", + EXCLUDE_IMPORT_STATEMENTS to "true" ) ) @@ -236,7 +236,7 @@ class MaxLineLengthSpec { TestConfig( MAX_LINE_LENGTH to "60", EXCLUDE_PACKAGE_STATEMENTS to "true", - EXCLUDE_IMPORT_STATEMENTS to "true", + EXCLUDE_IMPORT_STATEMENTS to "true" ) ) diff --git a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ReturnCountSpec.kt b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ReturnCountSpec.kt index a0966fc9154..be905b270d2 100644 --- a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ReturnCountSpec.kt +++ b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/ReturnCountSpec.kt @@ -347,7 +347,7 @@ class ReturnCountSpec { TestConfig( mapOf( MAX to "2", - EXCLUDED_FUNCTIONS to listOf("factorial", "fac"), + EXCLUDED_FUNCTIONS to listOf("factorial", "fac") ) ) ).compileAndLint(code) @@ -360,7 +360,7 @@ class ReturnCountSpec { TestConfig( mapOf( MAX to "2", - EXCLUDED_FUNCTIONS to listOf("fa*ctorial"), + EXCLUDED_FUNCTIONS to listOf("fa*ctorial") ) ) ).compileAndLint(code) diff --git a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrimMultilineRawStringSpec.kt b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrimMultilineRawStringSpec.kt index 8c3618a1fe1..8b8d1af4038 100644 --- a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrimMultilineRawStringSpec.kt +++ b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/TrimMultilineRawStringSpec.kt @@ -13,9 +13,9 @@ class TrimMultilineRawStringSpec { @Test fun `raises multiline raw strings without trim`() { val code = """ - val a = ${TQ} + val a = $TQ Hello world! - ${TQ} + $TQ """.trimIndent() subject.compileAndLint(code) assertThat(subject.findings).hasSize(1) @@ -24,9 +24,9 @@ class TrimMultilineRawStringSpec { @Test fun `raises multiline raw strings with lenght`() { val code = """ - val a = ${TQ} + val a = $TQ Hello world! - ${TQ}.length + $TQ.length """.trimIndent() subject.compileAndLint(code) assertThat(subject.findings).hasSize(1) @@ -35,9 +35,9 @@ class TrimMultilineRawStringSpec { @Test fun `doesn't raise multiline raw strings without trimIndent`() { val code = """ - val a = ${TQ} + val a = $TQ Hello world! - ${TQ}.trimIndent() + $TQ.trimIndent() """.trimIndent() subject.compileAndLint(code) assertThat(subject.findings).isEmpty() @@ -46,9 +46,9 @@ class TrimMultilineRawStringSpec { @Test fun `doesn't raise multiline raw strings without trimMargin`() { val code = """ - val a = ${TQ} + val a = $TQ |Hello world! - ${TQ}.trimMargin() + $TQ.trimMargin() """.trimIndent() subject.compileAndLint(code) assertThat(subject.findings).isEmpty() @@ -57,9 +57,9 @@ class TrimMultilineRawStringSpec { @Test fun `doesn't raise multiline raw strings without trimMargin with parameter`() { val code = """ - val a = ${TQ} + val a = $TQ >Hello world! - ${TQ}.trimMargin(">") + $TQ.trimMargin(">") """.trimIndent() subject.compileAndLint(code) assertThat(subject.findings).isEmpty() @@ -68,7 +68,7 @@ class TrimMultilineRawStringSpec { @Test fun `don't raise one line raw strings`() { val code = """ - val a = ${TQ}Hello world!${TQ} + val a = ${TQ}Hello world!$TQ """.trimIndent() subject.compileAndLint(code) assertThat(subject.findings).isEmpty() diff --git a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryParenthesesSpec.kt b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryParenthesesSpec.kt index 86882a5471b..2c91b29991d 100644 --- a/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryParenthesesSpec.kt +++ b/detekt-rules-style/src/test/kotlin/io/gitlab/arturbosch/detekt/rules/style/UnnecessaryParenthesesSpec.kt @@ -191,7 +191,7 @@ class UnnecessaryParenthesesSpec { @ParameterizedTest @MethodSource("cases") fun `should not report call to function with multiple lambdas as parameters but also other parameters`( - testCase: RuleTestCase, + testCase: RuleTestCase ) { val code = """ class Clazz { @@ -347,7 +347,7 @@ class UnnecessaryParenthesesSpec { ), Arguments.of( Named.of("With allow for unclear precedence", RuleTestCase(allowForUnclearPrecedence = true)) - ), + ) ) } } diff --git a/detekt-rules-style/src/test/resources/MaxLineLength.kt b/detekt-rules-style/src/test/resources/MaxLineLength.kt index 567a100731e..4b9efabe434 100644 --- a/detekt-rules-style/src/test/resources/MaxLineLength.kt +++ b/detekt-rules-style/src/test/resources/MaxLineLength.kt @@ -16,7 +16,7 @@ class MaxLineLength { This is another very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long multiline String that will break the MaxLineLength - """.trimIndent() + """.trimIndent() val longMultiLineFieldWithLineBreaks = """ @@ -42,7 +42,6 @@ class MaxLineLength { println(hello) println(loremIpsum) - } // https://longurlmaker.com/go?id=z4Is.gd8c11rangy50farawayRedirx1drawn%2Bout60c3protractedTinyLinkstringylingeringfar%2BreachinglMyURLSHurl86018lengthy7frunningoutstretched1111ilengthy2xSimURLSmallr800xSimURL361juEasyURLSimURL0022faraway1095xhighfar%2Boff1618sustained0Shima8961toutstretchedexpanded0stretch611220drawn%2BoutdwkTightURL8kDoioplongish10Xil14b101ShredURLTraceURLbptoweringB6512TinyURL6towering0rGetShorty004bm5301URLprotracted0prolonged61MooURLy1948jspread%2Bout428u0t3stretchingfarawaylasting11ShredURLc2bDigBigexpandedX.se90a20TinyURL26WapURLr1cprolongedkelongatedc1f2c01loftylengthycontinuede7WapURLgGetShorty2NutshellURLcontinued6a2lastingr5protracted1expandeddistantspread%2BoutURl.iersustainedNotLongSHurl3w2SimURL011xSnipURL02GetShorty2prolonged0f02f60blingeringIs.gd301URLTinyLinktowering3d200t01osustained2WapURL90ShortURL11spread%2Boute02URLPieFly2toweringDwarfurl70elongated9s070SnipURL6Is.gd7spread%2Boutc0hy210vtcnf43Redirxb9148n1lingering6PiURL16URLcutaspread%2BoutYATUCoutstretchede70lUlimita1e610ShortenURL1lnk.inenduringUlimit0U760l8m72011793v7020TightURLelongatedYATUCt6UrlTeaetc91e5kspun%2Bout010d1e1b1Dwarfurl6Shortlinksb0sustained0enlarged6great1187e5e690URLCutter1spun%2Bout10drawn%2Bouttall4EasyURLDecentURLenduringd1eTraceURL5yGetShortyTinyLinkfar%2Boff1prolonged4cc0stretcheddeepprotracted3f001elongate9018ystretchinglastingi7TinyURL7expanded910continuedremotef8sustainedz175lingeringcbloftyprolonged10079running0UlimitB6515Shrinkr00LiteURL1loftyoutstretchedclnk.in3farawayg5runningTinyLinkspread%2Bout1stringy11c036greatfarawaystretchingefar%2Boff31spread%2Bout4kDoiopMooURL53m19Beam.tolastingShredURL1s25ShimBeam.to8nstretchtowering80StartURLShortURL4lengthened018Is.gdNotLongzWapURLNutshellURLe2spun%2Bout119elongated7elongated5outstretchedh8k1stringyloftyShredURL84running06308d071Minilien3wg3UrlTealoftystretchedwCanURLfar%2Boff7atf104083towering820ganglingw35m1a063LiteURLt081NanoRef361lnk.in0deep0Shrinkr6e80far%2Boff9170Redirxy6btspread%2Boutsustained10UlimitShortlinks2toweringGetShorty3ShrinkrDecentURLsustaineddbg1nfShortURL331a001enlargedB65RedirxelongatedMinilien809UrlT diff --git a/detekt-rules-style/src/test/resources/MaxLineLengthSuppressed.kt b/detekt-rules-style/src/test/resources/MaxLineLengthSuppressed.kt index 2220b3d239e..eca7bda6c6e 100644 --- a/detekt-rules-style/src/test/resources/MaxLineLengthSuppressed.kt +++ b/detekt-rules-style/src/test/resources/MaxLineLengthSuppressed.kt @@ -20,7 +20,7 @@ class MaxLineLengthSuppressed { This is anotehr very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very very long multiline String that will break the MaxLineLength - """.trimIndent() + """.trimIndent() @Suppress("MaxLineLength") val longMultiLineFieldWithLineBreaks = @@ -42,7 +42,6 @@ class MaxLineLengthSuppressed { println(hello) println(loremIpsum) - } fun anIncrediblyLongAndComplexMethodNameThatProbablyShouldBeMuchShorterButForTheSakeOfTheTestItsNot(): String { diff --git a/detekt-rules-style/src/test/resources/MaxLineLengthWithLongComments.kt b/detekt-rules-style/src/test/resources/MaxLineLengthWithLongComments.kt index 1271d6ae5fb..18c330854bd 100644 --- a/detekt-rules-style/src/test/resources/MaxLineLengthWithLongComments.kt +++ b/detekt-rules-style/src/test/resources/MaxLineLengthWithLongComments.kt @@ -24,7 +24,6 @@ class MaxLineLengthWithLongComments { val loremIpsum = getLoremIpsum() println(loremIpsum) - } fun getLoremIpsum() = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua." diff --git a/detekt-rules-style/src/test/resources/NoTabsPositive.kt b/detekt-rules-style/src/test/resources/NoTabsPositive.kt index bdfedc9a00d..f83bc52acde 100644 --- a/detekt-rules-style/src/test/resources/NoTabsPositive.kt +++ b/detekt-rules-style/src/test/resources/NoTabsPositive.kt @@ -1,11 +1,10 @@ package cases class NoTabsPositive { - fun methodOk() { // reports 3 - println("A message") + fun methodOk() { // reports 3 + println("A message") + } - } - - val str = "${ methodOk()}" // reports 1 - val multiStr = """${ methodOk()}""" // reports 1 + val str = "${ methodOk()}" // reports 1 + val multiStr = """${ methodOk()}""" // reports 1 } diff --git a/detekt-rules-style/src/test/resources/UtilityClassesNegative.kt b/detekt-rules-style/src/test/resources/UtilityClassesNegative.kt index c80d87ee49a..bf463af9c4b 100644 --- a/detekt-rules-style/src/test/resources/UtilityClassesNegative.kt +++ b/detekt-rules-style/src/test/resources/UtilityClassesNegative.kt @@ -48,7 +48,7 @@ class NoUtilityClasses { private val i = 0 - class EmptyClass1 {} + class EmptyClass1 class EmptyClass2 class ClassWithSecondaryConstructor { diff --git a/detekt-rules/src/test/resources/SuppressedByElementAnnotation.kt b/detekt-rules/src/test/resources/SuppressedByElementAnnotation.kt index 069be9bd42c..eff9129c366 100644 --- a/detekt-rules/src/test/resources/SuppressedByElementAnnotation.kt +++ b/detekt-rules/src/test/resources/SuppressedByElementAnnotation.kt @@ -45,5 +45,4 @@ class SuppressedElements { lpl(1, 2, 3, 4, 5, 6) assert(false) { "FAILED TEST" } } - } diff --git a/detekt-rules/src/test/resources/SuppressedElementsByClassAnnotation.kt b/detekt-rules/src/test/resources/SuppressedElementsByClassAnnotation.kt index e61d23a80af..efb391621ee 100644 --- a/detekt-rules/src/test/resources/SuppressedElementsByClassAnnotation.kt +++ b/detekt-rules/src/test/resources/SuppressedElementsByClassAnnotation.kt @@ -35,5 +35,4 @@ class SuppressedElements3 { lpl(1, 2, 3, 4, 5, 6) assert(false) { "FAILED TEST" } } - } diff --git a/detekt-rules/src/test/resources/SuppressedElementsByFileAnnotation.kt b/detekt-rules/src/test/resources/SuppressedElementsByFileAnnotation.kt index 019212e7c77..54b77411dd7 100644 --- a/detekt-rules/src/test/resources/SuppressedElementsByFileAnnotation.kt +++ b/detekt-rules/src/test/resources/SuppressedElementsByFileAnnotation.kt @@ -40,5 +40,4 @@ class SuppressedElements2 { lpl(1, 2, 3, 4, 5, 6) assert(false) { "FAILED TEST" } } - } diff --git a/detekt-test-utils/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/KotlinEnvironmentTestSetup.kt b/detekt-test-utils/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/KotlinEnvironmentTestSetup.kt index fda626909a4..a7ab8d58815 100644 --- a/detekt-test-utils/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/KotlinEnvironmentTestSetup.kt +++ b/detekt-test-utils/src/main/kotlin/io/gitlab/arturbosch/detekt/rules/KotlinEnvironmentTestSetup.kt @@ -53,7 +53,7 @@ internal class KotlinEnvironmentResolver : ParameterResolver { additionalRootPaths = checkNotNull( classpathFromClassloader(Thread.currentThread().contextClassLoader) ) { "We should always have a classpath" }, - additionalJavaSourceRootPaths = extensionContext.additionalJavaSourcePaths(), + additionalJavaSourceRootPaths = extensionContext.additionalJavaSourcePaths() ) ).also { extensionContext.wrapper = it } return closeableWrapper.wrapper.env diff --git a/detekt-test/src/main/kotlin/io/gitlab/arturbosch/detekt/test/RuleExtensions.kt b/detekt-test/src/main/kotlin/io/gitlab/arturbosch/detekt/test/RuleExtensions.kt index 90dd131e8d2..6b039834a7c 100644 --- a/detekt-test/src/main/kotlin/io/gitlab/arturbosch/detekt/test/RuleExtensions.kt +++ b/detekt-test/src/main/kotlin/io/gitlab/arturbosch/detekt/test/RuleExtensions.kt @@ -37,7 +37,7 @@ fun BaseRule.lint(path: Path): List { fun BaseRule.lintWithContext( environment: KotlinCoreEnvironment, @Language("kotlin") content: String, - @Language("kotlin") vararg additionalContents: String, + @Language("kotlin") vararg additionalContents: String ): List { val ktFile = compileContentForTest(content) val additionalKtFiles = additionalContents.mapIndexed { index, additionalContent -> diff --git a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/BaselineProvider.kt b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/BaselineProvider.kt index b6b23cce58f..0f37d112101 100644 --- a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/BaselineProvider.kt +++ b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/BaselineProvider.kt @@ -14,7 +14,7 @@ interface BaselineProvider { companion object { fun load( - classLoader: ClassLoader = BaselineProvider::class.java.classLoader, + classLoader: ClassLoader = BaselineProvider::class.java.classLoader ): BaselineProvider = ServiceLoader.load(BaselineProvider::class.java, classLoader).first() } } diff --git a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/DefaultConfigurationProvider.kt b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/DefaultConfigurationProvider.kt index fcd2815a6d9..e4aab28c8b6 100644 --- a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/DefaultConfigurationProvider.kt +++ b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/api/DefaultConfigurationProvider.kt @@ -17,7 +17,7 @@ interface DefaultConfigurationProvider { fun load( extensionsSpec: ExtensionsSpec, - classLoader: ClassLoader = DefaultConfigurationProvider::class.java.classLoader, + classLoader: ClassLoader = DefaultConfigurationProvider::class.java.classLoader ): DefaultConfigurationProvider { return ServiceLoader.load(DefaultConfigurationProvider::class.java, classLoader) .first() diff --git a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/dsl/CompilerSpecBuilder.kt b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/dsl/CompilerSpecBuilder.kt index 3806b0f5c11..38ed5063c45 100644 --- a/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/dsl/CompilerSpecBuilder.kt +++ b/detekt-tooling/src/main/kotlin/io/github/detekt/tooling/dsl/CompilerSpecBuilder.kt @@ -18,5 +18,5 @@ private data class CompilerModel( override val jvmTarget: String, override val languageVersion: String?, override val classpath: String?, - override val jdkHome: Path?, + override val jdkHome: Path? ) : CompilerSpec diff --git a/detekt-tooling/src/test/kotlin/io/github/detekt/tooling/api/FunctionMatcherSpec.kt b/detekt-tooling/src/test/kotlin/io/github/detekt/tooling/api/FunctionMatcherSpec.kt index 5ddb232c655..23b2a9cd51f 100644 --- a/detekt-tooling/src/test/kotlin/io/github/detekt/tooling/api/FunctionMatcherSpec.kt +++ b/detekt-tooling/src/test/kotlin/io/github/detekt/tooling/api/FunctionMatcherSpec.kt @@ -25,28 +25,28 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { TestCase( testDescription = "should return method name and null params list in case of simplifies signature", functionSignature = "java.time.LocalDate.now", - expectedFunctionMatcher = FunctionMatcher.NameOnly("java.time.LocalDate.now"), + expectedFunctionMatcher = FunctionMatcher.NameOnly("java.time.LocalDate.now") ), TestCase( testDescription = "should return method name and empty params list for full signature parameterless method", functionSignature = "java.time.LocalDate.now()", - expectedFunctionMatcher = FunctionMatcher.WithParameters("java.time.LocalDate.now", emptyList()), + expectedFunctionMatcher = FunctionMatcher.WithParameters("java.time.LocalDate.now", emptyList()) ), TestCase( testDescription = "should return method name and params list for full signature method with single param", functionSignature = "java.time.LocalDate.now(java.time.Clock)", expectedFunctionMatcher = FunctionMatcher.WithParameters( "java.time.LocalDate.now", - listOf("java.time.Clock"), - ), + listOf("java.time.Clock") + ) ), TestCase( testDescription = "should return method name and params list for full signature method with multiple params", functionSignature = "java.time.LocalDate.of(kotlin.Int, kotlin.Int, kotlin.Int)", expectedFunctionMatcher = FunctionMatcher.WithParameters( "java.time.LocalDate.of", - listOf("kotlin.Int", "kotlin.Int", "kotlin.Int"), - ), + listOf("kotlin.Int", "kotlin.Int", "kotlin.Int") + ) ), TestCase( testDescription = "should return method name and params list for full signature method with multiple params " + @@ -54,8 +54,8 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { functionSignature = "io.gitlab.arturbosch.detekt.SomeClass.`some , method`(kotlin.String)", expectedFunctionMatcher = FunctionMatcher.WithParameters( "io.gitlab.arturbosch.detekt.SomeClass.some , method", - listOf("kotlin.String"), - ), + listOf("kotlin.String") + ) ), TestCase( testDescription = "should return method name and param list when it has lambdas", @@ -66,9 +66,9 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { "kotlin.Function2", "kotlin.Function1", "Foo", - "kotlin.Function0", - ), - ), + "kotlin.Function0" + ) + ) ), TestCase( testDescription = "should return method name and param list when it has complex lambdas", @@ -77,10 +77,10 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { "hello", listOf( "kotlin.Function2", - "kotlin.Function0", - ), - ), - ), + "kotlin.Function0" + ) + ) + ) ).map { testCase -> dynamicTest(testCase.testDescription) { val functionMatcher = FunctionMatcher.fromFunctionSignature(testCase.functionSignature) @@ -194,7 +194,7 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { "fun foo(a: () -> Unit), true", "fun foo(a: (String) -> String), false", "fun foo(a: (String) -> Unit), false", - "fun foo(a: (Int) -> Unit), false", + "fun foo(a: (Int) -> Unit), false" ) fun `When foo(() - kotlin#String)`(code: String, result: Boolean) { val (function, bindingContext) = buildKtFunction(env, code) @@ -209,7 +209,7 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { "fun foo(a: () -> Unit), false", "fun foo(a: (String) -> String), true", "fun foo(a: (String) -> Unit), true", - "fun foo(a: (Int) -> Unit), true", + "fun foo(a: (Int) -> Unit), true" ) fun `When foo((kotlin#String) - Unit)`(code: String, result: Boolean) { val (function, bindingContext) = buildKtFunction(env, code) @@ -224,7 +224,7 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { "fun foo(a: String), true", "fun Int.foo(), false", "fun String.foo(a: Int), false", - "'fun foo(a: String, ba: Int)', false", + "'fun foo(a: String, ba: Int)', false" ) fun `When foo(kotlin#String)`(code: String, result: Boolean) { val (function, bindingContext) = buildKtFunction(env, code) @@ -239,7 +239,7 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { "fun foo(a: String), false", "fun Int.foo(), false", "fun String.foo(a: Int), true", - "'fun foo(a: String, ba: Int)', true", + "'fun foo(a: String, ba: Int)', true" ) fun `When foo(kotlin#String, kotlin#Int)`(code: String, result: Boolean) { val (function, bindingContext) = buildKtFunction(env, code) @@ -254,7 +254,7 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { "'fun foo(a: U, b: T)', false", "'fun foo(a: String, b: U)', false", "'fun T.foo(a: U)', true", - "'fun U.foo(a: T)', false", + "'fun U.foo(a: T)', false" ) fun `When foo(T, U)`(code: String, result: Boolean) { val (function, bindingContext) = buildKtFunction(env, code) @@ -267,7 +267,7 @@ class FunctionMatcherSpec(private val env: KotlinCoreEnvironment) { private class TestCase( val testDescription: String, val functionSignature: String, - val expectedFunctionMatcher: FunctionMatcher, + val expectedFunctionMatcher: FunctionMatcher ) private fun buildKtFunction(environment: KotlinCoreEnvironment, code: String): Pair { diff --git a/detekt-utils/src/test/kotlin/io/github/detekt/utils/YamlSpec.kt b/detekt-utils/src/test/kotlin/io/github/detekt/utils/YamlSpec.kt index 7617df44702..05b4501b92c 100644 --- a/detekt-utils/src/test/kotlin/io/github/detekt/utils/YamlSpec.kt +++ b/detekt-utils/src/test/kotlin/io/github/detekt/utils/YamlSpec.kt @@ -172,8 +172,8 @@ class YamlSpec { "z" to "value", "a" to "value", "x" to "value", - "b" to "value", - ), + "b" to "value" + ) ) val result = yaml { listOfMaps("key", given) } val expected = """ @@ -192,8 +192,8 @@ class YamlSpec { mapOf( "a" to "value", "b" to null, - "c" to "value", - ), + "c" to "value" + ) ) val result = yaml { listOfMaps("key", given) } val expected = """ diff --git a/scripts/compare_releases.main.kts b/scripts/compare_releases.main.kts index b48fa8e88f1..6fbe6197a37 100755 --- a/scripts/compare_releases.main.kts +++ b/scripts/compare_releases.main.kts @@ -1,5 +1,5 @@ #!/bin/sh -//bin/true; exec kotlinc -script "$0" -- "$@" +// bin/true; exec kotlinc -script "$0" -- "$@" /** * Script to compare two detekt releases by running both versions and diffing the txt results. diff --git a/scripts/get_analysis_projects.kts b/scripts/get_analysis_projects.kts index 12d48d19a6c..c9738460989 100755 --- a/scripts/get_analysis_projects.kts +++ b/scripts/get_analysis_projects.kts @@ -16,7 +16,7 @@ val githubProjects = listOf( "Kotlin/kotlinx-datetime", "Kotlin/dokka", "kotest/kotest", - "tipsy/javalin", + "tipsy/javalin" ) class Downloader(private val basePath: Path, private val project: String) { diff --git a/scripts/github-milestone-report.main.kts b/scripts/github-milestone-report.main.kts index 8bfd2ef68eb..52ea5791427 100755 --- a/scripts/github-milestone-report.main.kts +++ b/scripts/github-milestone-report.main.kts @@ -1,5 +1,5 @@ #!/bin/sh -//bin/true; exec kotlinc -script "$0" -- "$@" +// bin/true; exec kotlinc -script "$0" -- "$@" /** * Script to prepare release notes for the upcoming Detekt release