feat(jetbrains): Add 2025.3 refresh

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/BuildScriptUtils.kt

@@ -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
 }

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -152,6 +152,49 @@ 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",
+                    "com.jetbrains.codeWithMe"
+                ),
+                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 }
 

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -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)

kotlinResolution.settings.gradle.kts

@@ -10,7 +10,7 @@ dependencyResolutionManagement {
                     "1.8.0-intellij-11"
                 }
 
-                "2025.2" -> {
+                "2025.2", "2025.3" -> {
                     "1.10.1-intellij-5"
                 }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt

@@ -17,6 +17,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.LocalFileSystem
+import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.ui.jcef.JBCefJSQuery.Response
 import kotlinx.coroutines.CancellationException
@@ -103,7 +104,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendC
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.StopResponseMessage
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TELEMETRY_EVENT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.amazonq.util.command
 import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
@@ -232,7 +232,11 @@ 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 { virtualFile ->
+                    val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
+                        ?: virtualFile.path
+                    TextDocumentIdentifier(relativePath)
+                }
                 val cursorState = editor?.let { LspEditorUtil.getCursorState(it) }
 
                 val enrichmentParams = mapOf(
@@ -362,7 +366,11 @@ 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 { virtualFile ->
+                    val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
+                        ?: virtualFile.path
+                    TextDocumentIdentifier(relativePath)
+                }
                 val cursorPosition = editor?.let { LspEditorUtil.getCursorPosition(it) }
 
                 val enrichmentParams = mapOf(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/file/util/LanguageExtractor.kt

@@ -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"
         }
 }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt

@@ -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 {