projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
73b9eef
2f54e51
)
Merge branch 'master' into vplyashkun/valgrind
author
Vladimir Plyashkun
<vladimir.plyashkun@jetbrains.com>
Mon, 25 Sep 2017 10:12:45 +0000
(13:12 +0300)
committer
Vladimir Plyashkun
<vladimir.plyashkun@jetbrains.com>
Mon, 25 Sep 2017 10:12:45 +0000
(13:12 +0300)
1
2
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
patch
|
diff1
|
diff2
|
blob
|
history
platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
patch
|
diff1
|
diff2
|
blob
|
history
spellchecker/src/com/intellij/spellchecker/jetbrains.dic
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
index 9633d51f64f5b1d50e3b5db3a133d31de3687cf8,6216db8bb7f372ecb3264264ad5ee17e3f62c33d..f28d50c6ad661d8b6009f13395be27c8eeeb4924
---
1
/
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
---
2
/
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
+++ b/
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
@@@
-1021,10
-1030,10
+1030,10
@@@
public class GlobalInspectionContextImp
}, ModalityState.defaultModalityState());
return;
}
-
+
Runnable runnable = () -> {
if (!FileModificationService.getInstance().preparePsiElementsForWrite(files)) return;
- CleanupInspectionIntention.applyFixesNoSort(getProject(), "Code Cleanup", descriptors, null);
+ CleanupInspectionIntention.applyFixesNoSort(getProject(), "Code Cleanup", descriptors, null
, false
);
if (postRunnable != null) {
postRunnable.run();
}
diff --cc
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
Simple merge
diff --cc
platform/platform-api/src/com/intellij/util/ui/tree/TreeUtil.java
Simple merge
diff --cc
spellchecker/src/com/intellij/spellchecker/jetbrains.dic
Simple merge