Merge 262#253
Open
DetachHead wants to merge 10000 commits into
Open
Conversation
^KTIJ-38997 fixed ^KTIJ-38974 fixed GitOrigin-RevId: bde5dfac22cd4943e63f3ea37760fd99afe180cb
GitOrigin-RevId: 17d485631a3ea0b8b896129bac26000729655052
GitOrigin-RevId: ff5c7c0427522ab31d38831b78e42b9c10170348
GitOrigin-RevId: 944db9a064d0bc2a1249292e8138cdbb7a26bb15
GitOrigin-RevId: 63c4816c535aa187456f69bdc3a93577061e24c6
… junit 5 GitOrigin-RevId: e6401a2107b1bc8caa9c70f5c1159561a39f0121
…unloading plugin classloaders GitOrigin-RevId: b89b958f646ec2ba939548fa3054c615361cb6bd
The MavenBuildToolLogTester only needs a Project as a parsing context, not an opened one. Opening a module-less project runs post-startup activities (e.g. PythonCore's PoetryPyProjectTomlPostStartupActivity), which logs 'SAFETY NET: no modules in project' as a warning; failOnWarns turns that unrelated warning into a test failure. Create the project without opening it. GitOrigin-RevId: 35d7055ef6a027cc44928a64e18f9be1ca9b734f
…e notification location GitOrigin-RevId: 3e34847c3a54cc55ee23895fb41d0487a313ca60
GitOrigin-RevId: c21efec58f24232b0567eb7931ca534f9b365433
GitOrigin-RevId: aa982d2964977bb29380109f19b7c3da013b6573
GitOrigin-RevId: 2cc16cb1de5afc610c821dbb81db437ad6d6148b
GitOrigin-RevId: 9a8738441a14a12856c2ef191eeeecaea32bcd01
Forward the global prompt model catalog through prompt launch requests so providers can scope model choices without re-querying their CLIs during session startup. Pi decodes the existing prompt model IDs into native PI model selectors for --models and passes the extension enough catalog metadata to register oMLX and JBCentral-backed models for /model. GitOrigin-RevId: 7083b14f953b347dccfd0c2b5a8701ed28d00976
GitOrigin-RevId: 72df9046d124d7bce51ae421a940507f1a874992
Add source-group metadata to generation models so selector UIs can keep Default first and then order explicit models as Local, OpenAI, Claude Code, and Other. Tag Codex, oMLX, JetBrains Central, and generic PI catalog rows at their source, and preserve the tag during model catalog normalization. Render those groups with separators in both the palette model popup and the launch profile editor combo. The profile editor also keeps stale/custom saved model selections in the Other group and keeps the default-profile marker out of row text for clearer rendering and accessibility. Document the selector ordering in the prompt generation controls spec and cover the grouping with prompt UI and PI catalog tests. GitOrigin-RevId: 954406a1b006356e496a24d7adaaf8d908e0ccff
GitOrigin-RevId: 95ff15eb29f9dff302cbffc93bcd419e4dffb199
Use a single project-scoped model catalog state for both the global prompt model popup and the Manage Launch Profiles editor. The shared selector entries keep loading, cached refresh, failure, retry, and grouping behavior consistent while allowing the non-modal profile editor to keep working after the prompt popup closes. The profile editor now starts loading models when its model combo is opened, matching the prompt popup's on-demand model loading behavior. GitOrigin-RevId: d2be9129afdece58673288c3bf0e76c3b8f9e1f4
IJ-MR-184958 IJ-MR-184993 IJ-MR-179029 IJ-MR-184126 IJ-MR-181153 IJ-MR-146078 IJ-MR-175479 IJ-MR-186058 IJ-MR-193195 IJ-MR-196957 IJ-MR-199124 IJ-MR-197441 IJ-MR-204135 IJ-MR-204674 IJ-MR-205883 GitOrigin-RevId: 6d0c4ad146160d3e86de42efa0c45655f3aebaa5
GitOrigin-RevId: 3c678471e9c60ac2a5277012a6911bb2e53e38e9
GitOrigin-RevId: 3c45bbe494f606a78e0be18052fa81725df08d2e
GitOrigin-RevId: 801ef0c4322c6fb39231cf3959f58515bb4c3cae
GitOrigin-RevId: 1ede710354e6991c0192093f0657df02a0958f5f
Opening a module-less project runs post-startup activities that can retain references to it past teardown, leaking the ProjectImpl. Bare util tests only need the project's base path, services and a PSI factory, none of which require an open project, so create it without opening. GitOrigin-RevId: 98252e57b13cb762f9163b0104aa5bc1e57a9fc3
GitOrigin-RevId: 219c8551f8c5455339d3d3e22703f1a8ae2edd1a
GitOrigin-RevId: c39a63316424c17e17c239865118e51bf8db573a
…Descriptor Keep it only in LspServerDescriptor. Since clients that migrate to LspClientDescriptor need to recompile, they might as well migrate to LspCustomization introduced about a year ago. GitOrigin-RevId: 742e12107fc9a5d2706ccce0d531f7ba4315899d
…ptor from IJPL-190316 Defensive change. This commit might be useful if later we find a branch in which there's a need to change exposed interfaces without touching LSP Client core GitOrigin-RevId: dda2932bfa9a32e26e657a0e82fdba3b56ab8ecb
…from IJPL-190316 Seems like it was never needed after all. After 99807acd1c4ae16af32accab873203e7d7c68698 it yields no benefits GitOrigin-RevId: 89bc923b57bf0484725dcaa0d3c2682e5a293193
Rollout parsing used independent timestamp heuristics for plans, tools, and turn completion. That left completed plan turns looking response-required in Agent Workbench even after Codex had emitted task_complete. Introduce a shared Codex activity projection and use it for both app-server turn snapshots and rollout fallback parsing. Matching or legacy no-id turn completion now clears pending plan attention, while stale completions still cannot clear newer work. GitOrigin-RevId: 268bf1e1f142a27ae82fb645ad9db3beba625b42
There is no need to guard `updateAppWindowIcon` calls - it performs necessary checks itself, hence `isWindowIconAlreadyExternallySet` doesn't have to be public. GitOrigin-RevId: e9a1346d6c80e4557e3f65236767b7ff43bafcd1
GitOrigin-RevId: ce6ad811c62a6e2293d94db30d5980eb656ef048
Move Maven tests as well since they are also quite heavy and unstable GitOrigin-RevId: 70b289beace889d5857b9eb73b4cfdafff5f9be6
GitOrigin-RevId: 6d75f614f6abd48d692bc4522b4743af9709bf90
…ide terminal GitOrigin-RevId: 3e4fa5064a40a7519edf61df5d1f602f1fd9c3a9
… via shell GitOrigin-RevId: cad044afbb4d8ea6d69accffc2499f8d8b177b01
GitOrigin-RevId: 7e77becdc8cce1711d846dec40dfecff182d9466
GitOrigin-RevId: 6d6f92b8614d27e0d735c40f1f865aab80503010
GitOrigin-RevId: ca1141cdc432b4c4ff3296ebbb1538b451cecf59
GitOrigin-RevId: 473b073eeea297b6c07dd41275602b97c04d71a1
…d action GitOrigin-RevId: 3982fd3ebe09a3c3eb162e5a2a5331e254315093
GitOrigin-RevId: 817370da91eb55df1f6ae63b47e1aea5d347e987
…rverProcess GitOrigin-RevId: 25003cbd059af809c9e2fcf938d13105c4c7148a
GitOrigin-RevId: 2c2570ceff269b6cfd70e7907c1f90fbfb3fcc73
…Impl GitOrigin-RevId: efb3b82edcff6d61879b54b40a6d940eb01a0cf6
GitOrigin-RevId: 8eae0cf483f0488bc082fdd718aa3546cea9d680
They are already a part of `KOTLIN_DEBUGGER_TESTS` GitOrigin-RevId: 9a353e800fd2c455e0b9ae282021cf7cb882774c
GitOrigin-RevId: 1d91e39703e22e9e33a4a74cab08d5d23b82abf5
GitOrigin-RevId: c3f1d9fa2eaefee31a134e5aed7db3caeeb04826
GitOrigin-RevId: 92bd3a421d88bf5eba8b716dbba0857435567d61
…n alias, if it exists ^KTIJ-38640 fixed GitOrigin-RevId: 90cf718289717f994947e525c681bd13e6fac418
… (IJPL-246329) The AI Review tab is an extension tab, and once provider selection moved into the launch-profile control its visibility was tied to NEW_TASK standard tabs only, so the selector vanished for every extension tab. Users therefore could not choose which Agent Workbench provider runs the review and the choice silently fell back to the default provider. Let an extension opt back into the provider selector and have AI Review do so, while keeping the per-task model and reasoning controls hidden since the review route does not consume them. Regression from 72df9046d124d, which folded provider selection into the launch-profile control and hid it on extension tabs. GitOrigin-RevId: 1db92951099248591fc3746add67d990e2b63cb1
…b (IJPL-246329) The AI Review tab previously exposed only the provider selector, leaving model and reasoning effort only in provider defaults. Let an extension opt into the per-task generation controls, have AI Review do so, and forward the chosen generation settings and model catalog through the submit data context into the review session launch so the selected model and effort actually apply to the AI review run. GitOrigin-RevId: e26db5d2680fe65cd2c6cd824c70bcb3ab96c961
… in monorepo GitOrigin-RevId: ce232c73c6eff7a2b4faac95618bef4ec254208b
Related change in JediTerm: https://jetbrains.team/p/ij/repositories/jediterm/revision/97c49c88c4a41c2213072281f5c936ecb8753fb5 GitOrigin-RevId: ae247d5ece571f25d2802b878ccad9b3e052c88b
…tion Signed-off-by: Dmitry Batkovich <dmitry.batkovich@jetbrains.com> GitOrigin-RevId: d2a215a7ba2771fbe09b7ac15db06feaae1a4cf5
# Conflicts: # .github/actions/build_ide/action.yml # .github/actions/upload_ide/action.yml # .github/workflows/code_quality.yml # .github/workflows/ide_build_and_upload.yml # .idea/compiler.xml # .idea/runConfigurations/Rebased.xml # BUILD.bazel # README.md # build/BUILD.bazel # build/idea-community-images/linux/icon_rebased_128.png # build/idea-community-images/mac/rebased.icns # build/idea-community-images/win/rebased.ico # build/src/JewelMavenArtifactsBuildTarget.kt # build/src/org/jetbrains/intellij/build/RebasedProperties.kt # getPlugins.sh # intellij.idea.community.main.iml # java/java-backend/resources/META-INF/JavaActions.xml # platform/build-scripts/src/org/jetbrains/intellij/build/BaseIdeaProperties.kt # platform/build-scripts/src/org/jetbrains/intellij/build/CommunityRepositoryModules.kt # platform/build-scripts/src/org/jetbrains/intellij/build/LinuxDistributionCustomizer.kt # platform/build-scripts/src/org/jetbrains/intellij/build/MacDistributionCustomizer.kt # platform/build-scripts/src/org/jetbrains/intellij/build/WindowsDistributionCustomizer.kt # platform/build-scripts/src/org/jetbrains/intellij/build/impl/JpsCompilationRunner.kt # platform/build-scripts/src/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt # platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompiledClasses.kt # platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt # platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/PluginDistributionJARsBuilderTest.kt # platform/ide-core/src/com/intellij/openapi/wm/ToolWindowId.java # platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/module/ModuleBridgeLoaderService.kt # platform/platform-api/resources/messages/IdeBundle.properties # platform/platform-impl/intellij.platform.ide.impl.iml # platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.kt # platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerPanelFactory.kt # platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorEmptyTextPainter.java # platform/platform-resources/src/META-INF/LangExtensions.xml # platform/platform-resources/src/META-INF/PlatformExtensions.xml # platform/platform-resources/src/idea/ExecutionActions.xml # platform/statistics/devkit/resources/intellij.platform.statistics.devkit.xml # platform/testFramework/common/src/common/PlatformPrefix.java # platform/vcs-log/impl/resources/intellij.platform.vcs.log.impl.xml # plugins/coverage-common/resources/intellij.platform.coverage.xml # plugins/textmate/loadVSCBundles.sh # tests.cmd
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| with: | ||
| name: dmg-build-scripts-${{ matrix.arch.name }} | ||
| - name: Download ${{ matrix.arch.name }}.sit | ||
| uses: actions/download-artifact@v7.0.0 |
| steps: | ||
| - uses: actions/checkout@v6.0.2 | ||
| - name: Download .dmg build scripts | ||
| uses: actions/download-artifact@v7.0.0 |
| runs-on: macos-latest | ||
| needs: distributions | ||
| steps: | ||
| - uses: actions/checkout@v6.0.2 |
| artifacts_dir: ${{inputs.artifacts_dir}} | ||
| - name: Upload .dmg build scripts | ||
| uses: actions/upload-artifact@v4.4.3 | ||
| uses: actions/upload-artifact@v6.0.0 |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4.2.2 | ||
| - uses: actions/checkout@v6.0.2 |
| # /mnt on hosted runners has ~70 GB free, so move swap there and grow it. | ||
| sudo swapoff -a || true | ||
| sudo rm -f /mnt/swapfile /swapfile | ||
| sudo fallocate -l ${{inputs.swap_size}} /mnt/swapfile |
Comment on lines
+70
to
+99
| dmg: | ||
| strategy: | ||
| matrix: | ||
| arch: | ||
| - name: x64 | ||
| suffix: .dmg | ||
| - name: aarch64 | ||
| suffix: -aarch64.dmg | ||
| runs-on: macos-latest | ||
| needs: distributions | ||
| steps: | ||
| - uses: actions/checkout@v6.0.2 | ||
| - name: Download .dmg build scripts | ||
| uses: actions/download-artifact@v7.0.0 | ||
| with: | ||
| name: dmg-build-scripts-${{ matrix.arch.name }} | ||
| - name: Download ${{ matrix.arch.name }}.sit | ||
| uses: actions/download-artifact@v7.0.0 | ||
| with: | ||
| name: mac-${{ matrix.arch.name }}-sit-unsigned | ||
| - name: Build ${{ matrix.arch.name }}.dmg | ||
| shell: bash | ||
| # language=bash | ||
| run: /bin/bash ./build.sh | ||
| - name: Upload .dmg | ||
| uses: ./.github/actions/upload_ide | ||
| with: | ||
| os: mac | ||
| suffix: ${{ matrix.arch.suffix }} | ||
| artifacts_dir: . |
| runs-on: macos-latest | ||
| needs: distributions | ||
| steps: | ||
| - uses: actions/checkout@v6.0.2 |
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.