Merge main into feature/flare-alpha

Author: aws-toolkit-automation

plugins/toolkit/jetbrains-core/src-253+/software/aws/toolkits/jetbrains/services/cfnlsp/CfnLspStartupActivity.kt

@@ -4,13 +4,13 @@
 package software.aws.toolkits.jetbrains.services.cfnlsp
 
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
 import com.intellij.platform.lsp.api.LspServerManager
 import software.aws.toolkits.jetbrains.services.cfnlsp.server.CfnLspServerDescriptor
 import software.aws.toolkits.jetbrains.services.cfnlsp.server.CfnLspServerSupportProvider
 
-internal class CfnLspStartupActivity : StartupActivity {
-    override fun runActivity(project: Project) {
+internal class CfnLspStartupActivity : ProjectActivity {
+    override suspend fun execute(project: Project) {
         CfnCredentialsService.getInstance(project) // eagerly initialize to register settings change listener
         LspServerManager.getInstance(project).ensureServerStarted(
             CfnLspServerSupportProvider::class.java,