Commit Graph

2989 Commits

Author SHA1 Message Date
Gregory.Shrago
05070ee65f update api-dumps
GitOrigin-RevId: c430d8faf7535b38de154de51def60231c8643c0
2024-06-04 23:28:22 +00:00
Gregory.Shrago
2796f98df1 IJPL-888 Migrate more components to EdtDataProvider
GitOrigin-RevId: 5458f2f54548c584a4fc5b7435c1d1edab4559f0
2024-06-04 23:28:22 +00:00
Dmitry Zhuravlev
0d59b47abd diff: move GenericDataProvider to API module
GitOrigin-RevId: fcb31df1c259c95f867215df1e5c1a048d46e118
2024-06-03 13:46:53 +00:00
Dmitry Zhuravlev
ef6716dfc9 diff: remove unused code
Follow-up: 909a33fb3c9df28b4bffe77573601ad28e8fb45d

GitOrigin-RevId: 1084c4bb3f1a4970f69b740364a87814776649d5
2024-06-03 13:46:48 +00:00
Dmitry Zhuravlev
814b9063dc diff: extract utils from internal actions
GitOrigin-RevId: c328d9f259e6e6454e3fbac9c45d7fa6bece370c
2024-06-03 13:46:43 +00:00
Dmitry Zhuravlev
eb58c8c554 diff: review api in the diff-impl module
GitOrigin-RevId: 491358cb340337cf8a95be0d063334f4c76c7920
2024-06-03 13:46:33 +00:00
Maxim.Kolmakov
71168cb8a9 IJ-CR-135039 Replace usages of PlatformTestUtil.newPerformanceTest with PerformanceTestUtil.newPerformanceTest
GitOrigin-RevId: 4edcfadc23f7305d68b8c08cd6ae634ee4869a2e
2024-06-03 10:14:22 +00:00
Ivan Semenov
1db0d22cd1 [collab] create and dispose document tracker in a coroutine
Disposing in `invokeOnCompletion` does not guarantee proper threading

#IJPL-155854 Fixed

GitOrigin-RevId: fecb472730a6ffa288e7c364cede715a36337e89
2024-05-29 17:26:33 +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
e142ecb740 IJPL-99522 Fix combined diff growing in case of split view
GitOrigin-RevId: 2e63ee4d528b041ddab799c4cc7a4ac48b2e9415
2024-05-28 12:04:20 +00:00
Andrey.Matveev
2ae879b86a PY-71150 Change api dump
GitOrigin-RevId: de9bfc42a1ce8dc05533e5192bdf6ff389cb9a37
2024-05-23 12:55:03 +00:00
Andrey.Matveev
5bd8aaca65 PY-71150 Avoid creating documents
GitOrigin-RevId: a3b59c128f62f6203553de064d9497a71ffff409
2024-05-23 12:55:03 +00:00
Aleksey Pivovarov
ebf4260c84 diff: update api-dump-unreviewed.txt
GitOrigin-RevId: 0e7af8ba6b919dfb7a692afa956d26a01676ecc4
2024-05-21 12:29:27 +00:00
Aleksey Pivovarov
2e4c25460c diff: mark CombinedDiff implementation as internal
GitOrigin-RevId: 69aaafc787c685cf7d0fef14d063429257071614
2024-05-21 12:29:27 +00:00
Aleksey Pivovarov
eaf3523b0b diff: deprecate EditorTabPreview
GitOrigin-RevId: 97470ed54b1591a3a94f103b780ada17e5a9e402
2024-05-21 12:29:27 +00:00
Aleksey Pivovarov
778ef55ac5 diff: mark CombinedDiff API as experimental
GitOrigin-RevId: 3313ac6ce8ae9a16929f70dac263b5a1ea7faa0a
2024-05-21 12:29:27 +00:00
Vladimir Krivosheev
2c705c974a IJPL-796 cleanup
GitOrigin-RevId: 7f553aa487e6b8513f6657a2aa8a29a3738982ce
2024-05-20 12:47:49 +00:00
Denis Zaichenko
734b887caf FUS-4405 fixed statisticks for 'merge.resolve.import.conflicts' event
GitOrigin-RevId: a4b18d91ef32ae5ed050c364703e2f520b69b426
2024-05-16 20:06:53 +00:00
Alexander Lobas
cde41ba2b4 IJPL-49419 Move old UI to plugin (fix tests)
GitOrigin-RevId: 66c2ddecc30a03803accdd02e59094ff99065e44
2024-05-12 09:26:05 +00:00
Gregory.Shrago
5980fec9c3 add knownIssue section for top issues
GitOrigin-RevId: 94baf82c1e7f25f6a76194abc9416a5fd83db719
2024-05-09 00:39:13 +00:00
Daniil Ovchinnikov
63058d231c IJPL-149498 rename namedChildScope -> childScope
GitOrigin-RevId: 8eb7b8706902a812aa9e6267e73b9884a9e127fe
2024-05-08 19:45:10 +00:00
Aleksey Pivovarov
51d5167d1b IJPL-149459 IDEA-346408 diff: avoid re-implementing the ToggleAction icon
'isMultiChoice' flag can now be explicitly disabled.

GitOrigin-RevId: 9d9b583196cb235e3cb0be241741dc2792529e7b
2024-05-08 18:49:35 +00:00
Aleksandr Krasilnikov
7f2e9185f1 [diff] Fix ApiCheckTest
GitOrigin-RevId: bec932a247eea96926572a0afc97c6ccdf54f765
2024-05-08 16:27:18 +00:00
Aleksandr Krasilnikov
9cd8901a41 [diff] Highlight AI resolved chunks in merge viewer
GitOrigin-RevId: 261bc23109d56d4970f9cc2b9022b9729e77a35f
2024-05-08 16:27:18 +00:00
Aleksandr Krasilnikov
72e802260b [diff] Add operation for reverting resolving merge chunk
GitOrigin-RevId: 7013f74948270cc0bd5cdc9f78e6775f2cc9c470
2024-05-08 16:27:18 +00:00
Aleksandr Krasilnikov
f6a01af1db [diff] Use TextMergeChange.reinstallHighlighters instead of manual destroy/install
GitOrigin-RevId: 4fd9239cb5d35bfa7ba767a6d192d679f4cb65fa
2024-05-08 16:27:18 +00:00
Aleksey Pivovarov
58abcec127 EA-1175656 lst: fix access to a protected method
GitOrigin-RevId: d6f856cc6dd2dba5bd59901c6b3421f14740dda0
2024-05-07 16:52:32 +00:00
Daniil Ovchinnikov
b03b92e140 IJPL-148490 clean up empty file-classes from existing dumps
GitOrigin-RevId: ca701387e601a76ae25a3a31ca0a02432126e0fb
2024-04-30 20:39:42 +00:00
Aleksey Pivovarov
8914f12ffd diff: reduce CombinedDiff dependency on vcs-impl
GitOrigin-RevId: 19e6eb51aa488e160179b02c7b4c1f3ad5105a6e
2024-04-30 13:41:25 +00:00
Dmitry Zhuravlev
67d6784783 combined-diff: update bottom border on focus
Consider the previous state.

GitOrigin-RevId: b95cb364bf69b534f5baa1402b8013f3f28fd91c
2024-04-29 20:28:28 +00:00
Dmitry Zhuravlev
94359e9ee0 combined-diff: rounded bottom corners for the sticky header
GitOrigin-RevId: 9e2ef6705d276d78a100461be3c3d378e7ed183c
2024-04-29 20:28:28 +00:00
Vladimir Krivosheev
3efe3553ff IJPL-148294 mark classes as internal, fix IntelliJProjectPackageNamesTest
GitOrigin-RevId: b8848d23cb161f066a3737e051087aa1272554e1
2024-04-29 15:46:03 +00:00
Vladimir Krivosheev
14876ac461 IJPL-148294 don't expose GetFromVersionControlAction
GitOrigin-RevId: 07ec1f7ad0622e6d3caddf16e397f7a7edf037a6
2024-04-29 15:45:40 +00:00
Vladimir Krivosheev
0590da61da IJPL-148294 mark CombinedUnifiedDiffTool as InternalIgnoreDependencyViolation (later we can move diff from core, but not now)
GitOrigin-RevId: 5bbb0e1200ab638e90c18915ae80dca02ae00525
2024-04-29 15:45:30 +00:00
Vladimir Krivosheev
e2867c159c IJPL-148294 VCS log uses old icons (part 3, depends on vcs-impl extraction)
GitOrigin-RevId: cd22d804742cfd20387fc34e990db8f240a2246b
2024-04-29 15:44:32 +00:00
Vladimir Krivosheev
871630131f IJPL-973 fix access to protected members from another module
GitOrigin-RevId: 09ff76e2a216fb342ee0c6aefebf38bcc0d99657
2024-04-29 15:44:22 +00:00
Vladimir Krivosheev
55fada02b1 IJPL-973 cleanup
GitOrigin-RevId: 2828170539b6240b94a9fbe05f1d42e988a96cfb
2024-04-29 15:44:15 +00:00
Dmitry Zhuravlev
b0de341627 combined-diff: use default diff open in editor action in the block header (IJPL-100514)
Invoking this action from a combined diff block header (e.g., by mouse click) will navigate to the corresponding line with caret.

GitOrigin-RevId: 4aadb15dae846eca2800995c4efd03706065c3fd
2024-04-29 14:11:48 +00:00
Aleksandr Krasilnikov
5dc68b6802 [diff] Fix ApiCheckTest
GitOrigin-RevId: 1b2b6d13df4548d66f49efb360493361dfb3bcac
2024-04-26 00:19:28 +00:00
Aleksandr Krasilnikov
e21fc60458 [ai] Resolve merge conflicts using LLM
GitOrigin-RevId: 0d90f586aae02ba8a1b84ffbcdacc43ccb093e86
2024-04-26 00:19:28 +00:00
Aleksandr Krasilnikov
8350c1c068 IJPL-100375 [diff] Add an MergeThreesideViewer ability to control external background operation execution and adjust UI
GitOrigin-RevId: 64be81af5aebad653b0e725b7242b3d14229153e
2024-04-26 00:19:27 +00:00
Aleksandr Krasilnikov
2116643344 IJPL-100375 [diff] Add an ability to extend MergeThreesideViewer toolbar with custom action
GitOrigin-RevId: dc324ed8a6e60d12a404c759d1d79efdf3292d3b
2024-04-26 00:19:27 +00:00
Alexey Kudravtsev
03552fe429 rename to avoid confusion with existing classes
GitOrigin-RevId: 497b7e29c0b6411bf3a73f54c444d53a7c6c74ec
2024-04-25 17:04:48 +00:00
Aleksey Pivovarov
c416ed73ef lst: cleanup painting
GitOrigin-RevId: 836ad4c2b1d0d06b792faf09a35e9d9f5cf132a0
2024-04-24 16:49:25 +00:00
Denis Zaichenko
d2d6270114 IDEA-22318 cleanup and some fixes.
Got rid of getApplyChangeRunnable() method. Use direct method call instead.
 Removed extra calls to resolve import changes.
 Added auto resolve for import changes for some cases.
 Api changes.

GitOrigin-RevId: f0237102a36eee996ad85337199482b23ffdcbeb
2024-04-24 12:34:35 +00:00
Denis Zaichenko
633727370e IDEA-22318 cleanup
GitOrigin-RevId: b1dc14c05c87d2d21cbd284b43e0375426ec0ca4
2024-04-24 12:34:33 +00:00
Aleksey Pivovarov
f0781aec65 diff: cleanup formatting
GitOrigin-RevId: 8f4c42f1b54e46f4496b3dc88b04d5089ff14311
2024-04-24 12:34:31 +00:00
Dmitry Zhuravlev
1c49902ff5 combined-diff: add FUS statistic for toggle block collapsing
GitOrigin-RevId: f5f2acf259944286d4a4e941188a4a66a3272888
2024-04-23 18:37:51 +00:00
Dmitry Zhuravlev
ba20dea3a8 combined-diff: update the sticky header bottom border
GitOrigin-RevId: e8d16f4389c59a80b6f1648cb10b1c63e7bfeec0
2024-04-23 11:46:27 +00:00
Dmitry Zhuravlev
423ee56edf combined-diff: refactor: remove casts to specific blocks
GitOrigin-RevId: 683a5c252f14b71f3498334c81a6db0b8973dee1
2024-04-23 11:46:23 +00:00