Merge pull request #31 from arsham/master

Mouse click navigation, whicherrs and code cleanups
alvarolm · Feb 18, 2017 · c26eccf · c26eccf
2 parents 9d9c0ef + 02bdc56
commit c26eccf
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 100 deletions.
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -1,13 +1,15 @@
 [
     { "keys": ["ctrl+shift+g"], "command": "go_guru"},
-    { "keys": ["ctrl+alt+shift+g"], "command": "go_guru_show_results"}
+    { "keys": ["ctrl+alt+shift+g"], "command": "go_guru_show_results"},
+    { "keys": ["ctrl+.+ctrl+g"], "command": "go_guru_goto_definition", "context": [{ "key": "selector", "operator": "equal", "operand": "source.go" }] },
 ]
 /*
-	You can also set a key binding for a specific mode by adding a "mode" arg, e.g.:
+    You can also set a key binding for a specific mode by adding a "mode" arg, e.g.:
     ...
     { "keys": ["ctrl+super+c"], "command": "go_guru", "args": {"mode": "callers"} },
     { "keys": ["ctrl+super+i"], "command": "go_guru", "args": {"mode": "implements"} },
     { "keys": ["ctrl+super+r"], "command": "go_guru", "args": {"mode": "referrers"} },
+    { "keys": ["ctrl+.+ctrl+g"], "command": "go_guru", "args": {"mode": "definition", output=false}},
     ...
 	please set this in your user keybinds, no here.
-*/
+*/
diff --git a/Default (Linux).sublime-mousemap b/Default (Linux).sublime-mousemap
@@ -0,0 +1,12 @@
+[
+    {
+        "button": "button2",
+        "modifiers": ["ctrl"],
+        "press_command": "drag_select",
+        "command": "go_guru",
+        "args": {
+            "mode": "definition",
+            "output": false
+        },
+    },
+]
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -1,13 +1,16 @@
 [
     { "keys": ["ctrl+shift+g"], "command": "go_guru"},
-    { "keys": ["ctrl+alt+shift+g"], "command": "go_guru_show_results"}
+    { "keys": ["ctrl+alt+shift+g"], "command": "go_guru_show_results"},
+    { "keys": ["ctrl+.+ctrl+g"], "command": "go_guru_goto_definition", "context": [{ "key": "selector", "operator": "equal", "operand": "source.go" }] },
 ]
 /*
 	You can also set a key binding for a specific mode by adding a "mode" arg, e.g.:
     ...
     { "keys": ["ctrl+super+c"], "command": "go_guru", "args": {"mode": "callers"} },
     { "keys": ["ctrl+super+i"], "command": "go_guru", "args": {"mode": "implements"} },
     { "keys": ["ctrl+super+r"], "command": "go_guru", "args": {"mode": "referrers"} },
+    { "keys": ["ctrl+.+ctrl+g"], "command": "go_guru", "args": {"mode": "definition", output=false}},
+
     ...
 	please set this in your user keybinds, no here.
-*/
+*/
diff --git a/Default (OSX).sublime-mousemap b/Default (OSX).sublime-mousemap
@@ -0,0 +1,12 @@
+[
+    {
+        "button": "button2",
+        "modifiers": ["ctrl"],
+        "press_command": "drag_select",
+        "command": "go_guru",
+        "args": {
+            "mode": "definition",
+            "output": false
+        },
+    },
+]
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -1,13 +1,15 @@
 [
     { "keys": ["ctrl+shift+g"], "command": "go_guru"},
-    { "keys": ["ctrl+alt+shift+g"], "command": "go_guru_show_results"}
+    { "keys": ["ctrl+alt+shift+g"], "command": "go_guru_show_results"},
+    { "keys": ["ctrl+.+ctrl+g"], "command": "go_guru_goto_definition", "context": [{ "key": "selector", "operator": "equal", "operand": "source.go" }] },
 ]
 /*
 	You can also set a key binding for a specific mode by adding a "mode" arg, e.g.:
     ...
     { "keys": ["ctrl+super+c"], "command": "go_guru", "args": {"mode": "callers"} },
     { "keys": ["ctrl+super+i"], "command": "go_guru", "args": {"mode": "implements"} },
     { "keys": ["ctrl+super+r"], "command": "go_guru", "args": {"mode": "referrers"} },
+    { "keys": ["ctrl+.+ctrl+g"], "command": "go_guru", "args": {"mode": "definition", output=false}},
     ...
 	please set this in your user keybinds, no here.
-*/
+*/
diff --git a/Default (Windows).sublime-mousemap b/Default (Windows).sublime-mousemap
@@ -0,0 +1,12 @@
+[
+    {
+        "button": "button2",
+        "modifiers": ["ctrl"],
+        "press_command": "drag_select",
+        "command": "go_guru",
+        "args": {
+            "mode": "definition",
+            "output": false
+        },
+    },
+]
diff --git a/Default.sublime-commands b/Default.sublime-commands
@@ -42,6 +42,14 @@
             "mode": "definition"
         }
     },
+    {
+        "caption": "GoGuru: jump to definition",
+        "command": "go_guru",
+        "args": {
+            "output": false,
+            "mode": "definition"
+        }
+    },
     {
         "caption": "GoGuru: describe",
         "command": "go_guru",
@@ -78,24 +86,24 @@
         }
     },
     {
-        "caption": "GoGuru: referrers",
+        "caption": "GoGuru: whicherrs",
         "command": "go_guru",
         "args": {
-           "mode": "referrers"
+            "mode": "whicherrs"
         }
     },
     {
-        "caption": "GoGuru: what",
+        "caption": "GoGuru: referrers",
         "command": "go_guru",
         "args": {
-            "mode": "what"
+           "mode": "referrers"
         }
     },
     {
-        "caption": "GoGuru: callgraph",
+        "caption": "GoGuru: what",
         "command": "go_guru",
         "args": {
-            "mode": "callgraph"
+            "mode": "what"
         }
     },
     {
@@ -129,5 +137,5 @@
         "platform": "OSX"
         }
     },
-    
+
 ]
diff --git a/README.md b/README.md
@@ -6,9 +6,9 @@ GoGuru is a Golang plugin for [SublimeText](http://www.sublimetext.com/) 3 that
 
 Please report any issues or improvements here [https://github.com/alvarolm/GoGuru/issues](https://github.com/alvarolm/GoGuru/issues)
 
-based on previus work from [waigani](http://github.com/waigani/GoOracle).
+based on previous work from [waigani](http://github.com/waigani/GoOracle).
 
-the guru tool still is on developent,
+the guru tool still is on development,
 check out the plan, the official git repo and the code review if you want to keep up:
 * https://docs.google.com/document/d/1UErU12vR7jTedYvKHVNRzGPmXqdMASZ6PfE7B-p6sIg/edit#
 * https://go.googlesource.com/tools/+log/master/cmd/guru
@@ -38,6 +38,8 @@ Select, or place your cursor over, a symbol (function, variable, constant etc) a
 Select one of the modes and the output will be displayed in a new tab.
 **double click on the file name in the results to jump directly to it.**
 
+You also can hold the `ctrl` key and `right-click` on a symbol to jump right to the definition.
+
 Install
 -------
 
@@ -111,6 +113,7 @@ Default key binding:
 [
     { "keys": ["ctrl+shift+g"], "command": "go_guru"},
     { "keys": ["ctrl+alt+shift+g"], "command": "go_guru_show_results"},
+    { "keys": ["ctrl+.+ctrl+g"], "command": "go_guru_goto_definition", "context": [{ "key": "selector", "operator": "equal", "operand": "source.go" }] },
 ]
 ```
 
@@ -123,9 +126,27 @@ You can also set a key binding for a specific mode by adding a "mode" arg, e.g.:
     { "keys": ["ctrl+super+c"], "command": "go_guru", "args": {"mode": "callers"} },
     { "keys": ["ctrl+super+i"], "command": "go_guru", "args": {"mode": "implements"} },
     { "keys": ["ctrl+super+r"], "command": "go_guru", "args": {"mode": "referrers"} },
+    { "keys": ["ctrl+.+ctrl+g"], "command": "go_guru", "args": {"mode": "definition", output=false}},
     ...
 ```
 
+Default mouse bindings:
+
+```javascript
+[
+    {
+        "button": "button2",
+        "modifiers": ["ctrl"],
+        "press_command": "drag_select",
+        "command": "go_guru",
+        "args": {
+            "mode": "definition",
+            "output": false
+        },
+    },
+]
+```
+
 
 Dependencies
 ------------