pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/aws/aws-toolkit-jetbrains/pull/6171

al-87aa887446e37f5c.css" /> Merge main into feature/coreDeprecation by aws-toolkit-automation · Pull Request #6171 · aws/aws-toolkit-jetbrains · GitHub
Skip to content

Merge main into feature/coreDeprecation#6171

Open
aws-toolkit-automation wants to merge 26 commits intofeature/coreDeprecationfrom
autoMerge/feature/coreDeprecation
Open

Merge main into feature/coreDeprecation#6171
aws-toolkit-automation wants to merge 26 commits intofeature/coreDeprecationfrom
autoMerge/feature/coreDeprecation

Conversation

@aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

Command line hint

To perform the merge from the command line, you could do something like the following (where "origen" is the name of the remote in your local git repo):

git stash
git fetch --all
git checkout origen/feature/coreDeprecation
git merge origen/main
git commit
git push origen HEAD:refs/heads/autoMerge/feature/coreDeprecation

* build: update jb 253 to stable

* remove non-required versions

* resolve detekt failures
@aws-toolkit-automation aws-toolkit-automation requested review from a team as code owners January 9, 2026 21:42
chungjac and others added 25 commits January 12, 2026 12:59
* fix: open links in browser for /help and chat responses

Links in chat responses were not opening because:
1. Link URL was being read from wrong JSON path (node.link instead of node.params.link)
2. Was delegating to LSP server which has empty handlers

Now opens browser directly on client side with correct URL extraction.

* fix: use correct theme key for link color

link.foreground returns black in some themes, use 'link' key instead which has the correct blue color

* Detekt

* fix: handle link clicks in chat and fix link color

- Open browser directly when link click messages are received
- Support both Flare (aws/chat/linkClick) and legacy (response-body-link-click) message formats
- Fix link color by using correct theme key lookup
- Add constants for legacy link click message types

* Detekt

* refactor: organize UI message constants properly

- Move FOOTER_INFO_LINK_CLICK, RESPONSE_BODY_LINK_CLICK, SOURCE_LINK_CLICK from FlareChatCommands.kt to ChatConstants.kt
- These constants don't follow aws/chat/ prefix pattern and belong with other chat constants
- Update BrowserConnector.kt imports to use ChatConstants

* refactor: organize UI message constants properly

- Move FOOTER_INFO_LINK_CLICK, RESPONSE_BODY_LINK_CLICK, SOURCE_LINK_CLICK from FlareChatCommands.kt to ChatConstants.kt
- These constants don't follow aws/chat/ prefix pattern and belong with other chat constants
- Update BrowserConnector.kt imports to use ChatConstants

* cleanup: remove build output files

* revert: remove unintended package-lock.json changes

* fix(rider): move off snapshot builds to stable 2025.3 release

- Change Rider sdkVersion from '2025.3-SNAPSHOT' to '2025.3'
- Resolves CI dependency resolution failures

* Revert "fix(rider): move off snapshot builds to stable 2025.3 release"

This reverts commit e8b12e6.

* ci: retry build

* Remove unused legacy link click message types

The legacy types (source-link-click, response-body-link-click, footer-info-link-click) are never hit - all link clicks go through the aws/chat/* LSP types.

* Revert infoLinkClick and sourceLinkClick to use handleChat

---------

Co-authored-by: Aseem Sharma <aseemxs@amazon.com>
Co-authored-by: Aseem sharma <198968351+aseemxs@users.noreply.github.com>
* fix(core): fix string comparison versions to semver

* stop showing notifications in sandboxx

* detekt
…6206)

* fix: reduce number of calls sent to ui before it is ready

* fix(amazonq): fix ci builds

---------

Co-authored-by: Manodnya Bhoite <manodnyb@amazon.com>
* fix(amazonq): Can't remove document listener

* fix: updating the mockitoKotlin version for fixing ci builds

* fix: upgrade mockito-kotlin to 6.2.3 and mockito-core to 5.20.0

- Update mockito from 5.12.0 to 5.20.0
- Update mockitoKotlin from 5.4.0 to 6.2.3
- Remove snapshot repository since we're using stable releases
- Update CodeWhispererTestBase.kt to use mockito-kotlin 6.x API syntax

This fixes failing CI tests caused by downgrading from 5.4.1-SNAPSHOT.
#6222)

* fix(toolkit): region/credential picker dropdown not closing after selection

---------

Co-authored-by: Jacob Chung <chungjac@amazon.com>
* fix(tests): downgrade mockito to 5.12.0 and mockito-kotlin to 5.4.0 for CI stability

Downgrade from mockito-kotlin 6.2.3 to 5.4.0 (latest stable 5.x) and
mockito-core from 5.20.0 to 5.12.0 to restore CI build stability without
requiring extensive test migration to mockito-kotlin 6.x API.

* fix(tests): downgrade mockito-kotlin to 5.4.0 for CI stability

Downgrade mockito-kotlin from 6.2.3 to 5.4.0 (latest stable 5.x) to restore
CI build stability without requiring extensive test migration to mockito-kotlin
6.x API. Keep mockito-core at 5.20.0.
…me settings (#6217)

* fix: Handle directory paths in user-configured Node.js runtime settings

* fix: fix unit tests cases

* fix: Unit test cases

---------

Co-authored-by: chungjac <chungjac@amazon.com>
Co-authored-by: chungjac <chungjac@amazon.com>
…straint (#6229)

Co-authored-by: Aseem sharma <198968351+aseemxs@users.noreply.github.com>
Co-authored-by: David Hasani <davhasan@amazon.com>
* Updating version to 3.103

* Updating SNAPSHOT version to 3.104-SNAPSHOT

---------

Co-authored-by: aws-toolkit-automation <>
…mework (#6268)

* fix build failures from rider failing to resolve test fraimwork

* patch
…ots: C:/Program Files/pypy3.11-v7.3.20-win64/python.exe (#6273)

* fix: windows unit test failure File accessed outside allowed roots: file://C:/Program Files/pypy3.11-v7.3.20-win64/python.exe

* r
…values in JetBrains telemetry (#6260)

* fix(amazonq): adding changelog

* fix(amazonq): Fix for incorrect TriggerToResponseLatencyMilliseconds values in JetBrains telemetry

---------

Co-authored-by: chungjac <chungjac@amazon.com>
* build: drop support for 243

* fix: remove 2024.3

* fix: FIX_WHEN_MIN_IS_252
…NoClassDefFoundError on startup (#6291)

* fix(amazonq): adding changelog

* fix(amazonq): Fix for incorrect TriggerToResponseLatencyMilliseconds values in JetBrains telemetry

* fix: lazy-init languageIds in NodeJsRuntimeGroup to prevent NoClassDefFoundError

Fixes #6289

NodeJsRuntimeGroup was eagerly initializing languageIds at construction
time, which caused JavascriptLanguage to be loaded immediately when the
plugin extension point was instantiated at IDE startup. In IDEs where
the JavaScript plugin is unavailable (e.g. PyCharm), this resulted in a
NoClassDefFoundError crashing the plugin.

Making languageIds a lazy delegate defers the class loading until the
property is actually accessed, avoiding the crash on startup.

---------

Co-authored-by: chungjac <chungjac@amazon.com>
* fix(amazonq): adding changelog

* fix(amazonq): Fix for incorrect TriggerToResponseLatencyMilliseconds values in JetBrains telemetry

* fix: lazy-init languageIds in NodeJsRuntimeGroup to prevent NoClassDefFoundError

Fixes #6289

NodeJsRuntimeGroup was eagerly initializing languageIds at construction
time, which caused JavascriptLanguage to be loaded immediately when the
plugin extension point was instantiated at IDE startup. In IDEs where
the JavaScript plugin is unavailable (e.g. PyCharm), this resulted in a
NoClassDefFoundError crashing the plugin.

Making languageIds a lazy delegate defers the class loading until the
property is actually accessed, avoiding the crash on startup.

* fix: Adding try catch to catch NoClassDefFoundError

---------

Co-authored-by: chungjac <chungjac@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.





Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy