-
Notifications
You must be signed in to change notification settings - Fork 28.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Part 1: split up the API. upcoming in part 2: In editor UX for multiple quick diffs. Fixes #169012
- Loading branch information
Showing
13 changed files
with
255 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import { CancellationTokenSource } from 'vs/base/common/cancellation'; | ||
| import { dispose, IDisposable } from 'vs/base/common/lifecycle'; | ||
| import { URI, UriComponents } from 'vs/base/common/uri'; | ||
| import { ExtHostContext, ExtHostQuickDiffShape, MainContext, MainThreadQuickDiffShape } from 'vs/workbench/api/common/extHost.protocol'; | ||
| import { IQuickDiffService, QuickDiffProvider } from 'vs/workbench/contrib/scm/common/quickDiff'; | ||
| import { extHostNamedCustomer, IExtHostContext } from 'vs/workbench/services/extensions/common/extHostCustomers'; | ||
|
|
||
| @extHostNamedCustomer(MainContext.MainThreadQuickDiff) | ||
| export class MainThreadQuickDiff implements MainThreadQuickDiffShape { | ||
|
|
||
| private readonly proxy: ExtHostQuickDiffShape; | ||
| private providers = new Map<number, QuickDiffProvider>(); | ||
| private providerDisposables = new Map<number, IDisposable>(); | ||
|
|
||
| constructor( | ||
| extHostContext: IExtHostContext, | ||
| @IQuickDiffService private readonly quickDiffService: IQuickDiffService | ||
| ) { | ||
| this.proxy = extHostContext.getProxy(ExtHostContext.ExtHostQuickDiff); | ||
| } | ||
|
|
||
| async $registerQuickDiffProvider(handle: number, label: string, rootUri: UriComponents | undefined): Promise<void> { | ||
| const provider: QuickDiffProvider = { | ||
| label, | ||
| rootUri: URI.revive(rootUri), | ||
| getOriginalResource: async (uri: URI) => { | ||
| return URI.revive(await this.proxy.$provideOriginalResource(handle, uri, new CancellationTokenSource().token)); | ||
| } | ||
| }; | ||
| this.providers.set(handle, provider); | ||
| const disposable = this.quickDiffService.addQuickDiffProvider(provider); | ||
| this.providerDisposables.set(handle, disposable); | ||
| } | ||
|
|
||
| async $unregisterQuickDiffProvider(handle: number): Promise<void> { | ||
| if (this.providers.has(handle)) { | ||
| this.providers.delete(handle); | ||
| } | ||
| if (this.providerDisposables.has(handle)) { | ||
| this.providerDisposables.delete(handle); | ||
| } | ||
| } | ||
|
|
||
| dispose(): void { | ||
| this.providers.clear(); | ||
| dispose(this.providerDisposables.values()); | ||
| this.providerDisposables.clear(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /*--------------------------------------------------------------------------------------------- | ||
| * Copyright (c) Microsoft Corporation. All rights reserved. | ||
| * Licensed under the MIT License. See License.txt in the project root for license information. | ||
| *--------------------------------------------------------------------------------------------*/ | ||
|
|
||
| import type * as vscode from 'vscode'; | ||
| import { CancellationToken } from 'vs/base/common/cancellation'; | ||
| import { URI, UriComponents } from 'vs/base/common/uri'; | ||
| import { ExtHostQuickDiffShape, IMainContext, MainContext, MainThreadQuickDiffShape } from 'vs/workbench/api/common/extHost.protocol'; | ||
| import { asPromise } from 'vs/base/common/async'; | ||
|
|
||
| export class ExtHostQuickDiff implements ExtHostQuickDiffShape { | ||
| private static handlePool: number = 0; | ||
|
|
||
| private proxy: MainThreadQuickDiffShape; | ||
| private providers: Map<number, vscode.QuickDiffProvider> = new Map(); | ||
|
|
||
| constructor( | ||
| mainContext: IMainContext | ||
| ) { | ||
| this.proxy = mainContext.getProxy(MainContext.MainThreadQuickDiff); | ||
| } | ||
|
|
||
| $provideOriginalResource(handle: number, uriComponents: UriComponents, token: CancellationToken): Promise<UriComponents | null> { | ||
| const uri = URI.revive(uriComponents); | ||
| const provider = this.providers.get(handle); | ||
|
|
||
| if (!provider) { | ||
| return Promise.resolve(null); | ||
| } | ||
|
|
||
| return asPromise(() => provider.provideOriginalResource!(uri, token)) | ||
| .then<UriComponents | null>(r => r || null); | ||
| } | ||
|
|
||
| async registerQuickDiffProvider(quickDiffProvider: vscode.QuickDiffProvider, label: string, rootUri?: vscode.Uri): Promise<vscode.Disposable> { | ||
| const handle = ExtHostQuickDiff.handlePool++; | ||
| this.providers.set(handle, quickDiffProvider); | ||
| await this.proxy.$registerQuickDiffProvider(handle, label, rootUri); | ||
| return { | ||
| dispose: () => this.providers.delete(handle) | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.