Skip to content

Commit f78c069

Browse files
laileni-awslaileni-aws
authored
Merge branch 'feature/q-extension' into feature/cw-proactive-scan
2 parents ea7fe5b + 36d5a60 commit f78c069

File tree

199 files changed

+3299
-1162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+3299
-1162
lines changed

‎.changes/next-release/bugfix-0127ba02-eaca-44c8-bb4a-83ebd3213328.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" : "Amazon Q Feature Development: Update error message for monthly conversation limit reach"
4+
}

‎.run/Run AWS Toolkit - Core [2023.2].run.xml‎ renamed to ‎.run/Run AWS Toolkit - Community [2023.2].run.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run AWS Toolkit - Core [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Community [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2023.2" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Core [2023.3].run.xml‎ renamed to ‎.run/Run AWS Toolkit - Community [2023.3].run.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run AWS Toolkit - Core [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Community [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2023.3" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Core [2024.1].run.xml‎ renamed to ‎.run/Run AWS Toolkit - Community [2024.1].run.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
2-
<configuration default="false" name="Run AWS Toolkit - Core [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
2+
<configuration default="false" name="Run AWS Toolkit - Community [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2024.1" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Rider [2023.2].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run AWS Toolkit - Rider [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2023.2" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Rider [2023.3].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run AWS Toolkit - Rider [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2023.3" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Rider [2024.1].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run AWS Toolkit - Rider [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2024.1" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Ultimate [2023.2].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run AWS Toolkit - Ultimate [2023.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.2">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2023.2" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Ultimate [2023.3].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run AWS Toolkit - Ultimate [2023.3]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2023.3">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2023.3" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

‎.run/Run AWS Toolkit - Ultimate [2024.1].run.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run AWS Toolkit - Ultimate [2024.1]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2024.1">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/system/log/idea.log" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
6-
<option name="externalProjectPath" value="$PROJECT_DIR$/plugins/toolkit/intellij" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
77
<option name="externalSystemIdString" value="GRADLE" />
88
<option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2024.1" />
99
<option name="taskDescriptions">
1010
<list />
1111
</option>
1212
<option name="taskNames">
1313
<list>
14-
<option value="runIde" />
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
1515
</list>
1616
</option>
1717
<option name="vmOptions" />
1818
</ExternalSystemSettings>
1919
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22-
<ForceTestExec>false</ForceTestExec>
22+
<RunAsTest>false</RunAsTest>
2323
<method v="2" />
2424
</configuration>
25-
</component>
25+
</component>

0 commit comments

Comments
 (0)