Release/2026.1.4#269
Open
DetachHead wants to merge 2432 commits into
Open
Conversation
closes JetBrains#3408 (cherry picked from commit af9b15e3067051230c956e3028608f158e2ef755) (cherry picked from commit ee8797d302d40cff89c957748464f5f54f85d86e) IJ-MR-203972 GitOrigin-RevId: d60412547f2873d478c3365c5477921c903c0450
closes JetBrains#3365 (cherry picked from commit 2ed53552b9ed25fbbc829d3df54f2924e80abbb9) (cherry picked from commit 2c47df3a19927a71e63fb0f3cf39c9f89fd32e09) IJ-MR-203972 GitOrigin-RevId: b16dd7d9f3d5dcd5303cc189032d4b8042205391
(cherry picked from commit 8de269f5e4cb227c94db5b9c6acb7d4ceacff323) IJ-MR-203972 GitOrigin-RevId: 659ef290913acaa9d2bb60d31bda3a8228492b37
closes JetBrains#3475 (cherry picked from commit 87572f8e99d68f1be528d93351b5aca523f89db6) (cherry picked from commit 0804e760e7b7d2da2cd2de292965479fdd5e7bb6) IJ-MR-203972 GitOrigin-RevId: 6eae9265a6acbf8e7a455d42a5c5e5333d1bca66
… causes first (initially-selected) item to become unselectable after first click (cherry picked from commit eb994e6836e4e5af84b04c82a761cca78ff610ec) IJ-MR-203972 GitOrigin-RevId: 2860a65be4e27502deb26d89bed7edd448a66cdc
…do anything (cherry picked from commit 359109be699ebbda865171a2f2ad77844e16308a) IJ-MR-205851 GitOrigin-RevId: 80d407217e1ffa7142a3bcf92a67593a7bf54fef
… Feedback IJ-CR-203574 (cherry picked from commit f94d3c8d53b5ef41b712ad49e2eacc80fa3d42ad) GitOrigin-RevId: 8e2b77a9a7a0f23834da2168e52fe99e03cac5cc
…s where additional project is opened (cherry picked from commit 6b2bf3d960e6d2d2b760cfcbf9ad1edf9891e0dc) IJ-MR-205899 GitOrigin-RevId: a52d4bc5cb3535f4da700110a033a70ceb7e2c9e
(cherry picked from commit 9df7ba94ba011c9d4625dbca269e8834fe348116) IJ-MR-205899 GitOrigin-RevId: b163d2ef564e5ec96c4e10d4df68110caf9f2393
This prevents crash when printing text with cursor outside screen bounds. Relevant fix in JediTerm: https://jetbrains.team/p/ij/reviews/205808/timeline (cherry picked from commit c0478da37dd7299156f9fb57ec5632a9a79b2fa4) IJ-CR-205823 GitOrigin-RevId: b3a344d8eeeb86308040d82a9995173cf745df4b
…rom master Bring the new tool implementations from master to 261 without cherry-picking the master refactor stack. Legacy toolsets (lint_files, reformat_file) stay on 261 per release-branch policy. JVM: - Add PatchToolset + PatchApplyEngine for apply_patch (Codex V4A and unified git diff formats); register PatchToolset in plugin.xml. - Replace ReadToolset with master's (file_path, offset, limit) API; drop the 261-only slice / lines / indentation modes. - Replace SearchToolset and SearchSymbolSupport; SearchItem narrows to filePath + 1-based startLine/startColumn/endLine/endColumn (drops startOffset/endOffset/lineText). - Re-add McpToolHints + McpToolHintValue in annotations.kt; the new toolsets use them. - Make isUnderProjectDirectory internal so the new ReadToolset can call it. ij-proxy: - Replace handlers/apply-patch.ts and handlers/read.ts from master. - Add readFileTextExact, readFileTextLegacy, formatReadLine, renderRawTextFromReadOutput, parseNumberedReadOutput to shared.ts next to the existing 261 helpers so edit.ts and other 261 handlers keep working. Tests: - New PatchApplyEngineTest from master (pure unit, 37 cases). - Rewrite ReadToolsetTest for the offset/limit API. - Drop SearchToolsetTest assertions on removed fields and the redundant snippet_details test. Add README.md at the mcp-server module root describing the parity with master and the known divergences (notably the ij-proxy SearchItem wire shape and the legacy lint/reformat handlers that remain only on 261). GitOrigin-RevId: e7d8e53a83bf51937814d904cc02fd774252ca55
… message Add a 261-style integration test that exercises the live JVM apply_patch path for add / update / delete operations against McpToolsetTestBase fixtures. Three @test methods, all green via `./tests.cmd -Dintellij.build.test.patterns=com.intellij.mcpserver.toolsets.PatchToolsetTest -Dintellij.build.test.main.module=intellij.mcpserver.tests`. Add the missing `tool.activity.applying.patch` bundle key used by PatchToolset.apply_patch — without it every call failed with "'tool.activity.applying.patch' is not found". README: note that 261 ij-proxy clients now hit the JVM apply_patch directly, so deletes show as unstaged in `git status` rather than the staged `D` the previous TS handler produced via `git rm`. Also mention the new PatchToolsetTest under "Tests". GitOrigin-RevId: a9c833fad21c294fa55ca6815aeeaf1cd815be60
(cherry picked from commit faabf572217ec91f35470884bb719b6abaa1058d) IJ-MR-206189 GitOrigin-RevId: 9b24aa51d45dad8e9f7e9f68e6db61f535c121d9
https://buildserver.labs.intellij.net/build/961229497 GitOrigin-RevId: 886acbdeed8528535a4103cab6f79e0ca1625577
https://buildserver.labs.intellij.net/build/961239779 GitOrigin-RevId: 3cfad4f3eadc7cc40050b34299831abea4e5f84a
https://buildserver.labs.intellij.net/build/961246198 GitOrigin-RevId: 5c759b1918de3904980025390875769f7dbe5f4a
https://buildserver.labs.intellij.net/build/961248944 GitOrigin-RevId: 5258cefb00a96e9dbadad53cb8198cd8f8edb4db
https://buildserver.labs.intellij.net/build/961266560 GitOrigin-RevId: 577a868806faca32cef68e7a9168d4a2c6baa2e9
https://buildserver.labs.intellij.net/build/961398467 GitOrigin-RevId: c09a8d1549f91553202489a4576424ab3f086247
…hter and log errors instead of throwing them IJ-CR-206374 (cherry picked from commit 200ee2a4792ff7b864a508f3884b7095940b1021) GitOrigin-RevId: cfbdafcb9db4c454b124fc1cb35812b38b1c6b68
(cherry picked from commit 9b16cf5a7c144f8c39fb1dbfd2fb8acf3f3c0c19) GitOrigin-RevId: 6f3b61f41ff224bd44b1ac825b05b9eefcf8300c
(cherry picked from commit 2c1a4acb00bb9113157056af685cb673631464a2) GitOrigin-RevId: 79ebaec50f5db9c585699a38c023e7e7430bc6eb
(cherry picked from commit af578076b2dd02ab583eb72e7587b37949484903) GitOrigin-RevId: b064504db2b331b02fd3029c03bdee405ec8edb9
(cherry picked from commit 91a1b8ffca6fbbd5fbb424eff7d12311027ba626) GitOrigin-RevId: f5278cf5393eb49fe0b5bf27aff83a3f4679436b
https://buildserver.labs.intellij.net/build/962729074 GitOrigin-RevId: 3cb31b8b9b117019d4f05b6685d80c28e316fd69
https://buildserver.labs.intellij.net/build/962735300 GitOrigin-RevId: 9eb0e9746cc40a1f7cfe3e685819960c4a144606
relates to KMT-2153 (cherry picked from commit 91abae73384f5389462c591414649500ae72d269) GitOrigin-RevId: ab47e5810149578c43dc7605e82e75e53474a4d9
https://buildserver.labs.intellij.net/build/963207767 GitOrigin-RevId: b97207a1705fbbb1f7a190d5694c5e6eb2a4eb42
https://buildserver.labs.intellij.net/build/963216126 GitOrigin-RevId: 65de2713d3aa58834a211d710f348715909353c5
https://buildserver.labs.intellij.net/build/963229602 GitOrigin-RevId: b10c5debc110967d969892893d93694e47248808
https://buildserver.labs.intellij.net/build/988920616 GitOrigin-RevId: 771ef64cdb6cad7ef758d62665a7a32e96866e03
(cherry picked from commit dcd496b590950c1b80db06cb78995857b7448547) IJ-MR-211229 GitOrigin-RevId: f1aaebbf1b14fe9bc7b16bf2eba8a04056b6ff60
https://buildserver.labs.intellij.net/build/990268271 GitOrigin-RevId: 334d823a9ba121601e8eb57a61b42240b25b23e5
https://buildserver.labs.intellij.net/build/990313669 GitOrigin-RevId: 77054ebcc82ba266e15c8b33f7b9fbdbd4be43bd
https://buildserver.labs.intellij.net/build/990755916 GitOrigin-RevId: 3e9f0047eb24ccc99a6c4ad406fe640111c57ea1
…ed metadata https://buildserver.labs.intellij.net/build/990769087 GitOrigin-RevId: 3aa536c234d6436302cbd21b3b006baa34a81c57
https://buildserver.labs.intellij.net/build/990783703 GitOrigin-RevId: dab94cb886b40e1cd6a226e74fa57feeebd90f18
https://buildserver.labs.intellij.net/build/990804145 GitOrigin-RevId: 001c2660c2eb4aa6e9d4bcfa59486adc00736842
https://buildserver.labs.intellij.net/build/990835713 GitOrigin-RevId: 14a114c7e7fd4f9be930f20c5d7ffbe0964c5ae0
# Conflicts: # BUILD.bazel # build/BUILD.bazel # build/src/JewelMavenArtifactsBuildTarget.kt # intellij.idea.community.main.iml # platform/platform-api/resources/messages/IdeBundle.properties # platform/platform-resources/src/META-INF/PlatformExtensions.xml
…rectories (#237) * add git menu items back to the file/directory right click menu. like with the editor view right click menu, these git-related options have been moved up to the top-level menu * remove git options that aren't specific to the current file from the right click menus. they are still accessible from the git dropdown menu at the top of the screen. --------- Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 3669367)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit f3a1396)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit d897445)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 541afff)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit d8f0a62)
…e with the markdown extension (#255) Co-authored-by: detachhead <detachhead@users.noreply.github.com>
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 9d09766)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 8b6046b)
* i'll make the logo (v2) * center the top of the readme * update readme screenshot --------- Co-authored-by: detachhead <detachhead@users.noreply.github.com>
DetachHead
added
the
release branch
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 0f8f631)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 9ddf2a2)
i don't think these were actually being used at all since rebased already disables telemetry Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 8a9bf9c)
Co-authored-by: detachhead <detachhead@users.noreply.github.com> (cherry picked from commit 54bd3f6)
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.