Release/2026.2.1 - #309
Open
DetachHead wants to merge 1150 commits into
Open
Conversation
(cherry picked from commit 77d144a45d221c8328b10cd9012243acd6b92f0c) IJ-MR-213651 GitOrigin-RevId: a37ba47a791f2c05d14028652e1b40f4b836b30c
https://buildserver.labs.intellij.net/build/1004065514 GitOrigin-RevId: 43c96755758719b25c7a9061bd0cea3eaf5ae058
…ager.UnzipCommand` constructor ... in preparation to changing the script serialization method (cherry picked from commit b1736e0d3b7622e6961dc29b57d4b0889911a72a) IJ-CR-213573 GitOrigin-RevId: 80309fe11a76d5a640dcba40915333c4ba2c62ef
…I usage) (cherry picked from commit c14883d816855acfdcf695326c6804edfb0f10e7) IJ-CR-213662 GitOrigin-RevId: 8434dfef4afa15985243158094b734b75e4055ef
…ished (cherry picked from commit 114bf251ecdd3df5aec42b7cbe63877aa2923e56) GitOrigin-RevId: 741c850e86cd9802c00e654fae84b6660a715e7d
(cherry picked from commit b3bfd7a6e0d9cfea543bd822e5cf10414cf68292) IJ-CR-213229 GitOrigin-RevId: 5e9520bc9656de53da643e5fd34ff2f6f902be2a
(cherry picked from commit e36a29ef3c7f242d9571d51e6638770045cfec6c) IJ-CR-213229 GitOrigin-RevId: c000b257f82052e9d76554f2c692175d782cd120
GitOrigin-RevId: 8d20d289dbb23a11a1e74f4c6b0419215d231d69
…9c857bd10967231090dce Closes PY-90305 Co-authored-by: Azimjon Akhmadjonov <azimjon.akhmadjonov@jetbrains.com> Merge-request: IJ-MR-208459 Merged-by: Azimjon Akhmadjonov <azimjon.akhmadjonov@jetbrains.com> (cherry picked from commit 6e2170714f15917f2110adaed4f611c123e9af18) IJ-MR-208459 GitOrigin-RevId: 6a4c1088e33b0a1b8b902704a746a34edda6a0fd
…ile in refactoring package (cherry picked from commit c130d4f74fbfc25d973087ef1faced3dabbf14e6) IJ-CR-212042 GitOrigin-RevId: bc4c82ec26f550da73347c13a5113a910e6713f7
…d code fragment patches (cherry picked from commit a4e3c834a16156d97fe0dee91c10c7dc15a640de) IJ-CR-212042 GitOrigin-RevId: 3148eaf04aff16e9d621e23378e5a5d7cc08cb92
…type argument analysis (cherry picked from commit b455d9991d94bff4bbaabe70991e78ef2baab068) IJ-CR-212042 GitOrigin-RevId: 626b911ee2c54e0ceba6aed9f4b6157eff1fb500
…eArgumentsInspection (cherry picked from commit b4d6e99ae299a16bbdb7e9919fbaa06fb9412773) IJ-CR-212042 GitOrigin-RevId: 71cf8559d17a7918b510f07782c20dd2424c11d4
…eduled for removal (cherry picked from commit c92807a5258eee6517f505ff21a380e4618fbfaa) IJ-CR-212042 GitOrigin-RevId: d49276b1f93784af5a2f62df28dda4f544d66c2a
(cherry picked from commit aebef101c3153aa63b9a0dcc3c2ff524a79defa0) IJ-CR-213432 GitOrigin-RevId: bbbf36e2b072f5d8a4a49a746cdaa14d426656c8
…0.3b508.20 GitOrigin-RevId: 2014eda0e29f673be3a9f120ca35e158f8215b6f
GitOrigin-RevId: 69f161169f67adeece7d64e4c6a07a38f7f78b63
…PyCollectionType (cherry picked from commit eb382056aa86ae80afceea0b680b1d5e92936e4c) GitOrigin-RevId: 33ab36000705e8ecff113c500fa21581d5215a68
Follow-up to the eb382056 cherry-pick: 262-only code paths not covered by the original commit still used the now-deprecated PyCollectionType marker. Switch them to PyClassType + isParameterized() and make the SQLAlchemy helper static, matching the commit's idiom. GitOrigin-RevId: c1e526da373d1e895869b9e10dca456c18e7a1fa
… usage) (cherry picked from commit 10486e51dfee13d21932098c016b4347fe8820b9) IJ-CR-213659 GitOrigin-RevId: d2f3d7d680e52223b9f3eb1fdce7cc4556e98405
^IDEA-391528 for:me fixed (cherry picked from commit 4c9b7b50279f390124e85f222b2951c56b0dddd7) IJ-CR-213406 GitOrigin-RevId: be3f136de1088bf17a0db31e663531d8e5164098
…int in call chain (cherry picked from commit c11d099a7036ce31ccb804541647aab35609e820) IJ-CR-208950 GitOrigin-RevId: 0a3e68361c587560183a436997dcc1671fa871e1
IJ-CR-208950 (cherry picked from commit 806ed0ca279cbecb47182308e64916e4c1a68487) IJ-CR-208950 GitOrigin-RevId: 169d394c66ca8bfe405c474836691d6f28d75a2c
…ecated API usage) (cherry picked from commit fe7c59e8567b604c3ae60d115ea4853f2f964ddc) IJ-CR-213658 GitOrigin-RevId: 731f32383200b1eabd7151b51cc2709d3df09c52
…le/disable action on EDT instead of RawSwingDispatcher RawSwingDispatcher is treated as `any` modality and causes write-unsafe context errors GitOrigin-RevId: aac0cf2e53cf84da6badf157661d0acd35dd7670
…r from ApplicationActivity to AppLifecycleListener Application activities are invoked too soon, EDT may not be initialized yet GitOrigin-RevId: 9e43f5be6fd0cf6f4bbf4d6c2369b7b7e9abbf6c
…ick when prompt contains wide characters (cherry picked from commit ea2eb6143170bd1a8b87a4b3ef50cbabae72ae3e) IJ-CR-212254 GitOrigin-RevId: c99add843506d9576c8f4cc5ef1d5c69320437fd
(cherry picked from commit 118629254f32fd4a60ebe02aea36e8672f730451) IJ-CR-212254 GitOrigin-RevId: ef44fdb9a706faa7ddda5566c5beea9aa27340ba
(cherry picked from commit 9d7f07667f49a8ff2e1d45e27c63f1c814af8b5e) IJ-CR-212254 GitOrigin-RevId: 6df5eec5d4ee6da5cbf44eb7b9af6ec52cdd4496
…8538b76 Closes PY-90306 (cherry picked from commit 854c42f766a8381ea400bf4b7f343265ad31d5c8) IJ-MR-213807 GitOrigin-RevId: d494458220cdf4ad7708e47a695b8aeb0bb12094
…ugger plugin in plugin suggestions Merge-request: IJ-MR-216357 Merged-by: Maxim Popov <maxim.popov@jetbrains.com> (cherry picked from commit 9b8343d4342d019ff4c4dffa7c14ae01d6318fde) IJ-MR-216357 GitOrigin-RevId: 051016e7b7d602705a508aced468ba21de2517bb
(cherry picked from commit 86cc011fc32d93c8c85a0d63e6bec0f3e8eff06d) Platform-only pick: the original commit also touched plugins/air (AgentPromptLaunchSettingsController.kt, AgentPromptLaunchSettingsView.kt, AgentPromptPaletteView.kt, AgentPromptInlineEmptyStateProvider.kt, AgentPromptInlineEmptyStatePrologue.kt, AgentPromptGenerationSettingsCatalogService.kt, associated tests, and spec files); those changes were stripped from this pick. GitOrigin-RevId: f5a153ea382a429334e442f33a15efc0b5652b73
(cherry picked from commit 97780ae9d90e5658fdddf7c4669e2d57766823fd) Platform-only pick: the original commit also touched plugins/air spec files (global-prompt-composer.spec.md, global-prompt-entry.spec.md); those changes were stripped from this pick. GitOrigin-RevId: 17536cf0fd4ea2f715c6dbdef9fedaf71a8da46e
…cuments/editors (cherry picked from commit f932654ebb993ed2b120dd1eee14cc506696b88c) Platform-only pick: the original commit was almost entirely a plugins/air refactor (AIR file-mention/completion services moved between backend/session/runtime, frontend/prompt/prompt, and shared/prompt, plus BUILD.bazel/.iml/spec updates); all of that was stripped from this pick, leaving only the platform-side BackendBasedDocument.kt change. GitOrigin-RevId: e6a6a9cff01525e5a365e960abcae64f046e997c
(cherry picked from commit e7d49b9c5ca4a3e11c510cb4a23721ea257f6e40) Platform-only pick: the original commit also touched plugins/air (AgentPromptInlineEmptyStateProvider.kt, its test, and global-prompt-entry.spec.md); those changes were stripped from this pick. GitOrigin-RevId: bcc87a6acdb72088818a17630605081b8b208ff9
(cherry picked from commit 69e1e9067feba65cf59dfa3acb0f2fdeeb0f2a3c) Platform-only pick: the original commit also touched plugins/air (AgentThreadsSessionSearch.kt, its test, and agent-sessions-search.spec.md); those changes were stripped from this pick. GitOrigin-RevId: 81db874a273ade5f1b5f39756d3afeb64b983a9d
… in tooltips and GotIt prompts. Merge-request: IJ-MR-216490 Merged-by: Maxim Popov <maxim.popov@jetbrains.com> (cherry picked from commit 4d1666d1db4236fed8246c828036f585cebd18be) IJ-MR-216490 GitOrigin-RevId: 4cfc994c19699346f619c071a954ab766d8c1345
The debugpy/DAP backend does not launch the debuggee through PythonCommandLineState.startProcess: DebugpyConfigProvider.createConfig assembles the environment from scratch and serializes it into the DAP launch request. Compared with PythonCommandLineState.prepareEnv it was missing setupVirtualEnvVariables (VIRTUAL_ENV and the venv-prefixed PATH) and addCommonEnvironmentVariables (PYCHARM_HOSTED, PYTHONUNBUFFERED, resetHomePathChanges), so a debugged process ran without its virtualenv activated and subprocess calls to tools installed in the venv failed with FileNotFoundError. The pydevd backend was unaffected because it goes through PythonCommandLineState.execute. Extract those two steps into PythonCommandLineState.addCommonAndVirtualEnvVariables, along with the PYCHARM_HOSTED decision inlined in initEnvironment (shouldAddPyCharmHosted), and call them from the default createConfig at the same ordering point, so run-configuration envs still win over the activated ones and PATH is prefix-merged. Placing the call in the interface default means every provider inherits it. Add PyDebuggerVirtualEnvTest, which runs against both backends and so asserts the parity directly. IJ-MR-216263 (cherry picked from commit 21b59a59a1a1f9550c68e4c1d61d4e27a376ead2) IJ-MR-216551 GitOrigin-RevId: 81080faed737880d84ffdab470791be629a293b0
Air plugin code depends on this platform method. Partial cherry-pick of 5e27b1400321582612657da9ecd321eefea8aea5, extracting only this method. GitOrigin-RevId: 84c9aa9f1ba2be6f4489fca7371c6d931ab07b36
Partial cherry-pick of 5e27b1400321582612657da9ecd321eefea8aea5, extracting only the client-tagging. GitOrigin-RevId: 1cf07418aad47cdaf361daca048556e9dcabbc46
…configured McpToolFilter.MaskBased.fromMaskList treated a null mask list the same as an empty/blank one and returned ProhibitAll. ACP agents without an explicit idea_mcp_allowed_tools / mcp.tool.filter resolve their session tool filter to null, so every IDE MCP tool (including the dotTrace analyze tools) was denied and the execute_tool router exposed nothing but itself. This was latent until MCP tool-state filtering was unified to also apply the session filter in VIA_ROUTER mode; previously router mode hardcoded AllowAll, so the null->ProhibitAll mapping had no visible effect. Treat a null mask (no filter configured) as AllowAll, matching the documented "null exposes all tools" contract, while keeping an explicitly empty/blank string as ProhibitAll. The fix lives in the shared community filter, so it covers both the AIA and AIR ACP paths. (cherry picked from commit 1e55c1950ea1630b38061037df5321f01804f2e8) NET-MR-18836 (cherry picked from commit 5249db4a775d13cd4bfcb386ced1474ec22800b3) IJ-CR-216670 GitOrigin-RevId: 235b9d76ff51ababb12935aaa4cc35cef92b1471
…ugin (cherry picked from commit dd1be36d543708fd0dfce10d7f0bb9998e57c64b) Merge-request: IJ-MR-216644 Merged-by: Alesia Matuzok <alesia.matuzok@jetbrains.com> Merge-request: IJ-MR-216718 Merged-by: Alesia Matuzok <alesia.matuzok@jetbrains.com> GitOrigin-RevId: 8fc90f0902e4985640315ca7d17e0cc904c55143
https://buildserver.labs.intellij.net/build/1020449057 GitOrigin-RevId: aca5a1dcca3e57c0c922181c5b92bdf50b6814fb
…cal variables IJ-CR-215549 (cherry picked from commit 18f61afb2c6ad3dae45ac5d1c012ac26e5fdec1c) (cherry picked from commit 22b67d10a47645524bfea06e72facad70250715a) IJ-CR-216735 GitOrigin-RevId: cdb9179c16ccedd86c4a80a2e55c3e0111091973
(cherry picked from commit f8213f4333026dbf8541c4facb703c5aa8fff537) (cherry picked from commit 989f8eae9c7b04d7ee01d37a1a4fe406e89bbe10) IJ-CR-216735 GitOrigin-RevId: 37e198ead34bcf32ee6657b882737b6f09676c06
… the Install Package dialog and tool window. Original MR: IJ-MR-216488 GitOrigin-RevId: b1cb4d55f5dc1bc193d3ed0ec7a18144c6c09fe9
…ion panel UI (cherry picked from commit 12dd3c7d4a7e7cd123f27bd26e6e0cb0f3dc81a5) IJ-MR-216737 GitOrigin-RevId: 2c8e639f27bc3d5fabae9d40ca7260bafd127683
GitOrigin-RevId: 5f91a0ba6523de0250caf0f90f83a7bab86cc95d
…rror (cherry picked from commit aa216ae0370dc1e6d60870f073fe9d7a9d74d1df) IJ-MR-213683 (cherry picked from commit 498fbb0c04142eaaea437a8d75f8338dc773d05c) IJ-CR-216837 GitOrigin-RevId: fcf78e2e7e7ac3db6b378f076f0635935daf3f95
…p corners (cherry picked from commit a77f3701d23190b4f5a4f89cfd32b9228bf0a5f7) IJ-MR-216784 (cherry picked from commit 2efbdee31ab450d03819debf2c9f56aef90a3edc) GitOrigin-RevId: 545fbdcb0511a519e89a2921c24e37953449d4b8
Skip uv SDK configuration when the associated module has no resolvable base directory. This avoids missing-working-directory failures and preserves the normal missing-SDK notification path. (cherry picked from commit 5aa7b369b7b658e311c47a616b332f2b40d8392a) IJ-MR-216899 GitOrigin-RevId: 77878855d244c1fb6446d025edc8a6ddb744f147
https://buildserver.labs.intellij.net/build/1021434740 GitOrigin-RevId: 8604d584fc35f2a7321775a404fa565cfc9bc965
https://buildserver.labs.intellij.net/build/1021742493 GitOrigin-RevId: 5dde1e8453b502adbd7d3d299954400a159680c7
https://buildserver.labs.intellij.net/build/1021830230 GitOrigin-RevId: 0d643c8857ebe48dd207cb916c9d0ae45679574f
https://buildserver.labs.intellij.net/build/1021873698 GitOrigin-RevId: cadc92f302d66df48ab7c3be417ed9791d506807
# Conflicts: # .github/workflows/jewel-checks.yml # .idea/modules.xml # BUILD.bazel # build/src/org/jetbrains/intellij/build/RebasedProperties.kt # images/resources/META-INF/plugin.xml # intellij.idea.community.main.tests.iml # lib/BUILD.bazel # lib/MODULE.bazel # platform/external-system-api/dependency-updater/BUILD.bazel # platform/platform-impl/src/com/intellij/ide/actions/CloseAllEditorsAction.java # platform/platform-impl/src/com/intellij/ide/actions/CloseEditorsActionBase.java # platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorEmptyTextPainter.java # platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.kt # plugins/compose/intellij.compose.ide.plugin.k2/BUILD.bazel # plugins/compose/intellij.compose.ide.plugin.resources/BUILD.bazel # plugins/compose/intellij.compose.ide.plugin.shared/BUILD.bazel # plugins/gradle/BUILD.bazel # plugins/gradle/completion/kotlin/tests/BUILD.bazel # plugins/gradle/gradle-declarative-sync/BUILD.bazel # plugins/gradle/java/BUILD.bazel # plugins/kotlin/base/fir/analysis-api-platform/BUILD.bazel # plugins/kotlin/base/fir/project-structure/BUILD.bazel # plugins/kotlin/code-insight/fixes-k2/tests/BUILD.bazel # plugins/kotlin/code-insight/inspections-k2/tests/BUILD.bazel # plugins/kotlin/code-insight/intentions-k2/tests/BUILD.bazel # plugins/kotlin/compiler-plugins/parcelize/tests/k2/BUILD.bazel # plugins/kotlin/fir/tests/BUILD.bazel # plugins/kotlin/gradle/gradle-java/k2/BUILD.bazel # plugins/kotlin/gradle/gradle-java/tests.shared/BUILD.bazel # plugins/kotlin/gradle/gradle/tests/BUILD.bazel # plugins/kotlin/gradle/multiplatform-tests-k2/BUILD.bazel # plugins/kotlin/gradle/scripting/kotlin.gradle.scripting.k2/BUILD.bazel # plugins/kotlin/grazie/intellij.kotlin.grazie.tests/BUILD.bazel # plugins/kotlin/injection/k2/tests/BUILD.bazel # plugins/kotlin/j2k/k2/tests/BUILD.bazel # plugins/kotlin/jvm-debugger/test/compose/BUILD.bazel # plugins/kotlin/jvm-debugger/test/compose/intellij.kotlin.jvm.debugger.test.compose.iml # plugins/kotlin/navigation/tests/BUILD.bazel # plugins/kotlin/project-wizard/tests/BUILD.bazel # plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/BUILD.bazel # plugins/kotlin/util/test-generator-fir/BUILD.bazel
DetachHead
added
the
release branch
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.