@codingame/monaco-vscode-api 7.1.0 → 7.1.1

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

@@ -6,7 +6,7 @@ import { decodeBase64, VSBuffer, encodeBase64 } from '../../../../base/common/bu
 import { CancellationTokenSource } from '../../../../base/common/cancellation.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { stringHash } from '../../../../base/common/hash.js';
-import { Disposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
 import { mixin } from '../../../../base/common/objects.js';
 import '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
@@ -16,14 +16,13 @@ import { isString, isUndefinedOrNull } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
 import { Range } from '../../../../editor/common/core/range.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.service.js';
 import { DebugTreeItemCollapsibleState, DEBUG_MEMORY_SCHEME, DataBreakpointSetType, isFrameDeemphasized, State, MemoryRangeType } from './debug.js';
 import { getUriFromSource, UNKNOWN_SOURCE_LABEL } from './debugSource.js';
 import { DisassemblyViewInput } from './disassemblyViewInput.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
-const _moduleId = "vs/workbench/contrib/debug/common/debugModel";
 class ExpressionContainer {
     static { this.allValues = ( (new Map())); }
     static { this.BASE_CHUNK_SIZE = 100; }
@@ -158,7 +157,7 @@ class ExpressionContainer {
                     );
                 }
                 return (
-                     (new Variable(this.session, this.threadId, this, 0, '', undefined, ( localizeWithPath(_moduleId, 0, "Invalid variable attributes")), 0, 0, undefined, { kind: 'virtual' }, undefined, undefined, false))
+                     (new Variable(this.session, this.threadId, this, 0, '', undefined, ( localize(5816, "Invalid variable attributes")), 0, 0, undefined, { kind: 'virtual' }, undefined, undefined, false))
                 );
             })));
             if (this.session.autoExpandLazyVariables) {
@@ -199,7 +198,7 @@ class ExpressionContainer {
     }
     async evaluateExpression(expression, session, stackFrame, context, keepLazyVars = false, location) {
         if (!session || (!stackFrame && context !== 'repl')) {
-            this.value = context === 'repl' ? ( localizeWithPath(_moduleId, 1, "Please start a debug session to evaluate expressions")) : Expression.DEFAULT_VALUE;
+            this.value = context === 'repl' ? ( localize(5817, "Please start a debug session to evaluate expressions")) : Expression.DEFAULT_VALUE;
             this.reference = 0;
             return false;
         }
@@ -275,10 +274,12 @@ class VisualizedExpression {
     }
 }
 class Expression extends ExpressionContainer {
-    static { this.DEFAULT_VALUE = ( localizeWithPath(_moduleId, 2, "not available")); }
+    static { this.DEFAULT_VALUE = ( localize(5818, "not available")); }
     constructor(name, id = generateUuid()) {
         super(undefined, undefined, 0, id);
         this.name = name;
+        this._onDidChangeValue = ( (new Emitter()));
+        this.onDidChangeValue = this._onDidChangeValue.event;
         this.available = false;
         if (name) {
             this.value = Expression.DEFAULT_VALUE;
@@ -286,6 +287,9 @@ class Expression extends ExpressionContainer {
     }
     async evaluate(session, stackFrame, context, keepLazyVars, location) {
         this.available = await this.evaluateExpression(this.name, session, stackFrame, context, keepLazyVars, location);
+        if (this.valueChanged) {
+            this._onDidChangeValue.fire(this);
+        }
     }
     toString() {
         return `${this.name}\n${this.value}`;
@@ -502,9 +506,9 @@ class Thread {
     get stateLabel() {
         if (this.stoppedDetails) {
             return this.stoppedDetails.description ||
-                (this.stoppedDetails.reason ? ( localizeWithPath(_moduleId, 3, "Paused on {0}", this.stoppedDetails.reason)) : ( localizeWithPath(_moduleId, 4, "Paused")));
+                (this.stoppedDetails.reason ? ( localize(5819, "Paused on {0}", this.stoppedDetails.reason)) : ( localize(5820, "Paused")));
         }
-        return ( localizeWithPath(_moduleId, 5, "Running"));
+        return ( localize(5821, "Running"));
     }
     async fetchCallStack(levels = 20) {
         if (this.stopped) {
@@ -810,9 +814,8 @@ class Breakpoint extends BaseBreakpoint {
     }
     get message() {
         if (this.textFileService.isDirty(this.uri)) {
-            return ( localizeWithPath(
-                _moduleId,
-                6,
+            return ( localize(
+                5822,
                 "Unverified breakpoint. File is modified, please restart debug session."
             ));
         }
@@ -1096,7 +1099,9 @@ let DebugModel = class DebugModel extends Disposable {
         this._onDidChangeBreakpoints = this._register(( (new Emitter())));
         this._onDidChangeCallStack = this._register(( (new Emitter())));
         this._onDidChangeWatchExpressions = this._register(( (new Emitter())));
+        this._onDidChangeWatchExpressionValue = this._register(( (new Emitter())));
         this._breakpointModes = ( (new Map()));
+        this.watchExpressionChangeListeners = this._register(( (new DisposableMap())));
         this._register(autorun(reader => {
             this.breakpoints = debugStorage.breakpoints.read(reader);
             this.functionBreakpoints = debugStorage.functionBreakpoints.read(reader);
@@ -1110,6 +1115,9 @@ let DebugModel = class DebugModel extends Disposable {
         }));
         this.instructionBreakpoints = [];
         this.sessions = [];
+        for (const we of this.watchExpressions) {
+            this.watchExpressionChangeListeners.set(we.getId(), we.onDidChangeValue((e) => this._onDidChangeWatchExpressionValue.fire(e)));
+        }
     }
     getId() {
         return 'root';
@@ -1158,6 +1166,9 @@ let DebugModel = class DebugModel extends Disposable {
     get onDidChangeWatchExpressions() {
         return this._onDidChangeWatchExpressions.event;
     }
+    get onDidChangeWatchExpressionValue() {
+        return this._onDidChangeWatchExpressionValue.event;
+    }
     rawUpdate(data) {
         const session = this.sessions.find(p => p.getId() === data.sessionId);
         if (session) {
@@ -1606,6 +1617,7 @@ let DebugModel = class DebugModel extends Disposable {
     }
     addWatchExpression(name) {
         const we = ( (new Expression(name || '')));
+        this.watchExpressionChangeListeners.set(we.getId(), we.onDidChangeValue((e) => this._onDidChangeWatchExpressionValue.fire(e)));
         this.watchExpressions.push(we);
         this._onDidChangeWatchExpressions.fire(we);
         return we;
@@ -1620,6 +1632,11 @@ let DebugModel = class DebugModel extends Disposable {
     removeWatchExpressions(id = null) {
         this.watchExpressions = id ? this.watchExpressions.filter(we => we.getId() !== id) : [];
         this._onDidChangeWatchExpressions.fire(undefined);
+        if (!id) {
+            this.watchExpressionChangeListeners.clearAndDisposeAll();
+            return;
+        }
+        this.watchExpressionChangeListeners.deleteAndDispose(id);
     }
     moveWatchExpression(id, position) {
         const we = this.watchExpressions.find(we => we.getId() === id);

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { URI } from '../../../../base/common/uri.js';
 import { normalize, isAbsolute } from '../../../../base/common/path.js';
 import { basenameOrAuthority } from '../../../../base/common/resources.js';
@@ -7,8 +7,7 @@ import { SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editor
 import { Schemas } from '../../../../base/common/network.js';
 import { isUri } from './debugUtils.js';
 import { TextEditorSelectionRevealType } from '../../../../platform/editor/common/editor.js';
-const _moduleId = "vs/workbench/contrib/debug/common/debugSource";
-const UNKNOWN_SOURCE_LABEL = ( localizeWithPath(_moduleId, 0, "Unknown Source"));
+const UNKNOWN_SOURCE_LABEL = ( localize(5815, "Unknown Source"));
 class Source {
     constructor(raw_, sessionId, uriIdentityService, logService) {
         let path;

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

@@ -57,7 +57,7 @@ function getExactExpressionStartAndEnd(lineContent, looseStart, looseEnd) {
         }
     }
     if (matchingExpression) {
-        const subExpression = /\w+/g;
+        const subExpression = /(\w|\p{L})+/gu;
         let subExpressionResult = null;
         while (subExpressionResult = subExpression.exec(matchingExpression)) {
             const subEnd = subExpressionResult.index + 1 + startOffset + subExpressionResult[0].length;

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

@@ -1,9 +1,8 @@
 import { EditorInput } from '../../../common/editor/editorInput.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const _moduleId = "vs/workbench/contrib/debug/common/disassemblyViewInput";
-const DisassemblyEditorIcon = registerIcon('disassembly-editor-label-icon', Codicon.debug, ( localizeWithPath(_moduleId, 0, 'Icon of the disassembly editor label.')));
+const DisassemblyEditorIcon = registerIcon('disassembly-editor-label-icon', Codicon.debug, ( localize(5823, 'Icon of the disassembly editor label.')));
 class DisassemblyViewInput extends EditorInput {
     constructor() {
         super(...arguments);
@@ -20,7 +19,7 @@ class DisassemblyViewInput extends EditorInput {
         return DisassemblyViewInput._instance;
     }
     getName() {
-        return ( localizeWithPath(_moduleId, 1, "Disassembly"));
+        return ( localize(5824, "Disassembly"));
     }
     getIcon() {
         return DisassemblyEditorIcon;

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

@@ -1,4 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { matchesFuzzy } from '../../../../base/common/filters.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { IDebugService } from './debug.service.js';
@@ -9,7 +9,6 @@ import { ILanguageService } from '../../../../editor/common/languages/language.j
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { dirname } from '../../../../base/common/resources.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
-const _moduleId = "vs/workbench/contrib/debug/common/loadedScriptsPicker";
 async function showLoadedScriptMenu(accessor) {
     const quickInputService = accessor.get(IQuickInputService);
     const debugService = accessor.get(IDebugService);
@@ -22,7 +21,7 @@ async function showLoadedScriptMenu(accessor) {
     const quickPick = quickInputService.createQuickPick();
     localDisposableStore.add(quickPick);
     quickPick.matchOnLabel = quickPick.matchOnDescription = quickPick.matchOnDetail = quickPick.sortByLabel = false;
-    quickPick.placeholder = ( localizeWithPath(_moduleId, 0, "Search loaded scripts by name"));
+    quickPick.placeholder = ( localize(10217, "Search loaded scripts by name"));
     quickPick.items = await _getPicks(quickPick.value, sessions, editorService, modelService, languageService, labelService);
     localDisposableStore.add(quickPick.onDidChangeValue(async () => {
         quickPick.items = await _getPicks(quickPick.value, sessions, editorService, modelService, languageService, labelService);

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

@@ -2,9 +2,8 @@ import { Emitter } from '../../../../base/common/event.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { isObject, isString } from '../../../../base/common/types.js';
 import { generateUuid } from '../../../../base/common/uuid.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ExpressionContainer } from './debugModel.js';
-const _moduleId = "vs/workbench/contrib/debug/common/replModel";
 const MAX_REPL_LENGTH = 10000;
 let topReplElementCounter = 0;
 const getUniqueId = () => `topReplElement:${topReplElementCounter++}`;
@@ -225,7 +224,7 @@ class ReplModel {
         const clearAnsiIndex = output.lastIndexOf(clearAnsiSequence);
         if (clearAnsiIndex !== -1) {
             this.removeReplExpressions();
-            this.appendToRepl(session, { output: ( localizeWithPath(_moduleId, 0, "Console was cleared")), sev: Severity$1.Ignore });
+            this.appendToRepl(session, { output: ( localize(10223, "Console was cleared")), sev: Severity$1.Ignore });
             output = output.substring(clearAnsiIndex + clearAnsiSequence.length);
         }
         if (expression) {
@@ -243,7 +242,7 @@ class ReplModel {
             }
             if (!previousElement.value.endsWith('\n') && !previousElement.value.endsWith('\r\n') && previousElement.count === 1) {
                 this.replElements[this.replElements.length - 1] = ( (new ReplOutputElement(session, getUniqueId(), previousElement.value + output, sev, source)));
-                this._onDidChangeElements.fire();
+                this._onDidChangeElements.fire(undefined);
                 return;
             }
         }
@@ -271,12 +270,12 @@ class ReplModel {
                 this.replElements.splice(0, this.replElements.length - MAX_REPL_LENGTH);
             }
         }
-        this._onDidChangeElements.fire();
+        this._onDidChangeElements.fire(newElement);
     }
     removeReplExpressions() {
         if (this.replElements.length > 0) {
             this.replElements = [];
-            this._onDidChangeElements.fire();
+            this._onDidChangeElements.fire(undefined);
         }
     }
     clone() {