Skip to content

Commit 708d5d8

Browse files
aseemxsaseemxs
authored
build(253): add 2025.3 build target (#6098)
1 parent cb480ec commit 708d5d8

File tree

61 files changed

+5034
-19
lines changed

Some content is hidden

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

61 files changed

+5034
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ fun Project.jvmTarget(): Provider<JavaVersion> = withCurrentProfileName {
2929
fun Project.kotlinTarget(): Provider<String> = withCurrentProfileName {
3030
when (it) {
3131
"2024.3" -> KotlinVersionEnum.KOTLIN_2_0
32-
"2025.1", "2025.2" -> KotlinVersionEnum.KOTLIN_2_1
32+
"2025.1", "2025.2", "2025.3" -> KotlinVersionEnum.KOTLIN_2_1
3333
else -> error("not set")
3434
}.version
3535
}

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

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,49 @@ object IdeVersions {
152152
rdGenVersion = "2025.2.2",
153153
nugetVersion = "2025.2.0"
154154
)
155+
),
156+
Profile(
157+
name = "2025.3",
158+
gateway = ProductProfile(
159+
sdkVersion = "253.28086.53",
160+
bundledPlugins = listOf("org.jetbrains.plugins.terminal")
161+
),
162+
community = ProductProfile(
163+
sdkVersion = "253.28294-EAP-CANDIDATE-SNAPSHOT",
164+
bundledPlugins = commonPlugins + listOf(
165+
"com.intellij.java",
166+
"com.intellij.gradle",
167+
"org.jetbrains.idea.maven",
168+
"com.intellij.properties"
169+
),
170+
marketplacePlugins = listOf(
171+
"org.toml.lang:253.28294.86",
172+
"PythonCore:253.28294.51",
173+
"Docker:253.28294.90",
174+
"com.intellij.modules.json:253.28294.51"
175+
)
176+
),
177+
ultimate = ProductProfile(
178+
sdkVersion = "253.28294-EAP-CANDIDATE-SNAPSHOT",
179+
bundledPlugins = commonPlugins + listOf(
180+
"JavaScript",
181+
"JavaScriptDebugger",
182+
"com.intellij.database",
183+
"com.jetbrains.codeWithMe"
184+
),
185+
marketplacePlugins = listOf(
186+
"Pythonid:253.28294.51",
187+
"org.jetbrains.plugins.go:253.28294.51",
188+
"com.intellij.modules.json:253.28294.51"
189+
)
190+
),
191+
rider = RiderProfile(
192+
sdkVersion = "2025.3-SNAPSHOT",
193+
bundledPlugins = commonPlugins,
194+
netFrameworkTarget = "net472",
195+
rdGenVersion = "2025.3.1",
196+
nugetVersion = "2025.3.0"
197+
)
155198
)
156199
).associateBy { it.name }
157200

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,14 @@ dependencies {
101101
bundledPlugins(toolkitIntelliJ.productProfile().map { it.bundledPlugins })
102102
plugins(toolkitIntelliJ.productProfile().map { it.marketplacePlugins })
103103

104+
// OAuth modules split in 2025.3 (253) - must be explicitly bundled
105+
val versionStr = version.get()
106+
if (versionStr.contains("253")) {
107+
bundledModule("intellij.platform.collaborationTools")
108+
bundledModule("intellij.platform.collaborationTools.auth.base")
109+
bundledModule("intellij.platform.collaborationTools.auth")
110+
}
111+
104112
testFramework(TestFrameworkType.Plugin.Java)
105113
testFramework(TestFrameworkType.Platform)
106114
testFramework(TestFrameworkType.JUnit5)

‎kotlinResolution.settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencyResolutionManagement {
1010
"1.8.0-intellij-11"
1111
}
1212

13-
"2025.2" -> {
13+
"2025.2", "2025.3" -> {
1414
"1.10.1-intellij-5"
1515
}
1616

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager
1717
import com.intellij.openapi.options.ShowSettingsUtil
1818
import com.intellij.openapi.project.Project
1919
import com.intellij.openapi.vfs.LocalFileSystem
20+
import com.intellij.openapi.vfs.VfsUtilCore
2021
import com.intellij.openapi.vfs.VirtualFile
2122
import com.intellij.ui.jcef.JBCefJSQuery.Response
2223
import kotlinx.coroutines.CancellationException
@@ -103,7 +104,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendC
103104
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.StopResponseMessage
104105
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TELEMETRY_EVENT
105106
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
106-
import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
107107
import software.aws.toolkits.jetbrains.services.amazonq.util.command
108108
import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
109109
import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
@@ -232,7 +232,11 @@ class BrowserConnector(
232232
SEND_CHAT_COMMAND_PROMPT -> {
233233
val requestFromUi = serializer.deserializeChatMessages<SendChatPromptRequest>(node)
234234
val editor = FileEditorManager.getInstance(project).selectedTextEditor
235-
val textDocumentIdentifier = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
235+
val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
236+
val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
237+
?: virtualFile.path
238+
TextDocumentIdentifier(relativePath)
239+
}
236240
val cursorState = editor?.let { LspEditorUtil.getCursorState(it) }
237241

238242
val enrichmentParams = mapOf(
@@ -362,7 +366,11 @@ class BrowserConnector(
362366

363367
CHAT_INSERT_TO_CURSOR -> {
364368
val editor = FileEditorManager.getInstance(project).selectedTextEditor
365-
val textDocumentIdentifier = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
369+
val textDocumentIdentifier = editor?.virtualFile?.let { virtualFile ->
370+
val relativePath = VfsUtilCore.getRelativePath(virtualFile, project.baseDir)
371+
?: virtualFile.path
372+
TextDocumentIdentifier(relativePath)
373+
}
366374
val cursorPosition = editor?.let { LspEditorUtil.getCursorPosition(it) }
367375

368376
val enrichmentParams = mapOf(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmi
1010
class LanguageExtractor {
1111
fun extractLanguageNameFromCurrentFile(editor: Editor): String =
1212
runReadAction {
13-
editor.virtualFile.programmingLanguage().languageId
13+
editor.virtualFile?.programmingLanguage()?.languageId ?: "plaintext"
1414
}
1515
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
114114
languageExtractor.extractLanguageNameFromCurrentFile(editor)
115115
}
116116
val fileText = editor.document.text
117-
val fileName = editor.virtualFile.name
117+
val fileName = editor.virtualFile?.name ?: "unknown"
118118

119119
// Offset the selection range to the start of the trimmedFileText
120120
val selectionInsideTrimmedFileTextRange = codeSelectionRange.let {

‎plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt‎ renamed to ‎plugins/amazonq/chat/jetbrains-community/tst-242-252/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt‎

File renamed without changes.

0 commit comments

Comments
 (0)