Aleksey Pivovarov
57d5b6f79d
diff: abort background computation on new request
...
Fix issue, when slow async `doLoadRequest` could override recently updated request.
Steps to reproduce:
* Have diff with multiple files and slow `doLoadRequest`
* Wait till request for the first file is loaded
* Switch to the second file ("Loading" request is shown)
* Switch back to the first file (request is taken from cache and shown immediately)
* Wait
* Request for the second file is loaded and replaces active request // BUG
2018-09-17 21:56:41 +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
nik
b719fd848f
cleanup: sort modifiers in Kotlin files accordingly to Kotlin code conventions
...
This fixes problems reported by 'Non-canonical modifier order' inspection.
2018-09-17 15:00:24 +03:00
Alexander Kass
965a40c67c
Introduce presentable names
2018-09-13 15:21:52 +03:00
Alexey Kudravtsev
2d523b8cc4
notNull dataId
2018-09-12 20:15:42 +03:00
Dmitry Batrak
b589ddc853
IDEA-183815 Capability to add a content between code lines in the editor
2018-09-12 16:27:13 +03:00
Anna Kozlova
460661947d
fix red code in java
2018-09-10 13:29:01 +03:00
nik
f62d6510d6
cleanup: remove 'public' modifier from constructors in non-public classes (IDEA-195931) in platform modules
...
public constructors in non-public classes may be confusing, and removing them make code shorter.
2018-09-06 14:27:40 +03:00
Alexey Kudravtsev
a5af483733
ToggleAction notnull
2018-08-31 13:58:54 +03:00
Alexey Kudravtsev
eec77c6320
notnull various listeners
2018-08-30 14:20:34 +03:00
Aleksey Pivovarov
e1d5d15f24
IDEA-197927 diff: fix "Ignore Imports and Formatting" mode
...
Trim ignored lines before computing inner fragments.
Otherwise, we might trim line, part of that was already matched with some "non-ignored" fragment from the other side.
As a side effect, it should reduce cases, when "non-ignored" lines deletion is placed between
two "ignored" lines blocks on the other side, producing confusing results.
As another side effect, we are avoiding matching "ignored" and "non-ignored" lines in some cases.
ex: "// import x.xx" vs "import x.xx" would be a "modification" before this fix and a "deletion" after.
So far, it's not clear which approach is better, as there are could be different cases with different ignore patterns.
2018-08-29 16:40:08 +03:00
Aleksey Pivovarov
5f78973e7b
IDEA-197927 diff: add tests for "Ignore Imports and Formatting" mode
2018-08-29 16:40:08 +03:00
Aleksey Pivovarov
83891f882b
IDEA-172564 diff: close diff windows on "Jump to Source" on MacOS when main IDE frame is in FullScreen
2018-08-23 17:44:34 +03:00
Aleksey Pivovarov
8a6be35b61
IDEA-46059 lst: adjust clickable area for empty ranges
...
* track affected ranges when handling folded ranges
2018-08-23 15:29:13 +03:00
Aleksey Pivovarov
906eb2cf5e
lst: adjust deleted range rendering to editor scaling
2018-08-23 15:29:13 +03:00
Aleksey Pivovarov
4409ceb7b3
lst: cleanup - inline method
2018-08-23 15:29:13 +03:00
Kirill Likhodedov
7a75ad465c
diff: extract constant for the common diff title rename separator ->
2018-08-23 15:24:49 +03:00
Aleksey Pivovarov
58a1e3f0fe
lst: cleanup - use parameter instead of the field (fix typo)
2018-08-20 18:41:55 +03:00
Aleksey Pivovarov
63997a5656
lst: simplify - group logic in helper class
2018-08-20 18:41:55 +03:00
Aleksey Pivovarov
08fad710c7
lst: cleanup - rearrange methods
2018-08-20 18:41:55 +03:00
Aleksey Pivovarov
5e8180b5a6
lst: simplify - inline method
2018-08-20 18:41:54 +03:00
Aleksey Pivovarov
7d7814b1f6
lst: simplify - remove unused events
2018-08-20 18:41:54 +03:00
Aleksey Pivovarov
bdef478f76
lst: simplify - merge similar events
2018-08-20 18:41:54 +03:00
Aleksey Pivovarov
7f3c201d26
lst: erase dirty flag after full refresh
2018-08-20 18:41:54 +03:00
Aleksey Pivovarov
8ea502c859
lst: restore original Stroke after painting
2018-08-17 16:01:01 +03:00
Aleksey Pivovarov
9d4aafb4f8
diff: ensure that connector trapeziums on divider are never less-than-pixel-thick
2018-08-17 16:01:01 +03:00
Aleksey Pivovarov
24330cbffb
diff: move divider width into Registry option
2018-08-17 14:36:40 +03:00
Aleksey Pivovarov
e4c9216c48
diff: remove shadows from separators
2018-08-17 14:36:40 +03:00
Aleksey Pivovarov
86706d60b4
diff: make splitter thinner
...
* do not paint icon on it
2018-08-17 14:36:40 +03:00
Aleksey Pivovarov
b161e21826
diff: draw separatows on divider same as changed fragments
2018-08-17 14:36:40 +03:00
Aleksey Pivovarov
b9d253bd34
IDEA-197371 diff: add arrow to "Go To Changed Files" action icon on toolbar
2018-08-15 13:36:16 +03:00
Vladimir Krivosheev
0e91550e74
add override
2018-08-14 17:49:35 +02:00
Vladimir Krivosheev
bd202ecfc7
add override
2018-08-14 17:49:34 +02:00
Vladimir Krivosheev
efa73e3600
override, notnull
2018-08-13 17:11:29 +02:00
Vladimir Krivosheev
f0098d0ddb
override, notnull
2018-08-13 17:07:10 +02:00
Aleksey Pivovarov
28e9b638c3
IDEA-195995 merge: unify name for "Compare Contents" action group
2018-08-07 15:27:01 +03:00
Aleksey Pivovarov
2367cd5b1d
IDEA-195995 merge: remove icons from "Compare ... and ... Contents" actions
2018-08-07 15:27:01 +03:00
Aleksey Pivovarov
9a0550c97d
IDEA-195995 merge: shorten names for "Compare ... and ... Contents" actions
2018-08-07 15:27:01 +03:00
Aleksey Pivovarov
46028f445b
IDEA-195995 diff: hide "Compare ... and ... Contents" actions under one group
2018-08-07 15:27:01 +03:00
Alexey Kudravtsev
299e218bb6
annotate dataContext and dataId parameters @NotNull
2018-08-07 12:33:04 +03:00
Alexey Kudravtsev
6d50c545cf
annotate AnActionEvent parameter @NotNull
2018-08-07 12:33:03 +03:00
Alexey Kudravtsev
a2783ed229
annotated AnActionEvent parameter @NotNull
2018-08-06 15:29:49 +03:00
Aleksey Pivovarov
2634f8a749
merge: cleanup - remove code duplication
2018-08-06 12:58:54 +03:00
Aleksey Pivovarov
52d125e61c
merge: reduce by-word highlighting blinking on mode switch
2018-08-06 12:58:54 +03: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
Aleksey Pivovarov
48c70e4751
IDEA-101663 merge: support "ignore whitespaces" policies
2018-08-06 12:58:53 +03:00
Aleksey Pivovarov
c0026a301c
merge: simplify
2018-08-06 12:58:53 +03:00
Dmitry Batrak
58dbbaa7b1
bring back the API to mute highlighters in collapsed fold region
2018-07-25 19:18:50 +03:00
Aleksey Pivovarov
1cb5368b76
diff: do not create new Line object with the same comparison policy
2018-07-23 11:33:54 +03:00
