Skip to content

Commit ffda3a1

Browse files
joaomorenojoaomoreno
committed
1 parent 3e492a3 commit ffda3a1

5 files changed

Lines changed: 67 additions & 31 deletions

File tree

‎extensions/git/src/api/extension.ts‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Model } from '../model';
77
import { GitExtension, Repository, API } from './git';
88
import { ApiRepository, ApiImpl } from './api1';
99
import { Event, EventEmitter } from 'vscode';
10-
import { latchEvent } from '../util';
1110

1211
export function deprecated(_target: any, key: string, descriptor: any): void {
1312
if (typeof descriptor.value !== 'function') {
@@ -26,14 +25,20 @@ export class GitExtensionImpl implements GitExtension {
2625
enabled: boolean = false;
2726

2827
private _onDidChangeEnablement = new EventEmitter<boolean>();
29-
readonly onDidChangeEnablement: Event<boolean> = latchEvent(this._onDidChangeEnablement.event);
28+
readonly onDidChangeEnablement: Event<boolean> = this._onDidChangeEnablement.event;
3029

3130
private _model: Model | undefined = undefined;
3231

3332
set model(model: Model | undefined) {
3433
this._model = model;
3534

36-
this.enabled = !!model;
35+
const enabled = !!model;
36+
37+
if (this.enabled === enabled) {
38+
return;
39+
}
40+
41+
this.enabled = enabled;
3742
this._onDidChangeEnablement.fire(this.enabled);
3843
}
3944

@@ -73,4 +78,4 @@ export class GitExtensionImpl implements GitExtension {
7378

7479
return new ApiImpl(this._model);
7580
}
76-
}
81+
}

‎extensions/git/src/util.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,6 @@ export function filterEvent<T>(event: Event<T>, filter: (e: T) => boolean): Even
4444
return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => event(e => filter(e) && listener.call(thisArgs, e), null, disposables);
4545
}
4646

47-
export function latchEvent<T>(event: Event<T>): Event<T> {
48-
let firstCall = true;
49-
let cache: T;
50-
51-
return filterEvent(event, value => {
52-
let shouldEmit = firstCall || value !== cache;
53-
firstCall = false;
54-
cache = value;
55-
return shouldEmit;
56-
});
57-
}
58-
5947
export function anyEvent<T>(...events: Event<T>[]): Event<T> {
6048
return (listener: (e: T) => any, thisArgs?: any, disposables?: Disposable[]) => {
6149
const result = combinedDisposable(events.map(event => event(i => listener.call(thisArgs, i))));

‎extensions/github/src/commands.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
import * as vscode from 'vscode';
77
import { API as GitAPI } from './typings/git';
88
import { publishRepository } from './publish';
9+
import { combinedDisposable } from './util';
910

10-
export function registerCommands(gitAPI: GitAPI): vscode.Disposable[] {
11-
const disposables = [];
11+
export function registerCommands(gitAPI: GitAPI): vscode.Disposable {
12+
const disposables: vscode.Disposable[] = [];
1213

1314
disposables.push(vscode.commands.registerCommand('github.publish', async () => {
1415
try {
@@ -18,5 +19,5 @@ export function registerCommands(gitAPI: GitAPI): vscode.Disposable[] {
1819
}
1920
}));
2021

21-
return disposables;
22+
return combinedDisposable(disposables);
2223
}

‎extensions/github/src/extension.ts‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,41 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import * as vscode from 'vscode';
6+
import { Disposable, ExtensionContext, extensions } from 'vscode';
77
import { GithubRemoteSourceProvider } from './remoteSourceProvider';
88
import { GitExtension } from './typings/git';
99
import { registerCommands } from './commands';
1010
import { GithubCredentialProviderManager } from './credentialProvider';
11+
import { dispose, combinedDisposable } from './util';
1112

12-
export async function activate(context: vscode.ExtensionContext) {
13-
const gitExtension = vscode.extensions.getExtension<GitExtension>('vscode.git')!.exports;
13+
export function activate(context: ExtensionContext): void {
14+
const disposables = new Set<Disposable>();
15+
context.subscriptions.push(combinedDisposable(disposables));
1416

15-
try {
16-
const gitAPI = gitExtension.getAPI(1);
17+
const init = () => {
18+
try {
19+
const gitAPI = gitExtension.getAPI(1);
1720

18-
context.subscriptions.push(...registerCommands(gitAPI));
19-
context.subscriptions.push(gitAPI.registerRemoteSourceProvider(new GithubRemoteSourceProvider(gitAPI)));
20-
context.subscriptions.push(new GithubCredentialProviderManager(gitAPI));
21-
} catch (err) {
22-
console.error('Could not initialize GitHub extension');
23-
console.warn(err);
24-
}
21+
disposables.add(registerCommands(gitAPI));
22+
disposables.add(gitAPI.registerRemoteSourceProvider(new GithubRemoteSourceProvider(gitAPI)));
23+
disposables.add(new GithubCredentialProviderManager(gitAPI));
24+
} catch (err) {
25+
console.error('Could not initialize GitHub extension');
26+
console.warn(err);
27+
}
28+
};
29+
30+
const onDidChangeGitExtensionEnablement = (enabled: boolean) => {
31+
if (!enabled) {
32+
dispose(disposables);
33+
disposables.clear();
34+
} else {
35+
init();
36+
}
37+
};
38+
39+
40+
const gitExtension = extensions.getExtension<GitExtension>('vscode.git')!.exports;
41+
context.subscriptions.push(gitExtension.onDidChangeEnablement(onDidChangeGitExtensionEnablement));
42+
onDidChangeGitExtensionEnablement(gitExtension.enabled);
2543
}

‎extensions/github/src/util.ts‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*---------------------------------------------------------------------------------------------
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for license information.
4+
*--------------------------------------------------------------------------------------------*/
5+
6+
import * as vscode from 'vscode';
7+
8+
export function dispose(arg: vscode.Disposable | Iterable<vscode.Disposable>): void {
9+
if (arg instanceof vscode.Disposable) {
10+
arg.dispose();
11+
} else {
12+
for (const disposable of arg) {
13+
disposable.dispose();
14+
}
15+
}
16+
}
17+
18+
export function combinedDisposable(disposables: Iterable<vscode.Disposable>): vscode.Disposable {
19+
return {
20+
dispose() {
21+
dispose(disposables);
22+
}
23+
};
24+
}

0 commit comments

Comments
 (0)