diff --git a/.editorconfig b/.editorconfig index 9498da2db1..7b39413db6 100644 --- a/.editorconfig +++ b/.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 diff --git a/detekt-rules/detekt.yml b/detekt-rules/detekt.yml index f05ffeeffc..3176ddae30 100644 --- a/detekt-rules/detekt.yml +++ b/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 diff --git a/detekt-rules/src/software/aws/toolkits/gradle/detekt/rules/BannedPatternRule.kt b/detekt-rules/src/software/aws/toolkits/gradle/detekt/rules/BannedPatternRule.kt index a676bb754b..127ab9445e 100644 --- a/detekt-rules/src/software/aws/toolkits/gradle/detekt/rules/BannedPatternRule.kt +++ b/detekt-rules/src/software/aws/toolkits/gradle/detekt/rules/BannedPatternRule.kt @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 @file:Suppress("BannedPattern") + package software.aws.toolkits.gradle.detekt.rules import io.gitlab.arturbosch.detekt.api.CodeSmell diff --git a/detekt-rules/tst/software/aws/toolkits/gradle/detekt/rules/BannedPatternRuleTest.kt b/detekt-rules/tst/software/aws/toolkits/gradle/detekt/rules/BannedPatternRuleTest.kt index 8c3b99d537..b4fbeba459 100644 --- a/detekt-rules/tst/software/aws/toolkits/gradle/detekt/rules/BannedPatternRuleTest.kt +++ b/detekt-rules/tst/software/aws/toolkits/gradle/detekt/rules/BannedPatternRuleTest.kt @@ -2,6 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 @file:Suppress("BannedPattern") + package software.aws.toolkits.gradle.detekt.rules import io.gitlab.arturbosch.detekt.test.lint diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt index 36547a3c38..2d5d297a25 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthController.kt +++ b/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) } diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthNeededState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthNeededState.kt index 58fa5fe291..e034717adf 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/auth/AuthNeededState.kt +++ b/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, ) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedPanel.kt index 94dac0b7ad..d9ab40514f 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedPanel.kt +++ b/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 com.intellij.ui.jcef.JBCefApp class QGettingStartedPanel( - val project: Project + val project: Project, ) : Disposable { private val webviewContainer = Wrapper() var browser: QGettingStartedContent? = null diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/onboarding/OnboardingPageInteraction.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/onboarding/OnboardingPageInteraction.kt index 07983566c1..6a57c9ec73 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/onboarding/OnboardingPageInteraction.kt +++ b/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"), } diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindow.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindow.kt index 4bc3f1d5b2..e5673cc6da 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindow.kt +++ b/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() diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt index 836f22dc19..6f4c1a6950 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQToolWindowFactory.kt @@ -91,7 +91,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 diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt index 3a73dab617..87e4d7860d 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt +++ b/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 + themeSource: Flow, ) = coroutineScope { themeSource .distinctUntilChanged() diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/CssVariable.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/CssVariable.kt index c7c38ee5eb..7fa543bf1d 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/CssVariable.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/theme/CssVariable.kt @@ -7,7 +7,7 @@ package software.aws.toolkits.jetbrains.services.amazonq.webview.theme * 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 @@ enum class CssVariable( MainBackground("--mynah-color-main"), MainForeground("--mynah-color-main-reverse"), - CardBackground("--mynah-card-bg") + CardBackground("--mynah-card-bg"), } diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt index 1fd3a8362d..925ffeaf1e 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevConstants.kt @@ -20,7 +20,7 @@ const val DEFAULT_RETRY_LIMIT = 0 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"), diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/GenerateTaskAssistPlanResult.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/GenerateTaskAssistPlanResult.kt index 17ca148447..1ac86f7f6e 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/GenerateTaskAssistPlanResult.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/clients/GenerateTaskAssistPlanResult.kt @@ -5,5 +5,5 @@ package software.aws.toolkits.jetbrains.services.amazonqFeatureDev.clients data class GenerateTaskAssistPlanResult( val approach: String, - val succeededPlanning: Boolean + val succeededPlanning: Boolean, ) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt index 9ae2e78ad1..b1da4d0643 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt @@ -74,7 +74,7 @@ import java.util.UUID 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 diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt index 8c7cee8dc7..4758bfda69 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessage.kt @@ -69,14 +69,14 @@ sealed interface IncomingFeatureDevMessage : FeatureDevBaseMessage { 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 } @@ -107,7 +107,7 @@ data class FeatureDevMessage( val message: String? = null, val followUps: List? = null, val canBeVoted: Boolean, - val snapToTop: Boolean + val snapToTop: Boolean, ) : UiMessage( tabId = tabId, @@ -117,7 +117,7 @@ data class FeatureDevMessage( data class AsyncEventProgressMessage( @JsonProperty("tabID") override val tabId: String, val message: String? = null, - val inProgress: Boolean + val inProgress: Boolean, ) : UiMessage( tabId = tabId, type = "asyncEventProgressMessage" @@ -125,7 +125,7 @@ data class AsyncEventProgressMessage( data class UpdatePlaceholderMessage( @JsonProperty("tabID") override val tabId: String, - val newPlaceholder: String + val newPlaceholder: String, ) : UiMessage( tabId = tabId, type = "updatePlaceholderMessage" @@ -135,7 +135,7 @@ data class FileComponent( @JsonProperty("tabID") override val tabId: String, val filePaths: List, val deletedFiles: List, - val messageId: String + val messageId: String, ) : UiMessage( tabId = tabId, type = "updateFileComponent" @@ -143,7 +143,7 @@ data class FileComponent( data class ChatInputEnabledMessage( @JsonProperty("tabID") override val tabId: String, - val enabled: Boolean + val enabled: Boolean, ) : UiMessage( tabId = tabId, type = "chatInputEnabledMessage" @@ -184,7 +184,7 @@ data class CodeResultMessage( val conversationId: String, val filePaths: List, val deletedFiles: List, - val references: List + val references: List, ) : UiMessage( tabId = tabId, type = "codeResultMessage" @@ -203,7 +203,7 @@ enum class FollowUpIcons( @field:JsonValue val json: String, ) { Ok("ok"), - Refresh("refresh") + Refresh("refresh"), } enum class FollowUpStatusType( @@ -212,11 +212,11 @@ enum class FollowUpStatusType( 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"), @@ -227,7 +227,7 @@ enum class FollowUpTypes( INSERT_CODE("InsertCode"), PROVIDE_FEEDBACK_AND_REGENERATE_CODE("ProvideFeedbackAndRegenerateCode"), NEW_TASK("NewTask"), - CLOSE_SESSION("CloseSession") + CLOSE_SESSION("CloseSession"), } // Util classes diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessagePublisherExtensions.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessagePublisherExtensions.kt index b732571ea9..1aa249b750 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/messages/FeatureDevMessagePublisherExtensions.kt +++ b/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: List, ) { this.sendAnswer( tabId = tabId, @@ -176,7 +176,7 @@ suspend fun MessagePublisher.sendCodeResult( uploadId: String, filePaths: List, deletedFiles: List, - references: List + references: List, ) { val refs = references.map { ref -> CodeReference( diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt index 9ef4f8a2c4..fbeca01236 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt @@ -28,7 +28,7 @@ class CodeGenerationState( val repositorySize: Double, val messenger: MessagePublisher, var codeGenerationRemainingIterationCount: Int? = null, - var codeGenerationTotalIterationCount: Int? = null + var codeGenerationTotalIterationCount: Int? = null, ) : SessionState { override val phase = SessionStatePhase.CODEGEN @@ -134,16 +134,20 @@ private suspend fun CodeGenerationState.generateCode(codeGenerationId: String): 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() } } diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt index d2a3215551..b89ae96c48 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareCodeGenerationState.kt @@ -29,7 +29,7 @@ class PrepareCodeGenerationState( 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 { diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareRefinementState.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareRefinementState.kt index 4043042510..f3a59047ea 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareRefinementState.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/PrepareRefinementState.kt @@ -16,7 +16,7 @@ private val logger = getLogger() class PrepareRefinementState( override var approach: String, override var tabID: String, - var config: SessionStateConfig + var config: SessionStateConfig, ) : SessionState { override val phase = SessionStatePhase.APPROACH override suspend fun interact(action: SessionStateAction): SessionStateInteraction { diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionStateTypes.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionStateTypes.kt index 51f660d6d6..3a93722668 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionStateTypes.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/SessionStateTypes.kt @@ -15,12 +15,12 @@ data class SessionStateAction( 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( @@ -34,18 +34,18 @@ enum class SessionStatePhase( 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( @@ -53,7 +53,7 @@ data class CodeGenerationResult( var deletedFiles: List, var references: List, var codeGenerationRemainingIterationCount: Int? = null, - var codeGenerationTotalIterationCount: Int? = null + var codeGenerationTotalIterationCount: Int? = null, ) data class CodeReferenceGenerated( @@ -72,5 +72,5 @@ data class CodeGenerationStreamResult( @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, ) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt index 340072ea47..3f620521a6 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/util/FeatureDevService.kt @@ -114,7 +114,7 @@ class FeatureDevService(val proxyClient: FeatureDevClient, val project: Project) conversationId: String, uploadId: String, message: String, - currentIteration: Int + currentIteration: Int, ): GenerateTaskAssistPlanResult { val startTime = System.currentTimeMillis() var failureReason: String? = null diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Requests.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Requests.kt index 183b7f6960..395cd03121 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Requests.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Requests.kt @@ -13,7 +13,7 @@ enum class TriggerType { Click, ContextMenu, Hotkeys, - CodeScanButton + CodeScanButton, } data class ChatRequestData( @@ -23,7 +23,7 @@ data class ChatRequestData( val userIntent: UserIntent?, val triggerType: TriggerType, val customization: CodeWhispererCustomization?, - val relevantTextDocuments: List + val relevantTextDocuments: List, ) interface CodeNames { diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Responses.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Responses.kt index 7ea384b101..2cb7878e7d 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Responses.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/clients/chat/model/Responses.kt @@ -58,12 +58,12 @@ data class Reference( val licenseName: String?, val repository: String?, val url: String?, - val recommendationContentSpan: RecommendationContentSpan? + val recommendationContentSpan: RecommendationContentSpan?, ) data class RecommendationContentSpan( val start: Int?, - val end: Int? + val end: Int?, ) data class Header(val sender: String, val responseTo: String, val sequenceId: String) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt index e08aab928c..36158b6735 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/EditorContextCommand.kt @@ -8,7 +8,7 @@ import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerTy enum class EditorContextCommand( val verb: String, val actionId: String, - var triggerType: TriggerType = TriggerType.ContextMenu + var triggerType: TriggerType = TriggerType.ContextMenu, ) { Explain( verb = "Explain", @@ -33,5 +33,5 @@ enum class EditorContextCommand( ExplainCodeScanIssue( verb = "ExplainIssue", actionId = "aws.amazonq.explainCodeScanIssue", - ) + ), } diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt index a7afeeba98..2a541cc9a4 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt @@ -334,7 +334,7 @@ class ChatController private constructor( message: ContextMenuActionMessage, triggerId: String, fileContext: ActiveFileContext, - modelPrompt: String? = null + modelPrompt: String? = null, ) { messagePublisher.publish( EditorContextCommandMessage( @@ -378,7 +378,7 @@ class ChatController private constructor( userIntent: UserIntent?, triggerType: TriggerType, projectContextQueryResult: List, - shouldAddIndexInProgressMessage: Boolean? = false + shouldAddIndexInProgressMessage: Boolean? = false, ) { val credentialState = authController.getAuthNeededStates(context.project).chat if (credentialState != null) { diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt index 0f3754f6c2..076a4045b2 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt @@ -51,7 +51,7 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) { triggerId: String, data: ChatRequestData, sessionInfo: ChatSessionInfo, - shouldAddIndexInProgressMessage: Boolean + shouldAddIndexInProgressMessage: Boolean, ) = flow { val session = sessionInfo.session session.chat(data) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt index 7c2c7ad62b..97d5e37389 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/TelemetryHelper.kt @@ -405,7 +405,7 @@ class TelemetryHelper(private val context: AmazonQAppInitContext, private val se isSuccess: Boolean, memoryUsage: Int? = 0, cpuUsage: Int? = 0, - startUrl: String? = null + startUrl: String? = null, ) { AmazonqTelemetry.indexWorkspace( project = null, diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/ActiveFileContext.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/ActiveFileContext.kt index a257431f6b..f2e7903745 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/ActiveFileContext.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/ActiveFileContext.kt @@ -8,5 +8,5 @@ import software.aws.toolkits.jetbrains.services.cwc.editor.context.focusArea.Foc data class ActiveFileContext( val fileContext: FileContext?, - val focusAreaContext: FocusAreaContext? + val focusAreaContext: FocusAreaContext?, ) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/ExtractionTriggerType.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/ExtractionTriggerType.kt index 6cc034ef37..e57b8f717c 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/ExtractionTriggerType.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/ExtractionTriggerType.kt @@ -7,5 +7,5 @@ enum class ExtractionTriggerType { ChatMessage, ContextMenu, OnboardingPageInteraction, - CodeScanButton + CodeScanButton, } diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/ProjectContextProvider.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/ProjectContextProvider.kt index e497b5c2ae..9abd6258b4 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/ProjectContextProvider.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/ProjectContextProvider.kt @@ -55,20 +55,20 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En data class IndexRequestPayload( val filePaths: List, val projectRoot: String, - val refresh: Boolean + val refresh: Boolean, ) data class FileCollectionResult( val files: List, - val fileSize: Int + val fileSize: Int, ) data class QueryRequestPayload( - val query: String + val query: String, ) data class UpdateIndexRequestPayload( - val filePath: String + val filePath: String, ) data class Usage( @@ -76,7 +76,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En @JsonProperty("memoryUsage") val memoryUsage: Int? = null, @JsonProperty("cpuUsage") - val cpuUsage: Int? = null + val cpuUsage: Int? = null, ) data class Chunk( diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/RelevantDocument.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/RelevantDocument.kt index 3df815803d..d77ade0f5d 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/RelevantDocument.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/RelevantDocument.kt @@ -5,5 +5,5 @@ package software.aws.toolkits.jetbrains.services.cwc.editor.context.project data class RelevantDocument( val relativeFilePath: String, - val text: String + val text: String, ) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/manifest/ManifestManager.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/manifest/ManifestManager.kt index e58dc51621..fea0b5f11a 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/manifest/ManifestManager.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/project/manifest/ManifestManager.kt @@ -29,7 +29,7 @@ class ManifestManager { @JsonProperty("hashes") val hashes: List? = emptyList(), @JsonProperty("bytes") - val bytes: Number? = null + val bytes: Number? = null, ) data class VersionTarget( @@ -39,7 +39,7 @@ class ManifestManager { @JsonProperty("arch") val arch: String? = null, @JsonProperty("contents") - val contents: List? = emptyList() + val contents: List? = emptyList(), ) data class Version( @JsonIgnoreProperties(ignoreUnknown = true) @@ -48,7 +48,7 @@ class ManifestManager { @JsonProperty("isDelisted") val isDelisted: Boolean? = null, @JsonProperty("targets") - val targets: List? = emptyList() + val targets: List? = emptyList(), ) data class Manifest( @@ -62,7 +62,7 @@ class ManifestManager { @JsonProperty("isManifestDeprecated") val isManifestDeprecated: Boolean? = null, @JsonProperty("versions") - val versions: List? = emptyList() + val versions: List? = emptyList(), ) fun getManifest(): Manifest? = fetchFromRemoteAndSave() diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/exceptions/ChatException.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/exceptions/ChatException.kt index 6200a580cd..6df9460784 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/exceptions/ChatException.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/exceptions/ChatException.kt @@ -8,5 +8,5 @@ package software.aws.toolkits.jetbrains.services.cwc.exceptions */ open class ChatException( message: String, - cause: Throwable? = null + cause: Throwable? = null, ) : Exception(message, cause) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt index dd7d9485b2..519cd4eca1 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt @@ -69,7 +69,7 @@ sealed interface IncomingCwcMessage : CwcMessage { val insertionTargetType: String?, val eventId: String?, val codeBlockIndex: Int?, - val totalCodeBlocks: Int? + val totalCodeBlocks: Int?, ) : IncomingCwcMessage data class InsertCodeAtCursorPosition( @@ -80,7 +80,7 @@ sealed interface IncomingCwcMessage : CwcMessage { val codeReference: List?, val eventId: String?, val codeBlockIndex: Int?, - val totalCodeBlocks: Int? + val totalCodeBlocks: Int?, ) : IncomingCwcMessage data class TriggerTabIdReceived( @@ -255,7 +255,7 @@ data class QuickActionMessage( data class OnboardingPageInteractionMessage( val message: String, val interactionType: OnboardingPageInteractionType, - @JsonProperty("triggerID") val triggerId: String + @JsonProperty("triggerID") val triggerId: String, ) : UiMessage( tabId = null, type = "editorContextCommandMessage", diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt index 8d31fc4d43..ec282c3bbe 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt @@ -124,7 +124,7 @@ class ArtifactHandler(private val project: Project, private val clientAdaptor: G suspend fun downloadArtifact( job: JobId, artifactType: TransformationDownloadArtifactType, - isPreFetch: Boolean = false + isPreFetch: Boolean = false, ): DownloadArtifactResult { isCurrentlyDownloading.set(true) val downloadStartTime = Instant.now() diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt index 0fc41aa5ce..b2da25eee2 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeModernizerManager.kt @@ -440,7 +440,7 @@ class CodeModernizerManager(private val project: Project) : PersistentStateCompo private suspend fun handleJobResumedFromHil( jobId: JobId, - session: CodeModernizerSession + session: CodeModernizerSession, ): CodeModernizerJobCompletedResult = session.pollUntilJobCompletion( jobId ) { new, plan -> diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt index 0cde3a1093..445b3c5fab 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/CodeTransformTelemetryManager.kt @@ -101,7 +101,7 @@ class CodeTransformTelemetryManager(private val project: Project) { codeTransformTotalByteSize: Int? = null, codeTransformUploadId: String? = null, codeTransformJobId: String? = null, - codeTransformRequestId: String? = null + codeTransformRequestId: String? = null, ) = CodetransformTelemetry.logApiLatency( codeTransformApiNames = apiName, codeTransformSessionId = sessionId, @@ -259,7 +259,7 @@ class CodeTransformTelemetryManager(private val project: Project) { downloadStartTime: Instant, jobId: JobId, totalDownloadBytes: Int, - telemetryErrorMessage: String? + telemetryErrorMessage: String?, ) { CodetransformTelemetry.downloadArtifact( codeTransformArtifactType = artifactType, @@ -278,7 +278,7 @@ class CodeTransformTelemetryManager(private val project: Project) { jobId: JobId, userChoice: String, source: CodeTransformVCSViewerSrcComponents, - telemetryErrorMessage: String? = null + telemetryErrorMessage: String? = null, ) { CodetransformTelemetry.viewArtifact( codeTransformArtifactType = artifactType, diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt index d35a991a93..7634127199 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/client/GumbyClient.kt @@ -101,7 +101,7 @@ class GumbyClient(private val project: Project) { fun startCodeModernization( uploadId: String, sourceLanguage: TransformationLanguage, - targetLanguage: TransformationLanguage + targetLanguage: TransformationLanguage, ): StartTransformationResponse { val request = StartTransformationRequest.builder() .workspaceState { state -> @@ -119,7 +119,7 @@ class GumbyClient(private val project: Project) { fun resumeCodeTransformation( jobId: JobId, - userActionStatus: TransformationUserActionStatus + userActionStatus: TransformationUserActionStatus, ): ResumeTransformationResponse { val request = ResumeTransformationRequest.builder() .transformationJobId(jobId.id) @@ -155,7 +155,7 @@ class GumbyClient(private val project: Project) { suspend fun downloadExportResultArchive( jobId: JobId, hilDownloadArtifactId: String? = null, - downloadArtifactType: TransformationDownloadArtifactType? = TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS + downloadArtifactType: TransformationDownloadArtifactType? = TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS, ): MutableList = amazonQStreamingClient.exportResultArchive( jobId.id, ExportIntent.TRANSFORMATION, diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt index 1ec33b7067..8afecd6854 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeTransformChatItems.kt @@ -409,7 +409,7 @@ fun buildTransformAwaitUserInputChatContent(dependency: Dependency): CodeTransfo fun buildTransformDependencyErrorChatContent( hilDownloadArtifact: CodeTransformHilDownloadArtifact, - showButton: Boolean = true + showButton: Boolean = true, ) = CodeTransformChatMessageContent( message = message("codemodernizer.chat.message.hil.pom_snippet_title") + "\n\n```xml" + diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt index cd6b915645..dd64479e40 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt @@ -80,7 +80,7 @@ import software.aws.toolkits.telemetry.CodeTransformVCSViewerSrcComponents class CodeTransformChatController( private val context: AmazonQAppInitContext, - private val chatSessionStorage: ChatSessionStorage + private val chatSessionStorage: ChatSessionStorage, ) : InboundAppMessagesHandler { private val authController = AuthController() private val messagePublisher = context.messagesFromAppToUi diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatHelper.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatHelper.kt index 5f89f69d65..1dd2ff5aea 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatHelper.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatHelper.kt @@ -17,7 +17,7 @@ import java.util.UUID class CodeTransformChatHelper( private val messagePublisher: MessagePublisher, - private val chatSessionStorage: ChatSessionStorage + private val chatSessionStorage: ChatSessionStorage, ) { private var activeCodeTransformTabId: String? = null private var hilPomItemId: String? = null @@ -48,7 +48,7 @@ class CodeTransformChatHelper( suspend fun addNewMessage( content: CodeTransformChatMessageContent, messageIdOverride: String? = null, - clearPreviousItemButtons: Boolean? = true + clearPreviousItemButtons: Boolean? = true, ) { if (activeCodeTransformTabId == null || chatSessionStorage.getSession(activeCodeTransformTabId as String).isAuthenticating) { return @@ -95,7 +95,7 @@ class CodeTransformChatHelper( suspend fun updateExistingMessage( targetMessageId: String, - content: CodeTransformChatMessageContent + content: CodeTransformChatMessageContent, ) { messagePublisher.publish( CodeTransformChatUpdateMessage( diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ideMaven/MavenRunnerUtils.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ideMaven/MavenRunnerUtils.kt index 3d55c4d548..4040418b8c 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ideMaven/MavenRunnerUtils.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ideMaven/MavenRunnerUtils.kt @@ -31,7 +31,7 @@ fun runHilMavenCopyDependency( destinationDir: File, buildlogBuilder: StringBuilder, logger: Logger, - project: Project + project: Project, ): MavenCopyCommandsResult { val telemetry = CodeTransformTelemetryManager.getInstance(project) logger.info { "Executing IntelliJ bundled Maven" } @@ -198,7 +198,7 @@ private fun runMavenClean( transformMavenRunner: TransformMavenRunner, logger: Logger, telemetry: CodeTransformTelemetryManager, - destinationDir: Path + destinationDir: Path, ): TransformRunnable { buildlogBuilder.appendLine("Command Run: IntelliJ IDEA bundled Maven clean") val cleanParams = MavenRunnerParameters( @@ -233,7 +233,7 @@ private fun runMavenInstall( transformMavenRunner: TransformMavenRunner, logger: Logger, telemetry: CodeTransformTelemetryManager, - destinationDir: Path + destinationDir: Path, ): TransformRunnable { buildlogBuilder.appendLine("Command Run: IntelliJ IDEA bundled Maven install") val installParams = MavenRunnerParameters( diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressStepTreeItem.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressStepTreeItem.kt index f860295f80..f48c38a16e 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressStepTreeItem.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressStepTreeItem.kt @@ -9,7 +9,7 @@ data class BuildProgressStepTreeItem( val id: ProgressStepId, var runtime: String? = null, var finishedTime: String? = null, - val transformationStepId: Int? = null + val transformationStepId: Int? = null, ) enum class ProgressStepId(val order: Int) { @@ -20,5 +20,5 @@ enum class ProgressStepId(val order: Int) { PLAN_STEP(5), PAUSED(6), RESUMED(7), - ROOT_STEP(99) + ROOT_STEP(99), } diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressTimelineStepDetailItem.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressTimelineStepDetailItem.kt index 4dcf6b7e6c..4a51836d05 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressTimelineStepDetailItem.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressTimelineStepDetailItem.kt @@ -8,5 +8,5 @@ data class BuildProgressTimelineStepDetailItem( val description: String, val status: BuildStepStatus, var runtime: String? = null, - var finishedTime: String? = null + var finishedTime: String? = null, ) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressTimelineStepDetailsList.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressTimelineStepDetailsList.kt index 838de79cdc..77f15eea0c 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressTimelineStepDetailsList.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildProgressTimelineStepDetailsList.kt @@ -15,7 +15,7 @@ class BuildProgressTimelineStepDetailsList fun getTransformationProgressStepsByTransformationStepId( stepId: Int, - transformationPlan: TransformationPlan? + transformationPlan: TransformationPlan?, ): BuildProgressTimelineStepDetailsList { val stepList = BuildProgressTimelineStepDetailsList() // skip step 0 (contains supplemental info) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt index 7cce145b69..507c7d601b 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeModernizerSessionContext.kt @@ -115,7 +115,7 @@ data class CodeModernizerSessionContext( } private fun executeDependencyVersionReportUsingMaven( sourceFolder: File, - buildLogBuilder: StringBuilder + buildLogBuilder: StringBuilder, ) = runDependencyReportCommands(sourceFolder, buildLogBuilder, LOG, project) fun createZipForHilUpload(hilTempPath: Path, manifest: CodeTransformHilDownloadManifest?, targetVersion: String): ZipCreationResult = diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeTransformFailureBuildLog.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeTransformFailureBuildLog.kt index b9959db2c4..09edf27f3e 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeTransformFailureBuildLog.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CodeTransformFailureBuildLog.kt @@ -16,7 +16,7 @@ import kotlin.io.path.Path * Represents a CodeModernizer artifact. Essentially a wrapper around the manifest file in the downloaded artifact zip. */ open class CodeTransformFailureBuildLog( - val logFile: File + val logFile: File, ) : CodeTransformDownloadArtifact { companion object : CodeTransformDownloadArtifact { private val tempDir = createTempDirectory("codeTransformBuildLog", null) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CustomerSelection.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CustomerSelection.kt index 50e0c13e2d..809e15af29 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CustomerSelection.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/CustomerSelection.kt @@ -9,5 +9,5 @@ import com.intellij.openapi.vfs.VirtualFile data class CustomerSelection( val configurationFile: VirtualFile, val sourceJavaVersion: JavaSdkVersion, - val targetJavaVersion: JavaSdkVersion + val targetJavaVersion: JavaSdkVersion, ) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/JobHistoryTableModel.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/JobHistoryTableModel.kt index 563329fcc7..6fe9e1ad45 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/JobHistoryTableModel.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/JobHistoryTableModel.kt @@ -7,7 +7,7 @@ import javax.swing.table.AbstractTableModel class JobHistoryTableModel( private val data: Array, - private val columnNames: Array + private val columnNames: Array, ) : AbstractTableModel() { override fun getRowCount(): Int = data.size diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ValidationResult.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ValidationResult.kt index cf222ca97c..1db3c1fe57 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ValidationResult.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ValidationResult.kt @@ -13,5 +13,5 @@ data class ValidationResult( val validatedBuildFiles: List = emptyList(), val validatedProjectJdkName: String = "", val buildSystem: CodeTransformBuildSystem = CodeTransformBuildSystem.Unknown, - val buildSystemVersion: String = "" + val buildSystemVersion: String = "", ) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ZipManifest.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ZipManifest.kt index 9f9b9a6ec9..972e53f4f1 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ZipManifest.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/ZipManifest.kt @@ -15,5 +15,5 @@ data class ZipManifest( val buildLogs: String = BUILD_LOG_PATH, val version: String = UPLOAD_ZIP_MANIFEST_VERSION.toString(), val hilCapabilities: List = listOf(HIL_1P_UPGRADE_CAPABILITY), - val transformCapabilities: List = listOf(EXPLAINABILITY_V1) + val transformCapabilities: List = listOf(EXPLAINABILITY_V1), ) diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressStepDetailsPanel.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressStepDetailsPanel.kt index ca5d088910..81cab76cd2 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressStepDetailsPanel.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressStepDetailsPanel.kt @@ -64,7 +64,7 @@ class BuildProgressStepDetailsPanel : JPanel(BorderLayout()) { value: Any?, index: Int, isSelected: Boolean, - cellHasFocus: Boolean + cellHasFocus: Boolean, ): Component { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus) val it = value as BuildProgressTimelineStepDetailItem diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressTreePanel.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressTreePanel.kt index 6b6fded44d..ed5ffe8885 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressTreePanel.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressTreePanel.kt @@ -144,7 +144,7 @@ class BuildProgressTreePanel : JPanel(BorderLayout()) { expanded: Boolean, leaf: Boolean, row: Int, - hasFocus: Boolean + hasFocus: Boolean, ): Component { val treeRenderer = super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus) if (value is DefaultMutableTreeNode) { diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt index dcf4a55207..fe26278aed 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/panels/managers/CodeModernizerBottomWindowPanelManager.kt @@ -182,20 +182,24 @@ class CodeModernizerBottomWindowPanelManager(private val project: Project) : JPa is CodeModernizerJobCompletedResult.UnableToCreateJob, is CodeModernizerJobCompletedResult.ZipUploadFailed, is CodeModernizerJobCompletedResult.JobAbortedZipTooLarge, - is CodeModernizerJobCompletedResult.JobAbortedMissingDependencies -> setJobFailedToStartUI() + is CodeModernizerJobCompletedResult.JobAbortedMissingDependencies, + -> setJobFailedToStartUI() is CodeModernizerJobCompletedResult.RetryableFailure, is CodeModernizerJobCompletedResult.JobFailedInitialBuild, - is CodeModernizerJobCompletedResult.JobFailed -> setJobFailedWhileRunningUI() + is CodeModernizerJobCompletedResult.JobFailed, + -> setJobFailedWhileRunningUI() is CodeModernizerJobCompletedResult.JobPartiallySucceeded, - is CodeModernizerJobCompletedResult.JobCompletedSuccessfully -> setJobCompletedSuccessfullyUI() + is CodeModernizerJobCompletedResult.JobCompletedSuccessfully, + -> setJobCompletedSuccessfullyUI() is CodeModernizerJobCompletedResult.ManagerDisposed -> return@setUI is CodeModernizerJobCompletedResult.JobPaused, is CodeModernizerJobCompletedResult.Stopped, - is CodeModernizerJobCompletedResult.JobAbortedBeforeStarting -> userInitiatedStopCodeModernizationUI() + is CodeModernizerJobCompletedResult.JobAbortedBeforeStarting, + -> userInitiatedStopCodeModernizationUI() } } } diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/session/Session.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/session/Session.kt index da169806a6..f32c78f206 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/session/Session.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/session/Session.kt @@ -4,7 +4,7 @@ package software.aws.toolkits.jetbrains.services.codemodernizer.session data class Session( - val tabId: String + val tabId: String, ) { var isAuthenticating: Boolean = false var authNeededNotified: Boolean = false diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerState.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerState.kt index b4298c8f40..b200a53eb4 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerState.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/state/CodeModernizerState.kt @@ -19,7 +19,7 @@ enum class JobDetails { } enum class StateFlags { - IS_ONGOING + IS_ONGOING, } fun buildState(context: CodeModernizerSessionContext, isJobOngoing: Boolean, jobId: JobId) = CodeModernizerState().apply { diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt index 581de8963a..aa9153c233 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformApiUtils.kt @@ -30,7 +30,7 @@ data class PollingResult( val succeeded: Boolean, val jobDetails: TransformationJob?, val state: TransformationStatus, - val transformationPlan: TransformationPlan? + val transformationPlan: TransformationPlan?, ) /** diff --git a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformProjectUtils.kt b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformProjectUtils.kt index dfba1b6d30..8fd40f30e4 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformProjectUtils.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/utils/CodeTransformProjectUtils.kt @@ -61,7 +61,7 @@ fun Project.getSupportedBuildFilesWithSupportedJdk( supportedJavaMappings: Map< JavaSdkVersion, Set - > + >, ): List { val detectedBuildFiles = this.getAllSupportedBuildFiles(supportedBuildFileNames) val supportedModules = this.getSupportedModules(supportedJavaMappings).toSet() diff --git a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/PanelTestBase.kt b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/PanelTestBase.kt index d3f5e66803..f1403c25d7 100644 --- a/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/PanelTestBase.kt +++ b/plugins/amazonq/codetransform/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codemodernizer/panels/PanelTestBase.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.BeforeEach import software.aws.toolkits.jetbrains.utils.rules.CodeInsightTestFixtureRule open class PanelTestBase( - @Rule @JvmField val projectRule: CodeInsightTestFixtureRule = CodeInsightTestFixtureRule() + @Rule @JvmField val projectRule: CodeInsightTestFixtureRule = CodeInsightTestFixtureRule(), ) { internal lateinit var project: Project diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanHighlightingFilesPanel.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanHighlightingFilesPanel.kt index 1886f411b7..3bd8e425d9 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanHighlightingFilesPanel.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanHighlightingFilesPanel.kt @@ -82,7 +82,7 @@ internal class CodeWhispererCodeScanHighlightingFilesPanel(private val project: expanded: Boolean, leaf: Boolean, row: Int, - hasFocus: Boolean + hasFocus: Boolean, ) { value as DefaultMutableTreeNode val file = value.userObject as? VirtualFile diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt index b26f14377f..9cdf5dc439 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanManager.kt @@ -186,7 +186,7 @@ class CodeWhispererCodeScanManager(val project: Project) { scope: CodeWhispererConstants.CodeAnalysisScope, isPluginStarting: Boolean = false, waitMs: Long = CodeWhispererConstants.AUTO_SCAN_DEBOUNCE_DELAY_IN_SECONDS * 1000, - coroutineScope: CoroutineScope = defaultScope + coroutineScope: CoroutineScope = defaultScope, ) { if (this::debouncedCodeScanJob.isInitialized && debouncedCodeScanJob.isActive) { debouncedCodeScanJob.cancel() @@ -536,7 +536,7 @@ class CodeWhispererCodeScanManager(val project: Project) { project: Project, programmingLanguage: CodeWhispererProgrammingLanguage, codeScanJobId: String?, - scope: CodeWhispererConstants.CodeAnalysisScope + scope: CodeWhispererConstants.CodeAnalysisScope, ) { runIfIdcConnectionOrTelemetryEnabled(project) { try { @@ -675,7 +675,7 @@ class CodeWhispererCodeScanManager(val project: Project) { suspend fun renderResponseOnUIThread( issues: List, scannedFiles: List, - scope: CodeWhispererConstants.CodeAnalysisScope + scope: CodeWhispererConstants.CodeAnalysisScope, ) { withContext(getCoroutineUiContext()) { var root: DefaultMutableTreeNode? = null @@ -735,7 +735,7 @@ data class CodeWhispererCodeScanIssue( val codeSnippet: List, val issueSeverity: HighlightDisplayLevel = HighlightDisplayLevel.WARNING, val isInvalid: Boolean = false, - var rangeHighlighter: RangeHighlighterEx? = null + var rangeHighlighter: RangeHighlighterEx? = null, ) { override fun toString(): String = title @@ -763,7 +763,7 @@ data class CodeWhispererCodeScanIssue( */ fun addRangeHighlighter( markupModel: MarkupModel? = - DocumentMarkupModel.forDocument(document, project, false) + DocumentMarkupModel.forDocument(document, project, false), ): RangeHighlighterEx? { if (!ApplicationManager.getApplication().isDispatchThread) return null return markupModel?.let { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanResultsView.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanResultsView.kt index b30a24b089..bb066970ea 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanResultsView.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanResultsView.kt @@ -120,7 +120,7 @@ internal class CodeWhispererCodeScanResultsView(private val project: Project) : fun updateAndDisplayScanResults( scanTreeModel: CodeWhispererCodeScanTreeModel, scannedFiles: List, - scope: CodeWhispererConstants.CodeAnalysisScope + scope: CodeWhispererConstants.CodeAnalysisScope, ) { codeScanTree.apply { model = scanTreeModel @@ -272,7 +272,7 @@ internal class CodeWhispererCodeScanResultsView(private val project: Project) : expanded: Boolean, leaf: Boolean, row: Int, - hasFocus: Boolean + hasFocus: Boolean, ): Component { value as DefaultMutableTreeNode val cell = JLabel() diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt index c24507ced9..9a28a895fd 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanSession.kt @@ -483,13 +483,13 @@ sealed class CodeScanResponse { data class Success( override val issues: List, - override val responseContext: CodeScanResponseContext + override val responseContext: CodeScanResponseContext, ) : CodeScanResponse() data class Failure( override val issues: List, override val responseContext: CodeScanResponseContext, - val failureReason: Throwable + val failureReason: Throwable, ) : CodeScanResponse() } @@ -506,7 +506,7 @@ internal data class CodeScanRecommendation( val relatedVulnerabilities: List, val severity: String, val remediation: Remediation, - val codeSnippet: List + val codeSnippet: List, ) data class Description(val text: String, val markdown: String) @@ -522,7 +522,7 @@ data class CodeLine(val number: Int, val content: String) data class CodeScanSessionContext( val project: Project, val sessionConfig: CodeScanSessionConfig, - val codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope + val codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope, ) internal fun defaultPayloadContext() = PayloadContext(CodewhispererLanguage.Unknown, 0, 0, 0, listOf(), 0, 0) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTreeModel.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTreeModel.kt index 8bf936537c..80148f48a4 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTreeModel.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTreeModel.kt @@ -7,7 +7,7 @@ import javax.swing.tree.DefaultMutableTreeNode import javax.swing.tree.DefaultTreeModel internal class CodeWhispererCodeScanTreeModel( - private val codeScanTreeNodeRoot: DefaultMutableTreeNode = DefaultMutableTreeNode("CodeWhisperer security scan results") + private val codeScanTreeNodeRoot: DefaultMutableTreeNode = DefaultMutableTreeNode("CodeWhisperer security scan results"), ) : DefaultTreeModel(codeScanTreeNodeRoot) { override fun getRoot(): Any = codeScanTreeNodeRoot diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanEditorMouseMotionListener.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanEditorMouseMotionListener.kt index ceae6cd32f..839524119b 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanEditorMouseMotionListener.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/listeners/CodeWhispererCodeScanEditorMouseMotionListener.kt @@ -327,7 +327,7 @@ class CodeWhispererCodeScanEditorMouseMotionListener(private val project: Projec component: String?, reason: String?, result: String?, - includesFix: Boolean? + includesFix: Boolean?, ) { runIfIdcConnectionOrTelemetryEnabled(project) { pluginAwareExecuteOnPooledThread { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt index 8901463903..c7fc667c57 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt @@ -45,7 +45,7 @@ import kotlin.io.path.relativeTo class CodeScanSessionConfig( private val selectedFile: VirtualFile?, private val project: Project, - private val scope: CodeAnalysisScope + private val scope: CodeAnalysisScope, ) { var projectRoot = project.basePath?.let { Path.of(it) }?.toFile()?.toVirtualFile() ?: run { project.guessProjectDir() ?: error("Cannot guess base directory for project ${project.name}") @@ -251,7 +251,7 @@ class CodeScanSessionConfig( data class Payload( val context: PayloadContext, - val srcZip: File + val srcZip: File, ) data class PayloadContext( @@ -262,12 +262,12 @@ data class PayloadContext( val scannedFiles: List, val srcPayloadSize: Long, val srcZipFileSize: Long, - val buildPayloadSize: Long? = null + val buildPayloadSize: Long? = null, ) data class PayloadMetadata( val sourceFiles: Set, val payloadSize: Long, val linesScanned: Long, - val language: CodewhispererLanguage + val language: CodewhispererLanguage, ) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt index e2508153b2..642be79950 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererClientAdaptor.kt @@ -71,22 +71,22 @@ interface CodeWhispererClientAdaptor : Disposable { ): Sequence fun createUploadUrl( - request: CreateUploadUrlRequest + request: CreateUploadUrlRequest, ): CreateUploadUrlResponse fun createCodeScan( request: CreateCodeScanRequest, - isSigv4: Boolean = shouldUseSigv4Client(project) + isSigv4: Boolean = shouldUseSigv4Client(project), ): CreateCodeScanResponse fun getCodeScan( request: GetCodeScanRequest, - isSigv4: Boolean = shouldUseSigv4Client(project) + isSigv4: Boolean = shouldUseSigv4Client(project), ): GetCodeScanResponse fun listCodeScanFindings( request: ListCodeScanFindingsRequest, - isSigv4: Boolean = shouldUseSigv4Client(project) + isSigv4: Boolean = shouldUseSigv4Client(project), ): ListCodeScanFindingsResponse fun listAvailableCustomizations(): List @@ -98,7 +98,7 @@ interface CodeWhispererClientAdaptor : Disposable { suggestionState: CodewhispererSuggestionState, suggestionReferenceCount: Int, lineCount: Int, - numberOfRecommendations: Int + numberOfRecommendations: Int, ): SendTelemetryEventResponse fun sendCodePercentageTelemetry( @@ -106,7 +106,7 @@ interface CodeWhispererClientAdaptor : Disposable { customizationArn: String?, acceptedTokenCount: Int, totalTokenCount: Int, - unmodifiedAcceptedTokenCount: Int? + unmodifiedAcceptedTokenCount: Int?, ): SendTelemetryEventResponse fun sendUserModificationTelemetry( @@ -114,13 +114,13 @@ interface CodeWhispererClientAdaptor : Disposable { requestId: String, language: CodeWhispererProgrammingLanguage, customizationArn: String, - modificationPercentage: Double + modificationPercentage: Double, ): SendTelemetryEventResponse fun sendCodeScanTelemetry( language: CodeWhispererProgrammingLanguage, codeScanJobId: String?, - scope: CodeWhispererConstants.CodeAnalysisScope + scope: CodeWhispererConstants.CodeAnalysisScope, ): SendTelemetryEventResponse fun sendCodeScanRemediationTelemetry( @@ -132,7 +132,7 @@ interface CodeWhispererClientAdaptor : Disposable { component: String?, reason: String?, result: String?, - includesFix: Boolean? + includesFix: Boolean?, ): SendTelemetryEventResponse fun listFeatureEvaluations(): ListFeatureEvaluationsResponse @@ -152,7 +152,7 @@ interface CodeWhispererClientAdaptor : Disposable { responseLength: Int?, numberOfCodeBlocks: Int?, hasProjectLevelContext: Boolean?, - customization: CodeWhispererCustomization? + customization: CodeWhispererCustomization?, ): SendTelemetryEventResponse fun sendChatInteractWithMessageTelemetry( @@ -173,7 +173,7 @@ interface CodeWhispererClientAdaptor : Disposable { language: CodeWhispererProgrammingLanguage, modificationPercentage: Double, hasProjectLevelContext: Boolean?, - customization: CodeWhispererCustomization? + customization: CodeWhispererCustomization?, ): SendTelemetryEventResponse companion object { @@ -299,7 +299,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW suggestionState: CodewhispererSuggestionState, suggestionReferenceCount: Int, lineCount: Int, - numberOfRecommendations: Int + numberOfRecommendations: Int, ): SendTelemetryEventResponse { val fileContext = requestContext.fileContextInfo val programmingLanguage = fileContext.programmingLanguage @@ -339,7 +339,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW customizationArn: String?, acceptedTokenCount: Int, totalTokenCount: Int, - unmodifiedAcceptedTokenCount: Int? + unmodifiedAcceptedTokenCount: Int?, ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder -> requestBuilder.telemetryEvent { telemetryEventBuilder -> telemetryEventBuilder.codeCoverageEvent { @@ -360,7 +360,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW requestId: String, language: CodeWhispererProgrammingLanguage, customizationArn: String, - modificationPercentage: Double + modificationPercentage: Double, ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder -> requestBuilder.telemetryEvent { telemetryEventBuilder -> telemetryEventBuilder.userModificationEvent { @@ -381,7 +381,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW override fun sendCodeScanTelemetry( language: CodeWhispererProgrammingLanguage, codeScanJobId: String?, - scope: CodeWhispererConstants.CodeAnalysisScope + scope: CodeWhispererConstants.CodeAnalysisScope, ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder -> requestBuilder.telemetryEvent { telemetryEventBuilder -> telemetryEventBuilder.codeScanEvent { @@ -405,7 +405,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW component: String?, reason: String?, result: String?, - includesFix: Boolean? + includesFix: Boolean?, ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder -> requestBuilder.telemetryEvent { telemetryEventBuilder -> telemetryEventBuilder.codeScanRemediationsEvent { @@ -459,7 +459,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW responseLength: Int?, numberOfCodeBlocks: Int?, hasProjectLevelContext: Boolean?, - customization: CodeWhispererCustomization? + customization: CodeWhispererCustomization?, ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder -> requestBuilder.telemetryEvent { telemetryEventBuilder -> telemetryEventBuilder.chatAddMessageEvent { @@ -492,7 +492,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW interactionTarget: String?, acceptedCharacterCount: Int?, acceptedSnippetHasReference: Boolean?, - hasProjectLevelContext: Boolean? + hasProjectLevelContext: Boolean?, ): SendTelemetryEventResponse = sendChatInteractWithMessageTelemetry( ChatInteractWithMessageEvent.builder().apply { conversationId(sessionId) @@ -520,7 +520,7 @@ open class CodeWhispererClientAdaptorImpl(override val project: Project) : CodeW language: CodeWhispererProgrammingLanguage, modificationPercentage: Double, hasProjectLevelContext: Boolean?, - customization: CodeWhispererCustomization? + customization: CodeWhispererCustomization?, ): SendTelemetryEventResponse = bearerClient().sendTelemetryEvent { requestBuilder -> requestBuilder.telemetryEvent { telemetryEventBuilder -> telemetryEventBuilder.chatUserModificationEvent { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererLoginType.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererLoginType.kt index 1f384ad0be..29e5fe7ee0 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererLoginType.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/credentials/CodeWhispererLoginType.kt @@ -8,5 +8,5 @@ enum class CodeWhispererLoginType(val displayName: String) { Sono("Builder ID"), Accountless("Access Code"), Logout("Logout"), - Expired("Expired") + Expired("Expired"), } diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt index efa52c081e..a05ed37b92 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererCustomizationDialog.kt @@ -65,7 +65,7 @@ private fun notifyCustomizationIsSelected(project: Project, customizationUiItem: */ class CodeWhispererCustomizationDialog( private val project: Project, - private val myCustomizations: List? = null + private val myCustomizations: List? = null, ) : DialogWrapper(project), Disposable { private data class Modal( var selectedOption: RadioButtonOption, @@ -74,7 +74,7 @@ class CodeWhispererCustomizationDialog( enum class RadioButtonOption { Default, - Customization + Customization, } private var modal: Modal @@ -248,7 +248,7 @@ private object CustomizationRenderer : ColoredListCellRenderer> { val result = mutableListOf>() val bracketsStack = Stack() @@ -195,7 +195,7 @@ class CodeWhispererEditorManager { editor: Editor, recommendationLines: List, isTruncatedOnRight: Boolean, - sessionContext: SessionContext + sessionContext: SessionContext, ): Int { val caretOffset = editor.caretModel.offset if (isTruncatedOnRight) { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/CodeWhispererExplorerActionManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/CodeWhispererExplorerActionManager.kt index 5590469cf5..32c396d514 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/CodeWhispererExplorerActionManager.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/explorer/CodeWhispererExplorerActionManager.kt @@ -38,7 +38,7 @@ enum class CodeWhispererExploreStateType { DoNotShowAgainWarn, DoNotShowAgainError, AccountlessNullified, - ConnectionExpiredDoNotShowAgain + ConnectionExpiredDoNotShowAgain, } interface CodeWhispererActivationChangedListener { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/classresolver/CodeWhispererClassResolver.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/classresolver/CodeWhispererClassResolver.kt index ac867a13b0..dc5454907b 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/classresolver/CodeWhispererClassResolver.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/classresolver/CodeWhispererClassResolver.kt @@ -22,5 +22,5 @@ interface CodeWhispererClassResolver { enum class ClassResolverKey { ClassName, - MethodName + MethodName, } diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt index 0c3fa69955..09c0d8ea0b 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt @@ -29,12 +29,12 @@ data class Chunk( val content: String, val path: String, val nextChunk: String = "", - val score: Double = 0.0 + val score: Double = 0.0, ) data class ListUtgCandidateResult( val vfile: VirtualFile?, - val strategy: UtgStrategy + val strategy: UtgStrategy, ) data class CaretContext(val leftFileContext: String, val rightFileContext: String, val leftContextOnCurrentLine: String = "") @@ -42,7 +42,7 @@ data class CaretContext(val leftFileContext: String, val rightFileContext: Strin data class FileContextInfo( val caretContext: CaretContext, val filename: String, - val programmingLanguage: CodeWhispererProgrammingLanguage + val programmingLanguage: CodeWhispererProgrammingLanguage, ) data class SupplementalContextInfo( @@ -83,7 +83,7 @@ data class RecommendationContext( val details: List, val userInputOriginal: String, val userInputSinceInvocation: String, - val position: VisualPosition + val position: VisualPosition, ) data class DetailContext( @@ -103,13 +103,13 @@ data class SessionContext( val seen: MutableSet = mutableSetOf(), val isFirstTimeShowingPopup: Boolean = true, var toBeRemovedHighlighter: RangeHighlighter? = null, - var insertEndOffset: Int = -1 + var insertEndOffset: Int = -1, ) data class RecommendationChunk( val text: String, val offset: Int, - val inlayOffset: Int + val inlayOffset: Int, ) data class CaretPosition(val offset: Int, val line: Int) @@ -123,7 +123,7 @@ data class InvocationContext( val requestContext: RequestContext, val responseContext: ResponseContext, val recommendationContext: RecommendationContext, - val popup: JBPopup + val popup: JBPopup, ) : Disposable { override fun dispose() {} } @@ -132,7 +132,7 @@ data class WorkerContext( val requestContext: RequestContext, val responseContext: ResponseContext, val response: GenerateCompletionsResponse, - val popup: JBPopup + val popup: JBPopup, ) data class CodeScanTelemetryEvent( @@ -141,12 +141,12 @@ data class CodeScanTelemetryEvent( val result: Result, val totalProjectSizeInBytes: Double?, val connection: ToolkitConnection?, - val codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope + val codeAnalysisScope: CodeWhispererConstants.CodeAnalysisScope, ) data class CodeScanServiceInvocationContext( val artifactsUploadDuration: Long, - val serviceInvocationDuration: Long + val serviceInvocationDuration: Long, ) data class CodeScanResponseContext( @@ -155,7 +155,7 @@ data class CodeScanResponseContext( val codeScanJobId: String? = null, val codeScanTotalIssues: Int = 0, val codeScanIssuesWithFixes: Int = 0, - val reason: String? = null + val reason: String? = null, ) data class LatencyContext( @@ -176,7 +176,7 @@ data class LatencyContext( var paginationAllCompletionsStart: Long = 0L, var paginationAllCompletionsEnd: Long = 0L, - var firstRequestId: String = "" + var firstRequestId: String = "", ) { fun getCodeWhispererEndToEndLatency() = TimeUnit.NANOSECONDS.toMillis( codewhispererEndToEndEnd - codewhispererEndToEndStart @@ -201,5 +201,5 @@ data class LatencyContext( data class TryExampleRowContext( val description: String, - val filename: String? + val filename: String?, ) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt index c5ad37e527..c548dff1d4 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/CodeWhispererPopupManager.kt @@ -120,7 +120,7 @@ class CodeWhispererPopupManager { indexChange: Int, typeaheadChange: String, typeaheadAdded: Boolean, - recommendationAdded: Boolean = false + recommendationAdded: Boolean = false, ) { val (_, _, recommendationContext, popup) = states val (details) = recommendationContext @@ -216,7 +216,7 @@ class CodeWhispererPopupManager { sessionContext: SessionContext, overlappingLinesCount: Int, isRecommendationAdded: Boolean, - isScrolling: Boolean + isScrolling: Boolean, ) { updatePopupPanel(states, sessionContext) @@ -283,7 +283,7 @@ class CodeWhispererPopupManager { sessionContext: SessionContext, popup: JBPopup, p: Point, - overlappingLinesCount: Int + overlappingLinesCount: Int, ) { val editor = states.requestContext.editor val detailContexts = states.recommendationContext.details @@ -627,7 +627,7 @@ class CodeWhispererPopupManager { detailContexts: List, userInput: String, start: Int, - typeahead: String + typeahead: String, ): Int { val count = detailContexts.size val unit = if (isReverse) -1 else 1 @@ -651,7 +651,7 @@ class CodeWhispererPopupManager { detailContexts: List, userInput: String, selectedIndex: Int, - typeahead: String + typeahead: String, ): Int { var currIndexIgnoreInvalid = 0 detailContexts.forEachIndexed { index, value -> diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupBackspaceHandler.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupBackspaceHandler.kt index 8f32eceac3..ec2b656c6f 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupBackspaceHandler.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupBackspaceHandler.kt @@ -13,7 +13,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispere class CodeWhispererPopupBackspaceHandler( private val defaultHandler: EditorActionHandler, - states: InvocationContext + states: InvocationContext, ) : CodeWhispererEditorActionHandler(states) { override fun doExecute(editor: Editor, caret: Caret?, dataContext: DataContext?) { val popupManager = CodeWhispererPopupManager.getInstance() diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupEnterHandler.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupEnterHandler.kt index 1c71f0675d..25dc0a7c6b 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupEnterHandler.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/handlers/CodeWhispererPopupEnterHandler.kt @@ -14,7 +14,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.popup.CodeWhispere class CodeWhispererPopupEnterHandler( private val defaultHandler: EditorActionHandler, - states: InvocationContext + states: InvocationContext, ) : CodeWhispererEditorActionHandler(states) { override fun doExecute(editor: Editor, caret: Caret?, dataContext: DataContext?) { val popupManager = CodeWhispererPopupManager.getInstance() diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutoTriggerService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutoTriggerService.kt index 68c578d092..47c35c851d 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutoTriggerService.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutoTriggerService.kt @@ -139,7 +139,7 @@ class CodeWhispererAutoTriggerService : CodeWhispererAutoTriggerHandler, Disposa fun shouldTriggerClassifier( editor: Editor, - automatedTriggerType: CodewhispererAutomatedTriggerType = CodewhispererAutomatedTriggerType.Classifier // TODO: need this? + automatedTriggerType: CodewhispererAutomatedTriggerType = CodewhispererAutomatedTriggerType.Classifier, // TODO: need this? ): ClassifierResult { val caretContext = runReadAction { CodeWhispererEditorUtil.extractCaretContext(editor) } val language = runReadAction { @@ -305,7 +305,7 @@ private enum class VariableTypeNeedNormalize { }, LineDiff { override fun normalize(value: Double): Double = 0.0 - }; + }, ; abstract fun normalize(toDouble: Double): Double diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutomatedTriggerType.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutomatedTriggerType.kt index e083689b7e..ff0c25fe2c 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutomatedTriggerType.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererAutomatedTriggerType.kt @@ -7,7 +7,7 @@ import software.aws.toolkits.telemetry.CodewhispererAutomatedTriggerType sealed class CodeWhispererAutomatedTriggerType( val telemetryType: CodewhispererAutomatedTriggerType, - var calculationResult: Double? = null + var calculationResult: Double? = null, ) { class Classifier : CodeWhispererAutomatedTriggerType(CodewhispererAutomatedTriggerType.Classifier) class SpecialChar(val specialChar: Char) : diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererFeatureConfigService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererFeatureConfigService.kt index af0bc46e36..e35f91f185 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererFeatureConfigService.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererFeatureConfigService.kt @@ -114,5 +114,5 @@ class CodeWhispererFeatureConfigService { data class FeatureContext( val name: String, val variation: String, - val value: FeatureValue + val value: FeatureValue, ) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererRecommendationManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererRecommendationManager.kt index 3f6305c1f7..2099b96399 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererRecommendationManager.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererRecommendationManager.kt @@ -50,7 +50,7 @@ class CodeWhispererRecommendationManager { fun buildRecommendationChunks( recommendation: String, - matchingSymbols: List> + matchingSymbols: List>, ): List = matchingSymbols .dropLast(1) .mapIndexed { index, (offset, inlayOffset) -> @@ -131,7 +131,7 @@ class CodeWhispererRecommendationManager { fun findRightContextOverlap( requestContext: RequestContext, - recommendation: Completion + recommendation: Completion, ): String { val document = requestContext.editor.document val caret = requestContext.editor.caretModel.primaryCaret diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt index 8962abc1cb..1ccdb50dc5 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt @@ -102,7 +102,7 @@ class CodeWhispererService : Disposable { fun showRecommendationsInPopup( editor: Editor, triggerTypeInfo: TriggerTypeInfo, - latencyContext: LatencyContext + latencyContext: LatencyContext, ) { val project = editor.project ?: return if (!isCodeWhispererEnabled(project)) return @@ -506,7 +506,7 @@ class CodeWhispererService : Disposable { responseContext: ResponseContext, response: GenerateCompletionsResponse, caretMovement: CaretMovement, - popup: JBPopup + popup: JBPopup, ): InvocationContext? { val requestId = response.responseMetadata().requestId() val recommendations = response.completions() @@ -551,7 +551,7 @@ class CodeWhispererService : Disposable { private fun updateStates( states: InvocationContext, - response: GenerateCompletionsResponse + response: GenerateCompletionsResponse, ): InvocationContext { val recommendationContext = states.recommendationContext val details = recommendationContext.details @@ -593,7 +593,7 @@ class CodeWhispererService : Disposable { private fun sendDiscardedUserDecisionEventForAll( requestContext: RequestContext, responseContext: ResponseContext, - recommendations: List + recommendations: List, ) { val detailContexts = recommendations.map { DetailContext("", it, it, true, false, "", getCompletionType(it)) @@ -614,7 +614,7 @@ class CodeWhispererService : Disposable { editor: Editor, project: Project, psiFile: PsiFile, - latencyContext: LatencyContext + latencyContext: LatencyContext, ): RequestContext { // 1. file context val fileContext: FileContextInfo = runReadAction { FileContextProvider.getInstance(project).extractFileContext(editor, psiFile) } @@ -682,7 +682,7 @@ class CodeWhispererService : Disposable { requestContext: RequestContext, responseContext: ResponseContext, recommendationContext: RecommendationContext, - popup: JBPopup + popup: JBPopup, ): InvocationContext { addPopupChildDisposables(popup) // Creating a disposable for managing all listeners lifecycle attached to the popup. @@ -710,7 +710,7 @@ class CodeWhispererService : Disposable { responseContext: ResponseContext, recommendations: List, latency: Double?, - exceptionType: String? + exceptionType: String?, ) { val recommendationLogs = recommendations.map { it.content().trimEnd() } .reduceIndexedOrNull { index, acc, recommendation -> "$acc\n[${index + 1}]\n$recommendation" } @@ -785,7 +785,7 @@ class CodeWhispererService : Disposable { fun buildCodeWhispererRequest( fileContextInfo: FileContextInfo, supplementalContext: SupplementalContextInfo?, - customizationArn: String? + customizationArn: String?, ): GenerateCompletionsRequest { val programmingLanguage = ProgrammingLanguage.builder() .languageName(fileContextInfo.programmingLanguage.toCodeWhispererRuntimeLanguage().languageId) @@ -828,7 +828,7 @@ data class RequestContext( val supplementalContext: SupplementalContextInfo?, val connection: ToolkitConnection?, val latencyContext: LatencyContext, - val customizationArn: String? + val customizationArn: String?, ) data class ResponseContext( diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererUserGroupSettings.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererUserGroupSettings.kt index 2dc1bfa69e..74e24d9d4e 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererUserGroupSettings.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererUserGroupSettings.kt @@ -121,7 +121,7 @@ class CodeWhispererUserGroupSettings : PersistentStateComponent = emptyMap() + var settings: Map = emptyMap(), ) interface CodeWhispererGroup @@ -135,5 +135,5 @@ enum class CodeWhispererUserGroup : CodeWhispererGroup { enum class CodeWhispererExpThresholdGroup : CodeWhispererGroup { Control, - Exp + Exp, } diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererCodeCoverageTracker.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererCodeCoverageTracker.kt index 60329e462f..813434ec5c 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererCodeCoverageTracker.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererCodeCoverageTracker.kt @@ -47,7 +47,7 @@ abstract class CodeWhispererCodeCoverageTracker( private val language: CodeWhispererProgrammingLanguage, private val rangeMarkers: MutableList, private val fileToTokens: MutableMap, - private val myServiceInvocationCount: AtomicInteger + private val myServiceInvocationCount: AtomicInteger, ) : Disposable { val percentage: Int? get() = if (totalTokensSize != 0) calculatePercentage(acceptedTokensSize, totalTokensSize) else null diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt index 29c0902052..baa5f37ebf 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt @@ -98,7 +98,7 @@ class CodeWhispererTelemetryService { lastRecommendationIndex: Int, invocationSuccess: Boolean, latency: Double, - exceptionType: String? + exceptionType: String?, ) { val (triggerType, automatedTriggerType) = requestContext.triggerTypeInfo val (offset, line) = requestContext.caretPosition @@ -150,7 +150,7 @@ class CodeWhispererTelemetryService { detailContext: DetailContext, index: Int, suggestionState: CodewhispererSuggestionState, - numOfRecommendations: Int + numOfRecommendations: Int, ) { val requestId = detailContext.requestId val recommendation = detailContext.recommendation @@ -197,7 +197,7 @@ class CodeWhispererTelemetryService { popupShownTime: Duration?, suggestionReferenceCount: Int, generatedLineCount: Int, - acceptedCharCount: Int + acceptedCharCount: Int, ) { val project = requestContext.project val totalImportCount = recommendationContext.details.fold(0) { grandTotal, detail -> @@ -367,7 +367,7 @@ class CodeWhispererTelemetryService { range: RangeMarker, suggestion: String, selectedIndex: Int, - completionType: CodewhispererCompletionType + completionType: CodewhispererCompletionType, ) { val codewhispererLanguage = requestContext.fileContextInfo.programmingLanguage CodeWhispererUserModificationTracker.getInstance(requestContext.project).enqueue( @@ -395,7 +395,7 @@ class CodeWhispererTelemetryService { recommendationContext: RecommendationContext, sessionContext: SessionContext, hasUserAccepted: Boolean, - popupShownTime: Duration? = null + popupShownTime: Duration? = null, ) { val detailContexts = recommendationContext.details val decisions = mutableListOf() @@ -533,7 +533,7 @@ class CodeWhispererTelemetryService { hasSeen: Boolean, hasUserAccepted: Boolean, isDiscarded: Boolean, - isEmpty: Boolean + isEmpty: Boolean, ): CodewhispererSuggestionState = if (isEmpty) { CodewhispererSuggestionState.Empty diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt index 49a0bbdf66..19dcd14123 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt @@ -54,7 +54,7 @@ data class AcceptedSuggestionEntry( val codewhispererLanguage: CodeWhispererProgrammingLanguage, val codewhispererRuntime: CodewhispererRuntime?, val codewhispererRuntimeSource: String?, - val connection: ToolkitConnection? + val connection: ToolkitConnection?, ) : UserModificationTrackingEntry @Service(Service.Level.PROJECT) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceManager.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceManager.kt index f1ffacc8d2..7bb8dd1643 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceManager.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/toolwindow/CodeWhispererCodeReferenceManager.kt @@ -240,7 +240,7 @@ class CodeWhispererCodeReferenceManager(private val project: Project) { private fun isHighlighterRangeMatchCodeContent( editor: Editor, highlighter: RangeHighlighterEx, - codeContent: String + codeContent: String, ): Boolean = highlighter.isValid && highlighter.endOffset <= editor.document.textLength && editor.document.getText(TextRange.create(highlighter.startOffset, highlighter.endOffset)) == codeContent @@ -255,10 +255,10 @@ data class CodeReferenceHighLightContext( val editor: Editor, val highlighter: RangeHighlighterEx, val codeContent: String, - val referenceContent: String + val referenceContent: String, ) data class CodeReferenceHighLightPopupContext( val context: CodeReferenceHighLightContext, - val popup: JBPopup + val popup: JBPopup, ) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/BM25.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/BM25.kt index ee2572b4b8..8cdacdbbb6 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/BM25.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/BM25.kt @@ -31,7 +31,7 @@ private fun String.tokenize(): List = this.split(" ").map { str -> data class BM25Result( val docString: String, - val score: Double + val score: Double, ) : Comparable { override fun compareTo(other: BM25Result): Int = compareValuesBy(other, this) { it.score } } diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeInsightsSettingsFacade.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeInsightsSettingsFacade.kt index 4ad49a02d3..23a213de2b 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeInsightsSettingsFacade.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeInsightsSettingsFacade.kt @@ -16,7 +16,7 @@ class CodeInsightsSettingsFacade : SimpleModificationTracker(), Disposable { private inner class ChangeAndRevert( val p: KMutableProperty, val value: T, - parentDisposable: Disposable + parentDisposable: Disposable, ) { val origin: T = p.getter.call() var isComplete: Boolean = false diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt index 90027de176..4b1c8093fd 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererConstants.kt @@ -102,7 +102,7 @@ object CodeWhispererConstants { enum class CodeAnalysisScope(val value: String) { FILE("FILE"), - PROJECT("PROJECT") + PROJECT("PROJECT"), } object Config { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererEndpointCustomizer.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererEndpointCustomizer.kt index e278fbe2f6..30e771f895 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererEndpointCustomizer.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererEndpointCustomizer.kt @@ -41,7 +41,7 @@ class CodeWhispererEndpointCustomizer : ToolkitClientCustomizer { tokenProvider: SdkTokenProvider?, regionId: String, builder: AwsClientBuilder<*, *>, - clientOverrideConfiguration: ClientOverrideConfiguration.Builder + clientOverrideConfiguration: ClientOverrideConfiguration.Builder, ) { if (builder is CodeWhispererRuntimeClientBuilder || builder is CodeWhispererStreamingAsyncClientBuilder) { val endpoint = URI.create(CodeWhispererConstants.Config.CODEWHISPERER_ENDPOINT) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererFileContextProvider.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererFileContextProvider.kt index 27911fccfd..a11fec6d0f 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererFileContextProvider.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererFileContextProvider.kt @@ -310,7 +310,8 @@ class DefaultCodeWhispererFileContextProvider(private val project: Project) : Fi is CodeWhispererJavaScript, is CodeWhispererTypeScript, is CodeWhispererJsx, - is CodeWhispererTsx -> true + is CodeWhispererTsx, + -> true else -> userGroup == CodeWhispererUserGroup.CrossFile } diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererMetadata.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererMetadata.kt index b8d42d85d0..170e7cbcfe 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererMetadata.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererMetadata.kt @@ -4,5 +4,5 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.util data class CodeWhispererMetadata( - var insertEnd: Int = -1 + var insertEnd: Int = -1, ) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt index 0ee1a6bccf..1a168f0c3b 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt @@ -273,7 +273,7 @@ object CodeWhispererUtil { fun debounce( waitMs: Long = 300L, coroutineScope: CoroutineScope, - destinationFunction: (T) -> Unit + destinationFunction: (T) -> Unit, ): (T) -> Unit { var debounceJob: Job? = null return { param: T -> diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/SupplementalContextStrategy.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/SupplementalContextStrategy.kt index c7ee9de79b..d3982a9d77 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/SupplementalContextStrategy.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/SupplementalContextStrategy.kt @@ -8,7 +8,8 @@ interface SupplementalContextStrategy enum class UtgStrategy : SupplementalContextStrategy { ByName, ByContent, - Empty; + Empty, + ; override fun toString() = when (this) { ByName -> "ByName" @@ -19,7 +20,8 @@ enum class UtgStrategy : SupplementalContextStrategy { enum class CrossFileStrategy : SupplementalContextStrategy { OpenTabsBM25, - Empty; + Empty, + ; override fun toString() = when (this) { OpenTabsBM25 -> "OpenTabs_BM25" diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererAcceptTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererAcceptTest.kt index 4026c090a7..ad4968d2eb 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererAcceptTest.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererAcceptTest.kt @@ -153,7 +153,7 @@ class CodeWhispererAcceptTest : CodeWhispererTestBase() { typing: String, brackets: String, remaining: String = "", - useKeyboard: Boolean = false + useKeyboard: Boolean = false, ) { projectRule.fixture.configureByText(javaFileName, buildContextWithRecommendation(brackets + remaining)) runInEdtAndWait { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererCodeCoverageTrackerTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererCodeCoverageTrackerTest.kt index 9b8d2d266a..505151b126 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererCodeCoverageTrackerTest.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererCodeCoverageTrackerTest.kt @@ -85,7 +85,7 @@ internal abstract class CodeWhispererCodeCoverageTrackerTestBase(myProjectRule: protected class TestTelemetryService( publisher: TelemetryPublisher = NoOpPublisher(), - batcher: TelemetryBatcher + batcher: TelemetryBatcher, ) : TelemetryService(publisher, batcher) @Rule diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererExplorerActionManagerTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererExplorerActionManagerTest.kt index ad1a5cda9b..e73f8191a4 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererExplorerActionManagerTest.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererExplorerActionManagerTest.kt @@ -180,7 +180,7 @@ class CodeWhispererExplorerActionManagerTest { expectedState: BearerTokenAuthState, expectedLoginType: CodeWhispererLoginType, expectedIsCwEnabled: Boolean, - expectedIsCwExpired: Boolean + expectedIsCwExpired: Boolean, ) { testDiskCache.saveAccessToken( DeviceGrantAccessTokenCacheKey( diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererLanguageManagerTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererLanguageManagerTest.kt index 27b4a783bc..26835c3181 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererLanguageManagerTest.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererLanguageManagerTest.kt @@ -105,7 +105,7 @@ class CodeWhispererLanguageManagerTest { private fun testGetProgrammingLanguageUtil( fileTypeNames: List, fileExtensions: List?, - expectedLanguage: Class + expectedLanguage: Class, ) { fileExtensions?.forEach { fileExtension -> fileTypeNames.forEach { fileTypeName -> diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryServiceTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryServiceTest.kt index 0371bb54b0..9e07e631f2 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryServiceTest.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryServiceTest.kt @@ -56,7 +56,7 @@ import kotlin.random.Random class CodeWhispererTelemetryServiceTest { private class NoOpToolkitTelemetryService( publisher: TelemetryPublisher = NoOpPublisher(), - batcher: TelemetryBatcher + batcher: TelemetryBatcher, ) : TelemetryService(publisher, batcher) @Rule @@ -362,7 +362,7 @@ class CodeWhispererTelemetryServiceTest { fun helper( decisions: List, expectedState: CodewhispererSuggestionState, - expectedPreviousSuggestionState: CodewhispererPreviousSuggestionState? + expectedPreviousSuggestionState: CodewhispererPreviousSuggestionState?, ) { val supplementalContextInfo = aSupplementalContextInfo() val requestContext = aRequestContext(projectRule.project, mySupplementalContextInfo = supplementalContextInfo) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryTest.kt index 671a6a90fd..c1ced5bb0b 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryTest.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTelemetryTest.kt @@ -85,7 +85,7 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() { private class TestTelemetryService( publisher: TelemetryPublisher = NoOpPublisher(), - batcher: TelemetryBatcher + batcher: TelemetryBatcher, ) : TelemetryService(publisher, batcher) private lateinit var telemetryService: TelemetryService @@ -852,7 +852,7 @@ class CodeWhispererTelemetryTest : CodeWhispererTestBase() { name: String, count: Int, vararg keyValues: Pair, - atLeast: Boolean = false + atLeast: Boolean = false, ) { assertThat(events).filteredOn { event -> event.data.any { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestUtil.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestUtil.kt index ed24f0c6ce..27aff4df63 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestUtil.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestUtil.kt @@ -188,7 +188,7 @@ object CodeWhispererTestUtil { licenseName: String, repository: String, start: Int, - end: Int + end: Int, ): Completion = Completion.builder() .content(content) @@ -211,7 +211,7 @@ object CodeWhispererTestUtil { fun aRequestContext( project: Project, myFileContextInfo: FileContextInfo? = null, - mySupplementalContextInfo: SupplementalContextInfo? = null + mySupplementalContextInfo: SupplementalContextInfo? = null, ): RequestContext { val triggerType = aTriggerType() val automatedTriggerType = if (triggerType == CodewhispererTriggerType.AutoTrigger) { diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTypeaheadTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTypeaheadTest.kt index 06db93b345..87aa376692 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTypeaheadTest.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTypeaheadTest.kt @@ -49,7 +49,7 @@ class CodeWhispererTypeaheadTest : CodeWhispererTestBase() { private fun testTypingTypeaheadWithLeadingSpaceShouldMatchTypeaheadStateCorrectly( expectedTypeaheadOriginal: String, expectedNumOfValidRecommendation: Int, - expectedSelectedAfterBackspace: Int + expectedSelectedAfterBackspace: Int, ) { withCodeWhispererServiceInvokedAndWait { states -> val editor = projectRule.fixture.editor diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTestBase.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTestBase.kt index 333a24c16e..798ca59d29 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTestBase.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanTestBase.kt @@ -115,7 +115,7 @@ open class CodeWhispererCodeScanTestBase(projectRule: CodeInsightTestFixtureRule filePath: Path, startLine: Int, endLine: Int, - codeSnippets: List> + codeSnippets: List>, ): String { val codeSnippetJson = codeSnippets.joinToString(",\n") { (number, content) -> """ @@ -313,7 +313,7 @@ open class CodeWhispererCodeScanTestBase(projectRule: CodeInsightTestFixtureRule includedSourceFilesSize: Long, totalSize: Long, expectedTotalLines: Long, - payloadLanguage: CodewhispererLanguage + payloadLanguage: CodewhispererLanguage, ) { val payloadMetadata = sessionConfigSpy.getProjectPayloadMetadata() assertNotNull(payloadMetadata) @@ -333,7 +333,7 @@ open class CodeWhispererCodeScanTestBase(projectRule: CodeInsightTestFixtureRule expectedTotalLines: Long, expectedTotalFiles: Int, expectedTotalSize: Long, - expectedTotalIssues: Int + expectedTotalIssues: Int, ) { val codeScanContext = CodeScanSessionContext(project, sessionConfigSpy, CodeWhispererConstants.CodeAnalysisScope.PROJECT) val sessionMock = spy(CodeWhispererCodeScanSession(codeScanContext)) diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/services/codewhisperer/importadder/CodeWhispererImportAdderTestBase.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/services/codewhisperer/importadder/CodeWhispererImportAdderTestBase.kt index 7b9c598e43..b978590865 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/services/codewhisperer/importadder/CodeWhispererImportAdderTestBase.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/services/codewhisperer/importadder/CodeWhispererImportAdderTestBase.kt @@ -18,13 +18,13 @@ import kotlin.test.fail open class CodeWhispererImportAdderTestBase( val importAdder: CodeWhispererImportAdder, @Rule @JvmField val projectRule: CodeInsightTestFixtureRule, - internal val fileExtension: String + internal val fileExtension: String, ) { fun testCreateNewImportPsiElementReturnValueForStatements( returnNull: Boolean, statements: List, - classType: Class + classType: Class, ) { val psiFile = projectRule.fixture.configureByText("test.$fileExtension", "") for (statement in statements) { diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/clients/AmazonQStreamingClient.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/clients/AmazonQStreamingClient.kt index 55b29f202d..07967cc89f 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/clients/AmazonQStreamingClient.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/clients/AmazonQStreamingClient.kt @@ -47,7 +47,7 @@ class AmazonQStreamingClient(private val project: Project) { * * @param startTime exception thrown by the streaming client. */ - onStreamingFinished: (startTime: Instant) -> Unit + onStreamingFinished: (startTime: Instant) -> Unit, ): MutableList { val startTime = Instant.now() val byteBufferList = mutableListOf() diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/InsertedCodeModificationEntry.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/InsertedCodeModificationEntry.kt index e3fb0fae8a..3b67533946 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/InsertedCodeModificationEntry.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/telemetry/InsertedCodeModificationEntry.kt @@ -14,5 +14,5 @@ data class InsertedCodeModificationEntry( override val time: Instant, val vFile: VirtualFile?, val range: RangeMarker, - val originalString: String + val originalString: String, ) : UserModificationTrackingEntry diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/MeetQSettings.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/MeetQSettings.kt index 7537fb0c57..e23dda3070 100644 --- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/MeetQSettings.kt +++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/MeetQSettings.kt @@ -31,5 +31,5 @@ class MeetQSettings : PersistentStateComponent { } } data class MeetQSettingsConfiguration( - var shouldDisplayPage: Boolean = true + var shouldDisplayPage: Boolean = true, ) diff --git a/plugins/core/core/src/migration/software/aws/toolkits/core/ToolkitClientManager.kt b/plugins/core/core/src/migration/software/aws/toolkits/core/ToolkitClientManager.kt index 265107422b..0f722e8290 100644 --- a/plugins/core/core/src/migration/software/aws/toolkits/core/ToolkitClientManager.kt +++ b/plugins/core/core/src/migration/software/aws/toolkits/core/ToolkitClientManager.kt @@ -49,7 +49,7 @@ abstract class ToolkitClientManager { data class AwsClientKey( val providerId: String, val region: AwsRegion, - val serviceClass: KClass + val serviceClass: KClass, ) private val cachedClients = ConcurrentHashMap() @@ -104,7 +104,7 @@ abstract class ToolkitClientManager { credProvider: AwsCredentialsProvider, region: Region, endpointOverride: String? = null, - clientCustomizer: ToolkitClientCustomizer? = null + clientCustomizer: ToolkitClientCustomizer? = null, ): T = createUnmanagedClient(T::class, credProvider, region, endpointOverride, clientCustomizer) /** @@ -115,7 +115,7 @@ abstract class ToolkitClientManager { credProvider: AwsCredentialsProvider, region: Region, endpointOverride: String?, - clientCustomizer: ToolkitClientCustomizer? = null + clientCustomizer: ToolkitClientCustomizer? = null, ): T = constructAwsClient(sdkClass, credProvider = credProvider, region = region, endpointOverride = endpointOverride, clientCustomizer = clientCustomizer) protected abstract fun getRegionProvider(): ToolkitRegionProvider @@ -128,7 +128,7 @@ abstract class ToolkitClientManager { tokenProvider: SdkTokenProvider?, regionId: String, builder: AwsClientBuilder<*, *>, - clientOverrideConfiguration: ClientOverrideConfiguration.Builder + clientOverrideConfiguration: ClientOverrideConfiguration.Builder, ) {} /** @@ -151,7 +151,7 @@ abstract class ToolkitClientManager { tokenProvider: SdkTokenProvider? = null, region: Region, endpointOverride: String? = null, - clientCustomizer: ToolkitClientCustomizer? = null + clientCustomizer: ToolkitClientCustomizer? = null, ): T { checkNotNull(credProvider ?: tokenProvider) { "Either a credential provider or a bearer token provider must be provided" } @@ -197,7 +197,7 @@ abstract class ToolkitClientManager { clientOverrideConfig.addExecutionInterceptor(object : ExecutionInterceptor { override fun modifyRequest( context: Context.ModifyRequest, - executionAttributes: ExecutionAttributes + executionAttributes: ExecutionAttributes, ): SdkRequest { val request = context.request() if (request !is AwsRequest) { diff --git a/plugins/core/core/src/migration/software/aws/toolkits/core/region/ToolkitRegionProvider.kt b/plugins/core/core/src/migration/software/aws/toolkits/core/region/ToolkitRegionProvider.kt index 4f43ff211e..e5fd1172c9 100644 --- a/plugins/core/core/src/migration/software/aws/toolkits/core/region/ToolkitRegionProvider.kt +++ b/plugins/core/core/src/migration/software/aws/toolkits/core/region/ToolkitRegionProvider.kt @@ -15,7 +15,7 @@ abstract class ToolkitRegionProvider { protected data class PartitionData( val description: String, val services: Map, - val regions: Map + val regions: Map, ) protected abstract fun partitionData(): Map diff --git a/plugins/core/core/src/software/aws/toolkits/core/ConnectionSettings.kt b/plugins/core/core/src/software/aws/toolkits/core/ConnectionSettings.kt index 9ae2272ff0..faa40d269b 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/ConnectionSettings.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/ConnectionSettings.kt @@ -27,7 +27,7 @@ data class ConnectionSettings(val credentials: ToolkitCredentialsProvider, overr data class TokenConnectionSettings( val tokenProvider: ToolkitBearerTokenProvider, - override val region: AwsRegion + override val region: AwsRegion, ) : ClientConnectionSettings { override val providerId: String get() = tokenProvider.id diff --git a/plugins/core/core/src/software/aws/toolkits/core/ToolkitClientCustomizer.kt b/plugins/core/core/src/software/aws/toolkits/core/ToolkitClientCustomizer.kt index cb2f2cffc0..ff9d3b39ba 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/ToolkitClientCustomizer.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/ToolkitClientCustomizer.kt @@ -29,6 +29,6 @@ fun interface ToolkitClientCustomizer { tokenProvider: SdkTokenProvider?, regionId: String, builder: AwsClientBuilder<*, *>, - clientOverrideConfiguration: ClientOverrideConfiguration.Builder + clientOverrideConfiguration: ClientOverrideConfiguration.Builder, ) } diff --git a/plugins/core/core/src/software/aws/toolkits/core/credentials/AwsCredentials.kt b/plugins/core/core/src/software/aws/toolkits/core/credentials/AwsCredentials.kt index 0bf0f45ff9..1bab34347d 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/credentials/AwsCredentials.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/credentials/AwsCredentials.kt @@ -33,7 +33,7 @@ fun AwsCredentials.mergeWithExistingEnvironmentVariables( existingKeys: Collection, removeKey: (String) -> Unit, putValues: (Map) -> Unit, - replace: Boolean = false + replace: Boolean = false, ) { val envVars = toEnvironmentVariables() if (replace || existingKeys.none { it in CREDENTIAL_ENVIRONMENT_VARIABLES }) { diff --git a/plugins/core/core/src/software/aws/toolkits/core/credentials/CredentialProviderFactory.kt b/plugins/core/core/src/software/aws/toolkits/core/credentials/CredentialProviderFactory.kt index 6d5ebe605b..a404a72772 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/credentials/CredentialProviderFactory.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/credentials/CredentialProviderFactory.kt @@ -32,6 +32,6 @@ interface CredentialProviderFactory { */ fun createAwsCredentialProvider( providerId: CredentialIdentifier, - region: AwsRegion + region: AwsRegion, ): AwsCredentialsProvider } diff --git a/plugins/core/core/src/software/aws/toolkits/core/credentials/CredentialsChangeEvent.kt b/plugins/core/core/src/software/aws/toolkits/core/credentials/CredentialsChangeEvent.kt index f2a2899a2e..d81dd0f7ae 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/credentials/CredentialsChangeEvent.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/credentials/CredentialsChangeEvent.kt @@ -14,7 +14,7 @@ data class CredentialsChangeEvent( val ssoAdded: List = emptyList(), val ssoModified: List = emptyList(), - val ssoRemoved: List = emptyList() + val ssoRemoved: List = emptyList(), ) typealias CredentialsChangeListener = (changeEvent: CredentialsChangeEvent) -> Unit diff --git a/plugins/core/core/src/software/aws/toolkits/core/credentials/ToolkitCredentialsProvider.kt b/plugins/core/core/src/software/aws/toolkits/core/credentials/ToolkitCredentialsProvider.kt index 693e0cd7d5..37dab7a9af 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/credentials/ToolkitCredentialsProvider.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/credentials/ToolkitCredentialsProvider.kt @@ -15,7 +15,7 @@ enum class CredentialType { AssumeMfaRoleProfile, SsoProfile, Ec2Metadata, - EcsMetadata + EcsMetadata, } enum class CredentialSourceId { @@ -23,7 +23,7 @@ enum class CredentialSourceId { SdkStore, Ecs, Ec2, - EnvVars + EnvVars, } /** @@ -100,7 +100,7 @@ interface ToolkitAuthenticationProvider { class ToolkitCredentialsProvider( val identifier: CredentialIdentifier, - val delegate: AwsCredentialsProvider + val delegate: AwsCredentialsProvider, ) : ToolkitAuthenticationProvider, AwsCredentialsProvider by delegate { override val id: String = identifier.id override val displayName = identifier.displayName diff --git a/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaArchitecture.kt b/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaArchitecture.kt index fb897aaa36..2faaba16f5 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaArchitecture.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaArchitecture.kt @@ -10,7 +10,8 @@ enum class LambdaArchitecture( val minSam: String? = null, ) { X86_64(Architecture.X86_64), - ARM64(Architecture.ARM64, minSam = "1.33.0"); + ARM64(Architecture.ARM64, minSam = "1.33.0"), + ; override fun toString() = architecture.toString() diff --git a/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt b/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt index 32af2b6f3d..66da37f6bd 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaRuntime.kt @@ -11,7 +11,7 @@ enum class LambdaRuntime( val minSamInit: String? = null, val minSamDebugging: String? = null, val architectures: List? = listOf(LambdaArchitecture.DEFAULT), - private val runtimeOverride: String? = null + private val runtimeOverride: String? = null, ) { GO1_X( Runtime.GO1_X, @@ -31,7 +31,8 @@ enum class LambdaRuntime( PYTHON3_10(Runtime.PYTHON3_10, minSamDebugging = "1.78.0", minSamInit = "1.78.0", architectures = ARM_COMPATIBLE), PYTHON3_11(Runtime.PYTHON3_11, minSamDebugging = "1.87.0", minSamInit = "1.87.0", architectures = ARM_COMPATIBLE), PYTHON3_12(Runtime.PYTHON3_12, minSamDebugging = "1.103.0", minSamInit = "1.103.0", architectures = ARM_COMPATIBLE), - DOTNET6_0(Runtime.DOTNET6, minSamDebugging = "1.40.1", minSamInit = "1.40.1", architectures = ARM_COMPATIBLE); + DOTNET6_0(Runtime.DOTNET6, minSamDebugging = "1.40.1", minSamInit = "1.40.1", architectures = ARM_COMPATIBLE), + ; override fun toString() = runtime?.toString() ?: runtimeOverride ?: throw IllegalStateException("LambdaRuntime has no runtime or override string") diff --git a/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaSampleEventProvider.kt b/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaSampleEventProvider.kt index a12e9eeefc..0f76e22d38 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaSampleEventProvider.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/lambda/LambdaSampleEventProvider.kt @@ -57,12 +57,12 @@ open class LambdaSampleEvent(val name: String, private val contentProvider: () - data class LambdaSampleEventManifest( @JsonProperty(value = "request") @JacksonXmlElementWrapper(useWrapping = false) - val requests: List + val requests: List, ) data class LambdaSampleEventRequest( val filename: String, - val name: String + val name: String, ) internal val LambdaSampleEventManifestResource = LambdaSampleEventResource("manifest.xml") diff --git a/plugins/core/core/src/software/aws/toolkits/core/region/AwsRegion.kt b/plugins/core/core/src/software/aws/toolkits/core/region/AwsRegion.kt index 61df7aac45..f3ac427b55 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/region/AwsRegion.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/region/AwsRegion.kt @@ -43,7 +43,7 @@ fun AwsRegion.mergeWithExistingEnvironmentVariables(existing: MutableMap, putValues: (Map) -> Unit, - replace: Boolean = false + replace: Boolean = false, ) { val regionEnvs = this.toEnvironmentVariables() if (replace || regionEnvs.keys.none { it in existingKeys }) { diff --git a/plugins/core/core/src/software/aws/toolkits/core/region/Partitions.kt b/plugins/core/core/src/software/aws/toolkits/core/region/Partitions.kt index 3dc885dc10..cea5e1b6ae 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/region/Partitions.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/region/Partitions.kt @@ -24,7 +24,7 @@ data class Partition( val partition: String, val partitionName: String, val regions: Map, - val services: Map + val services: Map, ) data class PartitionRegion(val description: String) diff --git a/plugins/core/core/src/software/aws/toolkits/core/telemetry/MetricEvent.kt b/plugins/core/core/src/software/aws/toolkits/core/telemetry/MetricEvent.kt index d9ae52e6a6..cbe4b50a10 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/telemetry/MetricEvent.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/telemetry/MetricEvent.kt @@ -77,7 +77,7 @@ data class DefaultMetricEvent internal constructor( override val awsRegion: String, override val awsProduct: AWSProduct, override val awsVersion: String, - override val data: Iterable + override val data: Iterable, ) : MetricEvent { class BuilderImpl : MetricEvent.Builder { @@ -137,7 +137,7 @@ data class DefaultMetricEvent internal constructor( override val value: Double, override val unit: MetricUnit, override val passive: Boolean, - override val metadata: Map + override val metadata: Map, ) : MetricEvent.Datum { class BuilderImpl(private var name: String) : MetricEvent.Datum.Builder { private var value: Double = 0.0 diff --git a/plugins/core/core/src/software/aws/toolkits/core/telemetry/TelemetryBatcher.kt b/plugins/core/core/src/software/aws/toolkits/core/telemetry/TelemetryBatcher.kt index 1c55550a5f..fe6747b862 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/telemetry/TelemetryBatcher.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/telemetry/TelemetryBatcher.kt @@ -28,7 +28,7 @@ class DefaultTelemetryBatcher( private val publisher: TelemetryPublisher, private val maxBatchSize: Int = DEFAULT_MAX_BATCH_SIZE, maxQueueSize: Int = DEFAULT_MAX_QUEUE_SIZE, - private val executor: ScheduledExecutorService = createDefaultExecutor() + private val executor: ScheduledExecutorService = createDefaultExecutor(), ) : TelemetryBatcher { private val isTelemetryEnabled: AtomicBoolean = AtomicBoolean(false) private val isShuttingDown: AtomicBoolean = AtomicBoolean(false) diff --git a/plugins/core/core/src/software/aws/toolkits/core/utils/RemoteResourceResolver.kt b/plugins/core/core/src/software/aws/toolkits/core/utils/RemoteResourceResolver.kt index fc0d590ea9..ce0603bf0f 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/utils/RemoteResourceResolver.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/utils/RemoteResourceResolver.kt @@ -24,7 +24,7 @@ interface RemoteResolveParser { class DefaultRemoteResourceResolver( private val urlFetcher: UrlFetcher, private val cacheBasePath: Path, - private val executor: (Callable) -> CompletionStage + private val executor: (Callable) -> CompletionStage, ) : RemoteResourceResolver { override fun resolve(resource: RemoteResource): CompletionStage = executor(Callable { internalResolve(resource) }) diff --git a/plugins/core/core/src/software/aws/toolkits/core/utils/Waiter.kt b/plugins/core/core/src/software/aws/toolkits/core/utils/Waiter.kt index 9fb723c6b4..17d6113906 100644 --- a/plugins/core/core/src/software/aws/toolkits/core/utils/Waiter.kt +++ b/plugins/core/core/src/software/aws/toolkits/core/utils/Waiter.kt @@ -32,7 +32,7 @@ object Waiters { exceptionsToIgnore: Set> = emptySet(), maxDuration: Duration = Duration.ofMinutes(1), // The status pulling method to get the latest resource - call: () -> T + call: () -> T, ): T? { val start = Instant.now() var attempt = 0 @@ -105,7 +105,7 @@ fun wait( // The maximum attempt for pulling the resource attempts: Int, // A fixed time interval between the pulling - delay: Duration + delay: Duration, ) { repeat(attempts) { try { diff --git a/plugins/core/core/tst/software/aws/toolkits/core/credentials/Mocks.kt b/plugins/core/core/tst/software/aws/toolkits/core/credentials/Mocks.kt index 2556fe9898..a39356ef44 100644 --- a/plugins/core/core/tst/software/aws/toolkits/core/credentials/Mocks.kt +++ b/plugins/core/core/tst/software/aws/toolkits/core/credentials/Mocks.kt @@ -9,14 +9,14 @@ import software.aws.toolkits.core.utils.test.aString fun aToolkitCredentialsProvider( identifier: CredentialIdentifier = aCredentialsIdentifier(), - delegate: AwsCredentialsProvider = mock() + delegate: AwsCredentialsProvider = mock(), ) = ToolkitCredentialsProvider(identifier, delegate) fun aCredentialsIdentifier( id: String = aString(), displayName: String = aString(), factoryId: String = aString(), - defaultRegionId: String? = null + defaultRegionId: String? = null, ) = object : CredentialIdentifierBase(CredentialType.StaticProfile) { override val id: String = id override val displayName: String = displayName diff --git a/plugins/core/core/tst/software/aws/toolkits/core/utils/RemoteResourceResolverTest.kt b/plugins/core/core/tst/software/aws/toolkits/core/utils/RemoteResourceResolverTest.kt index 2c80b39542..b129fe5b87 100644 --- a/plugins/core/core/tst/software/aws/toolkits/core/utils/RemoteResourceResolverTest.kt +++ b/plugins/core/core/tst/software/aws/toolkits/core/utils/RemoteResourceResolverTest.kt @@ -164,7 +164,7 @@ class RemoteResourceResolverTest { urls: List = listOf(PRIMARY_URL), ttl: Duration? = Duration.ofMillis(1000), initialValue: InputStream? = null, - remoteResolveParser: RemoteResolveParser? = LambdaManifestValidator + remoteResolveParser: RemoteResolveParser? = LambdaManifestValidator, ) = object : RemoteResource { override val urls: List = urls override val name: String = name diff --git a/plugins/core/core/tst/software/aws/toolkits/core/utils/test/TestUtils.kt b/plugins/core/core/tst/software/aws/toolkits/core/utils/test/TestUtils.kt index 79c0a63218..94a5f86e21 100644 --- a/plugins/core/core/tst/software/aws/toolkits/core/utils/test/TestUtils.kt +++ b/plugins/core/core/tst/software/aws/toolkits/core/utils/test/TestUtils.kt @@ -15,7 +15,7 @@ fun retryableAssert( timeout: Duration? = null, maxAttempts: Int? = null, interval: Duration = Duration.ofMillis(100), - assertion: () -> Unit + assertion: () -> Unit, ) { val calculatedTimeout = timeout ?: maxAttempts?.let { Duration.ofMillis(it * (interval.toMillis() * 2)) } ?: Duration.ofSeconds(1) val expiry = Instant.now().plus(calculatedTimeout) diff --git a/plugins/core/jetbrains-community/src-232/com/intellij/platform/ide/progress/WithBackgroundProgress.kt b/plugins/core/jetbrains-community/src-232/com/intellij/platform/ide/progress/WithBackgroundProgress.kt index 2cb90cf63d..8f4360c1da 100644 --- a/plugins/core/jetbrains-community/src-232/com/intellij/platform/ide/progress/WithBackgroundProgress.kt +++ b/plugins/core/jetbrains-community/src-232/com/intellij/platform/ide/progress/WithBackgroundProgress.kt @@ -9,5 +9,5 @@ import kotlinx.coroutines.CoroutineScope suspend fun withBackgroundProgress( project: Project, title: @ProgressTitle String, - action: suspend CoroutineScope.() -> T + action: suspend CoroutineScope.() -> T, ): T = com.intellij.openapi.progress.withBackgroundProgress(project, title, action) diff --git a/plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/core/AwsResourceCache.kt b/plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/core/AwsResourceCache.kt index 24dbcc5dec..05657b9905 100644 --- a/plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/core/AwsResourceCache.kt +++ b/plugins/core/jetbrains-community/src/migration/software/aws/toolkits/jetbrains/core/AwsResourceCache.kt @@ -37,7 +37,7 @@ interface AwsResourceCache { region: AwsRegion, credentialProvider: ToolkitCredentialsProvider, useStale: Boolean = true, - forceFetch: Boolean = false + forceFetch: Boolean = false, ): CompletionStage /** @@ -48,7 +48,7 @@ interface AwsResourceCache { region: AwsRegion, tokenProvider: ToolkitBearerTokenProvider, useStale: Boolean = true, - forceFetch: Boolean = false + forceFetch: Boolean = false, ): CompletionStage /** @@ -58,7 +58,7 @@ interface AwsResourceCache { resource: Resource, connectionSettings: ClientConnectionSettings<*>, useStale: Boolean = true, - forceFetch: Boolean = false + forceFetch: Boolean = false, ): CompletionStage = when (connectionSettings) { is ConnectionSettings -> getResource(resource, connectionSettings.region, connectionSettings.credentials, useStale, forceFetch) is TokenConnectionSettings -> getResource(resource, connectionSettings.region, connectionSettings.tokenProvider, useStale, forceFetch) @@ -76,7 +76,7 @@ interface AwsResourceCache { credentialProvider: ToolkitCredentialsProvider, timeout: Duration = DEFAULT_TIMEOUT, useStale: Boolean = true, - forceFetch: Boolean = false + forceFetch: Boolean = false, ): T = wait(timeout) { getResource(resource, region, credentialProvider, useStale, forceFetch) } /** @@ -88,7 +88,7 @@ interface AwsResourceCache { tokenProvider: ToolkitBearerTokenProvider, timeout: Duration = DEFAULT_TIMEOUT, useStale: Boolean = true, - forceFetch: Boolean = false + forceFetch: Boolean = false, ): T = wait(timeout) { getResource(resource, region, tokenProvider, useStale, forceFetch) } /** @@ -99,7 +99,7 @@ interface AwsResourceCache { connectionSettings: ClientConnectionSettings<*>, timeout: Duration = DEFAULT_TIMEOUT, useStale: Boolean = true, - forceFetch: Boolean = false + forceFetch: Boolean = false, ): T = when (connectionSettings) { is ConnectionSettings -> getResourceNow(resource, connectionSettings.region, connectionSettings.credentials, timeout, useStale, forceFetch) is TokenConnectionSettings -> getResourceNow(resource, connectionSettings.region, connectionSettings.tokenProvider, timeout, useStale, forceFetch) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/AwsToolkit.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/AwsToolkit.kt index 12cbf9218f..05d1e21e37 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/AwsToolkit.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/AwsToolkit.kt @@ -47,5 +47,5 @@ data class PluginInfo(val id: String, val name: String) { enum class AwsPlugin { TOOLKIT, Q, - CORE + CORE, } diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsClientManager.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsClientManager.kt index 61e46c555b..23a32aa0ba 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsClientManager.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsClientManager.kt @@ -77,7 +77,7 @@ open class AwsClientManager : ToolkitClientManager(), Disposable { tokenProvider: SdkTokenProvider?, regionId: String, builder: AwsClientBuilder<*, *>, - clientOverrideConfiguration: ClientOverrideConfiguration.Builder + clientOverrideConfiguration: ClientOverrideConfiguration.Builder, ) { CUSTOMIZER_EP.extensionList.forEach { it.customize(credentialProvider, tokenProvider, regionId, builder, clientOverrideConfiguration) } } diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsResourceCache.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsResourceCache.kt index 55ff1ae91f..07b1847b12 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsResourceCache.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/AwsResourceCache.kt @@ -130,7 +130,7 @@ class ClientBackedCachedResource( private val sdkClientClass: KClass, override val id: String, private val expiry: Duration?, - private val fetchCall: ClientType.() -> ReturnType + private val fetchCall: ClientType.() -> ReturnType, ) : Resource.Cached() { constructor(sdkClientClass: KClass, id: String, fetchCall: ClientType.() -> ReturnType) : this(sdkClientClass, id, null, fetchCall) @@ -148,7 +148,7 @@ class ClientBackedCachedResource( class DefaultAwsResourceCache( private val clock: Clock, private val maximumCacheEntries: Int, - private val maintenanceInterval: Duration + private val maintenanceInterval: Duration, ) : AwsResourceCache, Disposable, ToolkitCredentialsChangeListener { private val coroutineScope = disposableCoroutineScope(this) @@ -179,7 +179,7 @@ class DefaultAwsResourceCache( region: AwsRegion, credentialProvider: ToolkitCredentialsProvider, useStale: Boolean, - forceFetch: Boolean + forceFetch: Boolean, ): CompletionStage = when (resource) { is Resource.View<*, T> -> getResource( resource.underlying, @@ -198,7 +198,7 @@ class DefaultAwsResourceCache( region: AwsRegion, tokenProvider: ToolkitBearerTokenProvider, useStale: Boolean, - forceFetch: Boolean + forceFetch: Boolean, ): CompletionStage = when (resource) { is Resource.View<*, T> -> getResource( resource.underlying, @@ -376,7 +376,7 @@ class DefaultAwsResourceCache( val region: AwsRegion, val connectionSettings: ClientConnectionSettings<*>, val useStale: Boolean, - val forceFetch: Boolean + val forceFetch: Boolean, ) { val cacheKey = CacheKey(resource.id, region.id, connectionSettings.providerId) val future = CompletableFuture() diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ConfigFilesFacade.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ConfigFilesFacade.kt index f2c819e8ae..6ab051dc72 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ConfigFilesFacade.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ConfigFilesFacade.kt @@ -251,12 +251,12 @@ class DefaultConfigFilesFacade( data class ProfileLimitsInConfig( val startIndex: Int, val endIndex: Int, - val shouldBeWrittenToConfig: Boolean = true + val shouldBeWrittenToConfig: Boolean = true, ) data class CurrentProfileLimitsInConfig( val isProfileSso: Boolean, - val endIndex: Int = 0 + val endIndex: Int = 0, ) private fun appendSection(path: Path, sectionName: String, profile: Profile) { diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/CreateOrUpdateCredentialProfilesAction.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/CreateOrUpdateCredentialProfilesAction.kt index ce05ec9234..5d0ec36773 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/CreateOrUpdateCredentialProfilesAction.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/CreateOrUpdateCredentialProfilesAction.kt @@ -25,7 +25,7 @@ import software.aws.toolkits.telemetry.AwsTelemetry import java.nio.file.Path class CreateOrUpdateCredentialProfilesAction @TestOnly constructor( - private val writer: ConfigFilesFacade + private val writer: ConfigFilesFacade, ) : AnAction( message("configure.toolkit.upsert_credentials.action"), null, diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultAwsConnectionManager.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultAwsConnectionManager.kt index 64012ceb7b..e8d9d91b1a 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultAwsConnectionManager.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultAwsConnectionManager.kt @@ -17,7 +17,7 @@ data class ConnectionSettingsState( var activeProfile: String? = null, var activeRegion: String? = null, var recentlyUsedProfiles: List = mutableListOf(), - var recentlyUsedRegions: List = mutableListOf() + var recentlyUsedRegions: List = mutableListOf(), ) @State(name = "accountSettings", storages = [Storage("aws.xml")]) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManager.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManager.kt index 83c608f007..83e36ad350 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManager.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManager.kt @@ -297,11 +297,11 @@ class DefaultToolkitAuthManager : ToolkitAuthManager, PersistentStateComponent = emptyList(), - var lastLoginIdcInfo: LastLoginIdcInfo = LastLoginIdcInfo() + var lastLoginIdcInfo: LastLoginIdcInfo = LastLoginIdcInfo(), ) data class LastLoginIdcInfo( var profileName: String = "", var startUrl: String = "", - var region: String = "" + var region: String = "", ) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitConnectionManager.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitConnectionManager.kt index 51b0d0f312..83e0db3541 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitConnectionManager.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitConnectionManager.kt @@ -157,5 +157,5 @@ class DefaultToolkitConnectionManager : ToolkitConnectionManager, PersistentStat } data class ToolkitConnectionManagerState( - var activeConnectionId: String? = null + var activeConnectionId: String? = null, ) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/LoginUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/LoginUtils.kt index 9b2acadcfe..b391056661 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/LoginUtils.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/LoginUtils.kt @@ -39,7 +39,7 @@ sealed interface Login { val scopes: List, val onPendingToken: (InteractiveBearerTokenProvider) -> Unit, val onError: (Exception) -> Unit, - val onSuccess: () -> Unit + val onSuccess: () -> Unit, ) : Login { override val id: CredentialSourceId = CredentialSourceId.AwsId @@ -55,7 +55,7 @@ sealed interface Login { val scopes: List, val onPendingToken: (InteractiveBearerTokenProvider) -> Unit, val onSuccess: () -> Unit, - val onError: (Exception, AuthProfile) -> Unit + val onError: (Exception, AuthProfile) -> Unit, ) : Login { override val id: CredentialSourceId = CredentialSourceId.IamIdentityCenter private val configFilesFacade = DefaultConfigFilesFacade() @@ -90,7 +90,7 @@ sealed interface Login { data class LongLivedIAM( val profileName: String, val accessKey: String, - val secretKey: String + val secretKey: String, ) : Login { override val id: CredentialSourceId = CredentialSourceId.SharedCredentials private val configFilesFacade = DefaultConfigFilesFacade() @@ -99,7 +99,7 @@ sealed interface Login { project: Project, onConfigFileFacadeError: (Exception) -> Unit, onProfileAlreadyExist: () -> Unit, - onConnectionValidationError: () -> Unit + onConnectionValidationError: () -> Unit, ): Boolean { val existingProfiles = try { configFilesFacade.readAllProfiles() @@ -156,7 +156,7 @@ fun authAndUpdateConfig( configFilesFacade: ConfigFilesFacade, onPendingToken: (InteractiveBearerTokenProvider) -> Unit, onSuccess: () -> Unit, - onError: (Exception, AuthProfile) -> Unit + onError: (Exception, AuthProfile) -> Unit, ): AwsBearerTokenConnection? { val requestedScopes = profile.scopes val allScopes = requestedScopes.toMutableSet() diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt index 9ec246eeb3..63dc2ef7ae 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt @@ -56,14 +56,14 @@ sealed interface AuthProfile data class ManagedSsoProfile( var ssoRegion: String = "", var startUrl: String = "", - var scopes: List = emptyList() + var scopes: List = emptyList(), ) : AuthProfile data class UserConfigSsoSessionProfile( var configSessionName: String = "", var ssoRegion: String = "", var startUrl: String = "", - var scopes: List = emptyList() + var scopes: List = emptyList(), ) : AuthProfile { val id get() = "$SSO_SESSION_SECTION_NAME:$configSessionName" @@ -73,7 +73,7 @@ data class DetectedDiskSsoSessionProfile( var profileName: String = "", var startUrl: String = "", var ssoRegion: String = "", - var scopes: List = emptyList() + var scopes: List = emptyList(), ) : AuthProfile /** @@ -118,7 +118,7 @@ fun loginSso( onPendingToken: (InteractiveBearerTokenProvider) -> Unit = {}, onError: (Exception) -> Unit = {}, onSuccess: () -> Unit = {}, - metadata: ConnectionMetadata? = null + metadata: ConnectionMetadata? = null, ): AwsBearerTokenConnection? { fun createAndAuthNewConnection(profile: AuthProfile): AwsBearerTokenConnection? { val authManager = ToolkitAuthManager.getInstance() @@ -261,7 +261,7 @@ fun reauthConnectionIfNeeded( fun maybeReauthProviderIfNeeded( project: Project?, tokenProvider: BearerTokenProvider, - onReauthRequired: (SsoOidcException?) -> Any + onReauthRequired: (SsoOidcException?) -> Any, ): Boolean { val state = tokenProvider.state() when (state) { @@ -310,7 +310,7 @@ private fun recordLoginWithBrowser( reason: String? = null, isReAuth: Boolean, result: Result, - source: String? = null + source: String? = null, ) { TelemetryService.getInstance().record(null as Project?) { datum("aws_loginWithBrowser") { @@ -334,7 +334,7 @@ private fun recordAddConnection( reason: String? = null, isReAuth: Boolean, result: Result, - source: String? = null + source: String? = null, ) { TelemetryService.getInstance().record(null as Project?) { datum("auth_addConnection") { @@ -352,5 +352,5 @@ private fun recordAddConnection( } data class ConnectionMetadata( - val sourceId: String? = null + val sourceId: String? = null, ) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitConnectionImpls.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitConnectionImpls.kt index b46380429f..fb89054b5f 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitConnectionImpls.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitConnectionImpls.kt @@ -58,7 +58,7 @@ sealed class ManagedBearerSsoConnection( override val scopes: List, cache: DiskCache = diskCache, override val id: String, - override val label: String + override val label: String, ) : AwsBearerTokenConnection, Disposable { private val provider = @@ -85,7 +85,7 @@ class DetectedDiskSsoSessionConnection( override val startUrl: String, override val region: String, override val scopes: List, - displayNameOverride: String? = null + displayNameOverride: String? = null, ) : AwsBearerTokenConnection, Disposable { override val id = ToolkitBearerTokenProvider.diskSessionIdentifier(sessionName) override val label = displayNameOverride ?: ToolkitBearerTokenProvider.diskSessionDisplayName(sessionName) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitCredentialProcessProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitCredentialProcessProvider.kt index 160a7fc51c..803f251a07 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitCredentialProcessProvider.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitCredentialProcessProvider.kt @@ -33,7 +33,7 @@ import java.util.Enumeration */ class ToolkitCredentialProcessProvider @TestOnly constructor( private val command: String, - private val parser: CredentialProcessOutputParser + private val parser: CredentialProcessOutputParser, ) : AwsCredentialsProvider, SdkAutoCloseable { constructor(command: String) : this(command, DefaultCredentialProcessOutputParser) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/pinning/ConnectionPinningManager.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/pinning/ConnectionPinningManager.kt index 4b81ea9d8b..8fc4825ffc 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/pinning/ConnectionPinningManager.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/pinning/ConnectionPinningManager.kt @@ -132,5 +132,5 @@ class DefaultConnectionPinningManager : } data class ConnectionPinningManagerState( - var pinnedConnections: Map = emptyMap() + var pinnedConnections: Map = emptyMap(), ) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileAssumeRoleProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileAssumeRoleProvider.kt index 581fa7da29..950e76587a 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileAssumeRoleProvider.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileAssumeRoleProvider.kt @@ -57,7 +57,7 @@ class ProfileAssumeRoleProvider(@get:TestOnly internal val parentProvider: AwsCr roleArn: String, roleSessionName: String?, externalId: String?, - durationSeconds: Int + durationSeconds: Int, ): AssumeRoleRequest { val requestBuilder = AssumeRoleRequest.builder() .roleArn(roleArn) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactory.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactory.kt index c61419430e..4ac16390b7 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactory.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactory.kt @@ -82,7 +82,7 @@ private class ProfileCredentialsIdentifierLegacySso( override val ssoCache: SsoCache, override val ssoUrl: String, override val ssoRegion: String, - credentialType: CredentialType? + credentialType: CredentialType?, ) : ProfileCredentialsIdentifier(profileName, defaultRegionId, credentialType), SsoRequiredInteractiveCredentials, PostValidateInteractiveCredential { @@ -110,7 +110,7 @@ class ProfileCredentialsIdentifierSso @TestOnly constructor( profileName: String, val ssoSessionName: String, defaultRegionId: String?, - credentialType: CredentialType? + credentialType: CredentialType?, ) : ProfileCredentialsIdentifier(profileName, defaultRegionId, credentialType), PostValidateInteractiveCredential, SsoSessionBackedCredentialIdentifier { override val sessionIdentifier = "$SSO_SESSION_SECTION_NAME:$ssoSessionName" @@ -497,7 +497,7 @@ private fun Profile.toCredentialType(): CredentialType? = when { private data class ProfileHolder( val profiles: MutableMap = mutableMapOf(), - val ssoSessions: MutableMap = mutableMapOf() + val ssoSessions: MutableMap = mutableMapOf(), ) { fun snapshot() = copy( profiles = profiles.toMutableMap(), diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileReader.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileReader.kt index 1973f00dad..f95087f71d 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileReader.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileReader.kt @@ -14,7 +14,7 @@ data class Profiles( val validProfiles: Map, val invalidProfiles: Map, val validSsoSessions: Map, - val invalidSsoSessions: Map + val invalidSsoSessions: Map, ) /** diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileSsoSessionIdentifier.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileSsoSessionIdentifier.kt index 954b04a4d3..69a4c630f8 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileSsoSessionIdentifier.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileSsoSessionIdentifier.kt @@ -9,7 +9,7 @@ data class ProfileSsoSessionIdentifier( val profileName: String, override val startUrl: String, override val ssoRegion: String, - override val scopes: Set + override val scopes: Set, ) : SsoSessionIdentifier { override val id = "${SsoSessionConstants.SSO_SESSION_SECTION_NAME}:$profileName" } diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/AccessToken.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/AccessToken.kt index c486bd3903..971aebe343 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/AccessToken.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/AccessToken.kt @@ -48,7 +48,7 @@ data class DeviceAuthorizationGrantToken( override val accessToken: String, override val refreshToken: String? = null, override val expiresAt: Instant, - override val createdAt: Instant = Instant.EPOCH + override val createdAt: Instant = Instant.EPOCH, ) : AccessToken { override val ssoUrl: String get() = startUrl @@ -62,7 +62,7 @@ data class PKCEAuthorizationGrantToken( override val accessToken: String, override val refreshToken: String, override val expiresAt: Instant, - override val createdAt: Instant + override val createdAt: Instant, ) : AccessToken { override val ssoUrl: String get() = issuerUrl @@ -84,11 +84,11 @@ sealed interface AccessTokenCacheKey { data class DeviceGrantAccessTokenCacheKey( val connectionId: String, val startUrl: String, - override val scopes: List + override val scopes: List, ) : AccessTokenCacheKey data class PKCEAccessTokenCacheKey( val issuerUrl: String, val region: String, - override val scopes: List + override val scopes: List, ) : AccessTokenCacheKey diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/ClientRegistration.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/ClientRegistration.kt index 3a9b8b615e..cec4a52d4c 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/ClientRegistration.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/ClientRegistration.kt @@ -73,5 +73,5 @@ data class PKCEClientRegistrationCacheKey( // assume clientType, grantTypes, redirectUris are static, but throw them in just in case val clientType: String, val grantTypes: List, - val redirectUris: List + val redirectUris: List, ) : ClientRegistrationCacheKey diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCache.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCache.kt index 7bbed7a032..7485933e86 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCache.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/DiskCache.kt @@ -49,7 +49,7 @@ import java.util.TimeZone */ class DiskCache( private val cacheDir: Path = Paths.get(System.getProperty("user.home"), ".aws", "sso", "cache"), - private val clock: Clock = Clock.systemUTC() + private val clock: Clock = Clock.systemUTC(), ) : SsoCache { private val objectMapper = jacksonObjectMapper().also { it.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) @@ -77,7 +77,7 @@ class DiskCache( override fun withDelegate( converter: Converter?, delegateType: JavaType?, - delegateSerializer: JsonSerializer<*>? + delegateSerializer: JsonSerializer<*>?, ): StdDelegatingSerializer = StdDelegatingSerializer(converter, delegateType, delegateSerializer) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoAccessTokenProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoAccessTokenProvider.kt index ca2b66216a..e8d5781a07 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoAccessTokenProvider.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoAccessTokenProvider.kt @@ -137,7 +137,7 @@ class SsoAccessTokenProvider( private val client: SsoOidcClient, private val isAlwaysShowDeviceCode: Boolean = false, override val scopes: List = emptyList(), - private val clock: Clock = Clock.systemUTC() + private val clock: Clock = Clock.systemUTC(), ) : SsoAccessTokenCacheAccessor(), SdkTokenProvider { init { check(scopes.isNotEmpty()) { "Scopes should not be empty" } @@ -340,7 +340,7 @@ class SsoAccessTokenProvider( currentToken: AccessToken, reason: String, reasonDesc: String, - requestId: String? = null + requestId: String? = null, ) { val tokenCreationTime = currentToken.createdAt val sessionDuration = Duration.between(Instant.now(clock), tokenCreationTime) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoCredentialProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoCredentialProvider.kt index 201ccf3749..40c45c4f19 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoCredentialProvider.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoCredentialProvider.kt @@ -27,7 +27,7 @@ class SsoCredentialProvider( private val ssoAccount: String, private val ssoRole: String, private val ssoClient: SsoClient, - private val ssoAccessTokenProvider: SdkTokenProvider + private val ssoAccessTokenProvider: SdkTokenProvider, ) : AwsCredentialsProvider, SdkAutoCloseable { private val sessionCache: CachedSupplier = CachedSupplier.builder(this::refreshCredentials).build() diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt index 07e60ad0c1..70f0d47c7b 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/BearerTokenProvider.kt @@ -91,7 +91,7 @@ class InteractiveBearerTokenProvider( region: String, val scopes: List, id: String, - cache: DiskCache = diskCache + cache: DiskCache = diskCache, ) : BearerTokenProvider, BearerTokenLogoutSupport, Disposable { override val id = id override val displayName = ToolkitBearerTokenProvider.ssoDisplayName(startUrl) @@ -192,7 +192,7 @@ class NoTokenInitializedException(message: String) : Exception(message) public enum class BearerTokenAuthState { AUTHORIZED, NEEDS_REFRESH, - NOT_AUTHENTICATED + NOT_AUTHENTICATED, } class ProfileSdkTokenProviderWrapper(private val sessionName: String, region: String) : BearerTokenProvider, Disposable { diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/ConfirmUserCodeLoginDialog.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/ConfirmUserCodeLoginDialog.kt index 00a140e3cd..c3207fea6b 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/ConfirmUserCodeLoginDialog.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/bearer/ConfirmUserCodeLoginDialog.kt @@ -28,7 +28,7 @@ import javax.swing.JComponent class ConfirmUserCodeLoginDialog( private val authCode: String, private val dialogTitle: String, - private val credentialType: CredentialType + private val credentialType: CredentialType, ) : DialogWrapper(null) { private val pane = panel { diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt index 7011a19218..14904cdfbb 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/GettingStartedAuthUtils.kt @@ -36,7 +36,7 @@ fun requestCredentialsForCodeWhisperer( project ), isFirstInstance: Boolean = false, - connectionInitiatedFromExplorer: Boolean = false + connectionInitiatedFromExplorer: Boolean = false, ): Boolean { val authenticationDialog = SetupAuthenticationDialog( project, @@ -123,7 +123,7 @@ fun requestCredentialsForQ( ), isFirstInstance: Boolean = false, connectionInitiatedFromExplorer: Boolean = false, - connectionInitiatedFromQChatPanel: Boolean = false + connectionInitiatedFromQChatPanel: Boolean = false, ): Boolean { // try to scope upgrade if we have a codewhisperer connection val codeWhispererConnection = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(CodeWhispererConnection.getInstance()) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopup.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopup.kt index 3bb50204e6..7b8353a7cf 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopup.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/IdcRolePopup.kt @@ -33,7 +33,7 @@ import software.aws.toolkits.jetbrains.utils.ui.selected import software.aws.toolkits.resources.message data class IdcRolePopupState( - var roleInfo: RoleInfo? = null + var roleInfo: RoleInfo? = null, ) class IdcRolePopup( @@ -42,7 +42,7 @@ class IdcRolePopup( private val sessionName: String, private val tokenProvider: SdkTokenProvider, val state: IdcRolePopupState = IdcRolePopupState(), - private val configFilesFacade: ConfigFilesFacade = DefaultConfigFilesFacade() + private val configFilesFacade: ConfigFilesFacade = DefaultConfigFilesFacade(), ) : DialogWrapper(project) { init { title = message("gettingstarted.setup.idc.role.title") diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt index 3620457085..14e8140031 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/SetupAuthenticationDialog.kt @@ -75,7 +75,7 @@ data class SetupAuthenticationDialogState( var profileName: String = "", var startUrl: String = "", var region: AwsRegion = AwsRegionProvider.getInstance().defaultRegion(), - var rolePopupState: IdcRolePopupState = IdcRolePopupState() + var rolePopupState: IdcRolePopupState = IdcRolePopupState(), ) // has no state yet @@ -92,22 +92,22 @@ data class SetupAuthenticationDialogState( enum class SetupAuthenticationTabs { IDENTITY_CENTER, BUILDER_ID, - IAM_LONG_LIVED + IAM_LONG_LIVED, } data class AuthenticationTabSettings( val disabled: Boolean = false, - val notice: SetupAuthenticationNotice + val notice: SetupAuthenticationNotice, ) data class SetupAuthenticationNotice( val type: NoticeType, val message: String, - val learnMore: String + val learnMore: String, ) { enum class NoticeType { WARNING, - ERROR + ERROR, } } @@ -127,7 +127,7 @@ class SetupAuthenticationDialog( private val featureId: FeatureId, private val isFirstInstance: Boolean = false, private val connectionInitiatedFromExplorer: Boolean = false, - private val connectionInitiatedFromQChatPanel: Boolean = false + private val connectionInitiatedFromQChatPanel: Boolean = false, ) : DialogWrapper(project), AuthenticationDialog { private val rootTabPane = JBTabbedPane() private val idcTab = IdcTabPanelBuilder( @@ -476,7 +476,7 @@ class BuilderIdTabPanelBuilder { class IdcTabPanelBuilder( private val startUrl: KMutableProperty0, private val region: KMutableProperty0, - private var profileName: Optional> = Optional.empty() + private var profileName: Optional> = Optional.empty(), ) { fun build() = panel { profileName.ifPresent { diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanelUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanelUtils.kt index abb801519d..cf6d1be7c4 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanelUtils.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanelUtils.kt @@ -25,13 +25,13 @@ enum class ActiveConnectionType { BUILDER_ID, IAM_IDC, IAM, - UNKNOWN + UNKNOWN, } enum class BearerTokenFeatureSet { CODEWHISPERER, CODECATALYST, - Q + Q, } fun controlPanelVisibility(currentPanel: Panel, newPanel: Panel) { @@ -47,25 +47,25 @@ sealed interface ActiveConnection { data class ExpiredBearer( override val activeConnectionBearer: AwsBearerTokenConnection?, override val connectionType: ActiveConnectionType?, - override val activeConnectionIam: CredentialIdentifier? = null + override val activeConnectionIam: CredentialIdentifier? = null, ) : ActiveConnection data class ExpiredIam( override val activeConnectionBearer: AwsBearerTokenConnection? = null, override val connectionType: ActiveConnectionType?, - override val activeConnectionIam: CredentialIdentifier? + override val activeConnectionIam: CredentialIdentifier?, ) : ActiveConnection data class ValidBearer( override val activeConnectionBearer: AwsBearerTokenConnection?, override val connectionType: ActiveConnectionType?, - override val activeConnectionIam: CredentialIdentifier? = null + override val activeConnectionIam: CredentialIdentifier? = null, ) : ActiveConnection data class ValidIam( override val activeConnectionBearer: AwsBearerTokenConnection? = null, override val connectionType: ActiveConnectionType?, - override val activeConnectionIam: CredentialIdentifier? + override val activeConnectionIam: CredentialIdentifier?, ) : ActiveConnection object NotConnected : ActiveConnection { @@ -160,7 +160,7 @@ fun getSourceOfEntry( sourceOfEntry: SourceOfEntry, isStartup: Boolean = false, connectionInitiatedFromExplorer: Boolean = false, - connectionInitiatedFromQChatPanel: Boolean = false + connectionInitiatedFromQChatPanel: Boolean = false, ): String { val src = if (connectionInitiatedFromExplorer) { SourceOfEntry.EXPLORER.toString() @@ -181,7 +181,8 @@ enum class SourceOfEntry { FIRST_STARTUP, Q, AMAZONQ_CHAT_PANEL, - UNKNOWN; + UNKNOWN, + ; override fun toString(): String { val value = this.name.lowercase() // If the string in lowercase contains an _ eg RESOURCE_EXPLORER, this function returns camelCase of the string i.e resourceExplorer diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedTelemetryUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedTelemetryUtils.kt index 66f8ecfda6..fc4625db84 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedTelemetryUtils.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedTelemetryUtils.kt @@ -79,9 +79,11 @@ fun getStartupState(): StartUpState { fun getAuthStatus(project: Project) = when (checkConnectionValidity(project)) { is ActiveConnection.ExpiredIam, - is ActiveConnection.ExpiredBearer -> AuthStatus.Expired + is ActiveConnection.ExpiredBearer, + -> AuthStatus.Expired is ActiveConnection.ValidIam, - is ActiveConnection.ValidBearer -> AuthStatus.Connected + is ActiveConnection.ValidBearer, + -> AuthStatus.Connected else -> AuthStatus.NotConnected } @@ -94,5 +96,5 @@ enum class AuthFormId { IDENTITYCENTER_CODEWHISPERER, BUILDERID_Q, IDENTITYCENTER_Q, - UNKNOWN + UNKNOWN, } diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/help/HelpIds.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/help/HelpIds.kt index 3eb1ea34ee..1188db0a60 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/help/HelpIds.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/help/HelpIds.kt @@ -124,7 +124,7 @@ enum class HelpIds(shortId: String, val url: String) { TOOLKIT_ADD_CONNECTIONS_DIALOG( "ToolkitAddConnectionsDialog", "https://docs.aws.amazon.com/toolkit-for-jetbrains/latest/userguide/setup-credentials.html" - ) + ), ; val id = "$HELP_ID_PREFIX.$shortId" diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/BrowserMessage.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/BrowserMessage.kt index 120f544f73..c74ba7bf23 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/BrowserMessage.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/BrowserMessage.kt @@ -42,13 +42,13 @@ sealed interface BrowserMessage { data class LoginIdC( val url: String, val region: String, - val feature: String + val feature: String, ) : BrowserMessage data class LoginIAM( val profileName: String, val accessKey: String, - val secretKey: String + val secretKey: String, ) : BrowserMessage object CancelLogin : BrowserMessage diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt index 4059e1aedc..cacd73b3a2 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt @@ -57,7 +57,7 @@ data class BrowserState(val feature: FeatureId, val browserCancellable: Boolean abstract class LoginBrowser( private val project: Project, val domain: String, - val webScriptUri: String + val webScriptUri: String, ) { abstract val jcefBrowser: JBCefBrowserBase diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewResourceHandler.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewResourceHandler.kt index 44222820a2..174e63b188 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewResourceHandler.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/WebviewResourceHandler.kt @@ -17,7 +17,7 @@ import java.net.URLConnection class WebviewResourceHandlerFactory( val domain: String, - val assetUri: String + val assetUri: String, ) : CefSchemeHandlerFactory { override fun create( browser: CefBrowser?, diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/AwsCognitoCredentialsProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/AwsCognitoCredentialsProvider.kt index 38dba40d60..7c1d5511e3 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/AwsCognitoCredentialsProvider.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/AwsCognitoCredentialsProvider.kt @@ -28,7 +28,7 @@ import java.time.temporal.ChronoUnit class AwsCognitoCredentialsProvider( private val identityPool: String, private val cognitoClient: CognitoIdentityClient, - cacheStorage: CachedIdentityStorage? = null + cacheStorage: CachedIdentityStorage? = null, ) : AwsCredentialsProvider, SdkAutoCloseable { private val identityIdProvider = AwsCognitoIdentityProvider(cognitoClient, identityPool, cacheStorage) private val cacheSupplier = CachedSupplier.builder(this::updateCognitoCredentials) @@ -68,7 +68,7 @@ class AwsCognitoCredentialsProvider( private class AwsCognitoIdentityProvider( private val cognitoClient: CognitoIdentityClient, private val identityPoolId: String, - private val cacheStorage: CachedIdentityStorage? = null + private val cacheStorage: CachedIdentityStorage? = null, ) { val identityId: String by lazy { loadFromCache() ?: createNewIdentity() diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/DefaultTelemetryPublisher.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/DefaultTelemetryPublisher.kt index 5ba1f6737c..f40a9c5317 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/DefaultTelemetryPublisher.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/DefaultTelemetryPublisher.kt @@ -22,7 +22,7 @@ import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext class DefaultTelemetryPublisher( private val clientProvider: () -> ToolkitTelemetryClient, - private val clientMetadataProvider: (AWSProduct, String) -> ClientMetadata + private val clientMetadataProvider: (AWSProduct, String) -> ClientMetadata, ) : TelemetryPublisher { constructor() : this( clientProvider = { createDefaultTelemetryClient() }, diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt index 2459bbdd33..e536e73b80 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/telemetry/TelemetryService.kt @@ -16,7 +16,7 @@ data class MetricEventMetadata( val awsAccount: String = METADATA_NA, val awsRegion: String = METADATA_NA, var awsProduct: AWSProduct = AWSProduct.AWS_TOOLKIT_FOR_JET_BRAINS, - var awsVersion: String = METADATA_NA + var awsVersion: String = METADATA_NA, ) interface TelemetryListener { diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/AwsSettings.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/AwsSettings.kt index 0455264938..9e6c47a14c 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/AwsSettings.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/settings/AwsSettings.kt @@ -18,7 +18,8 @@ import java.util.prefs.Preferences enum class ProfilesNotification(private val description: String) { Always(message("settings.profiles.always")), OnFailure(message("settings.profiles.on_failure")), - Never(message("settings.profiles.never")); + Never(message("settings.profiles.never")), + ; override fun toString(): String = description } @@ -26,7 +27,8 @@ enum class ProfilesNotification(private val description: String) { enum class UseAwsCredentialRegion(private val description: String) { Always(message("settings.credentials.prompt_for_default_region_switch.always.description")), Prompt(message("settings.credentials.prompt_for_default_region_switch.ask.description")), - Never(message("settings.credentials.prompt_for_default_region_switch.never.description")); + Never(message("settings.credentials.prompt_for_default_region_switch.never.description")), + ; override fun toString(): String = description } @@ -134,5 +136,5 @@ data class AwsConfiguration( var isAutoUpdateEnabled: Boolean? = null, var isAutoUpdateNotificationEnabled: Boolean? = null, var isAutoUpdateFeatureNotificationShownOnce: Boolean? = null, - var isQMigrationNotificationShownOnce: Boolean? = null + var isQMigrationNotificationShownOnce: Boolean? = null, ) diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/AsyncComboBox.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/AsyncComboBox.kt index c873a533fe..112ef8e26c 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/AsyncComboBox.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/AsyncComboBox.kt @@ -30,14 +30,14 @@ import javax.swing.MutableComboBoxModel import javax.swing.event.ListDataListener class AsyncComboBox private constructor( - private val comboBoxModel: MutableComboBoxModel + private val comboBoxModel: MutableComboBoxModel, ) : ComboBox(comboBoxModel), Disposable { private val loading = AtomicBoolean(false) private val scope = disposableCoroutineScope(this) constructor( comboBoxModel: MutableComboBoxModel = DefaultComboBoxModel(), - customizer: SimpleListCellRenderer.Customizer? = null + customizer: SimpleListCellRenderer.Customizer? = null, ) : this(comboBoxModel) { renderer = object : SimpleListCellRenderer() { override fun getListCellRendererComponent( @@ -45,7 +45,7 @@ class AsyncComboBox private constructor( value: T?, index: Int, selected: Boolean, - hasFocus: Boolean + hasFocus: Boolean, ): Component { val component = super.getListCellRendererComponent(list, value, index, selected, hasFocus) as SimpleListCellRenderer<*> @@ -65,7 +65,7 @@ class AsyncComboBox private constructor( constructor( comboBoxModel: MutableComboBoxModel = DefaultComboBoxModel(), - customRenderer: ListCellRenderer + customRenderer: ListCellRenderer, ) : this(comboBoxModel) { renderer = ListCellRenderer { list, value, index, selected, hasFocus -> if (loading.get() && index == -1) { diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/KeyValueTextField.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/KeyValueTextField.kt index 20538d149a..88212744a5 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/KeyValueTextField.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/ui/KeyValueTextField.kt @@ -29,7 +29,7 @@ import javax.swing.event.DocumentEvent * Inheriting system env vars is not supported, but rest of UX is generally the same */ class KeyValueTextField( - @Nls dialogTitle: String = message("environment.variables.dialog.title") + @Nls dialogTitle: String = message("environment.variables.dialog.title"), ) : TextFieldWithBrowseButton(), UserActivityProviderComponent { private var data = EnvironmentVariablesData.create(emptyMap(), false) private val listeners = CopyOnWriteArrayList() diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/NotificationUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/NotificationUtils.kt index b252778108..774b09e90e 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/NotificationUtils.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/NotificationUtils.kt @@ -61,7 +61,7 @@ fun notifyStickyInfo( content: String = "", project: Project? = null, notificationActions: Collection = listOf(), - stripHtml: Boolean = true + stripHtml: Boolean = true, ) = notifySticky(NotificationType.INFORMATION, title, getCleanedContent(content, stripHtml), project, notificationActions) fun notifyStickyWarn( @@ -69,7 +69,7 @@ fun notifyStickyWarn( content: String = "", project: Project? = null, notificationActions: Collection = listOf(), - stripHtml: Boolean = true + stripHtml: Boolean = true, ) = notifySticky(NotificationType.WARNING, title, getCleanedContent(content, stripHtml), project, notificationActions) fun notifyStickyError( @@ -77,7 +77,7 @@ fun notifyStickyError( content: String = "", project: Project? = null, notificationActions: Collection = listOf(), - stripHtml: Boolean = true + stripHtml: Boolean = true, ) = notifySticky(NotificationType.ERROR, title, getCleanedContent(content, stripHtml), project, notificationActions) fun notifyInfo(title: String, content: String = "", project: Project? = null, listener: NotificationListener? = null, stripHtml: Boolean = true) = @@ -103,7 +103,7 @@ fun notifyError( content: String = "", project: Project? = null, listener: NotificationListener? = null, - stripHtml: Boolean = true + stripHtml: Boolean = true, ) = notify(Notification(GROUP_DISPLAY_ID, title, getCleanedContent(content, stripHtml), NotificationType.ERROR, listener), project) fun tryNotify(message: String, block: () -> T): T? = try { diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/ui/UiUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/ui/UiUtils.kt index 80b0dd598f..1204275644 100644 --- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/ui/UiUtils.kt +++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/utils/ui/UiUtils.kt @@ -113,7 +113,7 @@ fun drawSearchMatch( startX: Float, endX: Float, startY: Float, - height: Int + height: Int, ) { val color1 = JBColor.namedColor("SearchMatch.startBackground", JBColor.namedColor("SearchMatch.startColor", 0xffeaa2)) val color2 = JBColor.namedColor("SearchMatch.endBackground", JBColor.namedColor("SearchMatch.endColor", 0xffd042)) @@ -182,7 +182,7 @@ private fun JTextArea.speedSearchHighlighter(speedSearchEnabledComponent: JCompo class WrappingCellRenderer( private val wrapOnSelection: Boolean = false, private val wrapOnToggle: Boolean = false, - private val truncateAfterChars: Int? = null + private val truncateAfterChars: Int? = null, ) : CellRendererPanel(), TableCellRenderer { var wrap: Boolean = false diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/CredentialManagerTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/CredentialManagerTest.kt index 3cf032bf99..e03ff72d2c 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/CredentialManagerTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/CredentialManagerTest.kt @@ -254,7 +254,7 @@ class CredentialManagerTest { fun addCredentialProvider( credentialId: String, - awsCredentialsProvider: AwsCredentialsProvider? = null + awsCredentialsProvider: AwsCredentialsProvider? = null, ) { val identifier = TestCredentialProviderIdentifier(credentialId, id, getDefaultRegion().id, awsCredentialsProvider) if (!::callback.isInitialized) { @@ -305,7 +305,7 @@ class CredentialManagerTest { override val id: String, override val factoryId: String, override val defaultRegionId: String, - val provider: AwsCredentialsProvider? + val provider: AwsCredentialsProvider?, ) : CredentialIdentifierBase(null) { override val displayName: String = "$factoryId:$id" } diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt index 2bcc93354a..a12d814138 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt @@ -48,7 +48,7 @@ import software.aws.toolkits.jetbrains.utils.satisfiesKt class DefaultToolkitAuthManagerTest { private class TestTelemetryService( publisher: TelemetryPublisher = NoOpPublisher(), - batcher: TelemetryBatcher + batcher: TelemetryBatcher, ) : TelemetryService(publisher, batcher) @ExtendWith(MockRegionProviderExtension::class) @@ -276,7 +276,7 @@ class DefaultToolkitAuthManagerTest { @Test fun `loginSso with an existing connection that token is invalid and there's no refresh token, should re-authenticate`( - @TestDisposable disposable: Disposable + @TestDisposable disposable: Disposable, ) { val connectionManager = ToolkitConnectionManager.getInstance(projectRule.project) regionProvider.addRegion(Region.US_EAST_1) diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactoryTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactoryTest.kt index 837477f73c..0dfd55fb22 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactoryTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/credentials/profiles/ProfileCredentialProviderFactoryTest.kt @@ -961,7 +961,7 @@ class ProfileCredentialProviderFactoryTest { private fun profileName( expectedProfileName: String, - defaultRegion: String? = null + defaultRegion: String? = null, ): Condition> = object : Condition>(expectedProfileName) { override fun matches(value: Iterable): Boolean = value.any { @@ -970,7 +970,7 @@ class ProfileCredentialProviderFactoryTest { } private fun ssoSessionName( - expectedProfileName: String + expectedProfileName: String, ): Condition> = object : Condition>(expectedProfileName) { override fun matches(value: Iterable): Boolean = value.any { diff --git a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/settings/AwsSettingsTest.kt b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/settings/AwsSettingsTest.kt index b7b97556a5..a93b5bebd5 100644 --- a/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/settings/AwsSettingsTest.kt +++ b/plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/settings/AwsSettingsTest.kt @@ -26,7 +26,7 @@ import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService class AwsSettingsTest { private class TestTelemetryService( publisher: TelemetryPublisher = NoOpPublisher(), - batcher: TelemetryBatcher + batcher: TelemetryBatcher, ) : TelemetryService(publisher, batcher) private lateinit var telemetryService: TelemetryService diff --git a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockClientManager.kt b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockClientManager.kt index 8a0c56adc9..fcf9372fc3 100644 --- a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockClientManager.kt +++ b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockClientManager.kt @@ -30,7 +30,7 @@ class MockClientManager : AwsClientManager() { private data class Key( val clazz: KClass, val regionId: String? = null, - val credProviderId: AwsCredentialsProvider? = null + val credProviderId: AwsCredentialsProvider? = null, ) private val mockClients = mutableMapOf() @@ -42,7 +42,7 @@ class MockClientManager : AwsClientManager() { tokenProvider: SdkTokenProvider?, region: Region, endpointOverride: String?, - clientCustomizer: ToolkitClientCustomizer? + clientCustomizer: ToolkitClientCustomizer?, ): T = mockClients[Key(sdkClass, region.id(), credProvider)] as? T ?: mockClients[Key(sdkClass)] as? T ?: throw IllegalStateException("No mock registered for $sdkClass") diff --git a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockResourceCache.kt b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockResourceCache.kt index 010cfbec2d..66d5249ce5 100644 --- a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockResourceCache.kt +++ b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/MockResourceCache.kt @@ -31,7 +31,7 @@ class MockResourceCache : AwsResourceCache { resource: Resource, region: AwsRegion, credentialProvider: ToolkitCredentialsProvider, - useStale: Boolean + useStale: Boolean, ): T? = when (resource) { is Resource.View<*, T> -> getResourceIfPresent(resource.underlying, region, credentialProvider)?.let { resource.doMap(it, region) } is Resource.Cached -> mockResourceIfPresent(resource, region, credentialProvider) @@ -42,7 +42,7 @@ class MockResourceCache : AwsResourceCache { region: AwsRegion, credentialProvider: ToolkitCredentialsProvider, useStale: Boolean, - forceFetch: Boolean + forceFetch: Boolean, ): CompletionStage = when (resource) { is Resource.View<*, T> -> getResource(resource.underlying, region, credentialProvider, useStale, forceFetch).thenApply { resource.doMap(it as Any, region) @@ -56,7 +56,7 @@ class MockResourceCache : AwsResourceCache { resource: Resource, region: AwsRegion, tokenProvider: ToolkitBearerTokenProvider, - useStale: Boolean + useStale: Boolean, ): T? = when (resource) { is Resource.View<*, T> -> getResourceIfPresent(resource.underlying, region, tokenProvider)?.let { resource.doMap(it, region) } is Resource.Cached -> mockResourceIfPresent(resource, region, tokenProvider) @@ -67,7 +67,7 @@ class MockResourceCache : AwsResourceCache { region: AwsRegion, tokenProvider: ToolkitBearerTokenProvider, useStale: Boolean, - forceFetch: Boolean + forceFetch: Boolean, ): CompletionStage = when (resource) { is Resource.View<*, T> -> getResource(resource.underlying, region, tokenProvider, useStale, forceFetch).thenApply { resource.doMap(it as Any, region) @@ -80,7 +80,7 @@ class MockResourceCache : AwsResourceCache { private fun mockResourceIfPresent( resource: Resource.Cached, region: AwsRegion, - credentials: ToolkitAuthenticationProvider + credentials: ToolkitAuthenticationProvider, ): T? = when (val value = map[CacheKey(resource.id, region.id, credentials.id)]) { is CompletableFuture<*> -> if (value.isDone) value.get() as T else null else -> value as? T? @@ -89,7 +89,7 @@ class MockResourceCache : AwsResourceCache { private fun mockResource( resource: Resource.Cached, region: AwsRegion, - credentials: ToolkitAuthenticationProvider + credentials: ToolkitAuthenticationProvider, ) = when (val value = map[CacheKey(resource.id, region.id, credentials.id)]) { is CompletableFuture<*> -> value as CompletionStage else -> { diff --git a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/credentials/MockCredentialsManager.kt b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/credentials/MockCredentialsManager.kt index 6bb3aae4b8..2411d47017 100644 --- a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/credentials/MockCredentialsManager.kt +++ b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/core/credentials/MockCredentialsManager.kt @@ -39,26 +39,26 @@ class MockCredentialsManager : CredentialManager() { fun addCredentials( id: String, credentials: AwsCredentials = AwsBasicCredentials.create("Access", "Secret"), - regionId: String? = null + regionId: String? = null, ): CredentialIdentifier = addCredentials(id, StaticCredentialsProvider.create(credentials), regionId) fun addCredentials( id: String, credentials: AwsCredentialsProvider, - regionId: String? = null + regionId: String? = null, ): MockCredentialIdentifier = MockCredentialIdentifier(id, credentials, regionId).also { addProvider(it) } fun addCredentials( - credentialIdentifier: CredentialIdentifier + credentialIdentifier: CredentialIdentifier, ): CredentialIdentifier { addProvider(credentialIdentifier) return credentialIdentifier } fun addSsoProvider( - ssoSessionIdentifier: SsoSessionIdentifier + ssoSessionIdentifier: SsoSessionIdentifier, ): SsoSessionIdentifier { super.addSsoSession(ssoSessionIdentifier) return ssoSessionIdentifier @@ -67,7 +67,7 @@ class MockCredentialsManager : CredentialManager() { fun createCredentialProvider( id: String = aString(), credentials: AwsCredentials, - region: AwsRegion + region: AwsRegion, ): ToolkitCredentialsProvider { val credentialIdentifier = MockCredentialIdentifier(id, StaticCredentialsProvider.create(credentials), null) @@ -102,7 +102,7 @@ class MockCredentialsManager : CredentialManager() { override fun createAwsCredentialProvider( providerId: CredentialIdentifier, - region: AwsRegion + region: AwsRegion, ): ToolkitCredentialsProvider = ToolkitCredentialsProvider(providerId, (providerId as MockCredentialIdentifier).credentials) } } @@ -119,28 +119,28 @@ open class MockCredentialManagerRule : ApplicationRule() { fun addCredentials( id: String = aString(), credentials: AwsCredentials = AwsBasicCredentials.create("Access", "Secret"), - region: AwsRegion? = null + region: AwsRegion? = null, ): CredentialIdentifier = credentialManager.addCredentials(id, credentials, region?.id) fun addCredentials( id: String, credentials: AwsCredentialsProvider, - regionId: String? = null + regionId: String? = null, ): MockCredentialsManager.MockCredentialIdentifier = credentialManager.addCredentials(id, credentials, regionId) fun addCredentials( - credentialIdentifier: CredentialIdentifier + credentialIdentifier: CredentialIdentifier, ): CredentialIdentifier = credentialManager.addCredentials(credentialIdentifier) fun addSsoProvider( - ssoSessionIdentifier: SsoSessionIdentifier + ssoSessionIdentifier: SsoSessionIdentifier, ): SsoSessionIdentifier = credentialManager.addSsoProvider(ssoSessionIdentifier) fun createCredentialProvider( id: String = aString(), credentials: AwsCredentials = AwsBasicCredentials.create("Access", "Secret"), // Do not store this value as we should be able to dynamically change it - region: AwsRegion = getDefaultRegion() + region: AwsRegion = getDefaultRegion(), ): ToolkitCredentialsProvider = credentialManager.createCredentialProvider(id, credentials, region) fun getAwsCredentialProvider(providerId: CredentialIdentifier, region: AwsRegion): ToolkitCredentialsProvider = diff --git a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/AssertJMatchers.kt b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/AssertJMatchers.kt index 28149be11e..4aa3ac7840 100644 --- a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/AssertJMatchers.kt +++ b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/AssertJMatchers.kt @@ -46,7 +46,7 @@ fun AbstractAssert<*, T>.satisfiesKt(requirements: Consumer) = satisfies(requirements) as AbstractAssert<*, T> fun , ACTUAL : Throwable> AbstractThrowableAssert.hasCauseWithMessage( - message: String + message: String, ): AbstractThrowableAssert { satisfiesKt { parentThrowable -> assertThat(parentThrowable.cause).isNotNull.hasMessage(message) diff --git a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/rules/CodeInsightTestFixtureRule.kt b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/rules/CodeInsightTestFixtureRule.kt index 46233a7d5e..1fdc7d0c9d 100644 --- a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/rules/CodeInsightTestFixtureRule.kt +++ b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/rules/CodeInsightTestFixtureRule.kt @@ -165,7 +165,7 @@ fun CodeInsightTestFixture.addModule(moduleName: String): Module { fun CodeInsightTestFixture.addFileToModule( module: Module, relativePath: String, - fileText: String + fileText: String, ): PsiFile = runInEdtAndGet { val file = try { val contentRoot = ModuleRootManager.getInstance(module).contentRoots[0] diff --git a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/rules/JavaCodeInsightTestFixtureRule.kt b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/rules/JavaCodeInsightTestFixtureRule.kt index a88c882b41..8f4c87c366 100644 --- a/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/rules/JavaCodeInsightTestFixtureRule.kt +++ b/plugins/core/jetbrains-community/tstFixtures/software/aws/toolkits/jetbrains/utils/rules/JavaCodeInsightTestFixtureRule.kt @@ -151,7 +151,7 @@ private fun JavaCodeInsightTestFixture.addFile( module: Module, type: JpsModuleSourceRootType<*>, fileName: String, - content: String + content: String, ): PsiFile { val sourceRoot = ModuleRootManager.getInstance(module).getSourceRoots(type).first() val fullPath = Paths.get(sourceRoot.path, fileName).toString() diff --git a/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/deploy/SamDeployTest.kt b/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/deploy/SamDeployTest.kt index df5f4c2aff..50168564ec 100644 --- a/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/deploy/SamDeployTest.kt +++ b/plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/deploy/SamDeployTest.kt @@ -245,7 +245,7 @@ class SamDeployTest { stackName: String, hasImage: Boolean, parameters: Map = emptyMap(), - tags: Map = emptyMap() + tags: Map = emptyMap(), ): String? { val bucket = bucketRule.createBucket(stackName) val ecrRepo = if (hasImage) repositoryRule.createRepository(stackName).repositoryUri() else null diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/ExecutableBackedCacheResource.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/ExecutableBackedCacheResource.kt index 8633b7c938..a920158ce3 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/ExecutableBackedCacheResource.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/ExecutableBackedCacheResource.kt @@ -17,7 +17,7 @@ class ExecutableBackedCacheResource>( private val executableTypeClass: KClass, override val id: String, private val expiry: Duration? = null, - private val fetchCall: GeneralCommandLine.() -> ReturnType + private val fetchCall: GeneralCommandLine.() -> ReturnType, ) : Resource.Cached() { override fun fetch(connectionSettings: ClientConnectionSettings<*>): ReturnType { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilder.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilder.kt index b0320fc958..36297ed8a6 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilder.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenuBuilder.kt @@ -27,7 +27,7 @@ class ConnectionSettingsMenuBuilder private constructor() { private sealed interface IdentitySelectionSettings private data class SelectableIdentitySelectionSettings( val currentSelection: AwsBearerTokenConnection?, - val onChange: (AwsBearerTokenConnection) -> Unit + val onChange: (AwsBearerTokenConnection) -> Unit, ) : IdentitySelectionSettings private data class ActionsIdentitySelectionSettings(val project: Project?) : IdentitySelectionSettings @@ -200,7 +200,7 @@ class ConnectionSettingsMenuBuilder private constructor() { title: String, val value: T, private val selected: Boolean, - private val onSelect: (T) -> Unit + private val onSelect: (T) -> Unit, ) : ToggleAction(title), DumbAware { override fun getActionUpdateThread() = ActionUpdateThread.BGT @@ -216,13 +216,13 @@ class ConnectionSettingsMenuBuilder private constructor() { inner class SwitchRegionAction( value: AwsRegion, selected: Boolean, - onSelect: (AwsRegion) -> Unit + onSelect: (AwsRegion) -> Unit, ) : DumbAwareToggleAction(value.displayName, value, selected, onSelect) inner class SwitchCredentialsAction( value: CredentialIdentifier, selected: Boolean, - onSelect: (CredentialIdentifier) -> Unit + onSelect: (CredentialIdentifier) -> Unit, ) : DumbAwareToggleAction(value.displayName, value, selected, onSelect) inner class IndividualIdentityActionGroup(private val value: AwsBearerTokenConnection) : diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenus.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenus.kt index 191b33fcd2..7a31e96daf 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenus.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/credentials/ConnectionSettingsMenus.kt @@ -37,7 +37,7 @@ enum class ChangeSettingsMode(val showRegions: Boolean, val showCredentials: Boo NONE(false, false), CREDENTIALS(false, true), REGIONS(true, false), - BOTH(true, true) + BOTH(true, true), } /** diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/ToolkitDockerAdapter.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/ToolkitDockerAdapter.kt index 178ca101e4..7a86155118 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/ToolkitDockerAdapter.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/docker/ToolkitDockerAdapter.kt @@ -77,7 +77,7 @@ class ToolkitDockerAdapter(protected val project: Project, val runtimeFacade: Do fun pullImage( config: DockerRepositoryModel, - progressIndicator: ProgressIndicator? = null + progressIndicator: ProgressIndicator? = null, ) = agent.pullImage( DockerAgentRepositoryConfigImpl(config), object : DockerAgentProgressCallback { @@ -141,7 +141,7 @@ class ToolkitDockerAdapter(protected val project: Project, val runtimeFacade: Do agent: DockerAgent, config: DockerAgentDeploymentConfig, dockerfilePath: String, - tag: String + tag: String, ): String? { val queue = agent.createImageBuilder().asyncBuildImage(config).await() val future = CompletableFuture() @@ -178,5 +178,5 @@ class ToolkitDockerAdapter(protected val project: Project, val runtimeFacade: Do data class LocalImage( val imageId: String, - val tag: String? + val tag: String?, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/executables/ExecutableCommon.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/executables/ExecutableCommon.kt index e15651b308..cc87564a23 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/executables/ExecutableCommon.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/executables/ExecutableCommon.kt @@ -19,7 +19,7 @@ object ExecutableCommon { path: String, executableName: String, executableType: ExecutableType<*>? = null, - clientMetadata: ClientMetadata = ClientMetadata.getDefault() + clientMetadata: ClientMetadata = ClientMetadata.getDefault(), ): GeneralCommandLine { val sanitizedPath = path.nullize(true) ?: throw RuntimeException(message("executableCommon.cli_not_configured", executableName)) @@ -78,7 +78,7 @@ object ExecutableCommon { fun checkSemVerVersionForParallelValidVersions( version: SemVer, versionRange: List, - executableName: String + executableName: String, ) { versionRange.forEach { if (it.max > version && version >= it.min) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/executables/ExecutableManager.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/executables/ExecutableManager.kt index d3593d973f..924f2af121 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/executables/ExecutableManager.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/executables/ExecutableManager.kt @@ -274,7 +274,7 @@ sealed class ExecutableInstance { override val executablePath: Path, override val version: String, override val autoResolved: Boolean, - private val executableType: ExecutableType<*> + private val executableType: ExecutableType<*>, ) : ExecutableInstance(), ExecutableWithPath { // TODO get executable name as part of this fun getCommandLine(): GeneralCommandLine = @@ -285,7 +285,7 @@ sealed class ExecutableInstance { override val executablePath: Path, override val version: String?, override val autoResolved: Boolean, - override val validationError: String + override val validationError: String, ) : ExecutableInstance(), ExecutableWithPath, BadExecutable class UnresolvedExecutable(override val validationError: String) : ExecutableInstance(), BadExecutable { @@ -295,12 +295,12 @@ sealed class ExecutableInstance { // PersistentStateComponent requires a bean, so we wrap the List data class ExecutableStateList( - var value: List = listOf() + var value: List = listOf(), ) data class ExecutableState( var id: String? = null, var executablePath: String? = null, var autoResolved: Boolean? = false, - var lastKnownFileTime: Long? = null + var lastKnownFileTime: Long? = null, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtension.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtension.kt index 502086fbac..0409317f5e 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtension.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtension.kt @@ -121,7 +121,7 @@ class AwsConnectionRunConfigurationExtension> { fun > AwsConnectionRunConfigurationExtension.addEnvironmentVariables( configuration: T, cmdLine: GeneralCommandLine, - runtimeString: () -> String? = { null } + runtimeString: () -> String? = { null }, ) = addEnvironmentVariables(configuration, cmdLine.environment, runtimeString) fun > connectionSettingsEditor(configuration: T): AwsConnectionExtensionSettingsEditor = @@ -135,7 +135,7 @@ val AWS_CONNECTION_RUN_CONFIGURATION_KEY = data class AwsCredentialInjectionOptions( var useCurrentConnection: Boolean = false, var region: String? = null, - var credential: String? = null + var credential: String? = null, ) { companion object { operator fun invoke(block: AwsCredentialInjectionOptions.() -> Unit) = AwsCredentialInjectionOptions().apply(block) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionCommandLineTargetEnvironmentProvider.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionCommandLineTargetEnvironmentProvider.kt index dbb6d1cd78..f6ac6533cb 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionCommandLineTargetEnvironmentProvider.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionCommandLineTargetEnvironmentProvider.kt @@ -19,7 +19,7 @@ class PythonAwsConnectionCommandLineTargetEnvironmentProvider : PythonCommandLin project: Project, helpersAwareTargetRequest: HelpersAwareTargetEnvironmentRequest, pythonExecution: PythonExecution, - runParams: PythonRunParams + runParams: PythonRunParams, ) { if (!PythonAwsConnectionExperiment.isEnabled() && Registry.`is`("python.use.targets.api", true)) { return diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionExtension.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionExtension.kt index 7a73307a10..724a2791ed 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionExtension.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/PythonAwsConnectionExtension.kt @@ -23,7 +23,7 @@ class PythonAwsConnectionExtension : PythonRunConfigurationExtension() { configuration: AbstractPythonRunConfiguration<*>, runnerSettings: RunnerSettings?, cmdLine: GeneralCommandLine, - runnerId: String + runnerId: String, ) { if (isEnabled()) { delegate.addEnvironmentVariables(configuration, cmdLine, runtimeString = { configuration.getSdk()?.versionString }) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/experiments/ToolkitExperiment.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/experiments/ToolkitExperiment.kt index 4327ca5282..d25c1f1c1b 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/experiments/ToolkitExperiment.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/experiments/ToolkitExperiment.kt @@ -54,7 +54,7 @@ abstract class ToolkitExperiment( internal val description: () -> String, internal val hidden: Boolean = false, internal val default: Boolean = false, - internal val suggestionSnooze: Duration = Duration.ofDays(7) + internal val suggestionSnooze: Duration = Duration.ofDays(7), ) { override fun equals(other: Any?) = (other as? ToolkitExperiment)?.id?.equals(id) == true override fun hashCode() = id.hashCode() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsExplorerTreeStructureProvider.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsExplorerTreeStructureProvider.kt index 2416cb9a32..7ab1813291 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsExplorerTreeStructureProvider.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsExplorerTreeStructureProvider.kt @@ -20,7 +20,7 @@ abstract class AwsExplorerTreeStructureProvider : TreeStructureProvider { final override fun modify( parent: AbstractTreeNode<*>, children: MutableCollection>, - settings: ViewSettings? + settings: ViewSettings?, ): MutableCollection> = modify(parent, children) /** diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerToolWindow.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerToolWindow.kt index 50005b881b..ac42bd8ae2 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerToolWindow.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsToolkitExplorerToolWindow.kt @@ -34,7 +34,7 @@ class AwsToolkitExplorerToolWindowState : BaseState() { @State(name = "explorerToolWindow", storages = [Storage("aws.xml")]) class AwsToolkitExplorerToolWindow( - private val project: Project + private val project: Project, ) : SimpleToolWindowPanel(true, true), PersistentStateComponent { private val tabPane = JBTabbedPane() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/DeleteResourceDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/DeleteResourceDialog.kt index d50769a18b..4e121ca762 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/DeleteResourceDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/DeleteResourceDialog.kt @@ -19,7 +19,7 @@ class DeleteResourceDialog( project: Project, private val resourceType: String, private val resourceName: String, - private val comment: String = "" + private val comment: String = "", ) : DialogWrapper(project) { private val deleteResourceConfirmation = JBTextField().apply { emptyText.text = message("delete_resource.confirmation_text") diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ExplorerToolWindow.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ExplorerToolWindow.kt index 09daec89bf..1b625c5b0c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ExplorerToolWindow.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/ExplorerToolWindow.kt @@ -393,7 +393,7 @@ class ExplorerToolWindow(private val project: Project) : expanded: Boolean, leaf: Boolean, row: Int, - hasFocus: Boolean + hasFocus: Boolean, ) { super.customizeCellRenderer(tree, value, selected, expanded, leaf, row, hasFocus) if (value is DefaultMutableTreeNode && value.userObject is NodeDescriptor<*>) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/AnActionTreeNode.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/AnActionTreeNode.kt index 44a18cf200..1981750e78 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/AnActionTreeNode.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/AnActionTreeNode.kt @@ -13,7 +13,7 @@ import java.awt.event.MouseEvent open class AnActionTreeNode( project: Project, private val place: String, - private val action: AnAction + private val action: AnAction, ) : AbstractActionTreeNode( project, action.templatePresentation.text, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/DevToolsTreeStructureProvider.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/DevToolsTreeStructureProvider.kt index 0254034f12..e5c7c76cd0 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/DevToolsTreeStructureProvider.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/devToolsTab/DevToolsTreeStructureProvider.kt @@ -16,7 +16,7 @@ abstract class DevToolsTreeStructureProvider : TreeStructureProvider { final override fun modify( parent: AbstractTreeNode<*>, children: MutableCollection>, - settings: ViewSettings? + settings: ViewSettings?, ): MutableCollection> = modify(parent, children) abstract fun modify(parent: AbstractTreeNode<*>, children: MutableCollection>): MutableCollection> diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/nodes/AwsExplorerResourceNode.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/nodes/AwsExplorerResourceNode.kt index b3f30854bf..5419c5bfe1 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/nodes/AwsExplorerResourceNode.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/nodes/AwsExplorerResourceNode.kt @@ -13,7 +13,7 @@ abstract class AwsExplorerResourceNode( project: Project, val serviceId: String, value: T, - awsIcon: Icon? = null + awsIcon: Icon? = null, ) : AwsExplorerNode(project, value, awsIcon), ResourceActionNode { override fun actionGroupName() = "aws.toolkit.explorer.$serviceId.${resourceType()}" diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/GatewaySetupAuthenticationDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/GatewaySetupAuthenticationDialog.kt index 0e5b32afb4..cbff394541 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/GatewaySetupAuthenticationDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/GatewaySetupAuthenticationDialog.kt @@ -37,7 +37,7 @@ data class GatewaySetupAuthenticationDialogState( data class IdentityCenterTabState( var startUrl: String = "", var region: AwsRegion = AwsRegionProvider.getInstance().defaultRegion(), - var rolePopupState: IdcRolePopupState = IdcRolePopupState() + var rolePopupState: IdcRolePopupState = IdcRolePopupState(), ) // has no state yet @@ -46,7 +46,7 @@ data class GatewaySetupAuthenticationDialogState( enum class GatewaySetupAuthenticationTabs { IDENTITY_CENTER, - BUILDER_ID + BUILDER_ID, } class GatewaySetupAuthenticationDialog( @@ -54,7 +54,7 @@ class GatewaySetupAuthenticationDialog( private val scopes: List = emptyList(), private val state: GatewaySetupAuthenticationDialogState = GatewaySetupAuthenticationDialogState(), private val tabSettings: Map = emptyMap(), - private val promptForIdcPermissionSet: Boolean = false + private val promptForIdcPermissionSet: Boolean = false, ) : DialogWrapper(project), AuthenticationDialog { private val rootTabPane = JBTabbedPane() private val idcTab = IdcTabPanelBuilder(state.idcTabState::startUrl, state.idcTabState::region).build() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitAuthUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitAuthUtils.kt index 82700c2ea4..4408c9aba0 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitAuthUtils.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitAuthUtils.kt @@ -20,7 +20,7 @@ fun rolePopupFromConnection( project: Project, connection: AwsBearerTokenConnection, configFilesFacade: ConfigFilesFacade = DefaultConfigFilesFacade(), - isFirstInstance: Boolean = false + isFirstInstance: Boolean = false, ) { runInEdt { if (!connection.id.startsWith(SsoSessionConstants.SSO_SESSION_SECTION_NAME)) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitGettingStartedAuthUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitGettingStartedAuthUtils.kt index f3ddccbb55..a04f530a60 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitGettingStartedAuthUtils.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/ToolkitGettingStartedAuthUtils.kt @@ -28,7 +28,7 @@ fun requestCredentialsForCodeCatalyst( project ), isFirstInstance: Boolean = false, - connectionInitiatedFromExplorer: Boolean = false + connectionInitiatedFromExplorer: Boolean = false, ): Boolean? { if (JBCefApp.isSupported() && project != null) { ToolkitWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.Codecatalyst, true)) // TODO: consume data @@ -120,7 +120,7 @@ fun requestCredentialsForExplorer( project ), isFirstInstance: Boolean = false, - connectionInitiatedFromExplorer: Boolean = false + connectionInitiatedFromExplorer: Boolean = false, ): Boolean? { if (JBCefApp.isSupported()) { ToolkitWebviewPanel.getInstance(project).browser?.prepareBrowser(BrowserState(FeatureId.AwsExplorer, true)) // TODO: consume data diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedEditor.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedEditor.kt index 7f0845a5dc..f60cf4a4c5 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedEditor.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedEditor.kt @@ -16,7 +16,7 @@ class GettingStartedEditor( private val project: Project, private val file: VirtualFile, private val isFirstInstance: Boolean, - private val connectionInitiatedFromExplorer: Boolean = false + private val connectionInitiatedFromExplorer: Boolean = false, ) : UserDataHolderBase(), FileEditor { override fun dispose() { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt index c3d45c2107..e18e67d02f 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt @@ -77,7 +77,7 @@ import javax.swing.JLabel class GettingStartedPanel( private val project: Project, private val isFirstInstance: Boolean = false, - private val connectionInitiatedFromExplorer: Boolean = false + private val connectionInitiatedFromExplorer: Boolean = false, ) : BorderLayoutPanel(), Disposable { private val infoBanner = ConnectionInfoBanner() private val featureSetPanel = FeatureColumns() @@ -1197,7 +1197,7 @@ class GettingStartedPanel( data class AuthPanelBullet( val enable: Boolean, val titleName: String, - val comment: String + val comment: String, ) private inner class FeatureColumns : BorderLayoutPanel(10, 0) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt index a072aaac81..7cec59d6fe 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt @@ -11,7 +11,7 @@ import org.jetbrains.plugins.terminal.LocalTerminalDirectRunner class AwsLocalTerminalRunner( project: Project, private val termName: String, - private val applyConnection: (MutableMap) -> Unit + private val applyConnection: (MutableMap) -> Unit, ) : LocalTerminalDirectRunner(project) { override fun getInitialCommand(envs: MutableMap): MutableList = super.getInitialCommand(envs.apply(applyConnection)) override fun createTerminalWidget(parent: Disposable, currentWorkingDirectory: String?, deferSessionStartUntilUiShown: Boolean): JBTerminalWidget { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/DefaultToolManager.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/DefaultToolManager.kt index e839a74eca..142a14726c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/DefaultToolManager.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/DefaultToolManager.kt @@ -105,7 +105,7 @@ class DefaultToolManager @NonInjectable internal constructor(private val clock: override fun validateCompatability( tool: Tool>?, stricterMinVersion: T?, - project: Project? + project: Project?, ): Validity { tool ?: return Validity.NotInstalled diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/ToolManager.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/ToolManager.kt index eae40810e8..0c8a191e3d 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/ToolManager.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/tools/ToolManager.kt @@ -48,7 +48,7 @@ interface ToolManager { fun validateCompatability( tool: Tool>?, stricterMinVersion: T? = null, - project: Project? = null + project: Project? = null, ): Validity companion object { @@ -69,7 +69,7 @@ fun ToolManager.validateCompatability( path: Path, type: ToolType, stricterMinVersion: T? = null, - project: Project? = null + project: Project? = null, ): Validity = validateCompatability(getToolForPath(type, path), stricterMinVersion, project) fun ToolType.getTool(): Tool>? = ToolManager.getInstance().getTool(this) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/toolwindow/ToolkitToolWindow.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/toolwindow/ToolkitToolWindow.kt index 01bce86349..03ea4793b1 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/toolwindow/ToolkitToolWindow.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/toolwindow/ToolkitToolWindow.kt @@ -32,7 +32,7 @@ interface ToolkitToolWindow { component: JComponent, activate: Boolean = false, id: String = title, - additionalDisposable: Disposable? = null + additionalDisposable: Disposable? = null, ): Content { val toolWindow = toolWindow() val contentManager = toolWindow.contentManager diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/apprunner/AppRunnerExplorerNode.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/apprunner/AppRunnerExplorerNode.kt index c0cee63810..3d91548e59 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/apprunner/AppRunnerExplorerNode.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/apprunner/AppRunnerExplorerNode.kt @@ -23,7 +23,7 @@ class AppRunnerNode(project: Project, service: AwsExplorerServiceNode) : class AppRunnerServiceNode( project: Project, - val service: ServiceSummary + val service: ServiceSummary, ) : AwsExplorerResourceNode( project, AppRunnerClient.SERVICE_NAME, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsClientCustomizer.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsClientCustomizer.kt index 5e9ed071af..62234846d2 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsClientCustomizer.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsClientCustomizer.kt @@ -27,7 +27,7 @@ class CawsClientCustomizer : ToolkitClientCustomizer { tokenProvider: SdkTokenProvider?, regionId: String, builder: AwsClientBuilder<*, *>, - clientOverrideConfiguration: ClientOverrideConfiguration.Builder + clientOverrideConfiguration: ClientOverrideConfiguration.Builder, ) { if (builder is CodeCatalystClientBuilder) { val endpointOverride = Registry.get("aws.codecatalyst.endpoint").asString().nullize(true) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCloneDialogComponent.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCloneDialogComponent.kt index 1c12b3299e..2e1a6e97b9 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCloneDialogComponent.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCloneDialogComponent.kt @@ -55,7 +55,7 @@ import software.aws.toolkits.telemetry.Result as TelemetryResult class CawsCloneDialogComponent( private val project: Project, - private val modalityState: ModalityState + private val modalityState: ModalityState, ) : VcsCloneDialogExtensionComponent() { private lateinit var client: CodeCatalystClient private lateinit var cawsConnectionSettings: ClientConnectionSettings<*> diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCodeRepository.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCodeRepository.kt index 99781dc5f4..cff5e9a9b2 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCodeRepository.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsCodeRepository.kt @@ -6,7 +6,7 @@ package software.aws.toolkits.jetbrains.services.caws data class CawsCodeRepository( val space: String, val project: String, - val name: String + val name: String, ) { val presentableString by lazy { "$space/$project/$name" } } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsParameterDescriptions.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsParameterDescriptions.kt index ba063052ea..fa3d43a76f 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsParameterDescriptions.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsParameterDescriptions.kt @@ -22,30 +22,30 @@ fun loadParameterDescriptions(): ParameterDescriptions = descriptions data class ParameterDescriptions( @JsonProperty("environment") - val environmentParameters: EnvironmentParameters + val environmentParameters: EnvironmentParameters, ) data class EnvironmentParameters( @JsonProperty("instanceType") val instanceTypes: Map, - val persistentStorageSize: List + val persistentStorageSize: List, ) data class InstanceInfo( @JsonProperty("vcpus") val vCpus: Int, val ram: Ram, - val arch: String + val arch: String, ) data class Ram( val value: Int, - val unit: String + val unit: String, ) fun isSubscriptionFreeTier( client: CodeCatalystClient, - space: String? + space: String?, ): Boolean { val subscriptionTier = if (space != null) { client.getSubscription { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsProject.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsProject.kt index ebad6c2b5b..e365c38a03 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsProject.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/CawsProject.kt @@ -5,5 +5,5 @@ package software.aws.toolkits.jetbrains.services.caws data class CawsProject( val space: String, - val project: String + val project: String, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/CawsEnvironmentClient.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/CawsEnvironmentClient.kt index afc4c2f107..b4147f67d4 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/CawsEnvironmentClient.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/CawsEnvironmentClient.kt @@ -35,7 +35,7 @@ import software.aws.toolkits.resources.message @Service class CawsEnvironmentClient( private val endpoint: String = System.getenv(CawsConstants.CAWS_ENV_API_ENDPOINT).nullize(true) ?: CawsConstants.DEFAULT_CAWS_ENV_API_ENDPOINT, - private val httpClient: CloseableHttpClient = HttpClientBuilder.create().build() + private val httpClient: CloseableHttpClient = HttpClientBuilder.create().build(), ) : Disposable { init { LOG.info { "Initialized with endpoint: $endpoint" } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/CreateDevfileRequest.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/CreateDevfileRequest.kt index cddd53845f..27b4806743 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/CreateDevfileRequest.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/CreateDevfileRequest.kt @@ -8,5 +8,5 @@ package software.aws.toolkits.jetbrains.services.caws.envclient.models * @param path */ data class CreateDevfileRequest( - val path: String + val path: String, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/CreateDevfileResponse.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/CreateDevfileResponse.kt index 56408b8c51..3e90feebd5 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/CreateDevfileResponse.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/CreateDevfileResponse.kt @@ -8,5 +8,5 @@ package software.aws.toolkits.jetbrains.services.caws.envclient.models * @param location */ data class CreateDevfileResponse( - val location: String + val location: String, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/Error.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/Error.kt index c751587f2f..c9e36e4b5c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/Error.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/Error.kt @@ -8,5 +8,5 @@ package software.aws.toolkits.jetbrains.services.caws.envclient.models */ data class Error( /* A description of the error condition */ - val message: String? = null + val message: String? = null, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/GetActivityResponse.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/GetActivityResponse.kt index 836c10f122..bcf671b495 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/GetActivityResponse.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/GetActivityResponse.kt @@ -4,5 +4,5 @@ package software.aws.toolkits.jetbrains.services.caws.envclient.models data class GetActivityResponse( - val timestamp: String + val timestamp: String, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/GetStatusResponse.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/GetStatusResponse.kt index ba739af573..93e89910ac 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/GetStatusResponse.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/GetStatusResponse.kt @@ -16,7 +16,7 @@ data class GetStatusResponse( val actionId: String? = null, val status: Status? = null, val message: String? = null, - val location: String? = null + val location: String? = null, ) { /** * Values: PENDING,STABLE,CHANGED,IMAGES-UPDATE-AVAILABLE @@ -28,6 +28,6 @@ data class GetStatusResponse( IMAGES_UPDATE_AVAILABLE("IMAGES-UPDATE-AVAILABLE"), @JsonEnumDefaultValue - UNKNOWN("UNKNOWN") + UNKNOWN("UNKNOWN"), } } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/StartDevfileRequest.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/StartDevfileRequest.kt index 39bb3b316a..7bf0ad2347 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/StartDevfileRequest.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/StartDevfileRequest.kt @@ -5,5 +5,5 @@ package software.aws.toolkits.jetbrains.services.caws.envclient.models data class StartDevfileRequest( val location: String? = null, - val recreateHomeVolumes: Boolean? = null + val recreateHomeVolumes: Boolean? = null, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/UpdateActivityRequest.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/UpdateActivityRequest.kt index 1984358e8f..55876ec380 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/UpdateActivityRequest.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/envclient/models/UpdateActivityRequest.kt @@ -4,5 +4,5 @@ package software.aws.toolkits.jetbrains.services.caws.envclient.models data class UpdateActivityRequest( - val timestamp: String? = null + val timestamp: String? = null, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/projectstate/CawsProjectSettings.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/projectstate/CawsProjectSettings.kt index 7cc8a53d4c..6c87c8f724 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/projectstate/CawsProjectSettings.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/caws/projectstate/CawsProjectSettings.kt @@ -19,5 +19,5 @@ class CawsProjectSettings(private val project: Project) { data class CawsProjectSettingsState( var cawsProject: CawsProject? = null, - var codeRepo: CawsCodeRepository? = null + var codeRepo: CawsCodeRepository? = null, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormation.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormation.kt index e59dff804a..627076820b 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormation.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormation.kt @@ -67,7 +67,7 @@ private val CFN_CREATE_FAILURE_TERMINAL_STATES = setOf( fun CloudFormationClient.waitForStackCreateComplete( stackName: String, maxAttempts: Int = 720, - delay: Duration = Duration.ofSeconds(5) + delay: Duration = Duration.ofSeconds(5), ) { wait( call = { this.describeStacks(DescribeStacksRequest.builder().stackName(stackName).build()).stacks()[0] }, @@ -100,7 +100,7 @@ private val CFN_UPDATE_FAILURE_TERMINAL_STATES = setOf( fun CloudFormationClient.waitForStackUpdateComplete( stackName: String, maxAttempts: Int = 720, - delay: Duration = Duration.ofSeconds(5) + delay: Duration = Duration.ofSeconds(5), ) { wait( call = { this.describeStacks(DescribeStacksRequest.builder().stackName(stackName).build()).stacks()[0] }, @@ -136,7 +136,7 @@ private val CFN_DELETE_FAILURE_TERMINAL_STATES = setOf( fun CloudFormationClient.waitForStackDeletionComplete( stackName: String, maxAttempts: Int = 120, - delay: Duration = Duration.ofSeconds(20) + delay: Duration = Duration.ofSeconds(20), ) { wait( call = { this.describeStacks(DescribeStacksRequest.builder().stackName(stackName).build()).stacks()[0] }, @@ -159,7 +159,7 @@ fun CloudFormationClient.waitForChangeSetCreateComplete( stackName: String, changeSetName: String, maxAttempts: Int = 120, - delay: Duration = Duration.ofSeconds(2) + delay: Duration = Duration.ofSeconds(2), ) { wait( call = { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationExplorerNodes.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationExplorerNodes.kt index 5500eb01a2..741a49cb80 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationExplorerNodes.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationExplorerNodes.kt @@ -30,7 +30,7 @@ class CloudFormationStackNode( project: Project, val stackName: String, private val stackStatus: StackStatus, - val stackId: String + val stackId: String, ) : AwsExplorerResourceNode( project, CloudFormationClient.SERVICE_NAME, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationTemplateIndex.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationTemplateIndex.kt index 327132eff0..ea4f8d29d8 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationTemplateIndex.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/CloudFormationTemplateIndex.kt @@ -95,7 +95,7 @@ class CloudFormationTemplateIndex : FileBasedIndexExtension Boolean = { true }, - virtualFile: VirtualFile? = null + virtualFile: VirtualFile? = null, ): Collection { val index = FileBasedIndex.getInstance() val scope = virtualFile?.let { GlobalSearchScope.fileScope(project, it) } ?: GlobalSearchScope.projectScope(project) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/DynamicTableView.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/DynamicTableView.kt index d3d335c983..b63cae1c17 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/DynamicTableView.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/DynamicTableView.kt @@ -58,6 +58,6 @@ class DynamicTableView(private vararg val fields: Field) : View { data class Field( val readableName: String, val renderer: TableCellRenderer? = null, - val getData: (T) -> Any? + val getData: (T) -> Any?, ) } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Stack.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Stack.kt index 97ec5c573b..2ae7a82e77 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Stack.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Stack.kt @@ -71,7 +71,7 @@ private class StackUI( private val project: Project, private val stackName: String, stackId: String, - private val toolWindow: ToolkitToolWindow + private val toolWindow: ToolkitToolWindow, ) : UpdateListener, Disposable { val toolWindowTab: Content diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/TreeView.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/TreeView.kt index 45156be80f..9b32daba9a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/TreeView.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/TreeView.kt @@ -122,7 +122,7 @@ private class StackNodeDescriptor( private var statusType: StatusType, private var status: String, parent: StackNodeDescriptor? = null, - var physicalId: String? = null + var physicalId: String? = null, ) : NodeDescriptor(project, parent) { init { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Updater.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Updater.kt index 7188f5a821..faee346801 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Updater.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/Updater.kt @@ -39,7 +39,7 @@ class Updater( private val listener: UpdateListener, private val client: CloudFormationClient, private val setPagesAvailable: (Set) -> Unit, - private val stackId: String + private val stackId: String, ) : Disposable { @Volatile @@ -152,7 +152,7 @@ class Updater( stackStatus: StackStatus, resources: Collection, newEvents: List, - pageChanged: Boolean + pageChanged: Boolean, ) { assert(SwingUtilities.isEventDispatchThread()) treeView.setStackStatus(stackStatus) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/View.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/View.kt index 7be46a445e..dcd1901c38 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/View.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/stack/View.kt @@ -24,7 +24,7 @@ interface View { */ enum class Page(val icon: Icon) { PREVIOUS(AllIcons.Actions.Back), - NEXT(AllIcons.Actions.Forward) + NEXT(AllIcons.Actions.Forward), } enum class StatusType(val icon: Icon, val color: JBColor, private val animatedIconStrategy: (() -> AnimatedIcon)? = null) { @@ -32,7 +32,8 @@ enum class StatusType(val icon: Icon, val color: JBColor, private val animatedIc PROGRESS(AllIcons.Process.ProgressResume, JBColor.ORANGE, { AnimatedIcon.FS() }), COMPLETED(AllIcons.RunConfigurations.ToolbarPassed, BETTER_GREEN), DELETED(AllIcons.RunConfigurations.ToolbarSkipped, JBColor.GRAY), - FAILED(AllIcons.RunConfigurations.ToolbarFailed, JBColor.RED); + FAILED(AllIcons.RunConfigurations.ToolbarFailed, JBColor.RED), + ; val animatedIconIfPossible: Icon get() = animatedIconStrategy?.let { it() } ?: icon @@ -53,14 +54,16 @@ internal val StackStatus.type: StatusType StackStatus.DELETE_IN_PROGRESS, StackStatus.REVIEW_IN_PROGRESS, StackStatus.UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS, - StackStatus.UPDATE_COMPLETE_CLEANUP_IN_PROGRESS -> StatusType.PROGRESS + StackStatus.UPDATE_COMPLETE_CLEANUP_IN_PROGRESS, + -> StatusType.PROGRESS StackStatus.DELETE_COMPLETE -> StatusType.DELETED StackStatus.ROLLBACK_COMPLETE, StackStatus.DELETE_FAILED, StackStatus.UPDATE_ROLLBACK_FAILED, StackStatus.ROLLBACK_FAILED, StackStatus.UPDATE_ROLLBACK_COMPLETE, - StackStatus.CREATE_FAILED -> StatusType.FAILED + StackStatus.CREATE_FAILED, + -> StatusType.FAILED else -> StatusType.UNKNOWN } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplate.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplate.kt index c5e8f57d38..26bedbe2f4 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplate.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudformation/yaml/YamlCloudFormationTemplate.kt @@ -90,7 +90,7 @@ class YamlCloudFormationTemplate(template: YAMLFile) : CloudFormationTemplate { private class YamlResource( override val logicalName: String, override val cloudFormationTemplate: CloudFormationTemplate, - private val delegate: YAMLMapping + private val delegate: YAMLMapping, ) : YAMLMapping by delegate, Resource { override fun isType(requestedType: String): Boolean = try { type() == requestedType diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchActor.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchActor.kt index 0847232d00..13eb45cf5f 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchActor.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchActor.kt @@ -41,7 +41,7 @@ import java.time.Duration sealed class CloudWatchActor( protected val project: Project, protected val client: CloudWatchLogsClient, - protected val table: TableView + protected val table: TableView, ) : Disposable { @Suppress("LeakingThis") protected val coroutineScope = disposableCoroutineScope(this) @@ -110,7 +110,7 @@ sealed class CloudWatchActor( abstract class CloudWatchLogsActor( project: Project, client: CloudWatchLogsClient, - table: TableView + table: TableView, ) : CloudWatchActor(project, client, table) { sealed class Message { object LoadInitial : Message() @@ -225,7 +225,7 @@ class LogStreamFilterActor( client: CloudWatchLogsClient, table: TableView, private val logGroup: String, - private val logStream: String + private val logStream: String, ) : CloudWatchLogsActor(project, client, table) { override val emptyText = message("cloudwatch.logs.no_events_query", logStream) override val tableErrorMessage = message("cloudwatch.logs.failed_to_load_stream", logStream) @@ -276,7 +276,7 @@ class LogStreamListActor( client: CloudWatchLogsClient, table: TableView, private val logGroup: String, - private val logStream: String + private val logStream: String, ) : CloudWatchLogsActor(project, client, table) { override val emptyText = message("cloudwatch.logs.no_events") @@ -326,7 +326,7 @@ class LogStreamListActor( private fun getLogEvents( request: GetLogEventsRequest, saveForwardToken: Boolean = false, - saveBackwardToken: Boolean = false + saveBackwardToken: Boolean = false, ): List { val response = client.getLogEvents(request) val events = response.events().filterNotNull().map { it.toLogStreamEntry() } @@ -345,7 +345,7 @@ class LogGroupActor( project: Project, client: CloudWatchLogsClient, table: TableView, - private val logGroup: String + private val logGroup: String, ) : CloudWatchLogsActor(project, client, table) { override val emptyText = message("cloudwatch.logs.no_log_streams") override val tableErrorMessage = message("cloudwatch.logs.failed_to_load_streams", logGroup) @@ -390,7 +390,7 @@ class LogGroupSearchActor( project: Project, client: CloudWatchLogsClient, table: TableView, - private val logGroup: String + private val logGroup: String, ) : CloudWatchLogsActor(project, client, table) { override val emptyText = message("cloudwatch.logs.no_log_streams") override val tableErrorMessage = message("cloudwatch.logs.failed_to_load_streams", logGroup) @@ -435,7 +435,7 @@ class InsightsQueryResultsActor( project: Project, client: CloudWatchLogsClient, table: TableView, - private val queryId: String + private val queryId: String, ) : CloudWatchActor(project, client, table) { sealed class Message { object StartLoadingAll : Message() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogWindow.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogWindow.kt index 62a1e92ece..4574d530d6 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogWindow.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogWindow.kt @@ -50,7 +50,7 @@ class CloudWatchLogWindow(override val project: Project) : ToolkitToolWindow { logStream: String, previousEvent: LogStreamEntry? = null, duration: Duration? = null, - streamLogs: Boolean = false + streamLogs: Boolean = false, ) { var result = Result.Succeeded try { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogsServiceNode.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogsServiceNode.kt index 511a92a210..44b90e7d59 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogsServiceNode.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/CloudWatchLogsServiceNode.kt @@ -26,7 +26,7 @@ class CloudWatchLogsServiceNode(project: Project, service: AwsExplorerServiceNod class CloudWatchLogsNode( project: Project, val arn: String, - val logGroupName: String + val logGroupName: String, ) : AwsExplorerResourceNode( project, CloudWatchLogsClient.SERVICE_NAME, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/DownloadLogStream.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/DownloadLogStream.kt index a5335d4448..eb8676ae6c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/DownloadLogStream.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/DownloadLogStream.kt @@ -44,7 +44,7 @@ class LogStreamDownloadTask( private val edt: CoroutineContext, val client: CloudWatchLogsClient, val logGroup: String, - val logStream: String + val logStream: String, ) : Task.Backgroundable(project, message("cloudwatch.logs.opening_in_editor", logStream), true) { override fun run(indicator: ProgressIndicator) = runBlocking { @@ -126,7 +126,7 @@ class LogStreamDownloadToFileTask( private val logGroup: String, private val logStream: String, private val buffer: String, - private val request: GetLogEventsRequest? = null + private val request: GetLogEventsRequest? = null, ) : Task.Backgroundable(project, message("cloudwatch.logs.saving_to_disk", logStream), true) { private val edt = getCoroutineUiContext() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/DownloadLogStreamToFileAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/DownloadLogStreamToFileAction.kt index de14858591..a7b7044276 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/DownloadLogStreamToFileAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/DownloadLogStreamToFileAction.kt @@ -17,7 +17,7 @@ class DownloadLogStreamToFileAction( private val project: Project, private val client: CloudWatchLogsClient, private val logGroup: String, - private val logStream: String? + private val logStream: String?, ) : AnAction(message("cloudwatch.logs.save_action"), null, AllIcons.Actions.MenuSaveall), DumbAware { override fun actionPerformed(e: AnActionEvent) { logStream ?: return diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/ExportActionGroup.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/ExportActionGroup.kt index e106d8cfa8..588cbf046f 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/ExportActionGroup.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/ExportActionGroup.kt @@ -16,7 +16,7 @@ class ExportActionGroup( private val project: Project, private val client: CloudWatchLogsClient, private val logGroup: String, - private val logStream: () -> String? + private val logStream: () -> String?, ) : ActionGroup(message("cloudwatch.logs.export"), null, AllIcons.Actions.Download), DumbAware { init { isPopup = true diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/OpenCurrentInEditorAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/OpenCurrentInEditorAction.kt index 8d6bb2222d..55bdf58d8c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/OpenCurrentInEditorAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/OpenCurrentInEditorAction.kt @@ -20,7 +20,7 @@ import software.aws.toolkits.telemetry.CloudwatchlogsTelemetry class OpenCurrentInEditorAction( private val project: Project, private val logStream: String, - private val tableEntries: () -> List + private val tableEntries: () -> List, ) : AnAction(message("cloudwatch.logs.open_in_editor"), null, AllIcons.Actions.MenuOpen), DumbAware { private val coroutineScope = projectCoroutineScope(project) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/OpenLogStreamInEditorAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/OpenLogStreamInEditorAction.kt index c71cf3ddc1..e55e69d216 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/OpenLogStreamInEditorAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/OpenLogStreamInEditorAction.kt @@ -20,7 +20,7 @@ class OpenLogStreamInEditorAction( private val project: Project, private val client: CloudWatchLogsClient, private val logGroup: String, - private val logStream: String? + private val logStream: String?, ) : AnAction(message("cloudwatch.logs.open_in_editor"), null, AllIcons.Actions.MenuOpen), DumbAware { override fun actionPerformed(e: AnActionEvent) { logStream ?: return diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/ShowLogsAroundAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/ShowLogsAroundAction.kt index 81330300f7..9aa550fc9a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/ShowLogsAroundAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/actions/ShowLogsAroundAction.kt @@ -21,7 +21,7 @@ class ShowLogsAroundActionGroup( private val project: Project, private val logGroup: String, private val logStream: String, - private val treeTable: TableView + private val treeTable: TableView, ) : ActionGroup(message("cloudwatch.logs.show_logs_around"), null, null), DumbAware { init { isPopup = true @@ -40,7 +40,7 @@ private class ShowLogsAround( private val logStream: String, private val treeTable: TableView, timeMessage: String, - private val duration: Duration + private val duration: Duration, ) : AnAction(timeMessage, null, null), DumbAware { override fun actionPerformed(e: AnActionEvent) = runBlocking { CloudwatchlogsTelemetry.showEventsAround(project, success = true, value = duration.toMillis().toDouble()) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/CloudWatchLogGroup.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/CloudWatchLogGroup.kt index 39f951f99d..8ab97f3005 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/CloudWatchLogGroup.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/CloudWatchLogGroup.kt @@ -34,7 +34,7 @@ import javax.swing.JPanel class CloudWatchLogGroup( private val project: Project, - private val logGroup: String + private val logGroup: String, ) : Disposable { private val coroutineScope = disposableCoroutineScope(this) lateinit var content: JPanel diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/CloudWatchLogStream.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/CloudWatchLogStream.kt index b0008e8690..833e903630 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/CloudWatchLogStream.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/CloudWatchLogStream.kt @@ -40,7 +40,7 @@ class CloudWatchLogStream( private val logStream: String, private val previousEvent: LogStreamEntry? = null, private val duration: Duration? = null, - streamLogs: Boolean = false + streamLogs: Boolean = false, ) : Disposable { private val coroutineScope = disposableCoroutineScope(this) lateinit var content: JPanel diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/LogGroupTable.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/LogGroupTable.kt index e02233cae5..63336316a7 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/LogGroupTable.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/LogGroupTable.kt @@ -39,7 +39,7 @@ class LogGroupTable( private val project: Project, private val client: CloudWatchLogsClient, private val logGroup: String, - type: TableType + type: TableType, ) : Disposable { private val coroutineScope = disposableCoroutineScope(this) val component: JComponent @@ -49,7 +49,7 @@ class LogGroupTable( enum class TableType { LIST, - FILTER + FILTER, } init { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/LogStreamTable.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/LogStreamTable.kt index 0c2214ae29..9229429013 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/LogStreamTable.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/LogStreamTable.kt @@ -34,13 +34,13 @@ class LogStreamTable( client: CloudWatchLogsClient, private val logGroup: String, private val logStream: String, - type: TableType + type: TableType, ) : Disposable { private val coroutineScope = disposableCoroutineScope(this) enum class TableType { LIST, - FILTER + FILTER, } val component: JComponent diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/TableUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/TableUtils.kt index 2641d06c13..b8070c485b 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/TableUtils.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/editor/TableUtils.kt @@ -43,7 +43,7 @@ class LogStreamsStreamColumnRenderer : TableCellRenderer { class LogStreamsDateColumn( private val sortable: Boolean, - val format: SyncDateFormat? = null + val format: SyncDateFormat? = null, ) : ColumnInfo(message("cloudwatch.logs.last_event_time")) { private val renderer = ResizingTextColumnRenderer() override fun valueOf(item: LogStream?): String? = TimeFormatConversion.convertEpochTimeToStringDateTime( diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/DetailedLogRecord.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/DetailedLogRecord.kt index 84ef9442b6..92651794a6 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/DetailedLogRecord.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/DetailedLogRecord.kt @@ -30,7 +30,7 @@ import javax.swing.JPanel class DetailedLogRecord( private val project: Project, private val client: CloudWatchLogsClient, - private val logRecordPointer: String + private val logRecordPointer: String, ) : Disposable { private val coroutineScope = disposableCoroutineScope(this) val title = message("cloudwatch.logs.log_record", logRecordPointer) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/LogGroupSelectorTable.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/LogGroupSelectorTable.kt index 70b6f1427b..a88cdc23f7 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/LogGroupSelectorTable.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/LogGroupSelectorTable.kt @@ -11,7 +11,7 @@ import software.aws.toolkits.resources.message data class LogGroup( var selected: Boolean = false, - var name: String + var name: String, ) class LogGroupSelectorTable : TableView(model) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryDetails.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryDetails.kt index 0e433605ce..7df6db99eb 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryDetails.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryDetails.kt @@ -15,7 +15,7 @@ data class QueryDetails( val connectionSettings: ConnectionSettings, val logGroups: List, val timeRange: TimeRange, - val query: QueryString + val query: QueryString, ) { fun getQueryRange(clock: Clock = Clock.systemUTC()) = when (timeRange) { @@ -47,25 +47,25 @@ data class QueryDetails( sealed class QueryString { data class SearchTermQueryString( - val searchTerm: String + val searchTerm: String, ) : QueryString() data class InsightsQueryString( - val query: String + val query: String, ) : QueryString() } sealed class TimeRange { data class AbsoluteRange( val startDate: Date, - val endDate: Date + val endDate: Date, ) : TimeRange() data class RelativeRange( val relativeTimeAmount: Long, - val relativeTimeUnit: ChronoUnit + val relativeTimeUnit: ChronoUnit, ) : TimeRange() } data class StartEndInstant( val start: Instant, - val end: Instant + val end: Instant, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditor.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditor.kt index e524a901f2..0a7d6c847f 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditor.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditor.kt @@ -26,7 +26,7 @@ import javax.swing.JTextField class QueryEditor internal constructor( private val project: Project, - private val initialQueryDetails: QueryDetails + private val initialQueryDetails: QueryDetails, ) { lateinit var absoluteTimeRadioButton: JRadioButton private set diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditorDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditorDialog.kt index b20eff42cf..4611a38af4 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditorDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditorDialog.kt @@ -32,7 +32,7 @@ import javax.swing.JComponent class QueryEditorDialog internal constructor( // TODO: Exposed for testing only, should be refactored to be private private val project: Project, - private val initialQueryDetails: QueryDetails + private val initialQueryDetails: QueryDetails, ) : DialogWrapper(project) { private val coroutineScope = projectCoroutineScope(project) constructor(project: Project, connectionSettings: ConnectionSettings, logGroupName: String) : diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryResultPanel.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryResultPanel.kt index 25234ffce4..00e5fc179a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryResultPanel.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryResultPanel.kt @@ -23,7 +23,7 @@ class QueryResultPanel( private val project: Project, fields: List, queryId: String, - private val queryDetails: QueryDetails + private val queryDetails: QueryDetails, ) : SimpleToolWindowPanel(false, true), Disposable { private val coroutineScope = disposableCoroutineScope(this) init { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryResultsTable.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryResultsTable.kt index cae8c2ba58..bfd1432ca1 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryResultsTable.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryResultsTable.kt @@ -26,7 +26,7 @@ class QueryResultsTable( private val project: Project, connectionSettings: ConnectionSettings, fields: List, - queryId: String + queryId: String, ) : Disposable { private val coroutineScope = disposableCoroutineScope(this) private val client = let { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/RetrieveSavedQueryDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/RetrieveSavedQueryDialog.kt index a022eb9daa..39747280aa 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/RetrieveSavedQueryDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/RetrieveSavedQueryDialog.kt @@ -17,7 +17,7 @@ import javax.swing.JComponent class RetrieveSavedQueryDialog( private val parentEditor: QueryEditor, private val project: Project, - connectionSettings: ConnectionSettings + connectionSettings: ConnectionSettings, ) : DialogWrapper(project) { private val view = SelectSavedQuery(connectionSettings) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/SaveQueryDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/SaveQueryDialog.kt index 0ee7fc0ae8..e8baf5e8cc 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/SaveQueryDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/SaveQueryDialog.kt @@ -30,7 +30,7 @@ class SaveQueryDialog( private val project: Project, private val connectionSettings: ConnectionSettings, private val query: String, - private val logGroups: List + private val logGroups: List, ) : DialogWrapper(project) { private val coroutineScope = projectCoroutineScope(project) val view = EnterQueryName() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/SelectSavedQuery.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/SelectSavedQuery.kt index 3591e756d8..3653f730b5 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/SelectSavedQuery.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/SelectSavedQuery.kt @@ -14,7 +14,7 @@ import javax.swing.JPanel import javax.swing.JTextArea class SelectSavedQuery( - private val connectionSettings: ConnectionSettings + private val connectionSettings: ConnectionSettings, ) { lateinit var resourceSelector: ResourceSelector private set diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/TimeUnit.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/TimeUnit.kt index 5eeb09a3c5..a2a4ee1353 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/TimeUnit.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/TimeUnit.kt @@ -10,5 +10,5 @@ enum class TimeUnit(val unit: ChronoUnit, val text: String) { MINUTES(ChronoUnit.MINUTES, message("cloudwatch.logs.time_minutes")), HOURS(ChronoUnit.HOURS, message("cloudwatch.logs.time_hours")), DAYS(ChronoUnit.DAYS, message("cloudwatch.logs.time_days")), - WEEKS(ChronoUnit.WEEKS, message("cloudwatch.logs.time_weeks")) + WEEKS(ChronoUnit.WEEKS, message("cloudwatch.logs.time_weeks")), } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourceSchemaMapping.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourceSchemaMapping.kt index 8dde412778..f513851f9d 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourceSchemaMapping.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourceSchemaMapping.kt @@ -14,7 +14,7 @@ class DynamicResourceSchemaMapping { fun addResourceSchemaMapping( project: Project, - file: DynamicResourceVirtualFile + file: DynamicResourceVirtualFile, ) { val configuration = JsonSchemaMappingsProjectConfiguration.getInstance(project).findMappingForFile(file) if (configuration == null) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourcesUpdateManager.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourcesUpdateManager.kt index 784236184c..594edb003f 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourcesUpdateManager.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamic/DynamicResourcesUpdateManager.kt @@ -221,7 +221,7 @@ data class ResourceMutationState( val status: OperationStatus, val resourceIdentifier: String?, val message: String?, - val startTime: Instant + val startTime: Instant, ) { companion object { fun fromEvent(connectionSettings: ConnectionSettings, progress: ProgressEvent, startTime: Instant) = diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamodb/Index.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamodb/Index.kt index e1db017f34..2e3a2d21ff 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamodb/Index.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/dynamodb/Index.kt @@ -7,5 +7,5 @@ data class Index( val displayName: String, val indexName: String?, val partitionKey: String, - val sortKey: String? + val sortKey: String?, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/CreateEcrRepoDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/CreateEcrRepoDialog.kt index 8335092a51..9354ccadfe 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/CreateEcrRepoDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/CreateEcrRepoDialog.kt @@ -24,7 +24,7 @@ import javax.swing.JComponent class CreateEcrRepoDialog( private val project: Project, private val ecrClient: EcrClient, - parent: Component? = null + parent: Component? = null, ) : DialogWrapper(project, parent, false, IdeModalityType.IDE) { var repoName: String = "" diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrExplorerNode.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrExplorerNode.kt index 40de6ce5ed..dfe4700133 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrExplorerNode.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrExplorerNode.kt @@ -27,7 +27,7 @@ class EcrServiceNode(project: Project, service: AwsExplorerServiceNode) : AwsExp class EcrRepositoryNode( project: Project, - val repository: Repository + val repository: Repository, ) : AwsExplorerResourceNode( project, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrUtils.kt index 287ae97358..ee1d1a3340 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrUtils.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrUtils.kt @@ -31,7 +31,7 @@ typealias DockerRunConfiguration = DeployToServerRunConfiguration { val (runConfiguration, remoteRepo, remoteTag) = pushRequest // use connection specified in run configuration diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PullFromRepositoryAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PullFromRepositoryAction.kt index 341a20c717..063952be32 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PullFromRepositoryAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PullFromRepositoryAction.kt @@ -96,7 +96,7 @@ private class PullFromEcrTask( private val ecrLogin: EcrLogin, private val repository: Repository, private val image: String, - private val dockerRuntime: DockerRuntimeFacade + private val dockerRuntime: DockerRuntimeFacade, ) : Task.Backgroundable(project, message("ecr.pull.progress", repository.repositoryUri, image)) { private var task: OngoingProcess? = null diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PushToRepositoryAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PushToRepositoryAction.kt index 77ce509e01..41bf09f24c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PushToRepositoryAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PushToRepositoryAction.kt @@ -123,7 +123,7 @@ class PushToRepositoryAction : EcrDockerAction() { internal class PushToEcrDialog( private val project: Project, selectedRepository: Repository, - private val dockerRuntime: Deferred + private val dockerRuntime: Deferred, ) : DialogWrapper(project, null, false, IdeModalityType.IDE) { private val coroutineScope = projectCoroutineScope(project) private val defaultTag = "latest" diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/resources/EcrResources.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/resources/EcrResources.kt index 91b5bdd0bf..9304ddebeb 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/resources/EcrResources.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/resources/EcrResources.kt @@ -28,5 +28,5 @@ object EcrResources { data class Repository( val repositoryName: String, val repositoryArn: String, - val repositoryUri: String + val repositoryUri: String, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/ContainerActions.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/ContainerActions.kt index eed5c264fe..2da9bcbdf6 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/ContainerActions.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/ContainerActions.kt @@ -39,7 +39,7 @@ import software.aws.toolkits.resources.message class ContainerActions( private val project: Project, - private val container: ContainerDetails + private val container: ContainerDetails, ) : ActionGroup(container.containerDefinition.name(), null, null) { init { @@ -83,7 +83,7 @@ class ServiceContainerActions : SingleExplorerNodeActionGroup("C @Suppress("ComponentNotRegistered") class ContainerLogsAction( private val project: Project, - private val container: ContainerDetails + private val container: ContainerDetails, ) : DumbAwareAction(message("ecs.service.container_logs.action_label"), null, AwsIcons.Resources.CloudWatch.LOGS) { private val logConfiguration: Pair? by lazy { @@ -137,7 +137,7 @@ class ContainerLogsAction( class ExecuteCommandAction( private val project: Project, - private val container: ContainerDetails + private val container: ContainerDetails, ) : DumbAwareAction(message("ecs.execute_command_run"), null, null) { private val coroutineScope = projectCoroutineScope(project) override fun actionPerformed(e: AnActionEvent) { @@ -164,7 +164,7 @@ class ExecuteCommandAction( class ExecuteCommandInShellAction( private val project: Project, - private val container: ContainerDetails + private val container: ContainerDetails, ) : DumbAwareAction(message("ecs.execute_command_run_command_in_shell"), null, null) { private val coroutineScope = projectCoroutineScope(project) override fun actionPerformed(e: AnActionEvent) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/EcsExecUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/EcsExecUtils.kt index 5650e2d1f6..93dcec0463 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/EcsExecUtils.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/EcsExecUtils.kt @@ -227,7 +227,7 @@ object EcsExecUtils { connection: ConnectionSettings, container: ContainerDetails, task: String, - command: String + command: String, ): GeneralCommandLine { val client = connection.awsClient() val path = SsmPlugin.getOrInstallTool(project).path.toAbsolutePath().toString() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/OpenShellInContainerDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/OpenShellInContainerDialog.kt index 7ca22bcc11..a10eca6fbe 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/OpenShellInContainerDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/OpenShellInContainerDialog.kt @@ -39,7 +39,7 @@ import javax.swing.JComponent class OpenShellInContainerDialog( private val project: Project, private val container: ContainerDetails, - private val connectionSettings: ConnectionSettings + private val connectionSettings: ConnectionSettings, ) : DialogWrapper(project) { private val coroutineScope = projectCoroutineScope(project) private val shellList = listOf("/bin/bash", "/bin/sh", "/bin/zsh") diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/RunCommandRunProfile.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/RunCommandRunProfile.kt index 12b26ff0b2..6ed2d02c53 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/RunCommandRunProfile.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/RunCommandRunProfile.kt @@ -28,7 +28,7 @@ class RunCommandRunProfile( private val connection: ConnectionSettings, private val container: ContainerDetails, private val task: String, - private val command: String + private val command: String, ) : RunProfile { override fun getState(executor: Executor, environment: ExecutionEnvironment): RunProfileState = RunCommandRunProfileState(environment) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/federation/AwsConsoleUrlFactory.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/federation/AwsConsoleUrlFactory.kt index d1ac12a275..1344e1a492 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/federation/AwsConsoleUrlFactory.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/federation/AwsConsoleUrlFactory.kt @@ -180,12 +180,12 @@ private data class GetSigninTokenRequest( @JsonProperty("sessionKey") val sessionKey: String, @JsonProperty("sessionToken") - val sessionToken: String + val sessionToken: String, ) private data class GetSigninTokenResponse( @JsonProperty("SigninToken") - val signinToken: String + val signinToken: String, ) private fun UrlEncodedFormEntity.toUrlEncodedString() = this.content.bufferedReader().readText() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/iam/CreateIamRoleDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/iam/CreateIamRoleDialog.kt index d29715624b..0d48dac1ec 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/iam/CreateIamRoleDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/iam/CreateIamRoleDialog.kt @@ -27,7 +27,7 @@ class CreateIamRoleDialog( private val iamClient: IamClient, parent: Component? = null, @Language("JSON") defaultPolicyDocument: String, - @Language("JSON") defaultAssumeRolePolicyDocument: String + @Language("JSON") defaultAssumeRolePolicyDocument: String, ) : DialogWrapper(project, parent, false, IdeModalityType.IDE) { private val view = CreateRolePanel(project) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/Lambda.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/Lambda.kt index 2875614724..190ed35b09 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/Lambda.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/Lambda.kt @@ -98,7 +98,7 @@ data class LambdaFunction( val timeout: Int, val memorySize: Int, val xrayEnabled: Boolean, - val role: IamRole + val role: IamRole, ) fun FunctionConfiguration.toDataClass() = LambdaFunction( diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/LambdaExplorerNodes.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/LambdaExplorerNodes.kt index 57e799f816..7f2d799272 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/LambdaExplorerNodes.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/LambdaExplorerNodes.kt @@ -25,7 +25,7 @@ class LambdaServiceNode(project: Project, service: AwsExplorerServiceNode) : open class LambdaFunctionNode( project: Project, - function: LambdaFunction + function: LambdaFunction, ) : AwsExplorerResourceNode( project, LambdaClient.SERVICE_NAME, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/actions/SyncServerlessAppAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/actions/SyncServerlessAppAction.kt index 3699108fac..36fb85b024 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/actions/SyncServerlessAppAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/actions/SyncServerlessAppAction.kt @@ -231,7 +231,7 @@ class SyncServerlessAppAction : AnAction( project: Project, settings: SyncServerlessApplicationSettings, syncedResources: SyncedResources, - lambdaPackageType: LambdaPackageType + lambdaPackageType: LambdaPackageType, ) { try { val templatePath = templateFile.toNioPath() @@ -283,5 +283,5 @@ class SyncServerlessAppAction : AnAction( data class PreSyncRequirements( val dockerDoesntExist: Boolean? = null, - val activeStacks: List + val activeStacks: List, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/CreateCapabilities.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/CreateCapabilities.kt index 27fecb1ae3..6437075b62 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/CreateCapabilities.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/CreateCapabilities.kt @@ -25,7 +25,7 @@ enum class CreateCapabilities(val capability: String, val text: String, val tool message("cloudformation.capabilities.auto_expand"), message("cloudformation.capabilities.auto_expand.toolTipText"), false - ) + ), } class CapabilitiesEnumCheckBoxes { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/DeployServerlessApplicationSettings.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/DeployServerlessApplicationSettings.kt index e4a2d6acc8..da21e770c4 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/DeployServerlessApplicationSettings.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/DeployServerlessApplicationSettings.kt @@ -11,5 +11,5 @@ data class DeployServerlessApplicationSettings( val parameters: Map, val tags: Map, val useContainer: Boolean, - val capabilities: List + val capabilities: List, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/LambdaExecutionUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/LambdaExecutionUtils.kt index dfee80ce65..39c22cd5af 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/LambdaExecutionUtils.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/LambdaExecutionUtils.kt @@ -107,5 +107,5 @@ fun String?.validateSupportedArchitecture(): LambdaArchitecture { data class ResolvedFunction( var handler: String, var runtime: LambdaRuntime, - var architecture: LambdaArchitecture + var architecture: LambdaArchitecture, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/LambdaRunConfigurationBase.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/LambdaRunConfigurationBase.kt index 6449b06006..5b87ce84ab 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/LambdaRunConfigurationBase.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/LambdaRunConfigurationBase.kt @@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets abstract class LambdaRunConfigurationBase( project: Project, private val configFactory: ConfigurationFactory, - id: String + id: String, ) : AwsConnectionsRunConfigurationBase(project, configFactory, id), RunConfigurationWithSuppressedDefaultRunAction, RunConfigurationWithSuppressedDefaultDebugAction { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaOptions.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaOptions.kt index e0a647e7da..4ccdfe7300 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaOptions.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaOptions.kt @@ -41,5 +41,5 @@ class FunctionOptions { data class PersistedPathMapping( var local: String? = null, - var remote: String? = null + var remote: String? = null, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaRunConfigurationProducer.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaRunConfigurationProducer.kt index 65dee90545..9e499f11d2 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaRunConfigurationProducer.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/local/LocalLambdaRunConfigurationProducer.kt @@ -30,7 +30,7 @@ class LocalLambdaRunConfigurationProducer : LazyRunConfigurationProducer + sourceElement: Ref, ): Boolean { val element = context.psiLocation ?: return false val result = when (val parent = element.parent) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaLocation.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaLocation.kt index d9fce2b221..a7e98c233c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaLocation.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaLocation.kt @@ -23,7 +23,7 @@ class RemoteLambdaLocation(private val project: Project, val lambdaFunction: Lam override fun getAncestors( ancestorClass: Class?, - strict: Boolean + strict: Boolean, ): MutableIterator> = mutableListOf>().iterator() override fun getPsiElement(): DummyPsiElement = element diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunConfiguration.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunConfiguration.kt index fcdfb6e12b..22d912bbfd 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunConfiguration.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunConfiguration.kt @@ -73,5 +73,5 @@ data class RemoteLambdaRunSettings( val credentialProvider: ToolkitCredentialsProvider, val region: AwsRegion, val functionName: String, - val input: String + val input: String, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunConfigurationProducer.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunConfigurationProducer.kt index 819710a794..635c1ec6b3 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunConfigurationProducer.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunConfigurationProducer.kt @@ -25,7 +25,7 @@ class RemoteLambdaRunConfigurationProducer : LazyRunConfigurationProducer + sourceElement: Ref, ): Boolean { val location = context.location as? RemoteLambdaLocation ?: return false val function = location.lambdaFunction @@ -44,7 +44,7 @@ class RemoteLambdaRunConfigurationProducer : LazyRunConfigurationProducer, val debugHost: String, - val input: String + val input: String, ) { abstract val runtimeGroup: RuntimeGroup } @@ -47,7 +47,7 @@ class TemplateRunSettings( connection: ConnectionSettings, samOptions: SamOptions, debugHost: String, - input: String + input: String, ) : TemplateSettings, ZipSettings, LocalLambdaRunSettings(connection, samOptions, environmentVariables, debugHost, input) { override val runtimeGroup = runtime.runtimeGroup ?: throw IllegalStateException("Attempting to run SAM for unsupported runtime $runtime") } @@ -62,7 +62,7 @@ class HandlerRunSettings( connection: ConnectionSettings, samOptions: SamOptions, debugHost: String, - input: String + input: String, ) : ZipSettings, LocalLambdaRunSettings(connection, samOptions, environmentVariables, debugHost, input) { override val runtimeGroup = runtime.runtimeGroup ?: throw IllegalStateException("Attempting to run SAM for unsupported runtime $runtime") } @@ -77,7 +77,7 @@ class ImageTemplateRunSettings( connection: ConnectionSettings, samOptions: SamOptions, debugHost: String, - input: String + input: String, ) : ImageSettings, TemplateSettings, LocalLambdaRunSettings(connection, samOptions, environmentVariables, debugHost, input) { override val runtimeGroup = RuntimeGroup.find { imageDebugger.languageId in it.languageIds } ?: throw IllegalStateException("Attempting to run SAM for unsupported language ${imageDebugger.languageId}") diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/sam/SamDebugSupport.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/sam/SamDebugSupport.kt index 25bd196a4f..71679ddd54 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/sam/SamDebugSupport.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/sam/SamDebugSupport.kt @@ -26,7 +26,7 @@ interface SamDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter companion object { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/sam/SamRunningState.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/sam/SamRunningState.kt index 5d666c3d4a..4a7a21d94e 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/sam/SamRunningState.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/sam/SamRunningState.kt @@ -46,7 +46,7 @@ import java.nio.file.Paths class SamRunningState( val environment: ExecutionEnvironment, - val settings: LocalLambdaRunSettings + val settings: LocalLambdaRunSettings, ) : RunProfileState { lateinit var pathMappings: List @@ -126,7 +126,7 @@ class SamRunningState( settings: LocalLambdaRunSettings, state: SamRunningState, buildRequest: BuildLambdaRequest, - buildView: BuildView + buildView: BuildView, ): ProcessHandler { val startSam = SamRunnerStep(environment, settings, environment.isDebug()) @@ -222,7 +222,7 @@ class SamRunningState( lambdaBuilder: LambdaBuilder, templateFile: VirtualFile, logicalId: String, - samOptions: SamOptions + samOptions: SamOptions, ): BuildLambdaRequest { val templatePath = Paths.get(templateFile.path) val buildDir = templatePath.resolveSibling(".aws-sam").resolve("build") diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaDebugSupport.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaDebugSupport.kt index 1f3e34589e..d7ae24fc09 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaDebugSupport.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaDebugSupport.kt @@ -33,7 +33,7 @@ class JavaRuntimeDebugSupport : RuntimeDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = createDebugProcess(environment, debugHost, debugPorts) } @@ -45,7 +45,7 @@ abstract class JavaImageDebugSupport : ImageDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = createDebugProcess(environment, debugHost, debugPorts) } @@ -94,7 +94,7 @@ private val edtContext = getCoroutineUiContext() private suspend fun createDebugProcess( environment: ExecutionEnvironment, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter { val connection = RemoteConnection(true, debugHost, debugPorts.first().toString(), false) val debugEnvironment = RemotePortDebugEnvironment(environment, connection) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaLambdaHandlerResolver.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaLambdaHandlerResolver.kt index 5069257ac7..22a9a076ab 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaLambdaHandlerResolver.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaLambdaHandlerResolver.kt @@ -25,7 +25,7 @@ class JavaLambdaHandlerResolver : LambdaHandlerResolver { override fun findPsiElements( project: Project, handler: String, - searchScope: GlobalSearchScope + searchScope: GlobalSearchScope, ): Array { val split = handler.split("::") val className = split[0] diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaSamProjectWizard.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaSamProjectWizard.kt index ff529fc0c1..2b418b8469 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaSamProjectWizard.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/java/JavaSamProjectWizard.kt @@ -72,7 +72,7 @@ abstract class JavaMavenSamProjectTemplate : JavaSamProjectTemplate() { settings: SamNewProjectSettings, contentRoot: VirtualFile, rootModel: ModifiableRootModel, - indicator: ProgressIndicator + indicator: ProgressIndicator, ) { super.postCreationAction(settings, contentRoot, rootModel, indicator) val pomFile = locateBuildFile(contentRoot, "pom.xml") ?: return @@ -90,7 +90,7 @@ abstract class JavaGradleSamProjectTemplate : JavaSamProjectTemplate() { settings: SamNewProjectSettings, contentRoot: VirtualFile, rootModel: ModifiableRootModel, - indicator: ProgressIndicator + indicator: ProgressIndicator, ) { val buildFile = locateBuildFile(contentRoot, "build.gradle") ?: return diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonDebugSupport.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonDebugSupport.kt index 0f462249ff..4547655f6a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonDebugSupport.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonDebugSupport.kt @@ -38,7 +38,7 @@ class PythonRuntimeDebugSupport : RuntimeDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = createDebugProcess(environment, state, debugHost, debugPorts) } @@ -55,7 +55,7 @@ abstract class PythonImageDebugSupport : ImageDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = createDebugProcess(environment, state, debugHost, debugPorts) override fun samArguments(debugPorts: List): List = buildList { @@ -112,7 +112,7 @@ private fun createDebugProcess( environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter { // TODO: We should allow using the module SDK, but we can't easily get the module val sdk = ProjectRootManager.getInstance(environment.project).projectSdk?.takeIf { it.sdkType is PythonSdkType } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonLambdaHandlerResolver.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonLambdaHandlerResolver.kt index 90f05bc8cf..e92fe363b4 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonLambdaHandlerResolver.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonLambdaHandlerResolver.kt @@ -25,7 +25,7 @@ class PythonLambdaHandlerResolver : LambdaHandlerResolver { override fun findPsiElements( project: Project, handler: String, - searchScope: GlobalSearchScope + searchScope: GlobalSearchScope, ): Array { if (!handler.contains('.')) { return NavigatablePsiElement.EMPTY_NAVIGATABLE_ELEMENT_ARRAY @@ -52,7 +52,7 @@ class PythonLambdaHandlerResolver : LambdaHandlerResolver { private fun validateHandlerPath( pyModule: PyFile, parentModuleFolders: List, - parentFolders: List + parentFolders: List, ): Boolean { // Start matching to see if the parent folders align var directory = pyModule.containingDirectory diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonSamProjectWizard.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonSamProjectWizard.kt index c01d3a1aec..c22e155b86 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonSamProjectWizard.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/python/PythonSamProjectWizard.kt @@ -51,7 +51,7 @@ abstract class PythonSamProjectTemplate : SamAppTemplateBased() { settings: SamNewProjectSettings, contentRoot: VirtualFile, rootModel: ModifiableRootModel, - indicator: ProgressIndicator + indicator: ProgressIndicator, ) { super.postCreationAction(settings, contentRoot, rootModel, indicator) addSourceRoots(rootModel.project, rootModel, contentRoot) @@ -78,7 +78,7 @@ class SamDynamoDBCookieCutter : SamProjectTemplate() { settings: SamNewProjectSettings, contentRoot: VirtualFile, rootModel: ModifiableRootModel, - indicator: ProgressIndicator + indicator: ProgressIndicator, ) { super.postCreationAction(settings, contentRoot, rootModel, indicator) addSourceRoots(rootModel.project, rootModel, contentRoot) @@ -88,7 +88,7 @@ class SamDynamoDBCookieCutter : SamProjectTemplate() { projectName: String, runtime: LambdaRuntime, architecture: LambdaArchitecture, - packagingType: PackageType + packagingType: PackageType, ): TemplateParameters = LocationBasedTemplate( "gh:aws-samples/cookiecutter-aws-sam-dynamodb-python" ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamExecutable.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamExecutable.kt index 2d7d25c440..a71da43cf4 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamExecutable.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamExecutable.kt @@ -84,7 +84,7 @@ fun GeneralCommandLine.samBuildCommand( logicalId: String? = null, buildDir: Path, environmentVariables: Map, - samOptions: SamOptions + samOptions: SamOptions, ) = this.apply { withEnvironment(environmentVariables) withWorkDirectory(templatePath.toAbsolutePath().parent.toString()) @@ -127,7 +127,7 @@ fun GeneralCommandLine.samPackageCommand( templatePath: Path, packagedTemplatePath: Path, s3Bucket: String?, - ecrRepo: String? + ecrRepo: String?, ) = this.apply { withEnvironment(environmentVariables) withWorkDirectory(templatePath.parent.toAbsolutePath().toString()) @@ -150,7 +150,7 @@ fun GeneralCommandLine.samPackageCommand( fun GeneralCommandLine.samDeployCommand( environmentVariables: Map, templatePath: Path, - settings: DeployServerlessApplicationSettings + settings: DeployServerlessApplicationSettings, ) = this.apply { withEnvironment(environmentVariables) withWorkDirectory(templatePath.parent.toAbsolutePath().toString()) @@ -209,7 +209,7 @@ private fun escapeParameter(param: String): String { fun GeneralCommandLine.samInitCommand( outputDir: Path, parameters: TemplateParameters, - extraContext: Map + extraContext: Map, ) = this.apply { addParameter("init") addParameter("--no-input") @@ -264,7 +264,7 @@ fun GeneralCommandLine.samInitCommand( fun GeneralCommandLine.samSyncCommand( environmentVariables: Map, templatePath: Path, - settings: SyncServerlessApplicationSettings + settings: SyncServerlessApplicationSettings, ) = this.apply { withEnvironment(environmentVariables) withWorkDirectory(templatePath.toAbsolutePath().parent.toString()) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamOptions.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamOptions.kt index 8d0828f224..094e373fcc 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamOptions.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamOptions.kt @@ -11,5 +11,5 @@ data class SamOptions( var buildInContainer: Boolean = false, var skipImagePull: Boolean = false, var additionalBuildArgs: String? = null, - var additionalLocalArgs: String? = null + var additionalLocalArgs: String? = null, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamSchemaDownloadPostCreationAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamSchemaDownloadPostCreationAction.kt index 216036d3f2..e2ccbc4392 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamSchemaDownloadPostCreationAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamSchemaDownloadPostCreationAction.kt @@ -16,7 +16,7 @@ class SamSchemaDownloadPostCreationAction { schemaSourceRoot: Path, language: SchemaCodeLangs, connectionSettings: ConnectionSettings, - indicator: ProgressIndicator + indicator: ProgressIndicator, ) { val codeGenDownloader = SchemaCodeDownloader.create(connectionSettings) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamTemplateUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamTemplateUtils.kt index 69d101013c..bb78680358 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamTemplateUtils.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamTemplateUtils.kt @@ -179,7 +179,7 @@ object SamTemplateUtils { handler: String, timeout: Int = LambdaLimits.DEFAULT_TIMEOUT, memorySize: Int = LambdaLimits.DEFAULT_MEMORY_SIZE, - envVars: Map = emptyMap() + envVars: Map = emptyMap(), ) { templateCommon( tempFile = tempFile, @@ -204,7 +204,7 @@ object SamTemplateUtils { dockerfile: Path, timeout: Int = LambdaLimits.DEFAULT_TIMEOUT, memorySize: Int = LambdaLimits.DEFAULT_MEMORY_SIZE, - envVars: Map = emptyMap() + envVars: Map = emptyMap(), ) { templateCommon( tempFile = tempFile, @@ -229,7 +229,7 @@ object SamTemplateUtils { memorySize: Int = LambdaLimits.DEFAULT_MEMORY_SIZE, envVars: Map = emptyMap(), properties: YamlWriter.() -> Unit, - metadata: (YamlWriter.() -> Unit)? = null + metadata: (YamlWriter.() -> Unit)? = null, ) { if (!tempFile.exists()) { Files.createDirectories(tempFile.parent) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncApplicationRunProfile.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncApplicationRunProfile.kt index 35f5989086..64a313a32d 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncApplicationRunProfile.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncApplicationRunProfile.kt @@ -35,7 +35,7 @@ class SyncApplicationRunProfile( private val project: Project, private val settings: SyncServerlessApplicationSettings, private val connection: ConnectionSettings, - private val templatePath: Path + private val templatePath: Path, ) : RunProfile { override fun getState(executor: Executor, environment: ExecutionEnvironment): RunProfileState = SyncApplicationRunProfileState(environment) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncServerlessApplicationDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncServerlessApplicationDialog.kt index 88a1d9f113..236f54052b 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncServerlessApplicationDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncServerlessApplicationDialog.kt @@ -62,14 +62,14 @@ data class SyncServerlessApplicationSettings( val parameters: Map, val tags: Map, val useContainer: Boolean, - val capabilities: List + val capabilities: List, ) class SyncServerlessApplicationDialog( private val project: Project, private val templateFile: VirtualFile, private val activeStacks: List, - private val loadResourcesOnCreate: Boolean = true + private val loadResourcesOnCreate: Boolean = true, ) : DialogWrapper(project) { var useContainer: Boolean = false var newStackName: String = "" @@ -383,7 +383,7 @@ class SyncServerlessApplicationDialog( bucket: String? = null, forceEcrRepo: Boolean = false, ecrRepo: String? = null, - useContainer: Boolean? = null + useContainer: Boolean? = null, ) { if (stacks != null) { stackSelector.model = MutableCollectionComboBoxModel(stacks) @@ -450,6 +450,6 @@ class SyncServerlessApplicationDialog( enum class SyncType { CREATE, - UPDATE + UPDATE, } } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/BuildLambda.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/BuildLambda.kt index 91c62e8648..15140db5ee 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/BuildLambda.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/BuildLambda.kt @@ -19,7 +19,7 @@ data class BuildLambdaRequest( val buildDir: Path, val buildEnvVars: Map = emptyMap(), val samOptions: SamOptions, - val preBuildSteps: List = emptyList() + val preBuildSteps: List = emptyList(), ) class BuildLambda(private val request: BuildLambdaRequest) : SamCliStep() { @@ -50,5 +50,5 @@ class BuildLambda(private val request: BuildLambdaRequest) : SamCliStep() { */ data class BuiltLambda( val templateLocation: Path, - val logicalId: String? + val logicalId: String?, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/DeployLambda.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/DeployLambda.kt index 5e64eba863..38d286ff47 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/DeployLambda.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/DeployLambda.kt @@ -17,7 +17,7 @@ class DeployLambda( private val packagedTemplateFile: Path, private val envVars: Map, private val settings: DeployServerlessApplicationSettings, - region: AwsRegion + region: AwsRegion, ) : SamCliStep() { override val stepName = message("serverless.application.deploy.step_name.create_change_set") private val changeSetRegex = "(arn:${region.partitionId}:cloudformation:.*changeSet/[^\\s]*)".toRegex() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/LambdaWorkflows.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/LambdaWorkflows.kt index 3a766f8d88..09ed07db2d 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/LambdaWorkflows.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/LambdaWorkflows.kt @@ -28,7 +28,7 @@ fun createLambdaWorkflowForZip( buildDir: Path, buildEnvVars: Map, codeStorageLocation: String, - samOptions: SamOptions + samOptions: SamOptions, ): StepWorkflow { val (dummyTemplate, dummyLogicalId) = createTemporaryZipTemplate(buildDir, codeDetails) val packagedTemplate = buildDir.resolve("packaged-temp-template.yaml") @@ -75,7 +75,7 @@ fun createLambdaWorkflowForImage( functionDetails: FunctionDetails, codeDetails: ImageBasedCode, codeStorageLocation: String, - samOptions: SamOptions + samOptions: SamOptions, ): StepWorkflow { val (dummyTemplate, dummyLogicalId) = createTemporaryImageTemplate(codeDetails) val buildDir = codeDetails.dockerfile.resolveSibling(".aws-sam").resolve("build") @@ -116,7 +116,7 @@ fun updateLambdaCodeWorkflowForZip( buildEnvVars: Map, codeStorageLocation: String, samOptions: SamOptions, - updatedHandler: String? + updatedHandler: String?, ): StepWorkflow { val (dummyTemplate, dummyLogicalId) = createTemporaryZipTemplate(buildDir, codeDetails) val builtTemplate = buildDir.resolve("template.yaml") @@ -164,7 +164,7 @@ fun updateLambdaCodeWorkflowForImage( functionName: String, codeDetails: ImageBasedCode, codeStorageLocation: String, - samOptions: SamOptions + samOptions: SamOptions, ): StepWorkflow { val (dummyTemplate, dummyLogicalId) = createTemporaryImageTemplate(codeDetails) val buildDir = codeDetails.dockerfile.resolveSibling(".aws-sam").resolve("build") @@ -199,7 +199,7 @@ fun updateLambdaCodeWorkflowForImage( fun createDeployWorkflow( project: Project, template: VirtualFile, - settings: DeployServerlessApplicationSettings + settings: DeployServerlessApplicationSettings, ): StepWorkflow { val envVars = createAwsEnvVars(project) val region = AwsConnectionManager.getInstance(project).activeRegion diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/PackageLambda.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/PackageLambda.kt index 92c6da0af3..2b56a7a16c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/PackageLambda.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/PackageLambda.kt @@ -18,7 +18,7 @@ class PackageLambda( private val logicalId: String?, private val envVars: Map, private val s3Bucket: String? = null, - private val ecrRepo: String? = null + private val ecrRepo: String? = null, ) : SamCliStep() { override val stepName: String = message("lambda.create.step.package") diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/CreateLambdaFunctionAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/CreateLambdaFunctionAction.kt index 55f2313091..095cc805ac 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/CreateLambdaFunctionAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/CreateLambdaFunctionAction.kt @@ -21,7 +21,7 @@ import software.aws.toolkits.resources.message class CreateLambdaFunctionAction( private val handlerName: String?, private val elementPointer: SmartPsiElementPointer?, - private val lambdaHandlerResolver: LambdaHandlerResolver? + private val lambdaHandlerResolver: LambdaHandlerResolver?, ) : AnAction(message("lambda.create_new"), null, AwsIcons.Actions.LAMBDA_FUNCTION_NEW), UpdateInBackground { @Suppress("unused") // Used by ActionManager in plugin.xml diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/FunctionDetails.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/FunctionDetails.kt index 67f6a801ba..543ce79c6c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/FunctionDetails.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/FunctionDetails.kt @@ -20,7 +20,7 @@ data class FunctionDetails( val envVars: Map, val timeout: Int, val memorySize: Int, - val xrayEnabled: Boolean + val xrayEnabled: Boolean, ) { val tracingMode: TracingMode = if (xrayEnabled) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitRunner.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitRunner.kt index 26f5163ea0..619911709a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitRunner.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitRunner.kt @@ -27,7 +27,7 @@ object SamInitRunner { fun execute( outputDir: VirtualFile, templateParameters: TemplateParameters, - schemaParameters: SchemaTemplateParameters? + schemaParameters: SchemaTemplateParameters?, ) { // set output to a temp dir val tempDir = createTempDir() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitSelectionPanel.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitSelectionPanel.kt index 2b57dac11f..b88f25c3bd 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitSelectionPanel.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitSelectionPanel.kt @@ -37,7 +37,7 @@ class SamInitSelectionPanel( wizardFragmentList: List, private val projectLocation: TextFieldWithBrowseButton? = null, /* Only available in PyCharm! */ private val runtimeFilter: (LambdaRuntime) -> Boolean = { true }, - private val wizardUpdateCallback: () -> Unit = {} /* Used in Rider to refresh the validation */ + private val wizardUpdateCallback: () -> Unit = {}, /* Used in Rider to refresh the validation */ ) { lateinit var mainPanel: JPanel diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGenerator.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGenerator.kt index 47618bb87c..ad06cce34f 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGenerator.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGenerator.kt @@ -54,7 +54,7 @@ class SamProjectGenerator : override fun createStep( projectGenerator: DirectoryProjectGenerator?, - callback: AbstractNewProjectStep.AbstractCallback? + callback: AbstractNewProjectStep.AbstractCallback?, ): AbstractActionWithPanel = SamProjectRuntimeSelectionStep(this) // entry point for the Wizard, both light and heavy IDEs eventually hit this spot through our shims @@ -62,7 +62,7 @@ class SamProjectGenerator : project: Project, baseDir: VirtualFile, settings: SamNewProjectSettings, - module: Module + module: Module, ) { val rootModel = ModuleRootManager.getInstance(module).modifiableModel builder.contentEntryPath = baseDir.path diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGeneratorIntelliJShims.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGeneratorIntelliJShims.kt index 47dfdd9ca6..161052ac2f 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGeneratorIntelliJShims.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGeneratorIntelliJShims.kt @@ -84,7 +84,7 @@ class SamProjectBuilder(private val generator: SamProjectGenerator) : ModuleBuil name: String, settings: SamNewProjectSettings, schemaParameters: SchemaTemplateParameters?, - outputDir: VirtualFile + outputDir: VirtualFile, ) { var success = true try { @@ -114,7 +114,7 @@ class SamProjectBuilder(private val generator: SamProjectGenerator) : ModuleBuil model: ModifiableRootModel, indicator: ProgressIndicator, settings: SamNewProjectSettings, - outputDir: VirtualFile + outputDir: VirtualFile, ) { generator.wizardFragments.forEach { it.postProjectGeneration(model, settings.template, settings.runtime, indicator) } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectWizard.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectWizard.kt index b6fb6f6ec4..32523cb865 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectWizard.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectWizard.kt @@ -42,7 +42,7 @@ data class SamNewProjectSettings( val template: SamProjectTemplate, val runtime: LambdaRuntime, val architecture: LambdaArchitecture, - val packagingType: PackageType + val packagingType: PackageType, ) abstract class SamProjectTemplate { @@ -64,14 +64,14 @@ abstract class SamProjectTemplate { projectName: String, runtime: LambdaRuntime, architecture: LambdaArchitecture, - packagingType: PackageType + packagingType: PackageType, ): TemplateParameters open fun postCreationAction( settings: SamNewProjectSettings, contentRoot: VirtualFile, rootModel: ModifiableRootModel, - indicator: ProgressIndicator + indicator: ProgressIndicator, ) { excludeSamDirectory(rootModel, contentRoot) } @@ -136,7 +136,7 @@ abstract class SamAppTemplateBased : SamProjectTemplate() { projectName: String, runtime: LambdaRuntime, architecture: LambdaArchitecture, - packagingType: PackageType + packagingType: PackageType, ): TemplateParameters = when (packagingType) { PackageType.IMAGE -> AppBasedImageTemplate( name = projectName, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionComponents.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionComponents.kt index 298fd3b7ff..ab35b3f870 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionComponents.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionComponents.kt @@ -45,7 +45,7 @@ class SchemaSelectionListCellRenderer : ColoredListCellRenderer { super.getListCellRendererComponent(list, value, index, selected, hasFocus) @@ -60,7 +60,7 @@ class SchemaSelectionListCellRenderer : ColoredListCellRenderer = upload(project, RequestBody.fromFile(source), bucket, key, message, startInBackground) private fun S3Client.upload( @@ -44,7 +44,7 @@ private fun S3Client.upload( bucket: String, key: String, message: String = message("s3.upload.object.progress", key), - startInBackground: Boolean = true + startInBackground: Boolean = true, ): CompletionStage { val future = CompletableFuture() val request = PutObjectRequest.builder().bucket(bucket).key(key).build() @@ -75,7 +75,7 @@ private fun S3Client.upload( private class ProgressTrackingContentProvider( private val progressIndicator: ProgressIndicator, private val underlyingInputStreamProvider: ContentStreamProvider, - private val length: Long + private val length: Long, ) : ContentStreamProvider { private var currentStream: InputStream? = null @@ -99,7 +99,7 @@ fun S3Client.download( versionId: String?, destination: Path, message: String = message("s3.download.object.progress", key), - startInBackground: Boolean = true + startInBackground: Boolean = true, ): CompletionStage = download(project, bucket, key, versionId, destination.outputStream(), message, startInBackground) fun S3Client.download( @@ -109,7 +109,7 @@ fun S3Client.download( versionId: String?, destination: OutputStream, message: String = message("s3.download.object.progress", key), - startInBackground: Boolean = true + startInBackground: Boolean = true, ): CompletionStage { val future = CompletableFuture() val requestBuilder = GetObjectRequest.builder().bucket(bucket).key(key) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3ColumnInfo.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3ColumnInfo.kt index b459a1f373..6888f8a217 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3ColumnInfo.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3ColumnInfo.kt @@ -33,5 +33,5 @@ class S3Column(private val type: S3ColumnType) : ColumnInfo(type.tit enum class S3ColumnType(val title: String) { NAME(message("s3.name")), SIZE(message("s3.size")), - LAST_MODIFIED(message("s3.last_modified")) + LAST_MODIFIED(message("s3.last_modified")), } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeNode.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeNode.kt index de878ff5e2..6647030235 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeNode.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeNode.kt @@ -291,7 +291,7 @@ open class S3TreeContinuationNode( bucket: S3VirtualBucket, private val parentNode: S3LazyLoadParentNode, key: String, - private val continuationMarker: T + private val continuationMarker: T, ) : S3TreeNode(bucket, parentNode, key) { init { icon = AllIcons.Nodes.EmptyNode @@ -310,7 +310,7 @@ class S3TreeErrorContinuationNode( bucket: S3VirtualBucket, parentNode: S3LazyLoadParentNode, key: String, - continuationMarker: T + continuationMarker: T, ) : S3TreeContinuationNode(bucket, parentNode, key, continuationMarker) { init { icon = AllIcons.General.Error @@ -321,7 +321,7 @@ class S3TreeErrorContinuationNode( class S3TreeErrorNode( bucket: S3VirtualBucket, - parentNode: S3LazyLoadParentNode<*> + parentNode: S3LazyLoadParentNode<*>, ) : S3TreeNode(bucket, parentNode, "${parentNode.key}error") { init { icon = AllIcons.General.Error @@ -332,7 +332,7 @@ class S3TreeErrorNode( class S3TreeEmptyNode( bucket: S3VirtualBucket, - parentNode: S3LazyLoadParentNode<*> + parentNode: S3LazyLoadParentNode<*>, ) : S3TreeNode(bucket, parentNode, "${parentNode.key}empty") { override fun displayName(): String = message("explorer.empty_node") override fun update(presentation: PresentationData) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeTable.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeTable.kt index 1fd09ef97b..0fb80ed2e7 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeTable.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeTable.kt @@ -44,7 +44,7 @@ class S3TreeTable( private val treeTableModel: S3TreeTableModel, val rootNode: S3TreeDirectoryNode, val bucket: S3VirtualBucket, - private val project: Project + private val project: Project, ) : JBTreeTable(treeTableModel) { private val coroutineScope = projectCoroutineScope(project) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeTableModel.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeTableModel.kt index 6c856f98f6..735532a6d9 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeTableModel.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeTableModel.kt @@ -21,7 +21,7 @@ import javax.swing.tree.TreePath class S3TreeTableModel( private val delegate: AsyncTreeModel, private val columns: Array>, - val structureTreeModel: StructureTreeModel + val structureTreeModel: StructureTreeModel, ) : TreeTableModel, TreeModel by delegate, TreeVisitor.Acceptor { override fun getColumnCount(): Int = columns.size diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/objectActions/DownloadObjectAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/objectActions/DownloadObjectAction.kt index 6cfab26482..e53b335645 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/objectActions/DownloadObjectAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/objectActions/DownloadObjectAction.kt @@ -51,7 +51,8 @@ class DownloadObjectAction : SKIP(message("s3.download.object.conflict.skip")), OVERWRITE(message("s3.download.object.conflict.overwrite")), SKIP_ALL(message("s3.download.object.conflict.skip_rest")), - OVERWRITE_ALL(message("s3.download.object.conflict.overwrite_rest")); + OVERWRITE_ALL(message("s3.download.object.conflict.overwrite_rest")), + ; companion object { val SINGLE_FILE_RESOLUTIONS by lazy { @@ -164,7 +165,7 @@ class DownloadObjectAction : project: Project, targetDirectory: Path, download: DownloadInfo, - files: List + files: List, ): ConflictResolution { val description = message( "s3.download.object.conflict.description", diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/SchemaViewer.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/SchemaViewer.kt index 97a80aff33..3563485d1a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/SchemaViewer.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/SchemaViewer.kt @@ -29,7 +29,7 @@ class SchemaViewer( private val project: Project, private val schemaDownloader: SchemaDownloader = SchemaDownloader(), private val schemaFormatter: SchemaFormatter = SchemaFormatter(), - private val schemaPreviewer: SchemaPreviewer = SchemaPreviewer() + private val schemaPreviewer: SchemaPreviewer = SchemaPreviewer(), ) { fun downloadAndViewSchema(schemaName: String, registryName: String, connectionSettings: ConnectionSettings): CompletionStage = schemaDownloader.getSchemaContent(registryName, schemaName, connectionSettings = connectionSettings) @@ -57,7 +57,7 @@ class SchemaViewer( schemaName: String, registryName: String, version: String?, - connectionSettings: ConnectionSettings + connectionSettings: ConnectionSettings, ): CompletionStage = schemaDownloader.getSchemaContent(registryName, schemaName, version, connectionSettings) .thenCompose { schemaContent -> schemaFormatter.prettySchemaContent(schemaContent.content()) @@ -73,7 +73,7 @@ class SchemaDownloader { registryName: String, schemaName: String, version: String? = null, - connectionSettings: ConnectionSettings + connectionSettings: ConnectionSettings, ): CompletionStage { val resource = SchemasResources.getSchema(registryName, schemaName, version) return AwsResourceCache.getInstance().getResource(resource, connectionSettings) @@ -105,7 +105,7 @@ class SchemaPreviewer { schemaContent: String, version: String, project: Project, - connectionSettings: ConnectionSettings + connectionSettings: ConnectionSettings, ): CompletionStage { val credentialIdentifier = connectionSettings.credentials.id val region = connectionSettings.region.id diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/Schemas.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/Schemas.kt index 2a025403ad..bee9c0bf6b 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/Schemas.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/Schemas.kt @@ -12,12 +12,13 @@ enum class SchemaCodeLangs( val apiValue: String, val text: String, val extension: String, - val runtimeGroupId: String + val runtimeGroupId: String, ) { JAVA8("Java8", message("schemas.schema.language.java8"), "java", BuiltInRuntimeGroups.Java), PYTHON3_6("Python36", message("schemas.schema.language.python3_6"), "py", BuiltInRuntimeGroups.Python), TYPESCRIPT("TypeScript3", message("schemas.schema.language.typescript"), "ts", BuiltInRuntimeGroups.NodeJs), - GO1("Go1", message("schemas.schema.language.go1"), "go", BuiltInRuntimeGroups.Go); + GO1("Go1", message("schemas.schema.language.go1"), "go", BuiltInRuntimeGroups.Go), + ; override fun toString() = text } @@ -33,7 +34,7 @@ data class SchemaSummary(val name: String, val registryName: String) { data class SchemaTemplateParameters( val schema: software.aws.toolkits.jetbrains.services.schemas.SchemaSummary, val schemaVersion: String, - val templateExtraContext: SchemaTemplateExtraContext + val templateExtraContext: SchemaTemplateExtraContext, ) // This matches the extra_content parameters to Schema-based templates in both key and value names in cookiecutter.json in the templates used by @@ -62,7 +63,7 @@ data class SchemaTemplateExtraContext( // Need to provide user agent to SAM CLI so that it will enable appTemplate-based @get:JsonProperty("user_agent") - val userAgent: String = "AWSToolkit" + val userAgent: String = "AWSToolkit", ) fun SchemaSummary.toDataClass(registryName: String) = Schema( diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/SchemasExplorerNodes.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/SchemasExplorerNodes.kt index b89a02d1b1..b2be09b780 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/SchemasExplorerNodes.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/SchemasExplorerNodes.kt @@ -25,7 +25,7 @@ class SchemasServiceNode(project: Project, service: AwsExplorerServiceNode) : open class SchemaRegistryNode( project: Project, - val registry: RegistrySummary + val registry: RegistrySummary, ) : AwsExplorerResourceNode( project, SchemasClient.SERVICE_NAME, @@ -63,7 +63,7 @@ open class SchemaRegistryNode( open class SchemaNode( project: Project, - val schema: Schema + val schema: Schema, ) : AwsExplorerResourceNode( project, SchemasClient.SERVICE_NAME, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialog.kt index 1115bcd3dc..c2d244cced 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialog.kt @@ -47,7 +47,7 @@ class DownloadCodeForSchemaDialog( private val registryName: String = "", version: String? = null, language: SchemaCodeLangs? = null, - private val onClose: (() -> Unit)? = null + private val onClose: (() -> Unit)? = null, ) : DialogWrapper(project) { constructor(project: Project, schema: Schema) : @@ -179,7 +179,7 @@ class DownloadCodeForSchemaDialog( private fun showDownloadCompletionNotification( schemaName: String, - project: Project + project: Project, ) { val message = message("schemas.schema.download_code_bindings.notification.finished", schemaName) notifyInfo(title = NOTIFICATION_TITLE, content = message, project = project) @@ -188,7 +188,7 @@ class DownloadCodeForSchemaDialog( private fun showDownloadCompletionErrorNotification( error: Throwable?, - project: Project + project: Project, ) { when (val rootError = ExceptionUtils.getRootCause(error)) { is SchemaCodeDownloadFileCollisionException -> notifyError(title = NOTIFICATION_TITLE, content = rootError.message ?: "", project = project) @@ -199,7 +199,7 @@ class DownloadCodeForSchemaDialog( private fun openSchemaCoreCodeFileInEditor( schemaCoreCodeFile: Path?, - project: Project + project: Project, ): CompletionStage { val future = CompletableFuture() ApplicationManager.getApplication().invokeLater { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/SchemaCodeDownload.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/SchemaCodeDownload.kt index b59e663995..4e64ea5f24 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/SchemaCodeDownload.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/SchemaCodeDownload.kt @@ -12,7 +12,7 @@ data class SchemaCodeDownloadRequestDetails( val schema: SchemaSummary, val version: String, val language: SchemaCodeLangs, - val destinationDirectory: File + val destinationDirectory: File, ) { // TODO: This is far from reliable, and won't work if the schema has special characters, // and should either be generated using SchemaCodeGenUtils or provided from the server via metadata in DescribeCodeBindings @@ -20,5 +20,5 @@ data class SchemaCodeDownloadRequestDetails( } data class DownloadedSchemaCode( - val zipContents: ByteBuffer + val zipContents: ByteBuffer, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/SchemaCodeDownloader.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/SchemaCodeDownloader.kt index 0277668e09..accbddf8ed 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/SchemaCodeDownloader.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/code/SchemaCodeDownloader.kt @@ -31,11 +31,11 @@ class SchemaCodeDownloader( private val generator: CodeGenerator, private val poller: CodeGenerationStatusPoller, private val downloader: CodeDownloader, - private val extractor: CodeExtractor + private val extractor: CodeExtractor, ) { fun downloadCode( schemaDownloadRequest: SchemaCodeDownloadRequestDetails, - indicator: ProgressIndicator + indicator: ProgressIndicator, ): CompletionStage { val schemaName = schemaDownloadRequest.schema.name indicator.updateProgress(message("schemas.schema.download_code_bindings.notification.start", schemaName)) @@ -115,7 +115,7 @@ class CodeGenerator(private val schemasClient: SchemasClient) { class CodeGenerationStatusPoller(private val schemasClient: SchemasClient) { fun pollForCompletion( schemaDownload: SchemaCodeDownloadRequestDetails, - initialCodeGenerationStatus: CodeGenerationStatus = CodeGenerationStatus.CREATE_IN_PROGRESS + initialCodeGenerationStatus: CodeGenerationStatus = CodeGenerationStatus.CREATE_IN_PROGRESS, ): CompletionStage { val future = CompletableFuture() pluginAwareExecuteOnPooledThread { @@ -138,7 +138,7 @@ class CodeGenerationStatusPoller(private val schemasClient: SchemasClient) { } fun getCurrentStatus( - schemaDownload: SchemaCodeDownloadRequestDetails + schemaDownload: SchemaCodeDownloadRequestDetails, ): CompletionStage { val future = CompletableFuture() pluginAwareExecuteOnPooledThread { @@ -165,7 +165,7 @@ class CodeGenerationStatusPoller(private val schemasClient: SchemasClient) { class CodeDownloader(private val schemasClient: SchemasClient) { fun download( - schemaDownload: SchemaCodeDownloadRequestDetails + schemaDownload: SchemaCodeDownloadRequestDetails, ): CompletionStage { val future = CompletableFuture() pluginAwareExecuteOnPooledThread { @@ -194,7 +194,7 @@ class CodeDownloader(private val schemasClient: SchemasClient) { class CodeExtractor { fun extractAndPlace( request: SchemaCodeDownloadRequestDetails, - downloadedSchemaCode: DownloadedSchemaCode + downloadedSchemaCode: DownloadedSchemaCode, ): CompletionStage { val zipContents = downloadedSchemaCode.zipContents val zipFileName = "${request.schema.registryName}.${request.schema.name}.${request.version}.${request.language.apiValue}.zip" diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialog.kt index ebbc4f5596..dc571945ab 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialog.kt @@ -21,7 +21,7 @@ class SchemaSearchSingleRegistryDialog( project: Project, private val searchExecutor: SchemaSearchExecutor = SchemaSearchExecutor(project), schemaViewer: SchemaViewer = SchemaViewer(project), - onCancelCallback: (SchemaSearchDialogState) -> Unit + onCancelCallback: (SchemaSearchDialogState) -> Unit, ) : SchemasSearchDialogBase( project, schemaViewer, @@ -36,7 +36,7 @@ class SchemaSearchSingleRegistryDialog( override fun searchSchemas( searchText: String, incrementalResultsCallback: OnSearchResultReturned, - registrySearchErrorCallback: OnSearchResultError + registrySearchErrorCallback: OnSearchResultError, ) { SchemasTelemetry.search(project, Result.Succeeded) searchExecutor.searchSchemasInRegistry(registryName, searchText, incrementalResultsCallback, registrySearchErrorCallback) @@ -47,7 +47,7 @@ class SchemaSearchAllRegistriesDialog( project: Project, private val searchExecutor: SchemaSearchExecutor = SchemaSearchExecutor(project), schemaViewer: SchemaViewer = SchemaViewer(project), - onCancelCallback: (SchemaSearchDialogState) -> Unit + onCancelCallback: (SchemaSearchDialogState) -> Unit, ) : SchemasSearchDialogBase( project, schemaViewer, @@ -62,7 +62,7 @@ class SchemaSearchAllRegistriesDialog( override fun searchSchemas( searchText: String, incrementalResultsCallback: OnSearchResultReturned, - registrySearchErrorCallback: OnSearchResultError + registrySearchErrorCallback: OnSearchResultError, ) { SchemasTelemetry.search(project, Result.Succeeded) searchExecutor.searchSchemasAcrossAllRegistries(searchText, incrementalResultsCallback, registrySearchErrorCallback) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialogState.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialogState.kt index 618b496cab..41ad5bcf7d 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialogState.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialogState.kt @@ -7,5 +7,5 @@ data class SchemaSearchDialogState( val searchText: String, val searchResults: List, val selectedResult: SchemaSearchResultWithRegistry?, - val selectedVersion: String? + val selectedVersion: String?, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchExecutor.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchExecutor.kt index b4eb22106b..edd91aca6e 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchExecutor.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchExecutor.kt @@ -16,13 +16,13 @@ import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread class SchemaSearchExecutor( private val project: Project, - private val schemasClient: SchemasClient = project.awsClient() + private val schemasClient: SchemasClient = project.awsClient(), ) { fun searchSchemasInRegistry( registryName: String, searchText: String, incrementalResultsCallback: OnSearchResultReturned, - registrySearchErrorCallback: OnSearchResultError + registrySearchErrorCallback: OnSearchResultError, ) { pluginAwareExecuteOnPooledThread { try { @@ -38,7 +38,7 @@ class SchemaSearchExecutor( fun searchSchemasAcrossAllRegistries( searchText: String, incrementalResultsCallback: OnSearchResultReturned, - registrySearchErrorCallback: OnSearchResultError + registrySearchErrorCallback: OnSearchResultError, ) { project.getResource(SchemasResources.LIST_REGISTRIES) .thenApply { @@ -51,7 +51,7 @@ class SchemaSearchExecutor( private fun doSingleSearch( registryName: String, - searchText: String + searchText: String, ): List { val searchRequest = SearchSchemasRequest.builder() .registryName(registryName) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchResults.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchResults.kt index df199d33f3..3fe897a225 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchResults.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchResults.kt @@ -10,7 +10,7 @@ typealias OnSearchResultError = (SchemaSearchError) -> Unit data class SchemaSearchResultWithRegistry( val name: String, val versions: List, - val registry: String + val registry: String, ) data class SchemaSearchError(val registryName: String, val errorMessage: String) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemasSearchDialogBase.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemasSearchDialogBase.kt index 4adae29d52..bb7d9acf34 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemasSearchDialogBase.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/schemas/search/SchemasSearchDialogBase.kt @@ -52,7 +52,7 @@ abstract class SchemasSearchDialogBase( protected val project: Project, private val schemaViewer: SchemaViewer, private val headerText: String, - private val onCancelCallback: (SchemaSearchDialogState) -> Unit + private val onCancelCallback: (SchemaSearchDialogState) -> Unit, ) : SchemaSearchDialog, DialogWrapper(project) { val searchTextField = JTextField() private val searchTextAlarm = Alarm(Alarm.ThreadToUse.SWING_THREAD, this.disposable) @@ -320,7 +320,7 @@ abstract class SchemasSearchDialogBase( abstract fun searchSchemas( searchText: String, incrementalResultsCallback: OnSearchResultReturned, - registrySearchErrorCallback: OnSearchResultError + registrySearchErrorCallback: OnSearchResultError, ) override fun createCenterPanel(): JComponent? = contentPanel diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfigureLambdaDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfigureLambdaDialog.kt index 34bb72d481..40a98f1ecb 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfigureLambdaDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfigureLambdaDialog.kt @@ -31,7 +31,7 @@ import javax.swing.JComponent class ConfigureLambdaDialog( private val project: Project, - private val queue: Queue + private val queue: Queue, ) : DialogWrapper(project) { private val coroutineScope = projectCoroutineScope(project) private val lambdaClient: LambdaClient = project.awsClient() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfirmIamPolicyDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfirmIamPolicyDialog.kt index 1c15b03b0d..f1bb92d653 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfirmIamPolicyDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfirmIamPolicyDialog.kt @@ -27,7 +27,7 @@ class ConfirmIamPolicyDialog( private val lambdaClient: LambdaClient, private val functionName: String, private val queue: Queue, - parent: Component? = null + parent: Component? = null, ) : DialogWrapper(project, parent, false, IdeModalityType.IDE) { private val coroutineScope = projectCoroutineScope(project) private val rolePolicy: String by lazy { createSqsPollerPolicy(queue.arn) } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfirmQueuePolicyDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfirmQueuePolicyDialog.kt index 28e5588455..a2b5186b44 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfirmQueuePolicyDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfirmQueuePolicyDialog.kt @@ -29,7 +29,7 @@ class ConfirmQueuePolicyDialog( private val queue: Queue, topicArn: String, private val existingPolicy: String?, - parent: Component? = null + parent: Component? = null, ) : DialogWrapper(project, parent, false, IdeModalityType.IDE) { private val coroutineScope = projectCoroutineScope(project) private val policyStatement = createSqsSnsSubscribePolicyStatement(queue.arn, topicArn) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/CreateQueueDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/CreateQueueDialog.kt index e30c9acadb..3268a13bb4 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/CreateQueueDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/CreateQueueDialog.kt @@ -24,7 +24,7 @@ import javax.swing.JComponent class CreateQueueDialog( private val project: Project, - private val client: SqsClient + private val client: SqsClient, ) : DialogWrapper(project) { private val coroutineScope = projectCoroutineScope(project) val view = CreateQueuePanel() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/EditAttributesDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/EditAttributesDialog.kt index 5f8af959b1..cafc9ad11d 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/EditAttributesDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/EditAttributesDialog.kt @@ -26,7 +26,7 @@ class EditAttributesDialog( private val project: Project, private val client: SqsClient, private val queue: Queue, - private val attributes: Map + private val attributes: Map, ) : DialogWrapper(project) { private val coroutineScope = projectCoroutineScope(project) val view = EditAttributesPanel() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/SqsExplorerNodes.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/SqsExplorerNodes.kt index 73f8d2db50..201c6eb639 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/SqsExplorerNodes.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/SqsExplorerNodes.kt @@ -23,7 +23,7 @@ class SqsServiceNode(project: Project, service: AwsExplorerServiceNode) : class SqsQueueNode( project: Project, - val queueUrl: String + val queueUrl: String, ) : AwsExplorerResourceNode( project, SqsClient.SERVICE_NAME, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/SubscribeSnsDialog.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/SubscribeSnsDialog.kt index 406b94daf9..04744b5360 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/SubscribeSnsDialog.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/SubscribeSnsDialog.kt @@ -28,7 +28,7 @@ import javax.swing.JComponent class SubscribeSnsDialog( private val project: Project, - private val queue: Queue + private val queue: Queue, ) : DialogWrapper(project) { private val coroutineScope = projectCoroutineScope(project) private val snsClient: SnsClient = project.awsClient() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/actions/PurgeQueueAction.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/actions/PurgeQueueAction.kt index e5213902c8..da69905855 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/actions/PurgeQueueAction.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/actions/PurgeQueueAction.kt @@ -30,7 +30,7 @@ import software.aws.toolkits.telemetry.SqsTelemetry class PurgeQueueAction( private val project: Project, private val client: SqsClient, - private val queue: Queue + private val queue: Queue, ) : DumbAwareAction(message("sqs.purge_queue.action")) { private val edtContext = getCoroutineUiContext() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/toolwindow/PollMessagePane.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/toolwindow/PollMessagePane.kt index cc7ff36e17..b3fc229f2a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/toolwindow/PollMessagePane.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/toolwindow/PollMessagePane.kt @@ -33,7 +33,7 @@ import javax.swing.JPanel class PollMessagePane( private val project: Project, private val client: SqsClient, - private val queue: Queue + private val queue: Queue, ) { private val coroutineScope = projectCoroutineScope(project) private val bgContext = getCoroutineBgContext() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/toolwindow/SendMessagePane.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/toolwindow/SendMessagePane.kt index b389cb79aa..405c16b751 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/toolwindow/SendMessagePane.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/toolwindow/SendMessagePane.kt @@ -30,7 +30,7 @@ class SendMessagePane( private val project: Project, private val client: SqsClient, private val queue: Queue, - disposable: Disposable + disposable: Disposable, ) { private val coroutineScope = disposableCoroutineScope(disposable) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/CawsSpaceTracker.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/CawsSpaceTracker.kt index e8c8aab972..84cdd21a06 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/CawsSpaceTracker.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/CawsSpaceTracker.kt @@ -30,7 +30,7 @@ class CawsSpaceTracker : PersistentStateComponent { } data class CawsSpaceState( - var lastSpaceName: String? = null + var lastSpaceName: String? = null, ) interface CawsSpaceSelectionChange { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/DeploySettings.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/DeploySettings.kt index 11361e62ab..f4e2cbf64a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/DeploySettings.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/DeploySettings.kt @@ -59,7 +59,7 @@ class DeploySettings : PersistentStateComponent { } data class DeployConfigs( - var samConfigs: MutableMap = mutableMapOf() + var samConfigs: MutableMap = mutableMapOf(), ) data class DeploySamConfig( @@ -68,7 +68,7 @@ data class DeploySamConfig( var repoUri: String? = null, var autoExecute: Boolean = false, var useContainer: Boolean = false, - var enabledCapabilities: List? = null + var enabledCapabilities: List? = null, ) /** diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/EcsExecCommandSettings.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/EcsExecCommandSettings.kt index 3dd8885734..dca994e380 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/EcsExecCommandSettings.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/EcsExecCommandSettings.kt @@ -30,5 +30,5 @@ class EcsExecCommandSettings : PersistentStateComponent } data class AwsEcsExecConfiguration( - var showExecuteCommandWarning: Boolean = true + var showExecuteCommandWarning: Boolean = true, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/GettingStartedSettings.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/GettingStartedSettings.kt index 3f63f903a6..8241b1534a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/GettingStartedSettings.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/GettingStartedSettings.kt @@ -28,5 +28,5 @@ class GettingStartedSettings : PersistentStateComponent { } data class SyncConfigs( - var samConfigs: MutableMap = mutableMapOf() + var samConfigs: MutableMap = mutableMapOf(), ) data class SyncSamConfig( @@ -70,5 +70,5 @@ data class SyncSamConfig( var useContainer: Boolean = false, var enabledCapabilities: List? = null, var tags: Map? = null, - var tempParameterOverrides: Map? = null + var tempParameterOverrides: Map? = null, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/ToolkitSettingsConfigurable.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/ToolkitSettingsConfigurable.kt index da15a667b3..5c7a562746 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/ToolkitSettingsConfigurable.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/ToolkitSettingsConfigurable.kt @@ -191,7 +191,7 @@ class ToolkitSettingsConfigurable : executableName: String, executableType: ExecutableType<*>, saved: String?, - currentInput: String? + currentInput: String?, ) { // If input is null, wipe out input and try to autodiscover if (currentInput == null) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/UpdateLambdaSettings.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/UpdateLambdaSettings.kt index 9bf51fe3da..83c7dd83ce 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/UpdateLambdaSettings.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/settings/UpdateLambdaSettings.kt @@ -56,12 +56,12 @@ class UpdateLambdaSettings private constructor(private val arn: String) { } data class UpdateLambda( - var configs: MutableMap = mutableMapOf() + var configs: MutableMap = mutableMapOf(), ) data class UpdateConfig( var bucketName: String? = null, var ecrRepo: String? = null, var dockerfile: String? = null, - var useContainer: Boolean = false + var useContainer: Boolean = false, ) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ConfirmPolicyPanel.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ConfirmPolicyPanel.kt index ad0033f882..4a99d4ed82 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ConfirmPolicyPanel.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ConfirmPolicyPanel.kt @@ -12,7 +12,7 @@ import javax.swing.JPanel class ConfirmPolicyPanel( private val project: Project, - warning: String + warning: String, ) { lateinit var component: JPanel private set diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/CredentialIdentifierSelector.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/CredentialIdentifierSelector.kt index 6b3aa3c3a2..699f99c982 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/CredentialIdentifierSelector.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/CredentialIdentifierSelector.kt @@ -33,7 +33,7 @@ class CredentialIdentifierSelector(identifiers: List = Cre value: CredentialIdentifier?, index: Int, selected: Boolean, - hasFocus: Boolean + hasFocus: Boolean, ) { if (value is InvalidCredentialIdentifier) { append(value.displayName, SimpleTextAttributes.ERROR_ATTRIBUTES) diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ProjectFileBrowseListener.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ProjectFileBrowseListener.kt index 02cf4057ab..600214f8c6 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ProjectFileBrowseListener.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ProjectFileBrowseListener.kt @@ -20,7 +20,7 @@ private class ProjectFileBrowseListener( component: ComponentWithBrowseButton, fileChooserDescriptor: FileChooserDescriptor, textComponentAccessor: TextComponentAccessor, - private val onChosen: ((VirtualFile) -> String?)? = null + private val onChosen: ((VirtualFile) -> String?)? = null, ) : ComponentWithBrowseButton.BrowseFolderActionListener( /* title */ null, @@ -61,7 +61,7 @@ fun installProjectFileRootedCompletionAndBrowseDialog( textField: JTextField?, fileChooserDescriptor: FileChooserDescriptor, textComponentAccessor: TextComponentAccessor, - onChosen: ((VirtualFile) -> String)? = null + onChosen: ((VirtualFile) -> String)? = null, ) { component.addActionListener( ProjectFileBrowseListener(project, component, fileChooserDescriptor, textComponentAccessor, onChosen) @@ -82,7 +82,7 @@ fun installTextFieldProjectFileBrowseListener( project: Project, component: ComponentWithBrowseButton, fileChooserDescriptor: FileChooserDescriptor, - onChosen: ((VirtualFile) -> String)? = null + onChosen: ((VirtualFile) -> String)? = null, ) { installProjectFileRootedCompletionAndBrowseDialog( project = project, @@ -100,7 +100,7 @@ fun installComboBoxProjectFileBrowseListener( project: Project, component: ComboboxWithBrowseButton, fileChooserDescriptor: FileChooserDescriptor, - onChosen: ((VirtualFile) -> String)? = null + onChosen: ((VirtualFile) -> String)? = null, ) { installProjectFileRootedCompletionAndBrowseDialog( project = project, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ResourceSelector.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ResourceSelector.kt index 5514dc4d7c..64ef26aa7c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ResourceSelector.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/ResourceSelector.kt @@ -38,7 +38,7 @@ class ResourceSelector private constructor( customRenderer: ListCellRenderer?, loadOnCreate: Boolean, private val sortOnLoad: Boolean, - private val connectionSettingsSupplier: ConnectionSettingsSupplier + private val connectionSettingsSupplier: ConnectionSettingsSupplier, ) : ComboBox(comboBoxModel) { private val loading = message("loading_resource.loading") @@ -209,7 +209,7 @@ class ResourceSelector private constructor( private enum class Status { NOT_LOADED, LOADING, - LOADED + LOADED, } companion object { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/SliderPanel.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/SliderPanel.kt index bcfc8b5df7..365489805e 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/SliderPanel.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/SliderPanel.kt @@ -20,7 +20,7 @@ class SliderPanel( maxTick: Int = max, minorTick: Int = (max - min) / 30, majorTick: Int = (max - min) / 5, - snap: Boolean = false + snap: Boolean = false, ) { @Suppress("UnusedPrivateMember") // root element must be bound private lateinit var content: JPanel diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/connection/AwsConnectionSettingsEditor.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/connection/AwsConnectionSettingsEditor.kt index 64646cadd4..8bc5561a63 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/connection/AwsConnectionSettingsEditor.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/connection/AwsConnectionSettingsEditor.kt @@ -29,7 +29,7 @@ import javax.swing.JComponent class AwsConnectionSettingsEditor>( project: Project, serviceName: String? = null, - settingsChangedListener: (AwsRegion?, String?) -> Unit = { _, _ -> } + settingsChangedListener: (AwsRegion?, String?) -> Unit = { _, _ -> }, ) : SettingsEditor() { private val awsConnectionSelector = AwsConnectionSettingsSelector(project, serviceName) { // TODO: Undo this unwrapping @@ -56,7 +56,7 @@ fun > SettingsEditorGroup.addAwsCon abstract class AwsConnectionsRunConfigurationBase( project: Project, configFactory: ConfigurationFactory, - id: String? + id: String?, ) : LocatableConfigurationBase(project, configFactory, id) { abstract val serializableOptions: T diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/connection/CawsLoginOverlay.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/connection/CawsLoginOverlay.kt index ceb0e59b86..e106cfbcac 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/connection/CawsLoginOverlay.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/ui/connection/CawsLoginOverlay.kt @@ -30,7 +30,7 @@ import javax.swing.JComponent open class CawsLoginOverlay( private val project: Project?, private val disposable: Disposable, - private val drawPostLoginContent: (CawsLoginOverlay.(ClientConnectionSettings<*>) -> JComponent) + private val drawPostLoginContent: (CawsLoginOverlay.(ClientConnectionSettings<*>) -> JComponent), ) : NonOpaquePanel(VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0, true, true)) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/ProgressMonitors.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/ProgressMonitors.kt index 59f6073fea..49acb0e940 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/ProgressMonitors.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/ProgressMonitors.kt @@ -16,7 +16,7 @@ class ProgressMonitorInputStream( indicator: ProgressIndicator, delegate: InputStream, length: Long, - cancelable: Boolean = true + cancelable: Boolean = true, ) : FilterInputStream(delegate) { private val monitor = ProgressMonitor(indicator, length, cancelable) @@ -42,7 +42,7 @@ class ProgressMonitorInputStream( companion object { fun fromFile( indicator: ProgressIndicator, - path: Path + path: Path, ): InputStream = ProgressMonitorInputStream(indicator, FileInputStream(path.toFile()), path.fileSize()) } } diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/ToolkitNotificationUtils.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/ToolkitNotificationUtils.kt index 90d5c76eab..dd1d4234b9 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/ToolkitNotificationUtils.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/ToolkitNotificationUtils.kt @@ -17,7 +17,7 @@ import software.aws.toolkits.resources.message fun notifyNoActiveCredentialsError( project: Project, title: String = message("aws.notification.title"), - content: String = message("aws.notification.credentials_missing") + content: String = message("aws.notification.credentials_missing"), ) { notifyError( title = title, @@ -33,7 +33,7 @@ fun notifyNoActiveCredentialsError( fun notifySamCliNotValidError( project: Project, title: String = message("aws.notification.title"), - content: String + content: String, ) { notifyError( title = title, diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/BuildViewStepEmitter.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/BuildViewStepEmitter.kt index 4b0e2ec8f3..0e30d95c98 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/BuildViewStepEmitter.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/BuildViewStepEmitter.kt @@ -23,7 +23,7 @@ import software.aws.toolkits.resources.message class BuildViewWorkflowEmitter private constructor( private val buildListener: BuildProgressListener, private val workflowTitle: String, - private val workflowId: String + private val workflowId: String, ) : WorkflowEmitter { override fun createStepEmitter(): StepEmitter = BuildViewStepEmitter.createRoot(buildListener, workflowId) @@ -88,7 +88,7 @@ class BuildViewStepEmitter private constructor( private val parentId: String, private val stepName: String, private val hidden: Boolean, - private val parent: StepEmitter? + private val parent: StepEmitter?, ) : StepEmitter { override fun createChildEmitter(stepName: String, hidden: Boolean): StepEmitter { val (childParent, childStepName) = if (hidden) { diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/ParallelStep.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/ParallelStep.kt index 9bf95bf41d..fea9399e4c 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/ParallelStep.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/ParallelStep.kt @@ -25,7 +25,7 @@ abstract class ParallelStep : Step() { final override fun execute( context: Context, messageEmitter: StepEmitter, - ignoreCancellation: Boolean + ignoreCancellation: Boolean, ) { buildChildSteps(context).forEach { val stepFuture = CompletableFuture() diff --git a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/StepExecutor.kt b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/StepExecutor.kt index 17a117868a..f90182e11a 100644 --- a/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/StepExecutor.kt +++ b/plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/utils/execution/steps/StepExecutor.kt @@ -19,7 +19,7 @@ import java.io.OutputStream class StepExecutor( project: Project?, private val workflow: StepWorkflow, - private val messageEmitter: WorkflowEmitter + private val messageEmitter: WorkflowEmitter, ) { var onSuccess: ((Context) -> Unit)? = null var onError: ((Throwable) -> Unit)? = null diff --git a/plugins/toolkit/jetbrains-core/tst-232-233/software/aws/toolkits/jetbrains/utils/Compat.kt b/plugins/toolkit/jetbrains-core/tst-232-233/software/aws/toolkits/jetbrains/utils/Compat.kt index 47e9af2885..09eeb67ddc 100644 --- a/plugins/toolkit/jetbrains-core/tst-232-233/software/aws/toolkits/jetbrains/utils/Compat.kt +++ b/plugins/toolkit/jetbrains-core/tst-232-233/software/aws/toolkits/jetbrains/utils/Compat.kt @@ -14,7 +14,7 @@ suspend fun MavenProjectsManager.addManagedFilesWithProfiles( profiles: MavenExplicitProfiles, nothing: Nothing?, nothing1: Nothing?, - nothing3: Boolean + nothing3: Boolean, ) { resetManagedFilesAndProfilesInTests(poms, profiles) runInEdtAndWait { diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/EditorUtils.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/EditorUtils.kt index 7c3439951c..7cf1e8ed3d 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/EditorUtils.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/EditorUtils.kt @@ -19,7 +19,7 @@ fun getEditorNotif project: Project, editor: FileEditor, provider: Class, - key: Key + key: Key, ): JComponent? { PlatformTestUtil.dispatchAllInvocationEventsInIdeEventQueue() NonBlockingReadActionImpl.waitForAsyncTaskCompletion() diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtensionSettingsEditorTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtensionSettingsEditorTest.kt index dd591e843e..b3f0f37a10 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtensionSettingsEditorTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtensionSettingsEditorTest.kt @@ -128,7 +128,7 @@ class AwsConnectionExtensionSettingsEditorTest { private fun ApplicationConfiguration.extensionOptions() = getCopyableUserData(AWS_CONNECTION_RUN_CONFIGURATION_KEY) private fun ObjectAssert>.isPersistedAs( - expected: AwsCredentialInjectionOptions.() -> Unit + expected: AwsCredentialInjectionOptions.() -> Unit, ) { satisfiesKt { val updatedConfiguration = createConfiguration { } diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/experiments/ToolkitExperimentManagerTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/experiments/ToolkitExperimentManagerTest.kt index 0a261cd975..c2fb9d2439 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/experiments/ToolkitExperimentManagerTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/core/experiments/ToolkitExperimentManagerTest.kt @@ -371,5 +371,5 @@ class DummyExperiment( id: String = aString(), hidden: Boolean = false, default: Boolean = false, - suggestionSnooze: Duration = Duration.ofMillis(1) + suggestionSnooze: Duration = Duration.ofMillis(1), ) : ToolkitExperiment(id, { "Dummy ($id)" }, { "Dummy Description" }, hidden, default, suggestionSnooze) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/Mocks.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/Mocks.kt index 613b4ae020..2409e8e97a 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/Mocks.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudformation/stack/Mocks.kt @@ -59,7 +59,7 @@ internal class MockEventsGenerator { internal fun MockClientManagerRule.createMock( events: MockEventsGenerator, - postprocess: (CloudFormationClient) -> Unit = { } + postprocess: (CloudFormationClient) -> Unit = { }, ) = create().apply { whenever(describeStackEvents(Mockito.any())).then { invocation -> events.getEvents((invocation.arguments[0] as DescribeStackEventsRequest)) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/InsightsUtils.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/InsightsUtils.kt index 12cd92db4f..91b09151fc 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/InsightsUtils.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/InsightsUtils.kt @@ -11,7 +11,7 @@ object InsightsUtils { connectionSettings: ConnectionSettings, logGroups: List = listOf("logGroup"), timeRange: TimeRange = TimeRange.RelativeRange(1, ChronoUnit.DAYS), - query: QueryString = QueryString.InsightsQueryString("query") + query: QueryString = QueryString.InsightsQueryString("query"), ) = QueryDetails( connectionSettings = connectionSettings, logGroups = logGroups, diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditorDialogTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditorDialogTest.kt index a1da9fd52c..42d35b13e1 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditorDialogTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/cloudwatch/logs/insights/QueryEditorDialogTest.kt @@ -382,7 +382,7 @@ class QueryEditorDialogTest { querySearch: Boolean = false, queryLogs: Boolean = false, searchTerm: String = "Example", - query: String = "Example Query" + query: String = "Example Query", ) { view.logGroupTable.populateLogGroups(logGroups.toSet(), logGroups) view.relativeTimeRadioButton.isSelected = relativeTime diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamodb/AttributesTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamodb/AttributesTest.kt index 53d504397a..5271452cd9 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamodb/AttributesTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/dynamodb/AttributesTest.kt @@ -20,7 +20,7 @@ class AttributesTest { private val dataType: String, private val attributeValue: AttributeValue, private val attributeType: KClass>, - private val strFormat: String + private val strFormat: String, ) { companion object { @JvmStatic diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/local/CreateRunConfiguration.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/local/CreateRunConfiguration.kt index 8379bdbb30..6f6219c219 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/local/CreateRunConfiguration.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/local/CreateRunConfiguration.kt @@ -36,7 +36,7 @@ fun createTemplateRunConfiguration( inputIsFile: Boolean = false, credentialsProviderId: String? = null, region: AwsRegion? = getDefaultRegion(), - samOptions: SamOptions = SamOptions() + samOptions: SamOptions = SamOptions(), ): LocalLambdaRunConfiguration { val runConfiguration = samRunConfiguration(project) runConfiguration.useTemplate(templateFile, logicalId) @@ -65,7 +65,7 @@ fun createHandlerBasedRunConfiguration( credentialsProviderId: String? = null, region: AwsRegion? = getDefaultRegion(), environmentVariables: MutableMap = mutableMapOf(), - samOptions: SamOptions = SamOptions() + samOptions: SamOptions = SamOptions(), ): LocalLambdaRunConfiguration { val runConfiguration = samRunConfiguration(project) runConfiguration.useHandler(runtime, handler) @@ -90,7 +90,7 @@ private fun createBaseRunConfiguration( credentialsProviderId: String?, inputIsFile: Boolean, input: String?, - samOptions: SamOptions + samOptions: SamOptions, ) { runConfiguration.regionId(region?.id) runConfiguration.credentialProviderId(credentialsProviderId) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/remote/CreateRunConfiguration.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/remote/CreateRunConfiguration.kt index c86c4c2a35..9cec8cad16 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/remote/CreateRunConfiguration.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/remote/CreateRunConfiguration.kt @@ -15,7 +15,7 @@ fun createRunConfiguration( inputIsFile: Boolean = false, regionId: AwsRegion? = getDefaultRegion(), credentialId: String? = "MockCredentials", - functionName: String? = "DummyFunction" + functionName: String? = "DummyFunction", ): RemoteLambdaRunConfiguration { val runManager = RunManager.getInstance(project) val factory = LambdaRunConfigurationType.getInstance() diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaRuntimeGroupTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaRuntimeGroupTest.kt index 9671ca6a46..d84ebae96f 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaRuntimeGroupTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/java/JavaRuntimeGroupTest.kt @@ -22,7 +22,7 @@ import software.aws.toolkits.jetbrains.utils.rules.JavaCodeInsightTestFixtureRul class JavaRuntimeGroupTest( @Suppress("unused") private val name: String, private val sdk: () -> Sdk, - private val expectedRuntime: LambdaRuntime? + private val expectedRuntime: LambdaRuntime?, ) { @Rule @JvmField diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/SamCommonTestUtils.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/SamCommonTestUtils.kt index 32d790cb89..43ecbdda5c 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/SamCommonTestUtils.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/SamCommonTestUtils.kt @@ -61,7 +61,7 @@ object SamCommonTestUtils { logicalName: String = "Function", codeUri: String, handler: String, - runtime: LambdaRuntime + runtime: LambdaRuntime, ): PsiFile = this.addFileToProject( "template.yaml", """ diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/SamTemplateUtilsTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/SamTemplateUtilsTest.kt index 4353636249..854e6447cb 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/SamTemplateUtilsTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/SamTemplateUtilsTest.kt @@ -574,7 +574,7 @@ Resources: logicalName: String, codeLocation: String, handler: String, - runtime: String + runtime: String, ) { runInEdtAndWait { assertThat(function.logicalName).isEqualTo(logicalName) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncSamApplicationValidatorTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncSamApplicationValidatorTest.kt index e418fcc8f5..8dfd7f4058 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncSamApplicationValidatorTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncSamApplicationValidatorTest.kt @@ -398,7 +398,7 @@ class SyncSamApplicationValidatorTest { override val logicalName: String, private val type: String, private val defaultValue: String?, - private val additionalProperties: Map = emptyMap() + private val additionalProperties: Map = emptyMap(), ) : Parameter { override fun getScalarProperty(key: String): String = getOptionalScalarProperty(key) ?: throw Exception("Cannot be null") diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionPanelTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionPanelTest.kt index 8b3a72c575..9488139696 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionPanelTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionPanelTest.kt @@ -176,7 +176,7 @@ class SchemaSelectionPanelTest { schemaName: String, schemaRootEventName: String, schemaPackageHierarchy: String, - schemaTemplateParameters: SchemaTemplateParameters? + schemaTemplateParameters: SchemaTemplateParameters?, ) { assertThat(schemaTemplateParameters).isNotNull assertThat(schemaTemplateParameters?.schema?.registryName).isEqualTo(REGISTRY_NAME) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialogTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialogTest.kt index 1d2fc93538..528abf256c 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialogTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/schemas/code/DownloadCodeForSchemaDialogTest.kt @@ -211,7 +211,7 @@ class DownloadCodeForSchemaDialogTest { private fun selectDialogDefaults( dialog: DownloadCodeForSchemaDialog, - path: String + path: String, ) { dialog.view.location.text = path dialog.view.version.selectedItem = VERSION diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialogTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialogTest.kt index db6cd86a40..e84f39380d 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialogTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/schemas/search/SchemaSearchDialogTest.kt @@ -407,7 +407,7 @@ class SchemaSearchDialogTest { private fun assertSearchResultsDialogState( dialog: SchemasSearchDialogBase, expectedResults: Collection, - searchErrors: Collection + searchErrors: Collection, ) { assertThat(dialog.getDownloadButton()?.isEnabled).isFalse() assertThat(dialog.previewText.text.isEmpty()).isTrue() @@ -422,7 +422,7 @@ class SchemaSearchDialogTest { dialog: SchemasSearchDialogBase, schemaContents: String, versions: Collection, - selectedVersion: String + selectedVersion: String, ) { assertThat(dialog.getDownloadButton()?.isEnabled).isTrue() assertThat(dialog.previewText.text).isEqualTo(schemaContents) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/sqs/EditAttributesDialogTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/sqs/EditAttributesDialogTest.kt index cbfbb2059e..a93c2417ff 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/sqs/EditAttributesDialogTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/sqs/EditAttributesDialogTest.kt @@ -110,7 +110,7 @@ class EditAttributesDialogTest { maxDeliveryDelay: Int = MAX_DELIVERY_DELAY, waitTime: Int = MAX_WAIT_TIME, testRetentionPeriod: Int? = MAX_RETENTION_PERIOD, - testMessageSize: Int? = MAX_MESSAGE_SIZE_LIMIT + testMessageSize: Int? = MAX_MESSAGE_SIZE_LIMIT, ) = EditAttributesDialog(projectRule.project, client, queue, mapOf()).apply { view.visibilityTimeout.value = visibilityTimeout view.messageSize.text = testMessageSize?.toString() ?: "" diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/ui/feedback/FeedbackTest.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/ui/feedback/FeedbackTest.kt index 4c7e4f6e01..06317a0796 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/ui/feedback/FeedbackTest.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/ui/feedback/FeedbackTest.kt @@ -23,7 +23,7 @@ class FeedbackTest { private class TestFeedbackDialog( project: Project, initialSentiment: Sentiment, - initialComment: String + initialComment: String, ) : FeedbackDialog(project, initialSentiment, initialComment) { override fun notificationTitle() = "title" override fun productName() = "product" diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/RunConfigTestUtils.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/RunConfigTestUtils.kt index ad1d3f2986..bea5629e41 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/RunConfigTestUtils.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/RunConfigTestUtils.kt @@ -216,7 +216,7 @@ fun readProject( relativePath: String, sourceFileName: String, projectRule: CodeInsightTestFixtureRule, - templatePatches: Map = emptyMap() + templatePatches: Map = emptyMap(), ): Pair { val testDataPath = Paths.get(System.getProperty("testDataPath"), relativePath).toFile() val (source, template) = testDataPath.walk().fold>(Pair(null, null)) { acc, file -> @@ -262,7 +262,7 @@ fun samImageRunDebugTest( mockCredentialsId: String, input: String, expectedOutput: String? = input.uppercase(), - addBreakpoint: (() -> Unit)? = null + addBreakpoint: (() -> Unit)? = null, ) { assumeImageSupport() val (_, template) = readProject(relativePath, sourceFileName, projectRule, templatePatches) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/extensions/DevEnvironmentExtension.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/extensions/DevEnvironmentExtension.kt index 719d0f4b3f..3ccb401156 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/extensions/DevEnvironmentExtension.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/extensions/DevEnvironmentExtension.kt @@ -12,7 +12,7 @@ import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection class DevEnvironmentExtension( connection: () -> ToolkitConnection, - environmentBuilder: (CodeCatalystClient, CreateDevEnvironmentRequest.Builder) -> Unit + environmentBuilder: (CodeCatalystClient, CreateDevEnvironmentRequest.Builder) -> Unit, ) : AfterAllCallback { private val client: CodeCatalystClient by lazy { AwsClientManager.getInstance().getClient(connection().getConnectionSettings()) @@ -45,5 +45,5 @@ class DevEnvironmentExtension( data class DevEnvironment( val spaceName: String, val projectName: String, - val id: String + val id: String, ) diff --git a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/CloudFormationLazyInitRule.kt b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/CloudFormationLazyInitRule.kt index c4e54652d4..d1132113ea 100644 --- a/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/CloudFormationLazyInitRule.kt +++ b/plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/rules/CloudFormationLazyInitRule.kt @@ -17,7 +17,7 @@ class CloudFormationLazyInitRule( private val stackName: String, private val templateBody: String, private val parameters: List, - private val cloudformationClient: CloudFormationClient + private val cloudformationClient: CloudFormationClient, ) : ExternalResource() { val outputs: Map by lazy { cloudformationClient.describeStacks { diff --git a/plugins/toolkit/jetbrains-gateway/it/software/aws/toolkits/jetbrains/gateway/GatewayEcrVersionsKtTest.kt b/plugins/toolkit/jetbrains-gateway/it/software/aws/toolkits/jetbrains/gateway/GatewayEcrVersionsKtTest.kt index d899843884..dfaa488824 100644 --- a/plugins/toolkit/jetbrains-gateway/it/software/aws/toolkits/jetbrains/gateway/GatewayEcrVersionsKtTest.kt +++ b/plugins/toolkit/jetbrains-gateway/it/software/aws/toolkits/jetbrains/gateway/GatewayEcrVersionsKtTest.kt @@ -48,10 +48,10 @@ class GatewayEcrVersionsKtTest { } data class EcrPublicToken( - val token: String + val token: String, ) data class EcrPublicListTagsResponse( val name: String, - val tags: List + val tags: List, ) diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectionProvider.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectionProvider.kt index 4d7f269686..ecb470e8bc 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectionProvider.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectionProvider.kt @@ -388,7 +388,7 @@ class CawsConnectionProvider : GatewayConnectionProvider { private fun validateEnvironmentIsRunning( indicator: ProgressIndicator, - environmentActions: WorkspaceActions + environmentActions: WorkspaceActions, ) { when (val status = environmentActions.getEnvironmentDetails().status()) { DevEnvironmentStatus.PENDING, DevEnvironmentStatus.STARTING -> environmentActions.waitForTaskReady(indicator) @@ -436,7 +436,8 @@ class CawsConnectionProvider : GatewayConnectionProvider { } is GitSettings.CawsOwnedRepoSettings, - is GitSettings.NoRepo -> { + is GitSettings.NoRepo, + -> { } } @@ -537,7 +538,7 @@ data class CawsConnectionParameters( val envId: String, val gitSettings: GitSettings, val toolkitInstallSettings: ToolkitInstallSettings, - val ssoSettings: SsoSettings? + val ssoSettings: SsoSettings?, ) { companion object { const val CAWS_SPACE = "aws.codecatalyst.space" @@ -603,7 +604,7 @@ data class CawsConnectionParameters( data class SsoSettings( val startUrl: String, - val region: String + val region: String, ) { companion object { fun fromUrlParameters(startUrl: String, region: String) = SsoSettings(URLDecoder.decode(startUrl, "UTF-8"), region) diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectorViewPanels.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectorViewPanels.kt index cdfb285fad..b90e251310 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectorViewPanels.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectorViewPanels.kt @@ -105,7 +105,7 @@ class CawsSettings( // intermediate values var connectionSettings: ClientConnectionSettings<*>? = null, var branchCloneType: BranchCloneType = BranchCloneType.EXISTING, - var is3P: Boolean = false + var is3P: Boolean = false, ) fun cawsWizard(lifetime: Lifetime, settings: CawsSettings = CawsSettings()) = MultistagePanelContainer( @@ -618,12 +618,12 @@ class EnvironmentDetailsPanel(private val context: CawsSettings, lifetime: Lifet enum class CawsWizardCloneType { CAWS, UNLINKED_3P, - NONE + NONE, } enum class BranchCloneType { EXISTING, - NEW_FROM_EXISTING + NEW_FROM_EXISTING, } class PersistentStorageOptions(items: List, private val subscriptionIsFreeTier: Boolean) : CollectionComboBoxModel(items) { diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsGatewayConnectionHandle.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsGatewayConnectionHandle.kt index 99103491c7..6ca1d917e5 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsGatewayConnectionHandle.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsGatewayConnectionHandle.kt @@ -11,7 +11,7 @@ import javax.swing.JComponent class CawsGatewayConnectionHandle( lifetime: Lifetime, private val envId: String, - private val componentProvider: (GatewayConnectionHandle) -> JComponent + private val componentProvider: (GatewayConnectionHandle) -> JComponent, ) : GatewayConnectionHandle(lifetime) { // framework does not call componentProvider in test mode private val component = componentProvider(this) diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsUiComponents.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsUiComponents.kt index ccf83a4f7a..a66c12bb59 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsUiComponents.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsUiComponents.kt @@ -70,7 +70,7 @@ fun Row.ideVersionComboBox(disposable: Disposable, product: KMutableProperty0, - freeSubscriptionTier: Boolean + freeSubscriptionTier: Boolean, ) { row { browserLink(message("caws.environment.view_pricing"), CawsEndpoints.ConsoleFactory.pricing()) @@ -212,7 +212,7 @@ fun Row.cawsEnvironmentTimeout(timeout: KMutableProperty0) { value: InactivityTimeout?, index: Int, selected: Boolean, - hasFocus: Boolean + hasFocus: Boolean, ) { if (value == null) return diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GatewayEcrVersions.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GatewayEcrVersions.kt index 780a51409c..fdcc4557b0 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GatewayEcrVersions.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GatewayEcrVersions.kt @@ -9,7 +9,7 @@ fun gatewayManifest(): GatewayManifest = GatewayManifest(LATEST_ECR) data class GatewayManifest( @JsonProperty("images") - private val latestImages: List + private val latestImages: List, ) { val images = latestImages } @@ -24,7 +24,7 @@ data class GatewayProduct( @JsonProperty("marketingName") val fullName: String, @JsonProperty("tags") - val tags: List + val tags: List, ) { val apiType = when (productCode) { "IU" -> "IntelliJ" diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GitWrappers.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GitWrappers.kt index 010598eeb1..9e820f6204 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GitWrappers.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/GitWrappers.kt @@ -10,7 +10,7 @@ import software.aws.toolkits.core.utils.warn data class RemoteRef( val obj: String, - val ref: String + val ref: String, ) object GitWrappers { diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/SourceRepository.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/SourceRepository.kt index c2a26cbcd5..e2d5203871 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/SourceRepository.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/SourceRepository.kt @@ -6,7 +6,7 @@ package software.aws.toolkits.jetbrains.gateway import software.amazon.awssdk.services.codecatalyst.model.ListSourceRepositoriesItem data class SourceRepository( - val name: String + val name: String, ) fun ListSourceRepositoriesItem.toSourceRepository() = SourceRepository( @@ -15,5 +15,5 @@ fun ListSourceRepositoriesItem.toSourceRepository() = SourceRepository( data class BranchSummary( val name: String, - val headCommitId: String + val headCommitId: String, ) diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/Workspace.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/Workspace.kt index 3cc5081ecb..0b1262db68 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/Workspace.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/Workspace.kt @@ -29,7 +29,7 @@ data class Workspace( val branch: String?, val lastUpdated: Instant, val labels: List, - val ides: List + val ides: List, ) { val ide = ides.firstOrNull { it.runtime()?.contains(JB_ECR_DOMAIN) ?: false } val isCompatible = ide != null diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/AbstractSsmCommandExecutor.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/AbstractSsmCommandExecutor.kt index f1ff915ff1..d0574ca5f7 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/AbstractSsmCommandExecutor.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/AbstractSsmCommandExecutor.kt @@ -196,7 +196,7 @@ enum class StdOutResult { TIMEOUT, SUCCESS, FAILED, - UNKNOWN + UNKNOWN, } fun SsmCommandExecutorOutput.resultFromStdOut(): StdOutResult { diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/IdeBackendActions.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/IdeBackendActions.kt index 2d3146f49c..874bd9ec35 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/IdeBackendActions.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/IdeBackendActions.kt @@ -38,7 +38,7 @@ private const val REMOTE_SERVER_CMD = "$IDE_BACKEND_DIR/bin/remote-dev-server.sh class IdeBackendActions( private val remoteScriptPath: String, projectName: String?, - private val remoteCommandExecutor: AbstractSsmCommandExecutor + private val remoteCommandExecutor: AbstractSsmCommandExecutor, ) { // use projectPath if it exists, otherwise fallback to the default root private val projectPath by lazy { diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLine.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLine.kt index 79f2a3bd50..d21936cd8d 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLine.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLine.kt @@ -13,7 +13,7 @@ open class ScpCommandLine( remoteHost: String, remotePath: String, recursive: Boolean = false, - port: Int? = null + port: Int? = null, ) { private val sshOptions = ParamsGroup(SSH_OPTIONS) private val localPaths = ParamsGroup(LOCAL_PATHS) diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/SshAgent.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/SshAgent.kt index dd7542ca1b..30ce9ece9a 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/SshAgent.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/SshAgent.kt @@ -5,14 +5,14 @@ package software.aws.toolkits.jetbrains.gateway.connection sealed class SshAgent sealed class SocketBasedSshAgent( - open val socket: String + open val socket: String, ) : SshAgent() object WindowsServiceSshAgent : SshAgent() data class ExistingSshAgent(override val socket: String) : SocketBasedSshAgent(socket) data class ProcessBasedSshAgent( val pid: Int, - override val socket: String + override val socket: String, ) : SocketBasedSshAgent(socket) { companion object { diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/SsmCommandLineFactory.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/SsmCommandLineFactory.kt index 710e1508eb..d8b60d4d0e 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/SsmCommandLineFactory.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/SsmCommandLineFactory.kt @@ -15,7 +15,7 @@ import software.aws.toolkits.jetbrains.services.ssm.SsmPlugin data class StartSessionResponse( val sessionId: String, val streamUrl: String, - val tokenValue: String + val tokenValue: String, ) { override fun toString() = "StartSessionResponse(sessionId='$sessionId', streamUrl='***', tokenValue='***')" } @@ -24,7 +24,7 @@ class SsmCommandLineFactory( private val ssmTarget: String, private val sessionParameters: StartSessionResponse, private val region: AwsRegion, - private val overrideSsmPlugin: String? = null + private val overrideSsmPlugin: String? = null, ) { fun sshCommand(): SshCommandLine { val command = SshCommandLine(ssmTarget) @@ -52,7 +52,7 @@ class SsmCommandLineFactory( inner class ProxyCommand( val exePath: String, - val args: List + val args: List, ) /** diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/caws/CawsCommandExecutor.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/caws/CawsCommandExecutor.kt index a46cee10fb..d708717b00 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/caws/CawsCommandExecutor.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/caws/CawsCommandExecutor.kt @@ -14,7 +14,7 @@ class CawsCommandExecutor( private val cawsClient: CodeCatalystClient, ssmTarget: String, private val spaceName: String, - private val projectName: String + private val projectName: String, ) : AbstractSsmCommandExecutor(AwsRegion.GLOBAL, ssmTarget) { override fun startSsh(): StartSessionResponse = startSession { diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/InstallPluginBackend.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/InstallPluginBackend.kt index a655f9f027..253dbda727 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/InstallPluginBackend.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/InstallPluginBackend.kt @@ -34,7 +34,7 @@ import java.util.UUID abstract class InstallPluginBackend( protected val commandExecutor: AbstractSsmCommandExecutor, protected val remoteScriptPath: String, - protected val idePath: String + protected val idePath: String, ) : CliBasedStep() { override val stepName: String = message("gateway.connection.workflow.install_toolkit") @@ -53,7 +53,7 @@ abstract class InstallPluginBackend( commandExecutor: AbstractSsmCommandExecutor, remoteScriptPath: String, idePath: String, - private val marketplaceUrl: String = "https://plugins.jetbrains.com" + private val marketplaceUrl: String = "https://plugins.jetbrains.com", ) : InstallPluginBackend(commandExecutor, remoteScriptPath, idePath) { override fun buildDownloadUrl(): String? { val baseUrl = "$marketplaceUrl/pluginManager?action=download&id=aws.toolkit&build=" @@ -76,7 +76,7 @@ abstract class InstallPluginBackend( private val installSettings: ToolkitInstallSettings.UseArbitraryLocalPath, commandExecutor: AbstractSsmCommandExecutor, remoteScriptPath: String, - idePath: String + idePath: String, ) : InstallPluginBackend(commandExecutor, remoteScriptPath, idePath) { override fun buildDownloadUrl(): String? { val credId = CredentialManager.getInstance().getCredentialIdentifierById("profile:default") ?: error("Default profile not available") @@ -129,7 +129,7 @@ abstract class InstallPluginBackend( fun installBundledPluginBackend( commandExecutor: AbstractSsmCommandExecutor, remoteScriptPath: String, - idePath: String + idePath: String, ): Step { val remotePluginPath = "/tmp/${UUID.randomUUID()}.zip" @@ -143,7 +143,7 @@ fun installBundledPluginBackend( private class ZipAndCopyBundledPlugin( private val remotePluginPath: String, - private val commandExecutor: AbstractSsmCommandExecutor + private val commandExecutor: AbstractSsmCommandExecutor, ) : CliBasedStep() { override val stepName: String = "Zip and copy bundled plugin" override fun constructCommandLine(context: Context): GeneralCommandLine? { @@ -163,7 +163,7 @@ private class InstallBundledPluginBackend( private val remotePluginPath: String, commandExecutor: AbstractSsmCommandExecutor, remoteScriptPath: String, - idePath: String + idePath: String, ) : InstallPluginBackend(commandExecutor, remoteScriptPath, idePath) { override fun buildDownloadUrl(): String? = "file://$remotePluginPath" } diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt index d4dc263e34..fd5052db86 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/StartBackend.kt @@ -35,7 +35,7 @@ class StartBackend( private val executor: CawsCommandExecutor, private val lifetime: LifetimeDefinition, private val envId: String, - private val isSmallInstance: Boolean + private val isSmallInstance: Boolean, ) : Step() { override val stepName: String = message("gateway.connection.workflow.start_ide") diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/v2/HostContext.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/v2/HostContext.kt index 8321328271..2643419a34 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/v2/HostContext.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/v2/HostContext.kt @@ -11,5 +11,5 @@ class HostContext( override var config: Unit?, override var deployData: HostDeployInputs?, override val hostAccessor: HighLevelHostAccessor?, - override val remoteProjectPath: String? + override val remoteProjectPath: String?, ) : HostDeployContext diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/v2/StartBackendV2.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/v2/StartBackendV2.kt index b18633bbc1..6ca851a42a 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/v2/StartBackendV2.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/connection/workflow/v2/StartBackendV2.kt @@ -27,7 +27,7 @@ class StartBackendV2( private val lifetime: Lifetime, private val indicator: ProgressIndicator, private val identifier: WorkspaceIdentifier, - private val remoteProjectName: String? = null + private val remoteProjectName: String? = null, ) : Step() { override val stepName: String = message("gateway.connection.workflow.start_ide") diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/ExistingWorkspaces.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/ExistingWorkspaces.kt index 8fc5ec9495..6c70fb8474 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/ExistingWorkspaces.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/ExistingWorkspaces.kt @@ -31,7 +31,7 @@ import javax.swing.JComponent class ExistingWorkspaces( private val setContentCallback: (Component) -> Unit, - lifetime: Lifetime + lifetime: Lifetime, ) : CawsLoadingPanel(lifetime, setContentCallback), DataProvider { private val disposable = lifetime.createNestedDisposable() override val title = message("code.aws.workspaces.short") diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceConfigurationDialog.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceConfigurationDialog.kt index 9b8e62aed9..5895b72da1 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceConfigurationDialog.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceConfigurationDialog.kt @@ -130,7 +130,7 @@ class WorkspaceConfigurationDialog private constructor(cawsClient: CodeCatalystC cawsClient: CodeCatalystClient, ws: Workspace, context: ReconfigureWorkspaceSettings, - workspaceList: WorkspaceList + workspaceList: WorkspaceList, ) { val oldSettings = ReconfigureWorkspaceSettings(ws) if (oldSettings == context) { @@ -203,7 +203,7 @@ data class ReconfigureWorkspaceSettings( var alias: String, var gatewayProduct: GatewayProduct?, var instanceType: InstanceType, - var inactivityTimeout: InactivityTimeout + var inactivityTimeout: InactivityTimeout, ) { constructor(ws: Workspace) : this( diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceDataRetriever.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceDataRetriever.kt index aefcc88652..67823a717c 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceDataRetriever.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceDataRetriever.kt @@ -27,7 +27,7 @@ import kotlin.concurrent.write class WorkspaceDataRetriever( private val client: CodeCatalystClient, - private val spaceName: String + private val spaceName: String, ) : WorkspaceList, WorkspaceListStateChangeListener, Disposable { private val listeners = mutableListOf() diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceDetails.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceDetails.kt index d2d0e06901..75d4055f09 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceDetails.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceDetails.kt @@ -59,7 +59,7 @@ class WorkspaceDetails( workspaces: WorkspaceList, cawsClient: CodeCatalystClient, ssoSettings: SsoSettings?, - disposable: Disposable + disposable: Disposable, ) : NonOpaquePanel() { init { layout = GridBagLayout() diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceGroupsPanel.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceGroupsPanel.kt index efd157abca..79d04e5b76 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceGroupsPanel.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceGroupsPanel.kt @@ -45,7 +45,7 @@ class WorkspaceGroupsPanel( private val cawsClient: CodeCatalystClient, private val ssoSettings: SsoSettings?, private val setContentCallback: (Component) -> Unit, - private val lifetime: Lifetime + private val lifetime: Lifetime, ) : NonOpaquePanel(GridBagLayout()) { private val disposable = lifetime.createNestedDisposable() private data class WorkspaceGroup(val repoName: String?, val subtitle: String?, val workspaces: List) diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceListPanel.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceListPanel.kt index b0d932a84f..f6398b40a5 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceListPanel.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceListPanel.kt @@ -24,7 +24,7 @@ class WorkspaceListPanel( private val ssoSettings: SsoSettings?, private val setContentCallback: (Component) -> Unit, private val refreshCallback: () -> Unit, - private val lifetime: Lifetime + private val lifetime: Lifetime, ) : BorderLayoutPanel() { private val searchField = createSearchField() private val compatibleFilter = FilteringWorkspaceList(dataRetriever) { it.isCompatible } diff --git a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceNotifications.kt b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceNotifications.kt index e5c84c47dd..fa8fcfde18 100644 --- a/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceNotifications.kt +++ b/plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/welcomescreen/WorkspaceNotifications.kt @@ -11,7 +11,7 @@ object WorkspaceNotifications { } data class WorkspaceListStateChangeContext( - val wsId: WorkspaceIdentifier + val wsId: WorkspaceIdentifier, ) interface WorkspaceListStateChangeListener { diff --git a/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLineTest.kt b/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLineTest.kt index b1539fdc9b..a936504a68 100644 --- a/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLineTest.kt +++ b/plugins/toolkit/jetbrains-gateway/tst/software/aws/toolkits/jetbrains/gateway/connection/ScpCommandLineTest.kt @@ -139,7 +139,7 @@ class ScpCommandLineTest { op: ScpTransferEventListener.FileOperation?, file: Path?, length: Long, - perms: MutableSet? + perms: MutableSet?, ) { pathsCollector.add(file) } diff --git a/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt b/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt index 78fc1f56de..872a5f0a54 100644 --- a/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt +++ b/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt @@ -23,7 +23,7 @@ class DotNetSamProjectGenerator( private val context: ProjectTemplateDialogContext, group: String, categoryName: String, - model: ProjectTemplateTransferableModel + model: ProjectTemplateTransferableModel, ) : DotNetSamProjectGeneratorRoot(context, group, categoryName, model) { override fun expand() = Runnable { val samPanel = getSamPanel() diff --git a/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt b/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt index 32027fe85d..468a99a31c 100644 --- a/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt +++ b/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt @@ -30,7 +30,7 @@ abstract class DotNetSamProjectGeneratorRoot( private val context: ProjectTemplateDialogContext, group: String, categoryName: String, - model: ProjectTemplateTransferableModel + model: ProjectTemplateTransferableModel, ) : ReSharperTemplateGeneratorBase( model = model, createSolution = true, diff --git a/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt b/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt index 7d4ad4eb37..855c1ba541 100644 --- a/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt +++ b/plugins/toolkit/jetbrains-rider/src-232-233/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectProvider.kt @@ -35,7 +35,7 @@ class DotNetSamProjectProvider : RiderProjectTemplateProvider { override fun createGenerator( context: ProjectTemplateDialogContext, - transferableModel: ProjectTemplateTransferableModel + transferableModel: ProjectTemplateTransferableModel, ): RiderProjectTemplateGenerator = DotNetSamProjectGenerator( context = context, diff --git a/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt b/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt index 95f22dfec4..e2267d0d1b 100644 --- a/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt +++ b/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGenerator.kt @@ -23,7 +23,7 @@ import java.io.File class DotNetSamProjectGenerator( lifetime: Lifetime, private val context: NewProjectDialogContext, - sharedModel: ProjectTemplatesSharedModel + sharedModel: ProjectTemplatesSharedModel, ) : DotNetSamProjectGeneratorRoot(lifetime, context, sharedModel) { override suspend fun expandTemplate(): suspend () -> Unit = { val samPanel = getSamPanel() diff --git a/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt b/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt index 294d962685..d078e996d1 100644 --- a/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt +++ b/plugins/toolkit/jetbrains-rider/src-241+/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamProjectGeneratorRoot.kt @@ -24,7 +24,7 @@ import javax.swing.JComponent abstract class DotNetSamProjectGeneratorRoot( lifetime: Lifetime, private val context: NewProjectDialogContext, - sharedModel: ProjectTemplatesSharedModel + sharedModel: ProjectTemplatesSharedModel, ) : ProjectTemplateGeneratorBase( lifetime, context, diff --git a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetLambdaHandlerResolver.kt b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetLambdaHandlerResolver.kt index 7df55f0849..ced231c571 100644 --- a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetLambdaHandlerResolver.kt +++ b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetLambdaHandlerResolver.kt @@ -29,7 +29,7 @@ class DotNetLambdaHandlerResolver : LambdaHandlerResolver { override fun findPsiElements( project: Project, handler: String, - searchScope: GlobalSearchScope + searchScope: GlobalSearchScope, ): Array { val fieldId = getFieldIdByHandlerName(project, handler) if (fieldId < 0) return emptyArray() diff --git a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugSupport.kt b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugSupport.kt index 92adb71c76..85ad9a0361 100644 --- a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugSupport.kt +++ b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugSupport.kt @@ -37,7 +37,7 @@ class DotNetRuntimeDebugSupport : RuntimeDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = DotnetDebugUtils.createDebugProcess(environment, debugHost, debugPorts, context) } @@ -63,7 +63,7 @@ abstract class DotnetImageDebugSupport : ImageDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = DotnetDebugUtils.createDebugProcess(environment, debugHost, debugPorts, context) } diff --git a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugUtils.kt b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugUtils.kt index 5f09a2a5d6..44a34a2b22 100644 --- a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugUtils.kt +++ b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetDebugUtils.kt @@ -62,7 +62,7 @@ object DotnetDebugUtils { environment: ExecutionEnvironment, debugHost: String, debugPorts: List, - context: Context + context: Context, ): XDebugProcessStarter { val frontendPort = debugPorts[0] val backendPort = debugPorts[1] diff --git a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/element/RiderLambdaHandlerFakePsiElement.kt b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/element/RiderLambdaHandlerFakePsiElement.kt index 4b37382384..8b1864e72e 100644 --- a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/element/RiderLambdaHandlerFakePsiElement.kt +++ b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/element/RiderLambdaHandlerFakePsiElement.kt @@ -28,7 +28,7 @@ class RiderLambdaHandlerFakePsiElement( private val project: Project, private val myName: String, private val fileId: Int, - private val icon: Icon? = null + private val icon: Icon? = null, ) : FakePsiElement() { override fun getParent() = null diff --git a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/utils/DotNetDebuggerUtils.kt b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/utils/DotNetDebuggerUtils.kt index 8b117ae3af..4e5905bd62 100644 --- a/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/utils/DotNetDebuggerUtils.kt +++ b/plugins/toolkit/jetbrains-rider/src/software/aws/toolkits/jetbrains/utils/DotNetDebuggerUtils.kt @@ -33,7 +33,7 @@ object DotNetDebuggerUtils { processHandler: ProcessHandler, protocol: IProtocol, sessionModel: DotNetDebuggerSessionModel, - outputEventsListener: IDebuggerOutputListener + outputEventsListener: IDebuggerOutputListener, ): XDebugProcessStarter { val fireInitializedManually = env.getUserData(DotNetDebugRunner.FIRE_INITIALIZED_MANUALLY) ?: false diff --git a/plugins/toolkit/jetbrains-ultimate/src-232+/software/aws/toolkits/jetbrains/remoteDev/caws/DevEnvStatusWatcher.kt b/plugins/toolkit/jetbrains-ultimate/src-232+/software/aws/toolkits/jetbrains/remoteDev/caws/DevEnvStatusWatcher.kt index 5091dc4dfc..f17deff379 100644 --- a/plugins/toolkit/jetbrains-ultimate/src-232+/software/aws/toolkits/jetbrains/remoteDev/caws/DevEnvStatusWatcher.kt +++ b/plugins/toolkit/jetbrains-ultimate/src-232+/software/aws/toolkits/jetbrains/remoteDev/caws/DevEnvStatusWatcher.kt @@ -80,7 +80,7 @@ class DevEnvStatusWatcher : StartupActivity { fun checkHeartbeat( secondsSinceLastControllerActivity: Long, inactivityTimeoutInSeconds: Int, - project: Project + project: Project, ): Pair { val lastActivityTime = getJbRecordedActivity() diff --git a/plugins/toolkit/jetbrains-ultimate/src-232-233/com/jetbrains/rd/ui/bedsl/dsl/BeCompat.kt b/plugins/toolkit/jetbrains-ultimate/src-232-233/com/jetbrains/rd/ui/bedsl/dsl/BeCompat.kt index 59b7978de5..cf46f5ef5a 100644 --- a/plugins/toolkit/jetbrains-ultimate/src-232-233/com/jetbrains/rd/ui/bedsl/dsl/BeCompat.kt +++ b/plugins/toolkit/jetbrains-ultimate/src-232-233/com/jetbrains/rd/ui/bedsl/dsl/BeCompat.kt @@ -3,7 +3,7 @@ package com.jetbrains.rd.ui.bedsl.dsl public fun com.jetbrains.ide.model.uiautomation.BeControl.withMargin( - margin: com.jetbrains.ide.model.uiautomation.BeMargin + margin: com.jetbrains.ide.model.uiautomation.BeMargin, ): com.jetbrains.ide.model.uiautomation.BeControl = this.withMargin { margin diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/core/execution/GoAwsConnectionRunConfigurationExtension.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/core/execution/GoAwsConnectionRunConfigurationExtension.kt index f258803c0e..ef9b244f70 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/core/execution/GoAwsConnectionRunConfigurationExtension.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/core/execution/GoAwsConnectionRunConfigurationExtension.kt @@ -36,7 +36,7 @@ class GoAwsConnectionRunConfigurationExtension : GoRunConfigurationExtension() { cmdLine: TargetedCommandLineBuilder, runnerId: String, state: GoRunningState>, - commandLineType: GoRunningState.CommandLineType + commandLineType: GoRunningState.CommandLineType, ) { if (GoAwsConnectionExperiment.isEnabled()) { delegate.addToTargetCommandLineBuilder(configuration, cmdLine, runtimeString = { determineGoVersion(configuration) }) diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuth.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuth.kt index be54c79059..c76e0de3c0 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuth.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuth.kt @@ -34,7 +34,7 @@ import java.util.concurrent.CompletionStage data class SecretsManagerConfiguration( val connectionSettings: ConnectionSettings, - val secretId: String + val secretId: String, ) class SecretsManagerAuth : DatabaseAuthProviderCompatabilityAdapter { @@ -50,7 +50,7 @@ class SecretsManagerAuth : DatabaseAuthProviderCompatabilityAdapter { override fun intercept( connection: ProtoConnection, - silent: Boolean + silent: Boolean, ): CompletionStage? { LOG.info { "Intercepting db connection [$connection]" } val project = connection.project() diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerDbSecret.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerDbSecret.kt index 09a9fb942b..afa83f8a11 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerDbSecret.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerDbSecret.kt @@ -10,5 +10,5 @@ data class SecretsManagerDbSecret( val password: String?, val engine: String?, val host: String?, - val port: String? + val port: String?, ) diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/go/GoDebugSupport.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/go/GoDebugSupport.kt index 532ea96bae..febc86c0cd 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/go/GoDebugSupport.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/go/GoDebugSupport.kt @@ -18,7 +18,7 @@ class GoSamDebugSupport : RuntimeDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = GoDebugHelper.createGoDebugProcess(debugHost, debugPorts, context) override fun samArguments(debugPorts: List): List = buildList { @@ -55,6 +55,6 @@ class GoImageDebugSupport : ImageDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = GoDebugHelper.createGoDebugProcess(debugHost, debugPorts, context) } diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/go/GoHelper.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/go/GoHelper.kt index 7af77663ef..abd10e53cf 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/go/GoHelper.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/go/GoHelper.kt @@ -62,7 +62,7 @@ object GoDebugHelper { suspend fun createGoDebugProcess( debugHost: String, debugPorts: List, - context: Context + context: Context, ): XDebugProcessStarter = object : XDebugProcessStarter() { override fun start(session: XDebugSession): XDebugProcess { val process = DlvDebugProcess(session, DlvRemoteVmConnection(DlvDisconnectOption.KILL), null, true) diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugSupport.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugSupport.kt index ba4b9a61c8..5032c784b3 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugSupport.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsDebugSupport.kt @@ -33,7 +33,7 @@ class NodeJsRuntimeDebugSupport : RuntimeDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = NodeJsDebugUtils.createDebugProcess(state, debugHost, debugPorts) } @@ -45,7 +45,7 @@ abstract class NodeJsImageDebugSupport : ImageDebugSupport { environment: ExecutionEnvironment, state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = NodeJsDebugUtils.createDebugProcess(state, debugHost, debugPorts) override fun containerEnvVars(debugPorts: List): Map = mapOf( @@ -74,7 +74,7 @@ object NodeJsDebugUtils { fun createDebugProcess( state: SamRunningState, debugHost: String, - debugPorts: List + debugPorts: List, ): XDebugProcessStarter = object : XDebugProcessStarter() { override fun start(session: XDebugSession): XDebugProcess { val mappings = createBiMapMappings(state.pathMappings) diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsLambdaHandlerResolver.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsLambdaHandlerResolver.kt index 59975baa72..f42382a540 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsLambdaHandlerResolver.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/lambda/nodejs/NodeJsLambdaHandlerResolver.kt @@ -26,7 +26,7 @@ class NodeJsLambdaHandlerResolver : LambdaHandlerResolver { override fun findPsiElements( project: Project, handler: String, - searchScope: GlobalSearchScope + searchScope: GlobalSearchScope, ): Array { val lastDotIndex = handler.lastIndexOf(".") if (lastDotIndex < 0) { diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/RdsDatasourceConfiguration.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/RdsDatasourceConfiguration.kt index 63dc1aa20b..2cd2a1778e 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/RdsDatasourceConfiguration.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/RdsDatasourceConfiguration.kt @@ -7,5 +7,5 @@ data class RdsDatasourceConfiguration( val regionId: String, val credentialId: String, val database: RdsDatabase, - val username: String + val username: String, ) diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/RdsResources.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/RdsResources.kt index 9885ae98ec..1e5c213200 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/RdsResources.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/RdsResources.kt @@ -24,7 +24,7 @@ data class RdsDatabase( val engine: String, val iamDatabaseAuthenticationEnabled: Boolean, val endpoint: Endpoint, - val masterUsername: String + val masterUsername: String, ) { fun rdsEngine() = RdsEngine.fromEngine(engine) } diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/auth/IamAuth.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/auth/IamAuth.kt index 221330bb06..4203e3f2be 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/auth/IamAuth.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/rds/auth/IamAuth.kt @@ -45,7 +45,7 @@ data class RdsAuth( val address: String, val port: Int, val user: String, - val connectionSettings: ConnectionSettings + val connectionSettings: ConnectionSettings, ) // [DatabaseAuthProvider] is marked as internal, but JetBrains advised this was a correct usage @@ -72,7 +72,7 @@ class IamAuth : DatabaseAuthProviderCompatabilityAdapter { override fun intercept( connection: ProtoConnection, - silent: Boolean + silent: Boolean, ): CompletionStage? { LOG.info { "Intercepting db connection [$connection]" } val project = connection.project() diff --git a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuth.kt b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuth.kt index ec57429618..943b77b710 100644 --- a/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuth.kt +++ b/plugins/toolkit/jetbrains-ultimate/src/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuth.kt @@ -29,7 +29,7 @@ import java.util.concurrent.CompletionStage data class RedshiftSettings( val clusterId: String, val username: String, - val connectionSettings: ConnectionSettings + val connectionSettings: ConnectionSettings, ) class IamAuth : DatabaseAuthProviderCompatabilityAdapter { diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatabaseSecretTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatabaseSecretTest.kt index d155347f43..e05da60bb0 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatabaseSecretTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatabaseSecretTest.kt @@ -160,7 +160,7 @@ class DatabaseSecretTest { } private fun buildMockRedshiftNode( - validEndpoint: Boolean = true + validEndpoint: Boolean = true, ): RedshiftExplorerNode = mock { on { cluster } doAnswer { mock { @@ -171,7 +171,7 @@ class DatabaseSecretTest { private fun buildMockRdsNode( validEndpoint: Boolean = true, - validEngine: Boolean = true + validEngine: Boolean = true, ): RdsNode = mock { on { database } doAnswer { RdsDatabase( @@ -193,6 +193,6 @@ class DatabaseSecretTest { password: String? = "password", engine: String? = randomEngine, host: String? = randomHost, - port: String? = "5000" + port: String? = "5000", ) = SecretsManagerDbSecret(username, password, engine, host, port) } diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatagripUtilsTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatagripUtilsTest.kt index 1026032669..963f6beda9 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatagripUtilsTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/DatagripUtilsTest.kt @@ -79,7 +79,7 @@ class DatagripUtilsTest { private fun buildConnection( credentials: String? = null, - region: String? = null + region: String? = null, ): DatabaseConnectionInterceptor.ProtoConnection = mock { on { connectionPoint } doAnswer { mock { diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthTest.kt index 0bd53487c5..b5101ad079 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/datagrip/auth/SecretsManagerAuthTest.kt @@ -156,7 +156,7 @@ class SecretsManagerAuthTest { hasUsername: Boolean = true, hasPassword: Boolean = true, hasHost: Boolean = true, - hasPort: Boolean = true + hasPort: Boolean = true, ): SecretsManagerClient { val client = clientManager.create() val secretMap = mutableMapOf() @@ -193,7 +193,7 @@ class SecretsManagerAuthTest { hasPort: Boolean = true, hasSecret: Boolean = true, usesSshTunnel: Boolean = false, - usesUrlFromSecret: Boolean = false + usesUrlFromSecret: Boolean = false, ): DatabaseConnectionInterceptor.ProtoConnection { val mockConnection = mock { on { url } doAnswer { diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt index b8cde55677..18ffafd0ee 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/actions/CreateConfigurationActionTest.kt @@ -227,7 +227,7 @@ class CreateConfigurationActionTest { port: Int = RuleUtils.randomNumber(), dbName: String = RuleUtils.randomName(), iamAuthEnabled: Boolean = true, - engineType: String = MYSQL_ENGINE_TYPE + engineType: String = MYSQL_ENGINE_TYPE, ): RdsNode = mock { on { nodeProject } doAnswer { projectRule.project } on { database } doAnswer { @@ -240,7 +240,7 @@ class CreateConfigurationActionTest { port: Int = RuleUtils.randomNumber(), dbName: String = RuleUtils.randomName(), iamAuthEnabled: Boolean = true, - engineType: String = POSTGRES_ENGINE_TYPE + engineType: String = POSTGRES_ENGINE_TYPE, ): RdsDatabase = RdsDatabase( identifier = dbName, engine = engineType, diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthTest.kt index e75e4cc607..00211493d9 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthTest.kt @@ -204,7 +204,7 @@ class IamAuthTest { hasBadHost: Boolean = false, hasSslConfig: Boolean = true, dbmsType: Dbms = Dbms.POSTGRES, - credentialId: String = this.credentialId + credentialId: String = this.credentialId, ): ProtoConnection { val mockConnection = mock { on { url } doReturn "jdbc:postgresql://$dbHost:$connectionPort/dev" diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidgetTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidgetTest.kt index 18b66b17ca..8a9021e967 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidgetTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/rds/auth/IamAuthWidgetTest.kt @@ -111,7 +111,7 @@ class IamAuthWidgetTest { private fun buildDataSource( hasCredentials: Boolean = true, - hasRegion: Boolean = true + hasRegion: Boolean = true, ): LocalDataSource = mock { on { additionalProperties } doAnswer { val m = mutableMapOf() diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthTest.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthTest.kt index 5e6fb15601..c879d9f57a 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthTest.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/redshift/auth/IamAuthTest.kt @@ -178,7 +178,7 @@ class IamAuthTest { hasCredentials: Boolean = true, hasHost: Boolean = true, hasClusterId: Boolean = true, - hasPort: Boolean = true + hasPort: Boolean = true, ): ProtoConnection { val mockConnection = mock { on { url } doReturn if (hasUrl) { diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/GoCodeInsightTestFixtureRule.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/GoCodeInsightTestFixtureRule.kt index 57070e3452..19c26661c1 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/GoCodeInsightTestFixtureRule.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/GoCodeInsightTestFixtureRule.kt @@ -74,7 +74,7 @@ fun CodeInsightTestFixture.addGoLambdaHandler( func handler() { } - """.trimIndent() + """.trimIndent(), ): PsiElement { val psiFile = this.addFileToProject("$subPath/$fileName.go", fileContent) as GoFile @@ -90,7 +90,7 @@ fun CodeInsightTestFixture.addGoModFile( require github.com/aws/aws-lambda-go v1.13.3 module hello-world - """.trimIndent() + """.trimIndent(), ): PsiFile = this.addFileToProject("$subPath/go.mod", content) fun runGoModTidy(goModFile: VirtualFile) { diff --git a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/NodeJsCodeInsightTestFixtureRule.kt b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/NodeJsCodeInsightTestFixtureRule.kt index 5b119f3e40..995c602bb7 100644 --- a/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/NodeJsCodeInsightTestFixtureRule.kt +++ b/plugins/toolkit/jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/NodeJsCodeInsightTestFixtureRule.kt @@ -121,7 +121,7 @@ fun CodeInsightTestFixture.addLambdaHandler( exports.$handlerName = function (event, context, callback) { return 'HelloWorld' }; - """.trimIndent() + """.trimIndent(), ): PsiElement { val psiFile = this.addFileToProject("$subPath/$fileName.js", fileContent) as JSFile @@ -139,7 +139,7 @@ fun CodeInsightTestFixture.addTypeScriptLambdaHandler( export const $handlerName = (event: APIGatewayProxyEvent, context: Context, callback: Callback): APIGatewayProxyResult => { return { statusCode: 200 } } - """.trimIndent() + """.trimIndent(), ): PsiElement { val psiFile = this.addFileToProject("$subPath/$fileName.ts", fileContent) as JSFile @@ -156,7 +156,7 @@ fun CodeInsightTestFixture.addPackageJsonFile( "name": "hello-world", "version": "1.0.0" } - """.trimIndent() + """.trimIndent(), ): PsiFile = this.addFileToProject("$subPath/package.json", content) fun CodeInsightTestFixture.addTypeScriptPackageJsonFile( @@ -170,5 +170,5 @@ fun CodeInsightTestFixture.addTypeScriptPackageJsonFile( "typescript": "*" } } - """.trimIndent() + """.trimIndent(), ): PsiFile = this.addPackageJsonFile(subPath, content) diff --git a/sandbox-all/build.gradle.kts b/sandbox-all/build.gradle.kts index 5e6947467e..93fa35df3e 100644 --- a/sandbox-all/build.gradle.kts +++ b/sandbox-all/build.gradle.kts @@ -42,3 +42,8 @@ dependencies { localPlugin(project(":plugin-toolkit:intellij-standalone")) } } +val runIdeForUiTests by intellijPlatformTesting.runIde.registering { + plugins { + robotServerPlugin("0.11.22") + } +} diff --git a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/AwsExplorer.kt b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/AwsExplorer.kt index 91fd3d262c..09f4384995 100644 --- a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/AwsExplorer.kt +++ b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/AwsExplorer.kt @@ -14,7 +14,7 @@ import java.time.Duration fun IdeaFrame.awsExplorer( timeout: Duration = Duration.ofSeconds(20), - function: AwsExplorer.() -> Unit + function: AwsExplorer.() -> Unit, ) { val locator = byXpath("//div[@accessiblename='AWS Toolkit Tool Window']") @@ -46,7 +46,7 @@ fun IdeaFrame.awsExplorer( @FixtureName("AWSExplorer") open class AwsExplorer( remoteRobot: RemoteRobot, - remoteComponent: RemoteComponent + remoteComponent: RemoteComponent, ) : CommonContainerFixture(remoteRobot, remoteComponent) { fun explorerTree() = find(byXpath("//div[@class='Tree']"), timeout = Duration.ofSeconds(5)).also { it.waitUntilLoaded() } diff --git a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/Dialog.kt b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/Dialog.kt index 12645403d7..0f5fa0e35f 100644 --- a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/Dialog.kt +++ b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/Dialog.kt @@ -15,7 +15,7 @@ import java.time.Duration fun ContainerFixture.dialog( title: String, timeout: Duration = Duration.ofSeconds(20), - function: DialogFixture.() -> Unit = {} + function: DialogFixture.() -> Unit = {}, ) { step("Search for dialog with title $title") { val dialog = find(DialogFixture.byTitle(title), timeout) @@ -33,7 +33,7 @@ fun ContainerFixture.dialog( @FixtureName("Dialog") open class DialogFixture( remoteRobot: RemoteRobot, - remoteComponent: RemoteComponent + remoteComponent: RemoteComponent, ) : CommonContainerFixture(remoteRobot, remoteComponent) { companion object { fun byTitle(title: String) = byXpath("title $title", "//div[@title='$title' and @class='MyDialog']") diff --git a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/FileBrowserFixture.kt b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/FileBrowserFixture.kt index 5a957827b3..4af64e259c 100644 --- a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/FileBrowserFixture.kt +++ b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/FileBrowserFixture.kt @@ -21,7 +21,7 @@ import java.time.Duration fun ContainerFixture.fileBrowser( partialTitle: String, timeout: Duration = Duration.ofSeconds(20), - function: FileBrowserFixture.() -> Unit = {} + function: FileBrowserFixture.() -> Unit = {}, ) { step("Search for file explorer with title matching '$partialTitle'") { val dialog = find(DialogFixture.byTitleContains(partialTitle), timeout) @@ -39,7 +39,7 @@ fun ContainerFixture.fileBrowser( @FixtureName("FileBrowser") class FileBrowserFixture( remoteRobot: RemoteRobot, - remoteComponent: RemoteComponent + remoteComponent: RemoteComponent, ) : DialogFixture(remoteRobot, remoteComponent) { private val treeXpath = byXpath("//div[@class='Tree']") private val tree by lazy { diff --git a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/NewProjectWizard.kt b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/NewProjectWizard.kt index 3cd06241d9..69c787e4f5 100644 --- a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/NewProjectWizard.kt +++ b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/NewProjectWizard.kt @@ -17,7 +17,7 @@ import javax.swing.JButton fun RemoteRobot.newProjectWizard( timeout: Duration = Duration.ofSeconds(20), - function: NewProjectWizardDialog.() -> Unit + function: NewProjectWizardDialog.() -> Unit, ) { step("Search for new project wizard dialog") { val dialog = find(DialogFixture.byTitle("New Project"), timeout) @@ -33,7 +33,7 @@ fun RemoteRobot.newProjectWizard( @FixtureName("New Project Wizard") open class NewProjectWizardDialog( remoteRobot: RemoteRobot, - remoteComponent: RemoteComponent + remoteComponent: RemoteComponent, ) : DialogFixture(remoteRobot, remoteComponent) { fun selectProjectCategory(type: String) { findText(type).click() diff --git a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/Preferences.kt b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/Preferences.kt index d0b746545b..d60262ddaa 100644 --- a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/Preferences.kt +++ b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/Preferences.kt @@ -13,7 +13,7 @@ import java.time.Duration fun RemoteRobot.preferencesDialog( timeout: Duration = Duration.ofSeconds(20), - function: PreferencesDialog.() -> Unit + function: PreferencesDialog.() -> Unit, ) { step("Search for preferences dialog") { val dialog = find(DialogFixture.byTitleContains(preferencesTitle()), timeout) @@ -29,7 +29,7 @@ fun RemoteRobot.preferencesDialog( @FixtureName("Preferences") open class PreferencesDialog( remoteRobot: RemoteRobot, - remoteComponent: RemoteComponent + remoteComponent: RemoteComponent, ) : DialogFixture(remoteRobot, remoteComponent) { fun search(query: String) = step("Search $query") { textField(byXpath("//div[@class='SettingsSearch']//div[@class='TextFieldWithProcessing']")).text = query diff --git a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/ProjectStructure.kt b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/ProjectStructure.kt index 46d39f4992..9df6d490f6 100644 --- a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/ProjectStructure.kt +++ b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/ProjectStructure.kt @@ -14,7 +14,7 @@ import java.time.Duration fun IdeaFrame.projectStructureDialog( timeout: Duration = Duration.ofSeconds(20), - function: ProjectStructureDialog.() -> Unit + function: ProjectStructureDialog.() -> Unit, ) { step("Project Structure dialog") { if (remoteRobot.isMac()) { @@ -36,5 +36,5 @@ fun IdeaFrame.projectStructureDialog( @FixtureName("ProjectStructure") open class ProjectStructureDialog( remoteRobot: RemoteRobot, - remoteComponent: RemoteComponent + remoteComponent: RemoteComponent, ) : DialogFixture(remoteRobot, remoteComponent) diff --git a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/DynamoDbTest.kt b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/DynamoDbTest.kt index 4bf6135f83..e728adaf89 100644 --- a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/DynamoDbTest.kt +++ b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/DynamoDbTest.kt @@ -214,7 +214,7 @@ class DynamoDbTest { val numberMapProperty: Map = randomRange().associate { aString() to Random.nextLong() }, val mapOfMapProperty: Map> = randomRange().associate { aString() to randomRange().associate { aString() to aString() } }, val stringList: List = randomRange().map { aString() }, - val numberList: List = randomRange().map { Random.nextLong() } + val numberList: List = randomRange().map { Random.nextLong() }, ) } diff --git a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/utils/retryableAssert.kt b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/utils/retryableAssert.kt index 1cb502af0d..f4dd17082c 100644 --- a/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/utils/retryableAssert.kt +++ b/ui-tests/tst/software/aws/toolkits/jetbrains/uitests/utils/retryableAssert.kt @@ -11,7 +11,7 @@ import java.time.Duration fun recheckAssert( timeout: Duration = Duration.ofSeconds(1), interval: Duration = Duration.ofMillis(100), - assertion: () -> Unit + assertion: () -> Unit, ) { runBlocking { withTimeout(timeout.toMillis()) { @@ -30,7 +30,7 @@ fun recheckAssert( fun reattemptAssert( maxAttempts: Int = 5, interval: Duration = Duration.ofSeconds(1), - assertion: () -> Unit + assertion: () -> Unit, ) { for (i in 0..maxAttempts) { try {