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

package/debug.js

@@ -1,8 +1,8 @@
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { DebugService } from './vscode/src/vs/workbench/contrib/debug/browser/debugService.js';
-import { LanguageFeaturesService } from './vscode/src/vs/editor/common/services/languageFeaturesService.js';
-import { ILanguageFeaturesService } from 'monaco-editor/esm/vs/editor/common/services/languageFeatures.js';
+import { LanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeaturesService';
+import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { ConfigurationResolverService } from './vscode/src/vs/workbench/services/configurationResolver/browser/configurationResolverService.js';
 import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver';
 import { IExtensionHostDebugService } from 'vscode/vscode/vs/platform/debug/common/extensionHostDebug';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-debug-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,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
-    "monaco-editor": "0.45.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.85.6"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
+    "vscode-marked": "npm:marked@=3.0.2",
+    "@codingame/monaco-vscode-layout-service-override": "2.0.0-v2.1"
   }
 }

package/vscode/src/vs/platform/debug/common/extensionHostDebugIpc.js

@@ -1,5 +1,5 @@
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 
 class ExtensionHostDebugBroadcastChannel {
     constructor() {

package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js

@@ -1,16 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { HighlightedLabel } from 'monaco-editor/esm/vs/base/browser/ui/highlightedlabel/highlightedLabel.js';
-import { InputBox } from 'monaco-editor/esm/vs/base/browser/ui/inputbox/inputBox.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
-import { createMatches } from 'monaco-editor/esm/vs/base/common/filters.js';
-import { createSingleCallFunction } from 'monaco-editor/esm/vs/base/common/functional.js';
-import { DisposableStore, dispose, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { IContextViewService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { defaultInputBoxStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+import { append, addDisposableListener, EventType, clearNode, addStandardDisposableListener, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { InputBox } from 'vscode/vscode/vs/base/browser/ui/inputbox/inputBox';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
+import { createMatches } from 'vscode/vscode/vs/base/common/filters';
+import { createSingleCallFunction } from 'vscode/vscode/vs/base/common/functional';
+import { DisposableStore, dispose, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { defaultInputBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { Expression, Variable, ExpressionContainer } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { ReplEvaluationResult } from '../common/replModel.js';
@@ -18,7 +18,7 @@ import { ReplEvaluationResult } from '../common/replModel.js';
 const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
 const booleanRegex = /^(true|false)$/i;
 const stringRegex = /^(['"]).*\1$/;
-const $ = dom.$;
+const $ = $$1;
 function renderViewTree(container) {
     const treeContainer = $('.');
     treeContainer.classList.add('debug-view-content');
@@ -100,26 +100,26 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         this.contextViewService = contextViewService;
     }
     renderTemplate(container) {
-        const expression = dom.append(container, $('.expression'));
-        const name = dom.append(expression, $('span.name'));
-        const lazyButton = dom.append(expression, $('span.lazy-button'));
+        const expression = append(container, $('.expression'));
+        const name = append(expression, $('span.name'));
+        const lazyButton = append(expression, $('span.lazy-button'));
         lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
         lazyButton.title = ( localizeWithPath(
             'vs/workbench/contrib/debug/browser/baseDebugView',
             'debug.lazyButton.tooltip',
             "Click to expand"
         ));
-        const value = dom.append(expression, $('span.value'));
+        const value = append(expression, $('span.value'));
         const label = ( new HighlightedLabel(name));
-        const inputBoxContainer = dom.append(expression, $('.inputBoxContainer'));
+        const inputBoxContainer = append(expression, $('.inputBoxContainer'));
         const templateDisposable = ( new DisposableStore());
         let actionBar;
         if (this.renderActionBar) {
-            dom.append(expression, $('.span.actionbar-spacer'));
+            append(expression, $('.span.actionbar-spacer'));
             actionBar = templateDisposable.add(( new ActionBar(expression)));
         }
         const template = { expression, name, value, label, inputBoxContainer, actionBar, elementDisposable: [], templateDisposable, lazyButton, currentElement: undefined };
-        templateDisposable.add(dom.addDisposableListener(lazyButton, dom.EventType.CLICK, () => {
+        templateDisposable.add(addDisposableListener(lazyButton, EventType.CLICK, () => {
             if (template.currentElement) {
                 this.debugService.getViewModel().evaluateLazyExpression(template.currentElement);
             }
@@ -144,7 +144,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         nameElement.style.display = 'none';
         valueElement.style.display = 'none';
         inputBoxContainer.style.display = 'initial';
-        dom.clearNode(inputBoxContainer);
+        clearNode(inputBoxContainer);
         const inputBox = ( new InputBox(
             inputBoxContainer,
             this.contextViewService,
@@ -166,7 +166,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         });
         const toDispose = [
             inputBox,
-            dom.addStandardDisposableListener(inputBox.inputElement, dom.EventType.KEY_DOWN, (e) => {
+            addStandardDisposableListener(inputBox.inputElement, EventType.KEY_DOWN, (e) => {
                 const isEscape = e.equals(9 );
                 const isEnter = e.equals(3 );
                 if (isEscape || isEnter) {
@@ -175,10 +175,10 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
                     done(isEnter, true);
                 }
             }),
-            dom.addDisposableListener(inputBox.inputElement, dom.EventType.BLUR, () => {
+            addDisposableListener(inputBox.inputElement, EventType.BLUR, () => {
                 done(true, true);
             }),
-            dom.addDisposableListener(inputBox.inputElement, dom.EventType.CLICK, e => {
+            addDisposableListener(inputBox.inputElement, EventType.CLICK, e => {
                 e.preventDefault();
                 e.stopPropagation();
             })

package/vscode/src/vs/workbench/contrib/debug/browser/callStackView.js

@@ -1,31 +1,31 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { HighlightedLabel } from 'monaco-editor/esm/vs/base/browser/ui/highlightedlabel/highlightedLabel.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
-import { createMatches } from 'monaco-editor/esm/vs/base/common/filters.js';
-import { DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { posix } from 'monaco-editor/esm/vs/base/common/path.js';
-import { commonSuffixLength } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { MenuEntryActionViewItem, SubmenuEntryActionViewItem, createAndFillInContextMenuActions, createAndFillInActionBarActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { MenuItemAction, SubmenuItemAction, MenuId, registerAction2, MenuRegistry, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
-import { WorkbenchCompressibleAsyncDataTree } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { asCssVariable, textLinkForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { append, $ as $$1 } from 'vscode/vscode/vs/base/browser/dom';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { HighlightedLabel } from 'vscode/vscode/vs/base/browser/ui/highlightedlabel/highlightedLabel';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { Event } from 'vscode/vscode/vs/base/common/event';
+import { createMatches } from 'vscode/vscode/vs/base/common/filters';
+import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { posix } from 'vscode/vscode/vs/base/common/path';
+import { commonSuffixLength } from 'vscode/vscode/vs/base/common/strings';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { MenuEntryActionViewItem, SubmenuEntryActionViewItem, createAndFillInContextMenuActions, createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { MenuItemAction, SubmenuItemAction, MenuId, registerAction2, MenuRegistry, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { WorkbenchCompressibleAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { asCssVariable, textLinkForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { renderViewTree } from './baseDebugView.js';
@@ -37,7 +37,7 @@ import { Thread, StackFrame, ThreadAndSessionIds } from 'vscode/vscode/vs/workbe
 import { isSessionAttach } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugUtils';
 
 var SessionsRenderer_1, ThreadsRenderer_1, StackFramesRenderer_1;
-const $ = dom.$;
+const $ = $$1;
 function assignSessionContext(element, context) {
     context.sessionId = element.getId();
     return context;
@@ -168,9 +168,9 @@ let CallStackView = class CallStackView extends ViewPane {
     }
     renderHeaderTitle(container) {
         super.renderHeaderTitle(container, this.options.title);
-        this.stateMessage = dom.append(container, $('span.call-stack-state-message'));
+        this.stateMessage = append(container, $('span.call-stack-state-message'));
         this.stateMessage.hidden = true;
-        this.stateMessageLabel = dom.append(this.stateMessage, $('span.label'));
+        this.stateMessageLabel = append(this.stateMessage, $('span.label'));
     }
     renderBody(container) {
         super.renderBody(container);
@@ -440,10 +440,10 @@ let SessionsRenderer = class SessionsRenderer {
         return SessionsRenderer_1.ID;
     }
     renderTemplate(container) {
-        const session = dom.append(container, $('.session'));
-        dom.append(session, $(ThemeIcon.asCSSSelector(callstackViewSession)));
-        const name = dom.append(session, $('.name'));
-        const stateLabel = dom.append(session, $('span.state.label.monaco-count-badge.long'));
+        const session = append(container, $('.session'));
+        append(session, $(ThemeIcon.asCSSSelector(callstackViewSession)));
+        const name = append(session, $('.name'));
+        const stateLabel = append(session, $('span.state.label.monaco-count-badge.long'));
         const label = ( new HighlightedLabel(name));
         const templateDisposable = ( new DisposableStore());
         const stopActionViewItemDisposables = templateDisposable.add(( new DisposableStore()));
@@ -550,9 +550,9 @@ let ThreadsRenderer = class ThreadsRenderer {
         return ThreadsRenderer_1.ID;
     }
     renderTemplate(container) {
-        const thread = dom.append(container, $('.thread'));
-        const name = dom.append(thread, $('.name'));
-        const stateLabel = dom.append(thread, $('span.state.label.monaco-count-badge.long'));
+        const thread = append(container, $('.thread'));
+        const name = append(thread, $('.name'));
+        const stateLabel = append(thread, $('span.state.label.monaco-count-badge.long'));
         const label = ( new HighlightedLabel(name));
         const templateDisposable = ( new DisposableStore());
         const actionBar = templateDisposable.add(( new ActionBar(thread)));
@@ -610,12 +610,12 @@ let StackFramesRenderer = class StackFramesRenderer {
         return StackFramesRenderer_1.ID;
     }
     renderTemplate(container) {
-        const stackFrame = dom.append(container, $('.stack-frame'));
-        const labelDiv = dom.append(stackFrame, $('span.label.expression'));
-        const file = dom.append(stackFrame, $('.file'));
-        const fileName = dom.append(file, $('span.file-name'));
-        const wrapper = dom.append(file, $('span.line-number-wrapper'));
-        const lineNumber = dom.append(wrapper, $('span.line-number.monaco-count-badge'));
+        const stackFrame = append(container, $('.stack-frame'));
+        const labelDiv = append(stackFrame, $('span.label.expression'));
+        const file = append(stackFrame, $('.file'));
+        const fileName = append(file, $('span.file-name'));
+        const wrapper = append(file, $('span.line-number-wrapper'));
+        const lineNumber = append(wrapper, $('span.line-number.monaco-count-badge'));
         const label = ( new HighlightedLabel(labelDiv));
         const templateDisposable = ( new DisposableStore());
         const actionBar = templateDisposable.add(( new ActionBar(stackFrame)));
@@ -678,7 +678,7 @@ class ErrorsRenderer {
         return ErrorsRenderer.ID;
     }
     renderTemplate(container) {
-        const label = dom.append(container, $('.error'));
+        const label = append(container, $('.error'));
         return { label };
     }
     renderElement(element, index, data) {
@@ -704,7 +704,7 @@ class LoadMoreRenderer {
         return LoadMoreRenderer.ID;
     }
     renderTemplate(container) {
-        const label = dom.append(container, $('.load-all'));
+        const label = append(container, $('.load-all'));
         label.style.color = asCssVariable(textLinkForeground);
         return { label };
     }
@@ -724,7 +724,7 @@ class ShowMoreRenderer {
         return ShowMoreRenderer.ID;
     }
     renderTemplate(container) {
-        const label = dom.append(container, $('.show-more'));
+        const label = append(container, $('.show-more'));
         label.style.color = asCssVariable(textLinkForeground);
         return { label };
     }