@codingame/monaco-vscode-api 2.2.2 → 3.1.0

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js

@@ -48,13 +48,14 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         this._register(this._stickyScrollWidget);
         this._register(this._stickyLineCandidateProvider);
         this._widgetState = ( new StickyScrollWidgetState([], [], 0));
+        this._onDidResize();
         this._readConfiguration();
         const stickyScrollDomNode = this._stickyScrollWidget.getDomNode();
         this._register(this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(114 )
-                || e.hasChanged(72 )
-                || e.hasChanged(66 )
-                || e.hasChanged(109 )) {
+            if (e.hasChanged(115 )
+                || e.hasChanged(73 )
+                || e.hasChanged(67 )
+                || e.hasChanged(110 )) {
                 this._readConfiguration();
             }
         }));
@@ -330,12 +331,12 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         const scrollTop = (foldingIcon.isCollapsed ?
             this._editor.getTopForLineNumber(foldingIcon.foldingEndLine)
             : this._editor.getTopForLineNumber(foldingIcon.foldingStartLine))
-            - this._editor.getOption(66 ) * stickyLine.index + 1;
+            - this._editor.getOption(67 ) * stickyLine.index + 1;
         this._editor.setScrollTop(scrollTop);
         this._renderStickyScroll(line);
     }
     _readConfiguration() {
-        const options = this._editor.getOption(114 );
+        const options = this._editor.getOption(115 );
         if (options.enabled === false) {
             this._editor.removeOverlayWidget(this._stickyScrollWidget);
             this._sessionStore.clear();
@@ -358,7 +359,7 @@ let StickyScrollController = class StickyScrollController extends Disposable {
             }));
             this._enabled = true;
         }
-        const lineNumberOption = this._editor.getOption(67 );
+        const lineNumberOption = this._editor.getOption(68 );
         if (lineNumberOption.renderType === 2 ) {
             this._sessionStore.add(this._editor.onDidChangeCursorPosition(() => {
                 this._showEndForLine = null;
@@ -384,7 +385,7 @@ let StickyScrollController = class StickyScrollController extends Disposable {
     }
     _onDidResize() {
         const layoutInfo = this._editor.getLayoutInfo();
-        const theoreticalLines = layoutInfo.height / this._editor.getOption(66 );
+        const theoreticalLines = layoutInfo.height / this._editor.getOption(67 );
         this._maxStickyLines = Math.round(theoreticalLines * .25);
     }
     async _renderStickyScroll(rebuildFromLine) {
@@ -428,8 +429,8 @@ let StickyScrollController = class StickyScrollController extends Disposable {
         }
     }
     findScrollWidgetState() {
-        const lineHeight = this._editor.getOption(66 );
-        const maxNumberStickyLines = Math.min(this._maxStickyLines, this._editor.getOption(114 ).maxLineCount);
+        const lineHeight = this._editor.getOption(67 );
+        const maxNumberStickyLines = Math.min(this._maxStickyLines, this._editor.getOption(115 ).maxLineCount);
         const scrollTop = this._editor.getScrollTop();
         let lastLineRelativePosition = 0;
         const startLineNumbers = [];

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js

@@ -30,7 +30,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
         this._sessionStore = this._register(( new DisposableStore()));
         this._updateSoon = this._register(( new RunOnceScheduler(() => this.update(), 50)));
         this._register(this._editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(114 )) {
+            if (e.hasChanged(115 )) {
                 this.readConfiguration();
             }
         }));
@@ -39,7 +39,7 @@ let StickyLineCandidateProvider = class StickyLineCandidateProvider extends Disp
     readConfiguration() {
         this._stickyModelProvider = null;
         this._sessionStore.clear();
-        this._options = this._editor.getOption(114 );
+        this._options = this._editor.getOption(115 );
         if (!this._options.enabled) {
             return;
         }

package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js

@@ -40,7 +40,7 @@ class StickyScrollWidget extends Disposable {
         this._lineNumbersDomNode = document.createElement('div');
         this._linesDomNodeScrollable = document.createElement('div');
         this._linesDomNode = document.createElement('div');
-        this._lineHeight = this._editor.getOption(66 );
+        this._lineHeight = this._editor.getOption(67 );
         this._renderedStickyLines = [];
         this._lineNumbers = [];
         this._lastLineRelativePosition = 0;
@@ -57,14 +57,14 @@ class StickyScrollWidget extends Disposable {
         this._rootDomNode.appendChild(this._lineNumbersDomNode);
         this._rootDomNode.appendChild(this._linesDomNodeScrollable);
         const updateScrollLeftPosition = () => {
-            this._linesDomNode.style.left = this._editor.getOption(114 ).scrollWithEditor ? `-${this._editor.getScrollLeft()}px` : '0px';
+            this._linesDomNode.style.left = this._editor.getOption(115 ).scrollWithEditor ? `-${this._editor.getScrollLeft()}px` : '0px';
         };
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(114 )) {
+            if (e.hasChanged(115 )) {
                 updateScrollLeftPosition();
             }
-            if (e.hasChanged(66 )) {
-                this._lineHeight = this._editor.getOption(66 );
+            if (e.hasChanged(67 )) {
+                this._lineHeight = this._editor.getOption(67 );
             }
         }));
         this._register(this._editor.onDidScrollChange((e) => {
@@ -201,7 +201,7 @@ class StickyScrollWidget extends Disposable {
         this._editor.layoutOverlayWidget(this);
     }
     _setFoldingHoverListeners() {
-        const showFoldingControls = this._editor.getOption(109 );
+        const showFoldingControls = this._editor.getOption(110 );
         if (showFoldingControls !== 'mouseover') {
             return;
         }
@@ -222,7 +222,7 @@ class StickyScrollWidget extends Disposable {
         }
         const viewLineNumber = viewModel.coordinatesConverter.convertModelPositionToViewPosition(( new Position(line, 1))).lineNumber;
         const lineRenderingData = viewModel.getViewLineRenderingData(viewLineNumber);
-        const lineNumberOption = this._editor.getOption(67 );
+        const lineNumberOption = this._editor.getOption(68 );
         let actualInlineDecorations;
         try {
             actualInlineDecorations = LineDecoration.filter(lineRenderingData.inlineDecorations, viewLineNumber, lineRenderingData.minColumn, lineRenderingData.maxColumn);
@@ -325,7 +325,7 @@ class StickyScrollWidget extends Disposable {
         return stickyLine;
     }
     _renderFoldingIconForLine(foldingModel, line) {
-        const showFoldingControls = this._editor.getOption(109 );
+        const showFoldingControls = this._editor.getOption(110 );
         if (!foldingModel || showFoldingControls === 'never') {
             return;
         }

package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js

@@ -103,8 +103,8 @@ let SuggestController = class SuggestController {
             select: (model, pos, items) => this._memoryService.select(model, pos, items)
         });
         const ctxInsertMode = Context.InsertMode.bindTo(_contextKeyService);
-        ctxInsertMode.set(editor.getOption(117 ).insertMode);
-        this._toDispose.add(this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(117 ).insertMode)));
+        ctxInsertMode.set(editor.getOption(118 ).insertMode);
+        this._toDispose.add(this.model.onDidTrigger(() => ctxInsertMode.set(editor.getOption(118 ).insertMode)));
         this.widget = this._toDispose.add(( new WindowIdleValue(getWindow(editor.getDomNode()), () => {
             const widget = this._instantiationService.createInstance(SuggestWidget, this.editor);
             this._toDispose.add(widget);
@@ -188,7 +188,7 @@ let SuggestController = class SuggestController {
             }
             let noFocus = false;
             if (e.triggerOptions.auto) {
-                const options = this.editor.getOption(117 );
+                const options = this.editor.getOption(118 );
                 if (options.selectionMode === 'never' || options.selectionMode === 'always') {
                     noFocus = options.selectionMode === 'never';
                 }
@@ -400,7 +400,7 @@ let SuggestController = class SuggestController {
     }
     getOverwriteInfo(item, toggleMode) {
         assertType(this.editor.hasModel());
-        let replace = this.editor.getOption(117 ).insertMode === 'replace';
+        let replace = this.editor.getOption(118 ).insertMode === 'replace';
         if (toggleMode) {
             replace = !replace;
         }

package/vscode/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js

@@ -100,7 +100,7 @@ let SuggestInlineCompletions = class SuggestInlineCompletions extends Disposable
         if (!editor) {
             return;
         }
-        const config = editor.getOption(88 );
+        const config = editor.getOption(89 );
         if (QuickSuggestionsOptions.isAllOff(config)) {
             return;
         }
@@ -142,7 +142,7 @@ let SuggestInlineCompletions = class SuggestInlineCompletions extends Disposable
             if (completions.needsClipboard) {
                 clipboardText = await this._clipboardService.readText();
             }
-            const completionModel = ( new CompletionModel(completions.items, position.column, ( new LineContext(leadingLineContents, 0)), WordDistance.None, editor.getOption(117 ), editor.getOption(111 ), { boostFullMatch: false, firstMatchCanBeWeak: false }, clipboardText));
+            const completionModel = ( new CompletionModel(completions.items, position.column, ( new LineContext(leadingLineContents, 0)), WordDistance.None, editor.getOption(118 ), editor.getOption(112 ), { boostFullMatch: false, firstMatchCanBeWeak: false }, clipboardText));
             result = ( new InlineCompletionResults(
                 model,
                 position.lineNumber,

package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.js

@@ -139,9 +139,9 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
     }
     _updateTriggerCharacters() {
         this._triggerCharacterListener.clear();
-        if (this._editor.getOption(90 )
+        if (this._editor.getOption(91 )
             || !this._editor.hasModel()
-            || !this._editor.getOption(120 )) {
+            || !this._editor.getOption(121 )) {
             return;
         }
         const supportsByTriggerCharacter = ( new Map());
@@ -265,10 +265,10 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
         }
     }
     _doTriggerQuickSuggest() {
-        if (QuickSuggestionsOptions.isAllOff(this._editor.getOption(88 ))) {
+        if (QuickSuggestionsOptions.isAllOff(this._editor.getOption(89 ))) {
             return;
         }
-        if (this._editor.getOption(117 ).snippetsPreventQuickSuggestions && SnippetController2.get(this._editor)?.isInSnippet()) {
+        if (this._editor.getOption(118 ).snippetsPreventQuickSuggestions && SnippetController2.get(this._editor)?.isInSnippet()) {
             return;
         }
         this.cancel();
@@ -284,7 +284,7 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
             }
             const model = this._editor.getModel();
             const pos = this._editor.getPosition();
-            const config = this._editor.getOption(88 );
+            const config = this._editor.getOption(89 );
             if (QuickSuggestionsOptions.isAllOff(config)) {
                 return;
             }
@@ -303,7 +303,7 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
                 return;
             }
             this.trigger({ auto: true });
-        }, this._editor.getOption(89 ));
+        }, this._editor.getOption(90 ));
     }
     _refilterCompletionItems() {
         assertType(this._editor.hasModel());
@@ -331,7 +331,7 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
             };
         }
         this._requestToken = ( new CancellationTokenSource());
-        const snippetSuggestions = this._editor.getOption(111 );
+        const snippetSuggestions = this._editor.getOption(112 );
         let snippetSortOrder = 1 ;
         switch (snippetSuggestions) {
             case 'top':
@@ -367,12 +367,12 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
             const ctx = ( new LineContext(model, this._editor.getPosition(), options));
             const fuzzySearchOptions = {
                 ...FuzzyScoreOptions.default,
-                firstMatchCanBeWeak: !this._editor.getOption(117 ).matchOnWordStartOnly
+                firstMatchCanBeWeak: !this._editor.getOption(118 ).matchOnWordStartOnly
             };
             this._completionModel = ( new CompletionModel(completions.items, this._context.column, {
                 leadingLineContent: ctx.leadingLineContent,
                 characterCountDelta: ctx.column - this._context.column
-            }, wordDistance, this._editor.getOption(117 ), this._editor.getOption(111 ), fuzzySearchOptions, clipboardText));
+            }, wordDistance, this._editor.getOption(118 ), this._editor.getOption(112 ), fuzzySearchOptions, clipboardText));
             this._completionDisposables.add(completions.disposable);
             this._onNewContext(ctx);
             this._reportDurationsTelemetry(completions.durations);
@@ -396,11 +396,11 @@ let SuggestModel = SuggestModel_1 = class SuggestModel {
     }
     static createSuggestFilter(editor) {
         const result = ( new Set());
-        const snippetSuggestions = editor.getOption(111 );
+        const snippetSuggestions = editor.getOption(112 );
         if (snippetSuggestions === 'none') {
             result.add(27 );
         }
-        const suggestOptions = editor.getOption(117 );
+        const suggestOptions = editor.getOption(118 );
         if (!suggestOptions.showMethods) {
             result.add(0 );
         }

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js

@@ -176,7 +176,7 @@ let SuggestWidget = class SuggestWidget {
         const details = this._disposables.add(instantiationService.createInstance(SuggestDetailsWidget, this.editor));
         details.onDidClose(this.toggleDetails, this, this._disposables);
         this._details = ( new SuggestDetailsOverlay(details, this.editor));
-        const applyIconStyle = () => this.element.domNode.classList.toggle('no-icons', !this.editor.getOption(117 ).showIcons);
+        const applyIconStyle = () => this.element.domNode.classList.toggle('no-icons', !this.editor.getOption(118 ).showIcons);
         applyIconStyle();
         const renderer = instantiationService.createInstance(ItemRenderer, this.editor);
         this._disposables.add(renderer);
@@ -246,7 +246,7 @@ let SuggestWidget = class SuggestWidget {
             listInactiveFocusOutline: activeContrastBorder
         }));
         this._status = instantiationService.createInstance(SuggestWidgetStatus, this.element.domNode, suggestWidgetStatusbarMenu);
-        const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(117 ).showStatusBar);
+        const applyStatusBarStyle = () => this.element.domNode.classList.toggle('with-status-bar', this.editor.getOption(118 ).showStatusBar);
         applyStatusBarStyle();
         this._disposables.add(_themeService.onDidColorThemeChange(t => this._onThemeChange(t)));
         this._onThemeChange(_themeService.getColorTheme());
@@ -256,11 +256,11 @@ let SuggestWidget = class SuggestWidget {
         this._disposables.add(this._list.onDidChangeFocus(e => this._onListFocus(e)));
         this._disposables.add(this.editor.onDidChangeCursorSelection(() => this._onCursorSelectionChanged()));
         this._disposables.add(this.editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(117 )) {
+            if (e.hasChanged(118 )) {
                 applyStatusBarStyle();
                 applyIconStyle();
             }
-            if (this._completionModel && (e.hasChanged(50 ) || e.hasChanged(118 ) || e.hasChanged(119 ))) {
+            if (this._completionModel && (e.hasChanged(50 ) || e.hasChanged(119 ) || e.hasChanged(120 ))) {
                 this._list.splice(0, this._list.length, this._completionModel.items);
             }
         }));
@@ -773,8 +773,8 @@ let SuggestWidget = class SuggestWidget {
     }
     getLayoutInfo() {
         const fontInfo = this.editor.getOption(50 );
-        const itemHeight = clamp(this.editor.getOption(119 ) || fontInfo.lineHeight, 8, 1000);
-        const statusBarHeight = !this.editor.getOption(117 ).showStatusBar || this._state === 2  || this._state === 1  ? 0 : itemHeight;
+        const itemHeight = clamp(this.editor.getOption(120 ) || fontInfo.lineHeight, 8, 1000);
+        const statusBarHeight = !this.editor.getOption(118 ).showStatusBar || this._state === 2  || this._state === 1  ? 0 : itemHeight;
         const borderWidth = this._details.widget.borderWidth;
         const borderHeight = 2 * borderWidth;
         return {

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js

@@ -57,8 +57,8 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         const options = this._editor.getOptions();
         const fontInfo = options.get(50 );
         const fontFamily = fontInfo.getMassagedFontFamily();
-        const fontSize = options.get(118 ) || fontInfo.fontSize;
-        const lineHeight = options.get(119 ) || fontInfo.lineHeight;
+        const fontSize = options.get(119 ) || fontInfo.fontSize;
+        const lineHeight = options.get(120 ) || fontInfo.lineHeight;
         const fontWeight = fontInfo.fontWeight;
         const fontSizePx = `${fontSize}px`;
         const lineHeightPx = `${lineHeight}px`;
@@ -71,7 +71,7 @@ let SuggestDetailsWidget = class SuggestDetailsWidget {
         this._close.style.width = lineHeightPx;
     }
     getLayoutInfo() {
-        const lineHeight = this._editor.getOption(119 ) || this._editor.getOption(50 ).lineHeight;
+        const lineHeight = this._editor.getOption(120 ) || this._editor.getOption(50 ).lineHeight;
         const borderWidth = this._borderWidth;
         const borderHeight = borderWidth * 2;
         return {

package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js

@@ -89,8 +89,8 @@ let ItemRenderer = class ItemRenderer {
             const fontInfo = options.get(50 );
             const fontFamily = fontInfo.getMassagedFontFamily();
             const fontFeatureSettings = fontInfo.fontFeatureSettings;
-            const fontSize = options.get(118 ) || fontInfo.fontSize;
-            const lineHeight = options.get(119 ) || fontInfo.lineHeight;
+            const fontSize = options.get(119 ) || fontInfo.fontSize;
+            const lineHeight = options.get(120 ) || fontInfo.lineHeight;
             const fontWeight = fontInfo.fontWeight;
             const letterSpacing = fontInfo.letterSpacing;
             const fontSizePx = `${fontSize}px`;
@@ -159,7 +159,7 @@ let ItemRenderer = class ItemRenderer {
             data.detailsLabel.textContent = stripNewLines(completion.label.description || '');
             data.root.classList.remove('string-label');
         }
-        if (this._editor.getOption(117 ).showInlineDetails) {
+        if (this._editor.getOption(118 ).showInlineDetails) {
             show(data.detailsLabel);
         }
         else {

package/vscode/src/vs/editor/contrib/suggest/browser/wordContextKey.js

@@ -8,7 +8,7 @@ let WordContextKey = class WordContextKey {
         this._editor = _editor;
         this._enabled = false;
         this._ckAtEnd = WordContextKey_1.AtEnd.bindTo(contextKeyService);
-        this._configListener = this._editor.onDidChangeConfiguration(e => e.hasChanged(122 ) && this._update());
+        this._configListener = this._editor.onDidChangeConfiguration(e => e.hasChanged(123 ) && this._update());
         this._update();
     }
     dispose() {
@@ -17,7 +17,7 @@ let WordContextKey = class WordContextKey {
         this._ckAtEnd.reset();
     }
     _update() {
-        const enabled = this._editor.getOption(122 ) === 'on';
+        const enabled = this._editor.getOption(123 ) === 'on';
         if (this._enabled === enabled) {
             return;
         }

package/vscode/src/vs/editor/contrib/suggest/browser/wordDistance.js

@@ -6,7 +6,7 @@ class WordDistance {
         distance() { return 0; }
     }; }
     static async create(service, editor) {
-        if (!editor.getOption(117 ).localityBonus) {
+        if (!editor.getOption(118 ).localityBonus) {
             return WordDistance.None;
         }
         if (!editor.hasModel()) {

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

@@ -1,17 +1,17 @@
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { TabFocus } from '../../../browser/config/tabFocus.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 class ToggleTabFocusModeAction extends Action2 {
     static { this.ID = 'editor.action.toggleTabFocusMode'; }
     constructor() {
         super({
             id: ToggleTabFocusModeAction.ID,
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode',
                 { key: 'toggle.tabMovesFocus', comment: ['Turn on/off use of tab key for moving focus around VS Code'] },
                 'Toggle Tab Key Moves Focus'
-            )), original: 'Toggle Tab Key Moves Focus' },
+            )),
             precondition: undefined,
             keybinding: {
                 primary: 2048  | 43 ,

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

@@ -101,13 +101,13 @@ let UnicodeHighlighter = class UnicodeHighlighter extends Disposable {
             this._bannerClosed = false;
             this._updateHighlighter();
         }));
-        this._options = _editor.getOption(124 );
+        this._options = _editor.getOption(125 );
         this._register(_workspaceTrustService.onDidChangeTrust(e => {
             this._updateHighlighter();
         }));
         this._register(_editor.onDidChangeConfiguration(e => {
-            if (e.hasChanged(124 )) {
-                this._options = _editor.getOption(124 );
+            if (e.hasChanged(125 )) {
+                this._options = _editor.getOption(125 );
                 this._updateHighlighter();
             }
         }));

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

@@ -21,10 +21,10 @@ let UnusualLineTerminatorsDetector = class UnusualLineTerminatorsDetector extend
         this._dialogService = _dialogService;
         this._codeEditorService = _codeEditorService;
         this._isPresentingDialog = false;
-        this._config = this._editor.getOption(125 );
+        this._config = this._editor.getOption(126 );
         this._register(this._editor.onDidChangeConfiguration((e) => {
-            if (e.hasChanged(125 )) {
-                this._config = this._editor.getOption(125 );
+            if (e.hasChanged(126 )) {
+                this._config = this._editor.getOption(126 );
                 this._checkForUnusualLineTerminators();
             }
         }));
@@ -54,7 +54,7 @@ let UnusualLineTerminatorsDetector = class UnusualLineTerminatorsDetector extend
         if (ignoreState === true) {
             return;
         }
-        if (this._editor.getOption(90 )) {
+        if (this._editor.getOption(91 )) {
             return;
         }
         if (this._config === 'auto') {

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

@@ -201,7 +201,7 @@ let WordHighlighter = class WordHighlighter {
         this.codeEditorService = codeEditorService;
         this._hasWordHighlights = ctxHasWordHighlights.bindTo(contextKeyService);
         this._ignorePositionChangeEvent = false;
-        this.occurrencesHighlight = this.editor.getOption(80 );
+        this.occurrencesHighlight = this.editor.getOption(81 );
         this.model = this.editor.getModel();
         this.toUnhook.add(editor.onDidChangeCursorPosition((e) => {
             if (this._ignorePositionChangeEvent) {
@@ -212,6 +212,14 @@ let WordHighlighter = class WordHighlighter {
             }
             this._onPositionChanged(e);
         }));
+        this.toUnhook.add(editor.onDidFocusEditorText((e) => {
+            if (this.occurrencesHighlight === 'off') {
+                return;
+            }
+            if (!this.workerRequest) {
+                this._run();
+            }
+        }));
         this.toUnhook.add(editor.onDidChangeModelContent((e) => {
             this._stopAll();
         }));
@@ -226,7 +234,7 @@ let WordHighlighter = class WordHighlighter {
             }
         }));
         this.toUnhook.add(editor.onDidChangeConfiguration((e) => {
-            const newValue = this.editor.getOption(80 );
+            const newValue = this.editor.getOption(81 );
             if (this.occurrencesHighlight !== newValue) {
                 this.occurrencesHighlight = newValue;
                 this._stopAll();
@@ -316,6 +324,7 @@ let WordHighlighter = class WordHighlighter {
     }
     _removeAllDecorations() {
         const currentEditors = this.codeEditorService.listCodeEditors();
+        const deleteURI = [];
         for (const editor of currentEditors) {
             if (!editor.hasModel()) {
                 continue;
@@ -325,20 +334,24 @@ let WordHighlighter = class WordHighlighter {
                 continue;
             }
             editor.removeDecorations(currentDecorationIDs);
-            WordHighlighter_1.storedDecorations.delete(editor.getModel().uri);
+            deleteURI.push(editor.getModel().uri);
             const editorHighlighterContrib = WordHighlighterContribution.get(editor);
             if (!editorHighlighterContrib?.wordHighlighter) {
                 continue;
             }
             if (editorHighlighterContrib.wordHighlighter.decorations.length > 0) {
                 editorHighlighterContrib.wordHighlighter.decorations.clear();
+                editorHighlighterContrib.wordHighlighter.workerRequest = null;
                 editorHighlighterContrib.wordHighlighter._hasWordHighlights.set(false);
             }
         }
+        for (const uri of deleteURI) {
+            WordHighlighter_1.storedDecorations.delete(uri);
+        }
     }
     _stopSingular() {
         this._removeSingleDecorations();
-        if (this.editor.hasWidgetFocus()) {
+        if (this.editor.hasTextFocus()) {
             if (this.editor.getModel()?.uri.scheme !== Schemas.vscodeNotebookCell && WordHighlighter_1.query?.modelInfo?.model.uri.scheme !== Schemas.vscodeNotebookCell) {
                 WordHighlighter_1.query = null;
                 this._run();
@@ -447,14 +460,16 @@ let WordHighlighter = class WordHighlighter {
     }
     _run() {
         let workerRequestIsValid;
-        if (!this.editor.hasWidgetFocus()) {
-            if (WordHighlighter_1.query === null) {
+        const hasTextFocus = this.editor.hasTextFocus();
+        if (!hasTextFocus) {
+            if (!WordHighlighter_1.query) {
                 return;
             }
         }
         else {
             const editorSelection = this.editor.getSelection();
             if (!editorSelection || editorSelection.startLineNumber !== editorSelection.endLineNumber) {
+                WordHighlighter_1.query = null;
                 this._stopAll();
                 return;
             }
@@ -488,15 +503,10 @@ let WordHighlighter = class WordHighlighter {
             const myRequestId = ++this.workerRequestTokenId;
             this.workerRequestCompleted = false;
             const otherModelsToHighlight = this.getOtherModelsToHighlight(this.editor.getModel());
-            const sendWord = (!WordHighlighter_1.query.modelInfo && WordHighlighter_1.query.word) ||
-                (WordHighlighter_1.query.modelInfo?.model.uri !== this.model.uri)
-                ? true : false;
-            if (!WordHighlighter_1.query.modelInfo || (WordHighlighter_1.query.modelInfo.model.uri !== this.model.uri)) {
-                this.workerRequest = this.computeWithModel(this.model, this.editor.getSelection(), sendWord ? WordHighlighter_1.query.word : null, otherModelsToHighlight);
-            }
-            else {
-                this.workerRequest = this.computeWithModel(WordHighlighter_1.query.modelInfo.model, WordHighlighter_1.query.modelInfo.selection, WordHighlighter_1.query.word, otherModelsToHighlight);
+            if (!WordHighlighter_1.query.modelInfo || WordHighlighter_1.query.modelInfo.model.isDisposed()) {
+                return;
             }
+            this.workerRequest = this.computeWithModel(WordHighlighter_1.query.modelInfo.model, WordHighlighter_1.query.modelInfo.selection, WordHighlighter_1.query.word, otherModelsToHighlight);
             this.workerRequest?.result.then(data => {
                 if (myRequestId === this.workerRequestTokenId) {
                     this.workerRequestCompleted = true;
@@ -508,10 +518,10 @@ let WordHighlighter = class WordHighlighter {
     }
     computeWithModel(model, selection, word, otherModels) {
         if (!otherModels.length) {
-            return computeOccurencesAtPosition(this.providers, model, selection, word, this.editor.getOption(129 ));
+            return computeOccurencesAtPosition(this.providers, model, selection, word, this.editor.getOption(130 ));
         }
         else {
-            return computeOccurencesMultiModel(this.multiDocumentProviders, model, selection, word, this.editor.getOption(129 ), otherModels);
+            return computeOccurencesMultiModel(this.multiDocumentProviders, model, selection, word, this.editor.getOption(130 ), otherModels);
         }
     }
     _beginRenderDecorations() {
@@ -542,6 +552,9 @@ let WordHighlighter = class WordHighlighter {
                 const newDocumentHighlights = this.workerRequestValue.get(uri);
                 if (newDocumentHighlights) {
                     for (const highlight of newDocumentHighlights) {
+                        if (!highlight.range) {
+                            continue;
+                        }
                         newDecorations.push({
                             range: highlight.range,
                             options: getHighlightDecorationOptions(highlight.kind)

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

@@ -23,7 +23,7 @@ class MoveWordCommand extends EditorCommand {
         if (!editor.hasModel()) {
             return;
         }
-        const wordSeparators = getMapForWordSeparators(editor.getOption(129 ));
+        const wordSeparators = getMapForWordSeparators(editor.getOption(130 ));
         const model = editor.getModel();
         const selections = editor.getSelections();
         const result = ( selections.map((sel) => {
@@ -269,7 +269,7 @@ class DeleteWordCommand extends EditorCommand {
         if (!editor.hasModel()) {
             return;
         }
-        const wordSeparators = getMapForWordSeparators(editor.getOption(129 ));
+        const wordSeparators = getMapForWordSeparators(editor.getOption(130 ));
         const model = editor.getModel();
         const selections = editor.getSelections();
         const autoClosingBrackets = editor.getOption(6 );
@@ -404,7 +404,7 @@ class DeleteInsideWord extends EditorAction {
         if (!editor.hasModel()) {
             return;
         }
-        const wordSeparators = getMapForWordSeparators(editor.getOption(129 ));
+        const wordSeparators = getMapForWordSeparators(editor.getOption(130 ));
         const model = editor.getModel();
         const selections = editor.getSelections();
         const commands = ( selections.map((sel) => {

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

@@ -222,6 +222,10 @@ class ZoneWidget {
             this.editor.changeViewZones(accessor => {
                 accessor.layoutZone(this._viewZone.id);
             });
+            this._positionMarkerId.set([{
+                    range: Range.isIRange(rangeOrPos) ? rangeOrPos : Range.fromPositions(rangeOrPos),
+                    options: ModelDecorationOptions.EMPTY
+                }]);
         }
     }
     hide() {
@@ -241,7 +245,7 @@ class ZoneWidget {
         this._positionMarkerId.clear();
     }
     _decoratingElementsHeight() {
-        const lineHeight = this.editor.getOption(66 );
+        const lineHeight = this.editor.getOption(67 );
         let result = 0;
         if (this.options.showArrow) {
             const arrowHeight = Math.round(lineHeight / 3);
@@ -261,7 +265,7 @@ class ZoneWidget {
         this.domNode.style.left = this._getLeft(layoutInfo) + 'px';
         const viewZoneDomNode = document.createElement('div');
         viewZoneDomNode.style.overflow = 'hidden';
-        const lineHeight = this.editor.getOption(66 );
+        const lineHeight = this.editor.getOption(67 );
         if (!this.options.allowUnlimitedHeight) {
             const maxHeightInLines = Math.max(12, (this.editor.getLayoutInfo().height / lineHeight) * 0.8);
             heightInLines = Math.min(heightInLines, maxHeightInLines);
@@ -373,7 +377,7 @@ class ZoneWidget {
         }));
         this._disposables.add(this._resizeSash.onDidChange((evt) => {
             if (data) {
-                const lineDelta = (evt.currentY - data.startY) / this.editor.getOption(66 );
+                const lineDelta = (evt.currentY - data.startY) / this.editor.getOption(67 );
                 const roundedLineDelta = lineDelta < 0 ? Math.ceil(lineDelta) : Math.floor(lineDelta);
                 const newHeightInLines = data.heightInLines + roundedLineDelta;
                 if (newHeightInLines > 5 && newHeightInLines < 35) {