@codingame/monaco-vscode-api 15.0.3 → 16.0.1

package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js

@@ -28,20 +28,20 @@ const _allApiProposals = {
     },
     chatParticipantPrivate: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts',
-        version: 5
+        version: 6
     },
     chatProvider: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatProvider.d.ts',
     },
-    chatReadonlyPromptReference: {
-        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReadonlyPromptReference.d.ts',
-    },
     chatReferenceBinaryData: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReferenceBinaryData.d.ts',
     },
     chatReferenceDiagnostic: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatReferenceDiagnostic.d.ts',
     },
+    chatStatusItem: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatStatusItem.d.ts',
+    },
     chatTab: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.chatTab.d.ts',
     },
@@ -149,7 +149,7 @@ const _allApiProposals = {
     },
     defaultChatParticipant: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts',
-        version: 2
+        version: 3
     },
     diffCommand: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.diffCommand.d.ts',
@@ -221,15 +221,24 @@ const _allApiProposals = {
     languageModelCapabilities: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelCapabilities.d.ts',
     },
+    languageModelDataPart: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelDataPart.d.ts',
+    },
     languageModelSystem: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelSystem.d.ts',
     },
+    languageModelToolsForAgent: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageModelToolsForAgent.d.ts',
+    },
     languageStatusText: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.languageStatusText.d.ts',
     },
     mappedEditsProvider: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts',
     },
+    mcpConfigurationProvider: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.mcpConfigurationProvider.d.ts',
+    },
     multiDocumentHighlightProvider: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.multiDocumentHighlightProvider.d.ts',
     },
@@ -329,6 +338,9 @@ const _allApiProposals = {
     taskPresentationGroup: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskPresentationGroup.d.ts',
     },
+    taskProblemMatcherStatus: {
+        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.taskProblemMatcherStatus.d.ts',
+    },
     telemetry: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.telemetry.d.ts',
     },
@@ -353,9 +365,6 @@ const _allApiProposals = {
     terminalShellEnv: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellEnv.d.ts',
     },
-    terminalShellType: {
-        proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.terminalShellType.d.ts',
-    },
     testObserver: {
         proposal: 'https://raw.githubusercontent.com/microsoft/vscode/main/src/vscode-dts/vscode.proposed.testObserver.d.ts',
     },

package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js

@@ -206,7 +206,7 @@ class HTMLFileSystemProvider extends Disposable {
                 await this.delete(from, { recursive: false, useTrash: false, atomic: false });
             }
             else {
-                throw this.createFileSystemProviderError(from, ( localize(1793, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
+                throw this.createFileSystemProviderError(from, ( localize(1828, "Rename is only supported for files.")), FileSystemProviderErrorCode.Unavailable);
             }
         }
         catch (error) {
@@ -382,7 +382,7 @@ class HTMLFileSystemProvider extends Disposable {
         }
         let code = FileSystemProviderErrorCode.Unknown;
         if (error.name === 'NotAllowedError') {
-            error = ( new Error(( localize(1794, "Insufficient permissions. Please retry and allow the operation."))));
+            error = ( new Error(( localize(1829, "Insufficient permissions. Please retry and allow the operation."))));
             code = FileSystemProviderErrorCode.Unavailable;
         }
         return createFileSystemProviderError(error, code);

package/vscode/src/vs/platform/files/common/files.js

@@ -105,7 +105,7 @@ function createFileSystemProviderError(error, code) {
 }
 function ensureFileSystemProviderError(error) {
     if (!error) {
-        return createFileSystemProviderError(( localize(1827, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
+        return createFileSystemProviderError(( localize(1862, "Unknown Error")), FileSystemProviderErrorCode.Unknown);
     }
     return error;
 }
@@ -374,18 +374,18 @@ class ByteSize {
             size = 0;
         }
         if (size < ByteSize.KB) {
-            return localize(1828, "{0}B", size.toFixed(0));
+            return localize(1863, "{0}B", size.toFixed(0));
         }
         if (size < ByteSize.MB) {
-            return localize(1829, "{0}KB", (size / ByteSize.KB).toFixed(2));
+            return localize(1864, "{0}KB", (size / ByteSize.KB).toFixed(2));
         }
         if (size < ByteSize.GB) {
-            return localize(1830, "{0}MB", (size / ByteSize.MB).toFixed(2));
+            return localize(1865, "{0}MB", (size / ByteSize.MB).toFixed(2));
         }
         if (size < ByteSize.TB) {
-            return localize(1831, "{0}GB", (size / ByteSize.GB).toFixed(2));
+            return localize(1866, "{0}GB", (size / ByteSize.GB).toFixed(2));
         }
-        return localize(1832, "{0}TB", (size / ByteSize.TB).toFixed(2));
+        return localize(1867, "{0}TB", (size / ByteSize.TB).toFixed(2));
     }
 }
 function getLargeFileConfirmationLimit(arg) {

package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js

@@ -11,7 +11,7 @@ import { localize } from '../../../nls.js';
 import { DisposableStore, toDisposable } from '../../../base/common/lifecycle.js';
 import { isActiveElement } from '../../../base/browser/dom.js';
 
-const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1834, "Whether suggestion are visible"))));
+const historyNavigationVisible = ( new RawContextKey('suggestWidgetVisible', false, ( localize(1869, "Whether suggestion are visible"))));
 const HistoryNavigationWidgetFocusContext = 'historyNavigationWidgetFocus';
 const HistoryNavigationForwardsEnablementContext = 'historyNavigationForwardsEnabled';
 const HistoryNavigationBackwardsEnablementContext = 'historyNavigationBackwardsEnabled';

package/vscode/src/vs/platform/hover/browser/hover.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "../../../base/common/lifecycle.js";
 import { IHoverDelegate, IHoverDelegateOptions } from "../../../base/browser/ui/hover/hoverDelegate.js";
 import { IConfigurationService } from "../../configuration/common/configuration.service.js";
-import type { IHoverOptions, IHoverWidget, IManagedHoverContentOrFactory } from "@codingame/monaco-vscode-view-status-bar-service-override/vscode/vs/base/browser/ui/hover/hover";
+import type { IHoverOptions, IHoverWidget, IManagedHoverContentOrFactory } from "../../../base/browser/ui/hover/hover.js";
 import { IHoverService } from "./hover.service.js";
 export interface IHoverDelayOptions {
     readonly instantHover?: boolean;

package/vscode/src/vs/platform/hover/browser/hover.js

@@ -49,7 +49,7 @@ let WorkbenchHoverDelegate = class WorkbenchHoverDelegate extends Disposable {
             : typeof options.content === 'string'
                 ? ( options.content.toString())
                 : options.content.value;
-        return this.hoverService.showHover({
+        return this.hoverService.showInstantHover({
             ...options,
             ...overrideOptions,
             persistence: {

package/vscode/src/vs/platform/hover/browser/hover.service.d.ts

@@ -1,4 +1,4 @@
-import { IHoverDelegate2 } from "@codingame/monaco-vscode-view-status-bar-service-override/vscode/vs/base/browser/ui/hover/hover";
+import { IHoverDelegate2 } from "../../../base/browser/ui/hover/hover.js";
 export declare const IHoverService: import("../../instantiation/common/instantiation.js").ServiceIdentifier<IHoverService>;
 export interface IHoverService extends IHoverDelegate2 {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/platform/ipc/common/services.d.ts

@@ -1,4 +1,4 @@
-import { IChannel, IServerChannel } from "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common/vscode/vs/base/parts/ipc/common/ipc";
+import { IChannel, IServerChannel } from "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common/vscode/vs/base/parts/ipc/common/ipc";
 export interface IRemoteService {
     readonly _serviceBrand: undefined;
     getChannel(channelName: string): IChannel;

package/vscode/src/vs/platform/jsonschemas/common/jsonContributionRegistry.d.ts

@@ -1,5 +1,6 @@
 import { Event } from "../../../base/common/event.js";
 import { IJSONSchema } from "../../../base/common/jsonSchema.js";
+import { DisposableStore, IDisposable } from "../../../base/common/lifecycle.js";
 export declare const Extensions: {
     JSONContribution: string;
 };
@@ -10,9 +11,14 @@ export interface ISchemaContributions {
 }
 export interface IJSONContributionRegistry {
     readonly onDidChangeSchema: Event<string>;
-    registerSchema(uri: string, unresolvedSchemaContent: IJSONSchema): void;
+    readonly onDidChangeSchemaAssociations: Event<void>;
+    registerSchema(uri: string, unresolvedSchemaContent: IJSONSchema, store?: DisposableStore): void;
+    registerSchemaAssociation(uri: string, glob: string): IDisposable;
     notifySchemaChanged(uri: string): void;
     getSchemaContributions(): ISchemaContributions;
+    getSchemaAssociations(): {
+        [uri: string]: string[];
+    };
     getSchemaContent(uri: string): string | undefined;
     hasSchemaContent(uri: string): boolean;
 }

package/vscode/src/vs/platform/jsonschemas/common/jsonContributionRegistry.js

@@ -1,6 +1,7 @@
 
 import { Emitter } from '../../../base/common/event.js';
 import { getCompressedContent } from '../../../base/common/jsonSchema.js';
+import { toDisposable } from '../../../base/common/lifecycle.js';
 import { Registry } from '../../registry/common/platform.js';
 
 const Extensions = {
@@ -14,13 +15,46 @@ function normalizeId(id) {
 }
 class JSONContributionRegistry {
     constructor() {
+        this.schemasById = {};
+        this.schemaAssociations = {};
         this._onDidChangeSchema = ( new Emitter());
         this.onDidChangeSchema = this._onDidChangeSchema.event;
-        this.schemasById = {};
+        this._onDidChangeSchemaAssociations = ( new Emitter());
+        this.onDidChangeSchemaAssociations = this._onDidChangeSchemaAssociations.event;
     }
-    registerSchema(uri, unresolvedSchemaContent) {
-        this.schemasById[normalizeId(uri)] = unresolvedSchemaContent;
+    registerSchema(uri, unresolvedSchemaContent, store) {
+        const normalizedUri = normalizeId(uri);
+        this.schemasById[normalizedUri] = unresolvedSchemaContent;
         this._onDidChangeSchema.fire(uri);
+        if (store) {
+            store.add(toDisposable(() => {
+                delete this.schemasById[normalizedUri];
+                this._onDidChangeSchema.fire(uri);
+            }));
+        }
+    }
+    registerSchemaAssociation(uri, glob) {
+        const normalizedUri = normalizeId(uri);
+        if (!this.schemaAssociations[normalizedUri]) {
+            this.schemaAssociations[normalizedUri] = [];
+        }
+        if (!this.schemaAssociations[normalizedUri].includes(glob)) {
+            this.schemaAssociations[normalizedUri].push(glob);
+            this._onDidChangeSchemaAssociations.fire();
+        }
+        return toDisposable(() => {
+            const associations = this.schemaAssociations[normalizedUri];
+            if (associations) {
+                const index = associations.indexOf(glob);
+                if (index !== -1) {
+                    associations.splice(index, 1);
+                    if (associations.length === 0) {
+                        delete this.schemaAssociations[normalizedUri];
+                    }
+                    this._onDidChangeSchemaAssociations.fire();
+                }
+            }
+        });
     }
     notifySchemaChanged(uri) {
         this._onDidChangeSchema.fire(uri);
@@ -37,6 +71,9 @@ class JSONContributionRegistry {
     hasSchemaContent(uri) {
         return !!this.schemasById[uri];
     }
+    getSchemaAssociations() {
+        return this.schemaAssociations;
+    }
 }
 const jsonContributionRegistry = ( new JSONContributionRegistry());
 Registry.add(Extensions.JSONContribution, jsonContributionRegistry);

package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js

@@ -106,7 +106,7 @@ class AbstractKeybindingService extends Disposable {
                 throw illegalState('impossible');
             case 1:
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1835,
+                    1870,
                     "({0}) was pressed. Waiting for second key of chord...",
                     keypressLabel
                 )));
@@ -114,7 +114,7 @@ class AbstractKeybindingService extends Disposable {
             default: {
                 const fullKeypressLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                 this._currentChordStatusMessage = this._notificationService.status(( localize(
-                    1836,
+                    1871,
                     "({0}) was pressed. Waiting for next key of chord...",
                     fullKeypressLabel
                 )));
@@ -219,7 +219,7 @@ class AbstractKeybindingService extends Disposable {
                     const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                     this._log(`+ Leaving multi-chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                     this._notificationService.status(( localize(
-                        1837,
+                        1872,
                         "The key combination ({0}, {1}) is not a command.",
                         currentChordsLabel,
                         keypressLabel
@@ -243,7 +243,7 @@ class AbstractKeybindingService extends Disposable {
                         const currentChordsLabel = ( this._currentChords.map(({ label }) => label)).join(', ');
                         this._log(`+ Leaving chord mode: Nothing bound to "${currentChordsLabel}, ${keypressLabel}".`);
                         this._notificationService.status(( localize(
-                            1837,
+                            1872,
                             "The key combination ({0}, {1}) is not a command.",
                             currentChordsLabel,
                             keypressLabel

package/vscode/src/vs/platform/list/browser/listService.js

@@ -948,19 +948,19 @@ const configurationRegistry = ( Registry.as(Extensions.Configuration));
 configurationRegistry.registerConfiguration({
     id: 'workbench',
     order: 7,
-    title: ( localize(1845, "Workbench")),
+    title: ( localize(1880, "Workbench")),
     type: 'object',
     properties: {
         [multiSelectModifierSettingKey]: {
             type: 'string',
             enum: ['ctrlCmd', 'alt'],
             markdownEnumDescriptions: [
-                ( localize(1846, "Maps to `Control` on Windows and Linux and to `Command` on macOS.")),
-                ( localize(1847, "Maps to `Alt` on Windows and Linux and to `Option` on macOS."))
+                ( localize(1881, "Maps to `Control` on Windows and Linux and to `Command` on macOS.")),
+                ( localize(1882, "Maps to `Alt` on Windows and Linux and to `Option` on macOS."))
             ],
             default: 'ctrlCmd',
             description: ( localize(
-                1848,
+                1883,
                 "The modifier to be used to add an item in trees and lists to a multi-selection with the mouse (for example in the explorer, open editors and scm view). The 'Open to Side' mouse gestures - if supported - will adapt such that they do not conflict with the multiselect modifier."
             ))
         },
@@ -969,7 +969,7 @@ configurationRegistry.registerConfiguration({
             enum: ['singleClick', 'doubleClick'],
             default: 'singleClick',
             description: ( localize(
-                1849,
+                1884,
                 "Controls how to open items in trees and lists using the mouse (if supported). Note that some trees and lists might choose to ignore this setting if it is not applicable."
             ))
         },
@@ -977,59 +977,59 @@ configurationRegistry.registerConfiguration({
             type: 'boolean',
             default: false,
             description: ( localize(
-                1850,
+                1885,
                 "Controls whether lists and trees support horizontal scrolling in the workbench. Warning: turning on this setting has a performance implication."
             ))
         },
         [scrollByPageKey]: {
             type: 'boolean',
             default: false,
-            description: ( localize(1851, "Controls whether clicks in the scrollbar scroll page by page."))
+            description: ( localize(1886, "Controls whether clicks in the scrollbar scroll page by page."))
         },
         [treeIndentKey]: {
             type: 'number',
             default: 8,
             minimum: 4,
             maximum: 40,
-            description: ( localize(1852, "Controls tree indentation in pixels."))
+            description: ( localize(1887, "Controls tree indentation in pixels."))
         },
         [treeRenderIndentGuidesKey]: {
             type: 'string',
             enum: ['none', 'onHover', 'always'],
             default: 'onHover',
-            description: ( localize(1853, "Controls whether the tree should render indent guides."))
+            description: ( localize(1888, "Controls whether the tree should render indent guides."))
         },
         [listSmoothScrolling]: {
             type: 'boolean',
             default: false,
-            description: ( localize(1854, "Controls whether lists and trees have smooth scrolling.")),
+            description: ( localize(1889, "Controls whether lists and trees have smooth scrolling.")),
         },
         [mouseWheelScrollSensitivityKey]: {
             type: 'number',
             default: 1,
             markdownDescription: ( localize(
-                1855,
+                1890,
                 "A multiplier to be used on the `deltaX` and `deltaY` of mouse wheel scroll events."
             ))
         },
         [fastScrollSensitivityKey]: {
             type: 'number',
             default: 5,
-            markdownDescription: ( localize(1856, "Scrolling speed multiplier when pressing `Alt`."))
+            markdownDescription: ( localize(1891, "Scrolling speed multiplier when pressing `Alt`."))
         },
         [defaultFindModeSettingKey]: {
             type: 'string',
             enum: ['highlight', 'filter'],
             enumDescriptions: [
                 ( localize(
-                1857,
+                1892,
                 "Highlight elements when searching. Further up and down navigation will traverse only the highlighted elements."
             )),
-                ( localize(1858, "Filter elements when searching."))
+                ( localize(1893, "Filter elements when searching."))
             ],
             default: 'highlight',
             description: ( localize(
-                1859,
+                1894,
                 "Controls the default find mode for lists and trees in the workbench."
             ))
         },
@@ -1038,26 +1038,26 @@ configurationRegistry.registerConfiguration({
             enum: ['simple', 'highlight', 'filter'],
             enumDescriptions: [
                 ( localize(
-                1860,
+                1895,
                 "Simple keyboard navigation focuses elements which match the keyboard input. Matching is done only on prefixes."
             )),
                 ( localize(
-                1861,
+                1896,
                 "Highlight keyboard navigation highlights elements which match the keyboard input. Further up and down navigation will traverse only the highlighted elements."
             )),
                 ( localize(
-                1862,
+                1897,
                 "Filter keyboard navigation will filter out and hide all the elements which do not match the keyboard input."
             ))
             ],
             default: 'highlight',
             description: ( localize(
-                1863,
+                1898,
                 "Controls the keyboard navigation style for lists and trees in the workbench. Can be simple, highlight and filter."
             )),
             deprecated: true,
             deprecationMessage: ( localize(
-                1864,
+                1899,
                 "Please use 'workbench.list.defaultFindMode' and	'workbench.list.typeNavigationMode' instead."
             ))
         },
@@ -1065,12 +1065,12 @@ configurationRegistry.registerConfiguration({
             type: 'string',
             enum: ['fuzzy', 'contiguous'],
             enumDescriptions: [
-                ( localize(1865, "Use fuzzy matching when searching.")),
-                ( localize(1866, "Use contiguous matching when searching."))
+                ( localize(1900, "Use fuzzy matching when searching.")),
+                ( localize(1901, "Use contiguous matching when searching."))
             ],
             default: 'fuzzy',
             description: ( localize(
-                1867,
+                1902,
                 "Controls the type of matching used when searching lists and trees in the workbench."
             ))
         },
@@ -1079,21 +1079,21 @@ configurationRegistry.registerConfiguration({
             enum: ['singleClick', 'doubleClick'],
             default: 'singleClick',
             description: ( localize(
-                1868,
+                1903,
                 "Controls how tree folders are expanded when clicking the folder names. Note that some trees and lists might choose to ignore this setting if it is not applicable."
             )),
         },
         [treeStickyScroll]: {
             type: 'boolean',
             default: true,
-            description: ( localize(1869, "Controls whether sticky scrolling is enabled in trees.")),
+            description: ( localize(1904, "Controls whether sticky scrolling is enabled in trees.")),
         },
         [treeStickyScrollMaxElements]: {
             type: 'number',
             minimum: 1,
             default: 7,
             markdownDescription: ( localize(
-                1870,
+                1905,
                 "Controls the number of sticky elements displayed in the tree when {0} is enabled.",
                 '`#workbench.tree.enableStickyScroll#`'
             )),
@@ -1103,7 +1103,7 @@ configurationRegistry.registerConfiguration({
             enum: ['automatic', 'trigger'],
             default: 'automatic',
             markdownDescription: ( localize(
-                1871,
+                1906,
                 "Controls how type navigation works in lists and trees in the workbench. When set to `trigger`, type navigation begins once the `list.triggerTypeNavigation` command is run."
             )),
         }

package/vscode/src/vs/platform/log/common/log.d.ts

@@ -26,6 +26,7 @@ export interface ILogger extends IDisposable {
     error(message: string | Error, ...args: any[]): void;
     flush(): void;
 }
+export declare function canLog(loggerLevel: LogLevel, messageLevel: LogLevel): boolean;
 export declare function log(logger: ILogger, level: LogLevel, message: string): void;
 export type LoggerGroup = {
     readonly id: string;
@@ -158,7 +159,7 @@ export declare abstract class AbstractLoggerService extends Disposable implement
     setVisibility(resourceOrId: URI | string, visibility: boolean): void;
     getLogLevel(resource?: URI): LogLevel;
     registerLogger(resource: ILoggerResource): void;
-    deregisterLogger(resource: URI): void;
+    deregisterLogger(idOrResource: URI | string): void;
     getRegisteredLoggers(): Iterable<ILoggerResource>;
     getRegisteredLogger(resource: URI): ILoggerResource | undefined;
     dispose(): void;

package/vscode/src/vs/platform/log/common/log.js

@@ -24,6 +24,9 @@ var LogLevel;
     LogLevel[LogLevel["Error"] = 5] = "Error";
 })(LogLevel || (LogLevel = {}));
 const DEFAULT_LOG_LEVEL = LogLevel.Info;
+function canLog(loggerLevel, messageLevel) {
+    return loggerLevel !== LogLevel.Off && loggerLevel <= messageLevel;
+}
 function log(logger, level, message) {
     switch (level) {
         case LogLevel.Trace:
@@ -79,7 +82,7 @@ class AbstractLogger extends Disposable {
         return this.level;
     }
     checkLogLevel(level) {
-        return this.level !== LogLevel.Off && this.level <= level;
+        return canLog(this.level, level);
     }
     canLog(level) {
         if (this._store.isDisposed) {
@@ -344,7 +347,8 @@ class AbstractLoggerService extends Disposable {
             this._onDidChangeLoggers.fire({ added: [resource], removed: [] });
         }
     }
-    deregisterLogger(resource) {
+    deregisterLogger(idOrResource) {
+        const resource = this.toResource(idOrResource);
         const existing = this._loggers.get(resource);
         if (existing) {
             if (existing.logger) {
@@ -409,12 +413,12 @@ function LogLevelToString(logLevel) {
 }
 function LogLevelToLocalizedString(logLevel) {
     switch (logLevel) {
-        case LogLevel.Trace: return { original: 'Trace', value: ( localize(1872, "Trace")) };
-        case LogLevel.Debug: return { original: 'Debug', value: ( localize(1873, "Debug")) };
-        case LogLevel.Info: return { original: 'Info', value: ( localize(1874, "Info")) };
-        case LogLevel.Warning: return { original: 'Warning', value: ( localize(1875, "Warning")) };
-        case LogLevel.Error: return { original: 'Error', value: ( localize(1876, "Error")) };
-        case LogLevel.Off: return { original: 'Off', value: ( localize(1877, "Off")) };
+        case LogLevel.Trace: return { original: 'Trace', value: ( localize(1907, "Trace")) };
+        case LogLevel.Debug: return { original: 'Debug', value: ( localize(1908, "Debug")) };
+        case LogLevel.Info: return { original: 'Info', value: ( localize(1909, "Info")) };
+        case LogLevel.Warning: return { original: 'Warning', value: ( localize(1910, "Warning")) };
+        case LogLevel.Error: return { original: 'Error', value: ( localize(1911, "Error")) };
+        case LogLevel.Off: return { original: 'Off', value: ( localize(1912, "Off")) };
     }
 }
 function parseLogLevel(logLevel) {
@@ -438,4 +442,4 @@ function parseLogLevel(logLevel) {
 }
 const CONTEXT_LOG_LEVEL = ( new RawContextKey('logLevel', LogLevelToString(LogLevel.Info)));
 
-export { AbstractLogger, AbstractLoggerService, AbstractMessageLogger, CONTEXT_LOG_LEVEL, ConsoleLogger, DEFAULT_LOG_LEVEL, LogLevel, LogLevelToLocalizedString, LogLevelToString, MultiplexLogger, NullLogService, NullLogger, getLogLevel, isLogLevel, log, parseLogLevel };
+export { AbstractLogger, AbstractLoggerService, AbstractMessageLogger, CONTEXT_LOG_LEVEL, ConsoleLogger, DEFAULT_LOG_LEVEL, LogLevel, LogLevelToLocalizedString, LogLevelToString, MultiplexLogger, NullLogService, NullLogger, canLog, getLogLevel, isLogLevel, log, parseLogLevel };

package/vscode/src/vs/platform/log/common/log.service.d.ts

@@ -25,7 +25,7 @@ export interface ILoggerService {
     setVisibility(resourceOrId: URI | string, visible: boolean): void;
     readonly onDidChangeLoggers: Event<DidChangeLoggersEvent>;
     registerLogger(resource: ILoggerResource): void;
-    deregisterLogger(resource: URI): void;
+    deregisterLogger(idOrResource: URI | string): void;
     getRegisteredLoggers(): Iterable<ILoggerResource>;
     getRegisteredLogger(resource: URI): ILoggerResource | undefined;
 }

package/vscode/src/vs/platform/markers/common/markerService.d.ts

@@ -1,3 +1,4 @@
+import { IDisposable } from "../../../base/common/lifecycle.js";
 import { URI } from "../../../base/common/uri.js";
 import { IMarker, IMarkerData, IResourceMarker, MarkerStatistics } from "./markers.js";
 import { IMarkerService } from "./markers.service.js";
@@ -8,12 +9,15 @@ export declare class MarkerService implements IMarkerService {
     readonly onMarkerChanged: import("../../../base/common/event.js").Event<readonly URI[]>;
     private readonly _data;
     private readonly _stats;
+    private readonly _filteredResources;
     dispose(): void;
     getStatistics(): MarkerStatistics;
     remove(owner: string, resources: URI[]): void;
     changeOne(owner: string, resource: URI, markerData: IMarkerData[]): void;
+    installResourceFilter(resource: URI, reason: string): IDisposable;
     private static _toMarker;
     changeAll(owner: string, data: IResourceMarker[]): void;
+    private _createFilteredMarker;
     read(filter?: {
         owner?: string;
         resource?: URI;