Commit Graph

231 Commits

Author SHA1 Message Date
nik
c62e7180af [diff] move diff-related classes from platfrom.ide* modules to platform.diff* modules
GitOrigin-RevId: f9470bc88be2b131ea74f995b16a2c9e577d408e
2020-02-19 15:18:15 +00:00
Aleksey Pivovarov
67143dc458 diff: javadoc
GitOrigin-RevId: f6120ef56db047bd5693a7518237ac6851607dae
2020-02-19 12:36:22 +00:00
Aleksey Pivovarov
5f2706e9cd vcs: show diff window immediately for "Compare with ... Version" actions
GitOrigin-RevId: 9b1309bbe4cfb40c1c4db50704da01fc066fcc40
2020-01-31 09:34:55 +00:00
Tagir Valeev
78a91459c4 Array annotations changed to type-use style (not compilable now)
GitOrigin-RevId: 68aa4ba200618083684599228e13dfdba35967a4
2020-01-16 08:11:51 +00:00
Kirill Likhodedov
88e6c342f1 Let @CalledInAwt & Co be placed on a parameter
A lambda can be passed as a method parameter.

GitOrigin-RevId: e66b936c88e0885bee0a23100efc7bb2fa0f6380
2019-12-24 14:42:58 +00:00
Aleksey Pivovarov
d2af5f770d diff: move diff color options into [diff] module
GitOrigin-RevId: 2558e59ad133e81b7b032b6dac0a90eb63947bab
2019-12-09 12:31:29 +00:00
Elena Shaverdova
bc922c0834 Revert "Forcing generics on DiffElements" IDEA-CR-54193 WI-27162
This reverts commit cbf3b57c

GitOrigin-RevId: 8162c394fb08d374a0054844e26aee00c58c7dd1
2019-11-07 02:40:58 +00:00
Elena Shaverdova
aa12496429 Forcing generics on DiffElements
GitOrigin-RevId: cbf3b57c128e2135522e91bc6dba09c06aa05f31
2019-10-24 18:35:56 +00:00
Alexander Kass
dd611d9003 return diff actions DG-9126
GitOrigin-RevId: 9a4138fed40afa474a310b549797d3219898b3f2
2019-10-22 15:10:41 +00:00
Aleksey Pivovarov
c063b508ca diff: add border after toolbar for "Nothing to show" diff panel
GitOrigin-RevId: ff301ec467089fc764c02c1ec00ae62edae311ea
2019-09-30 12:36:41 +00:00
Nikolay.Rykunov
664f90b67e [diff-impl] Introduce ProxySimpleDiffRequest which is used to keep request context
GitOrigin-RevId: 44b9c4d27f31804b9d96b227e9b6a1c601f5af75
2019-08-15 18:04:21 +03:00
Nikolay.Rykunov
d1136bb247 [diff] Allow plugins to customize editor title in diff
Plugin can add DiffEditorTitleCustomizer to request context and it will be used to create diff title.

GitOrigin-RevId: b067a5f5802ebe4db23a0671525e2b4c04a0dca7
2019-08-15 18:04:21 +03:00
Aleksey Pivovarov
1a80831fe7 IDEA-220302 diff: add API to change selected file in diff viewer
GitOrigin-RevId: a6f78023cc48f4927eb6681ef5e3ab387d626273
2019-08-12 16:06:12 +03:00
Aleksey Pivovarov
a5ddef775c IDEA-215841 dir-diff: compare files from local file system using InputStream
Do not fail with FileTooBigException on big files.

GitOrigin-RevId: 856757a5ae025039db95ca6b80152ebc1bc61d19
2019-07-17 17:01:08 +03:00
Rustam Vishnyakov
123242c4b2 EditorConfig documentation test
GitOrigin-RevId: fd52ace3d7a32ecd02c2c5ab90e077967604c15e
2019-06-16 04:03:21 +03:00
Egor Zhdan
c1813cfb52 Cleanup: NotNull/Nullable
GitOrigin-RevId: b8e892f32ea84c2115973155dba7127b892cc36e
2019-06-16 04:02:08 +03:00
Anna Kozlova
91f7445298 constructor reference: don't ignore constructor parameters during method reference inference (IDEA-185578)
GitOrigin-RevId: e836468e05db28157713e9edd3c70382f8ecdebc
2019-06-13 03:15:49 +03:00
Egor Zhdan
39d2d77155 Cleanup: NotNull/Nullable
GitOrigin-RevId: b8e892f32ea84c2115973155dba7127b892cc36e
2019-06-13 03:14:35 +03:00
Aleksey Rostovskiy
185284cee6 get rid of intellij.build.toolbox.litegen parameter and use BuildOptions.TOOLBOX_LITE_GEN_STEP to skip it instead
GitOrigin-RevId: 9aac8ee4ed1ebf2a29de18a238825fafb1ab88f9
2019-05-27 15:08:08 +03:00
Alexandr Suhinin
9215f4240b [duplicates] enable duplicates analysis in PyCharm/WebStorm/PhpStorm/RubyMine
GitOrigin-RevId: 1545b79fdca4888f4b94f47f22703fd37694fa7a
2019-05-27 15:07:30 +03:00
Anna Kozlova
9d8759a332 Merge branch 'master' of ssh://git.jetbrains.team/intellij
GitOrigin-RevId: 7098d502d315375aa621c7bf7f2bb9998aca9ceb
2019-05-22 00:07:11 +03:00
Anna Kozlova
076a9cbca4 expected type: prefer array to boxing primitive (IDEA-212266)
GitOrigin-RevId: 93fb01a444f915e91a69c402df6337eb7dc16790
2019-05-22 00:06:02 +03:00
Vladimir Krivosheev
ff644d352d extract ui from util
GitOrigin-RevId: 4147e60c808d5ffd90a2d4e041bf4233a7c92abd
2019-05-21 21:08:28 +03:00
Anton Makeev
c105e26db3 Merge remote-tracking branch 'origin/master' into amakeev/gradle
GitOrigin-RevId: f9a633252daf311ecab19002c0f4757052eee9dc
2019-05-17 19:13:15 +03:00
Anton Makeev
b54aaf7e4e IDEA-210281 Cleanup Gradle settings: separate Runner configurable removed
GitOrigin-RevId: adbc39121fe91beb633e125b4cf39bfe0a422e4b
2019-05-17 19:02:16 +03:00
Yann Cébron
7f9d7ae8aa DiffTool: add @Nls capitalization
GitOrigin-RevId: 8727e9ae05db50f2db4c45c51a61220342decd64
2019-05-15 20:27:36 +03:00
Dmitry Avdeev
83f21c7197 Merge remote-tracking branch 'origin/master'
GitOrigin-RevId: 211e84dab4063848c1d3d835a526271ee1466636
2019-05-07 17:03:19 +03:00
Dmitry Avdeev
f9664fc455 IDEA-211555 Freeze on completion in XML file
do not process xincludes in ExtensionDomExtender

GitOrigin-RevId: d631dcd52d5bf500b61960473e16237008ad02a3
2019-05-07 17:02:41 +03:00
Vladimir Krivosheev
20e6ded163 use Collections.singletonList instead of Arrays.asList if possible
GitOrigin-RevId: db1f386101341ad49c99a602b259d1e366d7353a
2019-05-03 17:03:55 +03:00
Vladimir Krivosheev
4f9d52d43f deprecate ContainerUtil.list
GitOrigin-RevId: 4140918501ce1694b7642fbf61d4eb0e9eddfd41
2019-05-03 11:03:44 +03:00
Tagir Valeev
8f4ed82473 Merge remote-tracking branch 'origin/master'
GitOrigin-RevId: 4aa2198b0e40383875028553977a5721ba77766d
2019-04-23 13:19:45 +03:00
Aleksey Pivovarov
41ff102e05 diff: javadoc 2019-04-07 12:21:13 +03:00
Aleksey Pivovarov
78604ed4da diff: Javadoc 2019-03-10 17:21:20 +03:00
Yann Cébron
0e9d51a241 MergeRequest: Javadoc cleanup 2019-03-08 18:43:32 +01:00
Yann Cébron
a66d5521cc MergeRequest: fix Javadoc reference 2019-03-08 18:43:32 +01:00
Yann Cébron
0d8ff382c6 FocusableContext: fix Javadoc reference 2019-03-08 18:43:31 +01:00
Yann Cébron
22295bc971 DiffExtension: fix Javadoc reference 2019-03-08 18:43:31 +01:00
Aleksey Pivovarov
118ea5f289 diff: add assertion to Range constructor 2019-02-27 17:40:24 +03:00
Aleksey Pivovarov
5ddcd517db diff: allow to mark DiffContent as read-only 2019-02-04 17:32:11 +03:00
Alexey Kudravtsev
c3d946be56 introduce wildcards to VCS API for convenience and documentation 2018-12-24 17:34:49 +03:00
Aleksey Pivovarov
eeee5b698f IDEA-77478 diff: support by-character diff highlighting 2018-10-20 13:14:19 +03:00
Anna.Kozlova
c4b7de202d remove redundant suppressions 2018-10-04 12:09:46 +02:00
Alexey Kudravtsev
f9e73f56be Use bounded wildcards in API in static methods to make it more conventional and flexible 2018-10-01 13:44:57 +03:00
Aleksey Pivovarov
f45b0b048d IDEA-198769 vcs: show "Show Diff" dialog immediately
* Support async loader in ExternalDiffTool

follow-up: 60c91d5aca
2018-09-21 19:20:54 +03:00
Aleksey Pivovarov
81c75e2772 diff: limit access to DiffRequestChain to EDT thread 2018-09-17 19:54:02 +03:00
Aleksey Pivovarov
60c91d5aca IDEA-198769 vcs: show "Show Diff" dialog immediately
* Do not wait until changes are loaded in background - show loading progress in the diff window
2018-09-17 18:19:50 +03:00
Alexander Kass
965a40c67c Introduce presentable names 2018-09-13 15:21:52 +03:00
Vladimir Krivosheev
bd202ecfc7 add override 2018-08-14 17:49:34 +02:00
Aleksey Pivovarov
1adb56f5aa IDEA-101663 merge: support "ignore whitespaces" policies
In case of "ignored" changes, suggest to accept "Local" version,
rather than leaving "Base" one.
2018-08-06 12:58:54 +03:00
Kirill Likhodedov
3260175a3c vcs: cleanup: remove unused obsolete class w/o external usages 2018-05-21 19:15:01 +03:00