Improve multiline expression wrapping in .editorconfig

cartland · cartland · commit 0c519e127722 · 2025-04-04T15:02:51.000-07:00
This commit disables ktlint's standard multiline expression
wrapping rule in the `.editorconfig` file. This allows
developers to keep some multiline assignments on the same line,
improving code readability in certain cases.
diff --git a/Fruitties/.editorconfig b/Fruitties/.editorconfig
@@ -2,3 +2,34 @@
 # Kotlin style typically requires functions to start with a lowercase letter.
 # Composable functions should start with a capital letter.
 ktlint_function_naming_ignore_when_annotated_with = Composable
+
+# ktlint always puts a new line after a multi-line assignment, like this:
+# val colors =
+#     if (darkTheme) {
+#         darkColorScheme(
+#             primary = Color(0xFFBB86FC),
+#             secondary = Color(0xFF03DAC5),
+#             tertiary = Color(0xFF3700B3),
+#         )
+#     } else {
+#         lightColorScheme(
+#             primary = Color(0xFF6200EE),
+#             secondary = Color(0xFF03DAC5),
+#             tertiary = Color(0xFF3700B3),
+#         )
+#     }
+# But we actually prefer to keep some multi-line assignments on the same line, like this:
+# val colors = if (darkTheme) {
+#     darkColorScheme(
+#         primary = Color(0xFFBB86FC),
+#         secondary = Color(0xFF03DAC5),
+#         tertiary = Color(0xFF3700B3),
+#     )
+# } else {
+#     lightColorScheme(
+#         primary = Color(0xFF6200EE),
+#         secondary = Color(0xFF03DAC5),
+#         tertiary = Color(0xFF3700B3),
+#     )
+# }
+ktlint_standard_multiline-expression-wrapping = disabled
diff --git a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/MyApplicationTheme.kt b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/MyApplicationTheme.kt
@@ -35,35 +35,31 @@ fun MyApplicationTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     content: @Composable () -> Unit,
 ) {
-    val colors =
-        if (darkTheme) {
-            darkColorScheme(
-                primary = Color(0xFFBB86FC),
-                secondary = Color(0xFF03DAC5),
-                tertiary = Color(0xFF3700B3),
-            )
-        } else {
-            lightColorScheme(
-                primary = Color(0xFF6200EE),
-                secondary = Color(0xFF03DAC5),
-                tertiary = Color(0xFF3700B3),
-            )
-        }
-    val typography =
-        Typography(
-            bodyMedium =
-                TextStyle(
-                    fontFamily = FontFamily.Default,
-                    fontWeight = FontWeight.Normal,
-                    fontSize = 16.sp,
-                ),
+    val colors = if (darkTheme) {
+        darkColorScheme(
+            primary = Color(0xFFBB86FC),
+            secondary = Color(0xFF03DAC5),
+            tertiary = Color(0xFF3700B3),
         )
-    val shapes =
-        Shapes(
-            small = RoundedCornerShape(4.dp),
-            medium = RoundedCornerShape(4.dp),
-            large = RoundedCornerShape(0.dp),
+    } else {
+        lightColorScheme(
+            primary = Color(0xFF6200EE),
+            secondary = Color(0xFF03DAC5),
+            tertiary = Color(0xFF3700B3),
         )
+    }
+    val typography = Typography(
+        bodyMedium = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Normal,
+            fontSize = 16.sp,
+        ),
+    )
+    val shapes = Shapes(
+        small = RoundedCornerShape(4.dp),
+        medium = RoundedCornerShape(4.dp),
+        large = RoundedCornerShape(0.dp),
+    )
 
     MaterialTheme(
         colorScheme = colors,
diff --git a/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/ListScreen.kt b/Fruitties/androidApp/src/main/java/com/example/fruitties/android/ui/ListScreen.kt
@@ -75,16 +75,14 @@ fun ListScreen() {
     // Here we put the KMP-compatible AppContainer into the extras
     // so it can be passed to the ViewModel factory.
     val app = LocalContext.current.applicationContext as App
-    val extras =
-        remember(app) {
-            val container = app.container
-            MainViewModel.newCreationExtras(container)
-        }
-    val viewModel: MainViewModel =
-        viewModel(
-            factory = MainViewModel.Factory,
-            extras = extras,
-        )
+    val extras = remember(app) {
+        val container = app.container
+        MainViewModel.newCreationExtras(container)
+    }
+    val viewModel: MainViewModel = viewModel(
+        factory = MainViewModel.Factory,
+        extras = extras,
+    )
 
     val uiState by viewModel.homeUiState.collectAsState()
     val cartState by viewModel.cartUiState.collectAsState()
@@ -95,29 +93,26 @@ fun ListScreen() {
                 title = {
                     Text(text = stringResource(R.string.frutties))
                 },
-                colors =
-                    TopAppBarColors(
-                        containerColor = MaterialTheme.colorScheme.primary,
-                        scrolledContainerColor = MaterialTheme.colorScheme.primary,
-                        navigationIconContentColor = MaterialTheme.colorScheme.onPrimary,
-                        titleContentColor = MaterialTheme.colorScheme.onPrimary,
-                        actionIconContentColor = MaterialTheme.colorScheme.onPrimary,
-                    ),
+                colors = TopAppBarColors(
+                    containerColor = MaterialTheme.colorScheme.primary,
+                    scrolledContainerColor = MaterialTheme.colorScheme.primary,
+                    navigationIconContentColor = MaterialTheme.colorScheme.onPrimary,
+                    titleContentColor = MaterialTheme.colorScheme.onPrimary,
+                    actionIconContentColor = MaterialTheme.colorScheme.onPrimary,
+                ),
             )
         },
-        contentWindowInsets =
-            WindowInsets.safeDrawing.only(
-                // Do not include Bottom so scrolled content is drawn below system bars.
-                // Include Horizontal because some devices have camera cutouts on the side.
-                WindowInsetsSides.Top + WindowInsetsSides.Horizontal,
-            ),
+        contentWindowInsets = WindowInsets.safeDrawing.only(
+            // Do not include Bottom so scrolled content is drawn below system bars.
+            // Include Horizontal because some devices have camera cutouts on the side.
+            WindowInsetsSides.Top + WindowInsetsSides.Horizontal,
+        ),
     ) { paddingValues ->
         Column(
-            modifier =
-                Modifier
-                    // Support edge-to-edge (required on Android 15)
-                    // https://developer.android.com/develop/ui/compose/layouts/insets#inset-size
-                    .padding(paddingValues),
+            modifier = Modifier
+                // Support edge-to-edge (required on Android 15)
+                // https://developer.android.com/develop/ui/compose/layouts/insets#inset-size
+                .padding(paddingValues),
         ) {
             var expanded by remember { mutableStateOf(false) }
             Row(modifier = Modifier.padding(16.dp)) {
@@ -166,28 +161,24 @@ fun FruittieItem(
     modifier: Modifier = Modifier,
 ) {
     Card(
-        modifier =
-            modifier
-                .padding(horizontal = 16.dp, vertical = 8.dp)
-                .clip(RoundedCornerShape(8.dp)),
+        modifier = modifier
+            .padding(horizontal = 16.dp, vertical = 8.dp)
+            .clip(RoundedCornerShape(8.dp)),
         shape = RoundedCornerShape(8.dp),
-        colors =
-            CardDefaults.cardColors(
-                containerColor = MaterialTheme.colorScheme.surface,
-            ),
-        elevation =
-            CardDefaults.cardElevation(
-                defaultElevation = 8.dp,
-            ),
+        colors = CardDefaults.cardColors(
+            containerColor = MaterialTheme.colorScheme.surface,
+        ),
+        elevation = CardDefaults.cardElevation(
+            defaultElevation = 8.dp,
+        ),
     ) {
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically,
         ) {
             Column(
-                modifier =
-                    Modifier
-                        .heightIn(min = 96.dp),
+                modifier = Modifier
+                    .heightIn(min = 96.dp),
                 verticalArrangement = Arrangement.Center,
             ) {
                 Text(
@@ -196,27 +187,24 @@ fun FruittieItem(
                     style = MaterialTheme.typography.titleMedium,
                     maxLines = 1,
                     overflow = TextOverflow.Ellipsis,
-                    modifier =
-                        Modifier
-                            .padding(horizontal = 16.dp)
-                            .padding(top = 8.dp),
+                    modifier = Modifier
+                        .padding(horizontal = 16.dp)
+                        .padding(top = 8.dp),
                 )
                 Text(
                     text = item.fullName,
-                    modifier =
-                        Modifier
-                            .padding(horizontal = 16.dp)
-                            .padding(bottom = 8.dp),
+                    modifier = Modifier
+                        .padding(horizontal = 16.dp)
+                        .padding(bottom = 8.dp),
                     color = MaterialTheme.colorScheme.onSurface,
                     maxLines = 2,
                     overflow = TextOverflow.Ellipsis,
                 )
             }
             Spacer(modifier = Modifier.weight(1f))
             Row(
-                modifier =
-                    Modifier
-                        .padding(horizontal = 16.dp, vertical = 8.dp),
+                modifier = Modifier
+                    .padding(horizontal = 16.dp, vertical = 8.dp),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
                 Button(onClick = { onAddToCart(item) }) {
diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/DataRepository.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/DataRepository.kt
@@ -34,16 +34,15 @@ class DataRepository(
 ) {
     @OptIn(ExperimentalCoroutinesApi::class)
     val cartDetails: Flow<List<CartItemDetails>>
-        get() =
-            cartDataStore.cart.mapLatest {
-                val ids = it.items.map { it.id }
-                val fruitties = database.fruittieDao().loadMapped(ids)
-                it.items.mapNotNull {
-                    fruitties[it.id]?.let { fruittie ->
-                        CartItemDetails(fruittie, it.count)
-                    }
+        get() = cartDataStore.cart.mapLatest {
+            val ids = it.items.map { it.id }
+            val fruitties = database.fruittieDao().loadMapped(ids)
+            it.items.mapNotNull {
+                fruitties[it.id]?.let { fruittie ->
+                    CartItemDetails(fruittie, it.count)
                 }
             }
+        }
 
     suspend fun addToCart(fruittie: Fruittie) {
         cartDataStore.add(fruittie)
diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/database/CartDataStore.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/database/CartDataStore.kt
@@ -58,17 +58,15 @@ internal object CartJsonSerializer : OkioSerializer<Cart> {
 class CartDataStore(
     private val produceFilePath: () -> String,
 ) {
-    private val db =
-        DataStoreFactory.create(
-            storage =
-                OkioStorage<Cart>(
-                    fileSystem = FileSystem.SYSTEM,
-                    serializer = CartJsonSerializer,
-                    producePath = {
-                        produceFilePath().toPath()
-                    },
-                ),
-        )
+    private val db = DataStoreFactory.create(
+        storage = OkioStorage<Cart>(
+            fileSystem = FileSystem.SYSTEM,
+            serializer = CartJsonSerializer,
+            producePath = {
+                produceFilePath().toPath()
+            },
+        ),
+    )
     val cart: Flow<Cart>
         get() = db.data
 
diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/di/Factory.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/di/Factory.kt
@@ -35,12 +35,11 @@ expect class Factory {
 
 internal fun commonCreateApi(): FruittieApi =
     FruittieNetworkApi(
-        client =
-            HttpClient {
-                install(ContentNegotiation) {
-                    json(json, contentType = ContentType.Any)
-                }
-            },
+        client = HttpClient {
+            install(ContentNegotiation) {
+                json(json, contentType = ContentType.Any)
+            }
+        },
         apiUrl = "https://android.github.io/kotlin-multiplatform-samples/fruitties-api",
     )
 
diff --git a/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/MainViewModel.kt b/Fruitties/shared/src/commonMain/kotlin/com/example/fruitties/viewmodel/MainViewModel.kt
@@ -64,14 +64,13 @@ class MainViewModel(
     companion object {
         val APP_CONTAINER_KEY = CreationExtras.Key<AppContainer>()
 
-        val Factory: ViewModelProvider.Factory =
-            viewModelFactory {
-                initializer {
-                    val appContainer = this[APP_CONTAINER_KEY] as AppContainer
-                    val repository = appContainer.dataRepository
-                    MainViewModel(repository = repository)
-                }
+        val Factory: ViewModelProvider.Factory = viewModelFactory {
+            initializer {
+                val appContainer = this[APP_CONTAINER_KEY] as AppContainer
+                val repository = appContainer.dataRepository
+                MainViewModel(repository = repository)
             }
+        }
 
         /**
          * Helper function to prepare CreationExtras.
diff --git a/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/Factory.native.kt b/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/Factory.native.kt
@@ -47,14 +47,13 @@ actual class Factory {
 
     @OptIn(ExperimentalForeignApi::class)
     private fun fileDirectory(): String {
-        val documentDirectory: NSURL? =
-            NSFileManager.defaultManager.URLForDirectory(
-                directory = NSDocumentDirectory,
-                inDomain = NSUserDomainMask,
-                appropriateForURL = null,
-                create = false,
-                error = null,
-            )
+        val documentDirectory: NSURL? = NSFileManager.defaultManager.URLForDirectory(
+            directory = NSDocumentDirectory,
+            inDomain = NSUserDomainMask,
+            appropriateForURL = null,
+            create = false,
+            error = null,
+        )
         return requireNotNull(documentDirectory).path!!
     }
 
diff --git a/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/IOSViewModelOwner.kt b/Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/IOSViewModelOwner.kt
@@ -17,12 +17,11 @@ class IOSViewModelOwner(
     override val viewModelStore: ViewModelStore = ViewModelStore()
 
     // Create an instance of MainViewModel with the CreationExtras.
-    val mainViewModel: MainViewModel =
-        ViewModelProvider.create(
-            owner = this as ViewModelStoreOwner,
-            factory = MainViewModel.Factory,
-            extras = MainViewModel.newCreationExtras(appContainer),
-        )[MainViewModel::class]
+    val mainViewModel: MainViewModel = ViewModelProvider.create(
+        owner = this as ViewModelStoreOwner,
+        factory = MainViewModel.Factory,
+        extras = MainViewModel.newCreationExtras(appContainer),
+    )[MainViewModel::class]
 
     // To add more ViewModel types, add new properties for each ViewModel.
     // If we need to add a very large number of ViewModel types,
