@codingame/monaco-vscode-scm-service-override 1.83.15 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "1.83.15",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.15",
-    "monaco-editor": "0.44.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0"
   }
 }

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

@@ -19,7 +19,7 @@ function getCount(repository) {
         return repository.provider.count;
     }
     else {
-        return repository.provider.groups.elements.reduce((r, g) => r + g.elements.length, 0);
+        return repository.provider.groups.reduce((r, g) => r + g.resources.length, 0);
     }
 }
 let SCMStatusController = class SCMStatusController {
@@ -162,7 +162,7 @@ let SCMStatusController = class SCMStatusController {
                 '{0} pending changes',
                 num
             ))));
-            this.badgeDisposable.value = this.activityService.showViewActivity(VIEW_PANE_ID, { badge, clazz: 'scm-viewlet-label' });
+            this.badgeDisposable.value = this.activityService.showViewActivity(VIEW_PANE_ID, { badge });
         }
         else {
             this.badgeDisposable.value = undefined;
@@ -218,8 +218,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         if (activeResource?.scheme === Schemas.file || activeResource?.scheme === Schemas.vscodeRemote) {
             const activeResourceRepository = Iterable.find(this.scmService.repositories, r => Boolean(r.provider.rootUri && this.uriIdentityService.extUri.isEqualOrParent(activeResource, r.provider.rootUri)));
             this.activeResourceRepositoryContextKey.set(activeResourceRepository?.id);
-            for (const resourceGroup of activeResourceRepository?.provider.groups.elements ?? []) {
-                if (( resourceGroup.elements
+            for (const resourceGroup of activeResourceRepository?.provider.groups ?? []) {
+                if (( resourceGroup.resources
                     .some(
                     scmResource => this.uriIdentityService.extUri.isEqual(activeResource, scmResource.sourceUri)
                 ))) {

package/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css.js

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".scm-view{height:100%;position:relative}.scm-overflow-widgets-container{height:0;left:0;overflow:visible;position:absolute;top:0;width:0;z-index:5000}.scm-view .monaco-tl-contents>div{overflow:hidden;padding-right:12px}.scm-view .count{display:flex;margin-left:6px}.scm-view .count.hidden{display:none}.scm-view .scm-provider{align-items:center;display:flex;flex-direction:column;flex-flow:nowrap;height:100%}.scm-view.auto-provider-counts .scm-provider>.count[data-count=\"0\"],.scm-view.hide-provider-counts .scm-provider>.count{display:none}.scm-view .scm-provider>.label{flex:1;min-width:50px;overflow:hidden;text-overflow:ellipsis}.scm-view .scm-provider>.label>.name{font-weight:700}.scm-view .scm-provider>.label>.description{font-size:.9em;margin-left:.5em;opacity:.7}.scm-view .scm-provider>.actions{justify-content:flex-end;overflow:hidden}.scm-view .monaco-editor .selected-text{border-radius:0}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item{align-items:center;display:flex;min-width:16px;padding-left:4px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label,.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.monaco-dropdown>.dropdown-label>.action-label{align-items:center;display:flex;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label>.codicon{font-size:12px;justify-content:center}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:last-of-type{padding-right:0}.scm-view .scm-provider>.body{flex-grow:1}.scm-view .scm-provider>.status>.monaco-action-bar>.actions-container{border-color:var(--vscode-sideBar-border)}.scm-view .monaco-list-row{line-height:22px}.scm-view .monaco-list-row .history,.scm-view .monaco-list-row .history-item-group,.scm-view .monaco-list-row .resource-group{align-items:center;display:flex;height:100%}.scm-view .monaco-list-row .history-item-group .monaco-highlighted-label{align-items:center;display:flex}.scm-view .monaco-list-row .history-item .monaco-icon-label,.scm-view .monaco-list-row .history-item-group .monaco-icon-label{align-items:center;flex-grow:1}.scm-view .monaco-list-row .history-item-group .monaco-icon-label>.monaco-icon-label-container{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 .history-item .monaco-icon-label .icon-container,.scm-sync-view .monaco-list-row .monaco-icon-label .icon-container\n.scm-sync-view .monaco-list-row .monaco-icon-label .icon-container{display:flex;font-size:14px;padding-right:4px}.scm-sync-view .monaco-list-row .history-item .monaco-icon-label .avatar{border-radius:14px;height:14px;width:14px}.scm-view .monaco-list-row .history-item-group>.name,.scm-view .monaco-list-row .history>.name,.scm-view .monaco-list-row .resource-group>.name{flex:1;overflow:hidden;text-overflow:ellipsis}.scm-view .monaco-list-row .resource{display:flex;height:100%}.scm-view .monaco-list-row .resource.faded{opacity:.7}.scm-view .monaco-list-row .resource>.name{flex:1;overflow:hidden}.scm-view .monaco-list-row .resource>.name>.monaco-icon-label:after{margin-right:3px}.scm-view .monaco-list-row .resource>.decoration-icon{background-position:50% 50%;background-repeat:no-repeat;height:100%;margin-right:8px;width:16px}.scm-view .monaco-list-row .resource>.decoration-icon.codicon{margin-right:0;margin-top:3px}.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions{flex-grow:100}.scm-view .monaco-list .monaco-list-row .resource-group>.actions,.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions{display:none;max-width:fit-content}.scm-view .monaco-list .monaco-list-row.focused .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row.selected .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.selected .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover>.actions{display:block}.scm-view .monaco-list .monaco-list-row.focused.force-no-hover,.scm-view .monaco-list .monaco-list-row.force-no-hover,.scm-view .monaco-list .monaco-list-row.selected.force-no-hover,.scm-view .monaco-list .monaco-list-row:hover.force-no-hover{background:transparent!important}.scm-view .monaco-list .monaco-list-row.cursor-default{cursor:default}.scm-view.show-actions .scm-provider>.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{display:block}.scm-view .monaco-list-row .actions .action-label{padding:2px}.scm-view .scm-input{border-radius:2px;height:100%;padding-left:11px}.scm-view .scm-editor-container .monaco-editor{border-radius:2px}.scm-view .scm-editor-container .monaco-editor .focused .selected-text{background-color:var(--vscode-editor-selectionBackground)}.scm-view .scm-editor{box-sizing:border-box;display:flex;flex-direction:column;height:100%;justify-content:center;width:100%}.scm-view .button-container{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .button-container .codicon.codicon-cloud-upload,.scm-view .button-container .codicon.codicon-sync{margin:0 4px 0 0}.scm-view .button-container .codicon.codicon-arrow-down,.scm-view .button-container .codicon.codicon-arrow-up{font-size:small!important;margin:0 4px 0 0}.scm-view .button-container>.monaco-button-dropdown{flex-grow:1;overflow:hidden}.scm-view .button-container>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button{min-width:0}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button>span:not(.codicon){overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.scm-view .scm-editor.hidden{display:none}.monaco-workbench .part.panel .scm-view .scm-editor-container{outline:1px solid var(--vscode-panelInput-border)}.scm-view .scm-editor-container{background-color:var(--vscode-input-background);border:1px solid var(--vscode-input-border,transparent);border-radius:2px;box-sizing:border-box;position:relative}.monaco-workbench .part.panel .scm-view .scm-editor-container.synthetic-focus,.scm-view .scm-editor-container.synthetic-focus{outline:1px solid var(--vscode-focusBorder);outline-offset:-1px}.scm-view .scm-editor-container.validation-info{outline:1px solid var(--vscode-inputValidation-infoBorder)!important;outline-offset:-1px}.scm-view .scm-editor-container.validation-warning{outline:1px solid var(--vscode-inputValidation-warningBorder)!important;outline-offset:-1px}.scm-view .scm-editor-container.validation-error{outline:1px solid var(--vscode-inputValidation-errorBorder)!important;outline-offset:-1px}.scm-editor-validation-container{border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-style:solid;border-width:1px;border-top:none;box-sizing:border-box;display:flex;padding:2px}.scm-editor-validation-container.validation-info{background-color:var(--vscode-inputValidation-infoBackground);border-color:var(--vscode-inputValidation-infoBorder);color:var(--vscode-inputValidation-infoForeground)}.scm-editor-validation-container.validation-warning{background-color:var(--vscode-inputValidation-warningBackground);border-color:var(--vscode-inputValidation-warningBorder);color:var(--vscode-inputValidation-warningForeground)}.scm-editor-validation-container.validation-error{background-color:var(--vscode-inputValidation-errorBackground);border-color:var(--vscode-inputValidation-errorBorder);color:var(--vscode-inputValidation-errorForeground)}.scm-editor-validation{border-style:none;box-sizing:border-box;display:block;flex:auto;font-size:.9em;padding:1px 3px}.scm-editor-validation p{margin:0;padding:0}.scm-editor-validation a{color:var(--vscode-textLink-foreground);-webkit-user-select:none;user-select:none}.scm-editor-validation a:active,.scm-editor-validation a:hover{color:var(--vscode-textLink-activeForeground)}.scm-editor-validation-actions{align-self:start;margin-top:1px}.scm-view .scm-editor-placeholder{box-sizing:border-box;color:var(--vscode-input-placeholderForeground);overflow:hidden;padding:2px 6px;pointer-events:none;position:absolute;text-overflow:ellipsis;white-space:nowrap;width:100%;z-index:1}.scm-view .scm-editor-placeholder.hidden{display:none}.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .margin,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .monaco-editor-background,.scm-view .scm-editor-container .monaco-editor,.scm-view .scm-editor-container .monaco-editor .margin,.scm-view .scm-editor-container .monaco-editor-background{background-color:var(--vscode-input-background);color:inherit}.scm-view .scm-editor-container .mtk1{color:var(--vscode-input-foreground)}.scm-repositories-view .scm-provider{margin:0 12px 0 20px;overflow:hidden}.scm-repositories-view .scm-provider>.label>.name{font-weight:400}";
+var css = ".scm-view{height:100%;position:relative}.scm-overflow-widgets-container{height:0;left:0;overflow:visible;position:absolute;top:0;width:0;z-index:5000}.scm-view .monaco-tl-contents>div{overflow:hidden;padding-right:12px}.scm-view .count{display:flex;margin-left:6px}.scm-view .count.hidden{display:none}.scm-view .scm-provider{align-items:center;display:flex;flex-direction:column;flex-flow:nowrap;height:100%}.scm-view.auto-provider-counts .scm-provider>.count[data-count=\"0\"],.scm-view.hide-provider-counts .scm-provider>.count{display:none}.scm-view .scm-provider>.label{flex:1;min-width:50px;overflow:hidden;text-overflow:ellipsis}.scm-view .scm-provider>.label>.name{font-weight:700}.scm-view .scm-provider>.label>.description{font-size:.9em;margin-left:.5em;opacity:.7}.scm-view .scm-provider>.actions{justify-content:flex-end;overflow:hidden}.scm-view .monaco-editor .selected-text{border-radius:0}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item{align-items:center;display:flex;min-width:16px;padding-left:4px}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label,.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.monaco-dropdown>.dropdown-label>.action-label{align-items:center;display:flex;overflow:hidden}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item>.action-label>.codicon{font-size:12px;justify-content:center}.scm-view .scm-provider>.actions>.monaco-toolbar>.monaco-action-bar>.actions-container>.action-item:last-of-type{padding-right:0}.scm-view .scm-provider>.body{flex-grow:1}.scm-view .scm-provider>.status>.monaco-action-bar>.actions-container{border-color:var(--vscode-sideBar-border)}.scm-view .monaco-list-row{line-height:22px}.scm-view .monaco-list-row .history,.scm-view .monaco-list-row .history-item-group,.scm-view .monaco-list-row .resource-group{align-items:center;display:flex;height:100%}.scm-view .monaco-list-row .history-item .monaco-icon-label,.scm-view .monaco-list-row .history-item-group .monaco-icon-label{align-items:center;flex-grow:1}.scm-view .monaco-list-row .history-item{align-items:center;display:flex}.scm-view .monaco-list-row .history-item .stats-container{border:1px solid var(--vscode-scm-historyItemStatisticsBorder);border-radius:2px;display:flex;font-size:11px;gap:4px;line-height:11px;margin-left:6px;min-height:18px;padding:0 4px}.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>.deletions-label,.scm-view .monaco-list-row .history-item .stats-container>.files-label,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label{align-items:center;display:flex;opacity:.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>.deletions-label.hidden,.scm-view .monaco-list-row .history-item .stats-container>.insertions-label.hidden{display:none}.scm-view .monaco-list-row .history-item .monaco-icon-label .icon-container,.scm-view .monaco-list-row .history-item-group .monaco-icon-label .icon-container{display:flex;padding-right:4px}.scm-view .monaco-list-row .history-item .monaco-icon-label .avatar{border-radius:14px;height:14px;width:14px}.scm-view .monaco-list-row .separator-container{align-items:center;display:flex;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{color:var(--vscode-foreground)}.scm-view .monaco-list-row .separator-container .separator{border-top:1px solid var(--vscode-sideBar-border);display:flex;flex-grow:1;height:0;margin-left:6px}.scm-view .monaco-list-row .history-item-group>.name,.scm-view .monaco-list-row .history>.name,.scm-view .monaco-list-row .resource-group>.name{flex:1;overflow:hidden;text-overflow:ellipsis}.scm-view .monaco-list-row .resource{display:flex;height:100%}.scm-view .monaco-list-row .resource.faded{opacity:.7}.scm-view .monaco-list-row .resource>.name{flex:1;overflow:hidden}.scm-view .monaco-list-row .resource>.name>.monaco-icon-label:after{margin-right:3px}.scm-view .monaco-list-row .resource>.decoration-icon{background-position:50% 50%;background-repeat:no-repeat;height:100%;margin-right:8px;width:16px}.scm-view .monaco-list-row .resource>.decoration-icon.codicon{margin-right:0;margin-top:3px}.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions{flex-grow:100}.scm-view .monaco-list .monaco-list-row .history-item>.actions,.scm-view .monaco-list .monaco-list-row .resource-group>.actions,.scm-view .monaco-list .monaco-list-row .resource>.name>.monaco-icon-label>.actions{display:none;max-width:fit-content}.scm-view .monaco-list .monaco-list-row.focused .history-item>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.focused .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row.selected .history-item>.actions,.scm-view .monaco-list .monaco-list-row.selected .resource-group>.actions,.scm-view .monaco-list .monaco-list-row.selected .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list .monaco-list-row:hover .history-item>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource-group>.actions,.scm-view .monaco-list .monaco-list-row:hover .resource>.name>.monaco-icon-label>.actions,.scm-view .monaco-list:not(.selection-multiple) .monaco-list-row .resource:hover>.actions{display:block}.scm-view .monaco-list .monaco-list-row.focused.force-no-hover,.scm-view .monaco-list .monaco-list-row.force-no-hover,.scm-view .monaco-list .monaco-list-row.selected.force-no-hover,.scm-view .monaco-list .monaco-list-row:hover.force-no-hover{background:transparent!important}.scm-view .monaco-list .monaco-list-row.cursor-default{cursor:default}.scm-view.show-actions .scm-provider>.actions,.scm-view.show-actions>.monaco-list .monaco-list-row .history-item>.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 .scm-input>.scm-editor>.actions{display:block}.scm-view .monaco-list-row .actions .action-label{padding:2px}.scm-view .scm-input{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .scm-input .scm-editor .scm-editor-toolbar{padding:1px 3px 1px 1px}.scm-view .scm-input .scm-editor .scm-editor-toolbar .monaco-action-bar.hidden,.scm-view .scm-input .scm-editor .scm-editor-toolbar .monaco-toolbar.hidden,.scm-view .scm-input .scm-editor .scm-editor-toolbar.hidden{display:none}.scm-view .scm-input .scm-editor .scm-editor-toolbar.scroll-decoration{box-shadow:var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset}.scm-view .scm-input .scm-editor .scm-editor-toolbar .action-label.codicon.codicon-debug-stop{color:var(--vscode-icon-foreground)!important}.scm-view .scm-editor-container .monaco-editor{border-radius:2px}.scm-view .scm-editor-container .monaco-editor .focused .selected-text{background-color:var(--vscode-editor-selectionBackground)}.scm-view .scm-editor{align-items:flex-start;background-color:var(--vscode-input-background);border:1px solid var(--vscode-input-border,transparent);border-radius:2px;box-sizing:border-box;display:flex;width:100%}.scm-view .button-container{align-items:center;display:flex;height:100%;padding-left:11px}.scm-view .button-container .codicon.codicon-cloud-upload,.scm-view .button-container .codicon.codicon-sync{margin:0 4px 0 0}.scm-view .button-container .codicon.codicon-arrow-down,.scm-view .button-container .codicon.codicon-arrow-up{font-size:small!important;margin:0 4px 0 0}.scm-view .button-container>.monaco-button-dropdown{flex-grow:1;overflow:hidden}.scm-view .button-container>.monaco-button-dropdown>.monaco-dropdown-button{align-items:center;display:flex;padding:0 4px}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button{min-width:0}.scm-view .button-container>.monaco-button-dropdown>.monaco-button.monaco-text-button>span:not(.codicon){overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.scm-view .scm-editor.hidden{display:none}.monaco-workbench .part.panel .scm-view .scm-editor-container{outline:1px solid var(--vscode-panelInput-border)}.monaco-workbench .part.panel .scm-view .scm-editor.synthetic-focus,.scm-view .scm-editor.synthetic-focus{outline:1px solid var(--vscode-focusBorder);outline-offset:-1px}.scm-view .scm-editor.validation-info{outline:1px solid var(--vscode-inputValidation-infoBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-warning{outline:1px solid var(--vscode-inputValidation-warningBorder)!important;outline-offset:-1px}.scm-view .scm-editor.validation-error{outline:1px solid var(--vscode-inputValidation-errorBorder)!important;outline-offset:-1px}.scm-editor-validation-container{border-bottom-left-radius:2px;border-bottom-right-radius:2px;border-style:solid;border-width:1px;border-top:none;box-sizing:border-box;display:flex;padding:2px}.scm-editor-validation-container.validation-info{background-color:var(--vscode-inputValidation-infoBackground);border-color:var(--vscode-inputValidation-infoBorder);color:var(--vscode-inputValidation-infoForeground)}.scm-editor-validation-container.validation-warning{background-color:var(--vscode-inputValidation-warningBackground);border-color:var(--vscode-inputValidation-warningBorder);color:var(--vscode-inputValidation-warningForeground)}.scm-editor-validation-container.validation-error{background-color:var(--vscode-inputValidation-errorBackground);border-color:var(--vscode-inputValidation-errorBorder);color:var(--vscode-inputValidation-errorForeground)}.scm-editor-validation{border-style:none;box-sizing:border-box;display:block;flex:auto;font-size:.9em;padding:1px 3px}.scm-editor-validation p{margin:0;padding:0}.scm-editor-validation a{color:var(--vscode-textLink-foreground);-webkit-user-select:none;user-select:none}.scm-editor-validation a:active,.scm-editor-validation a:hover{color:var(--vscode-textLink-activeForeground)}.scm-editor-validation-actions{align-self:start;margin-top:1px}.scm-view .scm-editor-placeholder{box-sizing:border-box;color:var(--vscode-input-placeholderForeground);overflow:hidden;padding:2px 6px;pointer-events:none;position:absolute;text-overflow:ellipsis;white-space:nowrap;z-index:1}.scm-view .scm-editor-placeholder.hidden{display:none}.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .margin,.monaco-workbench .part.basepanel>.content .scm-view .scm-editor-container .monaco-editor .monaco-editor-background,.scm-view .scm-editor-container .monaco-editor,.scm-view .scm-editor-container .monaco-editor .margin,.scm-view .scm-editor-container .monaco-editor-background{background-color:var(--vscode-input-background);color:inherit}.scm-view .scm-editor-container .mtk1{color:var(--vscode-input-foreground)}.scm-repositories-view .scm-provider{margin:0 12px 0 20px;overflow:hidden}.scm-repositories-view .scm-provider>.label>.name{font-weight:400}";
 n(css,{});
 
 export { css, css as default };

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

@@ -106,9 +106,17 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
         }
         return this._repositoryMenu;
     }
+    get historyProviderMenu() {
+        if (this.provider.historyProvider && !this._historyProviderMenu) {
+            this._historyProviderMenu = this.instantiationService.createInstance(SCMHistoryProviderMenus);
+            this.disposables.add(this._historyProviderMenu);
+        }
+        return this._historyProviderMenu;
+    }
     constructor(provider, contextKeyService, instantiationService, menuService) {
+        this.provider = provider;
+        this.instantiationService = instantiationService;
         this.menuService = menuService;
-        this.resourceGroups = [];
         this.resourceGroupMenusItems = ( new Map());
         this.disposables = ( new DisposableStore());
         this.contextKeyService = contextKeyService.createOverlay([
@@ -119,8 +127,8 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
         const serviceCollection = ( new ServiceCollection([IContextKeyService, this.contextKeyService]));
         instantiationService = instantiationService.createChild(serviceCollection);
         this.titleMenu = instantiationService.createInstance(SCMTitleMenu);
-        provider.groups.onDidSplice(this.onDidSpliceGroups, this, this.disposables);
-        this.onDidSpliceGroups({ start: 0, deleteCount: 0, toInsert: provider.groups.elements });
+        provider.onDidChangeResourceGroups(this.onDidChangeResourceGroups, this, this.disposables);
+        this.onDidChangeResourceGroups();
     }
     getResourceGroupMenu(group) {
         return this.getOrCreateResourceGroupMenusItem(group).resourceGroupMenu;
@@ -142,12 +150,12 @@ let SCMRepositoryMenus = class SCMRepositoryMenus {
         }
         return result;
     }
-    onDidSpliceGroups({ start, deleteCount, toInsert }) {
-        const deleted = this.resourceGroups.splice(start, deleteCount, ...toInsert);
-        for (const group of deleted) {
-            const item = this.resourceGroupMenusItems.get(group);
-            item?.dispose();
-            this.resourceGroupMenusItems.delete(group);
+    onDidChangeResourceGroups() {
+        for (const resourceGroup of ( this.resourceGroupMenusItems.keys())) {
+            if (!this.provider.groups.includes(resourceGroup)) {
+                this.resourceGroupMenusItems.get(resourceGroup)?.dispose();
+                this.resourceGroupMenusItems.delete(resourceGroup);
+            }
         }
     }
     dispose() {
@@ -160,6 +168,35 @@ SCMRepositoryMenus = ( __decorate([
     ( __param(2, IInstantiationService)),
     ( __param(3, IMenuService))
 ], SCMRepositoryMenus));
+let SCMHistoryProviderMenus = class SCMHistoryProviderMenus {
+    constructor(contextKeyService, menuService) {
+        this.contextKeyService = contextKeyService;
+        this.menuService = menuService;
+        this.historyItemMenus = ( new Map());
+        this.disposables = ( new DisposableStore());
+    }
+    getHistoryItemMenu(historyItem) {
+        return this.getOrCreateHistoryItemMenu(historyItem);
+    }
+    getOrCreateHistoryItemMenu(historyItem) {
+        let result = this.historyItemMenus.get(historyItem);
+        if (!result) {
+            const contextKeyService = this.contextKeyService.createOverlay([
+                ['scmHistoryItem', historyItem.id],
+            ]);
+            result = this.menuService.createMenu(MenuId.SCMHistoryItem, contextKeyService);
+            this.historyItemMenus.set(historyItem, result);
+        }
+        return result;
+    }
+    dispose() {
+        this.disposables.dispose();
+    }
+};
+SCMHistoryProviderMenus = ( __decorate([
+    ( __param(0, IContextKeyService)),
+    ( __param(1, IMenuService))
+], SCMHistoryProviderMenus));
 let SCMMenus = class SCMMenus {
     constructor(scmService, instantiationService) {
         this.instantiationService = instantiationService;
@@ -201,4 +238,4 @@ MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
     order: 3,
 });
 
-export { SCMMenus, SCMRepositoryMenus, SCMTitleMenu };
+export { SCMHistoryProviderMenus, SCMMenus, SCMRepositoryMenus, SCMTitleMenu };

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

@@ -1,8 +1,8 @@
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { localizeWithPath, localize2WithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { DirtyDiffWorkbenchController } from 'vscode/vscode/vs/workbench/contrib/scm/browser/dirtydiffDecorator';
-import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, SYNC_VIEW_PANE_ID, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
+import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { SCMActiveResourceContextKeyController, SCMStatusController } from './activity.js';
 import { Extensions as Extensions$2 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
@@ -18,7 +18,7 @@ import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconReg
 import { SCMViewPane } from './scmViewPane.js';
 import { SCMRepositoriesViewPane } from './scmRepositoriesViewPane.js';
 import { Context } from 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggest.js';
-import { SCMSyncViewPane } from './scmSyncViewPane.js';
+import { getActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
 
 ModesRegistry.registerLanguage({
     id: 'scminput',
@@ -50,7 +50,7 @@ const viewContainer = ( Registry.as(Extensions$1.ViewContainersRegistry)).regist
 const viewsRegistry = ( Registry.as(Extensions$1.ViewsRegistry));
 viewsRegistry.registerViews([{
         id: VIEW_PANE_ID,
-        name: ( localizeWithPath(
+        name: ( localize2WithPath(
             'vs/workbench/contrib/scm/browser/scm.contribution',
             'source control',
             "Source Control"
@@ -58,7 +58,7 @@ viewsRegistry.registerViews([{
         ctorDescriptor: ( new SyncDescriptor(SCMViewPane)),
         canToggleVisibility: true,
         canMoveView: true,
-        weight: 60,
+        weight: 80,
         order: -999,
         containerIcon: sourceControlViewIcon,
         openCommandActionDescriptor: {
@@ -79,7 +79,7 @@ viewsRegistry.registerViews([{
     }], viewContainer);
 viewsRegistry.registerViews([{
         id: REPOSITORIES_VIEW_PANE_ID,
-        name: ( localizeWithPath(
+        name: ( localize2WithPath(
             'vs/workbench/contrib/scm/browser/scm.contribution',
             'source control repositories',
             "Source Control Repositories"
@@ -93,20 +93,6 @@ viewsRegistry.registerViews([{
         when: ( ContextKeyExpr.and(( ContextKeyExpr.has('scm.providerCount')), ( ContextKeyExpr.notEquals('scm.providerCount', 0)))),
         containerIcon: sourceControlViewIcon
     }], viewContainer);
-viewsRegistry.registerViews([{
-        id: SYNC_VIEW_PANE_ID,
-        name: ( localizeWithPath(
-            'vs/workbench/contrib/scm/browser/scm.contribution',
-            'source control sync',
-            "Source Control Sync"
-        )),
-        ctorDescriptor: ( new SyncDescriptor(SCMSyncViewPane)),
-        canToggleVisibility: true,
-        canMoveView: true,
-        weight: 20,
-        order: -998,
-        when: ( ContextKeyExpr.equals('config.scm.experimental.showSyncView', true)),
-    }], viewContainer);
 ( Registry.as(Extensions.Workbench))
     .registerWorkbenchContribution(SCMActiveResourceContextKeyController, 3 );
 ( Registry.as(Extensions.Workbench))
@@ -327,10 +313,11 @@ viewsRegistry.registerViews([{
                     "Show Source Control Provider count badges."
                 ))
             ],
-            description: ( localizeWithPath(
+            markdownDescription: ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/scm.contribution',
                 'scm.providerCountBadge',
-                "Controls the count badges on Source Control Provider headers. These headers only appear when there is more than one provider."
+                "Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
+                '\`#scm.alwaysShowRepositories#\`'
             )),
             default: 'hidden'
         },
@@ -410,6 +397,17 @@ viewsRegistry.registerViews([{
             )),
             default: 13
         },
+        'scm.inputMaxLines': {
+            type: 'number',
+            markdownDescription: ( localizeWithPath(
+                'vs/workbench/contrib/scm/browser/scm.contribution',
+                'inputMaxLines',
+                "Controls the maximum number of lines that the input will auto-grow to."
+            )),
+            minimum: 1,
+            maximum: 50,
+            default: 10
+        },
         'scm.alwaysShowRepositories': {
             type: 'boolean',
             markdownDescription: ( localizeWithPath(
@@ -464,20 +462,74 @@ viewsRegistry.registerViews([{
             )),
             default: true
         },
-        'scm.experimental.showSyncView': {
+        'scm.showInputActionButton': {
             type: 'boolean',
+            markdownDescription: ( localizeWithPath(
+                'vs/workbench/contrib/scm/browser/scm.contribution',
+                'showInputActionButton',
+                "Controls whether an action button can be shown in the Source Control input."
+            )),
+            default: true
+        },
+        'scm.showIncomingChanges': {
+            type: 'string',
+            enum: ['always', 'never', 'auto'],
+            enumDescriptions: [
+                ( localizeWithPath(
+                    'vs/workbench/contrib/scm/browser/scm.contribution',
+                    'scm.showIncomingChanges.always',
+                    "Always show incoming changes in the Source Control view."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/scm/browser/scm.contribution',
+                    'scm.showIncomingChanges.never',
+                    "Never show incoming changes in the Source Control view."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/scm/browser/scm.contribution',
+                    'scm.showIncomingChanges.auto',
+                    "Only show incoming changes in the Source Control view when any exist."
+                )),
+            ],
             description: ( localizeWithPath(
                 'vs/workbench/contrib/scm/browser/scm.contribution',
-                'showSyncView',
-                "Controls whether the Source Control Sync view is shown."
+                'scm.showIncomingChanges',
+                "Controls whether incoming changes are shown in the Source Control view."
             )),
-            default: false
+            default: 'auto'
+        },
+        'scm.showOutgoingChanges': {
+            type: 'string',
+            enum: ['always', 'never', 'auto'],
+            enumDescriptions: [
+                ( localizeWithPath(
+                    'vs/workbench/contrib/scm/browser/scm.contribution',
+                    'scm.showOutgoingChanges.always',
+                    "Always show outgoing changes in the Source Control view."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/scm/browser/scm.contribution',
+                    'scm.showOutgoingChanges.never',
+                    "Never show outgoing changes in the Source Control view."
+                )),
+                ( localizeWithPath(
+                    'vs/workbench/contrib/scm/browser/scm.contribution',
+                    'scm.showOutgoingChanges.auto',
+                    "Only show outgoing changes in the Source Control view when any exist."
+                )),
+            ],
+            description: ( localizeWithPath(
+                'vs/workbench/contrib/scm/browser/scm.contribution',
+                'scm.showOutgoingChanges',
+                "Controls whether outgoing changes are shown in the Source Control view."
+            )),
+            default: 'auto'
         }
     }
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.acceptInput',
-    description: { description: ( localizeWithPath(
+    metadata: { description: ( localizeWithPath(
         'vs/workbench/contrib/scm/browser/scm.contribution',
         'scm accept',
         "Source Control: Accept Input"
@@ -487,7 +539,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     primary: 2048  | 3 ,
     handler: accessor => {
         const contextKeyService = accessor.get(IContextKeyService);
-        const context = contextKeyService.getContext(document.activeElement);
+        const context = contextKeyService.getContext(getActiveElement());
         const repositoryId = context.getValue('scmRepository');
         if (!repositoryId) {
             return Promise.resolve(null);
@@ -513,7 +565,7 @@ const viewNextCommitCommand = {
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
         const scmService = accessor.get(ISCMService);
-        const context = contextKeyService.getContext(document.activeElement);
+        const context = contextKeyService.getContext(getActiveElement());
         const repositoryId = context.getValue('scmRepository');
         const repository = repositoryId ? scmService.getRepository(repositoryId) : undefined;
         repository?.input.showNextHistoryValue();
@@ -529,7 +581,7 @@ const viewPreviousCommitCommand = {
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
         const scmService = accessor.get(ISCMService);
-        const context = contextKeyService.getContext(document.activeElement);
+        const context = contextKeyService.getContext(getActiveElement());
         const repositoryId = context.getValue('scmRepository');
         const repository = repositoryId ? scmService.getRepository(repositoryId) : undefined;
         repository?.input.showPreviousHistoryValue();

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/scm.css.js';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { append, $ } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
@@ -18,6 +19,7 @@ import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/commo
 import { RepositoryRenderer } from './scmRepositoryRenderer.js';
 import { getActionViewItemProvider, collectContextMenuActions } from './util.js';
 import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
+import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 
 class ListDelegate {
     getHeight() {
@@ -31,10 +33,18 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
     constructor(options, scmViewService, keybindingService, contextMenuService, instantiationService, viewDescriptorService, contextKeyService, configurationService, openerService, themeService, telemetryService) {
         super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
         this.scmViewService = scmViewService;
+        this.disposables = ( new DisposableStore());
     }
     renderBody(container) {
         super.renderBody(container);
         const listContainer = append(container, $('.scm-view.scm-repositories-view'));
+        const updateProviderCountVisibility = () => {
+            const value = this.configurationService.getValue('scm.providerCountBadge');
+            listContainer.classList.toggle('hide-provider-counts', value === 'hidden');
+            listContainer.classList.toggle('auto-provider-counts', value === 'auto');
+        };
+        this._register(Event.filter(this.configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.providerCountBadge'), this.disposables)(updateProviderCountVisibility));
+        updateProviderCountVisibility();
         const delegate = ( new ListDelegate());
         const renderer = this.instantiationService.createInstance(RepositoryRenderer, getActionViewItemProvider(this.instantiationService));
         const identityProvider = { getId: (r) => r.provider.id };
@@ -77,6 +87,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
         this.updateBodySize();
     }
     focus() {
+        super.focus();
         this.list.domFocus();
     }
     layoutBody(height, width) {
@@ -136,6 +147,10 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
             this.list.setFocus([selection[0]]);
         }
     }
+    dispose() {
+        this.disposables.dispose();
+        super.dispose();
+    }
 };
 SCMRepositoriesViewPane = ( __decorate([
     ( __param(1, ISCMViewService)),

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

@@ -8,8 +8,6 @@ import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/b
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { isSCMRepository, connectPrimaryMenu, StatusBarAction } from './util.js';
 import { ToolBar } from 'monaco-editor/esm/vs/base/browser/ui/toolbar/toolbar.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
 import { defaultCountBadgeStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
 
 var RepositoryRenderer_1;
@@ -17,12 +15,11 @@ let RepositoryRenderer = class RepositoryRenderer {
     static { RepositoryRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'repository'; }
     get templateId() { return RepositoryRenderer_1.TEMPLATE_ID; }
-    constructor(actionViewItemProvider, scmViewService, commandService, contextMenuService, workspaceContextService) {
+    constructor(actionViewItemProvider, scmViewService, commandService, contextMenuService) {
         this.actionViewItemProvider = actionViewItemProvider;
         this.scmViewService = scmViewService;
         this.commandService = commandService;
         this.contextMenuService = contextMenuService;
-        this.workspaceContextService = workspaceContextService;
     }
     renderTemplate(container) {
         if (container.classList.contains('monaco-tl-contents')) {
@@ -46,20 +43,13 @@ let RepositoryRenderer = class RepositoryRenderer {
     }
     renderElement(arg, index, templateData, height) {
         const repository = isSCMRepository(arg) ? arg : arg.element;
+        templateData.name.textContent = repository.provider.name;
         if (repository.provider.rootUri) {
-            const folder = this.workspaceContextService.getWorkspaceFolder(repository.provider.rootUri);
-            if (folder?.uri.toString() === ( repository.provider.rootUri.toString())) {
-                templateData.name.textContent = folder.name;
-            }
-            else {
-                templateData.name.textContent = basename(repository.provider.rootUri);
-            }
             templateData.label.title = `${repository.provider.label}: ${repository.provider.rootUri.fsPath}`;
             templateData.description.textContent = repository.provider.label;
         }
         else {
             templateData.label.title = repository.provider.label;
-            templateData.name.textContent = repository.provider.label;
             templateData.description.textContent = '';
         }
         let statusPrimaryActions = [];
@@ -107,8 +97,7 @@ let RepositoryRenderer = class RepositoryRenderer {
 RepositoryRenderer = RepositoryRenderer_1 = ( __decorate([
     ( __param(1, ISCMViewService)),
     ( __param(2, ICommandService)),
-    ( __param(3, IContextMenuService)),
-    ( __param(4, IWorkspaceContextService))
+    ( __param(3, IContextMenuService))
 ], RepositoryRenderer));
 
 export { RepositoryRenderer };