Browse Source
Adds blame information in the statusBar
Add new StatusBar settings -- see **Extension Settings** above for details Renames the `gitlens.codeLens.recentChange.command` & `gitlens.codeLens.authors.command` settings options (to align with command names) Adds new `gitlens.diffWithPrevious` option to the `gitlens.codeLens.recentChange.command` & `gitlens.codeLens.authors.command` settings Fixes Diff with Previous when the selection is uncommited Removes `gitlens.blame.annotation.useCodeActions` setting and behaviormain
Eric Amodio
8 years ago
13 changed files with 606 additions and 467 deletions
Split View
Diff Options
-
+13 -3README.md
-
+36 -17package.json
-
+39 -75src/blameAnnotationController.ts
-
+111 -0src/blameStatusBarController.ts
-
+58 -36src/commands.ts
-
+21 -5src/configuration.ts
-
+2 -4src/constants.ts
-
+12 -9src/extension.ts
-
+11 -2src/git/git.ts
-
+0 -51src/gitCodeActionProvider.ts
-
+17 -3src/gitCodeLensProvider.ts
-
+39 -15src/gitProvider.ts
+ 13
- 3
README.md
View File
+ 36
- 17
package.json
View File
src/gitBlameController.ts → src/blameAnnotationController.ts
View File
+ 111
- 0
src/blameStatusBarController.ts
View File
| @ -0,0 +1,111 @@ | |||
| 'use strict' | |||
| import {Disposable, ExtensionContext, StatusBarAlignment, StatusBarItem, TextEditor, window, workspace} from 'vscode'; | |||
| import {IConfig, IStatusBarConfig, StatusBarCommand} from './configuration'; | |||
| import {WorkspaceState} from './constants'; | |||
| import GitProvider, {IGitBlameLine} from './gitProvider'; | |||
| import * as moment from 'moment'; | |||
| const isEqual = require('lodash.isequal'); | |||
| export default class BlameStatusBarController extends Disposable { | |||
| private _config: IStatusBarConfig; | |||
| private _disposable: Disposable; | |||
| private _statusBarItem: StatusBarItem|null; | |||
| private _statusBarDisposable: Disposable|null; | |||
| constructor(private context: ExtensionContext, private git: GitProvider) { | |||
| super(() => this.dispose()); | |||
| this._onConfigure(); | |||
| const subscriptions: Disposable[] = []; | |||
| subscriptions.push(workspace.onDidChangeConfiguration(this._onConfigure, this)); | |||
| this._disposable = Disposable.from(...subscriptions); | |||
| } | |||
| dispose() { | |||
| this._statusBarDisposable && this._statusBarDisposable.dispose(); | |||
| this._statusBarItem && this._statusBarItem.dispose(); | |||
| this._disposable && this._disposable.dispose(); | |||
| } | |||
| private _onConfigure() { | |||
| const config = workspace.getConfiguration('').get<IConfig>('gitlens'); | |||
| if (!isEqual(config.statusBar, this._config)) { | |||
| this._statusBarDisposable && this._statusBarDisposable.dispose(); | |||
| this._statusBarItem && this._statusBarItem.dispose(); | |||
| if (config.statusBar.enabled) { | |||
| this._statusBarItem = window.createStatusBarItem(StatusBarAlignment.Right, 1000); | |||
| switch (config.statusBar.command) { | |||
| case StatusBarCommand.ToggleCodeLens: | |||
| if (config.codeLens.visibility !== 'ondemand') { | |||
| config.statusBar.command = StatusBarCommand.BlameAnnotate; | |||
| } | |||
| break; | |||
| case StatusBarCommand.GitViewHistory: | |||
| if (!this.context.workspaceState.get(WorkspaceState.HasGitHistoryExtension, false)) { | |||
| config.statusBar.command = StatusBarCommand.BlameExplorer; | |||
| } | |||
| break; | |||
| } | |||
| this._statusBarItem.command = config.statusBar.command; | |||
| const subscriptions: Disposable[] = []; | |||
| subscriptions.push(window.onDidChangeActiveTextEditor(this._onActiveSelectionChanged, this)); | |||
| subscriptions.push(window.onDidChangeTextEditorSelection(e => this._onActiveSelectionChanged(e.textEditor))); | |||
| this._statusBarDisposable = Disposable.from(...subscriptions); | |||
| } else { | |||
| this._statusBarDisposable = null; | |||
| this._statusBarItem = null; | |||
| } | |||
| } | |||
| this._config = config.statusBar; | |||
| } | |||
| private _onActiveSelectionChanged(editor: TextEditor) : void { | |||
| if (!editor || !editor.document || editor.document.isUntitled) { | |||
| this.clear(); | |||
| return; | |||
| } | |||
| this.git.getBlameForLine(editor.document.uri.fsPath, editor.selection.active.line) | |||
| .then(blame => blame ? this.show(blame) : this.clear()); | |||
| } | |||
| clear() { | |||
| this._statusBarItem && this._statusBarItem.hide(); | |||
| } | |||
| show(blameLine: IGitBlameLine) { | |||
| const commit = blameLine.commit; | |||
| this._statusBarItem.text = `$(git-commit) ${commit.author}, ${moment(commit.date).fromNow()}`; | |||
| //this._statusBarItem.tooltip = [`Last changed by ${commit.author}`, moment(commit.date).format('MMMM Do, YYYY h:MM a'), '', commit.message].join('\n'); | |||
| switch (this._config.command) { | |||
| case StatusBarCommand.BlameAnnotate: | |||
| this._statusBarItem.tooltip = 'Toggle Blame Annotations'; | |||
| break; | |||
| case StatusBarCommand.BlameExplorer: | |||
| this._statusBarItem.tooltip = 'Open Blame History'; | |||
| break; | |||
| case StatusBarCommand.DiffWithPrevious: | |||
| this._statusBarItem.tooltip = 'Compare to Previous Commit'; | |||
| break; | |||
| case StatusBarCommand.ToggleCodeLens: | |||
| this._statusBarItem.tooltip = 'Toggle Blame CodeLens'; | |||
| break; | |||
| case StatusBarCommand.GitViewHistory: | |||
| this._statusBarItem.tooltip = 'View Git File History'; | |||
| break; | |||
| } | |||
| this._statusBarItem.show(); | |||
| } | |||
| } | |||
+ 58
- 36
src/commands.ts
View File
+ 21
- 5
src/configuration.ts
View File
+ 2
- 4
src/constants.ts
View File
+ 12
- 9
src/extension.ts
View File
+ 11
- 2
src/git/git.ts
View File
+ 0
- 51
src/gitCodeActionProvider.ts
View File
| @ -1,51 +0,0 @@ | |||
| 'use strict'; | |||
| import {CancellationToken, CodeActionContext, CodeActionProvider, Command, DocumentSelector, ExtensionContext, Range, TextDocument, Uri, window} from 'vscode'; | |||
| import {Commands, DocumentSchemes} from './constants'; | |||
| import GitProvider from './gitProvider'; | |||
| import {DiagnosticSource} from './constants'; | |||
| export default class GitCodeActionProvider implements CodeActionProvider { | |||
| static selector: DocumentSelector = { scheme: DocumentSchemes.File }; | |||
| constructor(context: ExtensionContext, private git: GitProvider) { } | |||
| provideCodeActions(document: TextDocument, range: Range, context: CodeActionContext, token: CancellationToken): Command[] | Thenable<Command[]> { | |||
| if (!context.diagnostics.some(d => d.source === DiagnosticSource)) { | |||
| return []; | |||
| } | |||
| return this.git.getBlameForLine(document.fileName, range.start.line) | |||
| .then(blame => { | |||
| const actions: Command[] = []; | |||
| if (!blame) return actions; | |||
| if (blame.commit.sha) { | |||
| actions.push({ | |||
| title: `GitLens: Diff ${blame.commit.sha} with working tree`, | |||
| command: Commands.DiffWithWorking, | |||
| arguments: [ | |||
| Uri.file(document.fileName), | |||
| blame.commit.sha, blame.commit.uri, | |||
| blame.line.line | |||
| ] | |||
| }); | |||
| } | |||
| if (blame.commit.sha && blame.commit.previousSha) { | |||
| actions.push({ | |||
| title: `GitLens: Diff ${blame.commit.sha} with previous ${blame.commit.previousSha}`, | |||
| command: Commands.DiffWithPrevious, | |||
| arguments: [ | |||
| Uri.file(document.fileName), | |||
| blame.commit.repoPath, | |||
| blame.commit.sha, blame.commit.uri, | |||
| blame.commit.previousSha, blame.commit.previousUri, | |||
| blame.line.line | |||
| ] | |||
| }); | |||
| } | |||
| return actions; | |||
| }); | |||
| } | |||
| } | |||