Require use of trailing commas at declaration site

.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 @@
     private fun getAuthNeededState(
         amazonqConnectionState: ActiveConnection,
         codeWhispererConnectionState: ActiveConnection,
-        onlyIamIdcConnection: Boolean = false
+        onlyIamIdcConnection: Boolean = false,
     ): AuthNeededState? =
         when (amazonqConnectionState) {
             ActiveConnection.NotConnected -> {
@@ -85,7 +85,8 @@
         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 @@
 
 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 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 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 @@
 @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()

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

@@ -7,7 +7,7 @@
  * Enumeration of CSS variables that used by MynahUi to theme the chat experience.
  */
 enum class CssVariable(
-    val varName: String
+    val varName: String,
 ) {
     FontSize("--vscode-font-size"),
     FontFamily("--mynah-font-family"),
@@ -55,5 +55,5 @@
     MainBackground("--mynah-color-main"),
     MainForeground("--mynah-color-main-reverse"),
 
-    CardBackground("--mynah-card-bg")
+    CardBackground("--mynah-card-bg"),
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt

@@ -17,7 +17,7 @@
 const val MAX_PROJECT_SIZE_BYTES: Long = 200 * 1024 * 1024
 
 enum class ModifySourceFolderErrorReason(
-    private val reasonText: String
+    private val reasonText: String,
 ) {
     ClosedBeforeSelection("ClosedBeforeSelection"),
     NotInWorkspaceFolder("NotInWorkspaceFolder"),

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

@@ -77,7 +77,7 @@
 class FeatureDevController(
     private val context: AmazonQAppInitContext,
     private val chatSessionStorage: ChatSessionStorage,
-    private val authController: AuthController = AuthController()
+    private val authController: AuthController = AuthController(),
 ) : InboundAppMessagesHandler {
 
     val messenger = context.messagesFromAppToUi

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt

@@ -76,14 +76,14 @@
     data class OpenDiff(
         @JsonProperty("tabID") val tabId: String,
         val filePath: String,
-        val deleted: Boolean
+        val deleted: Boolean,
     ) : IncomingFeatureDevMessage
 
     data class FileClicked(
         @JsonProperty("tabID") val tabId: String,
         val filePath: String,
         val messageId: String,
-        val actionName: String
+        val actionName: String,
     ) : IncomingFeatureDevMessage
 }
 
@@ -114,7 +114,7 @@
     val message: String? = null,
     val followUps: List<FollowUp>? = null,
     val canBeVoted: Boolean,
-    val snapToTop: Boolean
+    val snapToTop: Boolean,
 
 ) : UiMessage(
     tabId = tabId,
@@ -124,15 +124,15 @@
 data class AsyncEventProgressMessage(
     @JsonProperty("tabID") override val tabId: String,
     val message: String? = null,
-    val inProgress: Boolean
+    val inProgress: Boolean,
 ) : UiMessage(
     tabId = tabId,
     type = "asyncEventProgressMessage"
 )
 
 data class UpdatePlaceholderMessage(
     @JsonProperty("tabID") override val tabId: String,
-    val newPlaceholder: String
+    val newPlaceholder: String,
 ) : UiMessage(
     tabId = tabId,
     type = "updatePlaceholderMessage"
@@ -142,15 +142,15 @@
     @JsonProperty("tabID") override val tabId: String,
     val filePaths: List<NewFileZipInfo>,
     val deletedFiles: List<DeletedFileInfo>,
-    val messageId: String
+    val messageId: String,
 ) : UiMessage(
     tabId = tabId,
     type = "updateFileComponent"
 )
 
 data class ChatInputEnabledMessage(
     @JsonProperty("tabID") override val tabId: String,
-    val enabled: Boolean
+    val enabled: Boolean,
 ) : UiMessage(
     tabId = tabId,
     type = "chatInputEnabledMessage"
@@ -191,7 +191,7 @@
     val conversationId: String,
     val filePaths: List<NewFileZipInfo>,
     val deletedFiles: List<DeletedFileInfo>,
-    val references: List<CodeReference>
+    val references: List<CodeReference>,
 ) : UiMessage(
     tabId = tabId,
     type = "codeResultMessage"
@@ -210,7 +210,7 @@
     @field:JsonValue val json: String,
 ) {
     Ok("ok"),
-    Refresh("refresh")
+    Refresh("refresh"),
 }
 
 enum class FollowUpStatusType(
@@ -219,11 +219,11 @@
     Info("info"),
     Success("success"),
     Warning("warning"),
-    Error("error")
+    Error("error"),
 }
 
 enum class FollowUpTypes(
-    @field:JsonValue val json: String
+    @field:JsonValue val json: String,
 ) {
     RETRY("Retry"),
     MODIFY_DEFAULT_SOURCE_FOLDER("ModifyDefaultSourceFolder"),
@@ -232,7 +232,7 @@
     INSERT_CODE("InsertCode"),
     PROVIDE_FEEDBACK_AND_REGENERATE_CODE("ProvideFeedbackAndRegenerateCode"),
     NEW_TASK("NewTask"),
-    CLOSE_SESSION("CloseSession")
+    CLOSE_SESSION("CloseSession"),
 }
 
 // Util classes

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessagePublisherExtensions.kt

@@ -50,7 +50,7 @@ suspend fun MessagePublisher.sendAnswerPart(
 
 suspend fun MessagePublisher.sendSystemPrompt(
     tabId: String,
-    followUp: List<FollowUp>
+    followUp: List<FollowUp>,
 ) {
     this.sendAnswer(
         tabId = tabId,
@@ -176,7 +176,7 @@ suspend fun MessagePublisher.sendCodeResult(
     uploadId: String,
     filePaths: List<NewFileZipInfo>,
     deletedFiles: List<DeletedFileInfo>,
-    references: List<CodeReferenceGenerated>
+    references: List<CodeReferenceGenerated>,
 ) {
     val refs = references.map { ref ->
         CodeReference(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt

@@ -29,7 +29,7 @@
     val repositorySize: Double,
     val messenger: MessagePublisher,
     var codeGenerationRemainingIterationCount: Int? = null,
-    var codeGenerationTotalIterationCount: Int? = null
+    var codeGenerationTotalIterationCount: Int? = null,
 ) : SessionState {
     override val phase = SessionStatePhase.CODEGEN
 
@@ -148,16 +148,20 @@
                 when (true) {
                     codeGenerationResultState.codeGenerationStatusDetail()?.contains(
                         "Guardrails"
-                    ) -> featureDevServiceError(message("amazonqFeatureDev.exception.guardrails"))
+                    ),
+                    -> featureDevServiceError(message("amazonqFeatureDev.exception.guardrails"))
                     codeGenerationResultState.codeGenerationStatusDetail()?.contains(
                         "PromptRefusal"
-                    ) -> featureDevServiceError(message("amazonqFeatureDev.exception.prompt_refusal"))
+                    ),
+                    -> featureDevServiceError(message("amazonqFeatureDev.exception.prompt_refusal"))
                     codeGenerationResultState.codeGenerationStatusDetail()?.contains(
                         "EmptyPatch"
-                    ) -> featureDevServiceError(message("amazonqFeatureDev.exception.guardrails"))
+                    ),
+                    -> featureDevServiceError(message("amazonqFeatureDev.exception.guardrails"))
                     codeGenerationResultState.codeGenerationStatusDetail()?.contains(
                         "Throttling"
-                    ) -> featureDevServiceError(message("amazonqFeatureDev.exception.throttling"))
+                    ),
+                    -> featureDevServiceError(message("amazonqFeatureDev.exception.throttling"))
                     else -> codeGenerationFailedError()
                 }
             }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt

@@ -30,7 +30,7 @@
     private val currentIteration: Int,
     private var messenger: MessagePublisher,
     var codeGenerationRemainingIterationCount: Int? = null,
-    var codeGenerationTotalIterationCount: Int? = null
+    var codeGenerationTotalIterationCount: Int? = null,
 ) : SessionState {
     override val phase = SessionStatePhase.CODEGEN
     override suspend fun interact(action: SessionStateAction): SessionStateInteraction {

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionStateTypes.kt

@@ -15,12 +15,12 @@
 
 data class Interaction(
     val content: String?,
-    val interactionSucceeded: Boolean
+    val interactionSucceeded: Boolean,
 )
 
 data class SessionStateInteraction(
     val nextState: SessionState? = null,
-    val interaction: Interaction
+    val interaction: Interaction,
 )
 
 enum class SessionStatePhase(
@@ -33,26 +33,26 @@
 data class SessionStateConfig(
     val conversationId: String,
     val repoContext: FeatureDevSessionContext,
-    val featureDevService: FeatureDevService
+    val featureDevService: FeatureDevService,
 )
 
 data class NewFileZipInfo(
     val zipFilePath: String,
     val fileContent: String,
-    var rejected: Boolean
+    var rejected: Boolean,
 )
 
 data class DeletedFileInfo(
     val zipFilePath: String, // The string is the path of the file to be deleted
-    var rejected: Boolean
+    var rejected: Boolean,
 )
 
 data class CodeGenerationResult(
     var newFiles: List<NewFileZipInfo>,
     var deletedFiles: List<DeletedFileInfo>,
     var references: List<CodeReferenceGenerated>,
     var codeGenerationRemainingIterationCount: Int? = null,
-    var codeGenerationTotalIterationCount: Int? = null
+    var codeGenerationTotalIterationCount: Int? = null,
 )
 
 data class CodeReferenceGenerated(
@@ -71,5 +71,5 @@
 
 @Suppress("ConstructorParameterNaming") // Unfortunately, this is exactly how the string json is received and is needed for parsing.
 data class ExportTaskAssistResultArchiveStreamResult(
-    var code_generation_result: CodeGenerationStreamResult
+    var code_generation_result: CodeGenerationStreamResult,
 )

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Requests.kt

@@ -13,7 +13,7 @@
     Click,
     ContextMenu,
     Hotkeys,
-    CodeScanButton
+    CodeScanButton,
 }
 
 data class ChatRequestData(
@@ -24,7 +24,7 @@
     val triggerType: TriggerType,
     val customization: CodeWhispererCustomization?,
     val relevantTextDocuments: List<RelevantDocument>,
-    val useRelevantDocuments: Boolean
+    val useRelevantDocuments: Boolean,
 )
 
 interface CodeNames {