Skip to content

Merge main into feature/q-lsp-chat #5681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 7, 2025
Merged

Merge main into feature/q-lsp-chat #5681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c146b0f
fix(amazonq): unable to find Amazon Q feature dev auto build setting …
chengoramazon May 6, 2025
51d038e
refactor(amazonq): reduce extra call of listAvailableCustomization (#…
Will-ShaoHua May 7, 2025
723eb37
Merge remote-tracking branch 'origin/main' into HEAD
rli May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-7920ece4-99d6-4828-931e-29b66994dc10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "/dev: Fix missing Amazon Q feature dev auto build setting."
}
3 changes: 2 additions & 1 deletion ...ware/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,8 @@
}

private suspend fun handleDevCommandUserSetting(tabId: String, value: Boolean) {
CodeWhispererSettings.getInstance().toggleAutoBuildFeature(context.project.basePath, value)
val session = getSessionInfo(tabId)

Check warning on line 543 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

View check run for this annotation

Codecov / codecov/patch

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

Added line #L543 was not covered by tests
CodeWhispererSettings.getInstance().toggleAutoBuildFeature(session.context.workspaceRoot.path, value)
messenger.sendAnswer(
tabId = tabId,
message = message("amazonqFeatureDev.chat_message.setting_updated"),
Expand Down
4 changes: 2 additions & 2 deletions ...tware/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererModelConfiguratorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ class CodeWhispererModelConfiguratorTest {

@Ignore
@Test
fun `profile switch should keep using existing customization if new list still contains that arn`() {
fun `should switch to default customization on profile changed`() {
val ssoConn = spy(LegacyManagedBearerSsoConnection(region = "us-east-1", startUrl = "url 1", scopes = Q_SCOPES))
ToolkitConnectionManager.getInstance(projectRule.project).switchConnection(ssoConn)
val oldCustomization = CodeWhispererCustomization("oldArn", "oldName", "oldDescription")
Expand All @@ -634,7 +634,7 @@ class CodeWhispererModelConfiguratorTest {
.syncPublisher(QRegionProfileSelectedListener.TOPIC)
.onProfileSelected(projectRule.project, null)

assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(oldCustomization)
assertThat(sut.activeCustomization(projectRule.project)).isEqualTo(null)
}

@Ignore
Expand Down
4 changes: 1 addition & 3 deletions ...toolkits/jetbrains/services/codewhisperer/customization/CodeWhispererModelConfigurator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ class DefaultCodeWhispererModelConfigurator : CodeWhispererModelConfigurator, Pe
QRegionProfileSelectedListener.TOPIC,
object : QRegionProfileSelectedListener {
override fun onProfileSelected(project: Project, profile: QRegionProfile?) {
pluginAwareExecuteOnPooledThread {
CodeWhispererModelConfigurator.getInstance().listCustomizations(project, passive = true)
}
switchCustomization(project, null)
}
}
)
Expand Down
Loading