Release/2026.1.2#192
Open
DetachHead wants to merge 2025 commits into
Open
Conversation
…ocument content is changed (cherry picked from commit 77d45c493738a4e06529755a46222914d788bf6e) IJ-CR-200326 GitOrigin-RevId: 79e098a662f51ceba7e1c6aa4df9d22f16942021
…e number for anchor (cherry picked from commit 2cd61c295358bdad4650a03db9c79d9e01f3a7e3) IJ-CR-200326 GitOrigin-RevId: 26863a012b976313408bb27041f80c1d7139dacc
…oid freeze (cherry picked from commit 08719f4720e5ae9ca6fb12369dce6ac12f9c2ec1) IJ-CR-200326 GitOrigin-RevId: e124d67708fde989e4cbe416e394a5636084f06d
…ent highlighting cache on each document change within bulk mode (cherry picked from commit f79f6f64be023ad778aa5b160382535496530c41) IJ-CR-200326 GitOrigin-RevId: 9b950b4f0ba7a92d1ce55158ff5121657fd30f9c
…enumerating all range markers on each document change in bulk mode (cherry picked from commit 4548f27c8e093a2790f355a4327447f9270cf14d) IJ-CR-200326 GitOrigin-RevId: 4d64d5acff2ab9f0c417c35a32f8afe0b43f28f0
…caused by cell reformat outside document bulk mode (cherry picked from commit 71fcb5d15df1d3014973b4eaa3f50578b6d4733c) IJ-CR-200326 GitOrigin-RevId: 0ed6c12728f77ca371c550401525e93f84bc7cce
For hatch comparing data class to HatchEnvironment.DEFAULT led to an effect when environment wouldn't be detected if there were dependencies/features/etc. specified. Also, conda detection logic just checked well-known paths, but didn't take into account PATH variable, that was fixed by using proper detection logic. GitOrigin-RevId: 42a3edb654c2a2ea8b33139db7c718f3d51f5a48
This check is not entirely correct, it doesn't work for target-based SDKs. We can have a situation with WSL SDK, but we have a target path stored in homePath there, that's why it's interpreted as a local one. And as a consequence we will filter out such SDKs for WSL projects, which is incorrect. The change doesn't use filtering for target-based SDKs (these SDKs only exist for Python). Original MR: IJ-MR-194637 GitOrigin-RevId: 6949f2b9405c7ef4234d3565f233456d92d40aad
We use a check for eelMachine when getting SDKs from WSM (from a matching jdk table). However for target-based SDKs we can have a WSL SDK in a local jdk table for WSL project. And this leads to a problem with Python WSL interpreters in IDEA not being discovered. So this change adds a fallback to check LocalEelMachine if we didn't have a matching SDK, and return such a fallback SDK if it's a target-based one. Original MR: IJ-MR-194637 GitOrigin-RevId: 1875dd76b851e9716cd4b5a7f8a10e1f2554556f
Historically, setting a python version was only supported for local interpreters, leading to remote interpreters having `null` for some time after creation. And while it's tolerated in PyCharm, it's not really in IDEA. We need to have a valid SDK version from the very beginning. Original MR: IJ-MR-194637 GitOrigin-RevId: 5d561f513f430212428025a01f85d215d6cf0bf1
highlithing etc is handled by textmate plugin, so it looks safe to delete from this point. (cherry picked from commit 8dffac4347d6c6150c4664faf5aea44e7df95246) IJ-CR-200766 GitOrigin-RevId: efe9f812d21d2cd71c7a92b3e4d7d3d6f47c96be
(cherry picked from commit 762bd5b0f8763fb2acd33b57d6aa4e8a2fd7c82f) IJ-CR-200766 GitOrigin-RevId: cdd32c6109a7ac49fc6412bd14e34e6e23098041
* KTIJ-38326 * KT-83920 GitOrigin-RevId: 591086e006ed4734b9610d0b597dfc69073be45d
https://buildserver.labs.intellij.net/build/930733124 GitOrigin-RevId: 57d664ff377781becfcd2ea49d01e699cc5b4459
…-242735) There is a theory that making VFS watch the whole VCS repository root recursively might impact performance. The key is added to test that theory (cherry picked from commit d885fa8d1d6345c52298c45a4f7f6124d64d9576) GitOrigin-RevId: 3ddaa859ab7220d362bcf16165072226e0a1047b
https://buildserver.labs.intellij.net/build/930863800 GitOrigin-RevId: a5ae7d4c5e21349a29a4a4cba2bee3dba748f546
…nstallation - Pass module context when installing requirements via `PythonPackageManagerUI`. - Remove unused `installPackageDetachedCommand` from `UvPackageManager`. (cherry picked from commit ec4e390259107cd9e579df1304c9dd0596293284) IJ-MR-201006 GitOrigin-RevId: 3ff5fdb92f31c3e54134880827a56c4b086ea530
https://buildserver.labs.intellij.net/build/930905925 GitOrigin-RevId: 099433f1e502f473e0836311e7d57634623b6e2c
https://buildserver.labs.intellij.net/build/930910370 GitOrigin-RevId: 67bfc69413a94b38aa487fae0fe01f1fa96ed517
https://buildserver.labs.intellij.net/build/930913222 GitOrigin-RevId: 4978dfcda2f7b75463ae095ab1a00f2ebf23bedf
GitOrigin-RevId: 849669573245fa3a6b6608fd5ef674859d9dc4c9
…0.2b329.117 GitOrigin-RevId: 50775dbec8e845035f7ec401b5fc609a34047061
Closes PY-89281 (cherry picked from commit 3536f4e403c544635c7c1f3f50ec299ab6f8cbbb) IJ-MR-200954 GitOrigin-RevId: 4f3c3cffc5c77400a5109431ec0cc22c23adf7f3
…1222524e9d2d697ddc2bc Closes PY-89106 (cherry picked from commit 8232f1d3f64ef2f5fd4289202441520fb67876cd) IJ-MR-200000 GitOrigin-RevId: ef23e397e902dd3096dd67e3962ef1991447103a
…ade07c3 Closes PY-89107 (cherry picked from commit ee379776c58cbf31f748224e41eb39351fab0e92) IJ-MR-200002 GitOrigin-RevId: a368b24dbba11aa6ebdaeec0b015b7e72695626e
https://buildserver.labs.intellij.net/build/931389859 GitOrigin-RevId: c270c027595bd2e5d6490701ba303d7be3d8f290
Merge-request: IJ-MR-200885 Merged-by: Ilia Permiashkin <ilia.permiashkin@jetbrains.com> GitOrigin-RevId: c429ab27ccf2299845677b815e1d707fae00315d
(cherry picked from commit ab5419a0018f20c410b292f8beeb142274a6d622) (cherry picked from commit 005e08272d70519121754b6db33063afb373c860) IJ-MR-200842 GitOrigin-RevId: 144c5869f7d684b0995d0b4aff0494e51060bfba
…Throwable after throw expression ^KTIJ-37867 fixed (cherry picked from commit e332cfb48d6d476e9fce7374d011f8f33fa4d341) GitOrigin-RevId: f75fc08345bb21d26371975c8528dc2021a44077
(cherry picked from commit 7c41ce2c8d256ebe356f76f5d8adab0223e7bec9) GitOrigin-RevId: 4de3243e4deaa73412bf06fea879cda91c47cf37
Bug: 445669218 Test: n/a Change-Id: I3706c718ae39d49a5b1e9a91e732ec29e3211d26 GitOrigin-RevId: c679b5b2e9227dfd597804e46f90a41e84479b04 (cherry picked from commit 84af8990b8f7a701c674bbd0e48cc6a97618bb60) Space-RevId: 804d499654eff8a4166f3eb2be68d37846eb9e79
…[WIP] GitOrigin-RevId: 474a30233792465da0f8332f07c8d800073ab6a9
…ore code GitOrigin-RevId: 962daa7738526c619258a24d8783820729066e17
… SDK fetch GitOrigin-RevId: ec60ff74efb0b5c45479f5c94c96dcaadd09c261
Bug: 445296589 Test: GlassesPairingWizardTest Change-Id: I9569d11f17332caa862d565a0fdae3fb039b5d66 GitOrigin-RevId: 584a7c808afba1e16f7edb8dbc20d7f60fb36d51 Space-RevId: 21e93e954e51cd33a20c31419c62d7092c362bc0 (cherry picked from commit ff07adb4d3c2a9e139a61b771caa41845acb24be)
This change creates a 'dummy' module that will be the 'main' plugin.xml file for the gradle-dsl studio plugin. This module will only contain runtime dependencies on the gradle-dsl-* modules (besides gradle-dsl-android). Bug: 445669218 Test: n/a Change-Id: I74de09e8bb6cd75c5d95b71f60b3b7c396c68ab8 GitOrigin-RevId: 85c255960f7f0c5d8fe1a5384a109ebc4f4959a6 Space-RevId: 746a76d33ab2190b33df8e0f67c1ace33a3f0796 (cherry picked from commit c5021dbc8ccaf47744c35a3317f450b808886a32)
…ng: logcat.gradle GitOrigin-RevId: 75002e98af04d7a86c39b4c0db2a6ec1a05f8ce1
…" dummy plugin - "gradle-dsl-plugin" was introduced as a "dummy" plugin for AS containing the newly extracted gradle-dsl-android module from the existing "gradle-dsl" (https://issuetracker.google.com/issues/445669218), but in IJ this change brings no value, and we just added "gradle-dsl-android" as a content module for "gradle-dsl" GitOrigin-RevId: 46541b845da18855046047a327f57ff8a7dfedb1
…tries (261 fix) GitOrigin-RevId: 4411fcded07533913a0100aea36e40f5ef31a01e
…in.idea.compose.k2.debugger.test.cases add missing `intellij.android.logcat.gradle` which absence cased the `intellij.android.plugin.descriptor` not to be loaded - probably a patch for `8637fad86ec3b2466a778c24a11500a93a626e1c` GitOrigin-RevId: 2ea6c9d3ee1b596d013d5cf5dd854bd523c8a4c0
…tUtils Corrects commit 9abbe04013f211459f8269f4ae4e7b1383b5f6d0 GitOrigin-RevId: 012eb2cc4fe1a0cf87011499b1ccba98bffa7109
(cherry picked from commit 09f29397c2f2faa3530de9bbf318fc94755017e9) IJ-MR-204081 GitOrigin-RevId: 92cdfdeba0cee8352106ae52e94afcc192e1b9f9
https://buildserver.labs.intellij.net/build/949952525 GitOrigin-RevId: cdf2773731ae6a5197e8325244b5df27c1fd8a04
…ed metadata https://buildserver.labs.intellij.net/build/949959469 GitOrigin-RevId: 00440d2e4dc0d4aa9cdb0083cd8a591423de2327
… bands) always pass through the filter IJPL-240224 GitOrigin-RevId: 502e351aa4ff7236af4424a63a053955f16120d0
…odification IJPL-241014 (cherry picked from commit 8d63d566d8d7e901832a330501e0ff2ca3d5c9ba) GitOrigin-RevId: 24fc89e6b8e4daf4e81a574e398f2a4620348de6
prepare it for extending for CPP-49316. (cherry picked from commit e048a7916aa2bd967dea14bcd220615c64524fa1) IJ-CR-203838 (cherry picked from commit f9ea4697c1c6700451b1206cfdde6d2f0f5edce4) IJ-CR-204310 GitOrigin-RevId: d6518660887f5f4a9bd4cb626bb992dd1214fba7
(cherry picked from commit c229f23b53477f182396748681d561831ea800a8) IJ-CR-203838 (cherry picked from commit 8df359345ff58679a70d7e83c68575938f427845) IJ-CR-204310 GitOrigin-RevId: 89fa6fb19d55f1ad3ec34ba6166d916f6ccccdd6
(cherry picked from commit 089e4a826f01576b87790bd4d62eed5e17429b09) IJ-CR-203838 (cherry picked from commit 5eb27e42b556f31dabbe2fc452f97ccfbd8b1295) IJ-CR-204310 GitOrigin-RevId: ff8748ab21734cac4c35ff6577ae3ece3eb9186c
# Conflicts: # BUILD.bazel # build/BUILD.bazel # build/src/JewelMavenArtifactsBuildTarget.kt # intellij.idea.community.main.iml
DetachHead
added
the
release branch
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit e3acaac)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 92fa38d)
* pin appimagetool in ci and check its hash before using it * remove outdated comment * include spdx files in releases * fix duplicated spdx files --------- Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 8b42ca5)
…l cases where it's possible to close it (#216) * Revert "remove ctrl+G keyboard shortcut to open a new git log tab because it conflicts with go to line number." This reverts commit ef261e4. * use alt+G instead of ctrl+G for opening a new git log tab, to avoid conflicting with the shortcut to go to line number --------- Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit a4624f9)
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.