Skip to content

feat(jetbrains): Add 2025.3 refresh #6098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Nov 14, 2025
Merged

feat(jetbrains): Add 2025.3 refresh #6098

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9eab8ef
Add 2025.3 support with build 253.28294
aseemxs Nov 11, 2025
0642e85
Configure Kotlin 2.1 and coroutines for 2025.3
aseemxs Nov 11, 2025
72f8a3e
Remove codeWithMe dependency for 2025.3
aseemxs Nov 11, 2025
a0ef369
Fix detekt: remove unused import in 253+ version
aseemxs Nov 11, 2025
42db4e8
Fix Gateway SDK version for 2025.3
aseemxs Nov 11, 2025
8d4b06d
Fix gateway sdkVersion with the correct build number
aseemxs Nov 12, 2025
9faaca4
Bundle collaboration modules for 2025.3
aseemxs Nov 12, 2025
550881f
Version segregate OTelService for 2025.3
aseemxs Nov 12, 2025
8397fb9
Fix OTelService redeclaration error
aseemxs Nov 12, 2025
3a5683e
Fix RebuildDevfileRequiredNotification redeclaration
aseemxs Nov 12, 2025
d8f5d3c
Version segregate Gateway connection files for 2025.3
aseemxs Nov 12, 2025
75ff54b
Version segregate jetbrains-core test files for 2025.3
aseemxs Nov 13, 2025
e478640
Version segregate jetbrains-community test files for 2025.3
aseemxs Nov 13, 2025
2b97dc2
Fix detekt issues in tst-253+ test files
aseemxs Nov 13, 2025
02e01ef
Add LSP4J dependency to AmazonQ modules for 2025.3
aseemxs Nov 13, 2025
0d79bd6
Version segregate jetbrains-ultimate files for 2025.3
aseemxs Nov 13, 2025
097b3d0
Version segregate CodeWhisperer services and test files for 2025.3
aseemxs Nov 13, 2025
f2b2d4c
Fix CodeWhispererServiceNew.kt - replace test file with actual servic…
aseemxs Nov 13, 2025
2f95779
Un-segregate VirtualFile nullability fixes
aseemxs Nov 13, 2025
186725e
Fix VirtualFile nullability in chat module and segregate test files
aseemxs Nov 13, 2025
ff00481
Version segregate TelemetryHelperTest.kt for 2025.3
aseemxs Nov 13, 2025
9799fbd
Fix Windows test failure - allow Python SDK paths in VfsRootAccess
aseemxs Nov 13, 2025
e2dc546
Fix detekt trailing whitespace in AmazonQStreamingClientTest
aseemxs Nov 13, 2025
c172725
Retrigger CI - previous sdk-codegen failure was flaky
aseemxs Nov 13, 2025
a11edba
Fix Windows test - use @BeforeClass for VfsRootAccess before IDE startup
aseemxs Nov 13, 2025
420718a
Fix Windows test failure in TelemetryHelperTest - allow Python SDK paths
aseemxs Nov 13, 2025
51ad4f9
Fix detek trailing spaces in AmazonQStreamingClientTest.kt
aseemxs Nov 13, 2025
4a86406
Retrigger CI - previous sdk-codegen failure was flaky
aseemxs Nov 13, 2025
7835853
Fix 2025.3 compatibility issues
aseemxs Nov 14, 2025
7928093
Fix rd.platform dependency for IDE versions < 2025.2
aseemxs Nov 14, 2025
979ac44
Fix detekt spacing issue in build.gradle.kts
aseemxs Nov 14, 2025
39ea5b0
Retrigger CI - investigate detekt/coverage failure
aseemxs Nov 14, 2025
7dabfee
Remove duplicate CwmProblemsViewMutator from jetbrains-community
aseemxs Nov 14, 2025
5801765
Restore CwmProblemsViewMutator in jetbrains-community for IDE version…
aseemxs Nov 14, 2025
df39761
Move CwmProblemsViewMutator to src-253+ to prevent duplicate class in…
aseemxs Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ fun Project.jvmTarget(): Provider<JavaVersion> = withCurrentProfileName {
fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
when (it) {
"2024.3" -> KotlinVersionEnum.KOTLIN_2_0
"2025.1", "2025.2" -> KotlinVersionEnum.KOTLIN_2_1
"2025.1", "2025.2", "2025.3" -> KotlinVersionEnum.KOTLIN_2_1
else -> error("not set")
}.version
}
Expand Down
42 changes: 42 additions & 0 deletions buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,48 @@ object IdeVersions {
rdGenVersion = "2025.2.2",
nugetVersion = "2025.2.0"
)
),
Profile(
name = "2025.3",
gateway = ProductProfile(
sdkVersion = "253.28086.53",
bundledPlugins = listOf("org.jetbrains.plugins.terminal")
),
community = ProductProfile(
sdkVersion = "253.28294-EAP-CANDIDATE-SNAPSHOT",
bundledPlugins = commonPlugins + listOf(
"com.intellij.java",
"com.intellij.gradle",
"org.jetbrains.idea.maven",
"com.intellij.properties"
),
marketplacePlugins = listOf(
"org.toml.lang:253.28294.86",
"PythonCore:253.28294.51",
"Docker:253.28294.90",
"com.intellij.modules.json:253.28294.51"
)
),
ultimate = ProductProfile(
sdkVersion = "253.28294-EAP-CANDIDATE-SNAPSHOT",
bundledPlugins = commonPlugins + listOf(
"JavaScript",
"JavaScriptDebugger",
"com.intellij.database",
),
marketplacePlugins = listOf(
"Pythonid:253.28294.51",
"org.jetbrains.plugins.go:253.28294.51",
"com.intellij.modules.json:253.28294.51"
)
),
rider = RiderProfile(
sdkVersion = "2025.3-SNAPSHOT",
bundledPlugins = commonPlugins,
netFrameworkTarget = "net472",
rdGenVersion = "2025.3.1",
nugetVersion = "2025.3.0"
)
)
).associateBy { it.name }

Expand Down
8 changes: 8 additions & 0 deletions buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,14 @@ dependencies {
bundledPlugins(toolkitIntelliJ.productProfile().map { it.bundledPlugins })
plugins(toolkitIntelliJ.productProfile().map { it.marketplacePlugins })

// OAuth modules split in 2025.3 (253) - must be explicitly bundled
val versionStr = version.get()
if (versionStr.contains("253")) {
bundledModule("intellij.platform.collaborationTools")
bundledModule("intellij.platform.collaborationTools.auth.base")
bundledModule("intellij.platform.collaborationTools.auth")
}

testFramework(TestFrameworkType.Plugin.Java)
testFramework(TestFrameworkType.Platform)
testFramework(TestFrameworkType.JUnit5)
Expand Down
2 changes: 1 addition & 1 deletion kotlinResolution.settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencyResolutionManagement {
"1.8.0-intellij-11"
}

"2025.2" -> {
"2025.2", "2025.3" -> {
"1.10.1-intellij-5"
}

Expand Down
4 changes: 2 additions & 2 deletions ...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class BrowserConnector(
SEND_CHAT_COMMAND_PROMPT -> {
val requestFromUi = serializer.deserializeChatMessages<SendChatPromptRequest>(node)
val editor = FileEditorManager.getInstance(project).selectedTextEditor
val textDocumentIdentifier = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
val textDocumentIdentifier = editor?.virtualFile?.let { TextDocumentIdentifier(toUriString(it)) }
Copy link
Contributor

@rli rli Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this method call is obsolete

Copy link
Contributor Author

@aseemxs aseemxs Nov 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this use the relative path approach instead, like in AmazonQLanguageClientImpl.kt?

kotlin                                                                                                                                                                                                                            
val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
   val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
       ?: virtualFile.path
   TextDocumentIdentifier(relativePath)
}

Or is there a different preferred method?

val cursorState = editor?.let { LspEditorUtil.getCursorState(it) }

val enrichmentParams = mapOf(
Expand Down Expand Up @@ -362,7 +362,7 @@ class BrowserConnector(

CHAT_INSERT_TO_CURSOR -> {
val editor = FileEditorManager.getInstance(project).selectedTextEditor
val textDocumentIdentifier = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
val textDocumentIdentifier = editor?.virtualFile?.let { TextDocumentIdentifier(toUriString(it)) }
val cursorPosition = editor?.let { LspEditorUtil.getCursorPosition(it) }

val enrichmentParams = mapOf(
Expand Down
2 changes: 1 addition & 1 deletion ...oftware/aws/toolkits/jetbrains/services/cwc/editor/context/file/util/LanguageExtractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmi
class LanguageExtractor {
fun extractLanguageNameFromCurrentFile(editor: Editor): String =
runReadAction {
editor.virtualFile.programmingLanguage().languageId
editor.virtualFile?.programmingLanguage()?.languageId ?: "plaintext"
}
}
2 changes: 1 addition & 1 deletion ...aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
languageExtractor.extractLanguageNameFromCurrentFile(editor)
}
val fileText = editor.document.text
val fileName = editor.virtualFile.name
val fileName = editor.virtualFile?.name ?: "unknown"

// Offset the selection range to the start of the trimmedFileText
val selectionInsideTrimmedFileTextRange = codeSelectionRange.let {
Expand Down
0 ...s/services/amazonq/TelemetryHelperTest.kt → ...s/services/amazonq/TelemetryHelperTest.kt
View file
Open in desktop
File renamed without changes.
Loading
Loading