@codingame/monaco-vscode-api 1.79.1 → 1.79.2-next.1

package/dist/vscode/vs/workbench/contrib/markers/browser/markersViewActions.css.js

@@ -0,0 +1,4 @@
+import n from '../../../../../../node_modules/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = ".markers-panel-action-filter>.markers-panel-filter-controls>.monaco-action-bar .action-label.markers-filters.checked{background-color:var(--vscode-inputOption-activeBackground);border-color:var(--vscode-inputOption-activeBorder);color:var(--vscode-inputOption-activeForeground)}";
+n(css,{});
+export { css, css as default };

package/dist/vscode/vs/workbench/contrib/markers/browser/markersViewActions.js

@@ -0,0 +1,132 @@
+import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
+import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
+import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
+import Messages$1 from './messages.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
+import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { ActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
+import { MarkersContextKeys } from '../common/markers.js';
+import './markersViewActions.css.js';
+class MarkersFilters extends Disposable {
+    constructor(options, contextKeyService) {
+        super();
+        this.contextKeyService = contextKeyService;
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this._excludedFiles = MarkersContextKeys.ShowExcludedFilesFilterContextKey.bindTo(this.contextKeyService);
+        this._activeFile = MarkersContextKeys.ShowActiveFileFilterContextKey.bindTo(this.contextKeyService);
+        this._showWarnings = MarkersContextKeys.ShowWarningsFilterContextKey.bindTo(this.contextKeyService);
+        this._showErrors = MarkersContextKeys.ShowErrorsFilterContextKey.bindTo(this.contextKeyService);
+        this._showInfos = MarkersContextKeys.ShowInfoFilterContextKey.bindTo(this.contextKeyService);
+        this._showErrors.set(options.showErrors);
+        this._showWarnings.set(options.showWarnings);
+        this._showInfos.set(options.showInfos);
+        this._excludedFiles.set(options.excludedFiles);
+        this._activeFile.set(options.activeFile);
+        this.filterHistory = options.filterHistory;
+    }
+    get excludedFiles() {
+        return !!this._excludedFiles.get();
+    }
+    set excludedFiles(filesExclude) {
+        if (this._excludedFiles.get() !== filesExclude) {
+            this._excludedFiles.set(filesExclude);
+            this._onDidChange.fire({ excludedFiles: true });
+        }
+    }
+    get activeFile() {
+        return !!this._activeFile.get();
+    }
+    set activeFile(activeFile) {
+        if (this._activeFile.get() !== activeFile) {
+            this._activeFile.set(activeFile);
+            this._onDidChange.fire({ activeFile: true });
+        }
+    }
+    get showWarnings() {
+        return !!this._showWarnings.get();
+    }
+    set showWarnings(showWarnings) {
+        if (this._showWarnings.get() !== showWarnings) {
+            this._showWarnings.set(showWarnings);
+            this._onDidChange.fire({ showWarnings: true });
+        }
+    }
+    get showErrors() {
+        return !!this._showErrors.get();
+    }
+    set showErrors(showErrors) {
+        if (this._showErrors.get() !== showErrors) {
+            this._showErrors.set(showErrors);
+            this._onDidChange.fire({ showErrors: true });
+        }
+    }
+    get showInfos() {
+        return !!this._showInfos.get();
+    }
+    set showInfos(showInfos) {
+        if (this._showInfos.get() !== showInfos) {
+            this._showInfos.set(showInfos);
+            this._onDidChange.fire({ showInfos: true });
+        }
+    }
+}
+class QuickFixAction extends Action {
+    get quickFixes() {
+        return this._quickFixes;
+    }
+    set quickFixes(quickFixes) {
+        this._quickFixes = quickFixes;
+        this.enabled = this._quickFixes.length > 0;
+    }
+    autoFixable(autofixable) {
+        this.class = autofixable ? QuickFixAction.AUTO_FIX_CLASS : QuickFixAction.CLASS;
+    }
+    constructor(marker) {
+        super(QuickFixAction.ID, Messages$1.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX, QuickFixAction.CLASS, false);
+        this.marker = marker;
+        this._onShowQuickFixes = this._register(( new Emitter()));
+        this.onShowQuickFixes = this._onShowQuickFixes.event;
+        this._quickFixes = [];
+    }
+    run() {
+        this._onShowQuickFixes.fire();
+        return Promise.resolve();
+    }
+}
+QuickFixAction.ID = 'workbench.actions.problems.quickfix';
+QuickFixAction.CLASS = 'markers-panel-action-quickfix ' + ThemeIcon.asClassName(Codicon.lightBulb);
+QuickFixAction.AUTO_FIX_CLASS = QuickFixAction.CLASS + ' autofixable';
+let QuickFixActionViewItem = class QuickFixActionViewItem extends ActionViewItem {
+    constructor(action, contextMenuService) {
+        super(null, action, { icon: true, label: false });
+        this.contextMenuService = contextMenuService;
+    }
+    onClick(event) {
+        dom.EventHelper.stop(event, true);
+        this.showQuickFixes();
+    }
+    showQuickFixes() {
+        if (!this.element) {
+            return;
+        }
+        if (!this.isEnabled()) {
+            return;
+        }
+        const elementPosition = dom.getDomNodePagePosition(this.element);
+        const quickFixes = this.action.quickFixes;
+        if (quickFixes.length) {
+            this.contextMenuService.showContextMenu({
+                getAnchor: () => ({ x: elementPosition.left + 10, y: elementPosition.top + elementPosition.height + 4 }),
+                getActions: () => quickFixes
+            });
+        }
+    }
+};
+QuickFixActionViewItem = ( __decorate([
+    ( __param(1, IContextMenuService))
+], QuickFixActionViewItem));
+export { MarkersFilters, QuickFixAction, QuickFixActionViewItem };

package/dist/vscode/vs/workbench/contrib/markers/browser/media/markers.css.js

@@ -0,0 +1,4 @@
+import n from '../../../../../../../node_modules/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = ".markers-panel .markers-panel-container{height:100%}.markers-panel .hide{display:none}.markers-panel .markers-panel-container .message-box-container{line-height:22px;padding-left:20px}.markers-panel .markers-panel-container .message-box-container .messageAction{cursor:pointer;margin-left:4px;text-decoration:underline}.markers-panel .markers-panel-container .hidden{display:none}.markers-panel .markers-panel-container .codicon.codicon-light-bulb{color:var(--vscode-editorLightBulb-foreground)}.markers-panel .markers-panel-container .codicon.codicon-lightbulb-autofix{color:var(--vscode-editorLightBulbAutoFix-foreground)}.markers-panel .markers-panel-container .tree-container.hidden{display:none;visibility:hidden}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents{display:flex;line-height:22px;padding-right:10px}.monaco-workbench.hc-black .markers-panel .markers-panel-container .tree-container .monaco-tl-contents,.monaco-workbench.hc-light .markers-panel .markers-panel-container .tree-container .monaco-tl-contents{line-height:20px}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-stats{display:inline-block;margin-left:10px}.markers-panel:not(.wide) .markers-panel-container .tree-container .monaco-tl-contents .resource-label-container{flex:1}.markers-panel.wide .markers-panel-container .tree-container .monaco-tl-contents .count-badge-wrapper{margin-left:10px}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-message-details-container{flex:1;overflow:hidden}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-message-details-container>.marker-message-line{overflow:hidden}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-message-details-container>.marker-message-line>.marker-message{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-message-details-container>.marker-message-line.details-container{display:flex}.markers-panel .markers-panel-container .tree-container .monaco-list:focus .monaco-list-row.focused .monaco-tl-contents .details-container a.monaco-link{color:inherit}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .details-container a.monaco-link .monaco-highlighted-label{text-decoration:underline;text-underline-position:under}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-code:before{content:\"(\"}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-code:after{content:\")\"}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .details-container .marker-line,.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .details-container .marker-source,.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .details-container .multiline-actions{margin-left:6px}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-code,.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-line,.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .marker-source,.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .related-info-resource,.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .related-info-resource-separator{opacity:.7}.markers-panel .markers-panel-container .tree-container .monaco-tl-contents .highlight{font-weight:700}.markers-panel .monaco-tl-contents .marker-icon{align-items:center;display:flex;height:22px;justify-content:center;margin:0 6px}.markers-panel .monaco-list-row.focused .monaco-tl-contents>.marker-icon.quickFix,.markers-panel .monaco-list-row.selected .monaco-tl-contents>.marker-icon.quickFix,.markers-panel .monaco-list-row:hover .monaco-tl-contents>.marker-icon.quickFix,.markers-panel .monaco-tl-contents .actions .monaco-action-bar{display:none}.markers-panel .monaco-list-row.focused .monaco-tl-contents .actions .monaco-action-bar,.markers-panel .monaco-list-row.selected .monaco-tl-contents .actions .monaco-action-bar,.markers-panel .monaco-list-row:hover .monaco-tl-contents .actions .monaco-action-bar{display:block}.markers-panel .monaco-tl-contents .actions,.markers-panel .monaco-tl-contents .multiline-actions .monaco-action-bar{height:22px}.markers-panel .monaco-tl-contents .actions .action-label,.markers-panel .monaco-tl-contents .multiline-actions .monaco-action-bar .action-label{padding:2px}.markers-panel .monaco-tl-contents .actions .action-item{margin:0 4px}.markers-panel .monaco-tl-contents .actions .action-item.disabled,.markers-panel .monaco-tl-contents .multiline-actions .action-item.disabled{display:none}.markers-panel .markers-table-container .monaco-table .monaco-table-th{align-items:center;display:flex;font-weight:600;padding-left:10px}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td{align-items:center;display:flex;padding-left:10px}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td .highlight{font-weight:700}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code,.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.file,.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.message,.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.owner{overflow:hidden;text-overflow:ellipsis}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.severity{display:flex}.markers-panel .markers-table-container .monaco-table .monaco-list-row.focused .monaco-table-tr>.monaco-table-td.quickFix>.severity,.markers-panel .markers-table-container .monaco-table .monaco-list-row.selected .monaco-table-tr>.monaco-table-td.quickFix>.severity,.markers-panel .markers-table-container .monaco-table .monaco-list-row:hover .monaco-table-tr>.monaco-table-td.quickFix>.severity{display:none}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.actions{margin-left:-3px}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.actions>.monaco-action-bar .action-item{display:none}.markers-panel .markers-table-container .monaco-table .monaco-list-row.focused .monaco-table-tr>.monaco-table-td.quickFix>.actions>.monaco-action-bar .action-item,.markers-panel .markers-table-container .monaco-table .monaco-list-row.selected .monaco-table-tr>.monaco-table-td.quickFix>.actions>.monaco-action-bar .action-item,.markers-panel .markers-table-container .monaco-table .monaco-list-row:hover .monaco-table-tr>.monaco-table-td.quickFix>.actions>.monaco-action-bar .action-item{display:flex}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code>.code-label:before,.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code>.monaco-link:before{content:\"(\"}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code>.code-label:after,.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code>.monaco-link:after{content:\")\"}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code>.code-label,.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code>.monaco-link{display:none}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code.code-label>.code-label{display:inline}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.code.code-link>.monaco-link{display:inline;text-decoration:underline}.markers-panel .markers-table-container .monaco-table .monaco-list-row .monaco-table-tr>.monaco-table-td>.file>.file-position{margin-left:6px;opacity:.7}";
+n(css,{});
+export { css, css as default };

package/dist/vscode/vs/workbench/contrib/markers/browser/messages.js

@@ -0,0 +1,171 @@
+import * as nls from 'monaco-editor/esm/vs/nls.js';
+import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
+class Messages {
+}
+Messages.MARKERS_PANEL_TOGGLE_LABEL = ( nls.localize('problems.view.toggle.label', "Toggle Problems (Errors, Warnings, Infos)"));
+Messages.MARKERS_PANEL_SHOW_LABEL = ( nls.localize('problems.view.focus.label', "Focus Problems (Errors, Warnings, Infos)"));
+Messages.PROBLEMS_PANEL_CONFIGURATION_TITLE = ( nls.localize('problems.panel.configuration.title', "Problems View"));
+Messages.PROBLEMS_PANEL_CONFIGURATION_AUTO_REVEAL = ( nls.localize(
+    'problems.panel.configuration.autoreveal',
+    "Controls whether Problems view should automatically reveal files when opening them."
+));
+Messages.PROBLEMS_PANEL_CONFIGURATION_VIEW_MODE = ( nls.localize(
+    'problems.panel.configuration.viewMode',
+    "Controls the default view mode of the Problems view."
+));
+Messages.PROBLEMS_PANEL_CONFIGURATION_SHOW_CURRENT_STATUS = ( nls.localize(
+    'problems.panel.configuration.showCurrentInStatus',
+    "When enabled shows the current problem in the status bar."
+));
+Messages.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER = ( nls.localize(
+    'problems.panel.configuration.compareOrder',
+    "Controls the order in which problems are navigated."
+));
+Messages.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_SEVERITY = ( nls.localize(
+    'problems.panel.configuration.compareOrder.severity',
+    "Navigate problems ordered by severity"
+));
+Messages.PROBLEMS_PANEL_CONFIGURATION_COMPARE_ORDER_POSITION = ( nls.localize(
+    'problems.panel.configuration.compareOrder.position',
+    "Navigate problems ordered by position"
+));
+Messages.MARKERS_PANEL_TITLE_PROBLEMS = ( nls.localize('markers.panel.title.problems', "Problems"));
+Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT = ( nls.localize(
+    'markers.panel.no.problems.build',
+    "No problems have been detected in the workspace."
+));
+Messages.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT = ( nls.localize(
+    'markers.panel.no.problems.activeFile.build',
+    "No problems have been detected in the current file."
+));
+Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS = ( nls.localize(
+    'markers.panel.no.problems.filters',
+    "No results found with provided filter criteria."
+));
+Messages.MARKERS_PANEL_ACTION_TOOLTIP_MORE_FILTERS = ( nls.localize('markers.panel.action.moreFilters', "More Filters..."));
+Messages.MARKERS_PANEL_FILTER_LABEL_SHOW_ERRORS = ( nls.localize('markers.panel.filter.showErrors', "Show Errors"));
+Messages.MARKERS_PANEL_FILTER_LABEL_SHOW_WARNINGS = ( nls.localize('markers.panel.filter.showWarnings', "Show Warnings"));
+Messages.MARKERS_PANEL_FILTER_LABEL_SHOW_INFOS = ( nls.localize('markers.panel.filter.showInfos', "Show Infos"));
+Messages.MARKERS_PANEL_FILTER_LABEL_EXCLUDED_FILES = ( nls.localize('markers.panel.filter.useFilesExclude', "Hide Excluded Files"));
+Messages.MARKERS_PANEL_FILTER_LABEL_ACTIVE_FILE = ( nls.localize('markers.panel.filter.activeFile', "Show Active File Only"));
+Messages.MARKERS_PANEL_ACTION_TOOLTIP_FILTER = ( nls.localize('markers.panel.action.filter', "Filter Problems"));
+Messages.MARKERS_PANEL_ACTION_TOOLTIP_QUICKFIX = ( nls.localize('markers.panel.action.quickfix', "Show fixes"));
+Messages.MARKERS_PANEL_FILTER_ARIA_LABEL = ( nls.localize('markers.panel.filter.ariaLabel', "Filter Problems"));
+Messages.MARKERS_PANEL_FILTER_PLACEHOLDER = ( nls.localize(
+    'markers.panel.filter.placeholder',
+    "Filter (e.g. text, **/*.ts, !**/node_modules/**)"
+));
+Messages.MARKERS_PANEL_FILTER_ERRORS = ( nls.localize('markers.panel.filter.errors', "errors"));
+Messages.MARKERS_PANEL_FILTER_WARNINGS = ( nls.localize('markers.panel.filter.warnings', "warnings"));
+Messages.MARKERS_PANEL_FILTER_INFOS = ( nls.localize('markers.panel.filter.infos', "infos"));
+Messages.MARKERS_PANEL_SINGLE_ERROR_LABEL = ( nls.localize('markers.panel.single.error.label', "1 Error"));
+Messages.MARKERS_PANEL_MULTIPLE_ERRORS_LABEL = (noOfErrors) => { return ( nls.localize('markers.panel.multiple.errors.label', "{0} Errors", '' + noOfErrors)); };
+Messages.MARKERS_PANEL_SINGLE_WARNING_LABEL = ( nls.localize('markers.panel.single.warning.label', "1 Warning"));
+Messages.MARKERS_PANEL_MULTIPLE_WARNINGS_LABEL = (noOfWarnings) => { return ( nls.localize('markers.panel.multiple.warnings.label', "{0} Warnings", '' + noOfWarnings)); };
+Messages.MARKERS_PANEL_SINGLE_INFO_LABEL = ( nls.localize('markers.panel.single.info.label', "1 Info"));
+Messages.MARKERS_PANEL_MULTIPLE_INFOS_LABEL = (noOfInfos) => { return ( nls.localize('markers.panel.multiple.infos.label', "{0} Infos", '' + noOfInfos)); };
+Messages.MARKERS_PANEL_SINGLE_UNKNOWN_LABEL = ( nls.localize('markers.panel.single.unknown.label', "1 Unknown"));
+Messages.MARKERS_PANEL_MULTIPLE_UNKNOWNS_LABEL = (noOfUnknowns) => { return ( nls.localize('markers.panel.multiple.unknowns.label', "{0} Unknowns", '' + noOfUnknowns)); };
+Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER = (ln, col) => { return ( nls.localize('markers.panel.at.ln.col.number', "[Ln {0}, Col {1}]", '' + ln, '' + col)); };
+Messages.MARKERS_TREE_ARIA_LABEL_RESOURCE = (noOfProblems, fileName, folder) => { return ( nls.localize(
+    'problems.tree.aria.label.resource',
+    "{0} problems in file {1} of folder {2}",
+    noOfProblems,
+    fileName,
+    folder
+)); };
+Messages.MARKERS_TREE_ARIA_LABEL_MARKER = (marker) => {
+    const relatedInformationMessage = marker.relatedInformation.length ? ( nls.localize(
+        'problems.tree.aria.label.marker.relatedInformation',
+        " This problem has references to {0} locations.",
+        marker.relatedInformation.length
+    )) : '';
+    switch (marker.marker.severity) {
+        case MarkerSeverity.Error:
+            return marker.marker.source ? ( nls.localize(
+                'problems.tree.aria.label.error.marker',
+                "Error: {0} at line {1} and character {2}.{3} generated by {4}",
+                marker.marker.message,
+                marker.marker.startLineNumber,
+                marker.marker.startColumn,
+                relatedInformationMessage,
+                marker.marker.source
+            ))
+                : ( nls.localize(
+                'problems.tree.aria.label.error.marker.nosource',
+                "Error: {0} at line {1} and character {2}.{3}",
+                marker.marker.message,
+                marker.marker.startLineNumber,
+                marker.marker.startColumn,
+                relatedInformationMessage
+            ));
+        case MarkerSeverity.Warning:
+            return marker.marker.source ? ( nls.localize(
+                'problems.tree.aria.label.warning.marker',
+                "Warning: {0} at line {1} and character {2}.{3} generated by {4}",
+                marker.marker.message,
+                marker.marker.startLineNumber,
+                marker.marker.startColumn,
+                relatedInformationMessage,
+                marker.marker.source
+            ))
+                : ( nls.localize(
+                'problems.tree.aria.label.warning.marker.nosource',
+                "Warning: {0} at line {1} and character {2}.{3}",
+                marker.marker.message,
+                marker.marker.startLineNumber,
+                marker.marker.startColumn,
+                relatedInformationMessage,
+                relatedInformationMessage
+            ));
+        case MarkerSeverity.Info:
+            return marker.marker.source ? ( nls.localize(
+                'problems.tree.aria.label.info.marker',
+                "Info: {0} at line {1} and character {2}.{3} generated by {4}",
+                marker.marker.message,
+                marker.marker.startLineNumber,
+                marker.marker.startColumn,
+                relatedInformationMessage,
+                marker.marker.source
+            ))
+                : ( nls.localize(
+                'problems.tree.aria.label.info.marker.nosource',
+                "Info: {0} at line {1} and character {2}.{3}",
+                marker.marker.message,
+                marker.marker.startLineNumber,
+                marker.marker.startColumn,
+                relatedInformationMessage
+            ));
+        default:
+            return marker.marker.source ? ( nls.localize(
+                'problems.tree.aria.label.marker',
+                "Problem: {0} at line {1} and character {2}.{3} generated by {4}",
+                marker.marker.source,
+                marker.marker.message,
+                marker.marker.startLineNumber,
+                marker.marker.startColumn,
+                relatedInformationMessage,
+                marker.marker.source
+            ))
+                : ( nls.localize(
+                'problems.tree.aria.label.marker.nosource',
+                "Problem: {0} at line {1} and character {2}.{3}",
+                marker.marker.message,
+                marker.marker.startLineNumber,
+                marker.marker.startColumn,
+                relatedInformationMessage
+            ));
+    }
+};
+Messages.MARKERS_TREE_ARIA_LABEL_RELATED_INFORMATION = (relatedInformation) => ( nls.localize(
+    'problems.tree.aria.label.relatedinfo.message',
+    "{0} at line {1} and character {2} in {3}",
+    relatedInformation.message,
+    relatedInformation.startLineNumber,
+    relatedInformation.startColumn,
+    basename(relatedInformation.resource)
+));
+Messages.SHOW_ERRORS_WARNINGS_ACTION_LABEL = ( nls.localize('errors.warnings.show.label', "Show Errors and Warnings"));
+var Messages$1 = Messages;
+export { Messages$1 as default };

package/dist/vscode/vs/workbench/contrib/markers/common/markers.js

@@ -1,3 +1,4 @@
+import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 var Markers;
 ( (function(Markers) {
     Markers.MARKERS_CONTAINER_ID = 'workbench.panel.markers';
@@ -17,4 +18,17 @@ var Markers;
     Markers.MARKER_SHOW_QUICK_FIX = 'problems.action.showQuickFixes';
     Markers.TOGGLE_MARKERS_VIEW_ACTION_ID = 'workbench.actions.view.toggleProblems';
 })(Markers || (Markers = {})));
-export { Markers };
+var MarkersContextKeys;
+( (function(MarkersContextKeys) {
+    MarkersContextKeys.MarkersViewModeContextKey = ( new RawContextKey('problemsViewMode', "tree" ));
+    MarkersContextKeys.MarkersTreeVisibilityContextKey = ( new RawContextKey('problemsVisibility', false));
+    MarkersContextKeys.MarkerFocusContextKey = ( new RawContextKey('problemFocus', false));
+    MarkersContextKeys.MarkerViewFilterFocusContextKey = ( new RawContextKey('problemsFilterFocus', false));
+    MarkersContextKeys.RelatedInformationFocusContextKey = ( new RawContextKey('relatedInformationFocus', false));
+    MarkersContextKeys.ShowErrorsFilterContextKey = ( new RawContextKey('problems.filter.errors', true));
+    MarkersContextKeys.ShowWarningsFilterContextKey = ( new RawContextKey('problems.filter.warnings', true));
+    MarkersContextKeys.ShowInfoFilterContextKey = ( new RawContextKey('problems.filter.info', true));
+    MarkersContextKeys.ShowActiveFileFilterContextKey = ( new RawContextKey('problems.filter.activeFile', false));
+    MarkersContextKeys.ShowExcludedFilesFilterContextKey = ( new RawContextKey('problems.filter.excludedFiles', true));
+})(MarkersContextKeys || (MarkersContextKeys = {})));
+export { Markers, MarkersContextKeys };

package/dist/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -0,0 +1,135 @@
+import { __decorate, __param } from '../../../../../../node_modules/tslib/tslib.es6.js';
+import { assertFn } from 'monaco-editor/esm/vs/base/common/assert.js';
+import { autorun } from 'monaco-editor/esm/vs/base/common/observable.js';
+import { isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { isDefined } from 'monaco-editor/esm/vs/base/common/types.js';
+import { localize } from 'monaco-editor/esm/vs/nls.js';
+import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
+import { DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput } from '../../../common/editor.js';
+import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
+import { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory } from './mergeEditorInputModel.js';
+import { MergeEditorTelemetry } from './telemetry.js';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.js';
+let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditorInput {
+    get useWorkingCopy() {
+        return this.configurationService.getValue('mergeEditor.useWorkingCopy') ?? false;
+    }
+    constructor(base, input1, input2, result, _instaService, editorService, textFileService, labelService, fileService, configurationService, filesConfigurationService) {
+        super(result, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService);
+        this.base = base;
+        this.input1 = input1;
+        this.input2 = input2;
+        this.result = result;
+        this._instaService = _instaService;
+        this.configurationService = configurationService;
+        this.closeHandler = {
+            showConfirm: () => this._inputModel?.shouldConfirmClose() ?? false,
+            confirm: async (editors) => {
+                assertFn(() => editors.every(e => e.editor instanceof MergeEditorInput));
+                const inputModels = ( editors.map(e => e.editor._inputModel)).filter(isDefined);
+                return await this._inputModel.confirmClose(inputModels);
+            },
+        };
+        this.mergeEditorModeFactory = this._instaService.createInstance(this.useWorkingCopy
+            ? TempFileMergeEditorModeFactory
+            : WorkspaceMergeEditorModeFactory, this._instaService.createInstance(MergeEditorTelemetry));
+    }
+    dispose() {
+        super.dispose();
+    }
+    get typeId() {
+        return MergeEditorInput.ID;
+    }
+    get editorId() {
+        return DEFAULT_EDITOR_ASSOCIATION.id;
+    }
+    get capabilities() {
+        let capabilities = super.capabilities | 256 ;
+        if (this.useWorkingCopy) {
+            capabilities |= 4 ;
+        }
+        return capabilities;
+    }
+    getName() {
+        return ( localize('name', "Merging: {0}", super.getName()));
+    }
+    async resolve() {
+        if (!this._inputModel) {
+            const inputModel = this._register(await this.mergeEditorModeFactory.createInputModel({
+                base: this.base,
+                input1: this.input1,
+                input2: this.input2,
+                result: this.result,
+            }));
+            this._inputModel = inputModel;
+            this._register(autorun('fire dirty event', (reader) => {
+                inputModel.isDirty.read(reader);
+                this._onDidChangeDirty.fire();
+            }));
+            await this._inputModel.model.onInitialized;
+        }
+        return this._inputModel;
+    }
+    async accept() {
+        await this._inputModel?.accept();
+    }
+    async save(group, options) {
+        await this._inputModel?.save(options);
+        return undefined;
+    }
+    toUntyped() {
+        return {
+            input1: { resource: this.input1.uri, label: this.input1.title, description: this.input1.description, detail: this.input1.detail },
+            input2: { resource: this.input2.uri, label: this.input2.title, description: this.input2.description, detail: this.input2.detail },
+            base: { resource: this.base },
+            result: { resource: this.result },
+            options: {
+                override: this.typeId
+            }
+        };
+    }
+    matches(otherInput) {
+        if (this === otherInput) {
+            return true;
+        }
+        if (otherInput instanceof MergeEditorInput) {
+            return isEqual(this.base, otherInput.base)
+                && isEqual(this.input1.uri, otherInput.input1.uri)
+                && isEqual(this.input2.uri, otherInput.input2.uri)
+                && isEqual(this.result, otherInput.result);
+        }
+        if (isResourceMergeEditorInput(otherInput)) {
+            return (this.editorId === otherInput.options?.override || otherInput.options?.override === undefined)
+                && isEqual(this.base, otherInput.base.resource)
+                && isEqual(this.input1.uri, otherInput.input1.resource)
+                && isEqual(this.input2.uri, otherInput.input2.resource)
+                && isEqual(this.result, otherInput.result.resource);
+        }
+        return false;
+    }
+    async revert(group, options) {
+        return this._inputModel?.revert(options);
+    }
+    isDirty() {
+        return this._inputModel?.isDirty.get() ?? false;
+    }
+    setLanguageId(languageId, source) {
+        this._inputModel?.model.setLanguageId(languageId, source);
+    }
+};
+MergeEditorInput.ID = 'mergeEditor.Input';
+MergeEditorInput = ( __decorate([
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IEditorService)),
+    ( __param(6, ITextFileService)),
+    ( __param(7, ILabelService)),
+    ( __param(8, IFileService)),
+    ( __param(9, IConfigurationService)),
+    ( __param(10, IFilesConfigurationService))
+], MergeEditorInput));
+export { MergeEditorInput };