Merge branch 'release/0.3.5'

dishmaev · Feb 7, 2018 · 72b2fee · 72b2fee
2 parents a33c34e + 0ddf11e
commit 72b2fee
Show file tree

Hide file tree

Showing 3 changed files with 89 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,4 @@
 .DS_Store
 *.sublime-workspace
-jsonrpctcp
-old
 test.json
 note.txt
diff --git a/Default.sublime-keymap b/Default.sublime-keymap
@@ -2,75 +2,124 @@
     {
         "command": "dlv_expand_variable",
         "keys": ["right"],
-        "context": [{"key": "dlv_running"}, {"key": "dlv_variable_view"}]
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running"}, 
+            {"key": "dlv_variable_view"}
+        ]
     },
     {
         "command": "dlv_collapse_variable",
         "keys": ["left"],
-        "context": [{"key": "dlv_running"}, {"key": "dlv_variable_view"}]
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running"}, 
+            {"key": "dlv_variable_view"}
+        ]
     },
     {
         "command": "dlv_add_watch",
-        "keys": ["alt+insert"]
+        "keys": ["alt+insert"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+        ]
     },
     {
         "command": "dlv_remove_watch",
         "keys": ["alt+delete"],
-        "context": [{"key": "dlv_watch_view"}]
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_watch_view"}
+        ]
     },
     {
         "command": "dlv_input",
         "keys": ["shift+f5"],
-        "context": [{"key": "dlv_running", "operator": "equal", "operand": true}],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running", "operator": "equal", "operand": true}
+        ]
     },
     {
         "command": "dlv_prev_cmd",
-        "context": [{"key": "dlv_input_view"}],
-        "keys": ["up"]
+        "keys": ["up"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_input_view"}
+        ]
     },
     {
         "command": "dlv_next_cmd",
-        "context": [{"key": "dlv_input_view"}],
-        "keys": ["down"]
+        "keys": ["down"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_input_view"}
+        ]
     },
     {
         "command": "dlv_toggle_breakpoint",
-        "context": [{"key": "plugin_enable", "operator": "equal", "operand": true}],
-        "keys": ["alt+f9"]
+        "keys": ["alt+f9"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "plugin_enable", "operator": "equal", "operand": true}
+        ]
     },
     {
         "command": "dlv_start",
-        "context": [{"key": "dlv_running", "operator": "equal", "operand": false}],
-        "keys": ["f5"]
+        "keys": ["f5"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running", "operator": "equal", "operand": false}
+        ]
     },
     {
         "command": "dlv_resume",
-        "context": [{"key": "dlv_running", "operator": "equal", "operand": true}],
-        "keys": ["f5"]
+        "keys": ["f5"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running", "operator": "equal", "operand": true}
+        ]
     },
     {
         "command": "dlv_next",
-        "context": [{"key": "dlv_running", "operator": "equal", "operand": true}, {"key": "dlv_next_enable", "operator": "equal", "operand": true}],
-        "keys": ["f6"]
+        "keys": ["f6"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running", "operator": "equal", "operand": true}, 
+            {"key": "dlv_next_enable", "operator": "equal", "operand": true}
+        ]
     },
     {
         "command": "dlv_step_in",
-        "context": [{"key": "dlv_running", "operator": "equal", "operand": true}],
-        "keys": ["f7"]
+        "keys": ["f7"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running", "operator": "equal", "operand": true}
+        ]
     },
     {
         "command": "dlv_step_out",
-        "context": [{"key": "dlv_running", "operator": "equal", "operand": true}],
-        "keys": ["shift+f7"]
+        "keys": ["shift+f7"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running", "operator": "equal", "operand": true}
+        ]
     },
     {
         "command": "dlv_restart",
-        "context": [{"key": "dlv_running", "operator": "equal", "operand": true}],
-        "keys": ["f8"]
+        "keys": ["f8"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running", "operator": "equal", "operand": true}
+        ]
     },
     {
         "command": "dlv_cancel_next",
-        "context": [{"key": "dlv_running", "operator": "equal", "operand": true}, {"key": "dlv_next_enable", "operator": "equal", "operand": false}],
-        "keys": ["ctrl+f8"]
+        "keys": ["ctrl+f8"],
+        "context": [
+            {"key": "setting.delve_enable", "operand": true},
+            {"key": "dlv_running", "operator": "equal", "operand": true}, 
+            {"key": "dlv_next_enable", "operator": "equal", "operand": false}
+        ]
     },
-]
+]
diff --git a/README.md b/README.md
@@ -26,5 +26,19 @@ Based on ideas and sources:
 }
 ```
 
+## Usage
+See [the default key bindings](https://github.com/dishmaev/GoDebug/blob/master/Default.sublime-keymap), [the default mouse map](https://github.com/dishmaev/GoDebug/blob/master/Default.sublime-mousemap) and [the sample setting](https://github.com/dishmaev/GoDebug/blob/master/GoDebug.sublime-settings).
+
+In short:
+* If you have multiple projects, you most likely want to put project specific setting in your project file, with a prefixed "godebug_"
+* If you have multiple executables in the same project, you can add a "godebug_executables" setting to your project settings, and add an entry for each executable's settings
+* Toggle breakpoints with Alt+F9
+* Launch with F5
+* Step out with F7
+* Step into with Shift+F7
+* Click on the appropriate line in the Delve Stacktrace view to go to that stack frame
+* Click a variable in the Delve Variables view to show its children (if available)
+* You can also access some commands by right clicking in any view
+
 ## License
 GoDebug are released under the MIT license. See [LICENSE](https://github.com/dishmaev/GoDebug/blob/master/LICENSE)