@codingame/monaco-vscode-scm-service-override 36.2.7 → 37.1.0

package/index.js

@@ -11,7 +11,7 @@ import { QuickDiffModelService } from './vscode/src/vs/workbench/contrib/scm/bro
 import { IGitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/common/gitService.service';
 import { GitService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/git/browser/gitService';
 import './vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js';
-import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import './vscode/src/vs/workbench/contrib/scm/browser/quickDiff.contribution.js';
 
 function getServiceOverride() {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "36.2.7",
+  "version": "37.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - scm service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "36.2.7"
+    "@codingame/monaco-vscode-api": "37.1.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -126,7 +126,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( new NumberBadge(count, num => ( localize(13635, "{0} pending changes", num))));
+        const badge = ( new NumberBadge(count, num => ( localize(15622, "{0} pending changes", num))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, {
             badge
         }));
@@ -141,7 +141,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
             const tooltip = `${label}${command.tooltip ? ` - ${command.tooltip}` : ""}`;
             const genericCommandName = getStatusBarCommandGenericName(command);
             const statusbarEntry = {
-                name: ( localize(13636, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
+                name: ( localize(15623, "Source Control")) + (genericCommandName ? ` ${genericCommandName}` : ""),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -169,7 +169,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (this.scmViewService.repositories.length > 1) {
             const icon = getSCMRepositoryIcon(activeRepository, activeRepository.repository);
             const repositoryStatusbarEntry = {
-                name: ( localize(13637, "Source Control Provider")),
+                name: ( localize(15624, "Source Control Provider")),
                 text: `$(${icon.id}) ${activeRepository.repository.provider.name}`,
                 ariaLabel: label,
                 tooltip: label,
@@ -202,8 +202,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.scmService = scmService;
         this.uriIdentityService = uriIdentityService;
         this._onDidRepositoryChange = ( new Emitter());
-        const activeResourceHasChangesContextKey = ( new RawContextKey("scmActiveResourceHasChanges", false, ( localize(13638, "Whether the active resource has changes"))));
-        const activeResourceRepositoryContextKey = ( new RawContextKey("scmActiveResourceRepository", undefined, ( localize(13639, "The active resource's repository"))));
+        const activeResourceHasChangesContextKey = ( new RawContextKey("scmActiveResourceHasChanges", false, ( localize(15625, "Whether the active resource has changes"))));
+        const activeResourceRepositoryContextKey = ( new RawContextKey("scmActiveResourceRepository", undefined, ( localize(15626, "The active resource's repository"))));
         this._repositories = observableFromEvent(
             this,
             Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository),

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

@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.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.monaco-enable-motion .monaco-editor .dirty-diff-glyph:before {
+	transition: width 80ms linear, left 80ms linear, transform 80ms linear;
+}
+
+/* Hide glyph decorations when inside the inline diff editor */
+.monaco-editor.modified-in-monaco-diff-editor .margin-view-overlays > div > .dirty-diff-glyph {
+	display: none;
+}
+
+.monaco-editor .dirty-diff-added:not(.pattern) {
+	border-left-style: solid;
+}
+
+.monaco-editor .dirty-diff-added.primary {
+	border-left-color: var(--vscode-editorGutter-addedBackground);
+}
+
+.monaco-editor .dirty-diff-added.primary:before {
+	background: var(--vscode-editorGutter-addedBackground);
+}
+
+.monaco-editor .dirty-diff-added.secondary {
+	border-left-color: var(--vscode-editorGutter-addedSecondaryBackground);
+}
+
+.monaco-editor .dirty-diff-added.secondary:before {
+	background: var(--vscode-editorGutter-addedSecondaryBackground);
+}
+
+.monaco-editor .dirty-diff-added.pattern {
+	background-repeat: repeat-y;
+}
+
+.monaco-editor .dirty-diff-added.pattern:before {
+	transform: translateX(3px);
+}
+
+.monaco-editor .dirty-diff-added.pattern.primary,
+.monaco-editor .dirty-diff-added.pattern.primary: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));
+}
+
+.monaco-editor .dirty-diff-added.pattern.secondary,
+.monaco-editor .dirty-diff-added.pattern.secondary:before {
+	background-image: linear-gradient(45deg, var(--vscode-editorGutter-addedSecondaryBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-addedSecondaryBackground) 50%, var(--vscode-editorGutter-addedSecondaryBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
+}
+
+.monaco-editor .dirty-diff-modified:not(.pattern) {
+	border-left-style: solid;
+}
+
+.monaco-editor .dirty-diff-modified.primary {
+	border-left-color: var(--vscode-editorGutter-modifiedBackground);
+}
+
+.monaco-editor .dirty-diff-modified.primary:before {
+	background: var(--vscode-editorGutter-modifiedBackground);
+}
+
+.monaco-editor .dirty-diff-modified.secondary {
+	border-left-color: var(--vscode-editorGutter-modifiedSecondaryBackground);
+}
+
+.monaco-editor .dirty-diff-modified.secondary:before {
+	background: var(--vscode-editorGutter-modifiedSecondaryBackground);
+}
+
+.monaco-editor .dirty-diff-modified.pattern {
+	background-repeat: repeat-y;
+}
+
+.monaco-editor .dirty-diff-modified.pattern:before {
+	transform: translateX(3px);
+}
+
+.monaco-editor .dirty-diff-modified.pattern.primary,
+.monaco-editor .dirty-diff-modified.pattern.primary: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));
+}
+
+.monaco-editor .dirty-diff-modified.pattern.secondary,
+.monaco-editor .dirty-diff-modified.pattern.secondary:before {
+	background-image: linear-gradient(45deg, var(--vscode-editorGutter-modifiedSecondaryBackground) 25%, var(--vscode-editorGutter-background) 25%, var(--vscode-editorGutter-background) 50%, var(--vscode-editorGutter-modifiedSecondaryBackground) 50%, var(--vscode-editorGutter-modifiedSecondaryBackground) 75%, var(--vscode-editorGutter-background) 75%, var(--vscode-editorGutter-background));
+}
+
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-added,
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-modified,
+.monaco-workbench.monaco-enable-motion .monaco-editor .dirty-diff-deleted {
+	transition: opacity 0.5s;
+}
+
+.monaco-editor .margin:hover .dirty-diff-added,
+.monaco-editor .margin:hover .dirty-diff-modified,
+.monaco-editor .margin:hover .dirty-diff-deleted {
+	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;
+	pointer-events: none;
+}
+
+.monaco-editor .dirty-diff-deleted.primary:after {
+	border-left: 4px solid var(--vscode-editorGutter-deletedBackground);
+}
+
+.monaco-editor .dirty-diff-deleted.secondary:after {
+	border-left: 4px solid var(--vscode-editorGutter-deletedSecondaryBackground);
+}
+
+.monaco-workbench.monaco-enable-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-editor .dirty-diff-deleted.primary:before {
+	background: var(--vscode-editorGutter-deletedBackground);
+}
+
+.monaco-editor .dirty-diff-deleted.secondary:before {
+	background: var(--vscode-editorGutter-deletedSecondaryBackground);
+}
+
+.monaco-workbench.monaco-enable-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;
+}

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

@@ -263,7 +263,7 @@
 }
 
 .scm-view .monaco-list-row .history-item .monaco-icon-label.history-item-current .label-description {
-	font-weight: 500;
+	font-weight: var(--vscode-fontWeight-semiBold);
 }
 
 .scm-view .monaco-list-row .history-item > .actions {

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

@@ -313,7 +313,7 @@ let SCMMenus = class SCMMenus {
 };
 SCMMenus = ( __decorate([( __param(0, ISCMService)), ( __param(1, IInstantiationService))], SCMMenus));
 MenuRegistry.appendMenuItem(MenuId.SCMResourceContext, {
-    title: ( localize(13640, "Share")),
+    title: ( localize(15627, "Share")),
     submenu: MenuId.SCMResourceContextShare,
     group: "45_share",
     order: 3

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,105 @@
+
+import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Extensions as Extensions$1, ConfigurationScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiffService';
+import { QuickDiffWorkbenchController } from './quickDiffDecorator.js';
+import './quickDiffModel.js';
+import { QuickDiffEditorController } from './quickDiffWidget.js';
+
+MenuRegistry.appendMenuItem(MenuId.EditorLineNumberContext, {
+    title: ( localize(15628, "Diff Decorations")),
+    submenu: MenuId.SCMQuickDiffDecorations,
+    when: ( ContextKeyExpr.or(( ContextKeyExpr.equals("config.scm.diffDecorations", "all")), ( ContextKeyExpr.equals("config.scm.diffDecorations", "gutter")))),
+    group: "9_quickDiffDecorations"
+});
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(QuickDiffWorkbenchController, LifecyclePhase.Restored);
+registerEditorContribution(
+    QuickDiffEditorController.ID,
+    QuickDiffEditorController,
+    EditorContributionInstantiation.AfterFirstRender
+);
+( Registry.as(Extensions$1.Configuration)).registerConfiguration({
+    id: "scm",
+    order: 5,
+    title: ( localize(15629, "Source Control")),
+    type: "object",
+    scope: ConfigurationScope.RESOURCE,
+    properties: {
+        "scm.diffDecorations": {
+            type: "string",
+            enum: ["all", "gutter", "overview", "minimap", "none"],
+            enumDescriptions: [( localize(15630, "Show the diff decorations in all available locations.")), ( localize(15631, "Show the diff decorations only in the editor gutter.")), ( localize(15632, "Show the diff decorations only in the overview ruler.")), ( localize(15633, "Show the diff decorations only in the minimap.")), ( localize(15634, "Do not show the diff decorations."))],
+            default: "all",
+            description: ( localize(15635, "Controls diff decorations in the editor."))
+        },
+        "scm.diffDecorationsGutterWidth": {
+            type: "number",
+            enum: [1, 2, 3, 4, 5],
+            default: 3,
+            description: ( localize(
+                15636,
+                "Controls the width(px) of diff decorations in gutter (added & modified)."
+            ))
+        },
+        "scm.diffDecorationsGutterVisibility": {
+            type: "string",
+            enum: ["always", "hover"],
+            enumDescriptions: [( localize(15637, "Show the diff decorator in the gutter at all times.")), ( localize(15638, "Show the diff decorator in the gutter only on hover."))],
+            description: ( localize(
+                15639,
+                "Controls the visibility of the Source Control diff decorator in the gutter."
+            )),
+            default: "always"
+        },
+        "scm.diffDecorationsGutterAction": {
+            type: "string",
+            enum: ["diff", "none"],
+            enumDescriptions: [( localize(15640, "Show the inline diff Peek view on click.")), ( localize(15641, "Do nothing."))],
+            description: ( localize(15642, "Controls the behavior of Source Control diff gutter decorations.")),
+            default: "diff"
+        },
+        "scm.diffDecorationsGutterPattern": {
+            type: "object",
+            description: ( localize(
+                15643,
+                "Controls whether a pattern is used for the diff decorations in gutter."
+            )),
+            additionalProperties: false,
+            properties: {
+                "added": {
+                    type: "boolean",
+                    description: ( localize(15644, "Use pattern for the diff decorations in gutter for added lines."))
+                },
+                "modified": {
+                    type: "boolean",
+                    description: ( localize(
+                        15645,
+                        "Use pattern for the diff decorations in gutter for modified lines."
+                    ))
+                }
+            },
+            default: {
+                "added": false,
+                "modified": true
+            }
+        },
+        "scm.diffDecorationsIgnoreTrimWhitespace": {
+            type: "string",
+            enum: ["true", "false", "inherit"],
+            enumDescriptions: [( localize(15646, "Ignore leading and trailing whitespace.")), ( localize(15647, "Do not ignore leading and trailing whitespace.")), ( localize(15648, "Inherit from `diffEditor.ignoreTrimWhitespace`."))],
+            description: ( localize(
+                15649,
+                "Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
+            )),
+            default: "false"
+        }
+    }
+});

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

@@ -0,0 +1,36 @@
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { IQuickDiffService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/common/quickDiff.service";
+import { IQuickDiffModelService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/scm/browser/quickDiffModel.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
+import { RawContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
+export declare const quickDiffDecorationCount: RawContextKey<number>;
+export declare class QuickDiffWorkbenchController extends Disposable implements IWorkbenchContribution {
+    private readonly editorService;
+    private readonly configurationService;
+    private readonly quickDiffModelService;
+    private readonly quickDiffService;
+    private readonly uriIdentityService;
+    private enabled;
+    private readonly quickDiffDecorationCount;
+    private readonly activeEditor;
+    private readonly quickDiffProviders;
+    private readonly decorators;
+    private viewState;
+    private readonly transientDisposables;
+    private readonly stylesheet;
+    constructor(editorService: IEditorService, configurationService: IConfigurationService, quickDiffModelService: IQuickDiffModelService, quickDiffService: IQuickDiffService, uriIdentityService: IUriIdentityService, contextKeyService: IContextKeyService);
+    private onDidChangeConfiguration;
+    private onDidChangeDiffWidthConfiguration;
+    private onDidChangeDiffVisibilityConfiguration;
+    private setViewState;
+    private enable;
+    private disable;
+    private onDidActiveEditorChange;
+    private onDidChangeQuickDiffProviders;
+    private onEditorsChanged;
+    dispose(): void;
+}