Merge branch 'main' into feature/gettingstarted

manodnyab · web-flow · commit 97d7b54c8056 · 2023-11-07T10:37:59.000-08:00
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt
@@ -15,6 +15,7 @@ import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
+import com.intellij.util.concurrency.annotations.RequiresBackgroundThread
 import com.intellij.util.xmlb.annotations.MapAnnotation
 import com.intellij.util.xmlb.annotations.Property
 import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
@@ -113,6 +114,7 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
         }
     }
 
+    @RequiresBackgroundThread
     override fun listCustomizations(project: Project, passive: Boolean): List<CustomizationUiItem>? =
         calculateIfIamIdentityCenterConnection(project) {
             // 1. invoke API and get result

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ import com.intellij.openapi.components.State`
`15`	`15`	`import com.intellij.openapi.components.Storage`
`16`	`16`	`import com.intellij.openapi.components.service`
`17`	`17`	`import com.intellij.openapi.project.Project`
	`18`	`+import com.intellij.util.concurrency.annotations.RequiresBackgroundThread`
`18`	`19`	`import com.intellij.util.xmlb.annotations.MapAnnotation`
`19`	`20`	`import com.intellij.util.xmlb.annotations.Property`
`20`	`21`	`import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException`
`@@ -113,6 +114,7 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe`
`113`	`114`	`}`
`114`	`115`	`}`
`115`	`116`
	`117`	`+ @RequiresBackgroundThread`
`116`	`118`	`override fun listCustomizations(project: Project, passive: Boolean): List<CustomizationUiItem>? =`
`117`	`119`	`calculateIfIamIdentityCenterConnection(project) {`
`118`	`120`	`// 1. invoke API and get result`