Skip to content

Commit fa9ebac

Browse files
tonskytonsky
committed
Toggle Info, Show docs inline, Match editor line height in phantoms
1 parent e691c4e commit fa9ebac

File tree

6 files changed

+236
-181
lines changed

6 files changed

+236
-181
lines changed

‎Default (Linux).sublime-keymap‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,28 @@
99
"command": "sublime_clojure_eval_buffer",
1010
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
1111

12-
// Clear Evaluation Results
13-
{"keys": ["ctrl+alt+l"],
14-
"command": "sublime_clojure_clear_evals",
15-
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
16-
1712
// Interrupt Pending Evaluations
1813
{"keys": ["ctrl+alt+c"],
1914
"command": "sublime_clojure_interrupt_eval",
2015
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
2116

22-
// Lookup Symbol
23-
{"keys": ["ctrl+alt+d"],
24-
"command": "sublime_clojure_lookup_symbol",
17+
// Toggle Stacktrace
18+
// {"keys": ["ctrl+alt+e"],
19+
// "command": "sublime_clojure_toggle_trace",
20+
// "context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
21+
22+
// Toggle Symbol Info
23+
// {"keys": ["ctrl+alt+d"],
24+
// "command": "sublime_clojure_lookup_symbol",
25+
// "context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
26+
27+
// Toggle Info
28+
{"keys": ["ctrl+alt+i"],
29+
"command": "sublime_clojure_toggle_info",
2530
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
2631

27-
// Toggle Stacktrace
28-
{"keys": ["ctrl+alt+e"],
29-
"command": "sublime_clojure_toggle_trace",
32+
// Clear Evaluation Results
33+
{"keys": ["ctrl+alt+l"],
34+
"command": "sublime_clojure_clear_evals",
3035
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
3136
]

‎Default (OSX).sublime-keymap‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,28 @@
99
"command": "sublime_clojure_eval_buffer",
1010
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
1111

12-
// Clear Evaluation Results
13-
{"keys": ["ctrl+l"],
14-
"command": "sublime_clojure_clear_evals",
15-
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
16-
1712
// Interrupt Pending Evaluations
1813
{"keys": ["ctrl+c"],
1914
"command": "sublime_clojure_interrupt_eval",
2015
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
2116

22-
// Lookup Symbol
23-
{"keys": ["ctrl+d"],
24-
"command": "sublime_clojure_lookup_symbol",
17+
// Toggle Stacktrace
18+
// {"keys": ["ctrl+e"],
19+
// "command": "sublime_clojure_toggle_trace",
20+
// "context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
21+
22+
// Toggle Symbol Info
23+
// {"keys": ["ctrl+d"],
24+
// "command": "sublime_clojure_lookup_symbol",
25+
// "context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
26+
27+
// Toggle Info
28+
{"keys": ["ctrl+i"],
29+
"command": "sublime_clojure_toggle_info",
2530
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
2631

27-
// Toggle Stacktrace
28-
{"keys": ["ctrl+e"],
29-
"command": "sublime_clojure_toggle_trace",
32+
// Clear Evaluation Results
33+
{"keys": ["ctrl+l"],
34+
"command": "sublime_clojure_clear_evals",
3035
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
3136
]

‎Default (Windows).sublime-keymap‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,28 @@
99
"command": "sublime_clojure_eval_buffer",
1010
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
1111

12-
// Clear Evaluation Results
13-
{"keys": ["ctrl+alt+l"],
14-
"command": "sublime_clojure_clear_evals",
15-
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
16-
1712
// Interrupt Pending Evaluations
1813
{"keys": ["ctrl+alt+c"],
1914
"command": "sublime_clojure_interrupt_eval",
2015
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
2116

22-
// Lookup Symbol
23-
{"keys": ["ctrl+alt+d"],
24-
"command": "sublime_clojure_lookup_symbol",
17+
// Toggle Stacktrace
18+
// {"keys": ["ctrl+alt+e"],
19+
// "command": "sublime_clojure_toggle_trace",
20+
// "context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
21+
22+
// Toggle Symbol Info
23+
// {"keys": ["ctrl+alt+d"],
24+
// "command": "sublime_clojure_lookup_symbol",
25+
// "context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
26+
27+
// Toggle Info
28+
{"keys": ["ctrl+alt+i"],
29+
"command": "sublime_clojure_toggle_info",
2530
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
2631

27-
// Toggle Stacktrace
28-
{"keys": ["ctrl+alt+e"],
29-
"command": "sublime_clojure_toggle_trace",
32+
// Clear Evaluation Results
33+
{"keys": ["ctrl+alt+l"],
34+
"command": "sublime_clojure_clear_evals",
3035
"context": [{"key": "selector", "operator": "equal", "operand": "source.clojure"}]},
3136
]

‎Default.sublime-commands‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,37 @@
1919
"caption": "Clojure REPL: Evaluate Buffer",
2020
"command": "sublime_clojure_eval_buffer"
2121
},
22-
{
23-
"caption": "Clojure REPL: Clear Evaluation Results",
24-
"command": "sublime_clojure_clear_evals"
25-
},
2622
{
2723
"caption": "Clojure REPL: Interrupt Pending Evaluations",
2824
"command": "sublime_clojure_interrupt_eval"
2925
},
30-
{
31-
"caption": "Clojure REPL: Lookup Symbol",
32-
"command": "sublime_clojure_lookup_symbol"
33-
},
3426
{
3527
"caption": "Clojure REPL: Toggle Stacktrace",
3628
"command": "sublime_clojure_toggle_trace"
3729
},
30+
{
31+
"caption": "Clojure REPL: Toggle Symbol Info",
32+
"command": "sublime_clojure_toggle_symbol"
33+
},
34+
{
35+
"caption": "Clojure REPL: Toggle Info",
36+
"command": "sublime_clojure_toggle_info"
37+
},
38+
{
39+
"caption": "Clojure REPL: Clear Evaluation Results",
40+
"command": "sublime_clojure_clear_evals"
41+
},
3842
{
3943
"caption": "Preferences: Sublime Clojure Settings",
40-
"command": "sublime_clojure_edit_settings",
44+
"command": "edit_settings",
4145
"args": {
4246
"base_file": "${packages}/Sublime Clojure/Sublime Clojure.sublime-settings",
4347
"default": "// Sublime Clojure Settings - User\n{\n\t$0\n}\n"
4448
}
4549
},
4650
{
4751
"caption": "Preferences: Sublime Clojure Key Bindings",
48-
"command": "sublime_clojure_edit_settings",
52+
"command": "edit_settings",
4953
"args": {
5054
"base_file": "${packages}/Sublime Clojure/Default (${platform}).sublime-keymap",
5155
"user_file": "${packages}/User/Default (${platform}).sublime-keymap"

‎README.md‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,19 +116,22 @@ By default, Sublime Clojure will also print evaluation time if it took more than
116116

117117
<img src="https://raw.github.com/tonsky/sublime-clojure/master/screenshots/eval_elapsed.png" width="453" height="134" alt="Elapsed time">
118118

119+
If your evaluation runs too long and you want to interrupt it, run `Clojure REPL: Interrupt Pending Evaluations`:
120+
121+
<img src="https://raw.github.com/tonsky/sublime-clojure/master/screenshots/interrupt.png" width="587" height="39" alt="Interrupt">
122+
119123
If your evaluation failed, put your cursor inside failed region and run `Clojure REPL: Toggle Stacktrace`:
120124

121125
<img src="https://raw.github.com/tonsky/sublime-clojure/master/screenshots/toggle_stacktrace.png" width="594" height="165" alt="Toggle Stacktrace">
122126

123-
If your evaluation runs too long and you want to interrupt it, run `Clojure REPL: Interrupt Pending Evaluations`:
127+
To show symbol info, run `Clojure REPL: Toggle Symbol Info`:
124128

125-
<img src="https://raw.github.com/tonsky/sublime-clojure/master/screenshots/interrupt.png" width="587" height="39" alt="Interrupt">
129+
<img src="https://raw.github.com/tonsky/sublime-clojure/master/screenshots/lookup.png" width="593" height="143" alt="Lookup Symbol">
126130

127-
If you want to clear evaluation results, run `Clojure REPL: Clear Evaluation Results`.
131+
Universal `Clojure REPL: Toggle Info` command acts as either `Toggle Stacktrace` or `Toggle Symbol Info`, depending on context.
128132

129-
Finally, run `Clojure REPL: Lookup Symbol` when over a symbol to see its documentation:
133+
Finally, to clear evaluation results run `Clojure REPL: Clear Evaluation Results`.
130134

131-
<img src="https://raw.github.com/tonsky/sublime-clojure/master/screenshots/lookup.png" width="593" height="143" alt="Lookup Symbol">
132135

133136
To edit settings, run `Preferences: Sublime Clojure Settings` command.
134137

@@ -138,10 +141,9 @@ Command | macOS | Windows/Linux
138141
------------------------------|----------------------------------|-------------------------------------------------| -----------------------
139142
Evaluate | <kbd>Ctrl</kbd> <kbd>Enter</kbd> | <kbd>Ctrl</kbd> <kbd>Alt</kbd> <kbd>Enter</kbd> |
140143
Evaluate Buffer | <kbd>Ctrl</kbd> <kbd>B</kbd> | <kbd>Ctrl</kbd> <kbd>Alt</kbd> <kbd>B</kbd> | <kbd>B</kbd>uffer
141-
Toggle Stacktrace | <kbd>Ctrl</kbd> <kbd>E</kbd> | <kbd>Ctrl</kbd> <kbd>Alt</kbd> <kbd>E</kbd> | <kbd>E</kbd>xception
142144
Interrupt Pending Evaluations | <kbd>Ctrl</kbd> <kbd>C</kbd> | <kbd>Ctrl</kbd> <kbd>Alt</kbd> <kbd>C</kbd> | <kbd>C</kbd>ancel
145+
Toggle Info | <kbd>Ctrl</kbd> <kbd>I</kbd> | <kbd>Ctrl</kbd> <kbd>Alt</kbd> <kbd>I</kbd> | <kbd>I</kbd>nfo
143146
Clear Evaluation Results | <kbd>Ctrl</kbd> <kbd>L</kbd> | <kbd>Ctrl</kbd> <kbd>Alt</kbd> <kbd>L</kbd> | C<kbd>l</kbd>ear
144-
Lookup Symbol | <kbd>Ctrl</kbd> <kbd>D</kbd> | <kbd>Ctrl</kbd> <kbd>Alt</kbd> <kbd>D</kbd> | <kbd>D</kbd>ocumentation
145147

146148
To change key bindings, run `Preferences: Sublime Clojure Key Bindings` command.
147149

0 commit comments

Comments
 (0)