Code Style Change - Disable when arrow alignment

.editorconfig

@@ -764,7 +764,7 @@ ij_groovy_while_on_new_line = false
 ij_groovy_wrap_long_lines = false
 
 [{*.gradle.kts,*.kt,*.kts,*.main.kts}]
-ij_kotlin_align_in_columns_case_branch = true
+ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false
 ij_kotlin_align_multiline_extends_list = false
 ij_kotlin_align_multiline_method_parentheses = false

changelog.d/6126.misc

@@ -0,0 +1 @@
+Disables when arrow alignment in code style

library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentViewerActivity.kt

@@ -271,15 +271,15 @@ abstract class AttachmentViewerActivity : AppCompatActivity(), AttachmentEventLi
         directionDetector.handleTouchEvent(event)
 
         return when (swipeDirection) {
-            SwipeDirection.Up, SwipeDirection.Down    -> {
+            SwipeDirection.Up, SwipeDirection.Down -> {
                 if (isSwipeToDismissAllowed && !wasScaled && isImagePagerIdle) {
                     swipeDismissHandler.onTouch(views.rootContainer, event)
                 } else true
             }
             SwipeDirection.Left, SwipeDirection.Right -> {
                 views.attachmentPager.dispatchTouchEvent(event)
             }
-            else                                      -> true
+            else -> true
         }
     }
 

library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AttachmentsAdapter.kt

@@ -42,18 +42,18 @@ class AttachmentsAdapter : RecyclerView.Adapter<BaseViewHolder>() {
         val inflater = LayoutInflater.from(parent.context)
         val itemView = inflater.inflate(viewType, parent, false)
         return when (viewType) {
-            R.layout.item_image_attachment          -> ZoomableImageViewHolder(itemView)
+            R.layout.item_image_attachment -> ZoomableImageViewHolder(itemView)
             R.layout.item_animated_image_attachment -> AnimatedImageViewHolder(itemView)
-            R.layout.item_video_attachment          -> VideoViewHolder(itemView)
-            else                                    -> UnsupportedViewHolder(itemView)
+            R.layout.item_video_attachment -> VideoViewHolder(itemView)
+            else -> UnsupportedViewHolder(itemView)
         }
     }
 
     override fun getItemViewType(position: Int): Int {
         val info = attachmentSourceProvider!!.getAttachmentInfoAt(position)
         return when (info) {
-            is AttachmentInfo.Image         -> R.layout.item_image_attachment
-            is AttachmentInfo.Video         -> R.layout.item_video_attachment
+            is AttachmentInfo.Image -> R.layout.item_image_attachment
+            is AttachmentInfo.Video -> R.layout.item_video_attachment
             is AttachmentInfo.AnimatedImage -> R.layout.item_animated_image_attachment
 //            is AttachmentInfo.Audio         -> TODO()
 //            is AttachmentInfo.File          -> TODO()
@@ -68,13 +68,13 @@ class AttachmentsAdapter : RecyclerView.Adapter<BaseViewHolder>() {
         attachmentSourceProvider?.getAttachmentInfoAt(position)?.let {
             holder.bind(it)
             when (it) {
-                is AttachmentInfo.Image         -> {
+                is AttachmentInfo.Image -> {
                     attachmentSourceProvider?.loadImage((holder as ZoomableImageViewHolder).target, it)
                 }
                 is AttachmentInfo.AnimatedImage -> {
                     attachmentSourceProvider?.loadImage((holder as AnimatedImageViewHolder).target, it)
                 }
-                is AttachmentInfo.Video         -> {
+                is AttachmentInfo.Video -> {
                     attachmentSourceProvider?.loadVideo((holder as VideoViewHolder).target, it)
                 }
 //                else                            -> {

library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirection.kt

@@ -27,12 +27,12 @@ sealed class SwipeDirection {
     companion object {
         fun fromAngle(angle: Double): SwipeDirection {
             return when (angle) {
-                in 0.0..45.0    -> Right
-                in 45.0..135.0  -> Up
+                in 0.0..45.0 -> Right
+                in 45.0..135.0 -> Up
                 in 135.0..225.0 -> Left
                 in 225.0..315.0 -> Down
                 in 315.0..360.0 -> Right
-                else            -> NotDetected
+                else -> NotDetected
             }
         }
     }

library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeDirectionDetector.kt

@@ -33,7 +33,7 @@ class SwipeDirectionDetector(
 
     fun handleTouchEvent(event: MotionEvent) {
         when (event.action) {
-            MotionEvent.ACTION_DOWN                          -> {
+            MotionEvent.ACTION_DOWN -> {
                 startX = event.x
                 startY = event.y
             }
@@ -45,7 +45,7 @@ class SwipeDirectionDetector(
                 startX = startY
                 isDetected = false
             }
-            MotionEvent.ACTION_MOVE                          -> if (!isDetected && getEventDistance(event) > touchSlop) {
+            MotionEvent.ACTION_MOVE -> if (!isDetected && getEventDistance(event) > touchSlop) {
                 isDetected = true
                 onDirectionDetected(getDirection(startX, startY, event.x, event.y))
             }

library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/SwipeToDismissHandler.kt

@@ -79,8 +79,8 @@ class SwipeToDismissHandler(
     private fun onTrackingEnd(parentHeight: Int) {
         val animateTo = when {
             swipeView.translationY < -translationLimit -> -parentHeight.toFloat()
-            swipeView.translationY > translationLimit  -> parentHeight.toFloat()
-            else                                       -> 0f
+            swipeView.translationY > translationLimit -> parentHeight.toFloat()
+            else -> 0f
         }
 
         if (animateTo != 0f && !shouldAnimateDismiss()) {

library/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt

@@ -146,7 +146,7 @@ class VideoViewHolder constructor(itemView: View) :
                 wasPaused = true
                 views.videoView.pause()
             }
-            is AttachmentCommands.SeekTo  -> {
+            is AttachmentCommands.SeekTo -> {
                 val duration = views.videoView.duration
                 if (duration > 0) {
                     val seekDuration = duration * (commands.percentProgress / 100f)

library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerEpoxyController.kt

@@ -43,7 +43,7 @@ internal class JSonViewerEpoxyController(private val context: Context) :
                     text(async.error.localizedMessage?.toEpoxyCharSequence())
                 }
             }
-            else    -> {
+            else -> {
                 async.invoke()?.let {
                     buildRec(it, 0, "")
                 }
@@ -98,7 +98,7 @@ internal class JSonViewerEpoxyController(private val context: Context) :
                     }
                 }
             }
-            is JSonViewerArray  -> {
+            is JSonViewerArray -> {
                 if (model.isExpanded) {
                     open(id, model.key, model.index, depth, false, model)
                     model.items.forEach {
@@ -137,7 +137,7 @@ internal class JSonViewerEpoxyController(private val context: Context) :
                     }
                 }
             }
-            is JSonViewerLeaf   -> {
+            is JSonViewerLeaf -> {
                 valueItem {
                     id(id)
                     depth(depth)
@@ -172,12 +172,12 @@ internal class JSonViewerEpoxyController(private val context: Context) :
     private fun valueToSpan(leaf: JSonViewerLeaf): Span {
         val host = this
         return when (leaf.type) {
-            JSONType.STRING  -> {
+            JSONType.STRING -> {
                 span("\"${leaf.stringRes}\"") {
                     textColor = host.styleProvider.stringColor
                 }
             }
-            JSONType.NUMBER  -> {
+            JSONType.NUMBER -> {
                 span(leaf.stringRes) {
                     textColor = host.styleProvider.numberColor
                 }
@@ -187,7 +187,7 @@ internal class JSonViewerEpoxyController(private val context: Context) :
                     textColor = host.styleProvider.booleanColor
                 }
             }
-            JSONType.NULL    -> {
+            JSONType.NULL -> {
                 span("null") {
                     textColor = host.styleProvider.booleanColor
                 }

library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerModel.kt

@@ -82,7 +82,7 @@ internal object ModelParser {
                 }
                 parent.addChild(objectComposed)
             }
-            is JSONArray  -> {
+            is JSONArray -> {
                 val objectComposed = JSonViewerArray(key, index, obj)
                         .apply { isExpanded = initialOpenDepth == -1 || depth <= initialOpenDepth }
                 objectComposed.depth = depth
@@ -91,25 +91,25 @@ internal object ModelParser {
                 }
                 parent.addChild(objectComposed)
             }
-            is String     -> {
+            is String -> {
                 JSonViewerLeaf(key, index, obj, JSONType.STRING).let {
                     it.depth = depth
                     parent.addChild(it)
                 }
             }
-            is Number     -> {
+            is Number -> {
                 JSonViewerLeaf(key, index, obj.toString(), JSONType.NUMBER).let {
                     it.depth = depth
                     parent.addChild(it)
                 }
             }
-            is Boolean    -> {
+            is Boolean -> {
                 JSonViewerLeaf(key, index, obj.toString(), JSONType.BOOLEAN).let {
                     it.depth = depth
                     parent.addChild(it)
                 }
             }
-            else          -> {
+            else -> {
                 if (obj == JSONObject.NULL) {
                     JSonViewerLeaf(key, index, "null", JSONType.NULL).let {
                         it.depth = depth

library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt

@@ -48,7 +48,7 @@ class FilePicker : Picker<MultiPickerBaseType>() {
                 type.isMimeTypeVideo() -> selectedUri.toMultiPickerVideoType(context)
                 type.isMimeTypeImage() -> selectedUri.toMultiPickerImageType(context)
                 type.isMimeTypeAudio() -> selectedUri.toMultiPickerAudioType(context)
-                else                   -> {
+                else -> {
                     // Other files
                     context.contentResolver.query(selectedUri, null, null, null, null)
                             ?.use { cursor ->

library/multipicker/src/main/java/im/vector/lib/multipicker/MultiPicker.kt

@@ -31,15 +31,15 @@ class MultiPicker<T> private constructor() {
         @Suppress("UNCHECKED_CAST")
         fun <T> get(type: MultiPicker<T>): T {
             return when (type) {
-                IMAGE        -> ImagePicker() as T
-                VIDEO        -> VideoPicker() as T
-                MEDIA        -> MediaPicker() as T
-                FILE         -> FilePicker() as T
-                AUDIO        -> AudioPicker() as T
-                CONTACT      -> ContactPicker() as T
-                CAMERA       -> CameraPicker() as T
+                IMAGE -> ImagePicker() as T
+                VIDEO -> VideoPicker() as T
+                MEDIA -> MediaPicker() as T
+                FILE -> FilePicker() as T
+                AUDIO -> AudioPicker() as T
+                CONTACT -> ContactPicker() as T
+                CAMERA -> CameraPicker() as T
                 CAMERA_VIDEO -> CameraVideoPicker() as T
-                else         -> throw IllegalArgumentException("Unsupported type $type")
+                else -> throw IllegalArgumentException("Unsupported type $type")
             }
         }
     }

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt

@@ -626,7 +626,7 @@ class E2eeSanityTests : InstrumentedTest {
                         // we can release this latch?
                         oldCompleteLatch.countDown()
                     }
-                    else                                                -> Unit
+                    else -> Unit
                 }
             }
         })
@@ -653,17 +653,17 @@ class E2eeSanityTests : InstrumentedTest {
                     IncomingSasVerificationTransaction.UxState.SHOW_ACCEPT -> {
                         // no need to accept as there was a request first it will auto accept
                     }
-                    IncomingSasVerificationTransaction.UxState.SHOW_SAS    -> {
+                    IncomingSasVerificationTransaction.UxState.SHOW_SAS -> {
                         if (matchOnce) {
                             sasTx.userHasVerifiedShortCode()
                             newCode = sasTx.getDecimalCodeRepresentation()
                             matchOnce = false
                         }
                     }
-                    IncomingSasVerificationTransaction.UxState.VERIFIED    -> {
+                    IncomingSasVerificationTransaction.UxState.VERIFIED -> {
                         newCompleteLatch.countDown()
                     }
-                    else                                                   -> Unit
+                    else -> Unit
                 }
             }
         })

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt

@@ -415,7 +415,7 @@ class SASTest : InstrumentedTest {
                     OutgoingSasVerificationTransaction.UxState.SHOW_SAS -> {
                         aliceSASLatch.countDown()
                     }
-                    else                                                -> Unit
+                    else -> Unit
                 }
             }
         }
@@ -429,7 +429,7 @@ class SASTest : InstrumentedTest {
                     IncomingSasVerificationTransaction.UxState.SHOW_ACCEPT -> {
                         tx.performAccept()
                     }
-                    else                                                   -> Unit
+                    else -> Unit
                 }
                 if (uxState === IncomingSasVerificationTransaction.UxState.SHOW_SAS) {
                     bobSASLatch.countDown()
@@ -479,7 +479,7 @@ class SASTest : InstrumentedTest {
                             aliceSASLatch.countDown()
                         }
                     }
-                    else                                                -> Unit
+                    else -> Unit
                 }
             }
         }
@@ -499,16 +499,16 @@ class SASTest : InstrumentedTest {
                             tx.performAccept()
                         }
                     }
-                    IncomingSasVerificationTransaction.UxState.SHOW_SAS    -> {
+                    IncomingSasVerificationTransaction.UxState.SHOW_SAS -> {
                         if (matchOnce) {
                             matchOnce = false
                             tx.userHasVerifiedShortCode()
                         }
                     }
-                    IncomingSasVerificationTransaction.UxState.VERIFIED    -> {
+                    IncomingSasVerificationTransaction.UxState.VERIFIED -> {
                         bobSASLatch.countDown()
                     }
-                    else                                                   -> Unit
+                    else -> Unit
                 }
             }
         }

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/session/room/send/TestPermalinkService.kt

@@ -44,7 +44,7 @@ class TestPermalinkService : PermalinkService {
 
     override fun createMentionSpanTemplate(type: PermalinkService.SpanTemplateType, forceMatrixTo: Boolean): String {
         return when (type) {
-            HTML     -> "<a href=\"https://matrix.to/#/%1\$s\">%2\$s</a>"
+            HTML -> "<a href=\"https://matrix.to/#/%1\$s\">%2\$s</a>"
             MARKDOWN -> "[%2\$s](https://matrix.to/#/%1\$s)"
         }
     }

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/session/room/timeline/PollAggregationTest.kt

@@ -77,7 +77,7 @@ class PollAggregationTest : InstrumentedTest {
                     }
 
                     when (lock.count.toInt()) {
-                        TOTAL_TEST_COUNT     -> {
+                        TOTAL_TEST_COUNT -> {
                             // Poll has just been created.
                             testInitialPollConditions(pollContent, pollSummary)
                             lock.countDown()
@@ -119,7 +119,7 @@ class PollAggregationTest : InstrumentedTest {
                             testEndedPoll(pollSummary)
                             lock.countDown()
                         }
-                        else                 -> {
+                        else -> {
                             fail("Lock count ${lock.count} didn't handled.")
                         }
                     }

matrix-sdk-android/src/main/java/org/commonmark/ext/maths/InlineMaths.kt

@@ -26,14 +26,14 @@ internal class InlineMaths(private val delimiter: InlineDelimiter) : CustomNode(
 
     override fun getOpeningDelimiter(): String {
         return when (delimiter) {
-            InlineDelimiter.SINGLE_DOLLAR         -> "$"
+            InlineDelimiter.SINGLE_DOLLAR -> "$"
             InlineDelimiter.ROUND_BRACKET_ESCAPED -> "\\("
         }
     }
 
     override fun getClosingDelimiter(): String {
         return when (delimiter) {
-            InlineDelimiter.SINGLE_DOLLAR         -> "$"
+            InlineDelimiter.SINGLE_DOLLAR -> "$"
             InlineDelimiter.ROUND_BRACKET_ESCAPED -> "\\)"
         }
     }