@codingame/monaco-vscode-api 13.1.6 → 14.0.0

package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service.d.ts

@@ -5,7 +5,7 @@ import { URI } from "../../../../base/common/uri.js";
 import { IBaseFileStat } from "../../../../platform/files/common/files.js";
 import { SaveReason } from "../../../common/editor.js";
 import { EditorInput } from "../../../common/editor/editorInput.js";
-import { IAutoSaveConfiguration, IAutoSaveMode } from "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService";
+import { IAutoSaveConfiguration, IAutoSaveMode } from "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService";
 export declare const IFilesConfigurationService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IFilesConfigurationService>;
 export interface IFilesConfigurationService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/language/common/languageService.js

@@ -23,25 +23,25 @@ import { isString } from '../../../../base/common/types.js';
 const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'languages',
     jsonSchema: {
-        description: ( localize(11644, 'Contributes language declarations.')),
+        description: ( localize(11861, 'Contributes language declarations.')),
         type: 'array',
         items: {
             type: 'object',
             defaultSnippets: [{ body: { id: '${1:languageId}', aliases: ['${2:label}'], extensions: ['${3:extension}'], configuration: './language-configuration.json' } }],
             properties: {
                 id: {
-                    description: ( localize(11645, 'ID of the language.')),
+                    description: ( localize(11862, 'ID of the language.')),
                     type: 'string'
                 },
                 aliases: {
-                    description: ( localize(11646, 'Name aliases for the language.')),
+                    description: ( localize(11863, 'Name aliases for the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 extensions: {
-                    description: ( localize(11647, 'File extensions associated to the language.')),
+                    description: ( localize(11864, 'File extensions associated to the language.')),
                     default: ['.foo'],
                     type: 'array',
                     items: {
@@ -49,21 +49,21 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                     }
                 },
                 filenames: {
-                    description: ( localize(11648, 'File names associated to the language.')),
+                    description: ( localize(11865, 'File names associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 filenamePatterns: {
-                    description: ( localize(11649, 'File name glob patterns associated to the language.')),
+                    description: ( localize(11866, 'File name glob patterns associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
                     }
                 },
                 mimetypes: {
-                    description: ( localize(11650, 'Mime types associated to the language.')),
+                    description: ( localize(11867, 'Mime types associated to the language.')),
                     type: 'array',
                     items: {
                         type: 'string'
@@ -71,14 +71,14 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 },
                 firstLine: {
                     description: ( localize(
-                        11651,
+                        11868,
                         'A regular expression matching the first line of a file of the language.'
                     )),
                     type: 'string'
                 },
                 configuration: {
                     description: ( localize(
-                        11652,
+                        11869,
                         'A relative path to a file containing configuration options for the language.'
                     )),
                     type: 'string',
@@ -87,16 +87,16 @@ const languagesExtPoint = ExtensionsRegistry.registerExtensionPoint({
                 icon: {
                     type: 'object',
                     description: ( localize(
-                        11653,
+                        11870,
                         'A icon to use as file icon, if no icon theme provides one for the language.'
                     )),
                     properties: {
                         light: {
-                            description: ( localize(11654, 'Icon path when a light theme is used')),
+                            description: ( localize(11871, 'Icon path when a light theme is used')),
                             type: 'string'
                         },
                         dark: {
-                            description: ( localize(11655, 'Icon path when a dark theme is used')),
+                            description: ( localize(11872, 'Icon path when a dark theme is used')),
                             type: 'string'
                         }
                     }
@@ -170,11 +170,11 @@ class LanguageTableRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(11656, "ID")),
-            ( localize(11657, "Name")),
-            ( localize(11658, "File Extensions")),
-            ( localize(11659, "Grammar")),
-            ( localize(11660, "Snippets"))
+            ( localize(11873, "ID")),
+            ( localize(11874, "Name")),
+            ( localize(11875, "File Extensions")),
+            ( localize(11876, "Grammar")),
+            ( localize(11877, "Snippets"))
         ];
         const rows = ( languages.sort((a, b) => a.id.localeCompare(b.id))
             .map(l => {
@@ -196,7 +196,7 @@ class LanguageTableRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'languages',
-    label: ( localize(11661, "Programming Languages")),
+    label: ( localize(11878, "Programming Languages")),
     access: {
         canToggle: false
     },
@@ -214,7 +214,7 @@ let WorkbenchLanguageService = class WorkbenchLanguageService extends LanguageSe
                 const extension = extensions[i];
                 if (!Array.isArray(extension.value)) {
                     extension.collector.error(( localize(
-                        11662,
+                        11879,
                         "Invalid `contributes.{0}`. Expected an array.",
                         languagesExtPoint.name
                     )));
@@ -294,16 +294,16 @@ function isUndefinedOrStringArray(value) {
 }
 function isValidLanguageExtensionPoint(value, collector) {
     if (!value) {
-        collector?.error(( localize(11663, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
+        collector?.error(( localize(11880, "Empty value for `contributes.{0}`", languagesExtPoint.name)));
         return false;
     }
     if (typeof value.id !== 'string') {
-        collector?.error(( localize(11664, "property `{0}` is mandatory and must be of type `string`", 'id')));
+        collector?.error(( localize(11881, "property `{0}` is mandatory and must be of type `string`", 'id')));
         return false;
     }
     if (!isUndefinedOrStringArray(value.extensions)) {
         collector?.error(( localize(
-            11665,
+            11882,
             "property `{0}` can be omitted and must be of type `string[]`",
             'extensions'
         )));
@@ -311,7 +311,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.filenames)) {
         collector?.error(( localize(
-            11666,
+            11883,
             "property `{0}` can be omitted and must be of type `string[]`",
             'filenames'
         )));
@@ -319,7 +319,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (typeof value.firstLine !== 'undefined' && typeof value.firstLine !== 'string') {
         collector?.error(( localize(
-            11667,
+            11884,
             "property `{0}` can be omitted and must be of type `string`",
             'firstLine'
         )));
@@ -327,7 +327,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (typeof value.configuration !== 'undefined' && typeof value.configuration !== 'string') {
         collector?.error(( localize(
-            11668,
+            11885,
             "property `{0}` can be omitted and must be of type `string`",
             'configuration'
         )));
@@ -335,7 +335,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.aliases)) {
         collector?.error(( localize(
-            11669,
+            11886,
             "property `{0}` can be omitted and must be of type `string[]`",
             'aliases'
         )));
@@ -343,7 +343,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     }
     if (!isUndefinedOrStringArray(value.mimetypes)) {
         collector?.error(( localize(
-            11670,
+            11887,
             "property `{0}` can be omitted and must be of type `string[]`",
             'mimetypes'
         )));
@@ -352,7 +352,7 @@ function isValidLanguageExtensionPoint(value, collector) {
     if (typeof value.icon !== 'undefined') {
         if (typeof value.icon !== 'object' || typeof value.icon.light !== 'string' || typeof value.icon.dark !== 'string') {
             collector?.error(( localize(
-                11671,
+                11888,
                 "property `{0}` can be omitted and must be of type `object` with properties `{1}` and `{2}` of type `string`",
                 'icon',
                 'light',

package/vscode/src/vs/workbench/services/layout/browser/layoutService.d.ts

@@ -0,0 +1,63 @@
+import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
+export declare enum Parts {
+    TITLEBAR_PART = "workbench.parts.titlebar",
+    BANNER_PART = "workbench.parts.banner",
+    ACTIVITYBAR_PART = "workbench.parts.activitybar",
+    SIDEBAR_PART = "workbench.parts.sidebar",
+    PANEL_PART = "workbench.parts.panel",
+    AUXILIARYBAR_PART = "workbench.parts.auxiliarybar",
+    EDITOR_PART = "workbench.parts.editor",
+    STATUSBAR_PART = "workbench.parts.statusbar"
+}
+export declare enum ZenModeSettings {
+    SHOW_TABS = "zenMode.showTabs",
+    HIDE_LINENUMBERS = "zenMode.hideLineNumbers",
+    HIDE_STATUSBAR = "zenMode.hideStatusBar",
+    HIDE_ACTIVITYBAR = "zenMode.hideActivityBar",
+    CENTER_LAYOUT = "zenMode.centerLayout",
+    FULLSCREEN = "zenMode.fullScreen",
+    RESTORE = "zenMode.restore",
+    SILENT_NOTIFICATIONS = "zenMode.silentNotifications"
+}
+export declare enum LayoutSettings {
+    ACTIVITY_BAR_LOCATION = "workbench.activityBar.location",
+    EDITOR_TABS_MODE = "workbench.editor.showTabs",
+    EDITOR_ACTIONS_LOCATION = "workbench.editor.editorActionsLocation",
+    COMMAND_CENTER = "window.commandCenter",
+    LAYOUT_ACTIONS = "workbench.layoutControl.enabled"
+}
+export declare enum ActivityBarPosition {
+    DEFAULT = "default",
+    TOP = "top",
+    BOTTOM = "bottom",
+    HIDDEN = "hidden"
+}
+export declare enum EditorTabsMode {
+    MULTIPLE = "multiple",
+    SINGLE = "single",
+    NONE = "none"
+}
+export declare enum EditorActionsLocation {
+    DEFAULT = "default",
+    TITLEBAR = "titleBar",
+    HIDDEN = "hidden"
+}
+export declare enum Position {
+    LEFT = 0,
+    RIGHT = 1,
+    BOTTOM = 2,
+    TOP = 3
+}
+export declare function isHorizontal(position: Position): boolean;
+export declare enum PanelOpensMaximizedOptions {
+    ALWAYS = 0,
+    NEVER = 1,
+    REMEMBER_LAST = 2
+}
+export type PanelAlignment = "left" | "center" | "right" | "justify";
+export declare function positionToString(position: Position): string;
+export declare function positionFromString(str: string): Position;
+export declare function panelOpensMaximizedFromString(str: string): PanelOpensMaximizedOptions;
+export type MULTI_WINDOW_PARTS = Parts.EDITOR_PART | Parts.STATUSBAR_PART | Parts.TITLEBAR_PART;
+export type SINGLE_WINDOW_PARTS = Exclude<Parts, MULTI_WINDOW_PARTS>;
+export declare function shouldShowCustomTitleBar(configurationService: IConfigurationService, window: Window, menuBarToggled?: boolean): boolean;

package/vscode/src/vs/workbench/services/layout/browser/layoutService.js

@@ -0,0 +1,164 @@
+
+import { isWeb, isMacintosh, isNative } from '../../../../base/common/platform.js';
+import { isAuxiliaryWindow } from '../../../../base/browser/window.js';
+import { hasNativeTitlebar, TitleBarSetting, CustomTitleBarVisibility, getMenuBarVisibility } from '../../../../platform/window/common/window.js';
+import { isFullscreen, isWCOEnabled } from '../../../../base/browser/browser.js';
+
+var Parts;
+(function (Parts) {
+    Parts["TITLEBAR_PART"] = "workbench.parts.titlebar";
+    Parts["BANNER_PART"] = "workbench.parts.banner";
+    Parts["ACTIVITYBAR_PART"] = "workbench.parts.activitybar";
+    Parts["SIDEBAR_PART"] = "workbench.parts.sidebar";
+    Parts["PANEL_PART"] = "workbench.parts.panel";
+    Parts["AUXILIARYBAR_PART"] = "workbench.parts.auxiliarybar";
+    Parts["EDITOR_PART"] = "workbench.parts.editor";
+    Parts["STATUSBAR_PART"] = "workbench.parts.statusbar";
+})(Parts || (Parts = {}));
+var ZenModeSettings;
+(function (ZenModeSettings) {
+    ZenModeSettings["SHOW_TABS"] = "zenMode.showTabs";
+    ZenModeSettings["HIDE_LINENUMBERS"] = "zenMode.hideLineNumbers";
+    ZenModeSettings["HIDE_STATUSBAR"] = "zenMode.hideStatusBar";
+    ZenModeSettings["HIDE_ACTIVITYBAR"] = "zenMode.hideActivityBar";
+    ZenModeSettings["CENTER_LAYOUT"] = "zenMode.centerLayout";
+    ZenModeSettings["FULLSCREEN"] = "zenMode.fullScreen";
+    ZenModeSettings["RESTORE"] = "zenMode.restore";
+    ZenModeSettings["SILENT_NOTIFICATIONS"] = "zenMode.silentNotifications";
+})(ZenModeSettings || (ZenModeSettings = {}));
+var LayoutSettings;
+(function (LayoutSettings) {
+    LayoutSettings["ACTIVITY_BAR_LOCATION"] = "workbench.activityBar.location";
+    LayoutSettings["EDITOR_TABS_MODE"] = "workbench.editor.showTabs";
+    LayoutSettings["EDITOR_ACTIONS_LOCATION"] = "workbench.editor.editorActionsLocation";
+    LayoutSettings["COMMAND_CENTER"] = "window.commandCenter";
+    LayoutSettings["LAYOUT_ACTIONS"] = "workbench.layoutControl.enabled";
+})(LayoutSettings || (LayoutSettings = {}));
+var ActivityBarPosition;
+(function (ActivityBarPosition) {
+    ActivityBarPosition["DEFAULT"] = "default";
+    ActivityBarPosition["TOP"] = "top";
+    ActivityBarPosition["BOTTOM"] = "bottom";
+    ActivityBarPosition["HIDDEN"] = "hidden";
+})(ActivityBarPosition || (ActivityBarPosition = {}));
+var EditorTabsMode;
+(function (EditorTabsMode) {
+    EditorTabsMode["MULTIPLE"] = "multiple";
+    EditorTabsMode["SINGLE"] = "single";
+    EditorTabsMode["NONE"] = "none";
+})(EditorTabsMode || (EditorTabsMode = {}));
+var EditorActionsLocation;
+(function (EditorActionsLocation) {
+    EditorActionsLocation["DEFAULT"] = "default";
+    EditorActionsLocation["TITLEBAR"] = "titleBar";
+    EditorActionsLocation["HIDDEN"] = "hidden";
+})(EditorActionsLocation || (EditorActionsLocation = {}));
+var Position;
+(function (Position) {
+    Position[Position["LEFT"] = 0] = "LEFT";
+    Position[Position["RIGHT"] = 1] = "RIGHT";
+    Position[Position["BOTTOM"] = 2] = "BOTTOM";
+    Position[Position["TOP"] = 3] = "TOP";
+})(Position || (Position = {}));
+function isHorizontal(position) {
+    return position === Position.BOTTOM || position === Position.TOP;
+}
+var PanelOpensMaximizedOptions;
+(function (PanelOpensMaximizedOptions) {
+    PanelOpensMaximizedOptions[PanelOpensMaximizedOptions["ALWAYS"] = 0] = "ALWAYS";
+    PanelOpensMaximizedOptions[PanelOpensMaximizedOptions["NEVER"] = 1] = "NEVER";
+    PanelOpensMaximizedOptions[PanelOpensMaximizedOptions["REMEMBER_LAST"] = 2] = "REMEMBER_LAST";
+})(PanelOpensMaximizedOptions || (PanelOpensMaximizedOptions = {}));
+function positionToString(position) {
+    switch (position) {
+        case Position.LEFT: return 'left';
+        case Position.RIGHT: return 'right';
+        case Position.BOTTOM: return 'bottom';
+        case Position.TOP: return 'top';
+        default: return 'bottom';
+    }
+}
+const positionsByString = {
+    [positionToString(Position.LEFT)]: Position.LEFT,
+    [positionToString(Position.RIGHT)]: Position.RIGHT,
+    [positionToString(Position.BOTTOM)]: Position.BOTTOM,
+    [positionToString(Position.TOP)]: Position.TOP
+};
+function positionFromString(str) {
+    return positionsByString[str];
+}
+function panelOpensMaximizedSettingToString(setting) {
+    switch (setting) {
+        case PanelOpensMaximizedOptions.ALWAYS: return 'always';
+        case PanelOpensMaximizedOptions.NEVER: return 'never';
+        case PanelOpensMaximizedOptions.REMEMBER_LAST: return 'preserve';
+        default: return 'preserve';
+    }
+}
+const panelOpensMaximizedByString = {
+    [panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.ALWAYS)]: PanelOpensMaximizedOptions.ALWAYS,
+    [panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.NEVER)]: PanelOpensMaximizedOptions.NEVER,
+    [panelOpensMaximizedSettingToString(PanelOpensMaximizedOptions.REMEMBER_LAST)]: PanelOpensMaximizedOptions.REMEMBER_LAST
+};
+function panelOpensMaximizedFromString(str) {
+    return panelOpensMaximizedByString[str];
+}
+function shouldShowCustomTitleBar(configurationService, window, menuBarToggled) {
+    const inFullscreen = isFullscreen(window);
+    const nativeTitleBarEnabled = hasNativeTitlebar(configurationService);
+    if (!isWeb) {
+        const showCustomTitleBar = configurationService.getValue(TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY);
+        if (showCustomTitleBar === CustomTitleBarVisibility.NEVER && nativeTitleBarEnabled || showCustomTitleBar === CustomTitleBarVisibility.WINDOWED && inFullscreen) {
+            return false;
+        }
+    }
+    if (!isTitleBarEmpty(configurationService)) {
+        return true;
+    }
+    if (nativeTitleBarEnabled) {
+        return false;
+    }
+    if (isMacintosh && isNative) {
+        return !inFullscreen;
+    }
+    if (isNative && !inFullscreen) {
+        return true;
+    }
+    if (isWCOEnabled() && !inFullscreen) {
+        return true;
+    }
+    const menuBarVisibility = !isAuxiliaryWindow(window) ? getMenuBarVisibility(configurationService) : 'hidden';
+    switch (menuBarVisibility) {
+        case 'classic':
+            return !inFullscreen || !!menuBarToggled;
+        case 'compact':
+        case 'hidden':
+            return false;
+        case 'toggle':
+            return !!menuBarToggled;
+        case 'visible':
+            return true;
+        default:
+            return isWeb ? false : !inFullscreen || !!menuBarToggled;
+    }
+}
+function isTitleBarEmpty(configurationService) {
+    if (configurationService.getValue(LayoutSettings.COMMAND_CENTER)) {
+        return false;
+    }
+    const activityBarPosition = configurationService.getValue(LayoutSettings.ACTIVITY_BAR_LOCATION);
+    if (activityBarPosition === ActivityBarPosition.TOP || activityBarPosition === ActivityBarPosition.BOTTOM) {
+        return false;
+    }
+    const editorActionsLocation = configurationService.getValue(LayoutSettings.EDITOR_ACTIONS_LOCATION);
+    const editorTabsMode = configurationService.getValue(LayoutSettings.EDITOR_TABS_MODE);
+    if (editorActionsLocation === EditorActionsLocation.TITLEBAR || editorActionsLocation === EditorActionsLocation.DEFAULT && editorTabsMode === EditorTabsMode.NONE) {
+        return false;
+    }
+    if (configurationService.getValue(LayoutSettings.LAYOUT_ACTIONS)) {
+        return false;
+    }
+    return true;
+}
+
+export { ActivityBarPosition, EditorActionsLocation, EditorTabsMode, LayoutSettings, PanelOpensMaximizedOptions, Parts, Position, ZenModeSettings, isHorizontal, panelOpensMaximizedFromString, positionFromString, positionToString, shouldShowCustomTitleBar };

package/vscode/src/vs/workbench/services/layout/browser/layoutService.service.d.ts

@@ -5,7 +5,7 @@ import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { ILayoutService } from "../../../../platform/layout/browser/layoutService.service.js";
 import { Part } from "@codingame/monaco-vscode-d8236b3b-b91a-522d-89f4-94d70a546f6a-common/vscode/vs/workbench/browser/part";
-import { PanelAlignment, Parts, SINGLE_WINDOW_PARTS, MULTI_WINDOW_PARTS, Position } from "@codingame/monaco-vscode-e7080bda-ce3e-5243-9a35-98cd9634dbda-common/vscode/vs/workbench/services/layout/browser/layoutService";
+import { PanelAlignment, Parts, SINGLE_WINDOW_PARTS, MULTI_WINDOW_PARTS, Position } from "./layoutService.js";
 export declare const IWorkbenchLayoutService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkbenchLayoutService>;
 export interface IWorkbenchLayoutService extends ILayoutService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/localization/common/locale.service.d.ts

@@ -1,4 +1,4 @@
-import { ILanguagePackItem } from "@codingame/monaco-vscode-47923ab1-c4c8-58b5-89ac-fa1b998eb5dd-common/vscode/vs/platform/languagePacks/common/languagePacks";
+import { ILanguagePackItem } from "@codingame/monaco-vscode-4ee1e7cc-aa3e-55cb-9689-c49cb8629493-common/vscode/vs/platform/languagePacks/common/languagePacks";
 export declare const ILocaleService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<ILocaleService>;
 export interface ILocaleService {
     readonly _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/log/common/logConstants.d.ts

@@ -1,2 +1,4 @@
+import { LoggerGroup } from "../../../../platform/log/common/log.js";
 export declare const windowLogId = "rendererLog";
+export declare const windowLogGroup: LoggerGroup;
 export declare const showWindowLogActionId = "workbench.action.showWindowLog";

package/vscode/src/vs/workbench/services/log/common/logConstants.js

@@ -1,6 +1,8 @@
 
+import { localize } from '../../../../nls.js';
 
 const windowLogId = 'rendererLog';
+const windowLogGroup = { id: windowLogId, name: ( localize(11895, "Window")) };
 const showWindowLogActionId = 'workbench.action.showWindowLog';
 
-export { showWindowLogActionId, windowLogId };
+export { showWindowLogActionId, windowLogGroup, windowLogId };

package/vscode/src/vs/workbench/services/outline/browser/outline.service.d.ts

@@ -2,7 +2,7 @@ import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
 import { IEditorPane } from "../../../common/editor.js";
-import { OutlineTarget, IOutline, IOutlineCreator } from "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/vscode/vs/workbench/services/outline/browser/outline";
+import { OutlineTarget, IOutline, IOutlineCreator } from "@codingame/monaco-vscode-d4a98668-f793-5361-a9cf-1e6ae6d62ce3-common/vscode/vs/workbench/services/outline/browser/outline";
 export declare const IOutlineService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IOutlineService>;
 export interface IOutlineService {
     _serviceBrand: undefined;

package/vscode/src/vs/workbench/services/output/common/output.d.ts

@@ -1,6 +1,8 @@
 import { Event } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
 import { RawContextKey } from "../../../../platform/contextkey/common/contextkey.js";
+import { LogLevel } from "../../../../platform/log/common/log.js";
+import { Range } from "../../../../editor/common/core/range.js";
 export declare const OUTPUT_MIME = "text/x-code-output";
 export declare const OUTPUT_MODE_ID = "Log";
 export declare const LOG_MIME = "text/x-code-log-output";
@@ -8,19 +10,49 @@ export declare const LOG_MODE_ID = "log";
 export declare const OUTPUT_VIEW_ID = "workbench.panel.output";
 export declare const CONTEXT_IN_OUTPUT: RawContextKey<boolean>;
 export declare const CONTEXT_ACTIVE_FILE_OUTPUT: RawContextKey<boolean>;
+export declare const CONTEXT_ACTIVE_LOG_FILE_OUTPUT: RawContextKey<boolean>;
 export declare const CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE: RawContextKey<boolean>;
 export declare const CONTEXT_ACTIVE_OUTPUT_LEVEL: RawContextKey<string>;
 export declare const CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT: RawContextKey<boolean>;
 export declare const CONTEXT_OUTPUT_SCROLL_LOCK: RawContextKey<boolean>;
+export declare const ACTIVE_OUTPUT_CHANNEL_CONTEXT: RawContextKey<string>;
+export declare const SHOW_TRACE_FILTER_CONTEXT: RawContextKey<boolean>;
+export declare const SHOW_DEBUG_FILTER_CONTEXT: RawContextKey<boolean>;
+export declare const SHOW_INFO_FILTER_CONTEXT: RawContextKey<boolean>;
+export declare const SHOW_WARNING_FILTER_CONTEXT: RawContextKey<boolean>;
+export declare const SHOW_ERROR_FILTER_CONTEXT: RawContextKey<boolean>;
+export declare const OUTPUT_FILTER_FOCUS_CONTEXT: RawContextKey<boolean>;
+export declare const HIDE_CATEGORY_FILTER_CONTEXT: RawContextKey<string>;
+export interface IOutputViewFilters {
+    readonly onDidChange: Event<void>;
+    text: string;
+    trace: boolean;
+    debug: boolean;
+    info: boolean;
+    warning: boolean;
+    error: boolean;
+    categories: string;
+    toggleCategory(category: string): void;
+    hasCategory(category: string): boolean;
+}
 export declare enum OutputChannelUpdateMode {
     Append = 1,
     Replace = 2,
     Clear = 3
 }
+export interface ILogEntry {
+    readonly range: Range;
+    readonly timestamp: number;
+    readonly timestampRange: Range;
+    readonly logLevel: LogLevel;
+    readonly logLevelRange: Range;
+    readonly category: string | undefined;
+}
 export interface IOutputChannel {
-    id: string;
-    label: string;
-    uri: URI;
+    readonly id: string;
+    readonly label: string;
+    readonly uri: URI;
+    getLogEntries(): readonly ILogEntry[];
     append(output: string): void;
     clear(): void;
     replace(output: string): void;
@@ -36,18 +68,29 @@ export interface IOutputChannelDescriptor {
     label: string;
     log: boolean;
     languageId?: string;
-    file?: URI;
+    source?: IOutputContentSource | ReadonlyArray<IOutputContentSource>;
     extensionId?: string;
+    user?: boolean;
+}
+export interface ISingleSourceOutputChannelDescriptor extends IOutputChannelDescriptor {
+    source: IOutputContentSource;
 }
-export interface IFileOutputChannelDescriptor extends IOutputChannelDescriptor {
-    file: URI;
+export interface IMultiSourceOutputChannelDescriptor extends IOutputChannelDescriptor {
+    source: ReadonlyArray<IOutputContentSource>;
+}
+export declare function isSingleSourceOutputChannelDescriptor(descriptor: IOutputChannelDescriptor): descriptor is ISingleSourceOutputChannelDescriptor;
+export declare function isMultiSourceOutputChannelDescriptor(descriptor: IOutputChannelDescriptor): descriptor is IMultiSourceOutputChannelDescriptor;
+export interface IOutputContentSource {
+    readonly name?: string;
+    readonly resource: URI;
 }
 export interface IOutputChannelRegistry {
     readonly onDidRegisterChannel: Event<string>;
-    readonly onDidRemoveChannel: Event<string>;
+    readonly onDidRemoveChannel: Event<IOutputChannelDescriptor>;
+    readonly onDidUpdateChannelSources: Event<IMultiSourceOutputChannelDescriptor>;
     registerChannel(descriptor: IOutputChannelDescriptor): void;
+    updateChannelSources(id: string, sources: IOutputContentSource[]): void;
     getChannels(): IOutputChannelDescriptor[];
     getChannel(id: string): IOutputChannelDescriptor | undefined;
     removeChannel(id: string): void;
 }
-export declare const ACTIVE_OUTPUT_CHANNEL_CONTEXT: RawContextKey<string>;

package/vscode/src/vs/workbench/services/output/common/output.js

@@ -10,10 +10,19 @@ const LOG_MODE_ID = 'log';
 const OUTPUT_VIEW_ID = 'workbench.panel.output';
 const CONTEXT_IN_OUTPUT = ( new RawContextKey('inOutput', false));
 const CONTEXT_ACTIVE_FILE_OUTPUT = ( new RawContextKey('activeLogOutput', false));
+const CONTEXT_ACTIVE_LOG_FILE_OUTPUT = ( new RawContextKey('activeLogOutput.isLog', false));
 const CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE = ( new RawContextKey('activeLogOutput.levelSettable', false));
 const CONTEXT_ACTIVE_OUTPUT_LEVEL = ( new RawContextKey('activeLogOutput.level', ''));
 const CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT = ( new RawContextKey('activeLogOutput.levelIsDefault', false));
 const CONTEXT_OUTPUT_SCROLL_LOCK = ( new RawContextKey(`outputView.scrollLock`, false));
+const ACTIVE_OUTPUT_CHANNEL_CONTEXT = ( new RawContextKey('activeOutputChannel', ''));
+const SHOW_TRACE_FILTER_CONTEXT = ( new RawContextKey('output.filter.trace', true));
+const SHOW_DEBUG_FILTER_CONTEXT = ( new RawContextKey('output.filter.debug', true));
+const SHOW_INFO_FILTER_CONTEXT = ( new RawContextKey('output.filter.info', true));
+const SHOW_WARNING_FILTER_CONTEXT = ( new RawContextKey('output.filter.warning', true));
+const SHOW_ERROR_FILTER_CONTEXT = ( new RawContextKey('output.filter.error', true));
+const OUTPUT_FILTER_FOCUS_CONTEXT = ( new RawContextKey('outputFilterFocus', false));
+const HIDE_CATEGORY_FILTER_CONTEXT = ( new RawContextKey('output.filter.categories', ''));
 var OutputChannelUpdateMode;
 (function (OutputChannelUpdateMode) {
     OutputChannelUpdateMode[OutputChannelUpdateMode["Append"] = 1] = "Append";
@@ -23,6 +32,12 @@ var OutputChannelUpdateMode;
 const Extensions = {
     OutputChannels: 'workbench.contributions.outputChannels'
 };
+function isSingleSourceOutputChannelDescriptor(descriptor) {
+    return !!descriptor.source && !Array.isArray(descriptor.source);
+}
+function isMultiSourceOutputChannelDescriptor(descriptor) {
+    return Array.isArray(descriptor.source);
+}
 class OutputChannelRegistry {
     constructor() {
         this.channels = ( new Map());
@@ -30,6 +45,8 @@ class OutputChannelRegistry {
         this.onDidRegisterChannel = this._onDidRegisterChannel.event;
         this._onDidRemoveChannel = ( new Emitter());
         this.onDidRemoveChannel = this._onDidRemoveChannel.event;
+        this._onDidUpdateChannelFiles = ( new Emitter());
+        this.onDidUpdateChannelSources = this._onDidUpdateChannelFiles.event;
     }
     registerChannel(descriptor) {
         if (!( this.channels.has(descriptor.id))) {
@@ -45,12 +62,21 @@ class OutputChannelRegistry {
     getChannel(id) {
         return this.channels.get(id);
     }
+    updateChannelSources(id, sources) {
+        const channel = this.channels.get(id);
+        if (channel && isMultiSourceOutputChannelDescriptor(channel)) {
+            channel.source = sources;
+            this._onDidUpdateChannelFiles.fire(channel);
+        }
+    }
     removeChannel(id) {
-        this.channels.delete(id);
-        this._onDidRemoveChannel.fire(id);
+        const channel = this.channels.get(id);
+        if (channel) {
+            this.channels.delete(id);
+            this._onDidRemoveChannel.fire(channel);
+        }
     }
 }
 Registry.add(Extensions.OutputChannels, ( new OutputChannelRegistry()));
-const ACTIVE_OUTPUT_CHANNEL_CONTEXT = ( new RawContextKey('activeOutputChannel', ''));
 
-export { ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, CONTEXT_IN_OUTPUT, CONTEXT_OUTPUT_SCROLL_LOCK, Extensions, LOG_MIME, LOG_MODE_ID, OUTPUT_MIME, OUTPUT_MODE_ID, OUTPUT_VIEW_ID, OutputChannelUpdateMode };
+export { ACTIVE_OUTPUT_CHANNEL_CONTEXT, CONTEXT_ACTIVE_FILE_OUTPUT, CONTEXT_ACTIVE_LOG_FILE_OUTPUT, CONTEXT_ACTIVE_OUTPUT_LEVEL, CONTEXT_ACTIVE_OUTPUT_LEVEL_IS_DEFAULT, CONTEXT_ACTIVE_OUTPUT_LEVEL_SETTABLE, CONTEXT_IN_OUTPUT, CONTEXT_OUTPUT_SCROLL_LOCK, Extensions, HIDE_CATEGORY_FILTER_CONTEXT, LOG_MIME, LOG_MODE_ID, OUTPUT_FILTER_FOCUS_CONTEXT, OUTPUT_MIME, OUTPUT_MODE_ID, OUTPUT_VIEW_ID, OutputChannelUpdateMode, SHOW_DEBUG_FILTER_CONTEXT, SHOW_ERROR_FILTER_CONTEXT, SHOW_INFO_FILTER_CONTEXT, SHOW_TRACE_FILTER_CONTEXT, SHOW_WARNING_FILTER_CONTEXT, isMultiSourceOutputChannelDescriptor, isSingleSourceOutputChannelDescriptor };