Merge branch 'master' into diff

This commit is contained in:
Joao Moreno
2017-02-17 16:36:23 +01:00
127 changed files with 5308 additions and 2439 deletions

View File

@@ -17,14 +17,14 @@ export class GitContentProvider {
private uris = new Set<Uri>();
constructor(private model: Model, onGitChange: Event<Uri>) {
constructor(private model: Model) {
this.disposables.push(
onGitChange(this.fireChangeEvents, this),
model.onDidChangeRepository(this.fireChangeEvents, this),
workspace.registerTextDocumentContentProvider('git', this)
);
}
private fireChangeEvents(): void {
private fireChangeEvents(arg): void {
for (let uri of this.uris) {
this.onDidChangeEmitter.fire(uri);
}