From c6c383041874f7921b667003a987f219a39530ab Mon Sep 17 00:00:00 2001 From: Brian Norman Date: Fri, 26 Nov 2021 15:53:57 -0600 Subject: [PATCH] ktlint errors --- .editorconfig | 7 +++++++ .../com/bnorm/power/PowerAssertCallTransformer.kt | 12 +++++++----- .../com/bnorm/power/delegate/FunctionDelegate.kt | 1 - .../src/test/kotlin/com/bnorm/power/AssertTest.kt | 12 ++++++------ .../kotlin/com/bnorm/power/Junit5AssertionsTest.kt | 2 +- .../kotlin/com/bnorm/power/KotlinTestAssertTest.kt | 2 +- .../src/test/kotlin/com/bnorm/power/LamdaTest.kt | 2 +- 7 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.editorconfig b/.editorconfig index 03e22d69f1b..78092e35a49 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,16 @@ root = true [*] +charset = utf-8 end_of_line = lf insert_final_newline = true [*.{kt,kts}] indent_style = space indent_size = 2 + +ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL +ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^ +ij_kotlin_name_count_to_use_star_import = 2147483647 +ij_kotlin_name_count_to_use_star_import_for_members = 2147483647 +ij_kotlin_packages_to_use_import_on_demand = unset diff --git a/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt index f0622578ccc..7e4567a8e3c 100644 --- a/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt +++ b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/PowerAssertCallTransformer.kt @@ -194,9 +194,11 @@ class PowerAssertCallTransformer( if (values.isEmpty()) return emptyList() // Java static functions require searching by class - val parentClassFunctions = (function.parentClassOrNull - ?.let { context.referenceClass(it.kotlinFqName) } - ?.functions ?: emptySequence()) + val parentClassFunctions = ( + function.parentClassOrNull + ?.let { context.referenceClass(it.kotlinFqName) } + ?.functions ?: emptySequence() + ) .filter { it.owner.kotlinFqName == function.kotlinFqName } .toList() val possible = (context.referenceFunctions(function.kotlinFqName) + parentClassFunctions) @@ -226,8 +228,8 @@ class PowerAssertCallTransformer( private fun isStringJavaSupplierFunction(type: IrType): Boolean { val javaSupplier = context.referenceClass(FqName("java.util.function.Supplier")) - return javaSupplier != null && type.isSubtypeOfClass(javaSupplier) - && type is IrSimpleType && (type.arguments.size == 1 && isStringSupertype(type.arguments.first())) + return javaSupplier != null && type.isSubtypeOfClass(javaSupplier) && + type is IrSimpleType && (type.arguments.size == 1 && isStringSupertype(type.arguments.first())) } private fun isStringSupertype(argument: IrTypeArgument): Boolean = diff --git a/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/delegate/FunctionDelegate.kt b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/delegate/FunctionDelegate.kt index 6efda54ba8f..f0cb155ae77 100644 --- a/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/delegate/FunctionDelegate.kt +++ b/kotlin-power-assert-plugin/src/main/kotlin/com/bnorm/power/delegate/FunctionDelegate.kt @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.ir.builders.irCall import org.jetbrains.kotlin.ir.builders.parent import org.jetbrains.kotlin.ir.declarations.IrFunction import org.jetbrains.kotlin.ir.declarations.IrValueParameter -import org.jetbrains.kotlin.ir.declarations.IrVariable import org.jetbrains.kotlin.ir.expressions.IrCall import org.jetbrains.kotlin.ir.expressions.IrExpression import org.jetbrains.kotlin.ir.symbols.IrSimpleFunctionSymbol diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/AssertTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/AssertTest.kt index 1294ef8e526..a4726792610 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/AssertTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/AssertTest.kt @@ -16,8 +16,8 @@ package com.bnorm.power -import kotlin.test.Test import org.jetbrains.kotlin.name.FqName +import kotlin.test.Test class AssertTest { @Test @@ -86,11 +86,11 @@ fun main() { assert(1 == 2, lambda) }""", """ -Not equal -assert(1 == 2, lambda) - | - false -""".trimIndent() + Not equal + assert(1 == 2, lambda) + | + false + """.trimIndent() ) } diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/Junit5AssertionsTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/Junit5AssertionsTest.kt index 2fedb0a5867..a95873a1073 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/Junit5AssertionsTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/Junit5AssertionsTest.kt @@ -16,8 +16,8 @@ package com.bnorm.power -import kotlin.test.Test import org.jetbrains.kotlin.name.FqName +import kotlin.test.Test class Junit5AssertionsTest { @Test diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/KotlinTestAssertTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/KotlinTestAssertTest.kt index 0cba082e92c..5032dcee952 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/KotlinTestAssertTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/KotlinTestAssertTest.kt @@ -16,8 +16,8 @@ package com.bnorm.power -import kotlin.test.Test import org.jetbrains.kotlin.name.FqName +import kotlin.test.Test class KotlinTestAssertTest { @Test diff --git a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/LamdaTest.kt b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/LamdaTest.kt index 4769e631efa..763dc1f90ae 100644 --- a/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/LamdaTest.kt +++ b/kotlin-power-assert-plugin/src/test/kotlin/com/bnorm/power/LamdaTest.kt @@ -16,8 +16,8 @@ package com.bnorm.power -import kotlin.test.Test import org.jetbrains.kotlin.name.FqName +import kotlin.test.Test class LamdaTest { @Test