@codingame/monaco-vscode-debug-service-override 5.3.0 → 6.0.0

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

@@ -10,23 +10,30 @@ import { onUnexpectedExternalError, illegalArgument } from 'vscode/vscode/vs/bas
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { visit } from 'vscode/vscode/vs/base/common/json';
 import { setProperty } from 'vscode/vscode/vs/base/common/jsonEdit';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { MutableDisposable, DisposableStore, toDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { basename } from 'vscode/vscode/vs/base/common/path';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { noBreakWhitespace, format } from 'vscode/vscode/vs/base/common/strings';
 import { isDefined, assertType } from 'vscode/vscode/vs/base/common/types';
+import { Constants } from 'vscode/vscode/vs/base/common/uint';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { CoreEditingCommands } from 'vscode/vscode/vs/editor/browser/coreCommands';
+import { MouseTargetType } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { DEFAULT_WORD_REGEXP } from 'vscode/vscode/vs/editor/common/core/wordHelper';
+import { ScrollType } from 'vscode/vscode/vs/editor/common/editorCommon';
+import { StandardTokenType } from 'vscode/vscode/vs/editor/common/encodedTokenAttributes';
 import { InjectedTextCursorStops } from 'vscode/vscode/vs/editor/common/model';
 import { ILanguageFeatureDebounceService } from 'vscode/vscode/vs/editor/common/services/languageFeatureDebounce';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { HoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverController';
+import { HoverStartMode, HoverStartSource } from 'vscode/vscode/vs/editor/contrib/hover/browser/hoverOperation';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
@@ -45,9 +52,9 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { DebugHoverWidget } from './debugHover.js';
+import { DebugHoverWidget, ShowDebugHoverResult } from './debugHover.js';
 import { ExceptionWidget } from './exceptionWidget.js';
-import { CONTEXT_EXCEPTION_WIDGET_VISIBLE } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { CONTEXT_EXCEPTION_WIDGET_VISIBLE, State } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
 import { Expression } from 'vscode/vscode/vs/workbench/contrib/debug/common/debugModel';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
@@ -75,7 +82,7 @@ class InlineSegment {
         this.text = text;
     }
 }
-function createInlineValueDecoration(lineNumber, contentText, column = 1073741824 ) {
+function createInlineValueDecoration(lineNumber, contentText, column = Constants.MAX_SAFE_SMALL_INTEGER) {
     if (contentText.length > MAX_INLINE_DECORATOR_LENGTH) {
         contentText = contentText.substring(0, MAX_INLINE_DECORATOR_LENGTH) + '...';
     }
@@ -163,7 +170,7 @@ function getWordToLineNumbersMap(model, lineNumber, result) {
     const lineTokens = model.tokenization.getLineTokens(lineNumber);
     for (let tokenIndex = 0, tokenCount = lineTokens.getCount(); tokenIndex < tokenCount; tokenIndex++) {
         const tokenType = lineTokens.getStandardTokenType(tokenIndex);
-        if (tokenType === 0 ) {
+        if (tokenType === StandardTokenType.Other) {
             DEFAULT_WORD_REGEXP.lastIndex = 0;
             const tokenStartOffset = lineTokens.getStartOffset(tokenIndex);
             const tokenEndOffset = lineTokens.getEndOffset(tokenIndex);
@@ -247,7 +254,7 @@ let DebugEditorContribution = class DebugEditorContribution {
             }
         }));
         this.toDispose.push(this.debugService.onDidChangeState((state) => {
-            if (state !== 2 ) {
+            if (state !== State.Stopped) {
                 this.toggleExceptionWidget();
             }
         }));
@@ -277,7 +284,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         const ownerDocument = this.editor.getContainerDomNode().ownerDocument;
         this.altListener.value = addDisposableListener(ownerDocument, 'keydown', keydownEvent => {
             const standardKeyboardEvent = ( (new StandardKeyboardEvent(keydownEvent)));
-            if (standardKeyboardEvent.keyCode === 6 ) {
+            if (standardKeyboardEvent.keyCode === KeyCode.Alt) {
                 this.altPressed = true;
                 const debugHoverWasVisible = this.hoverWidget.isVisible();
                 this.hoverWidget.hide();
@@ -291,7 +298,7 @@ let DebugEditorContribution = class DebugEditorContribution {
                     if (isKeyboardEvent(keyupEvent)) {
                         standardKeyboardEvent = ( (new StandardKeyboardEvent(keyupEvent)));
                     }
-                    if (!standardKeyboardEvent || standardKeyboardEvent.keyCode === 6 ) {
+                    if (!standardKeyboardEvent || standardKeyboardEvent.keyCode === KeyCode.Alt) {
                         this.altPressed = false;
                         this.preventDefaultEditorHover();
                         listener.dispose();
@@ -307,7 +314,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         const model = this.editor.getModel();
         if (sf && model && this.uriIdentityService.extUri.isEqual(sf.source.uri, model.uri)) {
             const result = await this.hoverWidget.showAt(position, focus);
-            if (result === 1 ) {
+            if (result === ShowDebugHoverResult.NOT_AVAILABLE) {
                 this.showEditorHover(position, focus);
             }
         }
@@ -334,7 +341,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         const hoverController = this.editor.getContribution(HoverController.ID);
         const range = ( (new Range(position.lineNumber, position.column, position.lineNumber, position.column)));
         this.defaultHoverLockout.clear();
-        hoverController?.showContentHover(range, 1 , 0 , focus);
+        hoverController?.showContentHover(range, HoverStartMode.Immediate, HoverStartSource.Mouse, focus);
     }
     async onFocusStackFrame(sf) {
         const model = this.editor.getModel();
@@ -372,19 +379,19 @@ let DebugEditorContribution = class DebugEditorContribution {
     }
     onEditorMouseDown(mouseEvent) {
         this.mouseDown = true;
-        if (mouseEvent.target.type === 9  && mouseEvent.target.detail === DebugHoverWidget.ID) {
+        if (mouseEvent.target.type === MouseTargetType.CONTENT_WIDGET && mouseEvent.target.detail === DebugHoverWidget.ID) {
             return;
         }
         this.hideHoverWidget();
     }
     onEditorMouseMove(mouseEvent) {
-        if (this.debugService.state !== 2 ) {
+        if (this.debugService.state !== State.Stopped) {
             return;
         }
         const target = mouseEvent.target;
         const stopKey = isMacintosh ? 'metaKey' : 'ctrlKey';
         if (!this.altPressed) {
-            if (target.type === 2 ) {
+            if (target.type === MouseTargetType.GUTTER_GLYPH_MARGIN) {
                 this.defaultHoverLockout.clear();
                 this.gutterIsHovered = true;
             }
@@ -393,13 +400,13 @@ let DebugEditorContribution = class DebugEditorContribution {
                 this.updateHoverConfiguration();
             }
         }
-        if (target.type === 9  && target.detail === DebugHoverWidget.ID && !mouseEvent.event[stopKey]) {
+        if (target.type === MouseTargetType.CONTENT_WIDGET && target.detail === DebugHoverWidget.ID && !mouseEvent.event[stopKey]) {
             const sticky = this.editorHoverOptions?.sticky ?? true;
             if (sticky || this.hoverWidget.isShowingComplexValue) {
                 return;
             }
         }
-        if (target.type === 6 ) {
+        if (target.type === MouseTargetType.CONTENT_TEXT) {
             if (target.position && !Position.equals(target.position, this.hoverPosition)) {
                 this.hoverPosition = target.position;
                 this.preventDefaultEditorHover();
@@ -411,8 +418,8 @@ let DebugEditorContribution = class DebugEditorContribution {
         }
     }
     onKeyDown(e) {
-        const stopKey = isMacintosh ? 57  : 5 ;
-        if (e.keyCode !== stopKey && e.keyCode !== 6 ) {
+        const stopKey = isMacintosh ? KeyCode.Meta : KeyCode.Ctrl;
+        if (e.keyCode !== stopKey && e.keyCode !== KeyCode.Alt) {
             this.hideHoverWidget();
         }
     }
@@ -527,6 +534,7 @@ let DebugEditorContribution = class DebugEditorContribution {
         return (
              (new RunOnceScheduler(() => {
                 this.displayedStore.clear();
+                this.oldDecorations.clear();
             }, 100))
         );
     }
@@ -665,9 +673,20 @@ let DebugEditorContribution = class DebugEditorContribution {
             allDecorations = distinct(decorationsPerScope.flat(),
             decoration => `${decoration.range.startLineNumber}:${decoration?.options.after?.content}`);
         }
-        if (!cts.token.isCancellationRequested) {
-            this.oldDecorations.set(allDecorations);
-            this.displayedStore.add(toDisposable(() => this.oldDecorations.clear()));
+        if (cts.token.isCancellationRequested) {
+            return;
+        }
+        let preservePosition;
+        if (this.editor.getOption(EditorOption.wordWrap) !== 'off') {
+            const position = this.editor.getPosition();
+            if (position && ( (this.editor.getVisibleRanges().some(r => r.containsPosition(position))))) {
+                preservePosition = { position, top: this.editor.getTopForPosition(position.lineNumber, position.column) };
+            }
+        }
+        this.oldDecorations.set(allDecorations);
+        if (preservePosition) {
+            const top = this.editor.getTopForPosition(preservePosition.position.lineNumber, preservePosition.position.column);
+            this.editor.setScrollTop(this.editor.getScrollTop() - (preservePosition.top - top), ScrollType.Immediate);
         }
     }
     dispose() {

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

@@ -3,9 +3,13 @@ import { $ as $$1, append, addStandardDisposableListener, isAncestorOfActiveElem
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { ScrollbarVisibility } from 'vscode/vscode/vs/base/common/scrollable';
+import { ContentWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { ModelDecorationOptions } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { ILanguageFeaturesService } from 'vscode/vscode/vs/editor/common/services/languageFeatures';
@@ -39,6 +43,12 @@ import { getEvaluatableExpressionAtPosition } from 'vscode/vscode/vs/workbench/c
 var DebugHoverWidget_1;
 const _moduleId = "vs/workbench/contrib/debug/browser/debugHover";
 const $ = $$1;
+var ShowDebugHoverResult;
+( ((function(ShowDebugHoverResult) {
+    ShowDebugHoverResult[ShowDebugHoverResult["NOT_CHANGED"] = 0] = "NOT_CHANGED";
+    ShowDebugHoverResult[ShowDebugHoverResult["NOT_AVAILABLE"] = 1] = "NOT_AVAILABLE";
+    ShowDebugHoverResult[ShowDebugHoverResult["CANCELLED"] = 2] = "CANCELLED";
+})(ShowDebugHoverResult || (ShowDebugHoverResult = {}))));
 async function doFindExpression(container, namesToFind) {
     if (!container) {
         return null;
@@ -81,7 +91,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.toDispose = [];
         this._isVisible = false;
         this.showAtPosition = null;
-        this.positionPreference = [1 , 2 ];
+        this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
         this.debugHoverComputer = this.instantiationService.createInstance(DebugHoverComputer, this.editor);
     }
     create() {
@@ -116,7 +126,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         this.valueContainer = $('.value');
         this.valueContainer.tabIndex = 0;
         this.valueContainer.setAttribute('role', 'tooltip');
-        this.scrollbar = ( (new DomScrollableElement(this.valueContainer, { horizontal: 2  })));
+        this.scrollbar = ( (new DomScrollableElement(this.valueContainer, { horizontal: ScrollbarVisibility.Hidden })));
         this.domNode.appendChild(this.scrollbar.getDomNode());
         this.toDispose.push(this.scrollbar);
         this.editor.applyFontInfo(this.domNode);
@@ -146,12 +156,12 @@ let DebugHoverWidget = class DebugHoverWidget {
     }
     registerListeners() {
         this.toDispose.push(addStandardDisposableListener(this.domNode, 'keydown', (e) => {
-            if (e.equals(9 )) {
+            if (e.equals(KeyCode.Escape)) {
                 this.hide();
             }
         }));
         this.toDispose.push(this.editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(50 )) {
+            if (e.hasChanged(EditorOption.fontInfo)) {
                 this.editor.applyFontInfo(this.domNode);
             }
         }));
@@ -183,28 +193,28 @@ let DebugHoverWidget = class DebugHoverWidget {
         const session = this.debugService.getViewModel().focusedSession;
         if (!session || !this.editor.hasModel()) {
             this.hide();
-            return 1 ;
+            return ShowDebugHoverResult.NOT_AVAILABLE;
         }
         const result = await this.debugHoverComputer.compute(position, cancellationSource.token);
         if (cancellationSource.token.isCancellationRequested) {
             this.hide();
-            return 2 ;
+            return ShowDebugHoverResult.CANCELLED;
         }
         if (!result.range) {
             this.hide();
-            return 1 ;
+            return ShowDebugHoverResult.NOT_AVAILABLE;
         }
         if (this.isVisible() && !result.rangeChanged) {
-            return 0 ;
+            return ShowDebugHoverResult.NOT_CHANGED;
         }
         const expression = await this.debugHoverComputer.evaluate(session);
         if (cancellationSource.token.isCancellationRequested) {
             this.hide();
-            return 2 ;
+            return ShowDebugHoverResult.CANCELLED;
         }
         if (!expression || (expression instanceof Expression && !expression.available)) {
             this.hide();
-            return 1 ;
+            return ShowDebugHoverResult.NOT_AVAILABLE;
         }
         this.highlightDecorations.set([{
                 range: result.range,
@@ -303,7 +313,7 @@ let DebugHoverWidget = class DebugHoverWidget {
         this._isVisible = false;
         this.highlightDecorations.clear();
         this.editor.layoutContentWidget(this);
-        this.positionPreference = [1 , 2 ];
+        this.positionPreference = [ContentWidgetPositionPreference.ABOVE, ContentWidgetPositionPreference.BELOW];
     }
     getPosition() {
         return this._isVisible ? {
@@ -406,4 +416,4 @@ DebugHoverComputer = ( (__decorate([
     ( (__param(3, ILogService)))
 ], DebugHoverComputer)));
 
-export { DebugHoverWidget, findExpressionInStackFrame };
+export { DebugHoverWidget, ShowDebugHoverResult, findExpressionInStackFrame };

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

@@ -3,8 +3,8 @@ import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { toDisposable, DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 import { assertNever } from 'vscode/vscode/vs/base/common/assert';
-import { FileType, FilePermission, createFileSystemProviderError, FileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
-import { DEBUG_MEMORY_SCHEME } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
+import { FileSystemProviderCapabilities, FileChangeType, FileType, FilePermission, createFileSystemProviderError, FileSystemProviderErrorCode } from 'vscode/vscode/vs/platform/files/common/files';
+import { State, MemoryRangeType, DEBUG_MEMORY_SCHEME } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 
 const rangeRe = /range=([0-9]+):([0-9]+)/;
 class DebugMemoryFileSystemProvider {
@@ -16,8 +16,8 @@ class DebugMemoryFileSystemProvider {
         this.onDidChangeCapabilities = Event.None;
         this.onDidChangeFile = this.changeEmitter.event;
         this.capabilities = 0
-            | 1024
-            | 4 ;
+            | FileSystemProviderCapabilities.PathCaseSensitive
+            | FileSystemProviderCapabilities.FileOpenReadWriteClose;
         debugService.onDidEndSession(({ session }) => {
             for (const [fd, memory] of this.fdMemory) {
                 if (memory.session === session) {
@@ -33,8 +33,8 @@ class DebugMemoryFileSystemProvider {
         const { session, memoryReference, offset } = this.parseUri(resource);
         const disposable = ( new DisposableStore());
         disposable.add(session.onDidChangeState(() => {
-            if (session.state === 3  || session.state === 0 ) {
-                this.changeEmitter.fire([{ type: 2 , resource }]);
+            if (session.state === State.Running || session.state === State.Inactive) {
+                this.changeEmitter.fire([{ type: FileChangeType.DELETED, resource }]);
             }
         }));
         disposable.add(session.onDidInvalidateMemory(e => {
@@ -44,7 +44,7 @@ class DebugMemoryFileSystemProvider {
             if (offset && (e.body.offset >= offset.toOffset || e.body.offset + e.body.count < offset.fromOffset)) {
                 return;
             }
-            this.changeEmitter.fire([{ resource, type: 0  }]);
+            this.changeEmitter.fire([{ resource, type: FileChangeType.UPDATED }]);
         }));
         return disposable;
     }
@@ -122,16 +122,16 @@ class DebugMemoryFileSystemProvider {
         let readSoFar = 0;
         for (const range of ranges) {
             switch (range.type) {
-                case 1 :
+                case MemoryRangeType.Unreadable:
                     return readSoFar;
-                case 2 :
+                case MemoryRangeType.Error:
                     if (readSoFar > 0) {
                         return readSoFar;
                     }
                     else {
                         throw createFileSystemProviderError(range.error, FileSystemProviderErrorCode.Unknown);
                     }
-                case 0 : {
+                case MemoryRangeType.Valid: {
                     const start = Math.max(0, pos - range.offset);
                     const toWrite = range.data.slice(start, Math.min(range.data.byteLength, start + (length - readSoFar)));
                     data.set(toWrite.buffer, offset + readSoFar);

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { ProgressLocation } from 'vscode/vscode/vs/platform/progress/common/progress';
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
@@ -28,7 +29,7 @@ let DebugProgressContribution = class DebugProgressContribution {
                     }
                     const source = debugService.getAdapterManager().getDebuggerLabel(session.configuration.type);
                     progressService.withProgress({
-                        location: 15 ,
+                        location: ProgressLocation.Notification,
                         title: progressStartEvent.body.title,
                         cancellable: progressStartEvent.body.cancellable,
                         source,

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

@@ -3,6 +3,7 @@ import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platf
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { IDebugService } from 'vscode/vscode/vs/workbench/contrib/debug/common/debug.service';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { matchesFuzzy } from 'vscode/vscode/vs/base/common/filters';
@@ -40,7 +41,7 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
                 }
                 picks.push({
                     label: config.name,
-                    description: this.contextService.getWorkbenchState() === 3  ? config.launch.name : '',
+                    description: this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? config.launch.name : '',
                     highlights: { label: highlights },
                     buttons: [{
                             iconClass: ThemeIcon.asClassName(debugConfigure),
@@ -114,12 +115,12 @@ let StartDebugQuickAccessProvider = class StartDebugQuickAccessProvider extends
             picks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 5, "configure")) });
         }
         for (const launch of visibleLaunches) {
-            const label = this.contextService.getWorkbenchState() === 3  ?
+            const label = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ?
                 ( localizeWithPath(_moduleId, 6, "Add Config ({0})...", launch.name)) :
                 ( localizeWithPath(_moduleId, 7, "Add Configuration..."));
             picks.push({
                 label,
-                description: this.contextService.getWorkbenchState() === 3  ? launch.name : '',
+                description: this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE ? launch.name : '',
                 highlights: { label: matchesFuzzy(filter, label, true) ?? undefined },
                 accept: () => this.commandService.executeCommand(ADD_CONFIGURATION_ID, ( (launch.uri.toString())))
             });