Use addCommand for historyNavigation.

railsware · Aug 21, 2017 · dd7df85 · dd7df85
1 parent 05bf084
commit dd7df85
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 34 deletions.
diff --git a/src/views/PromptComponent.tsx b/src/views/PromptComponent.tsx
@@ -40,7 +40,7 @@ export class PromptComponent extends React.Component<Props, State> {
             fontSize: services.font.size * 1.2,
             fontFamily: services.font.family,
             suggestFontSize: services.font.size,
-            minimap: { enabled: false },
+            minimap: {enabled: false},
             scrollbar: {
                 vertical: "hidden",
                 horizontal: "hidden",
@@ -49,8 +49,30 @@ export class PromptComponent extends React.Component<Props, State> {
             quickSuggestions: true,
             quickSuggestionsDelay: 0,
             parameterHints: true,
+            fontLigatures: true,
         });
 
+        this.editor.addCommand(
+            monaco.KeyCode.UpArrow,
+            () => this.setPreviousHistoryItem(),
+            "!suggestWidgetVisible",
+        );
+        this.editor.addCommand(
+            monaco.KeyMod.WinCtrl | monaco.KeyCode.KEY_P,
+            () => this.setPreviousHistoryItem(),
+            "!suggestWidgetVisible",
+        );
+        this.editor.addCommand(
+            monaco.KeyCode.DownArrow,
+            () => this.setNextHistoryItem(),
+            "!suggestWidgetVisible",
+        );
+        this.editor.addCommand(
+            monaco.KeyMod.WinCtrl | monaco.KeyCode.KEY_N,
+            () => this.setNextHistoryItem(),
+            "!suggestWidgetVisible",
+        );
+
         this.focus();
     }
 
@@ -124,11 +146,14 @@ export class PromptComponent extends React.Component<Props, State> {
         }
     }
 
-    shouldNavigateHistory() {
-        return this.state.displayedHistoryRecordID || this.editor.getValue() === "";
+    setValue(value: string): void {
+        this.editor.setValue(value);
+        this.editor.setPosition({lineNumber: 1, column: value.length + 1});
+        this.prompt.setValue(value);
+        this.focus();
     }
 
-    setPreviousHistoryItem(): void {
+    private setPreviousHistoryItem(): void {
         const currentID = this.state.displayedHistoryRecordID;
         if (currentID) {
             const currentRecord = services.history.get(currentID);
@@ -150,7 +175,7 @@ export class PromptComponent extends React.Component<Props, State> {
         }
     }
 
-    setNextHistoryItem(): void {
+    private setNextHistoryItem(): void {
         const currentID = this.state.displayedHistoryRecordID;
         if (currentID) {
             const currentRecord = services.history.get(currentID);
@@ -168,13 +193,6 @@ export class PromptComponent extends React.Component<Props, State> {
         }
     }
 
-    setValue(value: string): void {
-        this.editor.setValue(value);
-        this.editor.setPosition({lineNumber: 1, column: value.length + 1});
-        this.prompt.setValue(value);
-        this.focus();
-    }
-
     private get promptContentNode(): HTMLDivElement {
         /* tslint:disable:no-string-literal */
         return this.refs["prompt-content"] as HTMLDivElement;

diff --git a/src/views/keyevents/Keybindings.ts b/src/views/keyevents/Keybindings.ts
@@ -356,37 +356,21 @@ export function handleUserEvent(application: ApplicationComponent, search: Searc
         return;
     }
 
-    if (event.keyCode === KeyCode.Tab && promptComponent.isInHistorySearch()) {
-        promptComponent.applyHistorySearch();
-        return;
-    }
-
-    if (event.keyCode === KeyCode.Escape && promptComponent.isInHistorySearch()) {
-        promptComponent.cancelHistorySearch();
-        return;
-    }
-
-    if (event.ctrlKey && event.keyCode === KeyCode.R) {
+    if (event.ctrlKey && event.keyCode === KeyCode.R && !promptComponent.isInHistorySearch()) {
         promptComponent.startHistorySearch();
 
         event.stopPropagation();
         event.preventDefault();
         return;
     }
 
-    if (promptComponent.shouldNavigateHistory() && isKeybindingForEvent(event, KeyboardAction.cliHistoryPrevious)) {
-        promptComponent.setPreviousHistoryItem();
-
-        event.stopPropagation();
-        event.preventDefault();
+    if (event.keyCode === KeyCode.Tab && promptComponent.isInHistorySearch()) {
+        promptComponent.applyHistorySearch();
         return;
     }
 
-    if (promptComponent.shouldNavigateHistory() && isKeybindingForEvent(event, KeyboardAction.cliHistoryNext)) {
-        promptComponent.setNextHistoryItem();
-
-        event.stopPropagation();
-        event.preventDefault();
+    if (event.keyCode === KeyCode.Escape && promptComponent.isInHistorySearch()) {
+        promptComponent.cancelHistorySearch();
         return;
     }
 }
diff --git a/tslint.json b/tslint.json
@@ -37,7 +37,7 @@
     ],
     "no-any": false,
     "no-arg": true,
-    "no-bitwise": true,
+    "no-bitwise": false,
     "no-conditional-assignment": true,
     "no-consecutive-blank-lines": false,
     "no-console": [