Skip to content

Commit 6500b33

Browse files
Merge branch 'feature/q-lsp' into samgst/aws-credentials
2 parents 352f368 + 1cdc40a commit 6500b33

File tree

7 files changed

+34
-8
lines changed

7 files changed

+34
-8
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix suggestion not visible in remote for 2024.3"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "/test: update capability card text"
4+
}

buildspec/windowsTests.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ env:
88
phases:
99
install:
1010
commands:
11+
# force install java21 while we work throuh path issues
12+
- |
13+
$javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
14+
ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
15+
}
16+
$JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
1117
- |
1218
if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
1319
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
2127
# See https://github.com/NuGet/NuGet.Client/pull/4259
2228
$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
2329
30+
$Env:JAVA_HOME = $JAVA_HOME
31+
2432
if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
2533
$Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
2634
# $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/GitIgnoreFilteringUtil.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,14 @@ class GitIgnoreFilteringUtil(
6060
"*.csv",
6161
"*.dylib",
6262
"*.parquet",
63-
"*.xlsx"
63+
"*.xlsx",
64+
"*.tar.gz",
65+
"*.tar",
66+
"*.pack",
67+
"*.pkg",
68+
"*.pkl",
69+
"*.deb",
70+
"*.model"
6471
)
6572
)
6673
}

plugins/amazonq/mynah-ui/src/mynah-ui/ui/apps/codeTestChatConnector.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@ interface MessageData {
5151

5252
function getIntroductionCardContent(): IntroductionCardContentType {
5353
const introductionBody = [
54-
"I can generate unit tests for your active file. ",
54+
"I can generate unit tests for the active file or open project in your IDE.",
5555
"\n\n",
56-
"After you select the functions or methods I should focus on, I will:\n",
57-
"1. Generate unit tests\n",
58-
"2. Place them into relevant test file\n",
56+
"I can do things like:\n",
57+
"- Add unit tests for highlighted functions\n",
58+
"- Generate tests for null and empty inputs\n",
5959
"\n\n",
60-
"To learn more, check out our [user guide](https://aws.amazon.com/q/developer/)."
60+
"To learn more, visit the [Amazon Q Developer User Guide](https://docs.aws.amazon.com/amazonq/latest/qdeveloper-ug/test-generation.html)."
6161
].join("");
6262

6363
return {
64-
title: "/test",
65-
description: "Included in your Q Developer subscription",
64+
title: "/test - Unit test generation",
65+
description: "Generate unit tests for selected code",
6666
icon: MynahIcons.CHECK_LIST,
6767
content: {
6868
body: introductionBody

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@
8686
<extensions defaultExtensionNs="com.intellij">
8787
<registryKey key="amazon.q.endpoint" description="Endpoint to use for Amazon Q"
8888
defaultValue="https://codewhisperer.us-east-1.amazonaws.com/" restartRequired="true"/>
89+
<registryKey key="inline.completion.rem.dev.use.rhizome" description="Defined by IntelliJ. Used for Amazon Q to display suggestions on remote."
90+
defaultValue="false" restartRequired="true"/>
8991
</extensions>
9092

9193
<xi:include href="/META-INF/module-amazonq.xml" />

plugins/core/jetbrains-community/tst/software/aws/toolkits/jetbrains/core/AwsSdkClientTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class AwsSdkClientTest {
122122
val selfSignedJks = AwsSdkClientTest::class.java.getResource("/selfSigned.jks")
123123
return WireMockRule(
124124
wireMockConfig()
125+
.httpDisabled(true)
125126
.dynamicHttpsPort()
126127
.keystorePath(selfSignedJks.toString())
127128
.keystorePassword("changeit")

0 commit comments

Comments
 (0)