Skip to content

Commit a3f7b2a

Browse files
bryceitoc9bryceitoc9
authored
Merge branch 'main' into bryceito/duplicated-code-qodana
2 parents e7f7166 + c6ac2dc commit a3f7b2a

File tree

4 files changed

+40
-20
lines changed

4 files changed

+40
-20
lines changed

‎.changes/next-release/bugfix-7ceafecb-844d-46ce-a68d-b28360840ab6.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "change to use promptStickyCard to for image verification notification"
4+
}

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,15 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
173173
0
174174
)
175175

176-
val errorJson = OBJECT_MAPPER.writeValueAsString(errorMessages)
177-
browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
178-
"window.handleNativeNotify('$errorJson')",
179-
browserInstance.jcefBrowser.cefBrowser.url,
180-
0
181-
)
176+
if (errorMessages.isNotEmpty()) {
177+
val errorJson = OBJECT_MAPPER.writeValueAsString(errorMessages)
178+
browserInstance.jcefBrowser.cefBrowser.executeJavaScript(
179+
"window.handleNativeNotify('$errorJson')",
180+
browserInstance.jcefBrowser.cefBrowser.url,
181+
0
182+
)
183+
}
184+
182185
dtde.dropComplete(true)
183186
} else {
184187
dtde.dropComplete(false)

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,19 @@ class Browser(parent: Disposable, private val webUri: URI, val project: Project)
175175
176176
window.handleNativeNotify = function(errorMessages) {
177177
const messages = JSON.parse(errorMessages);
178-
messages.forEach(msg => {
179-
qChat.notify({
180-
content: msg
181-
})
182-
});
178+
let message = messages.join('\n');
179+
qChat.updateStore(qChat.getSelectedTabId(), {
180+
promptInputStickyCard: {
181+
messageId: 'image-verification-banner',
182+
header: {
183+
icon: 'warning',
184+
iconStatus: 'warning',
185+
body: '### Invalid Image',
186+
},
187+
body: message,
188+
canBeDismissed: true,
189+
},
190+
})
183191
};
184192
}
185193
</script>

‎plugins/amazonq/src/main/resources/META-INF/plugin.xml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,39 @@
77
<description><![CDATA[
88
<p>The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI</p>
99
10-
<h2>Agent capabilities</h2>
10+
<h2>Agentic coding experience</h2>
11+
<p>Amazon Q Developer uses information across native and MCP server-based tools to intelligently perform actions beyond code suggestions, such as reading files, generating code diffs, and running commands based on your natural language instruction. Simply type your prompt in your preferred language and Q Developer will provide continuous status updates and iteratively apply changes based on your feedback, helping you accomplish tasks faster.</p>
12+
1113
<h3>Implement new features</h3>
12-
<p><code>/dev</code> to task Amazon Q with generating new code across your entire project and implement features.</p>
14+
<p>Generate new code across your entire project and implement features.</p>
1315
1416
<h3>Generate documentation</h3>
15-
<p><code>/doc</code> to task Amazon Q with writing API, technical design, and onboarding documentation.</p>
17+
<p>Write API, technical design, and onboarding documentation.</p>
1618
1719
<h3>Automate code reviews</h3>
18-
<p><code>/review</code> to ask Amazon Q to perform code reviews, flagging suspicious code patterns and assessing deployment risk.</p>
20+
<p>Perform code reviews, flagging suspicious code patterns and assessing deployment risk.</p>
1921
2022
<h3>Generate unit tests</h3>
21-
<p><code>/test</code> to ask Amazon Q to generate unit tests and add them to your project, helping you improve code quality, fast.</p>
23+
<p>Generate unit tests and add them to your project, helping you improve code quality, fast.</p>
2224
2325
<h3>Transform workloads</h3>
2426
<p><code>/transform</code> to upgrade your Java applications in minutes, not weeks.</p>
2527
2628
<h2>Core features</h2>
2729
30+
<h3>MCP support</h3>
31+
<p>Add Model Context Protocol (MCP) servers to give Amazon Q Developer access to important context.</p>
32+
33+
<h3>Inline suggestions</h3>
34+
<p>Receive real-time code suggestions ranging from snippets to full functions based on your comments and existing code.</p>
35+
<p><i><a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html">15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more</a></i></p>
36+
2837
<h3>Inline chat</h3>
2938
<p>Seamlessly initial chat within the inline coding experience. Select a section of code that you need assistance with and initiate chat within the editor to request actions such as "Optimize this code", "Add comments", or "Write tests".</p>
3039
3140
<h3>Chat</h3>
3241
<p>Generate code, explain code, and get answers about software development.</p>
3342
34-
<h3>Inline suggestions</h3>
35-
<p><Receive real-time code suggestions ranging from snippets to full functions based on your comments and existing code.</p>
36-
<p><i><a href="https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/q-language-ide-support.html">15+ languages supported including Python, TypeScript, Rust, Terraform, AWS Cloudformation, and more</a></i></p>
37-
3843
<h3>Code reference log</h3>
3944
<p>Attribute code from Amazon Q that is similar to training data. When code suggestions similar to training data are accepted, they will be added to the code reference log.</p>
4045

0 commit comments

Comments
 (0)