@codingame/monaco-vscode-scm-service-override 15.0.2 → 16.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "15.0.2",
+  "version": "16.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - scm service-override",
   "keywords": [],
@@ -15,18 +15,19 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "15.0.2",
-    "@codingame/monaco-vscode-1bb39316-6fbf-572e-ab6a-818a2496c14f-common": "15.0.2",
-    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "15.0.2",
-    "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "15.0.2",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "15.0.2",
-    "@codingame/monaco-vscode-81f603ca-d6ea-5402-90dd-3014dffc63b4-common": "15.0.2",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "15.0.2",
-    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "15.0.2",
-    "@codingame/monaco-vscode-api": "15.0.2",
-    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "15.0.2",
-    "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "15.0.2",
-    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "15.0.2"
+    "@codingame/monaco-vscode-12c5f9eb-72d3-57ca-babd-5bef7aa9de3b-common": "16.0.0",
+    "@codingame/monaco-vscode-27663a0b-1249-58ba-9085-e52d706b50bc-common": "16.0.0",
+    "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common": "16.0.0",
+    "@codingame/monaco-vscode-3e369455-cc41-54c6-86fb-8b7cd999a5da-common": "16.0.0",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "16.0.0",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "16.0.0",
+    "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common": "16.0.0",
+    "@codingame/monaco-vscode-aff8bc9b-c6f8-578f-9c8a-f70d14f9c13c-common": "16.0.0",
+    "@codingame/monaco-vscode-api": "16.0.0",
+    "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common": "16.0.0",
+    "@codingame/monaco-vscode-be8ddbb5-094a-5657-b1cc-fe106c94c632-common": "16.0.0",
+    "@codingame/monaco-vscode-f99b74f5-fcb7-512f-8c6c-35f5a107577d-common": "16.0.0",
+    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "16.0.0"
   },
   "main": "index.js",
   "module": "index.js",
@@ -35,6 +36,9 @@
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*.css": {
+      "default": "./vscode/src/*.css"
+    },
     "./vscode/*": {
       "types": "./vscode/src/*.d.ts",
       "default": "./vscode/src/*.js"

package/vscode/src/vs/workbench/contrib/scm/browser/activity.d.ts

@@ -17,9 +17,9 @@ export declare class SCMActiveRepositoryController extends Disposable implements
     private readonly scmViewService;
     private readonly statusbarService;
     private readonly titleService;
-    private readonly _countBadgeConfig;
     private readonly _repositories;
     private readonly _activeRepositoryHistoryItemRefName;
+    private readonly _countBadgeConfig;
     private readonly _countBadgeRepositories;
     private readonly _countBadge;
     private _activeRepositoryNameContextKey;

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

@@ -39,6 +39,12 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         this.scmViewService = scmViewService;
         this.statusbarService = statusbarService;
         this.titleService = titleService;
+        this._activeRepositoryNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryName.bindTo(this.contextKeyService);
+        this._activeRepositoryBranchNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryBranchName.bindTo(this.contextKeyService);
+        this.titleService.registerVariables([
+            { name: 'activeRepositoryName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryName.key },
+            { name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
+        ]);
         this._countBadgeConfig = observableConfigValue('scm.countBadge', 'all', this.configurationService);
         this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
         this._activeRepositoryHistoryItemRefName = derived(reader => {
@@ -75,16 +81,12 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             }
             return total;
         });
-        this._activeRepositoryNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryName.bindTo(this.contextKeyService);
-        this._activeRepositoryBranchNameContextKey = ActiveRepositoryContextKeys.ActiveRepositoryBranchName.bindTo(this.contextKeyService);
-        this.titleService.registerVariables([
-            { name: 'activeRepositoryName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryName.key },
-            { name: 'activeRepositoryBranchName', contextKey: ActiveRepositoryContextKeys.ActiveRepositoryBranchName.key, }
-        ]);
         this._register(autorunWithStore((reader, store) => {
-            this._updateActivityCountBadge(this._countBadge.read(reader), store);
+            const countBadge = this._countBadge.read(reader);
+            this._updateActivityCountBadge(countBadge, store);
         }));
         this._register(autorunWithStore((reader, store) => {
+            this._repositories.read(reader);
             const repository = this.scmViewService.activeRepository.read(reader);
             const commands = repository?.provider.statusBarCommands.read(reader);
             this._updateStatusBar(repository, commands ?? [], store);
@@ -102,7 +104,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(8690, '{0} pending changes', num))));
+        const badge = ( new NumberBadge(count, num => ( localize(8970, '{0} pending changes', num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
     _updateStatusBar(repository, commands, store) {
@@ -128,7 +130,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 repoAgnosticActionName = '';
             }
             const statusbarEntry = {
-                name: ( localize(8691, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localize(8971, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -138,6 +140,16 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, 10000) :
                 this.statusbarService.addEntry(statusbarEntry, `status.scm.${index}`, StatusbarAlignment.LEFT, { location: { id: `status.scm.${index - 1}`, priority: 10000 }, alignment: StatusbarAlignment.RIGHT, compact: true }));
         }
+        if (this.scmService.repositoryCount > 1) {
+            const repositoryStatusbarEntry = {
+                name: ( localize(8972, "Source Control Provider")),
+                text: `$(repo) ${repository.provider.name}`,
+                ariaLabel: label,
+                tooltip: label,
+                command: 'scm.setActiveProvider'
+            };
+            store.add(this.statusbarService.addEntry(repositoryStatusbarEntry, 'status.scm.provider', StatusbarAlignment.LEFT, { location: { id: `status.scm.0`, priority: 10000 }, alignment: StatusbarAlignment.LEFT, compact: true }));
+        }
     }
     _updateActiveRepositoryContextKeys(repositoryName, branchName) {
         this._activeRepositoryNameContextKey.set(repositoryName ?? '');
@@ -158,10 +170,10 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         super();
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
-        this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(8692, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(8693, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey('scmActiveResourceHasChanges', false, ( localize(8973, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey('scmActiveResourceRepository', undefined, ( localize(8974, "The active resource's repository"))));
+        this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
         this._store.add(autorunWithStore((reader, store) => {
             for (const repository of this._repositories.read(reader)) {
                 store.add(Event.runAndSubscribe(repository.provider.onDidChangeResources, () => {

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

@@ -0,0 +1,96 @@
+.monaco-editor .dirty-diff-glyph {
+	margin-left: 5px;
+	z-index: 5;
+}
+.monaco-editor .dirty-diff-glyph:before {
+	position: absolute;
+	content: '';
+	height: 100%;
+	width: 0;
+	left: -2px;
+}
+.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-glyph:before {
+	transition: width 80ms linear, left 80ms linear, transform 80ms linear;
+}
+.monaco-editor.modified-in-monaco-diff-editor .margin-view-overlays > div > .dirty-diff-glyph {
+	display: none;
+}
+.monaco-editor .dirty-diff-added {
+	border-left-color: var(--vscode-editorGutter-addedBackground);
+	border-left-style: solid;
+}
+.monaco-editor .dirty-diff-added:before {
+	background: var(--vscode-editorGutter-addedBackground);
+}
+.monaco-editor .dirty-diff-added-pattern {
+	background-image: linear-gradient(-45deg, var(--vscode-editorGutter-addedBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-addedBackground) 50%, var(--vscode-editorGutter-addedBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
+	background-repeat: repeat-y;
+}
+.monaco-editor .dirty-diff-added-pattern:before {
+	background-image: linear-gradient(-45deg, var(--vscode-editorGutter-addedBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-addedBackground) 50%, var(--vscode-editorGutter-addedBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
+	transform: translateX(3px);
+}
+.monaco-editor .dirty-diff-modified {
+	border-left-color: var(--vscode-editorGutter-modifiedBackground);
+	border-left-style: solid;
+}
+.monaco-editor .dirty-diff-modified:before {
+	background: var(--vscode-editorGutter-modifiedBackground);
+}
+.monaco-editor .dirty-diff-modified-pattern {
+	background-image: linear-gradient(-45deg, var(--vscode-editorGutter-modifiedBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-modifiedBackground) 50%, var(--vscode-editorGutter-modifiedBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
+	background-repeat: repeat-y;
+}
+.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-added,
+.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-added-pattern,
+.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-modified,
+.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-modified-pattern {
+	transition: opacity 0.5s;
+}
+.monaco-editor .dirty-diff-modified-pattern:before {
+	background-image: linear-gradient(-45deg, var(--vscode-editorGutter-modifiedBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-modifiedBackground) 50%, var(--vscode-editorGutter-modifiedBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
+	transform: translateX(3px);
+}
+.monaco-editor .margin:hover .dirty-diff-added,
+.monaco-editor .margin:hover .dirty-diff-added-pattern,
+.monaco-editor .margin:hover .dirty-diff-modified,
+.monaco-editor .margin:hover .dirty-diff-modified-pattern {
+	opacity: 1;
+}
+.monaco-editor .dirty-diff-deleted:after {
+	content: '';
+	position: absolute;
+	bottom: -4px;
+	box-sizing: border-box;
+	width: 4px;
+	height: 0;
+	z-index: 9;
+	border-top: 4px solid transparent;
+	border-bottom: 4px solid transparent;
+	border-left: 4px solid var(--vscode-editorGutter-deletedBackground);
+	pointer-events: none;
+}
+.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-deleted:after {
+	transition: border-top-width 80ms linear, border-bottom-width 80ms linear, bottom 80ms linear, opacity 0.5s;
+}
+.monaco-editor .dirty-diff-deleted:before {
+	background: var(--vscode-editorGutter-deletedBackground);
+	margin-left: 3px;
+	height: 0;
+	bottom: 0;
+}
+.monaco-workbench:not(.reduce-motion) .monaco-editor .dirty-diff-deleted:before {
+	transition: height 80ms linear;
+}
+.dirty-diff .peekview-title .dropdown {
+	margin-right: 10px;
+}
+.dirty-diff .peekview-title .dropdown.select-container {
+	cursor: default;
+}
+.dirty-diff .peekview-title .dropdown .monaco-select-box {
+	cursor: pointer;
+	min-width: 100px;
+	min-height: 18px;
+	padding: 0px 23px 0px 8px;
+}