@codingame/monaco-vscode-base-service-override 25.1.1 → 26.0.0

package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js

@@ -34,19 +34,22 @@ import { getIconRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform
 class DecorationRule {
     static keyOf(data) {
         if (Array.isArray(data)) {
-            return ( data.map(DecorationRule.keyOf)).join(',');
-        }
-        else {
-            const { color, letter } = data;
+            return ( data.map(DecorationRule.keyOf)).join(",");
+        } else {
+            const {
+                color,
+                letter
+            } = data;
             if (ThemeIcon.isThemeIcon(letter)) {
                 return `${color}+${letter.id}`;
-            }
-            else {
+            } else {
                 return `${color}/${letter}`;
             }
         }
     }
-    static { this._classNamesPrefix = 'monaco-decoration'; }
+    static {
+        this._classNamesPrefix = "monaco-decoration";
+    }
     constructor(themeService, data, key) {
         this.themeService = themeService;
         this._refCounter = 0;
@@ -66,23 +69,30 @@ class DecorationRule {
     appendCSSRules(element) {
         if (!Array.isArray(this.data)) {
             this._appendForOne(this.data, element);
-        }
-        else {
+        } else {
             this._appendForMany(this.data, element);
         }
     }
     _appendForOne(data, element) {
-        const { color, letter } = data;
+        const {
+            color,
+            letter
+        } = data;
         createCSSRule(`.${this.itemColorClassName}`, `color: ${getColor(color)};`, element);
         if (ThemeIcon.isThemeIcon(letter)) {
             this._createIconCSSRule(letter, color, element);
-        }
-        else if (letter) {
-            createCSSRule(`.${this.itemBadgeClassName}::after`, `content: "${letter}"; color: ${getColor(color)};`, element);
+        } else if (letter) {
+            createCSSRule(
+                `.${this.itemBadgeClassName}::after`,
+                `content: "${letter}"; color: ${getColor(color)};`,
+                element
+            );
         }
     }
     _appendForMany(data, element) {
-        const { color } = data.find(d => !!d.color) ?? data[0];
+        const {
+            color
+        } = data.find(d => !!d.color) ?? data[0];
         createCSSRule(`.${this.itemColorClassName}`, `color: ${getColor(color)};`, element);
         const letters = [];
         let icon;
@@ -90,19 +100,25 @@ class DecorationRule {
             if (ThemeIcon.isThemeIcon(d.letter)) {
                 icon = d.letter;
                 break;
-            }
-            else if (d.letter) {
+            } else if (d.letter) {
                 letters.push(d.letter);
             }
         }
         if (icon) {
             this._createIconCSSRule(icon, color, element);
-        }
-        else {
+        } else {
             if (letters.length) {
-                createCSSRule(`.${this.itemBadgeClassName}::after`, `content: "${letters.join(', ')}"; color: ${getColor(color)};`, element);
+                createCSSRule(
+                    `.${this.itemBadgeClassName}::after`,
+                    `content: "${letters.join(", ")}"; color: ${getColor(color)};`,
+                    element
+                );
             }
-            createCSSRule(`.${this.bubbleBadgeClassName}::after`, `content: "\uea71"; color: ${getColor(color)}; font-family: codicon; font-size: 14px; margin-right: 14px; opacity: 0.4;`, element);
+            createCSSRule(
+                `.${this.bubbleBadgeClassName}::after`,
+                `content: "\uea71"; color: ${getColor(color)}; font-family: codicon; font-size: 14px; margin-right: 14px; opacity: 0.4;`,
+                element
+            );
         }
     }
     _createIconCSSRule(icon, color, element) {
@@ -118,14 +134,18 @@ class DecorationRule {
         if (!definition) {
             return;
         }
-        createCSSRule(`.${this.iconBadgeClassName}::after`, `content: '${definition.fontCharacter}';
-			color: ${icon.color ? getColor(icon.color.id) : getColor(color)};
-			font-family: ${stringValue(definition.font?.id ?? 'codicon')};
-			font-size: 16px;
-			margin-right: 14px;
-			font-weight: normal;
-			${modifier === 'spin' ? 'animation: codicon-spin 1.5s steps(30) infinite; font-style: normal !important;' : ''};
-			`, element);
+        createCSSRule(
+            `.${this.iconBadgeClassName}::after`,
+            `content: '${definition.fontCharacter}';
+            color: ${icon.color ? getColor(icon.color.id) : getColor(color)};
+            font-family: ${stringValue(definition.font?.id ?? "codicon")};
+            font-size: 16px;
+            margin-right: 14px;
+            font-weight: normal;
+            ${modifier === "spin" ? "animation: codicon-spin 1.5s steps(30) infinite; font-style: normal !important; transform-origin: center center;" : ""};
+            `,
+            element
+        );
     }
     removeCSSRules(element) {
         removeCSSRulesContainingSelector(this.itemColorClassName, element);
@@ -157,11 +177,11 @@ class DecorationStyles {
         const labelClassName = rule.itemColorClassName;
         let badgeClassName = rule.itemBadgeClassName;
         const iconClassName = rule.iconBadgeClassName;
-        let tooltip = distinct(( data.filter(d => !isFalsyOrWhitespace(d.tooltip)).map(d => d.tooltip))).join(' • ');
+        let tooltip = distinct(( data.filter(d => !isFalsyOrWhitespace(d.tooltip)).map(d => d.tooltip))).join(" • ");
         const strikethrough = ( data.some(d => d.strikethrough));
         if (onlyChildren) {
             badgeClassName = rule.bubbleBadgeClassName;
-            tooltip = ( localize(13839, "Contains emphasized items"));
+            tooltip = ( localize(14226, "Contains emphasized items"));
         }
         return {
             labelClassName,
@@ -195,18 +215,22 @@ class DecorationDataRequest {
     }
 }
 function getColor(color) {
-    return color ? asCssVariable(color) : 'inherit';
+    return color ? asCssVariable(color) : "inherit";
 }
 let DecorationsService = class DecorationsService {
     constructor(uriIdentityService, themeService) {
         this._store = ( new DisposableStore());
-        this._onDidChangeDecorationsDelayed = this._store.add(( new DebounceEmitter({ merge: all => all.flat() })));
+        this._onDidChangeDecorationsDelayed = this._store.add(( new DebounceEmitter({
+            merge: all => all.flat()
+        })));
         this._onDidChangeDecorations = this._store.add(( new Emitter()));
         this.onDidChangeDecorations = this._onDidChangeDecorations.event;
         this._provider = ( new LinkedList());
         this._decorationStyles = ( new DecorationStyles(themeService));
         this._data = TernarySearchTree.forUris(key => uriIdentityService.extUri.ignorePathCasing(key));
-        this._store.add(this._onDidChangeDecorationsDelayed.event(event => { this._onDidChangeDecorations.fire(( new FileDecorationChangeEvent(event))); }));
+        this._store.add(this._onDidChangeDecorationsDelayed.event(event => {
+            this._onDidChangeDecorations.fire(( new FileDecorationChangeEvent(event)));
+        }));
     }
     dispose() {
         this._store.dispose();
@@ -215,7 +239,9 @@ let DecorationsService = class DecorationsService {
     registerDecorationsProvider(provider) {
         const rm = this._provider.unshift(provider);
         this._onDidChangeDecorations.fire({
-            affectsResource() { return true; }
+            affectsResource() {
+                return true;
+            }
         });
         const removeAll = () => {
             const uris = [];
@@ -231,8 +257,7 @@ let DecorationsService = class DecorationsService {
         const listener = provider.onDidChange(uris => {
             if (!uris) {
                 removeAll();
-            }
-            else {
+            } else {
                 for (const uri of uris) {
                     const map = this._ensureEntry(uri);
                     this._fetchData(map, uri, provider);
@@ -281,9 +306,7 @@ let DecorationsService = class DecorationsService {
                 }
             }
         }
-        return all.length === 0
-            ? undefined
-            : this._decorationStyles.asDecoration(all, containsChildren);
+        return all.length === 0 ? undefined : this._decorationStyles.asDecoration(all, containsChildren);
     }
     _fetchData(map, uri, provider) {
         const pendingRequest = map.get(provider);
@@ -296,8 +319,7 @@ let DecorationsService = class DecorationsService {
         if (!isThenable(dataOrThenable)) {
             cts.dispose();
             return this._keepItem(map, provider, uri, dataOrThenable);
-        }
-        else {
+        } else {
             const request = ( new DecorationDataRequest(cts, Promise.resolve(dataOrThenable).then(data => {
                 if (map.get(provider) === request) {
                     this._keepItem(map, provider, uri, data);
@@ -323,9 +345,6 @@ let DecorationsService = class DecorationsService {
         return deco;
     }
 };
-DecorationsService = ( __decorate([
-    ( __param(0, IUriIdentityService)),
-    ( __param(1, IThemeService))
-], DecorationsService));
+DecorationsService = ( __decorate([( __param(0, IUriIdentityService)), ( __param(1, IThemeService))], DecorationsService));
 
 export { DecorationsService };

package/vscode/src/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification.js

@@ -16,15 +16,25 @@ import { IWorkbenchExtensionEnablementService } from '@codingame/monaco-vscode-a
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
-const CODE_UNIFICATION_PREFIX = 'cmp-cht-';
-const EXTENSION_UNIFICATION_PREFIX = 'cmp-ext-';
-const CODE_UNIFICATION_FF = 'inlineCompletionsUnificationCode';
-const MODEL_UNIFICATION_FF = 'inlineCompletionsUnificationModel';
-const isRunningUnificationExperiment = ( new RawContextKey('isRunningUnificationExperiment', false));
-const ExtensionUnificationSetting = 'chat.extensionUnification.enabled';
+const CODE_UNIFICATION_PREFIX = "cmp-cht-";
+const EXTENSION_UNIFICATION_PREFIX = "cmp-ext-";
+const CODE_UNIFICATION_FF = "inlineCompletionsUnificationCode";
+const MODEL_UNIFICATION_FF = "inlineCompletionsUnificationModel";
+const isRunningUnificationExperiment = ( new RawContextKey("isRunningUnificationExperiment", false));
+const ExtensionUnificationSetting = "chat.extensionUnification.enabled";
 let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl extends Disposable {
-    get state() { return this._state; }
-    constructor(_assignmentService, _contextKeyService, _configurationService, _extensionEnablementService, _extensionManagementService, _extensionService, productService) {
+    get state() {
+        return this._state;
+    }
+    constructor(
+        _assignmentService,
+        _contextKeyService,
+        _configurationService,
+        _extensionEnablementService,
+        _extensionManagementService,
+        _extensionService,
+        productService
+    ) {
         super();
         this._assignmentService = _assignmentService;
         this._contextKeyService = _contextKeyService;
@@ -39,13 +49,16 @@ let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl ex
         this._onDidChangeExtensionUnificationSetting = this._register(( new Emitter()));
         this._completionsExtensionId = productService.defaultChatAgent?.extensionId.toLowerCase();
         this._chatExtensionId = productService.defaultChatAgent?.chatExtensionId.toLowerCase();
-        const relevantExtensions = [this._completionsExtensionId, this._chatExtensionId].filter((id) => !!id);
+        const relevantExtensions = [this._completionsExtensionId, this._chatExtensionId].filter(id => !!id);
         this.isRunningUnificationExperiment = isRunningUnificationExperiment.bindTo(this._contextKeyService);
         this._assignmentService.addTelemetryAssignmentFilter({
-            exclude: (assignment) => assignment.startsWith(EXTENSION_UNIFICATION_PREFIX) && this._state.extensionUnification !== this._configurationService.getValue(ExtensionUnificationSetting),
-            onDidChange: Event.any(this._onDidChangeExtensionUnificationState.event, this._onDidChangeExtensionUnificationSetting.event)
+            exclude: assignment => assignment.startsWith(EXTENSION_UNIFICATION_PREFIX) && this._state.extensionUnification !== this._configurationService.getValue(ExtensionUnificationSetting),
+            onDidChange: Event.any(
+                this._onDidChangeExtensionUnificationState.event,
+                this._onDidChangeExtensionUnificationSetting.event
+            )
         });
-        this._register(this._extensionEnablementService.onEnablementChanged((extensions) => {
+        this._register(this._extensionEnablementService.onEnablementChanged(extensions => {
             if (( extensions.some(ext => relevantExtensions.includes(ext.identifier.id.toLowerCase())))) {
                 this._update();
             }
@@ -56,7 +69,11 @@ let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl ex
                 this._onDidChangeExtensionUnificationSetting.fire();
             }
         }));
-        this._register(this._extensionService.onDidChangeExtensions(({ added }) => {
+        this._register(this._extensionService.onDidChangeExtensions((
+            {
+                added
+            }
+        ) => {
             if (( added.some(ext => relevantExtensions.includes(ext.identifier.value.toLowerCase())))) {
                 this._update();
             }
@@ -76,14 +93,18 @@ let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl ex
             codeUnificationFF === true,
             modelUnificationFF === true,
             extensionUnificationEnabled,
-            currentExperiments?.filter(exp => exp.startsWith(CODE_UNIFICATION_PREFIX) || (extensionStatesMatchUnificationSetting && exp.startsWith(EXTENSION_UNIFICATION_PREFIX))) ?? []
+            currentExperiments?.filter(
+                exp => exp.startsWith(CODE_UNIFICATION_PREFIX) || (extensionStatesMatchUnificationSetting && exp.startsWith(EXTENSION_UNIFICATION_PREFIX))
+            ) ?? []
         ));
         if (this._state.equals(newState)) {
             return;
         }
         const previousState = this._state;
         this._state = newState;
-        this.isRunningUnificationExperiment.set(this._state.codeUnification || this._state.modelUnification || this._state.extensionUnification);
+        this.isRunningUnificationExperiment.set(
+            this._state.codeUnification || this._state.modelUnification || this._state.extensionUnification
+        );
         this._onDidStateChange.fire();
         if (previousState.extensionUnification !== this._state.extensionUnification) {
             this._onDidChangeExtensionUnificationState.fire();
@@ -106,7 +127,7 @@ let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl ex
         }
         const completionExtensionInstalled = installedExtensions.filter(ext => ext.identifier.id.toLowerCase() === this._completionsExtensionId);
         if (completionExtensionInstalled.length === 0) {
-            return false;
+            return true;
         }
         const completionsExtensionDisabledByUnification = ( completionExtensionInstalled.some(
             ext => this._extensionEnablementService.getEnablementState(ext) === EnablementState.DisabledByUnification
@@ -114,15 +135,7 @@ let InlineCompletionsUnificationImpl = class InlineCompletionsUnificationImpl ex
         return !!chatExtension && completionsExtensionDisabledByUnification;
     }
 };
-InlineCompletionsUnificationImpl = ( __decorate([
-    ( __param(0, IWorkbenchAssignmentService)),
-    ( __param(1, IContextKeyService)),
-    ( __param(2, IConfigurationService)),
-    ( __param(3, IWorkbenchExtensionEnablementService)),
-    ( __param(4, IExtensionManagementService)),
-    ( __param(5, IExtensionService)),
-    ( __param(6, IProductService))
-], InlineCompletionsUnificationImpl));
+InlineCompletionsUnificationImpl = ( __decorate([( __param(0, IWorkbenchAssignmentService)), ( __param(1, IContextKeyService)), ( __param(2, IConfigurationService)), ( __param(3, IWorkbenchExtensionEnablementService)), ( __param(4, IExtensionManagementService)), ( __param(5, IExtensionService)), ( __param(6, IProductService))], InlineCompletionsUnificationImpl));
 class InlineCompletionsUnificationState {
     constructor(codeUnification, modelUnification, extensionUnification, expAssignments) {
         this.codeUnification = codeUnification;
@@ -131,10 +144,7 @@ class InlineCompletionsUnificationState {
         this.expAssignments = expAssignments;
     }
     equals(other) {
-        return this.codeUnification === other.codeUnification
-            && this.modelUnification === other.modelUnification
-            && this.extensionUnification === other.extensionUnification
-            && equals(this.expAssignments, other.expAssignments);
+        return this.codeUnification === other.codeUnification && this.modelUnification === other.modelUnification && this.extensionUnification === other.extensionUnification && equals(this.expAssignments, other.expAssignments);
     }
 }