Merge remote-tracking branch 'origin/master'

diff --git a/platform/icons/src/toolwindows/toolWindowProject.png b/platform/icons/src/toolwindows/toolWindowProject.png
index b44556c76a85313300bf04526b7530478d53503d..a0b2850ce43bca067eff4b6c47edbeb85435b6f7 100644 (file)
Binary files a/platform/icons/src/toolwindows/toolWindowProject.png and b/platform/icons/src/toolwindows/toolWindowProject.png differ

diff --git a/platform/icons/src/toolwindows/toolWindowProject@2x.png b/platform/icons/src/toolwindows/toolWindowProject@2x.png
index 0cf18675ebd72d50bb12e267f116ce5260d035d8..64835373be10e08ceb1f65db59e370c889e76faf 100644 (file)
Binary files a/platform/icons/src/toolwindows/toolWindowProject@2x.png and b/platform/icons/src/toolwindows/toolWindowProject@2x.png differ

diff --git a/platform/icons/src/toolwindows/toolWindowProject@2x_dark.png b/platform/icons/src/toolwindows/toolWindowProject@2x_dark.png
deleted file mode 100644 (file)
index 0dd7066..0000000
Binary files a/platform/icons/src/toolwindows/toolWindowProject@2x_dark.png and /dev/null differ

diff --git a/platform/icons/src/toolwindows/toolWindowProject_dark.png b/platform/icons/src/toolwindows/toolWindowProject_dark.png
deleted file mode 100644 (file)
index bf5eb0f..0000000
Binary files a/platform/icons/src/toolwindows/toolWindowProject_dark.png and /dev/null differ

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
index c19576888362cbd02fdaa164b657c2eda304c97d..f6380f9dedb785dc029c301d063ba501b8a59b01 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
@@ -932,12 +932,7 @@ public final class EditorUtil {
     DocumentEx document = ObjectUtils.tryCast(editor.getDocument(), DocumentEx.class);
     if (document != null && document.isInBulkUpdate()) {
       MessageBusConnection connection = ApplicationManager.getApplication().getMessageBus().connect();
-      disposeWithEditor(editor, new Disposable() {
-        @Override
-        public void dispose() {
-          connection.disconnect();
-        }
-      });
+      disposeWithEditor(editor, connection);
       connection.subscribe(DocumentBulkUpdateListener.TOPIC, new DocumentBulkUpdateListener.Adapter() {
         @Override
         public void updateFinished(@NotNull Document doc) {

diff --git a/python/helpers/coverage_runner/run_coverage.py b/python/helpers/coverage_runner/run_coverage.py
index b113602d95b6c9a347688c21fb51ee79a75e9586..a9c6b98feb432edbbef07fb01a556e50a011ac57 100644 (file)
--- a/python/helpers/coverage_runner/run_coverage.py
+++ b/python/helpers/coverage_runner/run_coverage.py
@@ -37,8 +37,7 @@ if run_cov:
 
 argv = []
 for arg in sys.argv:
-    if arg.startswith('-m'):
-        argv.append('-m')
+    if arg.startswith('-m') and arg[2:]:
         argv.append(arg[2:])
     else:
         argv.append(arg)