Commit Graph

435 Commits

Author SHA1 Message Date
Daniil Ovchinnikov
823e985f18 API dumps: re-generate dumps
GitOrigin-RevId: b5cec844cbfe3313723404f7a85b590c25350b41
2024-10-04 21:20:21 +00:00
Vladimir Krivosheev
a9e7930abe bazel - build lang-impl
GitOrigin-RevId: c4c4dce20bd6e4046644f95f6e7b3f437c51668d
2024-09-27 13:47:17 +00:00
Vladimir Krivosheev
a1210118c0 bazel - fix JPMS, exports and internal
GitOrigin-RevId: 3dc80a9ee01e1900c0cebc24b2d08f04f93ddeff
2024-09-25 19:05:37 +00:00
Vladimir Krivosheev
4eb9b78b78 use bazel to build platform-impl
GitOrigin-RevId: b5bbc75323a08c7674777e512dcfd988ceb4461f
2024-09-22 17:01:28 +00:00
Vladimir Krivosheev
834bd75254 run jps-to-bazel by Bazel, compile platform using Bazel
GitOrigin-RevId: 3774d5adc404b02036f70b7cc35c9e60fdb5d84c
2024-09-21 00:54:17 +00:00
Aleksey Pivovarov
bca5ef6d62 diff: expose DiffRequestFactoryImpl methods via its interface
GitOrigin-RevId: 451f79c7436dbe722069d1e8c12e512091f7a7bc
2024-08-28 04:35:20 +00:00
Ivan Semenov
06d6da671c [diff] add equals/hashCode to ListSelection
GitOrigin-RevId: 01959b04b145db98b2ba973c31ccad04ed62a2bd
2024-08-26 20:27:21 +00:00
Ilia.Shulgin
a805a51ce8 [diff] IJPL-101084 Show path relative to project root in diff window
All diff requests created via `ChangeDiffRequestProducer#createRequest` will contain `DiffUserDataKeysEx.VCS_DIFF_RIGHT_CONTENT_TITLE` allowing to show short revision and file path relative to a project root

The same applies to diffs created via `MergedChangeDiffRequestProvider`

GitOrigin-RevId: 60ecb120e8751a6a211d2917838d6403a6003dfd
2024-08-17 09:50:36 +00:00
Aleksey Pivovarov
0f0a21de9a IJPL-160366 IDEA-104009 patch: suggest switching into editable view for patches
GitOrigin-RevId: aa883807ee8fe1ff50dc609420899d8c3071eb5f
2024-08-16 16:34:28 +00:00
Aleksey Pivovarov
03f0040961 IJPL-101036 diff: support syntax highlighting in unified diff viewer
GitOrigin-RevId: 12e9af69f69404aee0613e46e8460256a5709828
2024-08-08 15:21:05 +00:00
Aleksey Pivovarov
b4ca6c7ea3 diff: simplify DataContext of a DiffRequestProcessor
Avoid computing data context for a DiffViewer component twice.

GitOrigin-RevId: 3b61fc4840d7cdb42cce76b22601ebd1f021d682
2024-07-13 19:22:13 +00:00
Daniil Ovchinnikov
7e3390a939 IJPL-150347 treat @NonExtendable classes as effectively final
GitOrigin-RevId: 273fb2a330cb67183be538890ae5c2c53aa9acf8
2024-07-08 23:18:28 +00:00
Chris Lemaire
0a34a0f074 [diff] Add an option to include diffs in history only when the diff is still open (IJPL-157316)
GitOrigin-RevId: ed8dab6b00e5af06207c2d1772996a0964509ad2
2024-07-02 21:01:51 +00:00
Chris Lemaire
c580b1842a [diff] Make registry option to include diffs in nav history a setting (IJPL-157316)
#IJPL-157316 Fixed

GitOrigin-RevId: c10d12ba1b68944f0f2b85e361b54856c091ecd7
2024-07-02 21:01:51 +00:00
Gregory.Shrago
4d5b8847eb migrate getData to uiDataSnapshot: vcs
GitOrigin-RevId: 0dc4a83894cd35777959eab7235d2603117a1c9e
2024-06-26 02:39:39 +00:00
Aleksey Pivovarov
3a5e4a850f diff: remove '@Internal' annotation from classes already used by plugins
GitOrigin-RevId: 898bd435f93505b0a94615cfe5041cd5de5fb507
2024-06-20 13:21:34 +00:00
Aleksandr Krasilnikov
36120c5533 merge: cleanup
GitOrigin-RevId: 04a17ccc9c19f93cd7e399834f8673a54ca57a08
2024-06-19 17:39:40 +00:00
Aleksandr Krasilnikov
286ea02437 IJPL-156230 merge: update balloons ui
GitOrigin-RevId: 30ee775078f295f69cdeb39cc14879223c4f22a0
2024-06-06 18:44:45 +00:00
Dmitry Zhuravlev
0d59b47abd diff: move GenericDataProvider to API module
GitOrigin-RevId: fcb31df1c259c95f867215df1e5c1a048d46e118
2024-06-03 13:46:53 +00:00
Dmitry Zhuravlev
1375111fb7 diff: review api in the diff-api module
GitOrigin-RevId: a99e0dd3ff78e49340c7f28d3b436c63c926d4e7
2024-06-03 13:46:28 +00:00
Daniil Ovchinnikov
6226776bd0 IJPL-148997 exclude non-abstract toString() from the API dump
GitOrigin-RevId: 6352bbb374532bca296d08131ae50083f69e46c0
2024-05-29 00:05:31 +00:00
Aleksandr Krasilnikov
72e802260b [diff] Add operation for reverting resolving merge chunk
GitOrigin-RevId: 7013f74948270cc0bd5cdc9f78e6775f2cc9c470
2024-05-08 16:27:18 +00:00
Aleksey Pivovarov
f0781aec65 diff: cleanup formatting
GitOrigin-RevId: 8f4c42f1b54e46f4496b3dc88b04d5089ff14311
2024-04-24 12:34:31 +00:00
Denis Zaichenko
ddca49fccf IDEA-22318 API changes.
GitOrigin-RevId: 3ced3b29aee69809ab67cf40cb214363ed39c7da
2024-04-19 17:09:28 +00:00
Denis Zaichenko
321a940823 IDEA-22318 Merge VCS conflicts in "import" statements
GitOrigin-RevId: 6a228e8d5d16637cdcf53369a2818cda014e9214
2024-04-19 17:09:23 +00:00
Aleksey Pivovarov
c4043846d0 diff: deprecate the diff.LineTokenizer
GitOrigin-RevId: 16869ac88d2cd87b85d734e6cc05bc6b9e2cc1d6
2024-04-10 14:16:02 +00:00
Daniil Ovchinnikov
5ec66a02cd IJPL-797 API dump: generate api-dump-unreviewed.txt and exposed API lists [2/4]
GitOrigin-RevId: 1f2fcb6d02f6bf1bb52d4063ac8b13ba953b6697
2024-04-09 02:21:27 +00:00
Aleksey Pivovarov
13387d3b20 diff: fix progress title capitalization
GitOrigin-RevId: 0b378b502d8255a3967abf141ecb19fc5d20860c
2024-04-03 13:23:29 +00:00
Aleksey Pivovarov
0b696be98d diff: introduce extendable provider instead of casts to DiffViewer implementations
GitOrigin-RevId: 1a8edd0dc9a8cc8f8dac4bd8494364f4254d45ad
2024-03-14 19:28:38 +00:00
Aleksey Pivovarov
7640e17dbf diff: cleanup - rearrange
GitOrigin-RevId: 52b1291ce8c88973543cd24f80a4221161ce660d
2024-03-14 19:28:38 +00:00
Dmitry Zhuravlev
2d0d7a6a9c diff: add the ability to search inside diff changes (IDEA-147934)
GitOrigin-RevId: 4f37948423c46088eddceca90e5bd05969da19fc
2024-02-19 21:05:25 +00:00
Denis Zaichenko
cac01922a3 IDEA-123224 Allow Ignoring Folders and Files in File/Folder Diff Viewer
GitOrigin-RevId: 8835404367ab021d3c0200abd96f5d7824d903e5
2024-02-19 16:55:14 +00:00
Aleksey Pivovarov
95cf73de49 combined-diff: move all-in-one diff Registry key to Advanced Setting
GitOrigin-RevId: 9636fbd86c44ea598b0df05bdc6222700e7857b6
2024-01-29 20:04:29 +00:00
Dmitry Zhuravlev
12f6df4c7e combined-diff: implement global text search
GitOrigin-RevId: faf30be3cb91e466512c0f2aa940f26cb6bf0091
2024-01-29 19:03:56 +00:00
Aleksandr Krasilnikov
6f904fe556 IDEA-339186 [all-in-one] all-in-one: files counter
GitOrigin-RevId: 7207cc3c6d9c16dcdeacad4400f1391e2db9563a
2024-01-24 16:09:07 +00:00
Aleksandr Krasilnikov
d4c6220e9f [vcs] cleanup
GitOrigin-RevId: 0b682968a9c34e5b8d60eaba01a7c8d22c8491d0
2024-01-24 16:09:01 +00:00
Denis Zaichenko
0084ea6450 IDEA-151554 diff: better handling of added-added conflicts
GitOrigin-RevId: 9804b5988ed1c41f46a0687c04bea729d2d0df4d
2024-01-17 17:08:39 +00:00
Aleksey Pivovarov
b2ec20e510 IDEA-341807 diff: show notification for invalid files
GitOrigin-RevId: 1897c5a863f867b7d762596cf0b0977962d90f24
2024-01-11 14:40:15 +00:00
Bogdan Kirilenko
f708aba9c2 [jupyter] diff -> fixes after the code review IJ-MR-122608
GitOrigin-RevId: fcac6454383ae24f30e5b78cb37d60d5f35a1448
2024-01-08 21:06:54 +00:00
Bogdan Kirilenko
9f29eadd0e [jupyter] PY-20132
added user data keys for jupyter diff editors such that "expand by default action" is disabled and line marker is always visible in the EditorGutterComponentImpl even if intersects folded region

GitOrigin-RevId: a1d2f11bca914738a68bf89c2e59b67a679cc059
2023-12-19 13:28:30 +00:00
Pavel Gromov
320453fa2c [diff-tool] Move text to bundle
# IDEA-305392 Fixed

GitOrigin-RevId: 469e167234d138e25e1bdcfc371d4cc96cae987d
2023-10-24 16:29:32 +00:00
Aleksey Pivovarov
ca95476cda diff: handle 'unified-split' switching for custom tools in combined diff
GitOrigin-RevId: 82039e212960a4376518875eb27b55c6e175a823
2023-10-17 15:33:11 +00:00
Aleksey Pivovarov
5176601b28 diff: extract common interface
GitOrigin-RevId: 6300fd1cb79106a3bc958599712f4aa260ae996a
2023-10-17 15:32:50 +00:00
Andrey Cherkasov
094b9fc6c1 The "Simplifiable service retrieving" inspection: cleanup
Merge-request: IJ-MR-116656
Merged-by: Andrey Cherkasov <Andrey.Cherkasov@jetbrains.com>

GitOrigin-RevId: d42dd51ec49b4176265baf2bb69df04a964418a3
2023-10-17 13:36:11 +00:00
Aleksey Pivovarov
6f8350fd7a vcs: add success indication to 'Copy to Clipboard' action for non-applied ranges
Follow-up: ab279348262476a59ce85f429cb0f5f149697cc7

GitOrigin-RevId: a8b3ec079f6fc286be98cf5076ed9960c61cfc3d
2023-09-26 12:28:08 +00:00
Aleksey Pivovarov
00ecca1f10 vcs: add 'Copy to Clipboard' action for non-applied ranges
GitOrigin-RevId: ab279348262476a59ce85f429cb0f5f149697cc7
2023-09-25 18:32:27 +00:00
Aleksey Pivovarov
831871673d IDEA-331151 diff: better changes counter in status label for partially excluded ranges
GitOrigin-RevId: 9230068f1a539042b16214eaf3fa07020deb0f6a
2023-09-11 14:14:56 +00:00
Aleksey Pivovarov
b5c5a4c7b3 IDEA-327951 diff: improve window title for "Compare with Editor"
GitOrigin-RevId: c1133cb657bb5f10b7632bbe10f277d3b3216e43
2023-08-09 17:15:55 +00:00
Aleksey Pivovarov
0bfebb7d3b IDEA-188410 diff: add tooltip to exclusion indicator for ignored lines
GitOrigin-RevId: ab3fb59a75b1620eabaf43a23120fe840f71ffdd
2023-06-19 18:13:34 +00:00
Tagir Valeev
eceaae8757 Enhanced switch used; other minor warnings fixed
GitOrigin-RevId: 36dd4522e953681b2fc3463968d172d2bf6453bf
2023-06-13 13:42:37 +00:00