mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
IDEA-346489 Allow Inserts for Default keymap on macOS if it's anyway filtered out from KeymapSchemeManager
GitOrigin-RevId: 7335b3922da7ca477136b918637d8b3bbe91c61e
This commit is contained in:
committed by
intellij-monorepo-bot
parent
986342dc48
commit
0f72691712
@@ -22,6 +22,7 @@ import com.intellij.openapi.keymap.Keymap
|
||||
import com.intellij.openapi.keymap.KeymapManagerListener
|
||||
import com.intellij.openapi.keymap.KeymapUtil
|
||||
import com.intellij.openapi.keymap.ex.KeymapManagerEx
|
||||
import com.intellij.openapi.keymap.impl.ui.KeymapSchemeManager
|
||||
import com.intellij.openapi.options.ExternalizableSchemeAdapter
|
||||
import com.intellij.openapi.options.SchemeState
|
||||
import com.intellij.openapi.options.ShowSettingsUtil
|
||||
@@ -591,7 +592,11 @@ open class KeymapImpl @JvmOverloads constructor(@field:Volatile private var data
|
||||
}
|
||||
|
||||
val actionIds = HashSet<String>()
|
||||
val skipInserts = SystemInfo.isMac && (ApplicationManager.getApplication() == null || !ApplicationManager.getApplication().isUnitTestMode)
|
||||
|
||||
val skipInserts = KeymapSchemeManager.FILTER.test(this)
|
||||
&& SystemInfo.isMac
|
||||
&& (ApplicationManager.getApplication() == null || !ApplicationManager.getApplication().isUnitTestMode)
|
||||
|
||||
for (actionElement in keymapElement.children) {
|
||||
if (actionElement.name != ACTION) {
|
||||
throw InvalidDataException("unknown element: $actionElement; Keymap's name=$name")
|
||||
|
||||
Reference in New Issue
Block a user