@codingame/monaco-vscode-api 37.6.0 → 38.0.0

package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js

@@ -31,7 +31,7 @@ import { isModelDecorationVisible, isModelDecorationInString, isModelDecorationI
 import { IMarkdownRendererService } from '../../../../platform/markdown/browser/markdownRenderer.service.js';
 
 registerCss(unicodeHighlighter, 1);
-const warningIcon = registerIcon("extensions-warning-message", Codicon.warning, ( localize(1697, "Icon shown with a warning message in the extensions editor.")));
+const warningIcon = registerIcon("extensions-warning-message", Codicon.warning, ( localize(1709, "Icon shown with a warning message in the extensions editor.")));
 let UnicodeHighlighter = class UnicodeHighlighter extends Disposable {
     static {
         this.ID = "editor.contrib.unicodeHighlighter";
@@ -61,17 +61,17 @@ let UnicodeHighlighter = class UnicodeHighlighter extends Disposable {
                 let data;
                 if (state.nonBasicAsciiCharacterCount >= max) {
                     data = {
-                        message: ( localize(1698, "This document contains many non-basic ASCII unicode characters")),
+                        message: ( localize(1710, "This document contains many non-basic ASCII unicode characters")),
                         command: ( new DisableHighlightingOfNonBasicAsciiCharactersAction())
                     };
                 } else if (state.ambiguousCharacterCount >= max) {
                     data = {
-                        message: ( localize(1699, "This document contains many ambiguous unicode characters")),
+                        message: ( localize(1711, "This document contains many ambiguous unicode characters")),
                         command: ( new DisableHighlightingOfAmbiguousCharactersAction())
                     };
                 } else if (state.invisibleCharacterCount >= max) {
                     data = {
-                        message: ( localize(1700, "This document contains many invisible unicode characters")),
+                        message: ( localize(1712, "This document contains many invisible unicode characters")),
                         command: ( new DisableHighlightingOfInvisibleCharactersAction())
                     };
                 } else {
@@ -327,7 +327,7 @@ class ViewportUnicodeHighlighter extends Disposable {
         };
     }
 }
-const configureUnicodeHighlightOptionsStr = ( localize(1701, "Configure Unicode Highlight Options"));
+const configureUnicodeHighlightOptionsStr = ( localize(1713, "Configure Unicode Highlight Options"));
 let UnicodeHighlighterHoverParticipant = class UnicodeHighlighterHoverParticipant {
     constructor(_editor, _markdownRendererService) {
         this._editor = _editor;
@@ -360,14 +360,14 @@ let UnicodeHighlighterHoverParticipant = class UnicodeHighlighterHoverParticipan
                 {
                     if (isBasicASCII(highlightInfo.reason.confusableWith)) {
                         reason = ( localize(
-                            1702,
+                            1714,
                             "The character {0} could be confused with the ASCII character {1}, which is more common in source code.",
                             codePointStr,
                             formatCodePointMarkdown(highlightInfo.reason.confusableWith.codePointAt(0))
                         ));
                     } else {
                         reason = ( localize(
-                            1703,
+                            1715,
                             "The character {0} could be confused with the character {1}, which is more common in source code.",
                             codePointStr,
                             formatCodePointMarkdown(highlightInfo.reason.confusableWith.codePointAt(0))
@@ -376,10 +376,10 @@ let UnicodeHighlighterHoverParticipant = class UnicodeHighlighterHoverParticipan
                     break;
                 }
             case UnicodeHighlighterReasonKind.Invisible:
-                reason = ( localize(1704, "The character {0} is invisible.", codePointStr));
+                reason = ( localize(1716, "The character {0} is invisible.", codePointStr));
                 break;
             case UnicodeHighlighterReasonKind.NonBasicAscii:
-                reason = ( localize(1705, "The character {0} is not a basic ASCII character.", codePointStr));
+                reason = ( localize(1717, "The character {0} is not a basic ASCII character.", codePointStr));
                 break;
             }
             if (( existedReason.has(reason))) {
@@ -392,7 +392,7 @@ let UnicodeHighlighterHoverParticipant = class UnicodeHighlighterHoverParticipan
                 inComment: highlightInfo.inComment,
                 inString: highlightInfo.inString
             };
-            const adjustSettings = ( localize(1706, "Adjust settings"));
+            const adjustSettings = ( localize(1718, "Adjust settings"));
             const uri = createCommandUri(ShowExcludeOptions.ID, adjustSettingsArgs);
             const markdown = ( new MarkdownString("", true)).appendMarkdown(reason).appendText(" ").appendLink(uri, adjustSettings, configureUnicodeHighlightOptionsStr);
             result.push(( new MarkdownHover(this, d.range, [markdown], false, index++)));
@@ -462,10 +462,10 @@ class DisableHighlightingInCommentsAction extends EditorAction {
     constructor() {
         super({
             id: DisableHighlightingOfAmbiguousCharactersAction.ID,
-            label: ( localize2(1707, "Disable highlighting of characters in comments")),
+            label: ( localize2(1719, "Disable highlighting of characters in comments")),
             precondition: undefined
         });
-        this.shortLabel = ( localize(1708, "Disable Highlight In Comments"));
+        this.shortLabel = ( localize(1720, "Disable Highlight In Comments"));
     }
     async run(accessor, editor) {
         const configurationService = accessor.get(IConfigurationService);
@@ -488,10 +488,10 @@ class DisableHighlightingInStringsAction extends EditorAction {
     constructor() {
         super({
             id: DisableHighlightingOfAmbiguousCharactersAction.ID,
-            label: ( localize2(1709, "Disable highlighting of characters in strings")),
+            label: ( localize2(1721, "Disable highlighting of characters in strings")),
             precondition: undefined
         });
-        this.shortLabel = ( localize(1710, "Disable Highlight In Strings"));
+        this.shortLabel = ( localize(1722, "Disable Highlight In Strings"));
     }
     async run(accessor, editor) {
         const configurationService = accessor.get(IConfigurationService);
@@ -510,11 +510,11 @@ class DisableHighlightingOfAmbiguousCharactersAction extends Action2 {
     constructor() {
         super({
             id: DisableHighlightingOfAmbiguousCharactersAction.ID,
-            title: ( localize2(1711, "Disable highlighting of ambiguous characters")),
+            title: ( localize2(1723, "Disable highlighting of ambiguous characters")),
             precondition: undefined,
             f1: false
         });
-        this.shortLabel = ( localize(1712, "Disable Ambiguous Highlight"));
+        this.shortLabel = ( localize(1724, "Disable Ambiguous Highlight"));
     }
     async run(accessor, editor) {
         const configurationService = accessor.get(IConfigurationService);
@@ -537,11 +537,11 @@ class DisableHighlightingOfInvisibleCharactersAction extends Action2 {
     constructor() {
         super({
             id: DisableHighlightingOfInvisibleCharactersAction.ID,
-            title: ( localize2(1713, "Disable highlighting of invisible characters")),
+            title: ( localize2(1725, "Disable highlighting of invisible characters")),
             precondition: undefined,
             f1: false
         });
-        this.shortLabel = ( localize(1714, "Disable Invisible Highlight"));
+        this.shortLabel = ( localize(1726, "Disable Invisible Highlight"));
     }
     async run(accessor, editor) {
         const configurationService = accessor.get(IConfigurationService);
@@ -564,11 +564,11 @@ class DisableHighlightingOfNonBasicAsciiCharactersAction extends Action2 {
     constructor() {
         super({
             id: DisableHighlightingOfNonBasicAsciiCharactersAction.ID,
-            title: ( localize2(1715, "Disable highlighting of non basic ASCII characters")),
+            title: ( localize2(1727, "Disable highlighting of non basic ASCII characters")),
             precondition: undefined,
             f1: false
         });
-        this.shortLabel = ( localize(1716, "Disable Non ASCII Highlight"));
+        this.shortLabel = ( localize(1728, "Disable Non ASCII Highlight"));
     }
     async run(accessor, editor) {
         const configurationService = accessor.get(IConfigurationService);
@@ -587,7 +587,7 @@ class ShowExcludeOptions extends Action2 {
     constructor() {
         super({
             id: ShowExcludeOptions.ID,
-            title: ( localize2(1717, "Show Exclude Options")),
+            title: ( localize2(1729, "Show Exclude Options")),
             precondition: undefined,
             f1: false
         });
@@ -605,13 +605,13 @@ class ShowExcludeOptions extends Action2 {
         function getExcludeCharFromBeingHighlightedLabel(codePoint) {
             if (InvisibleCharacters.isInvisibleCharacter(codePoint)) {
                 return localize(
-                    1718,
+                    1730,
                     "Exclude {0} (invisible character) from being highlighted",
                     codePointToHex(codePoint)
                 );
             }
             return localize(
-                1719,
+                1731,
                 "Exclude {0} from being highlighted",
                 `${codePointToHex(codePoint)} "${char}"`
             );
@@ -621,7 +621,7 @@ class ShowExcludeOptions extends Action2 {
             for (const locale of reason.notAmbiguousInLocales) {
                 options.push({
                     label: ( localize(
-                        1720,
+                        1732,
                         "Allow unicode characters that are more common in the language \"{0}\".",
                         locale
                     )),

package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js

@@ -72,15 +72,15 @@ let UnusualLineTerminatorsDetector = class UnusualLineTerminatorsDetector extend
         try {
             this._isPresentingDialog = true;
             result = await this._dialogService.confirm({
-                title: ( localize(1721, "Unusual Line Terminators")),
-                message: ( localize(1722, "Detected unusual line terminators")),
+                title: ( localize(1733, "Unusual Line Terminators")),
+                message: ( localize(1734, "Detected unusual line terminators")),
                 detail: ( localize(
-                    1723,
+                    1735,
                     "The file '{0}' contains one or more unusual line terminator characters, like Line Separator (LS) or Paragraph Separator (PS).\n\nIt is recommended to remove them from the file. This can be configured via `editor.unusualLineTerminators`.",
                     basename(model.uri)
                 )),
-                primaryButton: ( localize(1724, "&&Remove Unusual Line Terminators")),
-                cancelButton: ( localize(1725, "Ignore"))
+                primaryButton: ( localize(1736, "&&Remove Unusual Line Terminators")),
+                cancelButton: ( localize(1737, "Ignore"))
             });
         } finally {
             this._isPresentingDialog = false;

package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js

@@ -25,7 +25,7 @@ const wordHighlightBackground = registerColor("editor.wordHighlightBackground",
     hcDark: null,
     hcLight: null
 }, ( localize(
-    1726,
+    1738,
     "Background color of a symbol during read-access, like reading a variable. The color must not be opaque so as not to hide underlying decorations."
 )), true);
 registerColor("editor.wordHighlightStrongBackground", {
@@ -34,14 +34,14 @@ registerColor("editor.wordHighlightStrongBackground", {
     hcDark: null,
     hcLight: null
 }, ( localize(
-    1727,
+    1739,
     "Background color of a symbol during write-access, like writing to a variable. The color must not be opaque so as not to hide underlying decorations."
 )), true);
 registerColor(
     "editor.wordHighlightTextBackground",
     wordHighlightBackground,
     ( localize(
-    1728,
+    1740,
     "Background color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations."
 )),
     true
@@ -52,7 +52,7 @@ const wordHighlightBorder = registerColor("editor.wordHighlightBorder", {
     hcDark: activeContrastBorder,
     hcLight: activeContrastBorder
 }, ( localize(
-    1729,
+    1741,
     "Border color of a symbol during read-access, like reading a variable."
 )));
 registerColor("editor.wordHighlightStrongBorder", {
@@ -61,19 +61,19 @@ registerColor("editor.wordHighlightStrongBorder", {
     hcDark: activeContrastBorder,
     hcLight: activeContrastBorder
 }, ( localize(
-    1730,
+    1742,
     "Border color of a symbol during write-access, like writing to a variable."
 )));
-registerColor("editor.wordHighlightTextBorder", wordHighlightBorder, ( localize(1731, "Border color of a textual occurrence for a symbol.")));
+registerColor("editor.wordHighlightTextBorder", wordHighlightBorder, ( localize(1743, "Border color of a textual occurrence for a symbol.")));
 const overviewRulerWordHighlightForeground = registerColor("editorOverviewRuler.wordHighlightForeground", "#A0A0A0CC", ( localize(
-    1732,
+    1744,
     "Overview ruler marker color for symbol highlights. The color must not be opaque so as not to hide underlying decorations."
 )), true);
 const overviewRulerWordHighlightStrongForeground = registerColor(
     "editorOverviewRuler.wordHighlightStrongForeground",
     "#C0A0C0CC",
     ( localize(
-    1733,
+    1745,
     "Overview ruler marker color for write-access symbol highlights. The color must not be opaque so as not to hide underlying decorations."
 )),
     true
@@ -82,7 +82,7 @@ const overviewRulerWordHighlightTextForeground = registerColor(
     "editorOverviewRuler.wordHighlightTextForeground",
     overviewRulerSelectionHighlightForeground,
     ( localize(
-    1734,
+    1746,
     "Overview ruler marker color of a textual occurrence for a symbol. The color must not be opaque so as not to hide underlying decorations."
 )),
     true

package/vscode/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.d.ts

@@ -1,5 +1,16 @@
 import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
+import { DocumentHighlight, DocumentHighlightProvider, MultiDocumentHighlightProvider, ProviderResult } from "../../../common/languages.js";
+import { ITextModel } from "../../../common/model.js";
+import { Position } from "../../../common/core/position.js";
+import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Disposable } from "../../../../base/common/lifecycle.js";
+import { ResourceMap } from "../../../../base/common/map.js";
+import { LanguageFilter } from "../../../common/languageSelector.js";
+export declare class TextualDocumentHighlightProvider implements DocumentHighlightProvider, MultiDocumentHighlightProvider {
+    selector: LanguageFilter;
+    provideDocumentHighlights(model: ITextModel, position: Position, token: CancellationToken): ProviderResult<DocumentHighlight[]>;
+    provideMultiDocumentHighlights(primaryModel: ITextModel, position: Position, otherModels: ITextModel[], token: CancellationToken): ProviderResult<ResourceMap<DocumentHighlight[]>>;
+}
 export declare class TextualMultiDocumentHighlightFeature extends Disposable {
     constructor(languageFeaturesService: ILanguageFeaturesService);
 }

package/vscode/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.js

@@ -71,4 +71,4 @@ let TextualMultiDocumentHighlightFeature = class TextualMultiDocumentHighlightFe
 };
 TextualMultiDocumentHighlightFeature = ( __decorate([( __param(0, ILanguageFeaturesService))], TextualMultiDocumentHighlightFeature));
 
-export { TextualMultiDocumentHighlightFeature };
+export { TextualDocumentHighlightProvider, TextualMultiDocumentHighlightFeature };

package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.d.ts

@@ -13,7 +13,7 @@ import { DocumentHighlight, DocumentHighlightProvider, MultiDocumentHighlightPro
 import { ITextModel } from "../../../common/model.js";
 import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
 import { ITextModelService } from "../../../common/services/resolverService.service.js";
-export declare function getOccurrencesAtPosition(registry: LanguageFeatureRegistry<DocumentHighlightProvider>, model: ITextModel, position: Position, token: CancellationToken): Promise<ResourceMap<DocumentHighlight[]> | null | undefined>;
+export declare function getOccurrencesAtPosition(registry: LanguageFeatureRegistry<DocumentHighlightProvider>, model: ITextModel, position: Position, token: CancellationToken, mergeProviders: boolean): Promise<ResourceMap<DocumentHighlight[]> | null | undefined>;
 export declare function getOccurrencesAcrossMultipleModels(registry: LanguageFeatureRegistry<MultiDocumentHighlightProvider>, model: ITextModel, position: Position, token: CancellationToken, otherModels: ITextModel[]): Promise<ResourceMap<DocumentHighlight[]> | null | undefined>;
 declare class WordHighlighter {
     private readonly editor;
@@ -27,6 +27,7 @@ declare class WordHighlighter {
     private readonly configurationService;
     private readonly logService;
     private occurrencesHighlightEnablement;
+    private occurrencesHighlightFromAllProvidersEnablement;
     private occurrencesHighlightDelay;
     private workerRequestTokenId;
     private workerRequest;

package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js

@@ -2,6 +2,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localize2 } from '../../../../nls.js';
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
+import { coalesce, distinct } from '../../../../base/common/arrays.js';
 import { first, createCancelablePromise, Delayer } from '../../../../base/common/async.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { onUnexpectedExternalError, onUnexpectedError } from '../../../../base/common/errors.js';
@@ -28,12 +29,32 @@ import { shouldSynchronizeModel } from '../../../common/model.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.service.js';
 import { ITextModelService } from '../../../common/services/resolverService.service.js';
 import { getHighlightDecorationOptions } from './highlightDecorations.js';
-import { TextualMultiDocumentHighlightFeature } from './textualHighlightProvider.js';
+import { TextualDocumentHighlightProvider, TextualMultiDocumentHighlightFeature } from './textualHighlightProvider.js';
 
 var WordHighlighter_1, WordHighlighterContribution_1;
 const ctxHasWordHighlights = new RawContextKey("hasWordHighlights", false);
-function getOccurrencesAtPosition(registry, model, position, token) {
+function getOccurrencesAtPosition(registry, model, position, token, mergeProviders) {
     const orderedByScore = registry.ordered(model);
+    if (mergeProviders) {
+        const providers = orderedByScore.filter(provider => !(provider instanceof TextualDocumentHighlightProvider));
+        return Promise.all(
+            (providers.length > 0 ? providers : orderedByScore).map(async provider => {
+                try {
+                    return await provider.provideDocumentHighlights(model, position, token);
+                } catch (error) {
+                    return onUnexpectedExternalError(error);
+                }
+            })
+        ).then(results => {
+            const result = coalesce(results);
+            if (result.length > 0) {
+                const map = ( new ResourceMap());
+                map.set(model.uri, mergeHighlights(result));
+                return map;
+            }
+            return ( new ResourceMap());
+        });
+    }
     return first(orderedByScore.map(provider => () => {
         return Promise.resolve(provider.provideDocumentHighlights(model, position, token)).then(undefined, onUnexpectedExternalError);
     }), result => result !== undefined && result !== null).then(result => {
@@ -45,6 +66,17 @@ function getOccurrencesAtPosition(registry, model, position, token) {
         return ( new ResourceMap());
     });
 }
+function mergeHighlights(results) {
+    return distinct(results.flat(), highlight => {
+        const {
+            startLineNumber,
+            startColumn,
+            endLineNumber,
+            endColumn
+        } = highlight.range;
+        return `${startLineNumber}:${startColumn}:${endLineNumber}:${endColumn}`;
+    });
+}
 function getOccurrencesAcrossMultipleModels(registry, model, position, token, otherModels) {
     const orderedByScore = registry.ordered(model);
     return first(orderedByScore.map(provider => () => {
@@ -114,12 +146,19 @@ class OccurenceAtPositionRequest {
     }
 }
 class SemanticOccurenceAtPositionRequest extends OccurenceAtPositionRequest {
-    constructor(model, selection, wordSeparators, providers) {
+    constructor(model, selection, wordSeparators, providers, mergeProviders) {
         super(model, selection, wordSeparators);
         this._providers = providers;
+        this._mergeProviders = mergeProviders;
     }
     _compute(model, selection, wordSeparators, token) {
-        return getOccurrencesAtPosition(this._providers, model, selection.getPosition(), token).then(value => {
+        return getOccurrencesAtPosition(
+            this._providers,
+            model,
+            selection.getPosition(),
+            token,
+            this._mergeProviders
+        ).then(value => {
             if (!value) {
                 return ( new ResourceMap());
             }
@@ -142,19 +181,24 @@ class MultiModelOccurenceRequest extends OccurenceAtPositionRequest {
         });
     }
 }
-function computeOccurencesAtPosition(registry, model, selection, wordSeparators) {
-    return ( new SemanticOccurenceAtPositionRequest(model, selection, wordSeparators, registry));
+function computeOccurencesAtPosition(registry, model, selection, wordSeparators, mergeProviders) {
+    return ( new SemanticOccurenceAtPositionRequest(model, selection, wordSeparators, registry, mergeProviders));
 }
 function computeOccurencesMultiModel(registry, model, selection, wordSeparators, otherModels) {
     return ( new MultiModelOccurenceRequest(model, selection, wordSeparators, registry, otherModels));
 }
 registerModelAndPositionCommand("_executeDocumentHighlights", async (accessor, model, position) => {
     const languageFeaturesService = accessor.get(ILanguageFeaturesService);
+    const mergeProviders = accessor.get(IConfigurationService).getValue("editor.occurrencesHighlightFromAllProviders", {
+        resource: model.uri,
+        overrideIdentifier: model.getLanguageId()
+    });
     const map = await getOccurrencesAtPosition(
         languageFeaturesService.documentHighlightProvider,
         model,
         position,
-        CancellationToken.None
+        CancellationToken.None,
+        mergeProviders
     );
     return map?.get(model.uri);
 });
@@ -195,6 +239,7 @@ let WordHighlighter = class WordHighlighter {
         this._hasWordHighlights = ctxHasWordHighlights.bindTo(contextKeyService);
         this._ignorePositionChangeEvent = false;
         this.occurrencesHighlightEnablement = this.editor.getOption(EditorOption.occurrencesHighlight);
+        this.occurrencesHighlightFromAllProvidersEnablement = this.editor.getOption(EditorOption.occurrencesHighlightFromAllProviders);
         this.occurrencesHighlightDelay = this.configurationService.getValue("editor.occurrencesHighlightDelay");
         this.model = this.editor.getModel();
         this.toUnhook.add(editor.onDidChangeCursorPosition(e => {
@@ -251,6 +296,13 @@ let WordHighlighter = class WordHighlighter {
                     break;
                 }
             }
+            if (e.hasChanged(EditorOption.occurrencesHighlightFromAllProviders)) {
+                this.occurrencesHighlightFromAllProvidersEnablement = this.editor.getOption(EditorOption.occurrencesHighlightFromAllProviders);
+                this._stopAll();
+                if (this.occurrencesHighlightEnablement !== "off") {
+                    this._run();
+                }
+            }
         }));
         this.toUnhook.add(this.configurationService.onDidChangeConfiguration(e => {
             if (e.affectsConfiguration("editor.occurrencesHighlightDelay")) {
@@ -591,7 +643,8 @@ let WordHighlighter = class WordHighlighter {
                 this.providers,
                 model,
                 selection,
-                this.editor.getOption(EditorOption.wordSeparators)
+                this.editor.getOption(EditorOption.wordSeparators),
+                this.occurrencesHighlightFromAllProvidersEnablement
             );
         } else {
             return computeOccurencesMultiModel(
@@ -758,7 +811,7 @@ class NextWordHighlightAction extends WordHighlightNavigationAction {
     constructor() {
         super(true, {
             id: "editor.action.wordHighlight.next",
-            label: ( localize2(1735, "Go to Next Symbol Highlight")),
+            label: ( localize2(1747, "Go to Next Symbol Highlight")),
             precondition: ctxHasWordHighlights,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -772,7 +825,7 @@ class PrevWordHighlightAction extends WordHighlightNavigationAction {
     constructor() {
         super(false, {
             id: "editor.action.wordHighlight.prev",
-            label: ( localize2(1736, "Go to Previous Symbol Highlight")),
+            label: ( localize2(1748, "Go to Previous Symbol Highlight")),
             precondition: ctxHasWordHighlights,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,
@@ -786,7 +839,7 @@ class TriggerWordHighlightAction extends EditorAction {
     constructor() {
         super({
             id: "editor.action.wordHighlight.trigger",
-            label: ( localize2(1737, "Trigger Symbol Highlight")),
+            label: ( localize2(1749, "Trigger Symbol Highlight")),
             precondition: undefined,
             kbOpts: {
                 kbExpr: EditorContextKeys.editorTextFocus,

package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js

@@ -465,9 +465,9 @@ class DeleteInsideWord extends EditorAction {
         super({
             id: "deleteInsideWord",
             precondition: EditorContextKeys.writable,
-            label: ( localize2(1738, "Delete Word")),
+            label: ( localize2(1750, "Delete Word")),
             metadata: {
-                description: ( localize2(1739, "Delete the word at the cursor")),
+                description: ( localize2(1751, "Delete the word at the cursor")),
                 args: [{
                     name: "args",
                     schema: {
@@ -476,7 +476,7 @@ class DeleteInsideWord extends EditorAction {
                             "onlyWord": {
                                 type: "boolean",
                                 default: false,
-                                description: ( localize(1740, "Delete only the word and leave surrounding whitespace"))
+                                description: ( localize(1752, "Delete only the word and leave surrounding whitespace"))
                             }
                         }
                     }

package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.d.ts

@@ -1,7 +1,7 @@
 import { Event } from "../../../../base/common/event.js";
 import { ICodeEditor, IOverlayWidget, IOverlayWidgetPosition } from "../../../browser/editorBrowser.js";
 import { IEditorContribution } from "../../../common/editorCommon.js";
-import { IQuickPickItem, IQuickPick, IInputBox, IQuickNavigateConfiguration, IPickOptions, QuickPickInput, IInputOptions, IQuickWidget, IQuickTree, IQuickTreeItem } from "../../../../platform/quickinput/common/quickInput.js";
+import { IQuickPickItem, IQuickPick, IInputBox, IQuickNavigateConfiguration, IPickOptions, QuickPickInput, IInputOptions, IQuickInput, IQuickWidget, IQuickTree, IQuickTreeItem } from "../../../../platform/quickinput/common/quickInput.js";
 import { IQuickInputService } from "../../../../platform/quickinput/common/quickInput.service.js";
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
@@ -12,13 +12,14 @@ export declare class StandaloneQuickInputService implements IQuickInputService {
     readonly _serviceBrand: undefined;
     private mapEditorToService;
     private get activeService();
-    get currentQuickInput(): import("../../../../platform/quickinput/common/quickInput.js").IQuickInput | undefined;
+    get currentQuickInput(): IQuickInput | undefined;
     get quickAccess(): import("../../../../platform/quickinput/common/quickAccess.js").IQuickAccessController;
     get backButton(): import("../../../../platform/quickinput/common/quickInput.js").IQuickInputButton;
     get alignment(): import("../../../../base/common/observable.js").IObservable<import("../../../../platform/quickinput/common/quickInput.js").QuickInputAlignment>;
     get onShow(): Event<void>;
     get onHide(): Event<void>;
     constructor(instantiationService: IInstantiationService, codeEditorService: ICodeEditorService);
+    withQuickInputAnchor<T>(anchor: IQuickInput["anchor"], anchorPosition: IQuickInput["anchorPosition"], operation: () => Promise<T>): Promise<T>;
     pick<T extends IQuickPickItem, O extends IPickOptions<T>>(picks: Promise<QuickPickInput<T>[]> | QuickPickInput<T>[], options?: O, token?: CancellationToken): Promise<(O extends {
         canPickMany: true;
     } ? T[] : T) | undefined>;

package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js

@@ -134,6 +134,9 @@ let StandaloneQuickInputService = class StandaloneQuickInputService {
         this.codeEditorService = codeEditorService;
         this.mapEditorToService = ( new Map());
     }
+    withQuickInputAnchor(anchor, anchorPosition, operation) {
+        return this.activeService.withQuickInputAnchor(anchor, anchorPosition, operation);
+    }
     pick(picks, options, token = CancellationToken.None) {
         return this.activeService .pick(picks, options, token);
     }

package/vscode/src/vs/editor/standalone/browser/standaloneServices.js

@@ -4,8 +4,8 @@ import '../../../platform/hover/browser/hoverService.js';
 import '../../../platform/undoRedo/common/undoRedoService.js';
 import '../../browser/services/inlineCompletionsService.js';
 import '../../common/services/languageFeatureDebounce.js';
-import { Emitter, Event, ValueWithChangeEvent } from '../../../base/common/event.js';
-import { ImmortalReference, DisposableStore, toDisposable, combinedDisposable, Disposable } from '../../../base/common/lifecycle.js';
+import { Event, Emitter, ValueWithChangeEvent } from '../../../base/common/event.js';
+import { DisposableStore, toDisposable, combinedDisposable, Disposable } from '../../../base/common/lifecycle.js';
 import '../../common/model.js';
 import '../../../base/common/arrays.js';
 import '../../../base/common/async.js';
@@ -106,67 +106,12 @@ import { ITextResourceConfigurationService, ITextResourcePropertiesService } fro
 import { ITreeSitterLibraryService } from '../../common/services/treeSitter/treeSitterLibraryService.service.js';
 import { StandaloneServicesNLS } from '../../common/standaloneStrings.js';
 import { IStandaloneThemeService } from '../common/standaloneTheme.service.js';
+import { InMemoryTextModelService } from '../../common/services/inMemoryTextModelService.js';
 import { StandaloneQuickInputService } from './quickInput/standaloneQuickInputService.js';
 import { StandaloneWebWorkerService } from './services/standaloneWebWorkerService.js';
 import { StandaloneThemeService } from './standaloneThemeService.js';
 import { StandaloneTreeSitterLibraryService } from './standaloneTreeSitterLibraryService.js';
 
-class SimpleModel {
-    constructor(model) {
-        this.disposed = false;
-        this.model = model;
-        this._onWillDispose = ( new Emitter());
-    }
-    get onWillDispose() {
-        return this._onWillDispose.event;
-    }
-    resolve() {
-        return Promise.resolve();
-    }
-    get textEditorModel() {
-        return this.model;
-    }
-    createSnapshot() {
-        return this.model.createSnapshot();
-    }
-    isReadonly() {
-        return false;
-    }
-    dispose() {
-        this.disposed = true;
-        this._onWillDispose.fire();
-    }
-    isDisposed() {
-        return this.disposed;
-    }
-    isResolved() {
-        return true;
-    }
-    getLanguageId() {
-        return this.model.getLanguageId();
-    }
-}
-let StandaloneTextModelService = class StandaloneTextModelService {
-    constructor(modelService) {
-        this.modelService = modelService;
-    }
-    createModelReference(resource) {
-        const model = this.modelService.getModel(resource);
-        if (!model) {
-            return Promise.reject(( new Error(`Model not found`)));
-        }
-        return Promise.resolve(( new ImmortalReference(( new SimpleModel(model)))));
-    }
-    registerTextModelContentProvider(scheme, provider) {
-        return {
-            dispose: function() {}
-        };
-    }
-    canHandleResource(resource) {
-        return false;
-    }
-};
-StandaloneTextModelService = ( __decorate([( __param(0, IModelService))], StandaloneTextModelService));
 class StandaloneEditorProgressService {
     static {
         this.NULL_PROGRESS_RUNNER = {
@@ -949,6 +894,9 @@ class StandaloneWorkspaceTrustManagementService {
         throw ( new Error("Method not supported."));
     }
     async setUrisTrust(uri, trusted) {}
+    registerTrustedAuthority(scheme, authority) {
+        return Disposable.None;
+    }
     getTrustedUris() {
         return [];
     }
@@ -1105,7 +1053,7 @@ registerSingleton(
     StandaloneWorkspaceTrustManagementService,
     InstantiationType.Eager
 );
-registerSingleton(ITextModelService, StandaloneTextModelService, InstantiationType.Eager);
+registerSingleton(ITextModelService, InMemoryTextModelService, InstantiationType.Eager);
 registerSingleton(IAccessibilityService, AccessibilityService, InstantiationType.Eager);
 registerSingleton(IListService, ListService, InstantiationType.Eager);
 registerSingleton(ICommandService, StandaloneCommandService, InstantiationType.Eager);