diff --git a/src/vs/workbench/api/browser/mainThreadSCM.ts b/src/vs/workbench/api/browser/mainThreadSCM.ts index 4388711bdd485..099edc8b2584b 100644 --- a/src/vs/workbench/api/browser/mainThreadSCM.ts +++ b/src/vs/workbench/api/browser/mainThreadSCM.ts @@ -42,10 +42,9 @@ function getIconFromIconDto(iconDto?: UriComponents | { light: UriComponents; da } function toISCMHistoryItem(historyItemDto: SCMHistoryItemDto): ISCMHistoryItem { - const icon = getIconFromIconDto(historyItemDto.icon); const labels = historyItemDto.labels?.map(l => ({ title: l.title, icon: getIconFromIconDto(l.icon) })); - return { ...historyItemDto, icon, labels }; + return { ...historyItemDto, labels }; } class SCMInputBoxContentProvider extends Disposable implements ITextModelContentProvider { diff --git a/src/vs/workbench/api/common/extHost.protocol.ts b/src/vs/workbench/api/common/extHost.protocol.ts index e60031a148ce8..26322e60c81c8 100644 --- a/src/vs/workbench/api/common/extHost.protocol.ts +++ b/src/vs/workbench/api/common/extHost.protocol.ts @@ -1549,7 +1549,6 @@ export interface SCMHistoryItemDto { readonly message: string; readonly displayId?: string; readonly author?: string; - readonly icon?: UriComponents | { light: UriComponents; dark: UriComponents } | ThemeIcon; readonly timestamp?: number; readonly statistics?: { readonly files: number; diff --git a/src/vs/workbench/api/common/extHostSCM.ts b/src/vs/workbench/api/common/extHostSCM.ts index 22bd58cdfd57a..ef5fd2d03e823 100644 --- a/src/vs/workbench/api/common/extHostSCM.ts +++ b/src/vs/workbench/api/common/extHostSCM.ts @@ -72,10 +72,9 @@ function getHistoryItemIconDto(icon: vscode.Uri | { light: vscode.Uri; dark: vsc } function toSCMHistoryItemDto(historyItem: vscode.SourceControlHistoryItem): SCMHistoryItemDto { - const icon = getHistoryItemIconDto(historyItem.icon); const labels = historyItem.labels?.map(l => ({ title: l.title, icon: getHistoryItemIconDto(l.icon) })); - return { ...historyItem, icon, labels }; + return { ...historyItem, labels }; } function compareResourceThemableDecorations(a: vscode.SourceControlResourceThemableDecorations, b: vscode.SourceControlResourceThemableDecorations): number { diff --git a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts index 338dbc0c3aaff..e2101d202f9df 100644 --- a/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts +++ b/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.ts @@ -441,7 +441,6 @@ class HistoryItemActionRunner extends ActionRunner { message: h.historyItemViewModel.historyItem.message, displayId: h.historyItemViewModel.historyItem.displayId, author: h.historyItemViewModel.historyItem.author, - icon: h.historyItemViewModel.historyItem.icon, timestamp: h.historyItemViewModel.historyItem.timestamp, statistics: h.historyItemViewModel.historyItem.statistics, } satisfies ISCMHistoryItem))); @@ -452,7 +451,6 @@ class HistoryItemActionRunner extends ActionRunner { message: context.historyItemViewModel.historyItem.message, displayId: context.historyItemViewModel.historyItem.displayId, author: context.historyItemViewModel.historyItem.author, - icon: context.historyItemViewModel.historyItem.icon, timestamp: context.historyItemViewModel.historyItem.timestamp, statistics: context.historyItemViewModel.historyItem.statistics, } satisfies ISCMHistoryItem); diff --git a/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts b/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts index a7397e1ce1de3..c9bc2d84225ed 100644 --- a/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts +++ b/src/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts @@ -65,7 +65,6 @@ declare module 'vscode' { readonly message: string; readonly displayId?: string; readonly author?: string; - readonly icon?: Uri | { light: Uri; dark: Uri } | ThemeIcon; readonly timestamp?: number; readonly statistics?: SourceControlHistoryItemStatistics; readonly labels?: SourceControlHistoryItemLabel[];