Fixes (read: hacks) blame with visible whitespace

Adds diff menu commands always
Attempts to move the diff file to the correct line number
Fixes code action provider -- works again
Deletes deprecated code
This commit is contained in:
Eric Amodio
2016-09-05 16:40:38 -04:00
parent d04696ac1d
commit b7920f3c3d
12 changed files with 179 additions and 236 deletions

View File

@@ -23,6 +23,16 @@
"main": "./out/src/extension",
"contributes": {
"commands": [{
"command": "gitlens.diffWithPrevious",
"title": "GitLens: Open Diff with Previous Commit",
"category": "GitLens"
},
{
"command": "gitlens.diffWithWorking",
"title": "GitLens: Open Diff with Working Tree",
"category": "GitLens"
},
{
"command": "gitlens.showBlame",
"title": "GitLens: Show Git Blame",
"category": "GitLens"
@@ -31,16 +41,6 @@
"command": "gitlens.toggleBlame",
"title": "GitLens: Toggle Git Blame",
"category": "GitLens"
},
{
"command": "gitlens.diffWithPrevious",
"title": "GitLens: Diff Commit with Previous",
"category": "GitLens"
},
{
"command": "gitlens.diffWithWorking",
"title": "GitLens: Diff Commit with Working Tree",
"category": "GitLens"
}],
"menus": {
"editor/title": [{
@@ -48,22 +48,29 @@
"command": "gitlens.toggleBlame",
"group": "gitlens"
}],
"editor/context": [{
"editor/context": [
{
"when": "editorTextFocus",
"command": "gitlens.toggleBlame",
"command": "gitlens.diffWithWorking",
"group": "gitlens@1.0"
},
{
"when": "editorTextFocus && editorHasCodeActionsProvider",
"command": "gitlens.diffWithWorking",
"group": "gitlens.blame@1.1"
"when": "editorTextFocus",
"command": "gitlens.diffWithPrevious",
"group": "gitlens@1.1"
},
{
"when": "editorTextFocus && editorHasCodeActionsProvider",
"command": "gitlens.diffWithPrevious",
"group": "gitlens.blame@1.2"
"when": "editorTextFocus",
"command": "gitlens.toggleBlame",
"group": "gitlens-blame@1.2"
}]
}
},
"keybindings": [{
"command": "gitlens.toggleBlame",
"key": "alt+b",
"mac": "alt+b",
"when": "editorTextFocus"
}]
},
"activationEvents": [
"*"