From b0c39ed30c67736cd730b04d032a565a66979d21 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Thu, 26 Sep 2019 23:22:28 +0300 Subject: [PATCH] hide some non-applicable keymaps 2 GitOrigin-RevId: 63107dd637cdc6474d75ff1ae0d9d9ef7c330c34 --- .../keymap/impl/DefaultBundledKeymaps.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultBundledKeymaps.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultBundledKeymaps.java index f28ec4f41590..b12ae5c41be8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultBundledKeymaps.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/DefaultBundledKeymaps.java @@ -19,6 +19,7 @@ */ package com.intellij.openapi.keymap.impl; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.util.SystemInfo; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -42,16 +43,18 @@ public class DefaultBundledKeymaps implements BundledKeymapProvider { for (BundledKeymapBean bean : BundledKeymapBean.EP_NAME.getExtensionList()) { result.add(bean.file.replace("$OS$", os)); } - if (SystemInfo.isWindows || SystemInfo.isMac) { - result.remove("Default for XWin.xml"); - result.remove("Default for GNOME.xml"); - result.remove("Default for KDE.xml"); - } - if (!SystemInfo.isMac) { - result.remove("Mac OS X.xml"); - result.remove("Mac OS X 10.5+.xml"); - result.remove("Eclipse (Mac OS X).xml"); - result.remove("Sublime Text (Mac OS X).xml"); + if (!ApplicationManager.getApplication().isHeadlessEnvironment()) { + if (SystemInfo.isWindows || SystemInfo.isMac) { + result.remove("Default for XWin.xml"); + result.remove("Default for GNOME.xml"); + result.remove("Default for KDE.xml"); + } + if (!SystemInfo.isMac) { + result.remove("Mac OS X.xml"); + result.remove("Mac OS X 10.5+.xml"); + result.remove("Eclipse (Mac OS X).xml"); + result.remove("Sublime Text (Mac OS X).xml"); + } } return new ArrayList<>(result); }