Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 18:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds refresh for when timeline changes

Browse Source
This commit is contained in:
Eric Amodio
2020-01-22 15:42:43 -05:00
committed by Eric Amodio
parent 87c2332fed
commit d7b5fe4cc7
8 changed files with 144 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/vs/workbench/api/browser/mainThreadTimeline.ts
View File

@@ -8,10 +8,12 @@ import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers';
import { ITimelineService, TimelineItem, TimelineProviderDescriptor } from 'vs/workbench/contrib/timeline/common/timeline';
import { URI } from 'vs/base/common/uri';
import { CancellationToken } from 'vs/base/common/cancellation';
import { Emitter } from 'vs/base/common/event';
@extHostNamedCustomer(MainContext.MainThreadTimeline)
export class MainThreadTimeline implements MainThreadTimelineShape {
private readonly _proxy: ExtHostTimelineShape;
private readonly _providerEmitters = new Map<string, Emitter<URI | undefined>>();
constructor(
context: IExtHostContext,
@@ -29,12 +31,24 @@ export class MainThreadTimeline implements MainThreadTimelineShape {
const proxy = this._proxy;
const emitters = this._providerEmitters;
let onDidChange = emitters.get(provider.source);
// eslint-disable-next-line eqeqeq
if (onDidChange == null) {
onDidChange = new Emitter<URI | undefined>();
emitters.set(provider.source, onDidChange);
}
this._timelineService.registerTimelineProvider({
...provider,
onDidChange: onDidChange.event,
provideTimeline(uri: URI, since: number, token: CancellationToken) {
return proxy.$getTimeline(provider.source, uri, since, token);
},
dispose() { }
dispose() {
emitters.delete(provider.source);
onDidChange?.dispose();
}
});
}
@@ -43,6 +57,13 @@ export class MainThreadTimeline implements MainThreadTimelineShape {
this._timelineService.unregisterTimelineProvider(source);
}
$emitTimelineChangeEvent(source: string, uri: URI | undefined): void {
console.log(`MainThreadTimeline#emitChangeEvent: source=${source} uri=${uri?.toString(true)}`);
const emitter = this._providerEmitters.get(source);
emitter?.fire(uri);
}
dispose(): void {
// noop
}

3
src/vs/workbench/api/common/extHost.protocol.ts
View File

@@ -801,8 +801,9 @@ export interface MainThreadTunnelServiceShape extends IDisposable {
export interface MainThreadTimelineShape extends IDisposable {
$registerTimelineProvider(provider: TimelineProviderDescriptor): void;
$unregisterTimelineProvider(source: string): void;
$emitTimelineChangeEvent(source: string, uri: UriComponents | undefined): void;
$getTimeline(resource: UriComponents, since: number, token: CancellationToken): Promise<TimelineItem[]>;
$getTimeline(uri: UriComponents, since: number, token: CancellationToken): Promise<TimelineItem[]>;
}
// -- extension host

23
src/vs/workbench/api/common/extHostTimeline.ts
View File

@@ -39,13 +39,20 @@ export class ExtHostTimeline implements IExtHostTimeline {
}
registerTimelineProvider(provider: vscode.TimelineProvider, commandConverter: CommandsConverter): IDisposable {
const disposables = new DisposableStore();
const timelineDisposables = new DisposableStore();
const convertTimelineItem = this.convertTimelineItem(provider.source, commandConverter, timelineDisposables);
let disposable: IDisposable | undefined;
if (provider.onDidChange) {
console.log(`ExtHostTimeline#registerTimelineProvider: provider=${provider.source} hooking up onDidChange`);
disposable = provider.onDidChange(this.emitTimelineChangeEvent(provider.source), this);
}
const convertTimelineItem = this.convertTimelineItem(provider.source, commandConverter, disposables);
return this.registerTimelineProviderCore({
...provider,
async provideTimeline(uri: URI, since: number, token: CancellationToken) {
disposables.clear();
timelineDisposables.clear();
const results = await provider.provideTimeline(uri, since, token);
// eslint-disable-next-line eqeqeq
@@ -54,7 +61,8 @@ export class ExtHostTimeline implements IExtHostTimeline {
: [];
},
dispose() {
disposables.dispose();
disposable?.dispose();
timelineDisposables.dispose();
}
});
}
@@ -90,6 +98,13 @@ export class ExtHostTimeline implements IExtHostTimeline {
};
}
private emitTimelineChangeEvent(source: string) {
return (uri: vscode.Uri | undefined) => {
console.log(`ExtHostTimeline#registerTimelineProvider: provider=${source} onDidChange fired; uri=${uri?.toString(true)}`);
this._proxy.$emitTimelineChangeEvent(source, uri);
};
}
private registerTimelineProviderCore(provider: TimelineProvider): IDisposable {
console.log(`ExtHostTimeline#registerTimelineProvider: provider=${provider.source}`);