Browse Source
Removes git-blame document scheme
Removes git-blame content provider Fixes some CodeLens issues Adds support for git uris in more places Adds git content CodeLens providermain
Eric Amodio
8 years ago
12 changed files with 146 additions and 293 deletions
Unified View
Diff Options
-
+1 -1src/commands/diffWithPrevious.ts
-
+1 -1src/commands/diffWithWorking.ts
-
+2 -2src/commands/showBlameHistory.ts
-
+1 -1src/commands/showFileHistory.ts
-
+1 -2src/constants.ts
-
+9 -11src/extension.ts
-
+10 -4src/git/git.ts
-
+0 -93src/gitBlameCodeLensProvider.ts
-
+0 -110src/gitBlameContentProvider.ts
-
+18 -7src/gitCodeLensProvider.ts
-
+28 -61src/gitProvider.ts
-
+75 -0src/gitRevisionCodeLensProvider.ts
+ 1
- 1
src/commands/diffWithPrevious.ts
View File
+ 1
- 1
src/commands/diffWithWorking.ts
View File
+ 2
- 2
src/commands/showBlameHistory.ts
View File
+ 1
- 1
src/commands/showFileHistory.ts
View File
+ 1
- 2
src/constants.ts
View File
+ 9
- 11
src/extension.ts
View File
+ 10
- 4
src/git/git.ts
View File
+ 0
- 93
src/gitBlameCodeLensProvider.ts
View File
| @ -1,93 +0,0 @@ | |||||
| 'use strict'; | |||||
| import { CancellationToken, CodeLens, CodeLensProvider, DocumentSelector, ExtensionContext, Range, TextDocument, Uri } from 'vscode'; | |||||
| import { Commands, DocumentSchemes } from './constants'; | |||||
| import GitProvider, { GitCommit } from './gitProvider'; | |||||
| import * as path from 'path'; | |||||
| export class GitDiffWithWorkingTreeCodeLens extends CodeLens { | |||||
| constructor(git: GitProvider, public fileName: string, public commit: GitCommit, range: Range) { | |||||
| super(range); | |||||
| } | |||||
| } | |||||
| export class GitDiffWithPreviousCodeLens extends CodeLens { | |||||
| constructor(git: GitProvider, public fileName: string, public commit: GitCommit, range: Range) { | |||||
| super(range); | |||||
| } | |||||
| } | |||||
| export default class GitBlameCodeLensProvider implements CodeLensProvider { | |||||
| static selector: DocumentSelector = { scheme: DocumentSchemes.GitBlame }; | |||||
| constructor(context: ExtensionContext, private git: GitProvider) { } | |||||
| provideCodeLenses(document: TextDocument, token: CancellationToken): CodeLens[] | Thenable<CodeLens[]> { | |||||
| const data = GitProvider.fromBlameUri(document.uri); | |||||
| const fileName = data.fileName; | |||||
| const sha = data.sha; | |||||
| return this.git.getBlameForFile(fileName).then(blame => { | |||||
| const lenses: CodeLens[] = []; | |||||
| if (!blame) return lenses; | |||||
| const commit = blame.commits.get(sha); | |||||
| const absoluteFileName = path.join(commit.repoPath, fileName); | |||||
| // Add codelens to each "group" of blame lines | |||||
| const lines = blame.lines.filter(l => l.sha === sha && l.originalLine >= data.range.start.line && l.originalLine <= data.range.end.line); | |||||
| let lastLine = lines[0].originalLine; | |||||
| lines.forEach(l => { | |||||
| if (l.originalLine !== lastLine + 1) { | |||||
| lenses.push(new GitDiffWithWorkingTreeCodeLens(this.git, absoluteFileName, commit, new Range(l.originalLine, 0, l.originalLine, 1))); | |||||
| if (commit.previousSha) { | |||||
| lenses.push(new GitDiffWithPreviousCodeLens(this.git, absoluteFileName, commit, new Range(l.originalLine, 1, l.originalLine, 2))); | |||||
| } | |||||
| } | |||||
| lastLine = l.originalLine; | |||||
| }); | |||||
| // Check if we have a lens for the whole document -- if not add one | |||||
| if (!lenses.find(l => l.range.start.line === 0 && l.range.end.line === 0)) { | |||||
| lenses.push(new GitDiffWithWorkingTreeCodeLens(this.git, absoluteFileName, commit, new Range(0, 0, 0, 1))); | |||||
| if (commit.previousSha) { | |||||
| lenses.push(new GitDiffWithPreviousCodeLens(this.git, absoluteFileName, commit, new Range(0, 1, 0, 2))); | |||||
| } | |||||
| } | |||||
| return lenses; | |||||
| }); | |||||
| } | |||||
| resolveCodeLens(lens: CodeLens, token: CancellationToken): Thenable<CodeLens> { | |||||
| if (lens instanceof GitDiffWithWorkingTreeCodeLens) return this._resolveDiffWithWorkingTreeCodeLens(lens, token); | |||||
| if (lens instanceof GitDiffWithPreviousCodeLens) return this._resolveGitDiffWithPreviousCodeLens(lens, token); | |||||
| return Promise.reject<CodeLens>(undefined); | |||||
| } | |||||
| _resolveDiffWithWorkingTreeCodeLens(lens: GitDiffWithWorkingTreeCodeLens, token: CancellationToken): Thenable<CodeLens> { | |||||
| lens.command = { | |||||
| title: `Compare with Working Tree`, | |||||
| command: Commands.DiffWithWorking, | |||||
| arguments: [ | |||||
| Uri.file(lens.fileName), | |||||
| lens.commit.sha, | |||||
| lens.commit.uri, | |||||
| lens.range.start.line | |||||
| ] | |||||
| }; | |||||
| return Promise.resolve(lens); | |||||
| } | |||||
| _resolveGitDiffWithPreviousCodeLens(lens: GitDiffWithPreviousCodeLens, token: CancellationToken): Thenable<CodeLens> { | |||||
| lens.command = { | |||||
| title: `Compare with Previous (${lens.commit.previousSha})`, | |||||
| command: Commands.DiffWithPrevious, | |||||
| arguments: [ | |||||
| Uri.file(lens.fileName), | |||||
| lens.commit, | |||||
| lens.range.start.line | |||||
| ] | |||||
| }; | |||||
| return Promise.resolve(lens); | |||||
| } | |||||
| } | |||||
+ 0
- 110
src/gitBlameContentProvider.ts
View File
| @ -1,110 +0,0 @@ | |||||
| 'use strict'; | |||||
| import { EventEmitter, ExtensionContext, OverviewRulerLane, Range, TextEditor, TextEditorDecorationType, TextDocumentContentProvider, Uri, window } from 'vscode'; | |||||
| import { DocumentSchemes } from './constants'; | |||||
| import GitProvider, { IGitBlameUriData } from './gitProvider'; | |||||
| import { Logger } from './logger'; | |||||
| import * as moment from 'moment'; | |||||
| export default class GitBlameContentProvider implements TextDocumentContentProvider { | |||||
| static scheme = DocumentSchemes.GitBlame; | |||||
| private _blameDecoration: TextEditorDecorationType; | |||||
| private _onDidChange = new EventEmitter<Uri>(); | |||||
| //private _subscriptions: Disposable; | |||||
| constructor(context: ExtensionContext, private git: GitProvider) { | |||||
| this._blameDecoration = window.createTextEditorDecorationType({ | |||||
| dark: { | |||||
| backgroundColor: 'rgba(255, 255, 255, 0.15)', | |||||
| gutterIconPath: context.asAbsolutePath('images/blame-dark.png'), | |||||
| overviewRulerColor: 'rgba(255, 255, 255, 0.75)' | |||||
| }, | |||||
| light: { | |||||
| backgroundColor: 'rgba(0, 0, 0, 0.15)', | |||||
| gutterIconPath: context.asAbsolutePath('images/blame-light.png'), | |||||
| overviewRulerColor: 'rgba(0, 0, 0, 0.75)' | |||||
| }, | |||||
| gutterIconSize: 'contain', | |||||
| overviewRulerLane: OverviewRulerLane.Right, | |||||
| isWholeLine: true | |||||
| }); | |||||
| //this._subscriptions = Disposable.from( | |||||
| // window.onDidChangeActiveTextEditor(e => e ? Logger.log(e.document.uri) : Logger.log('active missing')), | |||||
| //); | |||||
| } | |||||
| dispose() { | |||||
| this._onDidChange.dispose(); | |||||
| //this._subscriptions && this._subscriptions.dispose(); | |||||
| } | |||||
| get onDidChange() { | |||||
| return this._onDidChange.event; | |||||
| } | |||||
| public update(uri: Uri) { | |||||
| this._onDidChange.fire(uri); | |||||
| } | |||||
| provideTextDocumentContent(uri: Uri): string | Thenable<string> { | |||||
| const data = GitProvider.fromBlameUri(uri); | |||||
| //const editor = this._findEditor(Uri.file(join(data.repoPath, data.file))); | |||||
| return this.git.getVersionedFileText(data.originalFileName || data.fileName, data.repoPath, data.sha) | |||||
| .then(text => { | |||||
| this.update(uri); | |||||
| // TODO: This only works on the first load -- not after since it is cached | |||||
| this._tryAddBlameDecorations(uri, data); | |||||
| // TODO: This needs to move to selection somehow to show on the main file editor | |||||
| //this._addBlameDecorations(editor, data); | |||||
| return text; | |||||
| }) | |||||
| .catch(ex => Logger.error('[GitLens.GitBlameContentProvider]', 'getVersionedFileText', ex)); | |||||
| // return this.git.getVersionedFile(data.fileName, data.sha).then(dst => { | |||||
| // let uri = Uri.parse(`file:${dst}`) | |||||
| // return workspace.openTextDocument(uri).then(doc => { | |||||
| // this.update(uri); | |||||
| // return doc.getText(); | |||||
| // }); | |||||
| // }); | |||||
| } | |||||
| private _findEditor(uri: Uri): TextEditor { | |||||
| let uriString = uri.toString(); | |||||
| const matcher = (e: TextEditor) => (e && e.document.uri.toString()) === uriString; | |||||
| if (matcher(window.activeTextEditor)) { | |||||
| return window.activeTextEditor; | |||||
| } | |||||
| return window.visibleTextEditors.find(matcher); | |||||
| } | |||||
| private _tryAddBlameDecorations(uri: Uri, data: IGitBlameUriData) { | |||||
| // Needs to be on a timer for some reason because we won't find the editor otherwise -- is there an event? | |||||
| let handle = setInterval(() => { | |||||
| let editor = this._findEditor(uri); | |||||
| if (!editor) return; | |||||
| clearInterval(handle); | |||||
| this.git.getBlameForShaRange(data.fileName, data.sha, data.range).then(blame => { | |||||
| if (!blame || !blame.lines.length) return; | |||||
| editor.setDecorations(this._blameDecoration, blame.lines.map(l => { | |||||
| return { | |||||
| range: editor.document.validateRange(new Range(l.originalLine, 0, l.originalLine, 1000000)), | |||||
| hoverMessage: `${blame.commit.message}\n${blame.commit.author}\n${moment(blame.commit.date).format('MMMM Do, YYYY hh:MMa')}\n${l.sha}` | |||||
| }; | |||||
| })); | |||||
| }); | |||||
| }, 200); | |||||
| } | |||||
| // private _addBlameDecorations(editor: TextEditor, data: IGitBlameUriData) { | |||||
| // editor.setDecorations(this._blameDecoration, data.lines.map(l => editor.document.validateRange(new Range(l.line, 0, l.line, 1000000)))); | |||||
| // } | |||||
| } | |||||
+ 18
- 7
src/gitCodeLensProvider.ts
View File
+ 28
- 61
src/gitProvider.ts
View File
+ 75
- 0
src/gitRevisionCodeLensProvider.ts
View File
| @ -0,0 +1,75 @@ | |||||
| 'use strict'; | |||||
| import { Iterables } from './system'; | |||||
| import { CancellationToken, CodeLens, CodeLensProvider, DocumentSelector, ExtensionContext, Range, TextDocument, Uri } from 'vscode'; | |||||
| import { Commands, DocumentSchemes } from './constants'; | |||||
| import GitProvider, { GitCommit, GitUri } from './gitProvider'; | |||||
| export class GitDiffWithWorkingCodeLens extends CodeLens { | |||||
| constructor(git: GitProvider, public fileName: string, public commit: GitCommit, range: Range) { | |||||
| super(range); | |||||
| } | |||||
| } | |||||
| export class GitDiffWithPreviousCodeLens extends CodeLens { | |||||
| constructor(git: GitProvider, public fileName: string, public commit: GitCommit, range: Range) { | |||||
| super(range); | |||||
| } | |||||
| } | |||||
| export default class GitRevisionCodeLensProvider implements CodeLensProvider { | |||||
| static selector: DocumentSelector = { scheme: DocumentSchemes.Git }; | |||||
| constructor(context: ExtensionContext, private git: GitProvider) { } | |||||
| async provideCodeLenses(document: TextDocument, token: CancellationToken): Promise<CodeLens[]> { | |||||
| const gitUri = GitUri.fromUri(document.uri); | |||||
| const lenses: CodeLens[] = []; | |||||
| const log = await this.git.getLogForFile(gitUri.fsPath, gitUri.sha, gitUri.repoPath); | |||||
| if (!log) return lenses; | |||||
| const commit = (gitUri.sha && log.commits.get(gitUri.sha)) || Iterables.first(log.commits.values()); | |||||
| if (!commit) return lenses; | |||||
| lenses.push(new GitDiffWithWorkingCodeLens(this.git, commit.uri.fsPath, commit, new Range(0, 0, 0, 1))); | |||||
| if (commit.previousSha) { | |||||
| lenses.push(new GitDiffWithPreviousCodeLens(this.git, commit.previousUri.fsPath, commit, new Range(0, 1, 0, 2))); | |||||
| } | |||||
| return lenses; | |||||
| } | |||||
| resolveCodeLens(lens: CodeLens, token: CancellationToken): Thenable<CodeLens> { | |||||
| if (lens instanceof GitDiffWithWorkingCodeLens) return this._resolveDiffWithWorkingTreeCodeLens(lens, token); | |||||
| if (lens instanceof GitDiffWithPreviousCodeLens) return this._resolveGitDiffWithPreviousCodeLens(lens, token); | |||||
| return Promise.reject<CodeLens>(undefined); | |||||
| } | |||||
| _resolveDiffWithWorkingTreeCodeLens(lens: GitDiffWithWorkingCodeLens, token: CancellationToken): Thenable<CodeLens> { | |||||
| lens.command = { | |||||
| title: `Compare (${lens.commit.sha}) with Working Tree`, | |||||
| command: Commands.DiffWithWorking, | |||||
| arguments: [ | |||||
| Uri.file(lens.fileName), | |||||
| lens.commit, | |||||
| lens.range.start.line | |||||
| ] | |||||
| }; | |||||
| return Promise.resolve(lens); | |||||
| } | |||||
| _resolveGitDiffWithPreviousCodeLens(lens: GitDiffWithPreviousCodeLens, token: CancellationToken): Thenable<CodeLens> { | |||||
| lens.command = { | |||||
| title: `Compare (${lens.commit.sha}) with Previous (${lens.commit.previousSha})`, | |||||
| command: Commands.DiffWithPrevious, | |||||
| arguments: [ | |||||
| Uri.file(lens.fileName), | |||||
| lens.commit, | |||||
| lens.range.start.line | |||||
| ] | |||||
| }; | |||||
| return Promise.resolve(lens); | |||||
| } | |||||
| } | |||||