@codingame/monaco-vscode-scm-service-override 8.0.4 → 9.0.0

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js

@@ -16,11 +16,10 @@ import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/context
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
-import { MenuItemAction, MenuId, MenuRegistry, Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { MenuItemAction, MenuId, MenuRegistry, registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
-import { ActionRunner, Action, toAction, Separator } from 'vscode/vscode/vs/base/common/actions';
+import { ActionRunner, Separator, Action } from 'vscode/vscode/vs/base/common/actions';
 import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
-import { registerThemingParticipant } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { isSCMResource, connectPrimaryMenuToInlineActionBar, connectPrimaryMenu, isSCMInput, isSCMActionButton, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemViewModelTreeElement, isSCMHistoryItemChangeTreeElement, isSCMHistoryItemChangeNode, isSCMViewSeparator, getActionViewItemProvider, toDiffEditorArguments, collectContextMenuActions, isSCMViewService } from './util.js';
 import { WorkbenchCompressibleAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
@@ -40,7 +39,7 @@ import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/c
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
+import { getSimpleEditorOptions, setupSimpleEditorSelectionStyling } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { MenuPreventer } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
@@ -75,7 +74,7 @@ import { CopyPasteController } from 'vscode/vscode/vs/editor/contrib/dropOrPaste
 import { DropIntoEditorController } from 'vscode/vscode/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
 import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/browser/messageController';
 import { defaultCountBadgeStyles, defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { InlineCompletionsController } from 'vscode/vscode/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { InlineCompletionsController } from 'vscode/vscode/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController';
 import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { fillEditorsDragData } from 'vscode/vscode/vs/workbench/browser/dnd';
@@ -87,10 +86,10 @@ import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
 import { registerColor, transparent } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
-import { foreground, selectionBackground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import { foreground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
-import { editorSelectionBackground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
-import { inputBackground, inputForeground } from 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
 import { listActiveSelectionForeground } from 'vscode/vscode/vs/platform/theme/common/colors/listColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
@@ -105,24 +104,26 @@ import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { WorkbenchHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hover';
 import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { OpenScmGroupAction } from 'vscode/vscode/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver';
-import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverController';
-import { equals } from 'vscode/vscode/vs/base/common/arrays';
+import { ContentHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/contentHoverController2';
+import { MarginHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/marginHoverController';
+import 'vscode/vscode/vs/base/common/arrays';
 import 'vscode/vscode/vs/base/common/observableInternal/derived';
 import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
 import 'vscode/vscode/vs/base/common/observableInternal/utils';
 import { getDefaultHoverDelegate, createInstantHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { renderSCMHistoryItemGraph, historyItemGroupLocal, historyItemGroupRemote, historyItemGroupBase, historyItemGroupHoverLabelForeground, toISCMHistoryItemViewModelArray } from './scmHistory.js';
+import { renderSCMHistoryItemGraph, historyItemGroupLocal, historyItemGroupRemote, historyItemGroupBase, historyItemGroupHoverLabelForeground } from './scmHistory.js';
 import { PlaceholderTextContribution } from 'vscode/vscode/vs/editor/contrib/placeholderText/browser/placeholderTextContribution';
 import { HoverPosition } from 'vscode/vscode/vs/base/browser/ui/hover/hoverWidget';
 import { Position } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { fromNow } from 'vscode/vscode/vs/base/common/date';
+import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 
 var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItem2Renderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
-const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6357, "History item additions foreground color.")));
-const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6358, "History item deletions foreground color.")));
-registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(6359, "History item statistics border color.")));
-registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(6360, "History item selected statistics border color.")));
+const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6300, "History item additions foreground color.")));
+const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6301, "History item deletions foreground color.")));
+registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(6302, "History item statistics border color.")));
+registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(6303, "History item selected statistics border color.")));
 function processResourceFilterData(uri, filterData) {
     if (!filterData) {
         return [undefined, undefined];
@@ -809,12 +810,12 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         if (historyItem.statistics) {
             const statsAriaLabel = [
                 historyItem.statistics.files === 1 ?
-                    ( localize(6361, "{0} file changed", historyItem.statistics.files)) :
-                    ( localize(6362, "{0} files changed", historyItem.statistics.files)),
-                historyItem.statistics.insertions === 1 ? ( localize(6363, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
-                    historyItem.statistics.insertions > 1 ? ( localize(6364, "{0} insertions{1}", historyItem.statistics.insertions, '(+)')) : '',
-                historyItem.statistics.deletions === 1 ? ( localize(6365, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
-                    historyItem.statistics.deletions > 1 ? ( localize(6366, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
+                    ( localize(6304, "{0} file changed", historyItem.statistics.files)) :
+                    ( localize(6305, "{0} files changed", historyItem.statistics.files)),
+                historyItem.statistics.insertions === 1 ? ( localize(6306, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
+                    historyItem.statistics.insertions > 1 ? ( localize(6307, "{0} insertions{1}", historyItem.statistics.insertions, '(+)')) : '',
+                historyItem.statistics.deletions === 1 ? ( localize(6308, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
+                    historyItem.statistics.deletions > 1 ? ( localize(6309, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
             ];
             const statsTitle = statsAriaLabel.filter(l => l !== '').join(', ');
             templateData.statsContainer.setAttribute('aria-label', statsTitle);
@@ -902,19 +903,19 @@ let HistoryItem2Renderer = class HistoryItem2Renderer {
         if (historyItem.statistics) {
             markdown.appendMarkdown(`---\n\n`);
             markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
-                ( localize(6361, "{0} file changed", historyItem.statistics.files)) :
-                ( localize(6362, "{0} files changed", historyItem.statistics.files))}</span>`);
+                ( localize(6304, "{0} file changed", historyItem.statistics.files)) :
+                ( localize(6305, "{0} files changed", historyItem.statistics.files))}</span>`);
             if (historyItem.statistics.insertions) {
                 const historyItemAdditionsForegroundColor = colorTheme.getColor(historyItemAdditionsForeground);
                 markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemAdditionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
-                    ( localize(6363, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
-                    ( localize(6364, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
+                    ( localize(6306, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
+                    ( localize(6307, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
             }
             if (historyItem.statistics.deletions) {
                 const historyItemDeletionsForegroundColor = colorTheme.getColor(historyItemDeletionsForeground);
                 markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemDeletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
-                    ( localize(6365, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
-                    ( localize(6366, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
+                    ( localize(6308, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
+                    ( localize(6309, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
             }
         }
         if (historyItem.labels) {
@@ -1050,7 +1051,7 @@ let SeparatorRenderer = class SeparatorRenderer {
         ]);
         const menu = this.menuService.createMenu(MenuId.SCMChangesSeparator, contextKeyService);
         templateData.elementDisposables.add(connectPrimaryMenu(menu, (primary, secondary) => {
-            secondary.push(...this.getFilterActions(element.element.repository));
+            secondary.splice(0, 0, ...this.getFilterActions(element.element.repository), ( (new Separator())));
             templateData.toolBar.setActions(primary, secondary, [MenuId.SCMChangesSeparator]);
         }));
         templateData.toolBar.context = provider;
@@ -1341,7 +1342,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return ( localize(6367, "Source Control Management"));
+        return ( localize(6310, "Source Control Management"));
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -1351,7 +1352,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
             return `${element.provider.name} ${element.provider.label}`;
         }
         else if (isSCMInput(element)) {
-            return ( localize(6368, "Source Control Input"));
+            return ( localize(6311, "Source Control Input"));
         }
         else if (isSCMActionButton(element)) {
             return element.button?.command.title ?? '';
@@ -1430,7 +1431,7 @@ const ContextKeys = {
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(6369, "View & Sort")),
+    title: ( localize(6312, "View & Sort")),
     submenu: Menus.ViewSort,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
@@ -1439,162 +1440,17 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
     group: '0_view&sort',
     order: 1
 });
-MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(6370, "Incoming & Outgoing")),
-    submenu: Menus.ChangesSettings,
-    when: ( (ContextKeyExpr.and(
-         (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
-         (ContextKeys.RepositoryCount.notEqualsTo(0)),
-         (( (ContextKeyExpr.equals('config.scm.showHistoryGraph', true))).negate())
-    ))),
-    group: '0_view&sort',
-    order: 2
-});
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localize(6371, "Repositories")),
+    title: ( localize(6313, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
 });
-class SCMChangesSettingAction extends Action2 {
-    constructor(settingKey, settingValue, desc) {
-        super({
-            ...desc,
-            f1: false,
-            toggled: ( (ContextKeyExpr.equals(`config.${settingKey}`, settingValue))),
-        });
-        this.settingKey = settingKey;
-        this.settingValue = settingValue;
-    }
-    run(accessor) {
-        const configurationService = accessor.get(IConfigurationService);
-        configurationService.updateValue(this.settingKey, this.settingValue);
-    }
-}
-MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
-    title: ( localize(6372, "Show Incoming Changes")),
-    submenu: MenuId.SCMIncomingChangesSetting,
-    group: '1_incoming&outgoing',
-    order: 1,
-    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
-});
-MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
-    title: ( localize(6372, "Show Incoming Changes")),
-    submenu: MenuId.SCMIncomingChangesSetting,
-    group: '1_incoming&outgoing',
-    order: 1,
-    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
-});
-registerAction2(class extends SCMChangesSettingAction {
-    constructor() {
-        super('scm.showIncomingChanges', 'always', {
-            id: 'workbench.scm.action.showIncomingChanges.always',
-            title: ( localize(6373, "Always")),
-            menu: { id: MenuId.SCMIncomingChangesSetting },
-        });
-    }
-});
-registerAction2(class extends SCMChangesSettingAction {
-    constructor() {
-        super('scm.showIncomingChanges', 'auto', {
-            id: 'workbench.scm.action.showIncomingChanges.auto',
-            title: ( localize(6374, "Auto")),
-            menu: {
-                id: MenuId.SCMIncomingChangesSetting,
-            }
-        });
-    }
-});
-registerAction2(class extends SCMChangesSettingAction {
-    constructor() {
-        super('scm.showIncomingChanges', 'never', {
-            id: 'workbench.scm.action.showIncomingChanges.never',
-            title: ( localize(6375, "Never")),
-            menu: {
-                id: MenuId.SCMIncomingChangesSetting,
-            }
-        });
-    }
-});
-MenuRegistry.appendMenuItem(MenuId.SCMChangesSeparator, {
-    title: ( localize(6376, "Show Outgoing Changes")),
-    submenu: MenuId.SCMOutgoingChangesSetting,
-    group: '1_incoming&outgoing',
-    order: 2,
-    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
-});
-MenuRegistry.appendMenuItem(Menus.ChangesSettings, {
-    title: ( localize(6376, "Show Outgoing Changes")),
-    submenu: MenuId.SCMOutgoingChangesSetting,
-    group: '1_incoming&outgoing',
-    order: 2,
-    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
-});
-registerAction2(class extends SCMChangesSettingAction {
-    constructor() {
-        super('scm.showOutgoingChanges', 'always', {
-            id: 'workbench.scm.action.showOutgoingChanges.always',
-            title: ( localize(6373, "Always")),
-            menu: {
-                id: MenuId.SCMOutgoingChangesSetting,
-            }
-        });
-    }
-});
-registerAction2(class extends SCMChangesSettingAction {
-    constructor() {
-        super('scm.showOutgoingChanges', 'auto', {
-            id: 'workbench.scm.action.showOutgoingChanges.auto',
-            title: ( localize(6374, "Auto")),
-            menu: {
-                id: MenuId.SCMOutgoingChangesSetting,
-            }
-        });
-    }
-});
-registerAction2(class extends SCMChangesSettingAction {
-    constructor() {
-        super('scm.showOutgoingChanges', 'never', {
-            id: 'workbench.scm.action.showOutgoingChanges.never',
-            title: ( localize(6375, "Never")),
-            menu: {
-                id: MenuId.SCMOutgoingChangesSetting,
-            }
-        });
-    }
-});
-registerAction2(class extends Action2 {
-    constructor() {
-        super({
-            id: 'workbench.scm.action.scm.showChangesSummary',
-            title: ( localize(6377, "Show Changes Summary")),
-            f1: false,
-            toggled: ( (ContextKeyExpr.equals('config.scm.showChangesSummary', true))),
-            menu: [
-                {
-                    id: MenuId.SCMChangesSeparator,
-                    order: 3,
-                    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
-                },
-                {
-                    id: Menus.ChangesSettings,
-                    order: 3,
-                    when: ( (ContextKeyExpr.equals('config.scm.showHistoryGraph', false)))
-                },
-            ]
-        });
-    }
-    run(accessor) {
-        const configurationService = accessor.get(IConfigurationService);
-        const configValue = configurationService.getValue('scm.showChangesSummary') === true;
-        configurationService.updateValue('scm.showChangesSummary', !configValue);
-    }
-});
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.scm.viewChanges',
-            title: ( localize(6378, "View Changes")),
+            title: ( localize(6314, "View Changes")),
             f1: false,
             menu: [
                 {
@@ -1627,16 +1483,15 @@ registerAction2(class extends Action2 {
         const title = historyItems.length === 1 ?
             `${historyItems[0].id.substring(0, 8)} - ${historyItems[0].message}` :
             ( localize(
-                6379,
+                6315,
                 "All Changes ({0} ↔ {1})",
-                historyItem.id.substring(0, 8),
-                historyItemLast.id.substring(0, 8)
+                historyItemLast.id.substring(0, 8),
+                historyItem.id.substring(0, 8)
             ));
         const rootUri = provider.rootUri;
-        const multiDiffSourceUri = rootUri ?
-            rootUri.with({ scheme: 'scm-history-item', path: `${rootUri.path}/${historyItem.id}..${historyItemParentId}` }) :
-            ( (URI.from(
-            { scheme: 'scm-history-item', path: `${provider.label}/${historyItem.id}..${historyItemParentId}` },
+        const path = rootUri ? rootUri.path : provider.label;
+        const multiDiffSourceUri = ( (URI.from(
+            { scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` },
             true
         )));
         commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
@@ -1730,7 +1585,7 @@ class SetListViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(6380, "View as List")),
+            title: ( localize(6316, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
@@ -1760,7 +1615,7 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(6381, "View as Tree")),
+            title: ( localize(6317, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
@@ -1817,17 +1672,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(6382, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(6318, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localize(6383, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(6319, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localize(6384, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(6320, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1852,17 +1707,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localize(6385, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(6321, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localize(6386, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(6322, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localize(6387, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(6323, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1872,7 +1727,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(6388, "Collapse All Repositories")),
+            title: ( localize(6324, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1895,7 +1750,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(6389, "Expand All Repositories")),
+            title: ( localize(6325, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1974,10 +1829,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this._onDidChange = ( (new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._disposables = this._register(( (new MutableDisposable())));
-        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6390, "More Actions...")), 'codicon-chevron-down')));
+        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6326, "More Actions...")), 'codicon-chevron-down')));
         this._cancelAction = ( (new MenuItemAction({
             id: SCMInputWidgetCommandId.CancelAction,
-            title: ( localize(6391, "Cancel")),
+            title: ( localize(6327, "Cancel")),
             icon: Codicon.debugStop,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
     }
@@ -2267,7 +2122,8 @@ let SCMInputWidget = class SCMInputWidget {
                 DropIntoEditorController.ID,
                 EditorDictation.ID,
                 FormatOnType.ID,
-                HoverController.ID,
+                ContentHoverController.ID,
+                MarginHoverController.ID,
                 InlineCompletionsController.ID,
                 LinkDetector.ID,
                 MenuPreventer.ID,
@@ -2427,7 +2283,7 @@ let SCMInputWidget = class SCMInputWidget {
                 }
                 const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
                 const actionbar = ( (new ActionBar(actionsContainer)));
-                const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6392, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6328, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';
@@ -2597,14 +2453,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
                     }, this, this.visibilityDisposables);
                     Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.inputMinLineCount') ||
                         e.affectsConfiguration('scm.inputMaxLineCount') ||
-                        e.affectsConfiguration('scm.showActionButton') ||
-                        e.affectsConfiguration('scm.showIncomingChanges') ||
-                        e.affectsConfiguration('scm.showOutgoingChanges') ||
-                        e.affectsConfiguration('scm.showHistoryGraph'), this.visibilityDisposables)(() => this.updateChildren(), this, this.visibilityDisposables);
-                    Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.showChangesSummary'), this.visibilityDisposables)(() => {
-                        this.historyProviderDataSource.clearCache();
-                        this.updateChildren();
-                    }, this, this.visibilityDisposables);
+                        e.affectsConfiguration('scm.showActionButton'), this.visibilityDisposables)(() => this.updateChildren(), this, this.visibilityDisposables);
                     this.editorService.onDidActiveEditorChange(this.onDidActiveEditorChange, this, this.visibilityDisposables);
                     this.scmViewService.onDidChangeVisibleRepositories(this.onDidChangeVisibleRepositories, this, this.visibilityDisposables);
                     this.onDidChangeVisibleRepositories({ added: this.scmViewService.visibleRepositories, removed: Iterable.empty() });
@@ -2648,21 +2497,15 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.disposables.add(historyItemActionRunner);
         const historyItemHoverDelegate = this.instantiationService.createInstance(HistoryItemHoverDelegate, this.viewDescriptorService.getViewLocationById(this.id), this.layoutService.getSideBarPosition());
         this.disposables.add(historyItemHoverDelegate);
-        this.historyProviderDataSource = this.instantiationService.createInstance(SCMTreeHistoryProviderDataSource, () => this.viewMode);
-        this.disposables.add(this.historyProviderDataSource);
-        const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode, this.historyProviderDataSource);
+        const treeDataSource = this.instantiationService.createInstance(SCMTreeDataSource, () => this.viewMode);
         this.disposables.add(treeDataSource);
+        const compressionEnabled = observableConfigValue('scm.compactFolders', true, this.configurationService);
         this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'SCM Tree Repo', container, ( (new ListDelegate(this.inputRenderer))), ( (new SCMTreeCompressionDelegate())), [
             this.inputRenderer,
             this.actionButtonRenderer,
             this.instantiationService.createInstance(RepositoryRenderer, MenuId.SCMTitle, getActionViewItemProvider(this.instantiationService)),
             this.instantiationService.createInstance(ResourceGroupRenderer, getActionViewItemProvider(this.instantiationService)),
-            this.instantiationService.createInstance(ResourceRenderer, () => this.viewMode, this.listLabels, getActionViewItemProvider(this.instantiationService), resourceActionRunner),
-            this.instantiationService.createInstance(HistoryItemGroupRenderer, historyItemGroupActionRunner),
-            this.instantiationService.createInstance(HistoryItemRenderer, historyItemActionRunner, getActionViewItemProvider(this.instantiationService)),
-            this.instantiationService.createInstance(HistoryItem2Renderer, historyItemHoverDelegate),
-            this.instantiationService.createInstance(HistoryItemChangeRenderer, () => this.viewMode, this.listLabels),
-            this.instantiationService.createInstance(SeparatorRenderer, (repository) => this.getHistoryItemGroupFilterActions(repository)),
+            this.instantiationService.createInstance(ResourceRenderer, () => this.viewMode, this.listLabels, getActionViewItemProvider(this.instantiationService), resourceActionRunner)
         ], treeDataSource, {
             horizontalScrolling: false,
             setRowLineHeight: false,
@@ -2673,6 +2516,7 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             sorter: ( (new SCMTreeSorter(() => this.viewMode, () => this.viewSortKey))),
             keyboardNavigationLabelProvider: this.instantiationService.createInstance(SCMTreeKeyboardNavigationLabelProvider, () => this.viewMode),
             overrideStyles: this.getLocationBasedColors().listOverrideStyles,
+            compressionEnabled: compressionEnabled.get(),
             collapseByDefault: (e) => {
                 if (isSCMRepository(e) || isSCMResourceGroup(e) || isSCMResourceNode(e) || isSCMHistoryItemChangeNode(e)) {
                     return false;
@@ -2686,6 +2530,11 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
         this.tree.onContextMenu(this.onListContextMenu, this, this.disposables);
         this.tree.onDidScroll(this.inputRenderer.clearValidation, this.inputRenderer, this.disposables);
         Event.filter(this.tree.onDidChangeCollapseState, e => isSCMRepository(e.node.element?.element), this.disposables)(this.updateRepositoryCollapseAllContextKeys, this, this.disposables);
+        this.disposables.add(autorun(reader => {
+            this.tree.updateOptions({
+                compressionEnabled: compressionEnabled.read(reader)
+            });
+        }));
         append(container, overflowWidgetsDomNode);
     }
     async open(e) {
@@ -2782,10 +2631,9 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             if (historyItemChanges) {
                 const title = `${historyItem.id.substring(0, 8)} - ${historyItem.message}`;
                 const rootUri = e.element.repository.provider.rootUri;
-                const multiDiffSourceUri = rootUri ?
-                    rootUri.with({ scheme: 'scm-history-item', path: `${rootUri.path}/${historyItem.id}..${historyItemParentId}` }) :
-                    ( (URI.from(
-                    { scheme: 'scm-history-item', path: `${e.element.repository.provider.label}/${historyItem.id}..${historyItemParentId}` },
+                const path = rootUri ? rootUri.path : e.element.repository.provider.label;
+                const multiDiffSourceUri = ( (URI.from(
+                    { scheme: 'scm-history-item', path: `${path}/${historyItemParentId}..${historyItem.id}` },
                     true
                 )));
                 await this.commandService.executeCommand('_workbench.openMultiDiffEditor', { title, multiDiffSourceUri, resources: historyItemChanges });
@@ -2849,12 +2697,6 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             repositoryDisposables.add(repository.provider.onDidChange(() => this.updateChildren(repository)));
             repositoryDisposables.add(repository.input.onDidChangeVisibility(() => this.updateChildren(repository)));
             repositoryDisposables.add(repository.provider.onDidChangeResourceGroups(() => this.updateChildren(repository)));
-            repositoryDisposables.add(autorun(reader => {
-                repository.provider.historyProvider.read(reader)?.currentHistoryItemGroup.read(reader);
-                this.historyProviderDataSource.deleteCacheEntry(repository);
-                this.historyProviderDataSource.deleteHistoryItemGroupFilter(repository);
-                this.updateChildren(repository);
-            }));
             const resourceGroupDisposables = repositoryDisposables.add(( (new DisposableMap())));
             const onDidChangeResourceGroups = () => {
                 for (const [resourceGroup] of resourceGroupDisposables) {
@@ -2876,7 +2718,6 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.items.set(repository, repositoryDisposables);
         }
         for (const repository of removed) {
-            this.historyProviderDataSource.deleteCacheEntry(repository);
             this.items.deleteAndDispose(repository);
         }
         this.updateChildren();
@@ -3147,32 +2988,6 @@ let SCMViewPane = class SCMViewPane extends ViewPane {
             this.tree.domFocus();
         }
     }
-    getHistoryItemGroupFilterActions(repository) {
-        const currentHistoryItemGroup = repository.provider.historyProvider.get()?.currentHistoryItemGroup?.get();
-        if (!currentHistoryItemGroup) {
-            return [];
-        }
-        const toHistoryItemGroupFilterAction = (historyItemGroupId, historyItemGroupName) => {
-            return toAction({
-                id: `workbench.scm.action.toggleHistoryItemGroupVisibility.${repository.id}.${historyItemGroupId}`,
-                label: historyItemGroupName,
-                checked: !( (this.historyProviderDataSource.getHistoryItemGroupFilter(repository).has(historyItemGroupId))),
-                run: () => {
-                    this.historyProviderDataSource.toggleHistoryItemGroupFilter(repository, historyItemGroupId);
-                    this.historyProviderDataSource.deleteCacheEntry(repository);
-                    this.updateChildren(repository);
-                }
-            });
-        };
-        const actions = [];
-        if (currentHistoryItemGroup.remote) {
-            actions.push(toHistoryItemGroupFilterAction(currentHistoryItemGroup.remote.id, currentHistoryItemGroup.remote.name));
-        }
-        if (currentHistoryItemGroup.base) {
-            actions.push(toHistoryItemGroupFilterAction(currentHistoryItemGroup.base.id, currentHistoryItemGroup.base.name));
-        }
-        return actions;
-    }
     shouldShowWelcome() {
         return this.scmService.repositoryCount === 0;
     }
@@ -3229,268 +3044,10 @@ SCMViewPane = ( (__decorate([
     ( (__param(17, ITelemetryService))),
     ( (__param(18, IHoverService)))
 ], SCMViewPane)));
-let SCMTreeHistoryProviderDataSource = class SCMTreeHistoryProviderDataSource extends Disposable {
-    constructor(viewMode, configurationService, uriIdentityService) {
-        super();
-        this.viewMode = viewMode;
-        this.configurationService = configurationService;
-        this.uriIdentityService = uriIdentityService;
-        this._cache = ( (new Map()));
-        this._historyItemGroupFilter = ( (new Map()));
-    }
-    clearCache() {
-        this._cache.clear();
-    }
-    deleteCacheEntry(repository) {
-        this._cache.delete(repository);
-    }
-    async getHistoryItemGroups(element) {
-        const { showIncomingChanges, showOutgoingChanges, showHistoryGraph } = this._getConfiguration();
-        const scmProvider = element.provider;
-        const historyProvider = scmProvider.historyProvider.get();
-        const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup.get();
-        if (!historyProvider || !currentHistoryItemGroup || (showIncomingChanges === 'never' && showOutgoingChanges === 'never') || showHistoryGraph) {
-            return [];
-        }
-        const children = [];
-        const historyProviderCacheEntry = this._getCacheEntry(element);
-        let incomingHistoryItemGroup = historyProviderCacheEntry?.incomingHistoryItemGroup;
-        let outgoingHistoryItemGroup = historyProviderCacheEntry?.outgoingHistoryItemGroup;
-        if (!incomingHistoryItemGroup && !outgoingHistoryItemGroup) {
-            const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor(currentHistoryItemGroup.id, currentHistoryItemGroup.remote?.id);
-            if (!ancestor) {
-                return [];
-            }
-            incomingHistoryItemGroup = currentHistoryItemGroup.remote ? {
-                id: currentHistoryItemGroup.remote.id,
-                label: currentHistoryItemGroup.remote.name,
-                ariaLabel: ( localize(6393, "Incoming changes from {0}", currentHistoryItemGroup.remote.name)),
-                icon: Codicon.arrowCircleDown,
-                direction: 'incoming',
-                ancestor: ancestor.id,
-                count: ancestor.behind,
-                repository: element,
-                type: 'historyItemGroup'
-            } : undefined;
-            outgoingHistoryItemGroup = {
-                id: currentHistoryItemGroup.id,
-                label: currentHistoryItemGroup.name,
-                ariaLabel: ( localize(6394, "Outgoing changes to {0}", currentHistoryItemGroup.name)),
-                icon: Codicon.arrowCircleUp,
-                direction: 'outgoing',
-                ancestor: ancestor.id,
-                count: ancestor.ahead,
-                repository: element,
-                type: 'historyItemGroup'
-            };
-            this._updateCacheEntry(element, {
-                incomingHistoryItemGroup,
-                outgoingHistoryItemGroup
-            });
-        }
-        if (incomingHistoryItemGroup &&
-            (showIncomingChanges === 'always' ||
-                (showIncomingChanges === 'auto' && (incomingHistoryItemGroup.count ?? 0) > 0))) {
-            children.push(incomingHistoryItemGroup);
-        }
-        if (outgoingHistoryItemGroup &&
-            (showOutgoingChanges === 'always' ||
-                (showOutgoingChanges === 'auto' && (outgoingHistoryItemGroup.count ?? 0) > 0))) {
-            children.push(outgoingHistoryItemGroup);
-        }
-        return children;
-    }
-    getHistoryItemGroupFilter(element) {
-        return this._historyItemGroupFilter.get(element) ?? ( (new Set()));
-    }
-    deleteHistoryItemGroupFilter(repository) {
-        this._historyItemGroupFilter.delete(repository);
-    }
-    toggleHistoryItemGroupFilter(element, historyItemGroupId) {
-        const filters = this.getHistoryItemGroupFilter(element);
-        if (!filters.delete(historyItemGroupId)) {
-            filters.add(historyItemGroupId);
-        }
-        this._historyItemGroupFilter.set(element, filters);
-    }
-    async getHistoryItems(element) {
-        const repository = element.repository;
-        const historyProvider = repository.provider.historyProvider.get();
-        if (!historyProvider) {
-            return [];
-        }
-        const historyProviderCacheEntry = this._getCacheEntry(repository);
-        const historyItemsMap = historyProviderCacheEntry.historyItems;
-        let historyItemsElement = historyProviderCacheEntry.historyItems.get(element.id);
-        if (!historyItemsElement) {
-            const historyItems = (await historyProvider.provideHistoryItems(element.id, { limit: { id: element.ancestor } })) ?? [];
-            const { showChangesSummary } = this._getConfiguration();
-            const allChanges = showChangesSummary && historyItems.length >= 2 ?
-                await historyProvider.provideHistoryItemSummary(historyItems[0].id, element.ancestor) : undefined;
-            historyItemsElement = [allChanges, historyItems];
-            this._updateCacheEntry(repository, {
-                historyItems: historyItemsMap.set(element.id, historyItemsElement)
-            });
-        }
-        const children = [];
-        if (historyItemsElement[0]) {
-            children.push({
-                ...historyItemsElement[0],
-                icon: historyItemsElement[0].icon ?? Codicon.files,
-                message: ( localize(6395, "All Changes")),
-                historyItemGroup: element,
-                type: 'allChanges'
-            });
-        }
-        children.push(...( (historyItemsElement[1]
-            .map(historyItem => ({
-            ...historyItem,
-            historyItemGroup: element,
-            type: 'historyItem'
-        })))));
-        return children;
-    }
-    async getHistoryItems2(element) {
-        const { showHistoryGraph } = this._getConfiguration();
-        const historyProvider = element.provider.historyProvider.get();
-        const currentHistoryItemGroup = historyProvider?.currentHistoryItemGroup.get();
-        if (!historyProvider || !currentHistoryItemGroup || !showHistoryGraph) {
-            return [];
-        }
-        const historyProviderCacheEntry = this._getCacheEntry(element);
-        let historyItemsElement = historyProviderCacheEntry.historyItems2.get(element.id);
-        const historyItemsMap = historyProviderCacheEntry.historyItems2;
-        if (!historyItemsElement) {
-            const historyItemGroupIds = [
-                currentHistoryItemGroup.id,
-                ...(currentHistoryItemGroup.remote ? [currentHistoryItemGroup.remote.id] : []),
-                ...(currentHistoryItemGroup.base ? [currentHistoryItemGroup.base.id] : []),
-            ];
-            const ancestor = await historyProvider.resolveHistoryItemGroupCommonAncestor2(historyItemGroupIds);
-            if (!ancestor) {
-                return [];
-            }
-            const filters = this.getHistoryItemGroupFilter(element);
-            historyItemsElement = (await historyProvider.provideHistoryItems2({
-                historyItemGroupIds: historyItemGroupIds.filter(id => !( (filters.has(id)))),
-                limit: { id: ancestor }
-            })) ?? [];
-            this._updateCacheEntry(element, {
-                historyItems2: historyItemsMap.set(element.id, historyItemsElement)
-            });
-        }
-        if (historyItemsElement.length === 1) {
-            const currentHistoryItemGroupLabels = [
-                currentHistoryItemGroup.name,
-                ...(currentHistoryItemGroup.remote ? [currentHistoryItemGroup.remote.name] : []),
-                ...(currentHistoryItemGroup.base ? [currentHistoryItemGroup.base.name] : []),
-            ];
-            const labels = ( ((historyItemsElement[0].labels ?? [])
-                .map(l => l.title)));
-            if (equals(currentHistoryItemGroupLabels.sort(), labels.sort())) {
-                return [];
-            }
-        }
-        const colorMap = ( (new Map([
-            [currentHistoryItemGroup.name, historyItemGroupLocal]
-        ])));
-        if (currentHistoryItemGroup.remote) {
-            colorMap.set(currentHistoryItemGroup.remote.name, historyItemGroupRemote);
-        }
-        if (currentHistoryItemGroup.base) {
-            colorMap.set(currentHistoryItemGroup.base.name, historyItemGroupBase);
-        }
-        return (
-             (toISCMHistoryItemViewModelArray(historyItemsElement, colorMap)
-                .map(historyItemViewModel => ({
-                repository: element,
-                historyItemViewModel,
-                type: 'historyItem2'
-            })))
-        );
-    }
-    async getHistoryItemChanges(element) {
-        const repository = element.historyItemGroup.repository;
-        const historyProvider = repository.provider.historyProvider.get();
-        if (!historyProvider) {
-            return [];
-        }
-        const historyProviderCacheEntry = this._getCacheEntry(repository);
-        const historyItemChangesMap = historyProviderCacheEntry.historyItemChanges;
-        const historyItemParentId = element.parentIds.length > 0 ? element.parentIds[0] : undefined;
-        let historyItemChanges = historyItemChangesMap.get(`${element.id}/${historyItemParentId}`);
-        if (!historyItemChanges) {
-            const historyItemParentId = element.parentIds.length > 0 ? element.parentIds[0] : undefined;
-            historyItemChanges = (await historyProvider.provideHistoryItemChanges(element.id, historyItemParentId)) ?? [];
-            this._updateCacheEntry(repository, {
-                historyItemChanges: historyItemChangesMap.set(`${element.id}/${historyItemParentId}`, historyItemChanges)
-            });
-        }
-        if (this.viewMode() === ViewMode.List) {
-            return (
-                 (historyItemChanges.map(change => ({
-                    ...change,
-                    historyItem: element,
-                    type: 'historyItemChange'
-                })))
-            );
-        }
-        const tree = ( (new ResourceTree(
-            element,
-            repository.provider.rootUri ?? URI.file('/'),
-            this.uriIdentityService.extUri
-        )));
-        for (const change of historyItemChanges) {
-            tree.add(change.uri, {
-                ...change,
-                historyItem: element,
-                type: 'historyItemChange'
-            });
-        }
-        const children = [];
-        for (const node of tree.root.children) {
-            children.push(node.element ?? node);
-        }
-        return children;
-    }
-    _getCacheEntry(repository) {
-        let entry = this._cache.get(repository);
-        if (!entry) {
-            entry = {
-                incomingHistoryItemGroup: undefined,
-                outgoingHistoryItemGroup: undefined,
-                historyItems: ( (new Map())),
-                historyItems2: ( (new Map())),
-                historyItemChanges: ( (new Map()))
-            };
-            this._cache.set(repository, entry);
-        }
-        return entry;
-    }
-    _updateCacheEntry(repository, entry) {
-        this._cache.set(repository, {
-            ...this._getCacheEntry(repository),
-            ...entry
-        });
-    }
-    _getConfiguration() {
-        return {
-            showChangesSummary: this.configurationService.getValue('scm.showChangesSummary'),
-            showIncomingChanges: this.configurationService.getValue('scm.showIncomingChanges'),
-            showOutgoingChanges: this.configurationService.getValue('scm.showOutgoingChanges'),
-            showHistoryGraph: this.configurationService.getValue('scm.showHistoryGraph')
-        };
-    }
-};
-SCMTreeHistoryProviderDataSource = ( (__decorate([
-    ( (__param(1, IConfigurationService))),
-    ( (__param(2, IUriIdentityService)))
-], SCMTreeHistoryProviderDataSource)));
 let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
-    constructor(viewMode, historyProviderDataSource, configurationService, scmViewService) {
+    constructor(viewMode, configurationService, scmViewService) {
         super();
         this.viewMode = viewMode;
-        this.historyProviderDataSource = historyProviderDataSource;
         this.configurationService = configurationService;
         this.scmViewService = scmViewService;
     }
@@ -3520,30 +3077,6 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
             if (hasSomeChanges || (repositoryCount === 1 && (!showActionButton || !actionButton))) {
                 children.push(...resourceGroups);
             }
-            const historyItemGroups = await this.historyProviderDataSource.getHistoryItemGroups(inputOrElement);
-            if (historyItemGroups.length > 0) {
-                let label = ( localize(6396, "Incoming/Outgoing"));
-                let ariaLabel = ( localize(6397, "Incoming and outgoing changes"));
-                const incomingHistoryItems = historyItemGroups.find(g => g.direction === 'incoming');
-                const outgoingHistoryItems = historyItemGroups.find(g => g.direction === 'outgoing');
-                if (incomingHistoryItems && !outgoingHistoryItems) {
-                    label = ( localize(6398, "Incoming"));
-                    ariaLabel = ( localize(6399, "Incoming changes"));
-                }
-                else if (!incomingHistoryItems && outgoingHistoryItems) {
-                    label = ( localize(6400, "Outgoing"));
-                    ariaLabel = ( localize(6401, "Outgoing changes"));
-                }
-                children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
-            }
-            children.push(...historyItemGroups);
-            const historyItems = await this.historyProviderDataSource.getHistoryItems2(inputOrElement);
-            if (historyItems.length > 0) {
-                const label = ( localize(6396, "Incoming/Outgoing"));
-                const ariaLabel = ( localize(6397, "Incoming and outgoing changes"));
-                children.push({ label, ariaLabel, repository: inputOrElement, type: 'separator' });
-            }
-            children.push(...historyItems);
             return children;
         }
         else if (isSCMResourceGroup(inputOrElement)) {
@@ -3565,12 +3098,6 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
             }
             return children;
         }
-        else if (isSCMHistoryItemGroupTreeElement(inputOrElement)) {
-            return this.historyProviderDataSource.getHistoryItems(inputOrElement);
-        }
-        else if (isSCMHistoryItemTreeElement(inputOrElement)) {
-            return this.historyProviderDataSource.getHistoryItemChanges(inputOrElement);
-        }
         return [];
     }
     getParent(element) {
@@ -3656,8 +3183,8 @@ let SCMTreeDataSource = class SCMTreeDataSource extends Disposable {
     }
 };
 SCMTreeDataSource = ( (__decorate([
-    ( (__param(2, IConfigurationService))),
-    ( (__param(3, ISCMViewService)))
+    ( (__param(1, IConfigurationService))),
+    ( (__param(2, ISCMViewService)))
 ], SCMTreeDataSource)));
 class SCMActionButton {
     constructor(container, contextMenuService, commandService, notificationService) {
@@ -3733,23 +3260,6 @@ class SCMActionButton {
         }
     }
 }
-registerThemingParticipant((theme, collector) => {
-    const selectionBackgroundColor = theme.getColor(selectionBackground);
-    if (selectionBackgroundColor) {
-        const inputBackgroundColor = theme.getColor(inputBackground);
-        if (inputBackgroundColor) {
-            collector.addRule(`.scm-view .scm-editor-container .monaco-editor-background { background-color: ${inputBackgroundColor}; } `);
-            collector.addRule(`.scm-view .scm-editor-container .monaco-editor .selected-text { background-color: ${( (inputBackgroundColor.transparent(0.4)))}; }`);
-        }
-        const inputForegroundColor = theme.getColor(inputForeground);
-        if (inputForegroundColor) {
-            collector.addRule(`.scm-view .scm-editor-container .monaco-editor .view-line span.inline-selected-text { color: ${inputForegroundColor}; }`);
-        }
-        collector.addRule(`.scm-view .scm-editor-container .monaco-editor .focused .selected-text { background-color: ${selectionBackgroundColor}; }`);
-    }
-    else {
-        collector.addRule(`.scm-view .scm-editor-container .monaco-editor .focused .selected-text { background-color: ${theme.getColor(editorSelectionBackground)}; }`);
-    }
-});
+setupSimpleEditorSelectionStyling('.scm-view .scm-editor-container');
 
 export { ActionButtonRenderer, ContextKeys, SCMAccessibilityProvider, SCMActionButton, SCMTreeKeyboardNavigationLabelProvider, SCMTreeSorter, SCMViewPane };