Require use of trailing commas at declaration site (#4760)

https://kotlinlang.org/docs/coding-conventions.html#trailing-commas
> The Kotlin style guide encourages the use of trailing commas at the declaration site and leaves it at your discretion for the call site.

Requiring trailing commas at call site would be nice as well, but will revisit in the future

Author: rli

.editorconfig

@@ -38,6 +38,7 @@ ij_java_use_single_class_imports = true
 ij_java_while_brace_force = always
 
 [{*.kts,*.kt}]
+ij_kotlin_allow_trailing_comma = true
 ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 ij_kotlin_name_count_to_use_star_import = 2147483647
 ij_kotlin_name_count_to_use_star_import_for_members = 2147483647

detekt-rules/detekt.yml

@@ -57,18 +57,14 @@ formatting:
   autoCorrect: true
   AnnotationOnSeparateLine:
     active: false
-    autoCorrect: true
   AnnotationSpacing:
     active: false
-    autoCorrect: true
   ArgumentListWrapping:
     active: true
-    autoCorrect: true
     indentSize: 4
     maxLineLength: 160
   Indentation:
     active: true
-    autoCorrect: true
     indentSize: 4
     excludes: [ '**/TelemetryDefinitions.kt' ]
   MaximumLineLength:
@@ -92,11 +88,13 @@ formatting:
     maxLineLength: 160
   SpacingBetweenDeclarationsWithComments:
     active: true
-    autoCorrect: true
     excludes: [ '**/icons/**' ]
+  #  TrailingCommaOnCallSite:
+  #    active: true
+  TrailingCommaOnDeclarationSite:
+    active: true
   Wrapping:
     active: true
-    autoCorrect: true
     indentSize: 4
     maxLineLength: 160
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt

@@ -38,7 +38,7 @@ class AuthController {
     private fun getAuthNeededState(
         amazonqConnectionState: ActiveConnection,
         codeWhispererConnectionState: ActiveConnection,
-        onlyIamIdcConnection: Boolean = false
+        onlyIamIdcConnection: Boolean = false,
     ): AuthNeededState? =
         when (amazonqConnectionState) {
             ActiveConnection.NotConnected -> {
@@ -85,7 +85,8 @@ class AuthController {
         when (type) {
             AuthFollowUpType.MissingScopes,
             AuthFollowUpType.Unsupported,
-            AuthFollowUpType.FullAuth -> runInEdt {
+            AuthFollowUpType.FullAuth,
+            -> runInEdt {
                 UiTelemetry.click(project, "amazonq_chatAuthenticate")
                 requestCredentialsForQ(project, connectionInitiatedFromQChatPanel = true)
             }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthNeededState.kt

@@ -5,10 +5,10 @@ package software.aws.toolkits.jetbrains.services.amazonq.auth
 
 data class AuthNeededState(
     val message: String,
-    val authType: AuthFollowUpType
+    val authType: AuthFollowUpType,
 )
 
 data class AuthNeededStates(
     val chat: AuthNeededState? = null,
-    val amazonQ: AuthNeededState? = null
+    val amazonQ: AuthNeededState? = null,
 )

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedPanel.kt

@@ -14,7 +14,7 @@ import com.intellij.ui.dsl.gridLayout.VerticalAlign
 import software.aws.toolkits.jetbrains.utils.isQWebviewsAvailable
 
 class QGettingStartedPanel(
-    val project: Project
+    val project: Project,
 ) : Disposable {
     private val webviewContainer = Wrapper()
     var browser: QGettingStartedContent? = null

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/onboarding/OnboardingPageInteraction.kt

@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonValue
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 
 enum class OnboardingPageInteractionType(
-    @field:JsonValue val json: String
+    @field:JsonValue val json: String,
 ) {
     CwcButtonClick("onboarding-page-cwc-button-clicked"),
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindow.kt

@@ -34,7 +34,7 @@ import javax.swing.JComponent
 @Service(Service.Level.PROJECT)
 class AmazonQToolWindow private constructor(
     private val project: Project,
-    private val scope: CoroutineScope
+    private val scope: CoroutineScope,
 ) : Disposable {
     private val appSource = AppSource()
     private val browserConnector = BrowserConnector()

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt

@@ -90,7 +90,7 @@ class AmazonQToolWindowFactory : ToolWindowFactory, DumbAware {
 
     private fun prepareChatContent(
         project: Project,
-        contentManager: ContentManager
+        contentManager: ContentManager,
     ): Content {
         val component = if (isQConnected(project) && !isQExpired(project)) {
             AmazonQToolWindow.getInstance(project).component

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowListener.kt

@@ -19,7 +19,7 @@ class AmazonQToolWindowListener : ToolWindowManagerListener {
     override fun stateChanged(
         toolWindowManager: ToolWindowManager,
         toolWindow: ToolWindow,
-        changeType: ToolWindowManagerListener.ToolWindowManagerEventType
+        changeType: ToolWindowManagerListener.ToolWindowManagerEventType,
     ) {
         if (toolWindow.id != AmazonQToolWindowFactory.WINDOW_ID) {
             return

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

@@ -63,7 +63,7 @@ class BrowserConnector(
     suspend fun connectTheme(
         chatBrowser: CefBrowser,
         loginBrowser: CefBrowser,
-        themeSource: Flow<AmazonQTheme>
+        themeSource: Flow<AmazonQTheme>,
     ) = coroutineScope {
         themeSource
             .distinctUntilChanged()