Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
c8eee2f1
Commit
c8eee2f1
authored
7 years ago
by
kskrygan
Browse files
Options
Download
Email Patches
Plain Diff
fixes due to review: compare by identity
parent
e74a9437
Branches unavailable
Tags unavailable
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java
+1
-1
...-impl/src/com/intellij/openapi/command/impl/UndoRedo.java
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedoStacksHolder.java
+2
-2
...m/intellij/openapi/command/impl/UndoRedoStacksHolder.java
with
3 additions
and
3 deletions
+3
-3
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java
+
1
-
1
View file @
c8eee2f1
...
...
@@ -98,7 +98,7 @@ abstract class UndoRedo {
Set
<
DocumentReference
>
clashing
=
getStackHolder
().
collectClashingActions
(
myUndoableGroup
);
if
(!
clashing
.
isEmpty
())
{
UndoableGroup
globalUndoableGroup
=
getStackHolder
().
findGlobalUndoableGroup
(
myUndoableGroup
.
getCommandTimestamp
()
);
UndoableGroup
globalUndoableGroup
=
getStackHolder
().
findGlobalUndoableGroup
(
myUndoableGroup
);
if
(
globalUndoableGroup
!=
null
)
{
if
(
isRedo
())
myManager
.
redo
(
null
);
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedoStacksHolder.java
+
2
-
2
View file @
c8eee2f1
...
...
@@ -269,9 +269,9 @@ class UndoRedoStacksHolder {
}
@Nullable
public
UndoableGroup
findGlobalUndoableGroup
(
int
timestamp
)
{
public
UndoableGroup
findGlobalUndoableGroup
(
UndoableGroup
timestamp
)
{
for
(
UndoableGroup
group
:
myGlobalStack
)
{
if
(
group
.
getCommandTimestamp
()
==
timestamp
)
{
if
(
group
==
timestamp
)
{
return
group
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help