Update dependency com.pinterest.ktlint:ktlint-cli to v1.3.0 (sqldelig…

…ht#5285)

* Update dependency com.pinterest.ktlint:ktlint-cli to v1.3.0

* Disable expression rule

* Reformat

* Reformat again

* Manual format

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jake Wharton <jw@squareup.com>

build.gradle

@@ -28,6 +28,8 @@ spotless {
     ktlint(libs.versions.ktlint.get()).editorConfigOverride([
       "ktlint_standard_discouraged-comment-location": "disabled",
       "ktlint_standard_package-name": "disabled",
+      // Making something an expression body should be a choice around readability.
+      'ktlint_standard_function-expression-body': 'disabled',
     ])
   }
 }

dialects/hsql/src/main/kotlin/app/cash/sqldelight/dialects/hsql/grammar/mixins/ResultColumnMixin.kt

@@ -7,7 +7,9 @@ import com.alecstrong.sql.psi.core.psi.QueryElement.QueryResult
 import com.alecstrong.sql.psi.core.psi.impl.SqlResultColumnImpl
 import com.intellij.lang.ASTNode
 
-internal abstract class ResultColumnMixin(node: ASTNode) : SqlResultColumnImpl(node), HsqlResultColumn {
+internal abstract class ResultColumnMixin(node: ASTNode) :
+  SqlResultColumnImpl(node),
+  HsqlResultColumn {
   private val queryExposed = ModifiableFileLazy lazy@{
     if (windowFunctionInvocation != null) {
       var column = QueryElement.QueryColumn(this)

dialects/postgresql/src/main/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/ColumnDefMixin.kt

@@ -5,7 +5,9 @@ import com.alecstrong.sql.psi.core.psi.SqlColumnDef
 import com.alecstrong.sql.psi.core.psi.impl.SqlColumnDefImpl
 import com.intellij.lang.ASTNode
 
-internal open class ColumnDefMixin(node: ASTNode) : SqlColumnDefImpl(node), SqlColumnDef {
+internal open class ColumnDefMixin(node: ASTNode) :
+  SqlColumnDefImpl(node),
+  SqlColumnDef {
 
   override fun hasDefaultValue(): Boolean {
     return isSerial() || super.hasDefaultValue()

dialects/postgresql/src/main/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/CopyMixin.kt

@@ -7,7 +7,9 @@ import com.alecstrong.sql.psi.core.psi.SqlTableName
 import com.intellij.lang.ASTNode
 import com.intellij.psi.PsiElement
 
-internal abstract class CopyMixin(node: ASTNode) : SqlCompositeElementImpl(node), PostgreSqlCopyStdin {
+internal abstract class CopyMixin(node: ASTNode) :
+  SqlCompositeElementImpl(node),
+  PostgreSqlCopyStdin {
   override fun queryAvailable(child: PsiElement): Collection<QueryResult> {
     val tableName = child.parent.children.filterIsInstance<SqlTableName>().single()
     return tableAvailable(child, tableName.name)

dialects/postgresql/src/main/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/CreateIndexMixin.kt

@@ -14,12 +14,12 @@ import com.intellij.psi.PsiElement
  * brin = [autosummarize (on|off|true|false), pages_per_range (1-2147483647) ]
  */
 internal abstract class CreateIndexMixin(node: ASTNode) :
-  SqlCreateIndexStmtImpl(node), PostgreSqlCreateIndexStmt {
+  SqlCreateIndexStmtImpl(node),
+  PostgreSqlCreateIndexStmt {
 
   override fun annotate(annotationHolder: SqlAnnotationHolder) {
     withStorageParameter?.let { wsp ->
-      wsp.storageParametersList.zip(wsp.storageParameterList).forEach {
-          sp ->
+      wsp.storageParametersList.zip(wsp.storageParameterList).forEach { sp ->
         indexMethod?.let { im ->
           when (im.text.lowercase()) {
             "brin" -> when (sp.first.text) {

dialects/postgresql/src/main/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/DistinctOnExpressionMixin.kt

@@ -13,7 +13,8 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
 
 internal abstract class DistinctOnExpressionMixin(node: ASTNode) :
-  SqlCompositeElementImpl(node), PostgreSqlDistinctOnExpr {
+  SqlCompositeElementImpl(node),
+  PostgreSqlDistinctOnExpr {
 
   private val distinctOnColumns get() = children.filterIsInstance<SqlResultColumn>()
 

dialects/postgresql/src/main/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/ReturningClauseMixin.kt

@@ -16,7 +16,9 @@ import com.intellij.lang.ASTNode
 import com.intellij.psi.util.PsiTreeUtil
 
 internal abstract class ReturningClauseMixin(node: ASTNode) :
-  SqlCompositeElementImpl(node), PostgreSqlReturningClause, FromQuery {
+  SqlCompositeElementImpl(node),
+  PostgreSqlReturningClause,
+  FromQuery {
 
   private val queryExposed = ModifiableFileLazy {
     listOf(

dialects/postgresql/src/main/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/SqlDeleteStmtLimitedMixin.kt

@@ -10,7 +10,8 @@ import com.intellij.psi.PsiElement
 
 internal abstract class SqlDeleteStmtLimitedMixin(
   node: ASTNode,
-) : SqlDeleteStmtLimitedImpl(node), PostgreSqlDeleteStmtLimited {
+) : SqlDeleteStmtLimitedImpl(node),
+  PostgreSqlDeleteStmtLimited {
 
   override fun tablesAvailable(child: PsiElement): Collection<LazyQuery> {
     val tablesAvailable = super.tablesAvailable(child)

dialects/postgresql/src/main/kotlin/app/cash/sqldelight/dialects/postgresql/grammar/mixins/SqlInsertStmtMixin.kt

@@ -10,7 +10,8 @@ import com.intellij.psi.PsiElement
 
 internal abstract class SqlInsertStmtMixin(
   node: ASTNode,
-) : SqlInsertStmtImpl(node), PostgreSqlInsertStmt {
+) : SqlInsertStmtImpl(node),
+  PostgreSqlInsertStmt {
 
   override fun tablesAvailable(child: PsiElement): Collection<LazyQuery> {
     val tablesAvailable = super.tablesAvailable(child)

dialects/sqlite-3-24/src/main/kotlin/app/cash/sqldelight/dialects/sqlite_3_24/grammar/mixins/InsertStmtMixin.kt

@@ -33,8 +33,10 @@ internal abstract class InsertStmtMixin(
         insertOr != null && insertOr.elementType == SqlTypes.OR -> {
           val type = insertOr.treeNext.elementType
           check(
-            type == SqlTypes.ROLLBACK || type == SqlTypes.ABORT ||
-              type == SqlTypes.FAIL || type == SqlTypes.IGNORE,
+            type == SqlTypes.ROLLBACK ||
+              type == SqlTypes.ABORT ||
+              type == SqlTypes.FAIL ||
+              type == SqlTypes.IGNORE,
           )
           type
         }

dialects/sqlite-3-25/src/main/kotlin/app/cash/sqldelight/dialects/sqlite_3_25/grammar/mixins/ResultColumnMixin.kt

@@ -7,7 +7,9 @@ import com.alecstrong.sql.psi.core.psi.QueryElement.QueryResult
 import com.alecstrong.sql.psi.core.psi.impl.SqlResultColumnImpl
 import com.intellij.lang.ASTNode
 
-internal abstract class ResultColumnMixin(node: ASTNode) : SqlResultColumnImpl(node), SqliteResultColumn {
+internal abstract class ResultColumnMixin(node: ASTNode) :
+  SqlResultColumnImpl(node),
+  SqliteResultColumn {
   private val queryExposed = ModifiableFileLazy lazy@{
     if (windowFunctionInvocation != null) {
       var column = QueryElement.QueryColumn(this)

dialects/sqlite-3-35/src/main/kotlin/app/cash/sqldelight/dialects/sqlite_3_35/grammar/mixins/InsertStmtMixin.kt

@@ -37,8 +37,10 @@ internal abstract class InsertStmtMixin(
         insertOr != null && insertOr.elementType == SqlTypes.OR -> {
           val type = insertOr.treeNext.elementType
           check(
-            type == SqlTypes.ROLLBACK || type == SqlTypes.ABORT ||
-              type == SqlTypes.FAIL || type == SqlTypes.IGNORE,
+            type == SqlTypes.ROLLBACK ||
+              type == SqlTypes.ABORT ||
+              type == SqlTypes.FAIL ||
+              type == SqlTypes.IGNORE,
           )
           type
         }

dialects/sqlite/json-module/src/main/kotlin/app/cash/sqldelight/dialects/sqlite/json/module/JsonModule.kt

@@ -17,8 +17,7 @@ class JsonModule : SqlDelightModule {
   }
 }
 
-private class JsonTypeResolver(private val parentResolver: TypeResolver) :
-  TypeResolver by parentResolver {
+private class JsonTypeResolver(private val parentResolver: TypeResolver) : TypeResolver by parentResolver {
   override fun functionType(functionExpr: SqlFunctionExpr): IntermediateType? {
     when (functionExpr.functionName.text) {
       "json_array", "json", "json_insert", "json_replace", "json_set", "json_object", "json_patch",

dialects/sqlite/json-module/src/main/kotlin/app/cash/sqldelight/dialects/sqlite/json/module/grammar/mixins/TableOrSubqueryMixin.kt

@@ -17,7 +17,9 @@ import com.intellij.lang.ASTNode
 import com.intellij.lang.PsiBuilder
 import com.intellij.psi.PsiElement
 
-internal abstract class TableOrSubqueryMixin(node: ASTNode?) : SqlTableOrSubqueryImpl(node), SqliteJsonTableOrSubquery {
+internal abstract class TableOrSubqueryMixin(node: ASTNode?) :
+  SqlTableOrSubqueryImpl(node),
+  SqliteJsonTableOrSubquery {
   private val queryExposed = ModifiableFileLazy lazy@{
     if (jsonFunctionName != null) {
       return@lazy listOf(
@@ -44,7 +46,10 @@ internal abstract class TableOrSubqueryMixin(node: ASTNode?) : SqlTableOrSubquer
   }
 }
 
-internal abstract class JsonFunctionNameMixin(node: ASTNode) : SqlNamedElementImpl(node), SqlTableName, ExposableType {
+internal abstract class JsonFunctionNameMixin(node: ASTNode) :
+  SqlNamedElementImpl(node),
+  SqlTableName,
+  ExposableType {
   override fun getId(): PsiElement? = null
   override fun getString(): PsiElement? = null
   override val parseRule: (PsiBuilder, Int) -> Boolean = JsonParser::json_function_name_real

drivers/android-driver/src/main/java/app/cash/sqldelight/driver/android/AndroidSqliteDriver.kt

@@ -271,7 +271,8 @@ private class AndroidQuery(
   private val database: SupportSQLiteDatabase,
   override val argCount: Int,
   private val windowSizeBytes: Long?,
-) : SupportSQLiteQuery, AndroidStatement {
+) : SupportSQLiteQuery,
+  AndroidStatement {
   private val binds = MutableList<((SupportSQLiteProgram) -> Unit)?>(argCount) { null }
 
   override fun bindBytes(index: Int, bytes: ByteArray?) {

drivers/jdbc-driver/src/main/kotlin/app/cash/sqldelight/driver/jdbc/JdbcDriver.kt

@@ -74,7 +74,9 @@ interface ConnectionManager {
   }
 }
 
-abstract class JdbcDriver : SqlDriver, ConnectionManager {
+abstract class JdbcDriver :
+  SqlDriver,
+  ConnectionManager {
   override fun close() {
   }
 

drivers/native-driver/src/nativeMain/kotlin/app/cash/sqldelight/driver/native/NativeSqlDatabase.kt

@@ -100,7 +100,8 @@ sealed class ConnectionWrapper : SqlDriver {
 class NativeSqliteDriver(
   private val databaseManager: DatabaseManager,
   maxReaderConnections: Int = 1,
-) : ConnectionWrapper(), SqlDriver {
+) : ConnectionWrapper(),
+  SqlDriver {
   constructor(
     configuration: DatabaseConfiguration,
     maxReaderConnections: Int = 1,

drivers/r2dbc-driver/src/main/kotlin/app/cash/sqldelight/driver/r2dbc/R2dbcDriver.kt

@@ -299,7 +299,9 @@ internal class AsyncPublisherIterator<T : Any>(
 }
 
 class R2dbcCursor
-internal constructor(private val results: AsyncPublisherIterator<List<Any?>>) : SqlCursor {
+internal constructor(
+  private val results: AsyncPublisherIterator<List<Any?>>,
+) : SqlCursor {
   private lateinit var currentRow: List<Any?>
 
   override fun next(): QueryResult.AsyncValue<Boolean> = QueryResult.AsyncValue {

drivers/sqlite-driver/src/main/kotlin/app/cash/sqldelight/driver/jdbc/sqlite/JdbcSqliteDriver.kt

@@ -34,7 +34,8 @@ class JdbcSqliteDriver constructor(
    */
   url: String,
   properties: Properties = Properties(),
-) : JdbcDriver(), ConnectionManager by connectionManager(url, properties) {
+) : JdbcDriver(),
+  ConnectionManager by connectionManager(url, properties) {
   private val listeners = linkedMapOf<String, MutableSet<Query.Listener>>()
 
   override fun addListener(vararg queryKeys: String, listener: Query.Listener) {

extensions/androidx-paging3/src/commonTest/kotlin/androidx/recyclerview/widget/BatchingListUpdateCallback.kt

@@ -67,7 +67,8 @@ class BatchingListUpdateCallback(callback: ListUpdateCallback) : ListUpdateCallb
   }
 
   override fun onInserted(position: Int, count: Int) {
-    if (mLastEventType == TYPE_ADD && position >= mLastEventPosition &&
+    if (mLastEventType == TYPE_ADD &&
+      position >= mLastEventPosition &&
       position <= mLastEventPosition + mLastEventCount
     ) {
       mLastEventCount += count
@@ -81,7 +82,8 @@ class BatchingListUpdateCallback(callback: ListUpdateCallback) : ListUpdateCallb
   }
 
   override fun onRemoved(position: Int, count: Int) {
-    if (mLastEventType == TYPE_REMOVE && mLastEventPosition >= position &&
+    if (mLastEventType == TYPE_REMOVE &&
+      mLastEventPosition >= position &&
       mLastEventPosition <= position + count
     ) {
       mLastEventCount += count
@@ -103,7 +105,8 @@ class BatchingListUpdateCallback(callback: ListUpdateCallback) : ListUpdateCallb
     if (mLastEventType == TYPE_CHANGE &&
       !(
         position > mLastEventPosition + mLastEventCount ||
-          position + count < mLastEventPosition || mLastEventPayload != payload
+          position + count < mLastEventPosition ||
+          mLastEventPayload != payload
         )
     ) {
       // take potential overlap into account

extensions/rxjava2-extensions/src/main/kotlin/app/cash/sqldelight/rx2/RxJavaExtensions.kt

@@ -40,7 +40,9 @@ private class QueryOnSubscribe<T : Any>(
 private class QueryListenerAndDisposable<T : Any>(
   private val emitter: ObservableEmitter<Query<T>>,
   private val query: Query<T>,
-) : AtomicBoolean(), Query.Listener, Disposable {
+) : AtomicBoolean(),
+  Query.Listener,
+  Disposable {
   override fun queryResultsChanged() {
     emitter.onNext(query)
   }

extensions/rxjava2-extensions/src/test/kotlin/app/cash/sqldelight/rx2/RecordingObserver.kt

@@ -38,8 +38,9 @@ internal class RecordingObserver(val numberOfColumns: Int) : DisposableObserver<
   override fun onNext(value: Query<*>) {
     val allRows = value.execute { cursor ->
       val data = mutableListOf<List<String?>>()
-      while (cursor.next().value)
+      while (cursor.next().value) {
         data.add((0 until numberOfColumns).map(cursor::getString))
+      }
       QueryResult.Value(data)
     }.value
     events.add(allRows)

extensions/rxjava3-extensions/src/main/kotlin/app/cash/sqldelight/rx3/RxJavaExtensions.kt

@@ -40,7 +40,9 @@ private class QueryOnSubscribe<T : Any>(
 private class QueryListenerAndDisposable<T : Any>(
   private val emitter: ObservableEmitter<Query<T>>,
   private val query: Query<T>,
-) : AtomicBoolean(), Query.Listener, Disposable {
+) : AtomicBoolean(),
+  Query.Listener,
+  Disposable {
   override fun queryResultsChanged() {
     emitter.onNext(query)
   }

extensions/rxjava3-extensions/src/test/kotlin/app/cash/sqldelight/rx3/RecordingObserver.kt

@@ -38,8 +38,9 @@ internal class RecordingObserver(val numberOfColumns: Int) : DisposableObserver<
   override fun onNext(value: Query<*>) {
     val allRows = value.execute { cursor ->
       val data = mutableListOf<List<String?>>()
-      while (cursor.next().value)
+      while (cursor.next().value) {
         data.add((0 until numberOfColumns).map(cursor::getString))
+      }
       QueryResult.Value(data)
     }.value
     events.add(allRows)

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ sqliter = "1.3.1"
 sqljs = "1.8.0"
 paging-mpp = "3.1.1-0.3.1"
 paging3 = "3.1.1"
-ktlint = "1.2.1"
+ktlint = "1.3.0"
 agp = "8.5.0"
 compileSdk = "34"
 minSdk = "21"

runtime/src/commonMain/kotlin/app/cash/sqldelight/Transacter.kt

@@ -191,7 +191,8 @@ private class RollbackException(val value: Any? = null) : Throwable()
 
 private class TransactionWrapper<R>(
   val transaction: Transaction,
-) : TransactionWithoutReturn, TransactionWithReturn<R> {
+) : TransactionWithoutReturn,
+  TransactionWithReturn<R> {
   override fun rollback(): Nothing {
     transaction.checkThreadConfinement()
     throw RollbackException()
@@ -226,7 +227,8 @@ private class TransactionWrapper<R>(
 
 private class SuspendingTransactionWrapper<R>(
   val transaction: Transaction,
-) : SuspendingTransactionWithoutReturn, SuspendingTransactionWithReturn<R> {
+) : SuspendingTransactionWithoutReturn,
+  SuspendingTransactionWithReturn<R> {
   override fun rollback(): Nothing {
     transaction.checkThreadConfinement()
     throw RollbackException()
@@ -341,7 +343,9 @@ abstract class BaseTransacterImpl(protected val driver: SqlDriver) {
 /**
  * A transaction-aware [SqlDriver] wrapper which can begin a [Transaction] on the current connection.
  */
-abstract class TransacterImpl(driver: SqlDriver) : BaseTransacterImpl(driver), Transacter {
+abstract class TransacterImpl(driver: SqlDriver) :
+  BaseTransacterImpl(driver),
+  Transacter {
   override fun transaction(
     noEnclosing: Boolean,
     body: TransactionWithoutReturn.() -> Unit,
@@ -378,7 +382,9 @@ abstract class TransacterImpl(driver: SqlDriver) : BaseTransacterImpl(driver), T
   }
 }
 
-abstract class SuspendingTransacterImpl(driver: SqlDriver) : BaseTransacterImpl(driver), SuspendingTransacter {
+abstract class SuspendingTransacterImpl(driver: SqlDriver) :
+  BaseTransacterImpl(driver),
+  SuspendingTransacter {
   override suspend fun <R> transactionWithResult(
     noEnclosing: Boolean,
     bodyWithReturn: suspend SuspendingTransactionWithReturn<R>.() -> R,

runtime/src/commonMain/kotlin/app/cash/sqldelight/db/OptimisticLockException.kt

@@ -1,4 +1,3 @@
 package app.cash.sqldelight.db
 
-class OptimisticLockException(message: String?, cause: Throwable? = null) :
-  IllegalStateException(message, cause)
+class OptimisticLockException(message: String?, cause: Throwable? = null) : IllegalStateException(message, cause)

sqldelight-compiler/dialect/src/main/kotlin/app/cash/sqldelight/dialect/api/PragmaWithResults.kt

@@ -14,7 +14,9 @@ class PragmaWithResults(pragmaStmt: SqlPragmaStmt) : QueryWithResults {
   override val pureTable: NamedElement? = null
 }
 
-class SqlDelightPragmaName(node: ASTNode?) : SqlPragmaNameImpl(node), QueryElement {
+class SqlDelightPragmaName(node: ASTNode?) :
+  SqlPragmaNameImpl(node),
+  QueryElement {
   override fun queryExposed() = listOf(
     QueryResult(
       column = this,

sqldelight-compiler/dialect/src/main/kotlin/app/cash/sqldelight/dialect/grammar/mixins/BindParameterMixin.kt

@@ -4,7 +4,9 @@ import com.alecstrong.sql.psi.core.psi.SqlBindParameter
 import com.alecstrong.sql.psi.core.psi.SqlCompositeElementImpl
 import com.intellij.lang.ASTNode
 
-abstract class BindParameterMixin(node: ASTNode) : SqlCompositeElementImpl(node), SqlBindParameter {
+abstract class BindParameterMixin(node: ASTNode) :
+  SqlCompositeElementImpl(node),
+  SqlBindParameter {
   /**
    * Overwrite, if the user provided sql parameter should be overwritten by sqldelight with [replaceWith].
    *

sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/compiler/MutatorQueryGenerator.kt

@@ -43,10 +43,11 @@ class MutatorQueryGenerator(
               val columns = trigger.columnNameList.map { it.name }
               val updateColumns = query.update.updateStmtSubsequentSetterList.map { it.columnName?.name } +
                 query.update.columnNameList.map { it.name }
-              trigger.childOfType(SqlTypes.UPDATE) != null && (
-                columns.isEmpty() ||
-                  updateColumns.any { it in columns }
-                )
+              trigger.childOfType(SqlTypes.UPDATE) != null &&
+                (
+                  columns.isEmpty() ||
+                    updateColumns.any { it in columns }
+                  )
             }
           }
 

sqldelight-compiler/src/main/kotlin/app/cash/sqldelight/core/compiler/model/NamedQuery.kt

@@ -192,7 +192,8 @@ data class NamedQuery(
 
     if (typeOne.column !== typeTwo.column &&
       typeOne.asNonNullable().cursorGetter(0) != typeTwo.asNonNullable().cursorGetter(0) &&
-      typeOne.column != null && typeTwo.column != null
+      typeOne.column != null &&
+      typeTwo.column != null
     ) {
       // Incompatible adapters. Revert to unadapted java type.
       return if (typeOne.javaType.copy(nullable = false) == typeTwo.javaType.copy(nullable = false)) {