From 2a68b9df491c0ecfb12d912554d9700a29e7f257 Mon Sep 17 00:00:00 2001 From: Ladislau Szomoru <3372902+lszomoru@users.noreply.github.com> Date: Wed, 16 Apr 2025 12:07:14 +0100 Subject: [PATCH] =?UTF-8?q?SCM=20-=20=F0=9F=92=84=20cleanup=20`isSCM`=20pr?= =?UTF-8?q?operty=20from=20quick=20diff=20providers=20(#246711)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/vs/workbench/api/browser/mainThreadQuickDiff.ts | 1 - src/vs/workbench/api/browser/mainThreadSCM.ts | 2 -- src/vs/workbench/contrib/scm/common/quickDiff.ts | 2 -- src/vs/workbench/contrib/scm/common/quickDiffService.ts | 1 - 4 files changed, 6 deletions(-) diff --git a/src/vs/workbench/api/browser/mainThreadQuickDiff.ts b/src/vs/workbench/api/browser/mainThreadQuickDiff.ts index 2301fefc9cb..1db282c0abe 100644 --- a/src/vs/workbench/api/browser/mainThreadQuickDiff.ts +++ b/src/vs/workbench/api/browser/mainThreadQuickDiff.ts @@ -28,7 +28,6 @@ export class MainThreadQuickDiff implements MainThreadQuickDiffShape { label, rootUri: URI.revive(rootUri), selector, - isSCM: false, visible, kind: 'contributed', getOriginalResource: async (uri: URI) => { diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts index 01bb3964340..86387c27651 100644 --- a/src/vs/workbench/api/browser/mainThreadSCM.ts +++ b/src/vs/workbench/api/browser/mainThreadSCM.ts @@ -336,7 +336,6 @@ class MainThreadSCMProvider implements ISCMProvider { this._quickDiff = this._quickDiffService.addQuickDiffProvider({ label: features.quickDiffLabel ?? this.label, rootUri: this.rootUri, - isSCM: true, visible: true, kind: 'primary', getOriginalResource: async (uri: URI) => { @@ -357,7 +356,6 @@ class MainThreadSCMProvider implements ISCMProvider { this._stagedQuickDiff = this._quickDiffService.addQuickDiffProvider({ label: features.secondaryQuickDiffLabel ?? this.label, rootUri: this.rootUri, - isSCM: true, visible: true, kind: 'secondary', getOriginalResource: async (uri: URI) => { diff --git a/src/vs/workbench/contrib/scm/common/quickDiff.ts b/src/vs/workbench/contrib/scm/common/quickDiff.ts index d588a18ca02..a69afe458e8 100644 --- a/src/vs/workbench/contrib/scm/common/quickDiff.ts +++ b/src/vs/workbench/contrib/scm/common/quickDiff.ts @@ -70,7 +70,6 @@ export interface QuickDiffProvider { label: string; rootUri: URI | undefined; selector?: LanguageSelector; - isSCM: boolean; visible: boolean; readonly kind: 'primary' | 'secondary' | 'contributed'; getOriginalResource(uri: URI): Promise; @@ -79,7 +78,6 @@ export interface QuickDiffProvider { export interface QuickDiff { label: string; originalResource: URI; - isSCM: boolean; visible: boolean; readonly kind: 'primary' | 'secondary' | 'contributed'; } diff --git a/src/vs/workbench/contrib/scm/common/quickDiffService.ts b/src/vs/workbench/contrib/scm/common/quickDiffService.ts index d52098aa5c0..a4de155691e 100644 --- a/src/vs/workbench/contrib/scm/common/quickDiffService.ts +++ b/src/vs/workbench/contrib/scm/common/quickDiffService.ts @@ -81,7 +81,6 @@ export class QuickDiffService extends Disposable implements IQuickDiffService { const diff: Partial = { originalResource: scoreValue > 0 ? await provider.getOriginalResource(uri) ?? undefined : undefined, label: provider.label, - isSCM: provider.isSCM, visible: provider.visible, kind: provider.kind };