Add Escape keybinding to dismiss inline messages. (#211)

Fixes #200.
rust-lang · Oct 28, 2017 · cf07fd1 · cf07fd1
1 parent d76638e
commit cf07fd1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -14,4 +14,10 @@
             {"key": "selector", "operator":"equal", "operand": "source.rust"}
         ]
     },
+    {"keys": ["escape"], "command": "rust_dismiss_messages", "context":
+        [
+            {"key": "selector", "operator":"equal", "operand": "source.rust"},
+            {"key": "rust_has_messages", "operator": "equal", "operand": true}
+        ]
+    },
 ]
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -14,4 +14,10 @@
             {"key": "selector", "operator":"equal", "operand": "source.rust"}
         ]
     },
+    {"keys": ["escape"], "command": "rust_dismiss_messages", "context":
+        [
+            {"key": "selector", "operator":"equal", "operand": "source.rust"},
+            {"key": "rust_has_messages", "operator": "equal", "operand": true}
+        ]
+    },
 ]
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -14,4 +14,10 @@
             {"key": "selector", "operator":"equal", "operand": "source.rust"}
         ]
     },
+    {"keys": ["escape"], "command": "rust_dismiss_messages", "context":
+        [
+            {"key": "selector", "operator":"equal", "operand": "source.rust"},
+            {"key": "rust_has_messages", "operator": "equal", "operand": true}
+        ]
+    },
 ]
diff --git a/cargo_build.py b/cargo_build.py
@@ -229,6 +229,16 @@ def on_load(self, view):
             sublime.set_timeout(
                 lambda: messages.show_messages_for_view(view), 1)
 
+    def on_query_context(self, view, key, operator, operand, match_all):
+        # Used by the Escape-key keybinding to dismiss inline phantoms.
+        if key == 'rust_has_messages':
+            has_messages = view.window().id() in messages.WINDOW_MESSAGES
+            if operator == sublime.OP_EQUAL:
+                return operand == has_messages
+            elif operator == sublime.OP_NOT_EQUAL:
+                return operand != has_messages
+        return None
+
 
 class NextPrevBase(sublime_plugin.WindowCommand):
 
@@ -266,3 +276,11 @@ def run(self):
         # Also call Sublime's cancel command, in case the user is using a
         # normal Sublime build.
         self.window.run_command('cancel_build')
+
+
+class RustDismissMessagesCommand(sublime_plugin.WindowCommand):
+
+    """Removes all inline messages."""
+
+    def run(self):
+        messages.clear_messages(self.window)