Release/2026.1.1#158
Open
DetachHead wants to merge 1696 commits into
Open
Conversation
In the separate commit deliberately so we could see in the previous one that the file was moved IJ-CR-198511 GitOrigin-RevId: 5730c2bef7a89097345c4fee04e3523dce6b3f84
…h to start adding `<extensions>true` to 2.3.0 IJ-CR-198511 GitOrigin-RevId: bec9c86bfeb1ff9271326e95f9ca0723ba6b5b4e
In the separate commit deliberately so we could see in the previous one that the files were moved IJ-CR-198511 GitOrigin-RevId: 15edd6456b367f3105fb84a6615325c1dc33177d
It is the first part of the fix: we need to detect shells in the env where project is located. (cherry picked from commit 45bf7a3ba2c31fc58a1555a34fdc5901237fa7e0) IJ-CR-193031 GitOrigin-RevId: ff30a4a551a73fa1e7ed8ace7873beadda14bbe4
…tection classes and rename them (cherry picked from commit c789174240a8d1007fd1d6ad8729969cd574a944) IJ-CR-193031 GitOrigin-RevId: 03f303857177f8ca653fd80915c54153911b2c39
We have to use extension point here because of the Docker case - we can't safely determine if EelDescriptor is a DockerEelDescriptor because it is defined in the Docker plugin we do not depend on. So, to safely do that, it looks like we would need to create a module that depends on the Docker plugin and define the detector there. As the first step, let's define a an extension point and the local project case implementation. (cherry picked from commit 6cc8cdd048874b53d8f197d30008b588f84f957d) IJ-CR-193031 GitOrigin-RevId: 2bca61a6ce209b3de87566fa7a59b711064debb0
(cherry picked from commit b6234032653e3f68c41dfa608e099078d4929e8d) IJ-CR-193031 GitOrigin-RevId: b669e1c10140964ddad7e3dfdd7a509be7936694
…ettings The `detectShells` method became suspend - we need to wrap it into modal progress. (cherry picked from commit 7acdba75557ccd0558b65416f6caab006935a97a) IJ-CR-193031 GitOrigin-RevId: 449e440c42c4c895b3af909d21789d4df20b8b97
…cting shells on Windows (cherry picked from commit a0a8f2c17eeff1ce8de953c68ddabf776747af14) IJ-CR-193031 GitOrigin-RevId: 2bb0a9a8a81ecce1b0b47a71be3ecd30b444dc36
Just in case. (cherry picked from commit 13eadb8eef125049245c13daa479847b322d5b96) IJ-CR-193031 GitOrigin-RevId: cd941ff2e4602d6e8d230f92e1ee4444e303643f
…new predefined sessions (cherry picked from commit 73423686274fea85054e82c29a0b509b98e9ca66) IJ-CR-193031 GitOrigin-RevId: c093601d128ef74b42df62198682f9d39cb54746
…Session popup (cherry picked from commit a9297f82ca80de922bf817e59e2d00e0f2a403df) IJ-CR-193031 GitOrigin-RevId: 9c4947447f4e0352902d2f0f375a459f10618282
We can't strictly depend on `intellij.platform.ide.impl.wsl` in the main terminal module because it exists only on the backend. While the main terminal module should be loaded on the frontend is well. (cherry picked from commit d74a0a4b4b18a345ba71d14a60b5fc26947021d5) IJ-CR-193031 GitOrigin-RevId: 7a77e1b850235fce7c7051758cab0075807805f9
"WSL" and "Dev Container" are names of the technologies, so they don't need to be translated. But "Host" might be different, so let's allow translating it. (cherry picked from commit cb38cc30748de40b1cd04f6fdf5d1aa18d84f0e5) IJ-CR-193031 GitOrigin-RevId: b38034ad5a3c0b2fee91af5201d881688c07d8ee
…eters The conversion of Python runners to coroutines (PY-87682) replaced AppExecutorUtil.getAppExecutorService() with project-scoped CoroutineScope.async(). The old executor automatically propagated the calling thread's context (including EnvDataContextElement with the execution DataContext), but the new coroutine scope does not inherit it. As a result, macros like $FilePath$ in the "Script parameters" field expand to empty strings because getEnvironmentDataContext() returns null inside the coroutine, and the fallback EMPTY_CONTEXT has no VIRTUAL_FILE. Fix: capture environment.dataContext before entering the coroutine and re-install it via ExecutionManagerImpl.withEnvironmentDataContext() around state.execute() in all four Python runners: - PythonRunner (Run) - PyDebugRunner (Debug) - PythonCoverageRunner (Coverage) - PythonProfileRunner (Profile) Add a parameterized JUnit 5 test that creates a run configuration with all 25 non-interactive macros, executes it through each runner, and verifies that every macro is expanded in the process output. GitOrigin-RevId: 43a548516f142837392dec67bbc34d12790855ce
(cherry picked from commit 025c5b73cab32b02962e716e84500e2c976ed6f1) IJ-MR-198883 GitOrigin-RevId: 2875d09b9e2dbfb324a717ce893b31e9463e58f3
(cherry picked from commit abe9b20551e81fdb584802f0b52339363780faf7) IJ-CR-197979 GitOrigin-RevId: 6e15c6e033653c066681bf9fb4e158494000af2a
…l, runQodana DSL, add log streaming Cherry-pick of master commits to 261: - b96d6ff4ac3bf testFramework [starter]: introduce ErrorIgnorer implementation of ErrorReporter - 8d93b6080c05f QD-13182 qodana-test-framework: redesign IntegrationTest, result model, runQodana DSL, add log streaming Original MR: IJ-MR-197658 Co-authored-by: Anna Zhukova <anna.zhukova@jetbrains.com> Merge-request: IJ-MR-198665 Merged-by: Anna Zhukova <anna.zhukova@jetbrains.com> GitOrigin-RevId: 2878fd1050828dd95470f6f55f0b07904ea35821
When we perform an inspection for absent SDK, we lock sdk configuration (which results in showing modal progress) for SDK auto-configuration. However we don't need this progress if we won't actually configure SDK. In order to avoid it, we'll lock sdk configuration just before we'll do the SDK setup with an extra check that no SDK was set in the process. (cherry picked from commit 377c520eccd71eb87013d1fa0ab97efc7a274c91) IJ-MR-198981 GitOrigin-RevId: aa9f9a722057da84ee9da970e92ea08021b3622d
(cherry picked from commit bd63dfe7ed3eb174241eb042a69b8cd1591fc8a1) IJ-CR-198171 GitOrigin-RevId: f1c3bc97a430bc04697f822a898b065e47609341
(cherry picked from commit 5740b09d6aa978d3222e775d0b965f9ded375684) (cherry picked from commit 001a3673b8c128d860a06428f70ca09d25be6cef) IJ-CR-198171 GitOrigin-RevId: 132f8b99d9e3fd26351cc66bf04dbcee30c0414d
(cherry picked from commit 41850f561cc583ce7520cda5ec7077cd47dbb4b4) (cherry picked from commit f34d17a457edfba73b56c13af692b9560aefb6eb) IJ-CR-198171 GitOrigin-RevId: eee60697ca5b37988f6f6a98592e0b5ef7034562
…iner names rather than toString representations (cherry picked from commit 689446cbd1db6dae03d4c7ae38f8b74e220f6606) (cherry picked from commit 28ba8e4781bfee54f1491a67e4cdef4667aea43b) IJ-CR-198171 GitOrigin-RevId: 8f4aebe09bcb3319940e864684cc5a27f292966b
(cherry picked from commit 3f48f78c006520c1897a230ba5321c88ee2e227a) (cherry picked from commit da7d3be12eeb06bc364be0e556100911f770515c) IJ-CR-198171 GitOrigin-RevId: 504bfb16dd2e2019d4a9d773e4ddc391693204e5
…inerDescriptor (cherry picked from commit f8de235902e101209d8344dec7f4a9c939db762c) (cherry picked from commit 4f7b810e72e9eb94a421a4c437f3d885211b5a2f) IJ-CR-198171 GitOrigin-RevId: 9274fd0af586756cd91f38494acc3ee7d65fc4d1
…hat they are pinned to top (cherry picked from commit 54291db265f821b21370a83bf7ef4825fc5f9ed6) (cherry picked from commit d328f11f31d9752df0775f84a43d3883d4100e6b) IJ-CR-198171 GitOrigin-RevId: 84680ec1ff44b7d12a9d46e26fc73e46b69caf0c
…t format with hierarchy support (cherry picked from commit e539bcfbcb30a69b592b6b54b177c92d57ec8fee) (cherry picked from commit fb98582035875d1411672a5f607865a8f439b175) IJ-CR-198171 GitOrigin-RevId: 971b5bb18ee3b15fc5a80726ca5a007f3daea68f
(cherry picked from commit 0dd3df008788d64d10015c1242f700a60d6807aa) (cherry picked from commit 6d103808aae767b38710736f1673cf6b11d86dee) IJ-CR-198171 GitOrigin-RevId: 198c92eac2e66d45fb5c8ffebee84031be80072a
…ntellij parser. Preserve name with "@id" suffix (cherry picked from commit 867a5e7116d1ee5ad4d2b749d95942a2ba611bdc) (cherry picked from commit bc0be87c3f6299b0dab2353acbcd419cae608848) IJ-CR-198171 GitOrigin-RevId: 7f6a5fa83612fddf62daaf907d27f2219f6fcd68
…ad dump) to the export action (cherry picked from commit cbcf4a3cfcd230ebe9d4bd32b1466136099f0f3c) (cherry picked from commit 3ef2fb84efad3a190b3d8eb0e38126642be31daa) IJ-CR-198171 GitOrigin-RevId: d3898adec15c83c23b532999eaabc9f13aa8a9b2
https://buildserver.labs.intellij.net/build/930733135 GitOrigin-RevId: 0e1b352dcd008f3425806d3f4fa33b1647892c3c
IJ-MR-200818 GitOrigin-RevId: f8c29ba57d3fdafb3d40be7a30fc9bd5262a29a2
https://buildserver.labs.intellij.net/build/930863807 GitOrigin-RevId: 0c88b510a4ac18b4ccf0c93b90765fd4e2bd9ce6
https://buildserver.labs.intellij.net/build/930910576 GitOrigin-RevId: 7542eca0786f2453c9acecd996ce4ebc7dfec137
https://buildserver.labs.intellij.net/build/930913228 GitOrigin-RevId: 8320b105c5f5e0481882fe9738fe1b5062043f57
…nstallation - Pass module context when installing requirements via `PythonPackageManagerUI`. - Remove unused `installPackageDetachedCommand` from `UvPackageManager`. (cherry picked from commit ec4e390259107cd9e579df1304c9dd0596293284) IJ-MR-201006 GitOrigin-RevId: 5f2a71a1c12b02d54a7e3d916c681294dd119ab6
https://buildserver.labs.intellij.net/build/931389865 GitOrigin-RevId: 2f3051513e9b5f07a9f95e76ef386dbe1dbad91d
(cherry picked from commit ab5419a0018f20c410b292f8beeb142274a6d622) (cherry picked from commit 005e08272d70519121754b6db33063afb373c860) IJ-MR-200842 GitOrigin-RevId: b66feb24b7850688867a90d9f8051acce06df498
…called (cherry picked from commit 4484a0968831cd876056136c6b56a3d56ad978f7) IJ-CR-199152 GitOrigin-RevId: 18e476f9bc33ec3eecab4af9a3619c2db10451d6
…0.2b329.117 (cherry picked from commit 50775dbec8e845035f7ec401b5fc609a34047061) IJ-CR-201097 GitOrigin-RevId: e2aaf03b093ded9419b3876c320ad71e83a44c65
…tion Merge-request: IJ-MR-192439 Merged-by: Egor Eliseev <Egor.Eliseev@jetbrains.com> (cherry picked from commit 3a7db9f5cbfbeaa599b2088b37851cc857fc5141) Merge-request: IJ-MR-201368 Merged-by: Egor Eliseev <Egor.Eliseev@jetbrains.com> (cherry picked from commit 3095eb6b56c723fcf11ecac3f7d0b43dab0ecb4f) IJ-MR-201368 GitOrigin-RevId: ccd60f41308d45b86c6a0a70935fa4284a62aac9
# Conflicts: # BUILD.bazel # build/BUILD.bazel # build/src/JewelMavenArtifactsBuildTarget.kt # intellij.idea.community.main.iml
DetachHead
added
the
release branch
DetachHead
force-pushed
the
release/2026.1.1
branch
2 times, most recently
from
ba74720 to
91c2a70
Compare
* ⚙️ ci: use matrix strategy for macOS multi-arch builds - support building both aarch64 and x64 architectures in single job - reduce CI configuration duplication - ensure artifact names include architecture identifier (cherry picked from commit d8cf4f5) * add back `# language=bash` comment --------- Co-authored-by: whsin.wang <whsin.cn@gmail.com> Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 686af06)
…is time) (#169) * disable facets attempt 2 * fix unit tests crashing due to missing `FacetManagerFactory` service * fix unit tests failing locally because i moved git related actions around --------- Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 982f418)
* add back project view tool window Unlike IntelliJ, the project view is not shown by default on startup. The commit tool window remains the default view. Closes #129 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * address PR review: reorder project view and remove unused panes - Add secondary="true" to Project tool window so it appears below git-related tool windows in the left sidebar - Comment out ScopeViewPane registration (not needed for a git-focused IDE) - Comment out PackageViewPane registration (Java-specific, not needed) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix project toolwindow placement and startup activation - make Project default to split section in new UI layout so it stays below primary Git windows - migrate existing new UI layouts to keep Project in split section - skip startup auto-activation when Project tool window is marked doNotActivateOnStart - add regression tests for layout migration and startup activation guard Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * address review: simplify project view startup handling - Disable 'ide.open.project.view.on.startup' registry key by default instead of adding new gating logic in IdeProjectFrameAllocator. - Revert the saved-layout migration in ToolWindowDefaultLayoutManager; rely on the new default layout (isSplit=true) only. - Drop the IdeProjectFrameAllocatorTest (tautological tests; also caused CI failure since intellij.platform.ide.impl has no JUnit dep). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * revert commented out `projectViewPane` in `JavaPlugin.xml` because that plugin is disabled in rebased anyway --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit b99c01d)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 5a37738)
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.