Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-20 02:08:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - set of fixes for the SCM Sync View (#193567)

Browse Source
This commit is contained in:
Ladislau Szomoru
2023-09-20 14:57:14 +02:00
committed by GitHub
parent 5528f93f38
commit ceda6cc485
3 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/git/src/historyProvider.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import { Disposable, Event, EventEmitter, SourceControlActionButton, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryItemGroup, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon } from 'vscode'; import { Disposable, Event, EventEmitter, SourceControlActionButton, SourceControlHistoryItem, SourceControlHistoryItemChange, SourceControlHistoryItemGroup, SourceControlHistoryOptions, SourceControlHistoryProvider, ThemeIcon, l10n } from 'vscode';
import { Repository } from './repository'; import { Repository } from './repository';
import { IDisposable } from './util'; import { IDisposable } from './util';
import { toGitUri } from './uri'; import { toGitUri } from './uri';
@@ -133,7 +133,7 @@ export class GitHistoryProvider implements SourceControlHistoryProvider, IDispos
private async getSummaryHistoryItem(ref1: string, ref2: string): Promise<SourceControlHistoryItem> { private async getSummaryHistoryItem(ref1: string, ref2: string): Promise<SourceControlHistoryItem> {
const diffShortStat = await this.repository.diffBetweenShortStat(ref1, ref2); const diffShortStat = await this.repository.diffBetweenShortStat(ref1, ref2);
return { id: `${ref1}..${ref2}`, parentIds: [], icon: new ThemeIcon('files'), label: 'Changes', description: diffShortStat }; return { id: `${ref1}..${ref2}`, parentIds: [], icon: new ThemeIcon('files'), label: l10n.t('All Changes'), description: diffShortStat };
} }
dispose(): void { dispose(): void {

4
src/vs/workbench/contrib/scm/browser/media/scm.css
View File

@@ -132,6 +132,10 @@
.scm-view .monaco-list-row .history-item-group .monaco-icon-label > .monaco-icon-label-container { .scm-view .monaco-list-row .history-item-group .monaco-icon-label > .monaco-icon-label-container {
display: flex; display: flex;
} }
.scm-view .monaco-list-row .history-item-group .monaco-icon-label > .monaco-icon-label-container .monaco-icon-description-container {
overflow: hidden;
text-overflow: ellipsis;
}
.scm-sync-view .monaco-list-row .monaco-icon-label .icon-container .scm-sync-view .monaco-list-row .monaco-icon-label .icon-container
.scm-sync-view .monaco-list-row .monaco-icon-label .icon-container { .scm-sync-view .monaco-list-row .monaco-icon-label .icon-container {

39
src/vs/workbench/contrib/scm/browser/scmSyncViewPane.ts
View File

@@ -40,6 +40,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
import { basename, dirname } from 'vs/base/common/resources'; import { basename, dirname } from 'vs/base/common/resources';
import { ILabelService } from 'vs/platform/label/common/label'; import { ILabelService } from 'vs/platform/label/common/label';
import { stripIcons } from 'vs/base/common/iconLabels'; import { stripIcons } from 'vs/base/common/iconLabels';
import { FileKind } from 'vs/platform/files/common/files';
type TreeElement = ISCMRepository[] | ISCMRepository | ISCMActionButton | SCMHistoryItemGroupTreeElement | SCMHistoryItemTreeElement | SCMHistoryItemChangeTreeElement; type TreeElement = ISCMRepository[] | ISCMRepository | ISCMActionButton | SCMHistoryItemGroupTreeElement | SCMHistoryItemTreeElement | SCMHistoryItemChangeTreeElement;
@@ -63,7 +64,7 @@ function toDiffEditorArguments(uri: URI, originalUri: URI, modifiedUri: URI): un
const originalShortRef = originalQuery.ref.substring(0, 8).concat(originalQuery.ref.endsWith('^') ? '^' : ''); const originalShortRef = originalQuery.ref.substring(0, 8).concat(originalQuery.ref.endsWith('^') ? '^' : '');
const modifiedShortRef = modifiedQuery.ref.substring(0, 8).concat(modifiedQuery.ref.endsWith('^') ? '^' : ''); const modifiedShortRef = modifiedQuery.ref.substring(0, 8).concat(modifiedQuery.ref.endsWith('^') ? '^' : '');
return [originalUri, modifiedUri, `${basename} (${originalShortRef}) ↔ ${basename} (${modifiedShortRef})`]; return [originalUri, modifiedUri, `${basename} (${originalShortRef}) ↔ ${basename} (${modifiedShortRef})`, null];
} }
function getSCMResourceId(element: TreeElement): string { function getSCMResourceId(element: TreeElement): string {
@@ -173,8 +174,8 @@ interface HistoryItemTemplate {
readonly iconContainer: HTMLElement; readonly iconContainer: HTMLElement;
// readonly avatarImg: HTMLImageElement; // readonly avatarImg: HTMLImageElement;
readonly iconLabel: IconLabel; readonly iconLabel: IconLabel;
readonly timestampContainer: HTMLElement; // readonly timestampContainer: HTMLElement;
readonly timestamp: HTMLSpanElement; // readonly timestamp: HTMLSpanElement;
readonly disposables: IDisposable; readonly disposables: IDisposable;
} }
@@ -193,10 +194,10 @@ class HistoryItemRenderer implements ITreeRenderer<SCMHistoryItemTreeElement, vo
const iconContainer = prepend(iconLabel.element, $('.icon-container')); const iconContainer = prepend(iconLabel.element, $('.icon-container'));
// const avatarImg = append(iconContainer, $('img.avatar')) as HTMLImageElement; // const avatarImg = append(iconContainer, $('img.avatar')) as HTMLImageElement;
const timestampContainer = append(iconLabel.element, $('.timestamp-container')); // const timestampContainer = append(iconLabel.element, $('.timestamp-container'));
const timestamp = append(timestampContainer, $('span.timestamp')); // const timestamp = append(timestampContainer, $('span.timestamp'));
return { iconContainer, iconLabel, timestampContainer, timestamp, disposables: new DisposableStore() }; return { iconContainer, iconLabel, disposables: new DisposableStore() };
} }
renderElement(node: ITreeNode<SCMHistoryItemTreeElement, void>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void { renderElement(node: ITreeNode<SCMHistoryItemTreeElement, void>, index: number, templateData: HistoryItemTemplate, height: number | undefined): void {
@@ -254,6 +255,7 @@ class HistoryItemChangeRenderer implements ITreeRenderer<SCMHistoryItemChangeTre
renderElement(node: ITreeNode<SCMHistoryItemChangeTreeElement, void>, index: number, templateData: HistoryItemChangeTemplate, height: number | undefined): void { renderElement(node: ITreeNode<SCMHistoryItemChangeTreeElement, void>, index: number, templateData: HistoryItemChangeTemplate, height: number | undefined): void {
templateData.fileLabel.setFile(node.element.uri, { templateData.fileLabel.setFile(node.element.uri, {
fileDecorations: { colors: false, badges: true }, fileDecorations: { colors: false, badges: true },
fileKind: FileKind.FILE,
hidePath: false, hidePath: false,
}); });
} }
@@ -372,6 +374,7 @@ class SCMSyncViewPaneTreeSorter implements ITreeSorter<TreeElement> {
export class SCMSyncViewPane extends ViewPane { export class SCMSyncViewPane extends ViewPane {
private listLabels!: ResourceLabels; private listLabels!: ResourceLabels;
private treeContainer!: HTMLElement;
private _tree!: WorkbenchAsyncDataTree<TreeElement, TreeElement>; private _tree!: WorkbenchAsyncDataTree<TreeElement, TreeElement>;
private _viewModel!: SCMSyncPaneViewModel; private _viewModel!: SCMSyncPaneViewModel;
@@ -398,7 +401,7 @@ export class SCMSyncViewPane extends ViewPane {
protected override renderBody(container: HTMLElement): void { protected override renderBody(container: HTMLElement): void {
super.renderBody(container); super.renderBody(container);
const treeContainer = append(container, $('.scm-view.scm-sync-view.file-icon-themable-tree')); this.treeContainer = append(container, $('.scm-view.scm-sync-view'));
this.listLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility }); this.listLabels = this.instantiationService.createInstance(ResourceLabels, { onDidChangeVisibility: this.onDidChangeBodyVisibility });
this._register(this.listLabels); this._register(this.listLabels);
@@ -406,7 +409,7 @@ export class SCMSyncViewPane extends ViewPane {
this._tree = this.instantiationService.createInstance( this._tree = this.instantiationService.createInstance(
WorkbenchAsyncDataTree, WorkbenchAsyncDataTree,
'SCM Sync View', 'SCM Sync View',
treeContainer, this.treeContainer,
new ListDelegate(), new ListDelegate(),
[ [
this.instantiationService.createInstance(RepositoryRenderer, getActionViewItemProvider(this.instantiationService)), this.instantiationService.createInstance(RepositoryRenderer, getActionViewItemProvider(this.instantiationService)),
@@ -427,6 +430,12 @@ export class SCMSyncViewPane extends ViewPane {
this._register(this._tree.onDidOpen(this.onDidOpen, this)); this._register(this._tree.onDidOpen(this.onDidOpen, this));
this._viewModel = this.instantiationService.createInstance(SCMSyncPaneViewModel, this._tree); this._viewModel = this.instantiationService.createInstance(SCMSyncPaneViewModel, this._tree);
this.treeContainer.classList.add('file-icon-themable-tree');
this.treeContainer.classList.add('show-file-icons');
this.updateIndentStyles(this.themeService.getFileIconTheme());
this._register(this.themeService.onDidFileIconThemeChange(this.updateIndentStyles, this));
} }
protected override layoutBody(height: number, width: number): void { protected override layoutBody(height: number, width: number): void {
@@ -439,11 +448,15 @@ export class SCMSyncViewPane extends ViewPane {
return; return;
} else if (isSCMHistoryItemChangeTreeElement(e.element)) { } else if (isSCMHistoryItemChangeTreeElement(e.element)) {
if (e.element.originalUri && e.element.modifiedUri) { if (e.element.originalUri && e.element.modifiedUri) {
await this.commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(e.element.uri, e.element.originalUri, e.element.modifiedUri)); await this.commandService.executeCommand(API_OPEN_DIFF_EDITOR_COMMAND_ID, ...toDiffEditorArguments(e.element.uri, e.element.originalUri, e.element.modifiedUri), e);
} }
} }
} }
private updateIndentStyles(theme: any): void {
this.treeContainer.classList.toggle('align-icons-and-twisties', theme.hasFileIcons || (theme.hasFileIcons && !theme.hasFolderIcons));
}
override dispose(): void { override dispose(): void {
this.disposables.dispose(); this.disposables.dispose();
super.dispose(); super.dispose();
@@ -590,8 +603,8 @@ class SCMSyncDataSource implements IAsyncDataSource<TreeElement, TreeElement> {
if (historyItemGroupBase) { if (historyItemGroupBase) {
children.push({ children.push({
id: historyItemGroupBase.id, id: historyItemGroupBase.id,
label: localize('incoming', "$(cloud-download) Incoming Changes"), label: `$(cloud-download) ${historyItemGroupBase.label}`,
description: historyItemGroupBase.label, description: localize('incoming', "Incoming Changes"),
ancestor: ancestor?.id, ancestor: ancestor?.id,
count: ancestor?.behind ?? 0, count: ancestor?.behind ?? 0,
repository: element, repository: element,
@@ -603,8 +616,8 @@ class SCMSyncDataSource implements IAsyncDataSource<TreeElement, TreeElement> {
if (historyItemGroup) { if (historyItemGroup) {
children.push({ children.push({
id: historyItemGroup.id, id: historyItemGroup.id,
label: localize('outgoing', "$(cloud-upload) Outgoing Changes"), label: `$(cloud-upload) ${historyItemGroup.label}`,
description: historyItemGroup.label, description: localize('outgoing', "Outgoing Changes"),
ancestor: ancestor?.id, ancestor: ancestor?.id,
count: ancestor?.ahead ?? 0, count: ancestor?.ahead ?? 0,
repository: element, repository: element,