Commit 5d23a5ae authored by Roman Shevchenko's avatar Roman Shevchenko Committed by intellij-monorepo-bot
Browse files

Cleanup (NPE; formatting)

GitOrigin-RevId: e79fc17f2bda6ac1dca99cfcfc8f65e4d5e25d4d
parent cb9004e8
Showing with 6 additions and 9 deletions
+6 -9
......@@ -4,14 +4,10 @@ package com.intellij.openapi.actionSystem.impl;
import com.intellij.openapi.actionSystem.Shortcut;
import com.intellij.openapi.actionSystem.ShortcutSet;
import com.intellij.openapi.keymap.KeymapManager;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
/**
* Please do not use this class outside impl package!!!
* Please do not use this class even if you managed to make it public!!!
* Thank you in advance.
* The UI Engineers.
*/
@ApiStatus.Internal
final class ProxyShortcutSet implements ShortcutSet {
private final String myActionId;
......@@ -19,9 +15,10 @@ final class ProxyShortcutSet implements ShortcutSet {
myActionId = actionId;
}
@Override
@NotNull
@Override
public Shortcut[] getShortcuts() {
return KeymapManager.getInstance().getActiveKeymap().getShortcuts(myActionId);
KeymapManager manager = KeymapManager.getInstance();
return manager != null ? manager.getActiveKeymap().getShortcuts(myActionId) : Shortcut.EMPTY_ARRAY;
}
}
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment