@codingame/monaco-vscode-api 6.0.1 → 6.0.2

package/api.js

@@ -29,7 +29,7 @@ function createProxy(key) {
     });
 }
 const api = {
-    version: "1.90.0",
+    version: "1.90.1",
     tasks: createProxy('tasks'),
     notebooks: createProxy('notebooks'),
     scm: createProxy('scm'),

package/missing-services.js

@@ -580,8 +580,8 @@ registerSingleton(IPathService, class PathService {
 registerSingleton(IProductService, class ProductService {
     constructor() {
         this._serviceBrand = undefined;
-        this.version = "1.90.0";
-        this.commit = "df33c94d9816c7c14a48f62b484951dbbd816c02";
+        this.version = "1.90.1";
+        this.commit = "611f9bfce64f25108829dd295f54a6894e87339d";
         this.quality = 'oss';
         this.nameShort = 'Code - OSS Dev';
         this.nameLong = 'Code - OSS Dev';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -99,12 +99,12 @@
   "dependencies": {
     "@vscode/iconv-lite-umd": "0.7.0",
     "jschardet": "3.0.0",
-    "@codingame/monaco-vscode-extensions-service-override": "6.0.1",
-    "@codingame/monaco-vscode-files-service-override": "6.0.1",
-    "@codingame/monaco-vscode-quickaccess-service-override": "6.0.1",
-    "@codingame/monaco-vscode-environment-service-override": "6.0.1",
-    "@codingame/monaco-vscode-layout-service-override": "6.0.1",
-    "@codingame/monaco-vscode-host-service-override": "6.0.1",
-    "@codingame/monaco-vscode-base-service-override": "6.0.1"
+    "@codingame/monaco-vscode-files-service-override": "6.0.2",
+    "@codingame/monaco-vscode-extensions-service-override": "6.0.2",
+    "@codingame/monaco-vscode-quickaccess-service-override": "6.0.2",
+    "@codingame/monaco-vscode-environment-service-override": "6.0.2",
+    "@codingame/monaco-vscode-layout-service-override": "6.0.2",
+    "@codingame/monaco-vscode-host-service-override": "6.0.2",
+    "@codingame/monaco-vscode-base-service-override": "6.0.2"
   }
 }

package/services.d.ts

@@ -43,7 +43,7 @@ import { IEditorOverrideServices } from './vscode/src/vs/editor/standalone/brows
 export { StandaloneServices } from './vscode/src/vs/editor/standalone/browser/standaloneServices.js';
 import { IWorkbenchConstructionOptions } from './vscode/src/vs/workbench/browser/web.api.js';
 export { IProductService } from './vscode/src/vs/platform/product/common/productService.service.js';
-export { IConfigurationChangeEvent } from './vscode/src/vs/platform/configuration/common/configuration.js';
+export { ConfigurationTarget, IConfigurationChangeEvent } from './vscode/src/vs/platform/configuration/common/configuration.js';
 import { EnvironmentOverride } from './workbench.js';
 export { SyncDescriptor } from './vscode/src/vs/platform/instantiation/common/descriptors.js';
 export { IBulkEditService } from './vscode/src/vs/editor/browser/services/bulkEditService.js';

package/services.js

@@ -178,14 +178,15 @@ export { IBannerService } from './vscode/src/vs/workbench/services/banner/browse
 export { IWorkspaceTrustEnablementService, IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from './vscode/src/vs/platform/workspace/common/workspaceTrust.service.js';
 export { IKeybindingService } from './vscode/src/vs/platform/keybinding/common/keybinding.service.js';
 export { ISecretStorageService } from './vscode/src/vs/platform/secrets/common/secrets.service.js';
+export { ConfigurationTarget } from './vscode/src/vs/platform/configuration/common/configuration.js';
 async function initialize(overrides, container = document.body, configuration = {}, env) {
     checkServicesNotInitialized();
     initialize$1(container, configuration, env);
     const instantiationService = StandaloneServices.initialize({
         [( IProductService.toString())]: mixin({
-            version: "1.90.0",
+            version: "1.90.1",
             quality: 'stable',
-            commit: "df33c94d9816c7c14a48f62b484951dbbd816c02",
+            commit: "611f9bfce64f25108829dd295f54a6894e87339d",
             nameShort: 'Code - OSS',
             nameLong: 'Code - OSS',
             applicationName: 'code-oss',

package/vscode/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.js

@@ -20,6 +20,12 @@ let MoveLinesCommand = class MoveLinesCommand {
         this._moveEndLineSelectionShrink = false;
     }
     getEditOperations(model, builder) {
+        const getLanguageId = () => {
+            return model.getLanguageId();
+        };
+        const getLanguageIdAtPosition = (lineNumber, column) => {
+            return model.getLanguageIdAtPosition(lineNumber, column);
+        };
         const modelLineCount = model.getLineCount();
         if (this._isMovingDown && this._selection.endLineNumber === modelLineCount) {
             this._selectionId = builder.trackSelection(this._selection);
@@ -37,20 +43,6 @@ let MoveLinesCommand = class MoveLinesCommand {
         }
         const { tabSize, indentSize, insertSpaces } = model.getOptions();
         const indentConverter = this.buildIndentConverter(tabSize, indentSize, insertSpaces);
-        const virtualModel = {
-            tokenization: {
-                getLineTokens: (lineNumber) => {
-                    return model.tokenization.getLineTokens(lineNumber);
-                },
-                getLanguageId: () => {
-                    return model.getLanguageId();
-                },
-                getLanguageIdAtPosition: (lineNumber, column) => {
-                    return model.getLanguageIdAtPosition(lineNumber, column);
-                },
-            },
-            getLineContent: null,
-        };
         if (s.startLineNumber === s.endLineNumber && model.getLineMaxColumn(s.startLineNumber) === 1) {
             const lineNumber = s.startLineNumber;
             const otherLineNumber = (this._isMovingDown ? lineNumber + 1 : lineNumber - 1);
@@ -90,13 +82,27 @@ let MoveLinesCommand = class MoveLinesCommand {
                         insertingText = newIndentation + this.trimStart(movingLineText);
                     }
                     else {
-                        virtualModel.getLineContent = (lineNumber) => {
-                            if (lineNumber === s.startLineNumber) {
-                                return model.getLineContent(movingLineNumber);
-                            }
-                            else {
-                                return model.getLineContent(lineNumber);
-                            }
+                        const virtualModel = {
+                            tokenization: {
+                                getLineTokens: (lineNumber) => {
+                                    if (lineNumber === s.startLineNumber) {
+                                        return model.tokenization.getLineTokens(movingLineNumber);
+                                    }
+                                    else {
+                                        return model.tokenization.getLineTokens(lineNumber);
+                                    }
+                                },
+                                getLanguageId,
+                                getLanguageIdAtPosition,
+                            },
+                            getLineContent: (lineNumber) => {
+                                if (lineNumber === s.startLineNumber) {
+                                    return model.getLineContent(movingLineNumber);
+                                }
+                                else {
+                                    return model.getLineContent(lineNumber);
+                                }
+                            },
                         };
                         const indentOfMovingLine = getGoodIndentForLine(this._autoIndent, virtualModel, model.getLanguageIdAtPosition(movingLineNumber, 1), s.startLineNumber, indentConverter, this._languageConfigurationService);
                         if (indentOfMovingLine !== null) {
@@ -117,16 +123,33 @@ let MoveLinesCommand = class MoveLinesCommand {
                         }
                     }
                     else {
-                        virtualModel.getLineContent = (lineNumber) => {
-                            if (lineNumber === s.startLineNumber) {
-                                return insertingText;
-                            }
-                            else if (lineNumber >= s.startLineNumber + 1 && lineNumber <= s.endLineNumber + 1) {
-                                return model.getLineContent(lineNumber - 1);
-                            }
-                            else {
-                                return model.getLineContent(lineNumber);
-                            }
+                        const virtualModel = {
+                            tokenization: {
+                                getLineTokens: (lineNumber) => {
+                                    if (lineNumber === s.startLineNumber) {
+                                        return model.tokenization.getLineTokens(movingLineNumber);
+                                    }
+                                    else if (lineNumber >= s.startLineNumber + 1 && lineNumber <= s.endLineNumber + 1) {
+                                        return model.tokenization.getLineTokens(lineNumber - 1);
+                                    }
+                                    else {
+                                        return model.tokenization.getLineTokens(lineNumber);
+                                    }
+                                },
+                                getLanguageId,
+                                getLanguageIdAtPosition,
+                            },
+                            getLineContent: (lineNumber) => {
+                                if (lineNumber === s.startLineNumber) {
+                                    return insertingText;
+                                }
+                                else if (lineNumber >= s.startLineNumber + 1 && lineNumber <= s.endLineNumber + 1) {
+                                    return model.getLineContent(lineNumber - 1);
+                                }
+                                else {
+                                    return model.getLineContent(lineNumber);
+                                }
+                            },
                         };
                         const newIndentatOfMovingBlock = getGoodIndentForLine(this._autoIndent, virtualModel, model.getLanguageIdAtPosition(movingLineNumber, 1), s.startLineNumber + 1, indentConverter, this._languageConfigurationService);
                         if (newIndentatOfMovingBlock !== null) {
@@ -155,13 +178,27 @@ let MoveLinesCommand = class MoveLinesCommand {
                     model.getLineMaxColumn(s.endLineNumber)
                 )), '\n' + movingLineText);
                 if (this.shouldAutoIndent(model, s)) {
-                    virtualModel.getLineContent = (lineNumber) => {
-                        if (lineNumber === movingLineNumber) {
-                            return model.getLineContent(s.startLineNumber);
-                        }
-                        else {
-                            return model.getLineContent(lineNumber);
-                        }
+                    const virtualModel = {
+                        tokenization: {
+                            getLineTokens: (lineNumber) => {
+                                if (lineNumber === movingLineNumber) {
+                                    return model.tokenization.getLineTokens(s.startLineNumber);
+                                }
+                                else {
+                                    return model.tokenization.getLineTokens(lineNumber);
+                                }
+                            },
+                            getLanguageId,
+                            getLanguageIdAtPosition,
+                        },
+                        getLineContent: (lineNumber) => {
+                            if (lineNumber === movingLineNumber) {
+                                return model.getLineContent(s.startLineNumber);
+                            }
+                            else {
+                                return model.getLineContent(lineNumber);
+                            }
+                        },
                     };
                     const ret = this.matchEnterRule(model, indentConverter, tabSize, s.startLineNumber, s.startLineNumber - 2);
                     if (ret !== null) {

package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js

@@ -150,10 +150,22 @@ let AccessibilitySignalService = class AccessibilitySignalService extends Dispos
     onSoundEnabledChanged(signal) {
         return this.getEnabledState(signal, false).onDidChange;
     }
-    getDelayMs(signal, modality) {
-        const delaySettingsKey = signal.delaySettingsKey ?? 'accessibility.signalOptions.delays.general';
-        const delaySettingsValue = this.configurationService.getValue(delaySettingsKey);
-        return modality === 'sound' ? delaySettingsValue.sound : delaySettingsValue.announcement;
+    getDelayMs(signal, modality, mode) {
+        const options = this.configurationService.getValue('accessibility.signalOptions');
+        if (!options || !options.debouncePositionChanges) {
+            return 0;
+        }
+        let value;
+        if (signal.name === AccessibilitySignal.errorAtPosition.name && mode === 'positional') {
+            value = options['experimental.delays'].errorAtPosition;
+        }
+        else if (signal.name === AccessibilitySignal.warningAtPosition.name && mode === 'positional') {
+            value = options['experimental.delays'].warningAtPosition;
+        }
+        else {
+            value = options['experimental.delays'].general;
+        }
+        return modality === 'sound' ? value.sound : value.announcement;
     }
 };
 AccessibilitySignalService = ( (__decorate([

package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service.d.ts

@@ -13,7 +13,7 @@ interface IAccessibilitySignalService {
     })[]): Promise<void>;
     playSignalLoop(signal: AccessibilitySignal, milliseconds: number): IDisposable;
     getEnabledState(signal: AccessibilitySignal, userGesture: boolean, modality?: AccessibilityModality | undefined): IValueWithChangeEvent<boolean>;
-    getDelayMs(signal: AccessibilitySignal, modality: AccessibilityModality): number;
+    getDelayMs(signal: AccessibilitySignal, modality: AccessibilityModality, mode: 'line' | 'positional'): number;
     /**
     * Avoid this method and prefer `.playSignal`!
     * Only use it when you want to play the sound regardless of enablement, e.g. in the settings quick pick.

package/vscode/src/vs/platform/theme/common/colors/baseColors.js

@@ -50,7 +50,7 @@ const textLinkActiveForeground = registerColor('textLink.activeForeground', { li
  "Foreground color for links in text when clicked on and on mouse hover."
 )));
 registerColor('textSeparator.foreground', { light: '#0000002e', dark: '#ffffff2e', hcDark: Color.black, hcLight: '#292929' }, ( localizeWithPath(_moduleId, 11, "Color for text separators.")));
-registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#FFFFFF', hcLight: '#000000' }, ( localizeWithPath(_moduleId, 12, "Foreground color for preformatted text segments.")));
+registerColor('textPreformat.foreground', { light: '#A31515', dark: '#D7BA7D', hcDark: '#000000', hcLight: '#FFFFFF' }, ( localizeWithPath(_moduleId, 12, "Foreground color for preformatted text segments.")));
 registerColor('textPreformat.background', { light: '#0000001A', dark: '#FFFFFF1A', hcDark: '#FFFFFF', hcLight: '#09345f' }, ( localizeWithPath(_moduleId, 13, "Background color for preformatted text segments.")));
 const textBlockQuoteBackground = registerColor('textBlockQuote.background', { light: '#f2f2f2', dark: '#222222', hcDark: null, hcLight: '#F2F2F2' }, ( localizeWithPath(_moduleId, 14, "Background color for block quotes in text.")));
 const textBlockQuoteBorder = registerColor('textBlockQuote.border', { light: '#007acc80', dark: '#007acc80', hcDark: Color.white, hcLight: '#292929' }, ( localizeWithPath(_moduleId, 15, "Border color for block quotes in text.")));

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

@@ -12,7 +12,7 @@ import '../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../base/common/observableInternal/autorun.js';
 import '../../../../base/common/observableInternal/utils.js';
 import { basenameOrAuthority } from '../../../../base/common/resources.js';
-import { isUndefinedOrNull, isString } from '../../../../base/common/types.js';
+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';
@@ -463,6 +463,7 @@ class StackFrame {
         return (this.name === other.name) && (other.thread === this.thread) && (this.frameId === other.frameId) && (other.source === this.source) && (Range.equalsRange(this.range, other.range));
     }
 }
+const KEEP_SUBTLE_FRAME_AT_TOP_REASONS = ['breakpoint', 'step', 'function breakpoint'];
 class Thread {
     constructor(session, name, threadId) {
         this.session = session;
@@ -493,8 +494,9 @@ class Thread {
     }
     getTopStackFrame() {
         const callStack = this.getCallStack();
-        const firstAvailableStackFrame = callStack.find(sf => !!(((this.stoppedDetails?.reason === 'instruction breakpoint' || (this.stoppedDetails?.reason === 'step' && this.lastSteppingGranularity === 'instruction')) && sf.instructionPointerReference) ||
-            (sf.source && sf.source.available && !isFrameDeemphasized(sf))));
+        const stopReason = this.stoppedDetails?.reason;
+        const firstAvailableStackFrame = callStack.find(sf => !!(((stopReason === 'instruction breakpoint' || (stopReason === 'step' && this.lastSteppingGranularity === 'instruction')) && sf.instructionPointerReference) ||
+            (sf.source && sf.source.available && (KEEP_SUBTLE_FRAME_AT_TOP_REASONS.includes(stopReason) || !isFrameDeemphasized(sf)))));
         return firstAvailableStackFrame;
     }
     get stateLabel() {