Skip to content

Commit 9d13116

Browse files
committed
Rename commands and add Instadiff to Command Palette
1 parent 251cacc commit 9d13116

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

Commands/Default.sublime-commands

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
[
2-
{
3-
"caption": "Git Blame: Toggle Inline Blame",
4-
"command": "toggle_inline_git_blame"
5-
},
62
{
73
"caption": "Git Blame: Show",
84
"command": "blame"
@@ -15,6 +11,14 @@
1511
"caption": "Git Blame: Erase All",
1612
"command": "blame_erase_all"
1713
},
14+
{
15+
"caption": "Git Blame: Toggle Inline Blame",
16+
"command": "blame_toggle_inline"
17+
},
18+
{
19+
"caption": "Git Blame: Instadiff",
20+
"command": "blame_instadiff"
21+
},
1822
{
1923
"caption": "Git Blame: Settings",
2024
// TWIN: Entry in "Main.sublime-menu"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{"keys": ["ctrl+shift+q"], "command": "blame"},
33
{"keys": ["ctrl+shift+c"], "command": "blame_show_all"},
4-
//{"keys": ["f5"], "command": "toggle_inline_git_blame"},
5-
//{"keys": ["f8"], "command": "blame_insta_diff"},
4+
//{"keys": ["f5"], "command": "blame_toggle_inline"},
5+
//{"keys": ["f8"], "command": "blame_instadiff"},
66
]

Keymaps/Default (OSX).sublime-keymap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{"keys": ["ctrl+alt+b"], "command": "blame"},
33
{"keys": ["ctrl+alt+shift+b"], "command": "blame_show_all"},
4-
//{"keys": ["f5"], "command": "toggle_inline_git_blame"},
5-
//{"keys": ["f8"], "command": "blame_insta_diff"},
4+
//{"keys": ["f5"], "command": "blame_toggle_inline"},
5+
//{"keys": ["f8"], "command": "blame_instadiff"},
66
]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{"keys": ["ctrl+alt+b"], "command": "blame"},
33
{"keys": ["ctrl+alt+shift+b"], "command": "blame_show_all"},
4-
// {"keys": ["f5"], "command": "toggle_inline_git_blame"},
5-
// {"keys": ["f8"], "command": "blame_insta_diff"},
4+
// {"keys": ["f5"], "command": "blame_toggle_inline"},
5+
// {"keys": ["f8"], "command": "blame_instadiff"},
66
]

src/blame_inline.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def rerun(self, **kwargs):
7272
@classmethod
7373
def determine_enablement(cls, view_settings):
7474
enabled = view_settings.get(
75-
ToggleInlineGitBlame.VIEW_SETTINGS_KEY_INLINE_BLAME_ENABLED
75+
BlameToggleInline.VIEW_SETTINGS_KEY_INLINE_BLAME_ENABLED
7676
)
7777
if enabled is None:
7878
enabled = pkg_settings().get(PKG_SETTINGS_KEY_INLINE_BLAME_ENABLED)
@@ -94,7 +94,7 @@ def on_pkg_setting_changed(cls):
9494
if view_is_editor(view)
9595
]
9696
for view in all_editor_views:
97-
ToggleInlineGitBlame.erase_viewlevel_customization(view)
97+
BlameToggleInline.erase_viewlevel_customization(view)
9898
if not pkg_settings().get(PKG_SETTINGS_KEY_INLINE_BLAME_ENABLED):
9999
view.erase_phantoms(cls.phantom_set_key())
100100
# Do a dummy modification to the view's settings to induce the ViewEventListener applicability check to happen again.
@@ -164,7 +164,7 @@ def maybe_insert_phantoms(self, phantoms):
164164
self.phantom_set.update(phantoms)
165165

166166

167-
class ToggleInlineGitBlame(sublime_plugin.TextCommand):
167+
class BlameToggleInline(sublime_plugin.TextCommand):
168168

169169
# Might as well reuse the same settings key, but at the view-level.
170170
VIEW_SETTINGS_KEY_INLINE_BLAME_ENABLED = PKG_SETTINGS_KEY_INLINE_BLAME_ENABLED

src/blame_instadiff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from .base import BaseBlame
66

77

8-
class BlameInstaDiff(BaseBlame, sublime_plugin.TextCommand):
8+
class BlameInstadiff(BaseBlame, sublime_plugin.TextCommand):
99

1010
# Overrides (TextCommand) ----------------------------------------------------------
1111

0 commit comments

Comments
 (0)