mirror of
https://github.com/microsoft/vscode.git
synced 2026-02-22 18:55:56 +00:00
SCM - remove old incoming/outgoing code (#227200)
* Delete SCMViewSeparatorElement * Deleted all renderers * Delete SCMHistoryItemGroupTreeElement * More clean-up * Cleanup old menus * Fix compilation errors after ESM merge
This commit is contained in:
Ladislau Szomoru
GitHub
@@ -552,7 +552,6 @@
|
||||
"--vscode-scm-historyGraph-yellow",
|
||||
"--vscode-scm-historyItemAdditionsForeground",
|
||||
"--vscode-scm-historyItemDeletionsForeground",
|
||||
"--vscode-scm-historyItemSelectedStatisticsBorder",
|
||||
"--vscode-scm-historyItemStatisticsBorder",
|
||||
"--vscode-scrollbar-shadow",
|
||||
"--vscode-scrollbarSlider-activeBackground",
|
||||
|
||||
@@ -16,8 +16,6 @@
|
||||
"contribMergeEditorMenus",
|
||||
"contribMultiDiffEditorMenus",
|
||||
"contribDiffEditorGutterToolBarMenus",
|
||||
"contribSourceControlHistoryItemChangesMenu",
|
||||
"contribSourceControlHistoryItemGroupMenu",
|
||||
"contribSourceControlHistoryItemMenu",
|
||||
"contribSourceControlHistoryTitleMenu",
|
||||
"contribSourceControlInputBoxMenu",
|
||||
@@ -1958,28 +1956,6 @@
|
||||
"group": "navigation@3"
|
||||
}
|
||||
],
|
||||
"scm/historyItemChanges/title": [
|
||||
{
|
||||
"command": "git.fetchRef",
|
||||
"group": "navigation@1",
|
||||
"when": "scmProvider == git && scmHistoryItemGroupHasRemote"
|
||||
},
|
||||
{
|
||||
"command": "git.pullRef",
|
||||
"group": "navigation@2",
|
||||
"when": "scmProvider == git && scmHistoryItemGroupHasRemote"
|
||||
},
|
||||
{
|
||||
"command": "git.pushRef",
|
||||
"when": "scmProvider == git && scmHistoryItemGroupHasRemote",
|
||||
"group": "navigation@3"
|
||||
},
|
||||
{
|
||||
"command": "git.publish",
|
||||
"when": "scmProvider == git && !scmHistoryItemGroupHasRemote",
|
||||
"group": "navigation@3"
|
||||
}
|
||||
],
|
||||
"scm/historyItem/context": [
|
||||
{
|
||||
"command": "git.copyCommitId",
|
||||
@@ -1992,102 +1968,6 @@
|
||||
"group": "1_copy@2"
|
||||
}
|
||||
],
|
||||
"scm/incomingChanges": [
|
||||
{
|
||||
"command": "git.fetchRef",
|
||||
"group": "navigation",
|
||||
"when": "scmProvider == git"
|
||||
},
|
||||
{
|
||||
"command": "git.pullRef",
|
||||
"group": "navigation",
|
||||
"when": "scmProvider == git"
|
||||
}
|
||||
],
|
||||
"scm/incomingChanges/context": [
|
||||
{
|
||||
"command": "git.fetchRef",
|
||||
"group": "1_modification@1",
|
||||
"when": "scmProvider == git"
|
||||
},
|
||||
{
|
||||
"command": "git.pullRef",
|
||||
"group": "1_modification@2",
|
||||
"when": "scmProvider == git"
|
||||
}
|
||||
],
|
||||
"scm/incomingChanges/allChanges/context": [
|
||||
{
|
||||
"command": "git.viewAllChanges",
|
||||
"when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
|
||||
"group": "inline@1"
|
||||
},
|
||||
{
|
||||
"command": "git.viewAllChanges",
|
||||
"when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
|
||||
"group": "1_view@1"
|
||||
}
|
||||
],
|
||||
"scm/incomingChanges/historyItem/context": [
|
||||
{
|
||||
"command": "git.viewCommit",
|
||||
"when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
|
||||
"group": "inline@1"
|
||||
},
|
||||
{
|
||||
"command": "git.viewCommit",
|
||||
"when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
|
||||
"group": "1_view@1"
|
||||
}
|
||||
],
|
||||
"scm/outgoingChanges": [
|
||||
{
|
||||
"command": "git.pushRef",
|
||||
"group": "navigation",
|
||||
"when": "scmProvider == git && scmHistoryItemGroupHasRemote"
|
||||
},
|
||||
{
|
||||
"command": "git.publish",
|
||||
"group": "navigation",
|
||||
"when": "scmProvider == git && !scmHistoryItemGroupHasRemote"
|
||||
}
|
||||
],
|
||||
"scm/outgoingChanges/context": [
|
||||
{
|
||||
"command": "git.pushRef",
|
||||
"when": "scmProvider == git && scmHistoryItemGroupHasRemote",
|
||||
"group": "1_modification@1"
|
||||
},
|
||||
{
|
||||
"command": "git.publish",
|
||||
"when": "scmProvider == git && !scmHistoryItemGroupHasRemote",
|
||||
"group": "1_modification@1"
|
||||
}
|
||||
],
|
||||
"scm/outgoingChanges/allChanges/context": [
|
||||
{
|
||||
"command": "git.viewAllChanges",
|
||||
"when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
|
||||
"group": "inline@1"
|
||||
},
|
||||
{
|
||||
"command": "git.viewAllChanges",
|
||||
"when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
|
||||
"group": "1_view@1"
|
||||
}
|
||||
],
|
||||
"scm/outgoingChanges/historyItem/context": [
|
||||
{
|
||||
"command": "git.viewCommit",
|
||||
"when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
|
||||
"group": "inline@1"
|
||||
},
|
||||
{
|
||||
"command": "git.viewCommit",
|
||||
"when": "scmProvider == git && scmHistoryItemFileCount != 0 && config.multiDiffEditor.experimental.enabled",
|
||||
"group": "1_view@1"
|
||||
}
|
||||
],
|
||||
"editor/title": [
|
||||
{
|
||||
"command": "git.openFile",
|
||||
|
||||
@@ -113,18 +113,7 @@ export class MenuId {
|
||||
static readonly OpenEditorsContextShare = new MenuId('OpenEditorsContextShare');
|
||||
static readonly ProblemsPanelContext = new MenuId('ProblemsPanelContext');
|
||||
static readonly SCMInputBox = new MenuId('SCMInputBox');
|
||||
static readonly SCMChangesSeparator = new MenuId('SCMChangesSeparator');
|
||||
static readonly SCMChangesContext = new MenuId('SCMChangesContext');
|
||||
static readonly SCMIncomingChanges = new MenuId('SCMIncomingChanges');
|
||||
static readonly SCMIncomingChangesContext = new MenuId('SCMIncomingChangesContext');
|
||||
static readonly SCMIncomingChangesSetting = new MenuId('SCMIncomingChangesSetting');
|
||||
static readonly SCMOutgoingChanges = new MenuId('SCMOutgoingChanges');
|
||||
static readonly SCMOutgoingChangesContext = new MenuId('SCMOutgoingChangesContext');
|
||||
static readonly SCMOutgoingChangesSetting = new MenuId('SCMOutgoingChangesSetting');
|
||||
static readonly SCMIncomingChangesAllChangesContext = new MenuId('SCMIncomingChangesAllChangesContext');
|
||||
static readonly SCMIncomingChangesHistoryItemContext = new MenuId('SCMIncomingChangesHistoryItemContext');
|
||||
static readonly SCMOutgoingChangesAllChangesContext = new MenuId('SCMOutgoingChangesAllChangesContext');
|
||||
static readonly SCMOutgoingChangesHistoryItemContext = new MenuId('SCMOutgoingChangesHistoryItemContext');
|
||||
static readonly SCMChangeContext = new MenuId('SCMChangeContext');
|
||||
static readonly SCMResourceContext = new MenuId('SCMResourceContext');
|
||||
static readonly SCMResourceContextShare = new MenuId('SCMResourceContextShare');
|
||||
|
||||
@@ -121,12 +121,6 @@ const _allApiProposals = {
|
||||
contribShareMenu: {
|
||||
proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribShareMenu.d.ts',
|
||||
},
|
||||
contribSourceControlHistoryItemChangesMenu: {
|
||||
proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemChangesMenu.d.ts',
|
||||
},
|
||||
contribSourceControlHistoryItemGroupMenu: {
|
||||
proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts',
|
||||
},
|
||||
contribSourceControlHistoryItemMenu: {
|
||||
proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts',
|
||||
},
|
||||
|
||||
@@ -158,49 +158,6 @@
|
||||
padding: 2px
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .history-item .stats-container {
|
||||
display: flex;
|
||||
font-size: 11px;
|
||||
line-height: 11px;
|
||||
margin-left: 6px;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .history-item .stats-container {
|
||||
min-height: 18px;
|
||||
padding: 0 4px;
|
||||
border-radius: 2px;
|
||||
border: 1px solid var(--vscode-scm-historyItemStatisticsBorder);
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row.focused .history-item .stats-container,
|
||||
.scm-view .monaco-list-row.selected .history-item .stats-container {
|
||||
border: 1px solid var(--vscode-scm-historyItemSelectedStatisticsBorder);
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .history-item .stats-container > .files-label,
|
||||
.scm-view .monaco-list-row .history-item .stats-container > .insertions-label,
|
||||
.scm-view .monaco-list-row .history-item .stats-container > .deletions-label {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
opacity: 0.75;
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .history-item .stats-container > .insertions-label {
|
||||
color: var(--vscode-scm-historyItemAdditionsForeground);
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .history-item .stats-container > .deletions-label {
|
||||
color: var(--vscode-scm-historyItemDeletionsForeground);
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .history-item .stats-container.hidden,
|
||||
.scm-view .monaco-list-row .history-item .stats-container > .insertions-label.hidden,
|
||||
.scm-view .monaco-list-row .history-item .stats-container > .deletions-label.hidden {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .history-item-group .monaco-icon-label .icon-container,
|
||||
.scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container {
|
||||
display: flex;
|
||||
padding-right: 4px;
|
||||
@@ -212,37 +169,7 @@
|
||||
border-radius: 14px;
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .separator-container {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding-left: 11px;
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .separator-container .label-name {
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row.focused .separator-container .label-name,
|
||||
.scm-view .monaco-list-row.selected .separator-container .label-name,
|
||||
.scm-view .monaco-list-row.focused .separator-container .action-label::before,
|
||||
.scm-view .monaco-list-row.selected .separator-container .action-label::before {
|
||||
color: var(--vscode-foreground);
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .separator-container .separator {
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
height: 0;
|
||||
margin-left: 6px;
|
||||
border-top: 1px solid var(--vscode-sideBar-border);
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .separator-container .actions {
|
||||
padding-left: 6px;
|
||||
}
|
||||
|
||||
.scm-view .monaco-list-row .history > .name,
|
||||
.scm-view .monaco-list-row .history-item-group > .name,
|
||||
.scm-view .monaco-list-row .resource-group > .name {
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
@@ -286,8 +213,6 @@
|
||||
|
||||
.scm-view .monaco-list .monaco-list-row .resource-group > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row .separator-container > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row .history-item-group > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row .history-item > .actions {
|
||||
display: none;
|
||||
max-width: fit-content;
|
||||
@@ -298,10 +223,6 @@
|
||||
.scm-view .monaco-list .monaco-list-row:hover .resource > .name > .monaco-icon-label > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row.focused .resource > .name > .monaco-icon-label > .actions,
|
||||
.scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row:hover .separator-container > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row.focused .separator-container > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row:hover .history-item-group > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row.focused .history-item-group > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row:hover .history-item > .actions,
|
||||
.scm-view .monaco-list .monaco-list-row.focused .history-item > .actions {
|
||||
display: block;
|
||||
@@ -322,8 +243,6 @@
|
||||
.scm-view.show-actions > .monaco-list .monaco-list-row .scm-input > .scm-editor > .actions,
|
||||
.scm-view.show-actions > .monaco-list .monaco-list-row .resource-group > .actions,
|
||||
.scm-view.show-actions > .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions,
|
||||
.scm-view.show-actions > .monaco-list .monaco-list-row .separator-container > .actions,
|
||||
.scm-view.show-actions > .monaco-list .monaco-list-row .history-item-group > .actions,
|
||||
.scm-view.show-actions > .monaco-list .monaco-list-row .history-item > .actions {
|
||||
display: block;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ import { IMenu, IMenuService, MenuId, MenuRegistry } from '../../../../platform/
|
||||
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
|
||||
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
|
||||
import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
|
||||
import { ISCMHistoryProviderMenus, SCMHistoryItemGroupTreeElement, SCMHistoryItemTreeElement, SCMHistoryItemViewModelTreeElement } from '../common/history.js';
|
||||
import { ISCMHistoryProviderMenus, SCMHistoryItemViewModelTreeElement } from '../common/history.js';
|
||||
import { ISCMMenus, ISCMProvider, ISCMRepository, ISCMRepositoryMenus, ISCMResource, ISCMResourceGroup, ISCMService } from '../common/scm.js';
|
||||
|
||||
function actionEquals(a: IAction, b: IAction): boolean {
|
||||
@@ -255,7 +255,6 @@ export class SCMRepositoryMenus implements ISCMRepositoryMenus, IDisposable {
|
||||
|
||||
export class SCMHistoryProviderMenus implements ISCMHistoryProviderMenus, IDisposable {
|
||||
|
||||
private readonly historyItemMenus = new Map<SCMHistoryItemTreeElement, IMenu>();
|
||||
private readonly historyItemMenus2 = new Map<SCMHistoryItemViewModelTreeElement, IMenu>();
|
||||
private readonly disposables = new DisposableStore();
|
||||
|
||||
@@ -263,52 +262,11 @@ export class SCMHistoryProviderMenus implements ISCMHistoryProviderMenus, IDispo
|
||||
@IContextKeyService private readonly contextKeyService: IContextKeyService,
|
||||
@IMenuService private readonly menuService: IMenuService) { }
|
||||
|
||||
getHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu {
|
||||
return this.getOrCreateHistoryItemMenu(historyItem);
|
||||
}
|
||||
|
||||
getHistoryItemMenu2(historyItem: SCMHistoryItemViewModelTreeElement): IMenu {
|
||||
return this.getOrCreateHistoryItemMenu2(historyItem);
|
||||
}
|
||||
|
||||
getHistoryItemGroupMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
|
||||
return historyItemGroup.direction === 'incoming' ?
|
||||
this.menuService.createMenu(MenuId.SCMIncomingChanges, this.contextKeyService) :
|
||||
this.getOutgoingHistoryItemGroupMenu(MenuId.SCMOutgoingChanges, historyItemGroup);
|
||||
}
|
||||
|
||||
getHistoryItemGroupContextMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
|
||||
return historyItemGroup.direction === 'incoming' ?
|
||||
this.menuService.createMenu(MenuId.SCMIncomingChangesContext, this.contextKeyService) :
|
||||
this.getOutgoingHistoryItemGroupMenu(MenuId.SCMOutgoingChangesContext, historyItemGroup);
|
||||
}
|
||||
|
||||
private getOrCreateHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu {
|
||||
let result = this.historyItemMenus.get(historyItem);
|
||||
|
||||
if (!result) {
|
||||
let menuId: MenuId;
|
||||
if (historyItem.historyItemGroup.direction === 'incoming') {
|
||||
menuId = historyItem.type === 'allChanges' ?
|
||||
MenuId.SCMIncomingChangesAllChangesContext :
|
||||
MenuId.SCMIncomingChangesHistoryItemContext;
|
||||
} else {
|
||||
menuId = historyItem.type === 'allChanges' ?
|
||||
MenuId.SCMOutgoingChangesAllChangesContext :
|
||||
MenuId.SCMOutgoingChangesHistoryItemContext;
|
||||
}
|
||||
|
||||
const contextKeyService = this.contextKeyService.createOverlay([
|
||||
['scmHistoryItemFileCount', historyItem.statistics?.files ?? 0],
|
||||
]);
|
||||
|
||||
result = this.menuService.createMenu(menuId, contextKeyService);
|
||||
this.historyItemMenus.set(historyItem, result);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private getOrCreateHistoryItemMenu2(historyItem: SCMHistoryItemViewModelTreeElement): IMenu {
|
||||
let result = this.historyItemMenus2.get(historyItem);
|
||||
|
||||
@@ -320,14 +278,6 @@ export class SCMHistoryProviderMenus implements ISCMHistoryProviderMenus, IDispo
|
||||
return result;
|
||||
}
|
||||
|
||||
private getOutgoingHistoryItemGroupMenu(menuId: MenuId, historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu {
|
||||
const contextKeyService = this.contextKeyService.createOverlay([
|
||||
['scmHistoryItemGroupHasRemote', !!historyItemGroup.repository.provider.historyProvider.get()?.currentHistoryItemGroup.get()?.remote],
|
||||
]);
|
||||
|
||||
return this.menuService.createMenu(menuId, contextKeyService);
|
||||
}
|
||||
|
||||
dispose(): void {
|
||||
this.disposables.dispose();
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ import { IOpenEvent, WorkbenchAsyncDataTree } from '../../../../platform/list/br
|
||||
import { observableConfigValue } from '../../../../platform/observable/common/platformObservableUtils.js';
|
||||
import { IOpenerService } from '../../../../platform/opener/common/opener.js';
|
||||
import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
|
||||
import { ColorIdentifier, registerColor } from '../../../../platform/theme/common/colorRegistry.js';
|
||||
import { ColorIdentifier, foreground, registerColor, transparent } from '../../../../platform/theme/common/colorRegistry.js';
|
||||
import { IThemeService } from '../../../../platform/theme/common/themeService.js';
|
||||
import { IViewPaneOptions, ViewAction, ViewPane } from '../../../browser/parts/views/viewPane.js';
|
||||
import { IViewDescriptorService, ViewContainerLocation } from '../../../common/views.js';
|
||||
@@ -57,6 +57,7 @@ import { IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/a
|
||||
import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
|
||||
import { IProgressService } from '../../../../platform/progress/common/progress.js';
|
||||
|
||||
registerColor('scm.historyItemStatisticsBorder', transparent(foreground, 0.2), localize('scm.historyItemStatisticsBorder', "History item statistics border color."));
|
||||
const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', localize('scm.historyItemAdditionsForeground', "History item additions foreground color."));
|
||||
const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', localize('scm.historyItemDeletionsForeground', "History item deletions foreground color."));
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -3,8 +3,7 @@
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
import * as path from '../../../../base/common/path.js';
|
||||
import { SCMHistoryItemChangeTreeElement, SCMHistoryItemGroupTreeElement, SCMHistoryItemLoadMoreTreeElement, SCMHistoryItemTreeElement, SCMHistoryItemViewModelTreeElement, SCMViewSeparatorElement } from '../common/history.js';
|
||||
import { SCMHistoryItemLoadMoreTreeElement, SCMHistoryItemViewModelTreeElement } from '../common/history.js';
|
||||
import { ISCMResource, ISCMRepository, ISCMResourceGroup, ISCMInput, ISCMActionButton, ISCMViewService, ISCMProvider } from '../common/scm.js';
|
||||
import { IMenu, MenuItemAction } from '../../../../platform/actions/common/actions.js';
|
||||
import { ActionBar, IActionViewItemProvider } from '../../../../base/browser/ui/actionbar/actionbar.js';
|
||||
@@ -18,7 +17,6 @@ import { ICommandService } from '../../../../platform/commands/common/commands.j
|
||||
import { Command } from '../../../../editor/common/languages.js';
|
||||
import { reset } from '../../../../base/browser/dom.js';
|
||||
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
|
||||
import { URI } from '../../../../base/common/uri.js';
|
||||
import { IResourceNode, ResourceTree } from '../../../../base/common/resourceTree.js';
|
||||
|
||||
export function isSCMRepositoryArray(element: any): element is ISCMRepository[] {
|
||||
@@ -53,15 +51,6 @@ export function isSCMResourceNode(element: any): element is IResourceNode<ISCMRe
|
||||
return ResourceTree.isResourceNode(element) && isSCMResourceGroup(element.context);
|
||||
}
|
||||
|
||||
export function isSCMHistoryItemGroupTreeElement(element: any): element is SCMHistoryItemGroupTreeElement {
|
||||
return (element as SCMHistoryItemGroupTreeElement).type === 'historyItemGroup';
|
||||
}
|
||||
|
||||
export function isSCMHistoryItemTreeElement(element: any): element is SCMHistoryItemTreeElement {
|
||||
return (element as SCMHistoryItemTreeElement).type === 'allChanges' ||
|
||||
(element as SCMHistoryItemTreeElement).type === 'historyItem';
|
||||
}
|
||||
|
||||
export function isSCMHistoryItemViewModelTreeElement(element: any): element is SCMHistoryItemViewModelTreeElement {
|
||||
return (element as SCMHistoryItemViewModelTreeElement).type === 'historyItem2';
|
||||
}
|
||||
@@ -70,29 +59,6 @@ export function isSCMHistoryItemLoadMoreTreeElement(element: any): element is SC
|
||||
return (element as SCMHistoryItemLoadMoreTreeElement).type === 'historyItemLoadMore';
|
||||
}
|
||||
|
||||
export function isSCMHistoryItemChangeTreeElement(element: any): element is SCMHistoryItemChangeTreeElement {
|
||||
return (element as SCMHistoryItemChangeTreeElement).type === 'historyItemChange';
|
||||
}
|
||||
|
||||
export function isSCMHistoryItemChangeNode(element: any): element is IResourceNode<SCMHistoryItemChangeTreeElement, SCMHistoryItemTreeElement> {
|
||||
return ResourceTree.isResourceNode(element) && isSCMHistoryItemTreeElement(element.context);
|
||||
}
|
||||
|
||||
export function isSCMViewSeparator(element: any): element is SCMViewSeparatorElement {
|
||||
return (element as SCMViewSeparatorElement).type === 'separator';
|
||||
}
|
||||
|
||||
export function toDiffEditorArguments(uri: URI, originalUri: URI, modifiedUri: URI): unknown[] {
|
||||
const basename = path.basename(uri.fsPath);
|
||||
const originalQuery = JSON.parse(originalUri.query) as { path: string; ref: string };
|
||||
const modifiedQuery = JSON.parse(modifiedUri.query) as { path: string; ref: string };
|
||||
|
||||
const originalShortRef = originalQuery.ref.substring(0, 8).concat(originalQuery.ref.endsWith('^') ? '^' : '');
|
||||
const modifiedShortRef = modifiedQuery.ref.substring(0, 8).concat(modifiedQuery.ref.endsWith('^') ? '^' : '');
|
||||
|
||||
return [originalUri, modifiedUri, `${basename} (${originalShortRef}) ↔ ${basename} (${modifiedShortRef})`, null];
|
||||
}
|
||||
|
||||
const compareActions = (a: IAction, b: IAction) => {
|
||||
if (a instanceof MenuItemAction && b instanceof MenuItemAction) {
|
||||
return a.id === b.id && a.enabled === b.enabled && a.hideActions?.isHidden === b.hideActions?.isHidden;
|
||||
|
||||
@@ -11,10 +11,6 @@ import { ColorIdentifier } from '../../../../platform/theme/common/colorUtils.js
|
||||
import { ISCMRepository } from './scm.js';
|
||||
|
||||
export interface ISCMHistoryProviderMenus {
|
||||
getHistoryItemGroupMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu;
|
||||
getHistoryItemGroupContextMenu(historyItemGroup: SCMHistoryItemGroupTreeElement): IMenu;
|
||||
|
||||
getHistoryItemMenu(historyItem: SCMHistoryItemTreeElement): IMenu;
|
||||
getHistoryItemMenu2(historyItem: SCMHistoryItemViewModelTreeElement): IMenu;
|
||||
}
|
||||
|
||||
@@ -49,19 +45,6 @@ export interface ISCMHistoryItemGroup {
|
||||
readonly remote?: Omit<Omit<ISCMHistoryItemGroup, 'base'>, 'remote'>;
|
||||
}
|
||||
|
||||
export interface SCMHistoryItemGroupTreeElement {
|
||||
readonly id: string;
|
||||
readonly label: string;
|
||||
readonly ariaLabel?: string;
|
||||
readonly icon?: URI | { light: URI; dark: URI } | ThemeIcon;
|
||||
readonly description?: string;
|
||||
readonly direction: 'incoming' | 'outgoing';
|
||||
readonly ancestor?: string;
|
||||
readonly count?: number;
|
||||
readonly repository: ISCMRepository;
|
||||
readonly type: 'historyItemGroup';
|
||||
}
|
||||
|
||||
export interface ISCMHistoryItemStatistics {
|
||||
readonly files: number;
|
||||
readonly insertions: number;
|
||||
@@ -107,26 +90,9 @@ export interface SCMHistoryItemLoadMoreTreeElement {
|
||||
readonly type: 'historyItemLoadMore';
|
||||
}
|
||||
|
||||
export interface SCMHistoryItemTreeElement extends ISCMHistoryItem {
|
||||
readonly historyItemGroup: SCMHistoryItemGroupTreeElement;
|
||||
readonly type: 'allChanges' | 'historyItem';
|
||||
}
|
||||
|
||||
export interface ISCMHistoryItemChange {
|
||||
readonly uri: URI;
|
||||
readonly originalUri?: URI;
|
||||
readonly modifiedUri?: URI;
|
||||
readonly renameUri?: URI;
|
||||
}
|
||||
|
||||
export interface SCMHistoryItemChangeTreeElement extends ISCMHistoryItemChange {
|
||||
readonly historyItem: SCMHistoryItemTreeElement;
|
||||
readonly type: 'historyItemChange';
|
||||
}
|
||||
|
||||
export interface SCMViewSeparatorElement {
|
||||
readonly label: string;
|
||||
readonly ariaLabel?: string;
|
||||
readonly repository: ISCMRepository;
|
||||
readonly type: 'separator';
|
||||
}
|
||||
|
||||
@@ -181,64 +181,10 @@ const apiMenus: IAPIMenu[] = [
|
||||
description: localize('menus.scmHistoryTitle', "The Source Control History title menu"),
|
||||
proposed: 'contribSourceControlHistoryTitleMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/historyItemChanges/title',
|
||||
id: MenuId.SCMChangesSeparator,
|
||||
description: localize('menus.historyItemChanges', "The Source Control incoming/outgoing changes title menu"),
|
||||
proposed: 'contribSourceControlHistoryItemChangesMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/historyItem/context',
|
||||
id: MenuId.SCMChangesContext,
|
||||
description: localize('menus.historyItemContext', "The Source Control history item context menu"),
|
||||
proposed: 'contribSourceControlHistoryItemChangesMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/incomingChanges',
|
||||
id: MenuId.SCMIncomingChanges,
|
||||
description: localize('menus.incomingChanges', "The Source Control incoming changes menu"),
|
||||
proposed: 'contribSourceControlHistoryItemGroupMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/incomingChanges/context',
|
||||
id: MenuId.SCMIncomingChangesContext,
|
||||
description: localize('menus.incomingChangesContext', "The Source Control incoming changes context menu"),
|
||||
proposed: 'contribSourceControlHistoryItemGroupMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/outgoingChanges',
|
||||
id: MenuId.SCMOutgoingChanges,
|
||||
description: localize('menus.outgoingChanges', "The Source Control outgoing changes menu"),
|
||||
proposed: 'contribSourceControlHistoryItemGroupMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/outgoingChanges/context',
|
||||
id: MenuId.SCMOutgoingChangesContext,
|
||||
description: localize('menus.outgoingChangesContext', "The Source Control outgoing changes context menu"),
|
||||
proposed: 'contribSourceControlHistoryItemGroupMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/incomingChanges/allChanges/context',
|
||||
id: MenuId.SCMIncomingChangesAllChangesContext,
|
||||
description: localize('menus.incomingChangesAllChangesContext', "The Source Control all incoming changes context menu"),
|
||||
proposed: 'contribSourceControlHistoryItemMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/incomingChanges/historyItem/context',
|
||||
id: MenuId.SCMIncomingChangesHistoryItemContext,
|
||||
description: localize('menus.incomingChangesHistoryItemContext', "The Source Control incoming changes history item context menu"),
|
||||
proposed: 'contribSourceControlHistoryItemMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/outgoingChanges/allChanges/context',
|
||||
id: MenuId.SCMOutgoingChangesAllChangesContext,
|
||||
description: localize('menus.outgoingChangesAllChangesContext', "The Source Control all outgoing changes context menu"),
|
||||
proposed: 'contribSourceControlHistoryItemMenu'
|
||||
},
|
||||
{
|
||||
key: 'scm/outgoingChanges/historyItem/context',
|
||||
id: MenuId.SCMOutgoingChangesHistoryItemContext,
|
||||
description: localize('menus.outgoingChangesHistoryItemContext', "The Source Control outgoing changes history item context menu"),
|
||||
proposed: 'contribSourceControlHistoryItemMenu'
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
// empty placeholder declaration for the `scm/historyItemChanges/title`-menu contribution point
|
||||
// https://github.com/microsoft/vscode/issues/201997
|
||||
@@ -1,10 +0,0 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
// empty placeholder declaration for the `scm/incomingChanges`-menu contribution point
|
||||
// empty placeholder declaration for the `scm/incomingChanges/context`-menu contribution point
|
||||
// empty placeholder declaration for the `scm/outgoingChanges`-menu contribution point
|
||||
// empty placeholder declaration for the `scm/outgoingChanges/context`-menu contribution point
|
||||
// https://github.com/microsoft/vscode/issues/201997
|
||||
@@ -3,6 +3,5 @@
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
|
||||
// empty placeholder declaration for the `scm/incomingChanges/historyItem/context`-menu contribution point
|
||||
// empty placeholder declaration for the `scm/outgoingChanges/historyItem/context`-menu contribution point
|
||||
// empty placeholder declaration for the `scm/historyItem/context`-menu contribution point
|
||||
// https://github.com/microsoft/vscode/issues/201997
|
||||
|
||||
Reference in New Issue
Block a user