Commit Graph

388 Commits

Author SHA1 Message Date
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
Nikolay Chashnikov
9b16a6d5f2 [platform API] mark unused API which was deprecated in 2022.3 and earlier versions for removal (IDEA-312594)
GitOrigin-RevId: 83ef88a5d857a404abde02189c3c5f4c531b54c5
2023-06-12 11:00:51 +00:00
Aleksey Pivovarov
f925aa7c95 diff: javadoc
GitOrigin-RevId: 969a8344f37d6635d15e0544680e45a5a27cf8c9
2023-06-12 10:21:01 +00:00
Dmitry Avdeev
67586ca25d IDEA-305061 Not localized: Settings | Tools | Diff & Merge | External Diff Tools | Add an external tool: dropdown values for "Tool group"
GitOrigin-RevId: 69f9e7656f2f451bfcd7a9549ded5cb709cab6f3
2023-06-03 15:45:13 +00:00
Vladimir Krivosheev
227d75a1fc don't extend DynamicBundle
GitOrigin-RevId: 49cbebd629a92877dbeeffba8d97b0631fb9407e
2023-05-05 09:46:42 +00:00
Dmitry Matveev
eef142d395 Fix typos 'can not'
GitOrigin-RevId: bd10e24098a4eaf1b113210237e169cf9c676745
2023-04-18 11:03:00 +00:00
Aleksey Pivovarov
375517c472 diff: javadoc
GitOrigin-RevId: fe595706975982eefadd5424bb4c62e94b0490c2
2023-03-24 15:24:29 +00:00
Aleksey Pivovarov
f87a13c2a9 diff: javadoc
GitOrigin-RevId: 6d4741a21dccba1f7c59cbc5b94883dc41c36c9d
2023-02-06 19:53:15 +00:00
Vladimir Krivosheev
57764d700b mark classes final
GitOrigin-RevId: 6414b6f2119c82c7567987dd30b35cab5491d9e2
2022-12-30 06:58:01 +00:00
Aleksey Pivovarov
36571e4e7f vcs: drop DiffVcsFacade
GitOrigin-RevId: c14f5fa4918ecd1fad007c599fdeb9dc511c34bd
2022-11-28 15:31:09 +00:00
Aleksey Pivovarov
6bafa5d0ea dbvfs: remove UrlFilePath from the platform
We remove UrlFilePath usages from VCS for the sake of simplicity,
leaving 2 concrete applications in lvcs where necessary (Difference.java).

These commits are reverting huge chunks of
b259a3928d21f99c68ea022981e6d2d445a57cc5 and c96e98e06ba9b81122f0eecc43a1df817af12f01

GitOrigin-RevId: 179e6e45e18917ce2d495f6e85e1e373b9574498
2022-11-28 15:31:07 +00:00
Aleksey Pivovarov
7eade0f266 diff: drop intermediate FilePath wrapper
Simplify code flow by excluding UrlFilePath from consideration.

GitOrigin-RevId: 7371d5296b62010231ff90a364382c5b97f25a7f
2022-11-28 15:31:04 +00:00
Aleksey Pivovarov
8909f4bff1 diff: add tooltip to progress spinner
GitOrigin-RevId: d65f08612dbb15ec3571335fe2bb56d1ab728e4b
2022-11-22 16:48:04 +00:00
Igor Slobodskov
27570e71c2 [DS-4000] undo quickfix, remove CUSTOM_GUTTER_AREA_FUNC
GitOrigin-RevId: 11b0b46e0656ce94d9ce37408aa64e6da05a8e6b
2022-11-21 14:09:50 +00:00
Aleksey Pivovarov
de9ddf6ba9 vcs: update copyright
GitOrigin-RevId: 44f42335f049c548b8d2c4e5c24ca43f4343d00b
2022-11-18 12:05:11 +00:00
Aleksey Pivovarov
ef6c104bfc vcs: move from [util] to [diff]
GitOrigin-RevId: aceb91d1c598d22cba97256eb5707428685f5fd9
2022-11-18 12:05:03 +00:00
Alexey Kudravtsev
725f22cff8 add correct wildcards to method signatures
GitOrigin-RevId: 746a7473532fe4892901196f495997cfbc78475f
2022-11-18 03:23:59 +00:00
Alexey Kudravtsev
c7d42826db add correct wildcards to method signatures
GitOrigin-RevId: 9534fb26e3f625a097c747938c564800895c14b5
2022-11-17 13:44:42 +00:00
Igor Slobodskov
1cc64081d3 [DS-4000] customize how changed lines are shown
Move colored stripe to the right side of gutter in Jupyter Notebooks.

Merge-request: IJ-MR-98303
Merged-by: Igor Slobodskov <Igor.Slobodskov@jetbrains.com>

GitOrigin-RevId: 857b73e9723bb75e4f4afed2111c2d7e507c0965
2022-11-11 19:53:33 +00:00
Aleksey Pivovarov
2ca107fb5d IDEA-291879 diff: display output from test runs of External Diff Tool
GitOrigin-RevId: da8b9fe56dc936c0d4ba7ff2af6f91c4061834a7
2022-10-04 15:45:12 +00:00
Tagir Valeev
0577e2f137 Text blocks used in production code
GitOrigin-RevId: f9f5c027037972fd02aa6d3e262bb175e2b676b3
2022-09-27 11:30:34 +00:00
Julia Beliaeva
17c61fbc81 [git-index] add a registry key to switch navigation from diff to the staging area content off
IDEA-268267

GitOrigin-RevId: 690e1d793ac14e994fb7e64a4372c25db71c9625
2022-09-09 16:49:21 +00:00
Aleksey Pivovarov
9bf40c2345 vcs: cleanup - fix yellow code
GitOrigin-RevId: fc108e4c4931fa20c931a444d98b7150ff05537a
2022-09-07 13:23:33 +00:00
Nikolay Chashnikov
5cd0ac836c [platform] cleanup: remove unused deprecated API (IDEA-295370)
GitOrigin-RevId: 8b942eb4aa33f096edcdde474a1beeed4804a05b
2022-09-06 12:45:36 +00:00
Aleksey Pivovarov
d00baa52dc IJPF-CR-6786 git: update bundled strings - prefer 'Cannot'
GitOrigin-RevId: b9f51a4e8ce02509aa7df364802ebb0dfdc06ce8
2022-09-05 11:54:51 +00:00
Aleksey Pivovarov
06be9768a2 VCSP-85 diff: expand folding on separator wave click in gutter
GitOrigin-RevId: 2f38e62bd2ec50599fb3bd8b592e58db67378136
2022-07-15 12:31:42 +00:00
Aleksey Pivovarov
47bb661387 vcs: ChangeViewDiffRequestProcessor - migrate Stream to JBIterable
GitOrigin-RevId: eb44da6b18f44005755a3f438ee1c598768c5c47
2022-07-06 13:08:24 +00:00
Aleksey Pivovarov
e4a9aab781 vcs: update JavaDoc
GitOrigin-RevId: 9403a88c95a9a095bb14542eaa5867827c3ec72b
2022-06-21 10:21:08 +00:00
Aleksey Pivovarov
4941f54c5c vcs: specify FileType for diff request producers
GitOrigin-RevId: cd96b9d6e90c56cec154a5d6287ba251e8e5ffb1
2022-06-20 07:39:40 +00:00
Aleksey Pivovarov
17c94c7e0f IDEA-294551 diff: fix External Diff Tools not working for test failures
GitOrigin-RevId: b351009e48abafd67630c8b67f99800239ded846
2022-06-20 07:39:37 +00:00
Aleksey Pivovarov
911c251d35 IDEA-294662 diff: prevent IDE from opening too many files in an external tool
GitOrigin-RevId: ea3b73ff9aa8f274dcab88662b1feb1493984e6d
2022-06-19 18:59:13 +00:00
Pavel Gromov
4cc59b9c3e [external tools] Remove unused properties
GitOrigin-RevId: 88ecf259db5fff10e87267f415b005dfb61c1b80
2022-05-24 14:47:27 +00:00
Aleksey Pivovarov
ff5a0e00a2 diff: ensure ListSelection has no nulls
GitOrigin-RevId: 74da3daaa3eed696f6f1ea05935aa8e69b917c10
2022-05-23 16:02:21 +00:00
Aleksey Pivovarov
43ec8ab997 diff: improve javadoc for DiffRequestChain
GitOrigin-RevId: 88057d6861d6b751d7f1209c63f0b5c48b32ff37
2022-05-23 11:30:09 +00:00
Aleksey Pivovarov
a22a5ba644 IDEA-291970 diff: add support for explicit multiple selection for External Diff Tools
GitOrigin-RevId: d9c924ff6d97f3629cc2646372bb4c2896d2f758
2022-05-23 11:30:03 +00:00
Aleksey Pivovarov
d147e19e21 diff: continue deprecation of DiffRequestChain.setIndex
GitOrigin-RevId: 5c28c7311c9d52b70f349e087dd6c4b7910b9505
2022-05-23 11:30:00 +00:00
Aleksey Pivovarov
4ecdbcc016 IDEA-291970 diff: process External Diff Tools for empty selection in log
* Handle it as a single selection of the first element

GitOrigin-RevId: 5a563765f21cfa2dd22a1b16f3cdce170fd4829a
2022-05-23 11:29:57 +00:00
Aleksey Pivovarov
6b257253db IDEA-69499 diff: fix External Diff Tools - do not mix up Name and DisplayName
GitOrigin-RevId: 7deb35f5c737145474f8294bcb7a0c8919ec7e4a
2022-05-20 08:45:31 +00:00
Aleksey Pivovarov
1add025a56 merge: javadoc, assertions
GitOrigin-RevId: 6afc23c6c456945c66eb5a43363fdbd0b0a18cc5
2022-04-27 18:12:11 +00:00
Aleksey Pivovarov
5ef47b2e2e Revert "merge: remove dead code"
This commit reverts 6f5cc65f06e0593ef478dbc26e868cf838405b6f

GitOrigin-RevId: 7b1d2b4c55980495f9afe5e7a4424a7ad1c786ef
2022-04-27 18:11:12 +00:00
Aleksey Pivovarov
ddb086d6ca merge: remove dead code
GitOrigin-RevId: 6f5cc65f06e0593ef478dbc26e868cf838405b6f
2022-04-26 19:14:10 +00:00
Pavel Gromov
6308245b7b [diff] Remove unused property
GitOrigin-RevId: 240111a8af6f0118b906701a38405dacd6417cd5
2022-04-01 15:30:16 +00:00
Pavel Gromov
4145207f36 [diff] Fix title in add dialog
GitOrigin-RevId: b16bfdb4b561795b62fa84aeeb55eef4b322bdc0
2022-04-01 15:30:14 +00:00
Pavel Gromov
d7d543e215 [diff] Remove redundant "External" from column names (IDEA-291023)
GitOrigin-RevId: c4aad751b3aa28e214249982191ed81a60ac44a4
2022-04-01 15:30:12 +00:00
Pavel Gromov
ac463535ac [diff] Fix-up! Fix title capitalization warning. Remove extra messages
GitOrigin-RevId: f0e8d9b770a504d4059a996547ed210568660f96
2022-03-14 13:37:08 +00:00
Alexander.Kass
e2dfb3bf28 dbvfs: fix local history (fix vcs:// files)
GitOrigin-RevId: b259a3928d21f99c68ea022981e6d2d445a57cc5
2022-02-24 10:24:47 +00:00
Alexander.Kass
26cd49201e dbvfs: fix local history
GitOrigin-RevId: c96e98e06ba9b81122f0eecc43a1df817af12f01
2022-02-22 00:08:35 +00:00
Pavel Gromov
5b57b8d021 [diff] Clean-up external tool UI panel (IDEA-69499)
* Update "add dialog" for external tool
* Add autocomplete for tool name field
* Add expand/collapse a group with double click
* Fix: disable tree and table when checkbox is disabled

GitOrigin-RevId: f0fc55460a625d0324169fb69cfc36871e72fcd9
2022-02-21 21:38:15 +00:00