Skip to content

Commit e4b5cbe

Browse files
rlirli
committed
Merge remote-tracking branch 'origin/main' into rli/config-caching
 Conflicts: plugins/core/resources/build.gradle.kts plugins/toolkit/jetbrains-core/build.gradle.kts
2 parents 415566e + 6209636 commit e4b5cbe

File tree

107 files changed

+1576
-402
lines changed

Some content is hidden

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

107 files changed

+1576
-402
lines changed

‎.changes/3.86.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"date" : "2025-07-16",
3+
"version" : "3.86",
4+
"entries" : [ {
5+
"type" : "bugfix",
6+
"description" : "- Fixed \"Insert to Cursor\" button to correctly insert code blocks at the current cursor position in the active file"
7+
} ]
8+
}

‎.changes/3.87.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"date" : "2025-07-30",
3+
"version" : "3.87",
4+
"entries" : [ {
5+
"type" : "bugfix",
6+
"description" : "change to use promptStickyCard to for image verification notification"
7+
}, {
8+
"type" : "bugfix",
9+
"description" : "Suppress IDE error when current editor context is not valid for Amazon Q"
10+
} ]
11+
}

‎.changes/3.88.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"date" : "2025-08-04",
3+
"version" : "3.88",
4+
"entries" : [ {
5+
"type" : "feature",
6+
"description" : "Add support for 2025.2"
7+
}, {
8+
"type" : "bugfix",
9+
"description" : "Fix unsupported files being shown in file picker when selecting images for adding image context in Windows"
10+
}, {
11+
"type" : "bugfix",
12+
"description" : "Fix the issue that sometime images added via drag & drop are incorrectly routed to pinned context"
13+
} ]
14+
}

‎.changes/3.89.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"date" : "2025-08-07",
3+
"version" : "3.89",
4+
"entries" : [ {
5+
"type" : "bugfix",
6+
"description" : "/transform: validate YAML dependency file for required fields"
7+
} ]
8+
}

‎.github/workflows/qodana-check-duplicatedcode.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Qodana - Duplicated Code
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches: [ main, feature/** ]
7+
pull_request:
8+
branches: [ '**' ]
9+
10+
concurrency:
11+
group: ${{ github.workflow }}${{ github.event.pull_request.number || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
qodana:
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
19+
# PR check
20+
checks: write
21+
# PR comments
22+
pull-requests: write
23+
# SARIF upload
24+
security-events: write
25+
steps:
26+
- uses: actions/checkout@v4
27+
with:
28+
ref: ${{ github.event.pull_request.head.sha }}
29+
fetch-depth: 0
30+
- name: Maximize Build Space
31+
if: runner.os == 'Linux'
32+
uses: jlumbroso/free-disk-space@main
33+
with:
34+
tool-cache: false
35+
large-packages: false
36+
- name: 'Qodana Scan'
37+
uses: JetBrains/[email protected]
38+
env:
39+
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
40+
with:
41+
# --config points to the DuplicatedCode-only Qodana config
42+
args:
43+
--config,qodana-configs/duplicated-code/qodana.yaml
44+
cache-default-branch-only: true
45+
# pr-mode off means that the whole repo should be checked for duplicate code, instead of just copy/pastes within the PR
46+
pr-mode: false
47+
- uses: github/codeql-action/upload-sarif@v3
48+
with:
49+
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json

‎.github/workflows/qodana-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
tool-cache: false
3535
large-packages: false
3636
- name: 'Qodana Scan'
37-
uses: JetBrains/qodana-action@v2024.2.3
37+
uses: JetBrains/qodana-action@v2025.1.1
3838
env:
3939
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
4040
with:

‎.run/Run AWS Toolkit - Community [2025.2].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Community [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IC-2025.2/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2025.2" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

‎.run/Run AWS Toolkit - Gateway [2025.2].run.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Gateway [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/GW-2025.2/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value=" -PideProfileName=2025.2" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value=":plugin-toolkit:jetbrains-gateway:runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Rider [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/RD-2025.2/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2025.2" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

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

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run AWS Toolkit - Ultimate [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IU-2025.2/log/idea.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2025.2" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value=":plugin-toolkit:intellij-standalone:runIde" />
15+
</list>
16+
</option>
17+
<option name="vmOptions" />
18+
</ExternalSystemSettings>
19+
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
20+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
21+
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
23+
<method v="2" />
24+
</configuration>
25+
</component>

0 commit comments

Comments
 (0)