npm - @codingame/monaco-vscode-markers-service-override - Versions diffs - 1.85.6 → 2.0.0-v2.1 - Mend

@codingame/monaco-vscode-markers-service-override 1.85.6 → 2.0.0-v2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-markers-service-override",
-  "version": "1.85.6",
+  "version": "2.0.0-v2.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
+    "url": "git@github.com:CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
-    "monaco-editor": "0.45.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
+    "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/vscode/src/vs/workbench/contrib/markers/browser/markers.contribution.js CHANGED Viewed

@@ -1,30 +1,30 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { Extensions } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
-import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Marker, ResourceMarkers, RelatedInformation } from './markersModel.js';
 import { MarkersView } from './markersView.js';
-import { registerAction2, MenuId, Action2 } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { registerAction2, MenuId, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Markers, MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
 import Messages from './messages.js';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/common/contributions';
-import { IClipboardService } from 'monaco-editor/esm/vs/platform/clipboard/common/clipboardService.js';
-import { Disposable, MutableDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
+import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
-import { IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
+import { IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { IViewsService, Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
 import { FocusedViewContext, getVisbileViewContextKey } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { ViewAction } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { NumberBadge, IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
 import { viewFilterSubmenu } from 'vscode/vscode/vs/workbench/browser/parts/views/viewFilter';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: Markers.MARKER_OPEN_ACTION_ID,

package/vscode/src/vs/workbench/contrib/markers/browser/markersFilterOptions.js CHANGED Viewed

@@ -1,8 +1,8 @@
-import { matchesFuzzy2, matchesFuzzy } from 'monaco-editor/esm/vs/base/common/filters.js';
-import { getEmptyExpression, splitGlobAware, parse } from 'monaco-editor/esm/vs/base/common/glob.js';
-import * as strings from 'monaco-editor/esm/vs/base/common/strings.js';
-import { relativePath } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { TernarySearchTree } from 'monaco-editor/esm/vs/base/common/ternarySearchTree.js';
+import { matchesFuzzy2, matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
+import { getEmptyExpression, splitGlobAware, parse } from 'vscode/vscode/vs/base/common/glob';
+import { rtrim, ltrim } from 'vscode/vscode/vs/base/common/strings';
+import { relativePath } from 'vscode/vscode/vs/base/common/resources';
+import { TernarySearchTree } from 'vscode/vscode/vs/base/common/ternarySearchTree';
 class ResourceGlobMatcher {
     constructor(globalExpression, rootExpressions, uriIdentityService) {
@@ -41,18 +41,18 @@ class FilterOptions {
         for (const { expression } of filesExcludeByRoot) {
             for (const pattern of ( Object.keys(expression))) {
                 if (!pattern.endsWith('/**')) {
-                    expression[`${strings.rtrim(pattern, '/')}/**`] = expression[pattern];
+                    expression[`${rtrim(pattern, '/')}/**`] = expression[pattern];
                 }
             }
         }
         const negate = filter.startsWith('!');
-        this.textFilter = { text: (negate ? strings.ltrim(filter, '!') : filter).trim(), negate };
+        this.textFilter = { text: (negate ? ltrim(filter, '!') : filter).trim(), negate };
         const includeExpression = getEmptyExpression();
         if (filter) {
             const filters = ( splitGlobAware(filter, ',').map(s => s.trim())).filter(s => !!s.length);
             for (const f of filters) {
                 if (f.startsWith('!')) {
-                    const filterText = strings.ltrim(f, '!');
+                    const filterText = ltrim(f, '!');
                     if (filterText) {
                         this.setPattern(excludesExpression, filterText);
                     }

package/vscode/src/vs/workbench/contrib/markers/browser/markersModel.js CHANGED Viewed

@@ -1,12 +1,12 @@
-import { basename, extUri } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { MarkerSeverity, IMarkerData } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
-import { flatten, isNonEmptyArray } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Hasher } from 'monaco-editor/esm/vs/base/common/hash.js';
-import { splitLines } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { unsupportedSchemas } from 'monaco-editor/esm/vs/platform/markers/common/markerService.js';
+import { basename, extUri } from 'vscode/vscode/vs/base/common/resources';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { MarkerSeverity, IMarkerData } from 'vscode/vscode/vs/platform/markers/common/markers';
+import { flatten, isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Hasher } from 'vscode/vscode/vs/base/common/hash';
+import { splitLines } from 'vscode/vscode/vs/base/common/strings';
+import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
 function compareMarkersByUri(a, b) {
     return extUri.compare(a.resource, b.resource);

package/vscode/src/vs/workbench/contrib/markers/browser/markersTable.js CHANGED Viewed

@@ -1,29 +1,29 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { WorkbenchTable } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { HighlightedLabel } from 'monaco-editor/esm/vs/base/browser/ui/highlightedlabel/highlightedLabel.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { append, $ as $$1, findParentWithClass } from 'vscode/vscode/vs/base/browser/dom';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { WorkbenchTable } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
 import { MarkerTableItem, compareMarkersByUri, Marker } from './markersModel.js';
-import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
-import { SeverityIcon } from 'monaco-editor/esm/vs/platform/severityIcon/browser/severityIcon.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
+import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
+import { SeverityIcon } from 'vscode/vscode/vs/platform/severityIcon/browser/severityIcon';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { FilterOptions } from './markersFilterOptions.js';
-import { Link } from 'monaco-editor/esm/vs/platform/opener/browser/link.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
+import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
 import { QuickFixAction, QuickFixActionViewItem } from './markersViewActions.js';
-import { DomEmitter } from 'monaco-editor/esm/vs/base/browser/event.js';
+import { DomEmitter } from 'vscode/vscode/vs/base/browser/event';
 import Messages from './messages.js';
-import { isUndefinedOrNull } from 'monaco-editor/esm/vs/base/common/types.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { unsupportedSchemas } from 'monaco-editor/esm/vs/platform/markers/common/markerService.js';
-import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
+import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 var MarkerSeverityColumnRenderer_1, MarkerCodeColumnRenderer_1, MarkerFileColumnRenderer_1;
-const $ = dom.$;
+const $ = $$1;
 let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
     static { MarkerSeverityColumnRenderer_1 = this; }
     static { this.TEMPLATE_ID = 'severity'; }
@@ -33,9 +33,9 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
         this.templateId = MarkerSeverityColumnRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
-        const severityColumn = dom.append(container, $('.severity'));
-        const icon = dom.append(severityColumn, $(''));
-        const actionBarColumn = dom.append(container, $('.actions'));
+        const severityColumn = append(container, $('.severity'));
+        const icon = append(severityColumn, $(''));
+        const actionBarColumn = append(container, $('.actions'));
         const actionBar = ( new ActionBar(actionBarColumn, {
             actionViewItemProvider: (action) => action.id === QuickFixAction.ID ? this.instantiationService.createInstance(QuickFixActionViewItem, action) : undefined,
             animated: false
@@ -45,7 +45,7 @@ let MarkerSeverityColumnRenderer = class MarkerSeverityColumnRenderer {
     renderElement(element, index, templateData, height) {
         const toggleQuickFix = (enabled) => {
             if (!isUndefinedOrNull(enabled)) {
-                const container = dom.findParentWithClass(templateData.icon, 'monaco-table-td');
+                const container = findParentWithClass(templateData.icon, 'monaco-table-td');
                 container.classList.toggle('quickFix', enabled);
             }
         };
@@ -79,7 +79,7 @@ let MarkerCodeColumnRenderer = class MarkerCodeColumnRenderer {
         this.templateId = MarkerCodeColumnRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
-        const codeColumn = dom.append(container, $('.code'));
+        const codeColumn = append(container, $('.code'));
         const sourceLabel = ( new HighlightedLabel(codeColumn));
         sourceLabel.element.classList.add('source-label');
         const codeLabel = ( new HighlightedLabel(codeColumn));
@@ -126,7 +126,7 @@ class MarkerMessageColumnRenderer {
     }
     static { this.TEMPLATE_ID = 'message'; }
     renderTemplate(container) {
-        const columnElement = dom.append(container, $('.message'));
+        const columnElement = append(container, $('.message'));
         const highlightedLabel = ( new HighlightedLabel(columnElement));
         return { columnElement, highlightedLabel };
     }
@@ -144,7 +144,7 @@ let MarkerFileColumnRenderer = class MarkerFileColumnRenderer {
         this.templateId = MarkerFileColumnRenderer_1.TEMPLATE_ID;
     }
     renderTemplate(container) {
-        const columnElement = dom.append(container, $('.file'));
+        const columnElement = append(container, $('.file'));
         const fileLabel = ( new HighlightedLabel(columnElement));
         fileLabel.element.classList.add('file-label');
         const positionLabel = ( new HighlightedLabel(columnElement));
@@ -168,7 +168,7 @@ class MarkerOwnerColumnRenderer {
     }
     static { this.TEMPLATE_ID = 'owner'; }
     renderTemplate(container) {
-        const columnElement = dom.append(container, $('.owner'));
+        const columnElement = append(container, $('.owner'));
         const highlightedLabel = ( new HighlightedLabel(columnElement));
         return { columnElement, highlightedLabel };
     }
@@ -265,7 +265,7 @@ let MarkersTable = class MarkersTable extends Disposable {
         ], options);
         const list = this.table.domNode.querySelector('.monaco-list-rows');
         const onRowHover = Event.chain(this._register(( new DomEmitter(list, 'mouseover'))).event, $ => ( ( $.map(
-            e => dom.findParentWithClass(e.target, 'monaco-list-row', 'monaco-list-rows')
+            e => findParentWithClass(e.target, 'monaco-list-row', 'monaco-list-rows')
         ))
             .filter(((e) => !!e))
             .map(e => parseInt(e.getAttribute('data-index')))));

package/vscode/src/vs/workbench/contrib/markers/browser/markersTreeViewer.js CHANGED Viewed

@@ -1,44 +1,44 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import * as network from 'monaco-editor/esm/vs/base/common/network.js';
-import * as path from 'monaco-editor/esm/vs/base/common/path.js';
-import { CountBadge } from 'monaco-editor/esm/vs/base/browser/ui/countBadge/countBadge.js';
-import { HighlightedLabel } from 'monaco-editor/esm/vs/base/browser/ui/highlightedlabel/highlightedLabel.js';
-import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
+import { append, $, clearNode, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { dirname, basename as basename$1 } from 'vscode/vscode/vs/base/common/path';
+import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
+import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { MarkerSeverity } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { Marker, ResourceMarkers, MarkerTableItem, RelatedInformation } from './markersModel.js';
 import Messages from './messages.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { DisposableStore, Disposable, toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { DisposableStore, Disposable, toDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
 import { QuickFixAction, QuickFixActionViewItem } from './markersViewActions.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { dirname, basename, isEqual } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { dirname as dirname$1, basename, isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { FilterOptions } from './markersFilterOptions.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { isUndefinedOrNull } from 'monaco-editor/esm/vs/base/common/types.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { createCancelablePromise, Delayer } from 'monaco-editor/esm/vs/base/common/async.js';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
-import { getCodeActions, applyCodeAction, ApplyCodeActionReason } from 'monaco-editor/esm/vs/editor/contrib/codeAction/browser/codeAction.js';
-import { CodeActionTriggerSource, CodeActionKind } from 'monaco-editor/esm/vs/editor/contrib/codeAction/common/types.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { isUndefinedOrNull } from 'vscode/vscode/vs/base/common/types';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { createCancelablePromise, Delayer } from 'vscode/vscode/vs/base/common/async';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { Range } from 'vscode/vscode/vs/editor/common/core/range';
+import { getCodeActions, applyCodeAction, ApplyCodeActionReason } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeAction';
+import { CodeActionTriggerSource, CodeActionKind } from 'vscode/vscode/vs/editor/contrib/codeAction/common/types';
 import { ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { SeverityIcon } from 'monaco-editor/esm/vs/platform/severityIcon/browser/severityIcon.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { Progress } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
-import { ActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
-import { Link } from 'monaco-editor/esm/vs/platform/opener/browser/link.js';
-import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { SeverityIcon } from 'vscode/vscode/vs/platform/severityIcon/browser/severityIcon';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { Progress } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
+import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
+import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
-import { unsupportedSchemas } from 'monaco-editor/esm/vs/platform/markers/common/markerService.js';
-import { defaultCountBadgeStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
-import Severity from 'monaco-editor/esm/vs/base/common/severity.js';
+import { unsupportedSchemas } from 'vscode/vscode/vs/platform/markers/common/markerService';
+import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import Severity from 'vscode/vscode/vs/base/common/severity';
 let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvider {
     constructor(labelService) {
@@ -53,8 +53,8 @@ let MarkersWidgetAccessibilityProvider = class MarkersWidgetAccessibilityProvide
     }
     getAriaLabel(element) {
         if (element instanceof ResourceMarkers) {
-            const path$1 = this.labelService.getUriLabel(element.resource, { relative: true }) || element.resource.fsPath;
-            return Messages.MARKERS_TREE_ARIA_LABEL_RESOURCE(element.markers.length, element.name, path.dirname(path$1));
+            const path = this.labelService.getUriLabel(element.resource, { relative: true }) || element.resource.fsPath;
+            return Messages.MARKERS_TREE_ARIA_LABEL_RESOURCE(element.markers.length, element.name, dirname(path));
         }
         if (element instanceof Marker || element instanceof MarkerTableItem) {
             return Messages.MARKERS_TREE_ARIA_LABEL_MARKER(element);
@@ -104,20 +104,20 @@ let ResourceMarkersRenderer = class ResourceMarkersRenderer {
         onDidChangeRenderNodeCount(this.onDidChangeRenderNodeCount, this, this.disposables);
     }
     renderTemplate(container) {
-        const resourceLabelContainer = dom.append(container, dom.$('.resource-label-container'));
+        const resourceLabelContainer = append(container, $('.resource-label-container'));
         const resourceLabel = this.labels.create(resourceLabelContainer, { supportHighlights: true });
-        const badgeWrapper = dom.append(container, dom.$('.count-badge-wrapper'));
+        const badgeWrapper = append(container, $('.count-badge-wrapper'));
         const count = ( new CountBadge(badgeWrapper, {}, defaultCountBadgeStyles));
         return { count, resourceLabel };
     }
     renderElement(node, _, templateData) {
         const resourceMarkers = node.element;
         const uriMatches = node.filterData && node.filterData.uriMatches || [];
-        if (this.fileService.hasProvider(resourceMarkers.resource) || resourceMarkers.resource.scheme === network.Schemas.untitled) {
+        if (this.fileService.hasProvider(resourceMarkers.resource) || resourceMarkers.resource.scheme === Schemas.untitled) {
             templateData.resourceLabel.setFile(resourceMarkers.resource, { matches: uriMatches });
         }
         else {
-            templateData.resourceLabel.setResource({ name: resourceMarkers.name, description: this.labelService.getUriLabel(dirname(resourceMarkers.resource), { relative: true }), resource: resourceMarkers.resource }, { matches: uriMatches });
+            templateData.resourceLabel.setResource({ name: resourceMarkers.name, description: this.labelService.getUriLabel(dirname$1(resourceMarkers.resource), { relative: true }), resource: resourceMarkers.resource }, { matches: uriMatches });
         }
         this.updateCount(node, templateData);
         const nodeRenders = this.renderedNodes.get(resourceMarkers) ?? [];
@@ -216,23 +216,23 @@ class MarkerWidget extends Disposable {
         this.markersViewModel = markersViewModel;
         this._openerService = _openerService;
         this.disposables = this._register(( new DisposableStore()));
-        this.actionBar = this._register(( new ActionBar(dom.append(parent, dom.$('.actions')), {
+        this.actionBar = this._register(( new ActionBar(append(parent, $('.actions')), {
             actionViewItemProvider: (action) => action.id === QuickFixAction.ID ? _instantiationService.createInstance(QuickFixActionViewItem, action) : undefined
         })));
-        this.iconContainer = dom.append(parent, dom.$(''));
-        this.icon = dom.append(this.iconContainer, dom.$(''));
-        this.messageAndDetailsContainer = dom.append(parent, dom.$('.marker-message-details-container'));
+        this.iconContainer = append(parent, $(''));
+        this.icon = append(this.iconContainer, $(''));
+        this.messageAndDetailsContainer = append(parent, $('.marker-message-details-container'));
     }
     render(element, filterData) {
         this.actionBar.clear();
         this.disposables.clear();
-        dom.clearNode(this.messageAndDetailsContainer);
+        clearNode(this.messageAndDetailsContainer);
         this.iconContainer.className = `marker-icon ${( Severity.toString(MarkerSeverity.toSeverity(element.marker.severity)))}`;
         this.icon.className = `codicon ${SeverityIcon.className(MarkerSeverity.toSeverity(element.marker.severity))}`;
         this.renderQuickfixActionbar(element);
         this.renderMessageAndDetails(element, filterData);
-        this.disposables.add(dom.addDisposableListener(this.parent, dom.EventType.MOUSE_OVER, () => this.markersViewModel.onMarkerMouseHover(element)));
-        this.disposables.add(dom.addDisposableListener(this.parent, dom.EventType.MOUSE_LEAVE, () => this.markersViewModel.onMarkerMouseLeave(element)));
+        this.disposables.add(addDisposableListener(this.parent, EventType.MOUSE_OVER, () => this.markersViewModel.onMarkerMouseHover(element)));
+        this.disposables.add(addDisposableListener(this.parent, EventType.MOUSE_LEAVE, () => this.markersViewModel.onMarkerMouseLeave(element)));
     }
     renderQuickfixActionbar(marker) {
         const viewModel = this.markersViewModel.getViewModel(marker);
@@ -254,7 +254,7 @@ class MarkerWidget extends Disposable {
         }
     }
     renderMultilineActionbar(marker, parent) {
-        const multilineActionbar = this.disposables.add(( new ActionBar(dom.append(parent, dom.$('.multiline-actions')), {
+        const multilineActionbar = this.disposables.add(( new ActionBar(append(parent, $('.multiline-actions')), {
             actionViewItemProvider: (action) => {
                 if (action.id === toggleMultilineAction) {
                     return ( new ToggleMultilineActionViewItem(undefined, action, { icon: true }));
@@ -290,8 +290,8 @@ class MarkerWidget extends Disposable {
         this.messageAndDetailsContainer.title = element.marker.message;
         const lineElements = [];
         for (let index = 0; index < (multiline ? lines.length : 1); index++) {
-            const lineElement = dom.append(this.messageAndDetailsContainer, dom.$('.marker-message-line'));
-            const messageElement = dom.append(lineElement, dom.$('.marker-message'));
+            const lineElement = append(this.messageAndDetailsContainer, $('.marker-message-line'));
+            const messageElement = append(lineElement, $('.marker-message'));
             const highlightedLabel = ( new HighlightedLabel(messageElement));
             highlightedLabel.set(lines[index].length > 1000 ? `${lines[index].substring(0, 1000)}...` : lines[index], lineMatches[index]);
             if (lines[index] === '') {
@@ -305,17 +305,17 @@ class MarkerWidget extends Disposable {
     renderDetails(marker, filterData, parent) {
         parent.classList.add('details-container');
         if (marker.source || marker.code) {
-            const source = ( new HighlightedLabel(dom.append(parent, dom.$('.marker-source'))));
+            const source = ( new HighlightedLabel(append(parent, $('.marker-source'))));
             const sourceMatches = filterData && filterData.sourceMatches || [];
             source.set(marker.source, sourceMatches);
             if (marker.code) {
                 if (typeof marker.code === 'string') {
-                    const code = ( new HighlightedLabel(dom.append(parent, dom.$('.marker-code'))));
+                    const code = ( new HighlightedLabel(append(parent, $('.marker-code'))));
                     const codeMatches = filterData && filterData.codeMatches || [];
                     code.set(marker.code, codeMatches);
                 }
                 else {
-                    const container = dom.$('.marker-code');
+                    const container = $('.marker-code');
                     const code = ( new HighlightedLabel(container));
                     const link = ( marker.code.target.toString(true));
                     this.disposables.add(( new Link(
@@ -329,7 +329,7 @@ class MarkerWidget extends Disposable {
                 }
             }
         }
-        const lnCol = dom.append(parent, dom.$('span.marker-line'));
+        const lnCol = append(parent, $('span.marker-line'));
         lnCol.textContent = Messages.MARKERS_PANEL_AT_LINE_COL_NUMBER(marker.startLineNumber, marker.startColumn);
     }
 }
@@ -340,14 +340,14 @@ let RelatedInformationRenderer = class RelatedInformationRenderer {
     }
     renderTemplate(container) {
         const data = Object.create(null);
-        dom.append(container, dom.$('.actions'));
-        dom.append(container, dom.$('.icon'));
-        data.resourceLabel = ( new HighlightedLabel(dom.append(container, dom.$('.related-info-resource'))));
-        data.lnCol = dom.append(container, dom.$('span.marker-line'));
-        const separator = dom.append(container, dom.$('span.related-info-resource-separator'));
+        append(container, $('.actions'));
+        append(container, $('.icon'));
+        data.resourceLabel = ( new HighlightedLabel(append(container, $('.related-info-resource'))));
+        data.lnCol = append(container, $('span.marker-line'));
+        const separator = append(container, $('span.related-info-resource-separator'));
         separator.textContent = ':';
         separator.style.paddingRight = '4px';
-        data.description = ( new HighlightedLabel(dom.append(container, dom.$('.marker-description'))));
+        data.description = ( new HighlightedLabel(append(container, $('.marker-description'))));
         return data;
     }
     renderElement(node, _, templateData) {
@@ -433,7 +433,7 @@ class Filter {
             return true;
         }
         const uriMatches = FilterOptions._filter(this.options.textFilter.text, basename(relatedInformation.raw.resource));
-        const messageMatches = FilterOptions._messageFilter(this.options.textFilter.text, path.basename(relatedInformation.raw.message));
+        const messageMatches = FilterOptions._messageFilter(this.options.textFilter.text, basename$1(relatedInformation.raw.message));
         const matched = uriMatches || messageMatches;
         if (matched && !this.options.textFilter.negate) {
             return { visibility: true, data: { type: 2 , uriMatches: uriMatches || [], messageMatches: messageMatches || [] } };

package/vscode/src/vs/workbench/contrib/markers/browser/markersView.js CHANGED Viewed

@@ -1,41 +1,41 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/markers.css.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { Separator } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { addDisposableListener, append, $, isActiveElement, clearNode, addStandardDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
+import { Separator } from 'vscode/vscode/vs/base/common/actions';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { MarkersModel, Marker, RelatedInformation, MarkerTableItem, ResourceMarkers, compareMarkersByUri } from './markersModel.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { MarkersFilters } from './markersViewActions.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import Messages from './messages.js';
 import { RangeHighlightDecorations } from 'vscode/vscode/vs/workbench/browser/codeeditor';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
-import { Event, Relay } from 'monaco-editor/esm/vs/base/common/event.js';
-import { WorkbenchObjectTree, IListService } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { Event, Relay } from 'vscode/vscode/vs/base/common/event';
+import { WorkbenchObjectTree, IListService } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { FilterOptions } from './markersFilterOptions.js';
-import { deepClone } from 'monaco-editor/esm/vs/base/common/objects.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { deepClone } from 'vscode/vscode/vs/base/common/objects';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { MarkersViewModel, MarkersWidgetAccessibilityProvider, Filter, VirtualDelegate, ResourceMarkersRenderer, MarkerRenderer, RelatedInformationRenderer } from './markersTreeViewer.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { StandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
-import { MarkerSeverity, IMarkerService } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
+import { MarkerSeverity, IMarkerService } from 'vscode/vscode/vs/platform/markers/common/markers';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { FilterViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { withSelection, IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { ActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
-import { DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { groupBy } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
+import { withSelection, IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { groupBy } from 'vscode/vscode/vs/base/common/arrays';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { ResourceListDnDHandler } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { MarkersTable } from './markersTable.js';
@@ -118,15 +118,15 @@ let MarkersView = class MarkersView extends FilterViewPane {
     renderBody(parent) {
         super.renderBody(parent);
         parent.classList.add('markers-panel');
-        this._register(dom.addDisposableListener(parent, 'keydown', e => {
+        this._register(addDisposableListener(parent, 'keydown', e => {
             if (this.keybindingService.mightProducePrintableCharacter(( new StandardKeyboardEvent(e)))) {
                 this.focusFilter();
             }
         }));
-        const panelContainer = dom.append(parent, dom.$('.markers-panel-container'));
+        const panelContainer = append(parent, $('.markers-panel-container'));
         this.createArialLabelElement(panelContainer);
         this.createMessageBox(panelContainer);
-        this.widgetContainer = dom.append(panelContainer, dom.$('.widget-container'));
+        this.widgetContainer = append(panelContainer, $('.widget-container'));
         this.createWidget(this.widgetContainer);
         this.updateFilter();
         this.renderContent();
@@ -144,7 +144,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
     }
     focus() {
         super.focus();
-        if (dom.isActiveElement(this.widget.getHTMLElement())) {
+        if (isActiveElement(this.widget.getHTMLElement())) {
             return;
         }
         if (this.hasNoProblems()) {
@@ -299,11 +299,11 @@ let MarkersView = class MarkersView extends FilterViewPane {
         return resourceMarkers;
     }
     createMessageBox(parent) {
-        this.messageBoxContainer = dom.append(parent, dom.$('.message-box-container'));
+        this.messageBoxContainer = append(parent, $('.message-box-container'));
         this.messageBoxContainer.setAttribute('aria-labelledby', 'markers-panel-arialabel');
     }
     createArialLabelElement(parent) {
-        this.ariaLabelElement = dom.append(parent, dom.$(''));
+        this.ariaLabelElement = append(parent, $(''));
         this.ariaLabelElement.setAttribute('id', 'markers-panel-arialabel');
     }
     createWidget(parent) {
@@ -331,7 +331,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.widgetDisposables.add(this.widget.onDidChangeSelection(this.onSelected, this));
     }
     createTable(parent) {
-        const table = this.instantiationService.createInstance(MarkersTable, dom.append(parent, dom.$('.markers-table-container')), this.markersViewModel, this.getResourceMarkers(), this.filter.options, {
+        const table = this.instantiationService.createInstance(MarkersTable, append(parent, $('.markers-table-container')), this.markersViewModel, this.getResourceMarkers(), this.filter.options, {
             accessibilityProvider: this.widgetAccessibilityProvider,
             dnd: this.instantiationService.createInstance(ResourceListDnDHandler, (element) => {
                 if (element instanceof MarkerTableItem) {
@@ -355,7 +355,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
             this.instantiationService.createInstance(MarkerRenderer, this.markersViewModel),
             this.instantiationService.createInstance(RelatedInformationRenderer)
         ];
-        const tree = this.instantiationService.createInstance(MarkersTree, 'MarkersView', dom.append(parent, dom.$('.tree-container.show-file-icons')), virtualDelegate, renderers, {
+        const tree = this.instantiationService.createInstance(MarkersTree, 'MarkersView', append(parent, $('.tree-container.show-file-icons')), virtualDelegate, renderers, {
             filter: this.filter,
             accessibilityProvider: this.widgetAccessibilityProvider,
             identityProvider: this.widgetIdentityProvider,
@@ -525,7 +525,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
         if (!this.messageBoxContainer || !this.ariaLabelElement) {
             return;
         }
-        dom.clearNode(this.messageBoxContainer);
+        clearNode(this.messageBoxContainer);
         const { total, filtered } = this.getFilterStats();
         if (filtered === 0) {
             this.messageBoxContainer.style.display = 'block';
@@ -573,19 +573,19 @@ let MarkersView = class MarkersView extends FilterViewPane {
         }
     }
     renderFilteredByFilterMessage(container) {
-        const span1 = dom.append(container, dom.$('span'));
+        const span1 = append(container, $('span'));
         span1.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS;
-        const link = dom.append(container, dom.$('a.messageAction'));
+        const link = append(container, $('a.messageAction'));
         link.textContent = ( localizeWithPath(
             'vs/workbench/contrib/markers/browser/markersView',
             'clearFilter',
             "Clear Filters"
         ));
         link.setAttribute('tabIndex', '0');
-        const span2 = dom.append(container, dom.$('span'));
+        const span2 = append(container, $('span'));
         span2.textContent = '.';
-        dom.addStandardDisposableListener(link, dom.EventType.CLICK, () => this.clearFilters());
-        dom.addStandardDisposableListener(link, dom.EventType.KEY_DOWN, (e) => {
+        addStandardDisposableListener(link, EventType.CLICK, () => this.clearFilters());
+        addStandardDisposableListener(link, EventType.KEY_DOWN, (e) => {
             if (e.equals(3 ) || e.equals(10 )) {
                 this.clearFilters();
                 e.stopPropagation();
@@ -594,12 +594,12 @@ let MarkersView = class MarkersView extends FilterViewPane {
         this.setAriaLabel(Messages.MARKERS_PANEL_NO_PROBLEMS_FILTERS);
     }
     renderNoProblemsMessageForActiveFile(container) {
-        const span = dom.append(container, dom.$('span'));
+        const span = append(container, $('span'));
         span.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT;
         this.setAriaLabel(Messages.MARKERS_PANEL_NO_PROBLEMS_ACTIVE_FILE_BUILT);
     }
     renderNoProblemsMessage(container) {
-        const span = dom.append(container, dom.$('span'));
+        const span = append(container, $('span'));
         span.textContent = Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT;
         this.setAriaLabel(Messages.MARKERS_PANEL_NO_PROBLEMS_BUILT);
     }
@@ -629,7 +629,7 @@ let MarkersView = class MarkersView extends FilterViewPane {
     }
     updateRangeHighlights() {
         this.rangeHighlightDecorations.removeHighlightRange();
-        if (dom.isActiveElement(this.widget.getHTMLElement())) {
+        if (isActiveElement(this.widget.getHTMLElement())) {
             this.highlightCurrentSelectedMarkerRange();
         }
     }

package/vscode/src/vs/workbench/contrib/markers/browser/markersViewActions.js CHANGED Viewed

@@ -1,13 +1,13 @@
 import { __decorate, __param } from '../../../../../../../external/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 { EventHelper, getDomNodePagePosition } from 'vscode/vscode/vs/base/browser/dom';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
 import Messages 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 { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { MarkersContextKeys } from 'vscode/vscode/vs/workbench/contrib/markers/common/markers';
 import './markersViewActions.css.js';
@@ -107,7 +107,7 @@ let QuickFixActionViewItem = class QuickFixActionViewItem extends ActionViewItem
         this.contextMenuService = contextMenuService;
     }
     onClick(event) {
-        dom.EventHelper.stop(event, true);
+        EventHelper.stop(event, true);
         this.showQuickFixes();
     }
     showQuickFixes() {
@@ -117,7 +117,7 @@ let QuickFixActionViewItem = class QuickFixActionViewItem extends ActionViewItem
         if (!this.isEnabled()) {
             return;
         }
-        const elementPosition = dom.getDomNodePagePosition(this.element);
+        const elementPosition = getDomNodePagePosition(this.element);
         const quickFixes = this.action.quickFixes;
         if (quickFixes.length) {
             this.contextMenuService.showContextMenu({

package/vscode/src/vs/workbench/contrib/markers/browser/messages.js CHANGED Viewed

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