Browse Source
Fixes #59 - Updates command context to opened file state
Removes insiders restriction from Open in Remote commandsmain
Eric Amodio
7 years ago
9 changed files with 244 additions and 216 deletions
Split View
Diff Options
-
+42 -42package.json
-
+3 -4src/blameActiveLineController.ts
-
+3 -4src/blameAnnotationController.ts
-
+0 -100src/blameabilityTracker.ts
-
+3 -1src/commands/common.ts
-
+6 -59src/extension.ts
-
+9 -0src/git/git.ts
-
+163 -0src/git/gitContextTracker.ts
-
+15 -6src/gitService.ts
+ 42
- 42
package.json
View File
+ 3
- 4
src/blameActiveLineController.ts
View File
+ 3
- 4
src/blameAnnotationController.ts
View File
+ 0
- 100
src/blameabilityTracker.ts
View File
| @ -1,100 +0,0 @@ | |||
| 'use strict'; | |||
| import { Disposable, Event, EventEmitter, TextDocument, TextDocumentChangeEvent, TextEditor, window, workspace } from 'vscode'; | |||
| import { CommandContext, setCommandContext } from './commands'; | |||
| import { TextDocumentComparer } from './comparers'; | |||
| import { GitService } from './gitService'; | |||
| export interface BlameabilityChangeEvent { | |||
| blameable: boolean; | |||
| editor: TextEditor; | |||
| } | |||
| export class BlameabilityTracker extends Disposable { | |||
| private _onDidChange = new EventEmitter<BlameabilityChangeEvent>(); | |||
| get onDidChange(): Event<BlameabilityChangeEvent> { | |||
| return this._onDidChange.event; | |||
| } | |||
| private _disposable: Disposable; | |||
| private _documentChangeDisposable: Disposable; | |||
| private _editor: TextEditor; | |||
| private _isBlameable: boolean; | |||
| constructor(private git: GitService) { | |||
| super(() => this.dispose()); | |||
| const subscriptions: Disposable[] = []; | |||
| subscriptions.push(window.onDidChangeActiveTextEditor(this._onActiveTextEditorChanged, this)); | |||
| subscriptions.push(workspace.onDidSaveTextDocument(this._onTextDocumentSaved, this)); | |||
| subscriptions.push(this.git.onDidBlameFail(this._onBlameFailed, this)); | |||
| this._disposable = Disposable.from(...subscriptions); | |||
| this._onActiveTextEditorChanged(window.activeTextEditor); | |||
| } | |||
| dispose() { | |||
| this._disposable && this._disposable.dispose(); | |||
| this._documentChangeDisposable && this._documentChangeDisposable.dispose(); | |||
| } | |||
| private _onActiveTextEditorChanged(editor: TextEditor) { | |||
| this._editor = editor; | |||
| let blameable = editor && editor.document && !editor.document.isDirty; | |||
| if (blameable) { | |||
| blameable = this.git.getBlameability(editor.document.fileName); | |||
| } | |||
| this._subscribeToDocumentChanges(); | |||
| this.updateBlameability(blameable, true); | |||
| } | |||
| private _onBlameFailed(key: string) { | |||
| const fileName = this._editor && this._editor.document && this._editor.document.fileName; | |||
| if (!fileName || key !== this.git.getCacheEntryKey(fileName)) return; | |||
| this.updateBlameability(false); | |||
| } | |||
| private _onTextDocumentChanged(e: TextDocumentChangeEvent) { | |||
| if (!TextDocumentComparer.equals(this._editor && this._editor.document, e && e.document)) return; | |||
| // Can't unsubscribe here because undo doesn't trigger any other event | |||
| //this._unsubscribeToDocumentChanges(); | |||
| //this.updateBlameability(false); | |||
| // We have to defer because isDirty is not reliable inside this event | |||
| setTimeout(() => this.updateBlameability(!e.document.isDirty), 1); | |||
| } | |||
| private _onTextDocumentSaved(e: TextDocument) { | |||
| if (!TextDocumentComparer.equals(this._editor && this._editor.document, e)) return; | |||
| // Don't need to resubscribe as we aren't unsubscribing on document changes anymore | |||
| //this._subscribeToDocumentChanges(); | |||
| this.updateBlameability(!e.isDirty); | |||
| } | |||
| private _subscribeToDocumentChanges() { | |||
| this._unsubscribeToDocumentChanges(); | |||
| this._documentChangeDisposable = workspace.onDidChangeTextDocument(this._onTextDocumentChanged, this); | |||
| } | |||
| private _unsubscribeToDocumentChanges() { | |||
| this._documentChangeDisposable && this._documentChangeDisposable.dispose(); | |||
| this._documentChangeDisposable = undefined; | |||
| } | |||
| private updateBlameability(blameable: boolean, force: boolean = false) { | |||
| if (!force && this._isBlameable === blameable) return; | |||
| setCommandContext(CommandContext.IsBlameable, blameable); | |||
| this._onDidChange.fire({ | |||
| blameable: blameable, | |||
| editor: this._editor | |||
| }); | |||
| } | |||
| } | |||
+ 3
- 1
src/commands/common.ts
View File
+ 6
- 59
src/extension.ts
View File
+ 9
- 0
src/git/git.ts
View File
+ 163
- 0
src/git/gitContextTracker.ts
View File
| @ -0,0 +1,163 @@ | |||
| 'use strict'; | |||
| import { Disposable, Event, EventEmitter, TextDocument, TextDocumentChangeEvent, TextEditor, window, workspace } from 'vscode'; | |||
| import { CommandContext, setCommandContext } from '../commands'; | |||
| import { TextDocumentComparer } from '../comparers'; | |||
| import { GitService, GitUri } from '../gitService'; | |||
| import { Logger } from '../logger'; | |||
| export interface BlameabilityChangeEvent { | |||
| blameable: boolean; | |||
| editor: TextEditor; | |||
| } | |||
| export class GitContextTracker extends Disposable { | |||
| private _onDidBlameabilityChange = new EventEmitter<BlameabilityChangeEvent>(); | |||
| get onDidBlameabilityChange(): Event<BlameabilityChangeEvent> { | |||
| return this._onDidBlameabilityChange.event; | |||
| } | |||
| private _disposable: Disposable; | |||
| private _documentChangeDisposable: Disposable; | |||
| private _editor: TextEditor; | |||
| private _gitEnabled: boolean; | |||
| private _isBlameable: boolean; | |||
| constructor(private git: GitService) { | |||
| super(() => this.dispose()); | |||
| const subscriptions: Disposable[] = []; | |||
| subscriptions.push(window.onDidChangeActiveTextEditor(this._onActiveTextEditorChanged, this)); | |||
| subscriptions.push(workspace.onDidChangeConfiguration(this._onConfigurationChanged, this)); | |||
| subscriptions.push(workspace.onDidSaveTextDocument(this._onTextDocumentSaved, this)); | |||
| subscriptions.push(this.git.onDidBlameFail(this._onBlameFailed, this)); | |||
| this._disposable = Disposable.from(...subscriptions); | |||
| setCommandContext(CommandContext.IsRepository, !!this.git.repoPath); | |||
| this._onConfigurationChanged(); | |||
| this._onActiveTextEditorChanged(window.activeTextEditor); | |||
| } | |||
| dispose() { | |||
| this._disposable && this._disposable.dispose(); | |||
| this._documentChangeDisposable && this._documentChangeDisposable.dispose(); | |||
| } | |||
| _onConfigurationChanged() { | |||
| const gitEnabled = workspace.getConfiguration('git').get<boolean>('enabled'); | |||
| if (this._gitEnabled !== gitEnabled) { | |||
| this._gitEnabled = gitEnabled; | |||
| setCommandContext(CommandContext.Enabled, gitEnabled); | |||
| this._onActiveTextEditorChanged(window.activeTextEditor); | |||
| } | |||
| } | |||
| private _onActiveTextEditorChanged(editor: TextEditor) { | |||
| this._editor = editor; | |||
| this._updateContext(this._gitEnabled && editor); | |||
| this._subscribeToDocumentChanges(); | |||
| } | |||
| private _onBlameFailed(key: string) { | |||
| const fileName = this._editor && this._editor.document && this._editor.document.fileName; | |||
| if (!fileName || key !== this.git.getCacheEntryKey(fileName)) return; | |||
| this._updateBlameability(false); | |||
| } | |||
| private _onTextDocumentChanged(e: TextDocumentChangeEvent) { | |||
| if (!TextDocumentComparer.equals(this._editor && this._editor.document, e && e.document)) return; | |||
| // Can't unsubscribe here because undo doesn't trigger any other event | |||
| //this._unsubscribeToDocumentChanges(); | |||
| //this.updateBlameability(false); | |||
| // We have to defer because isDirty is not reliable inside this event | |||
| setTimeout(() => this._updateBlameability(!e.document.isDirty), 1); | |||
| } | |||
| private _onTextDocumentSaved(e: TextDocument) { | |||
| if (!TextDocumentComparer.equals(this._editor && this._editor.document, e)) return; | |||
| // Don't need to resubscribe as we aren't unsubscribing on document changes anymore | |||
| //this._subscribeToDocumentChanges(); | |||
| this._updateBlameability(!e.isDirty); | |||
| } | |||
| private _subscribeToDocumentChanges() { | |||
| this._unsubscribeToDocumentChanges(); | |||
| this._documentChangeDisposable = workspace.onDidChangeTextDocument(this._onTextDocumentChanged, this); | |||
| } | |||
| private _unsubscribeToDocumentChanges() { | |||
| this._documentChangeDisposable && this._documentChangeDisposable.dispose(); | |||
| this._documentChangeDisposable = undefined; | |||
| } | |||
| private async _updateContext(editor: TextEditor) { | |||
| try { | |||
| const gitUri = editor && await GitUri.fromUri(editor.document.uri, this.git); | |||
| await Promise.all([ | |||
| this._updateEditorContext(gitUri, editor), | |||
| this._updateContextHasRemotes(gitUri) | |||
| ]); | |||
| } | |||
| catch (ex) { | |||
| Logger.error(ex, 'GitEditorTracker._updateContext'); | |||
| } | |||
| } | |||
| private async _updateContextHasRemotes(uri: GitUri | undefined) { | |||
| try { | |||
| let hasRemotes = false; | |||
| if (uri) { | |||
| const repoPath = uri.repoPath || this.git.repoPath; | |||
| if (repoPath) { | |||
| const remotes = await this.git.getRemotes(repoPath); | |||
| hasRemotes = remotes.length !== 0; | |||
| } | |||
| } | |||
| setCommandContext(CommandContext.HasRemotes, hasRemotes); | |||
| } | |||
| catch (ex) { | |||
| Logger.error(ex, 'GitEditorTracker._updateContextHasRemotes'); | |||
| } | |||
| } | |||
| private async _updateEditorContext(uri: GitUri | undefined, editor: TextEditor | undefined) { | |||
| try { | |||
| const tracked = uri && await this.git.isTracked(uri); | |||
| setCommandContext(CommandContext.IsTracked, tracked); | |||
| let blameable = tracked && editor && editor.document && !editor.document.isDirty; | |||
| if (blameable) { | |||
| blameable = await this.git.getBlameability(uri); | |||
| } | |||
| this._updateBlameability(blameable, true); | |||
| } | |||
| catch (ex) { | |||
| Logger.error(ex, 'GitEditorTracker._updateEditorContext'); | |||
| } | |||
| } | |||
| private _updateBlameability(blameable: boolean, force: boolean = false) { | |||
| if (!force && this._isBlameable === blameable) return; | |||
| try { | |||
| setCommandContext(CommandContext.IsBlameable, blameable); | |||
| this._onDidBlameabilityChange.fire({ | |||
| blameable: blameable, | |||
| editor: this._editor | |||
| }); | |||
| } | |||
| catch (ex) { | |||
| Logger.error(ex, 'GitEditorTracker._updateBlameability'); | |||
| } | |||
| } | |||
| } | |||