@codingame/monaco-vscode-debug-service-override 1.83.1 → 1.83.3-next.0

package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js

@@ -23,7 +23,7 @@ import { autorun } from 'monaco-editor/esm/vs/base/common/observable.js';
 import { findLastIdx } from 'monaco-editor/esm/vs/base/common/arraysFind.js';
 
 class ExpressionContainer {
-    static { this.allValues = ( (new Map())); }
+    static { this.allValues = ( new Map()); }
     static { this.BASE_CHUNK_SIZE = 100; }
     constructor(session, threadId, _reference, id, namedVariables = 0, indexedVariables = 0, memoryReference = undefined, startOfVariables = 0, presentationHint = undefined) {
         this.session = session;
@@ -87,7 +87,7 @@ class ExpressionContainer {
             for (let i = 0; i < numberOfChunks; i++) {
                 const start = (this.startOfVariables || 0) + i * chunkSize;
                 const count = Math.min(chunkSize, this.indexedVariables - i * chunkSize);
-                children.push(( (new Variable(
+                children.push(( new Variable(
                     this.session,
                     this.threadId,
                     this,
@@ -103,7 +103,7 @@ class ExpressionContainer {
                     undefined,
                     true,
                     start
-                ))));
+                )));
             }
             return children;
         }
@@ -128,59 +128,55 @@ class ExpressionContainer {
             if (!response || !response.body || !response.body.variables) {
                 return [];
             }
-            const nameCount = ( (new Map()));
-            const vars = ( (response.body.variables.filter(v => !!v).map((v) => {
+            const nameCount = ( new Map());
+            const vars = ( response.body.variables.filter(v => !!v).map((v) => {
                 if (isString(v.value) && isString(v.name) && typeof v.variablesReference === 'number') {
                     const count = nameCount.get(v.name) || 0;
-                    const idDuplicationIndex = count > 0 ? ( (count.toString())) : '';
+                    const idDuplicationIndex = count > 0 ? ( count.toString()) : '';
                     nameCount.set(v.name, count + 1);
-                    return (
-                         (new Variable(
-                            this.session,
-                            this.threadId,
-                            this,
-                            v.variablesReference,
-                            v.name,
-                            v.evaluateName,
-                            v.value,
-                            v.namedVariables,
-                            v.indexedVariables,
-                            v.memoryReference,
-                            v.presentationHint,
-                            v.type,
-                            v.__vscodeVariableMenuContext,
-                            true,
-                            0,
-                            idDuplicationIndex
-                        ))
-                    );
-                }
-                return (
-                     (new Variable(
+                    return ( new Variable(
                         this.session,
                         this.threadId,
                         this,
+                        v.variablesReference,
+                        v.name,
+                        v.evaluateName,
+                        v.value,
+                        v.namedVariables,
+                        v.indexedVariables,
+                        v.memoryReference,
+                        v.presentationHint,
+                        v.type,
+                        v.__vscodeVariableMenuContext,
+                        true,
                         0,
-                        '',
-                        undefined,
-                         (nls.localize('invalidVariableAttributes', "Invalid variable attributes")),
-                        0,
-                        0,
-                        undefined,
-                        { kind: 'virtual' },
-                        undefined,
-                        undefined,
-                        false
-                    ))
-                );
-            })));
+                        idDuplicationIndex
+                    ));
+                }
+                return ( new Variable(
+                    this.session,
+                    this.threadId,
+                    this,
+                    0,
+                    '',
+                    undefined,
+                    nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'invalidVariableAttributes', "Invalid variable attributes"),
+                    0,
+                    0,
+                    undefined,
+                    { kind: 'virtual' },
+                    undefined,
+                    undefined,
+                    false
+                ));
+            }));
             if (this.session.autoExpandLazyVariables) {
-                await Promise.all(( (vars.map(v => v.presentationHint?.lazy && v.evaluateLazy()))));
+                await Promise.all(( vars.map(v => v.presentationHint?.lazy && v.evaluateLazy())));
             }
             return vars;
         }
         catch (e) {
-            return [( (new Variable(
+            return [( new Variable(
                 this.session,
                 this.threadId,
                 this,
@@ -195,7 +191,7 @@ class ExpressionContainer {
                 undefined,
                 undefined,
                 false
-            )))];
+            ))];
         }
     }
     get getChildrenInChunks() {
@@ -212,7 +208,7 @@ class ExpressionContainer {
     }
     async evaluateExpression(expression, session, stackFrame, context, keepLazyVars = false) {
         if (!session || (!stackFrame && context !== 'repl')) {
-            this.value = context === 'repl' ? ( (nls.localize('startDebugFirst', "Please start a debug session to evaluate expressions"))) : Expression.DEFAULT_VALUE;
+            this.value = context === 'repl' ? nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'startDebugFirst', "Please start a debug session to evaluate expressions") : Expression.DEFAULT_VALUE;
             this.reference = 0;
             return false;
         }
@@ -251,7 +247,7 @@ function handleSetResponse(expression, response) {
     }
 }
 class Expression extends ExpressionContainer {
-    static { this.DEFAULT_VALUE = ( (nls.localize('notAvailable', "not available"))); }
+    static { this.DEFAULT_VALUE = nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'notAvailable', "not available"); }
     constructor(name, id = generateUuid()) {
         super(undefined, undefined, 0, id);
         this.name = name;
@@ -370,36 +366,32 @@ class StackFrame {
                 if (!response || !response.body || !response.body.scopes) {
                     return [];
                 }
-                const usedIds = ( (new Set()));
-                return (
-                     (response.body.scopes.map(rs => {
-                        let id = 0;
-                        do {
-                            id = stringHash(`${rs.name}:${rs.line}:${rs.column}`, id);
-                        } while (( (usedIds.has(id))));
-                        usedIds.add(id);
-                        return (
-                             (new Scope(
-                                this,
-                                id,
-                                rs.name,
-                                rs.variablesReference,
-                                rs.expensive,
-                                rs.namedVariables,
-                                rs.indexedVariables,
-                                rs.line && rs.column && rs.endLine && rs.endColumn ? ( (new Range(rs.line, rs.column, rs.endLine, rs.endColumn))) : undefined
-                            ))
-                        );
-                    }))
-                );
-            }, err => [( (new ErrorScope(this, 0, err.message)))]);
+                const usedIds = ( new Set());
+                return ( response.body.scopes.map(rs => {
+                    let id = 0;
+                    do {
+                        id = stringHash(`${rs.name}:${rs.line}:${rs.column}`, id);
+                    } while (( usedIds.has(id)));
+                    usedIds.add(id);
+                    return ( new Scope(
+                        this,
+                        id,
+                        rs.name,
+                        rs.variablesReference,
+                        rs.expensive,
+                        rs.namedVariables,
+                        rs.indexedVariables,
+                        rs.line && rs.column && rs.endLine && rs.endColumn ? ( new Range(rs.line, rs.column, rs.endLine, rs.endColumn)) : undefined
+                    ));
+                }));
+            }, err => [( new ErrorScope(this, 0, err.message))]);
         }
         return this.scopes;
     }
     async getMostSpecificScopes(range) {
         const scopes = await this.getScopes();
         const nonExpensiveScopes = scopes.filter(s => !s.expensive);
-        const haveRangeInfo = ( (nonExpensiveScopes.some(s => !!s.range)));
+        const haveRangeInfo = ( nonExpensiveScopes.some(s => !!s.range));
         if (!haveRangeInfo) {
             return nonExpensiveScopes;
         }
@@ -473,15 +465,9 @@ class Thread {
     get stateLabel() {
         if (this.stoppedDetails) {
             return this.stoppedDetails.description ||
-                (this.stoppedDetails.reason ? ( (nls.localize(
-                { key: 'pausedOn', comment: ['indicates reason for program being paused'] },
-                "Paused on {0}",
-                this.stoppedDetails.reason
-            ))) : ( (nls.localize('paused', "Paused"))));
+                (this.stoppedDetails.reason ? nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', { key: 'pausedOn', comment: ['indicates reason for program being paused'] }, "Paused on {0}", this.stoppedDetails.reason) : nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'paused', "Paused"));
         }
-        return (
-             (nls.localize({ key: 'running', comment: ['indicates state'] }, "Running"))
-        );
+        return nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', { key: 'running', comment: ['indicates state'] }, "Running");
     }
     async fetchCallStack(levels = 20) {
         if (this.stopped) {
@@ -499,7 +485,7 @@ class Thread {
     }
     async getCallStackImpl(startFrame, levels) {
         try {
-            const tokenSource = ( (new CancellationTokenSource()));
+            const tokenSource = ( new CancellationTokenSource());
             this.callStackCancellationTokens.push(tokenSource);
             const response = await this.session.stackTrace(this.threadId, startFrame, levels, tokenSource.token);
             if (!response || !response.body || tokenSource.token.isCancellationRequested) {
@@ -508,24 +494,10 @@ class Thread {
             if (this.stoppedDetails) {
                 this.stoppedDetails.totalFrames = response.body.totalFrames;
             }
-            return (
-                 (response.body.stackFrames.map((rsf, index) => {
-                    const source = this.session.getSource(rsf.source);
-                    return (
-                         (new StackFrame(
-                            this,
-                            rsf.id,
-                            source,
-                            rsf.name,
-                            rsf.presentationHint,
-                             (new Range(rsf.line, rsf.column, rsf.endLine || rsf.line, rsf.endColumn || rsf.column)),
-                            startFrame + index,
-                            typeof rsf.canRestart === 'boolean' ? rsf.canRestart : true,
-                            rsf.instructionPointerReference
-                        ))
-                    );
-                }))
-            );
+            return ( response.body.stackFrames.map((rsf, index) => {
+                const source = this.session.getSource(rsf.source);
+                return ( new StackFrame(this, rsf.id, source, rsf.name, rsf.presentationHint, ( new Range(rsf.line, rsf.column, rsf.endLine || rsf.line, rsf.endColumn || rsf.column)), startFrame + index, typeof rsf.canRestart === 'boolean' ? rsf.canRestart : true, rsf.instructionPointerReference));
+            }));
         }
         catch (err) {
             if (this.stoppedDetails) {
@@ -572,21 +544,19 @@ class Thread {
     }
 }
 const getUriForDebugMemory = (sessionId, memoryReference, range, displayName = 'memory') => {
-    return (
-         (URI.from({
-            scheme: DEBUG_MEMORY_SCHEME,
-            authority: sessionId,
-            path: '/' + encodeURIComponent(memoryReference) + `/${encodeURIComponent(displayName)}.bin`,
-            query: range ? `?range=${range.fromOffset}:${range.toOffset}` : undefined,
-        }))
-    );
+    return ( URI.from({
+        scheme: DEBUG_MEMORY_SCHEME,
+        authority: sessionId,
+        path: '/' + encodeURIComponent(memoryReference) + `/${encodeURIComponent(displayName)}.bin`,
+        query: range ? `?range=${range.fromOffset}:${range.toOffset}` : undefined,
+    }));
 };
 class MemoryRegion extends Disposable {
     constructor(memoryReference, session) {
         super();
         this.memoryReference = memoryReference;
         this.session = session;
-        this.invalidateEmitter = this._register(( (new Emitter())));
+        this.invalidateEmitter = this._register(( new Emitter()));
         this.onDidInvalidate = this.invalidateEmitter.event;
         this.writable = !!this.session.capabilities.supportsWriteMemoryRequest;
         this._register(session.onDidInvalidateMemory(e => {
@@ -665,7 +635,7 @@ class BaseBreakpoint extends Enablement {
         this.hitCondition = hitCondition;
         this.condition = condition;
         this.logMessage = logMessage;
-        this.sessionData = ( (new Map()));
+        this.sessionData = ( new Map());
         if (enabled === undefined) {
             this.enabled = true;
         }
@@ -678,7 +648,7 @@ class BaseBreakpoint extends Enablement {
             data.sessionId = sessionId;
             this.sessionData.set(sessionId, data);
         }
-        const allData = Array.from(( (this.sessionData.values())));
+        const allData = Array.from(( this.sessionData.values()));
         const verifiedData = distinct(allData.filter(d => d.verified), d => `${d.line}:${d.column}`);
         if (verifiedData.length) {
             this.data = verifiedData.length === 1 ? verifiedData[0] : undefined;
@@ -769,12 +739,7 @@ class Breakpoint extends BaseBreakpoint {
     }
     get message() {
         if (this.textFileService.isDirty(this.uri)) {
-            return (
-                 (nls.localize(
-                    'breakpointDirtydHover',
-                    "Unverified breakpoint. File is modified, please restart debug session."
-                ))
-            );
+            return nls.localizeWithPath('vs/workbench/contrib/debug/common/debugModel', 'breakpointDirtydHover', "Unverified breakpoint. File is modified, please restart debug session.");
         }
         return super.message;
     }
@@ -899,7 +864,7 @@ class ExceptionBreakpoint extends BaseBreakpoint {
         this.description = description;
         this.conditionDescription = conditionDescription;
         this.fallback = fallback;
-        this.supportedSessions = ( (new Set()));
+        this.supportedSessions = ( new Set());
     }
     toJSON() {
         const result = Object.create(null);
@@ -928,7 +893,7 @@ class ExceptionBreakpoint extends BaseBreakpoint {
         return true;
     }
     isSupportedSession(sessionId) {
-        return sessionId ? ( (this.supportedSessions.has(sessionId))) : this.fallback;
+        return sessionId ? ( this.supportedSessions.has(sessionId)) : this.fallback;
     }
     matches(filter) {
         return this.filter === filter.filter && this.label === filter.label && this.supportsCondition === !!filter.supportsCondition && this.conditionDescription === filter.conditionDescription && this.description === filter.description;
@@ -976,11 +941,11 @@ let DebugModel = class DebugModel extends Disposable {
         this.textFileService = textFileService;
         this.uriIdentityService = uriIdentityService;
         this.logService = logService;
-        this.schedulers = ( (new Map()));
+        this.schedulers = ( new Map());
         this.breakpointsActivated = true;
-        this._onDidChangeBreakpoints = this._register(( (new Emitter())));
-        this._onDidChangeCallStack = this._register(( (new Emitter())));
-        this._onDidChangeWatchExpressions = this._register(( (new Emitter())));
+        this._onDidChangeBreakpoints = this._register(( new Emitter()));
+        this._onDidChangeCallStack = this._register(( new Emitter()));
+        this._onDidChangeWatchExpressions = this._register(( new Emitter()));
         this._register(autorun(reader => {
             this.breakpoints = debugStorage.breakpoints.read(reader);
             this.functionBreakpoints = debugStorage.functionBreakpoints.read(reader);
@@ -1018,7 +983,7 @@ let DebugModel = class DebugModel extends Disposable {
             return true;
         });
         let i = 1;
-        while (( (this.sessions.some(s => s.getLabel() === session.getLabel())))) {
+        while (( this.sessions.some(s => s.getLabel() === session.getLabel()))) {
             session.setName(`${session.configuration.name} ${++i}`);
         }
         let index = -1;
@@ -1079,13 +1044,13 @@ let DebugModel = class DebugModel extends Disposable {
     refreshTopOfCallstack(thread) {
         if (thread.session.capabilities.supportsDelayedStackTraceLoading) {
             let topCallStack = Promise.resolve();
-            const wholeCallStack = ( (new Promise((c, e) => {
+            const wholeCallStack = ( new Promise((c, e) => {
                 topCallStack = thread.fetchCallStack(1).then(() => {
-                    if (!( (this.schedulers.has(thread.getId())))) {
-                        const deferred = ( (new DeferredPromise()));
+                    if (!( this.schedulers.has(thread.getId()))) {
+                        const deferred = ( new DeferredPromise());
                         this.schedulers.set(thread.getId(), {
                             completeDeferred: deferred,
-                            scheduler: ( (new RunOnceScheduler(() => {
+                            scheduler: ( new RunOnceScheduler(() => {
                                 thread.fetchCallStack(19).then(() => {
                                     const stale = thread.getStaleCallStack();
                                     const current = thread.getCallStack();
@@ -1100,7 +1065,7 @@ let DebugModel = class DebugModel extends Disposable {
                                     deferred.complete();
                                     this.schedulers.delete(thread.getId());
                                 });
-                            }, 420)))
+                            }, 420))
                         });
                     }
                     const entry = this.schedulers.get(thread.getId());
@@ -1108,7 +1073,7 @@ let DebugModel = class DebugModel extends Disposable {
                     entry.completeDeferred.p.then(c, e);
                     this._onDidChangeCallStack.fire();
                 });
-            })));
+            }));
             return { topCallStack, wholeCallStack };
         }
         const wholeCallStack = thread.fetchCallStack();
@@ -1119,10 +1084,10 @@ let DebugModel = class DebugModel extends Disposable {
             const uriStr = filter.uri?.toString();
             const originalUriStr = filter.originalUri?.toString();
             return this.breakpoints.filter(bp => {
-                if (uriStr && ( (bp.uri.toString())) !== uriStr) {
+                if (uriStr && ( bp.uri.toString()) !== uriStr) {
                     return false;
                 }
-                if (originalUriStr && ( (bp.originalUri.toString())) !== originalUriStr) {
+                if (originalUriStr && ( bp.originalUri.toString()) !== originalUriStr) {
                     return false;
                 }
                 if (filter.lineNumber && bp.lineNumber !== filter.lineNumber) {
@@ -1161,7 +1126,7 @@ let DebugModel = class DebugModel extends Disposable {
                 let ebp = this.exceptionBreakpoints.filter((exbp) => exbp.matches(d)).pop();
                 if (!ebp) {
                     didChangeBreakpoints = true;
-                    ebp = ( (new ExceptionBreakpoint(
+                    ebp = ( new ExceptionBreakpoint(
                         d.filter,
                         d.label,
                         !!d.default,
@@ -1169,7 +1134,7 @@ let DebugModel = class DebugModel extends Disposable {
                         undefined ,
                         d.description,
                         d.conditionDescription
-                    )));
+                    ));
                     this.exceptionBreakpoints.push(ebp);
                 }
                 ebp.setSupportedSession(sessionId, true);
@@ -1197,7 +1162,7 @@ let DebugModel = class DebugModel extends Disposable {
         this._onDidChangeBreakpoints.fire(undefined);
     }
     addBreakpoints(uri, rawData, fireEvent = true) {
-        const newBreakpoints = ( (rawData.map(rawBp => ( (new Breakpoint(
+        const newBreakpoints = ( rawData.map(rawBp => ( new Breakpoint(
             uri,
             rawBp.lineNumber,
             rawBp.column,
@@ -1210,7 +1175,7 @@ let DebugModel = class DebugModel extends Disposable {
             this.uriIdentityService,
             this.logService,
             rawBp.id
-        ))))));
+        ))));
         this.breakpoints = this.breakpoints.concat(newBreakpoints);
         this.breakpointsActivated = true;
         this.sortAndDeDup();
@@ -1220,7 +1185,7 @@ let DebugModel = class DebugModel extends Disposable {
         return newBreakpoints;
     }
     removeBreakpoints(toRemove) {
-        this.breakpoints = this.breakpoints.filter(bp => !( (toRemove.some(toRemove => toRemove.getId() === bp.getId()))));
+        this.breakpoints = this.breakpoints.filter(bp => !( toRemove.some(toRemove => toRemove.getId() === bp.getId())));
         this._onDidChangeBreakpoints.fire({ removed: toRemove, sessionOnly: false });
     }
     updateBreakpoints(data) {
@@ -1304,7 +1269,7 @@ let DebugModel = class DebugModel extends Disposable {
     }
     sortAndDeDup() {
         this.breakpoints = this.breakpoints.sort((first, second) => {
-            if (( (first.uri.toString())) !== ( (second.uri.toString()))) {
+            if (( first.uri.toString()) !== ( second.uri.toString())) {
                 return resources.basenameOrAuthority(first.uri).localeCompare(resources.basenameOrAuthority(second.uri));
             }
             if (first.lineNumber === second.lineNumber) {
@@ -1315,7 +1280,7 @@ let DebugModel = class DebugModel extends Disposable {
             }
             return first.lineNumber - second.lineNumber;
         });
-        this.breakpoints = distinct(this.breakpoints, bp => `${( ( bp.uri.toString()))}:${bp.lineNumber}:${bp.column}`);
+        this.breakpoints = distinct(this.breakpoints, bp => `${( bp.uri.toString())}:${bp.lineNumber}:${bp.column}`);
     }
     setEnablement(element, enable) {
         if (element instanceof Breakpoint || element instanceof FunctionBreakpoint || element instanceof ExceptionBreakpoint || element instanceof DataBreakpoint || element instanceof InstructionBreakpoint) {
@@ -1362,7 +1327,7 @@ let DebugModel = class DebugModel extends Disposable {
         this._onDidChangeBreakpoints.fire({ changed: changed, sessionOnly: false });
     }
     addFunctionBreakpoint(functionName, id) {
-        const newFunctionBreakpoint = ( (new FunctionBreakpoint(functionName, true, undefined, undefined, undefined, id)));
+        const newFunctionBreakpoint = ( new FunctionBreakpoint(functionName, true, undefined, undefined, undefined, id));
         this.functionBreakpoints.push(newFunctionBreakpoint);
         this._onDidChangeBreakpoints.fire({ added: [newFunctionBreakpoint], sessionOnly: false });
         return newFunctionBreakpoint;
@@ -1395,7 +1360,7 @@ let DebugModel = class DebugModel extends Disposable {
         this._onDidChangeBreakpoints.fire({ removed, sessionOnly: false });
     }
     addDataBreakpoint(label, dataId, canPersist, accessTypes, accessType) {
-        const newDataBreakpoint = ( (new DataBreakpoint(
+        const newDataBreakpoint = ( new DataBreakpoint(
             label,
             dataId,
             canPersist,
@@ -1405,7 +1370,7 @@ let DebugModel = class DebugModel extends Disposable {
             undefined,
             accessTypes,
             accessType
-        )));
+        ));
         this.dataBreakpoints.push(newDataBreakpoint);
         this._onDidChangeBreakpoints.fire({ added: [newDataBreakpoint], sessionOnly: false });
     }
@@ -1422,7 +1387,7 @@ let DebugModel = class DebugModel extends Disposable {
         this._onDidChangeBreakpoints.fire({ removed, sessionOnly: false });
     }
     addInstructionBreakpoint(instructionReference, offset, address, condition, hitCondition) {
-        const newInstructionBreakpoint = ( (new InstructionBreakpoint(
+        const newInstructionBreakpoint = ( new InstructionBreakpoint(
             instructionReference,
             offset,
             false,
@@ -1431,7 +1396,7 @@ let DebugModel = class DebugModel extends Disposable {
             condition,
             undefined,
             address
-        )));
+        ));
         this.instructionBreakpoints.push(newInstructionBreakpoint);
         this._onDidChangeBreakpoints.fire({ added: [newInstructionBreakpoint], sessionOnly: true });
     }
@@ -1456,7 +1421,7 @@ let DebugModel = class DebugModel extends Disposable {
         return this.watchExpressions;
     }
     addWatchExpression(name) {
-        const we = ( (new Expression(name || '')));
+        const we = ( new Expression(name || ''));
         this.watchExpressions.push(we);
         this._onDidChangeWatchExpressions.fire(we);
         return we;
@@ -1490,10 +1455,10 @@ let DebugModel = class DebugModel extends Disposable {
         this._onDidChangeCallStack.fire(undefined);
     }
 };
-DebugModel = ( (__decorate([
-    ( (__param(1, ITextFileService))),
-    ( (__param(2, IUriIdentityService))),
-    ( (__param(3, ILogService)))
-], DebugModel)));
+DebugModel = ( __decorate([
+    ( __param(1, ITextFileService)),
+    ( __param(2, IUriIdentityService)),
+    ( __param(3, ILogService))
+], DebugModel));
 
 export { BaseBreakpoint, Breakpoint, DataBreakpoint, DebugModel, Enablement, ErrorScope, ExceptionBreakpoint, Expression, ExpressionContainer, FunctionBreakpoint, InstructionBreakpoint, MemoryRegion, Scope, StackFrame, Thread, ThreadAndSessionIds, Variable, getUriForDebugMemory };