@codingame/monaco-vscode-api 19.1.3 → 20.0.0

package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLines.js

@@ -17,6 +17,7 @@ import { Range } from '../../../common/core/range.js';
 import { ScrollType } from '../../../common/editorCommon.js';
 import { VerticalRevealType } from '../../../common/viewEvents.js';
 import { ViewLineOptions } from './viewLineOptions.js';
+import { TextDirection } from '../../../common/model.js';
 import { createElement } from '../../../../base/browser/dom.js';
 
 registerCss(viewLines);
@@ -330,7 +331,8 @@ class ViewLines extends ViewPart {
             const startColumn = lineNumber === range.startLineNumber ? range.startColumn : 1;
             const continuesInNextLine = lineNumber !== originalEndLineNumber;
             const endColumn = continuesInNextLine ? this._context.viewModel.getLineMaxColumn(lineNumber) : range.endColumn;
-            const visibleRangesForLine = this._visibleLines.getVisibleLine(lineNumber).getVisibleRangesForRange(lineNumber, startColumn, endColumn, domReadingContext);
+            const visibleLine = this._visibleLines.getVisibleLine(lineNumber);
+            const visibleRangesForLine = visibleLine.getVisibleRangesForRange(lineNumber, startColumn, endColumn, domReadingContext);
             if (!visibleRangesForLine) {
                 continue;
             }
@@ -338,7 +340,11 @@ class ViewLines extends ViewPart {
                 const currentLineModelLineNumber = nextLineModelLineNumber;
                 nextLineModelLineNumber = this._context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(( new Position(lineNumber + 1, 1))).lineNumber;
                 if (currentLineModelLineNumber !== nextLineModelLineNumber) {
-                    visibleRangesForLine.ranges[visibleRangesForLine.ranges.length - 1].width += this._typicalHalfwidthCharacterWidth;
+                    const floatHorizontalRange = visibleRangesForLine.ranges[visibleRangesForLine.ranges.length - 1];
+                    floatHorizontalRange.width += this._typicalHalfwidthCharacterWidth;
+                    if (this._context.viewModel.getTextDirection(currentLineModelLineNumber) === TextDirection.RTL) {
+                        floatHorizontalRange.left -= this._typicalHalfwidthCharacterWidth;
+                    }
                 }
             }
             visibleRanges[visibleRangesLen++] = ( new LineVisibleRanges(
@@ -366,6 +372,13 @@ class ViewLines extends ViewPart {
         this._updateLineWidthsSlowIfDomDidLayout(domReadingContext);
         return result;
     }
+    _lineIsRenderedRTL(lineNumber) {
+        if (lineNumber < this._visibleLines.getStartLineNumber() || lineNumber > this._visibleLines.getEndLineNumber()) {
+            return false;
+        }
+        const visibleLine = this._visibleLines.getVisibleLine(lineNumber);
+        return visibleLine.isRenderedRTL();
+    }
     visibleRangeForPosition(position) {
         const visibleRanges = this._visibleRangesForLineRange(position.lineNumber, position.column, position.column);
         if (!visibleRanges) {
@@ -454,7 +467,7 @@ class ViewLines extends ViewPart {
                 this.onDidRender();
                 const newScrollLeft = this._computeScrollLeftToReveal(horizontalRevealRequest);
                 if (newScrollLeft) {
-                    if (!this._isViewportWrapping) {
+                    if (!this._isViewportWrapping && !newScrollLeft.hasRTL) {
                         this._ensureMaxLineWidth(newScrollLeft.maxHorizontalOffset);
                     }
                     this._context.viewModel.viewLayout.setScrollPosition({
@@ -581,7 +594,9 @@ class ViewLines extends ViewPart {
         const viewportEndX = viewportStartX + viewport.width - layoutInfo.verticalScrollbarWidth;
         let boxStartX = Constants.MAX_SAFE_SMALL_INTEGER;
         let boxEndX = 0;
+        let hasRTL = false;
         if (horizontalRevealRequest.type === 'range') {
+            hasRTL = this._lineIsRenderedRTL(horizontalRevealRequest.lineNumber);
             const visibleRanges = this._visibleRangesForLineRange(horizontalRevealRequest.lineNumber, horizontalRevealRequest.startColumn, horizontalRevealRequest.endColumn);
             if (!visibleRanges) {
                 return null;
@@ -597,6 +612,7 @@ class ViewLines extends ViewPart {
                     return null;
                 }
                 const visibleRanges = this._visibleRangesForLineRange(selection.startLineNumber, selection.startColumn, selection.endColumn);
+                hasRTL ||= this._lineIsRenderedRTL(selection.startLineNumber);
                 if (!visibleRanges) {
                     return null;
                 }
@@ -616,7 +632,8 @@ class ViewLines extends ViewPart {
         const newScrollLeft = this._computeMinimumScrolling(viewportStartX, viewportEndX, boxStartX, boxEndX);
         return {
             scrollLeft: newScrollLeft,
-            maxHorizontalOffset: boxEndX
+            maxHorizontalOffset: boxEndX,
+            hasRTL
         };
     }
     _computeMinimumScrolling(viewportStart, viewportEnd, boxStart, boxEnd, revealAtStart, revealAtEnd) {

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.d.ts

@@ -30,7 +30,7 @@ import { IInstantiationService, ServicesAccessor } from "../../../../platform/in
 import { INotificationService } from "../../../../platform/notification/common/notification.service.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
 import { MenuId } from "../../../../platform/actions/common/actions.js";
-import { TextModelEditReason } from "../../../common/textModelEditReason.js";
+import { TextModelEditSource } from "../../../common/textModelEditSource.js";
 import { TextEdit } from "../../../common/core/edits/textEdit.js";
 import { IKeybindingService } from "../../../../platform/keybinding/common/keybinding.service.js";
 export declare class CodeEditorWidget extends Disposable implements editorBrowser.ICodeEditor {
@@ -255,8 +255,8 @@ export declare class CodeEditorWidget extends Disposable implements editorBrowse
     _getViewModel(): IViewModel | null;
     pushUndoStop(): boolean;
     popUndoStop(): boolean;
-    edit(edit: TextEdit, reason: TextModelEditReason): boolean;
-    executeEdits(source: string | null | undefined | TextModelEditReason, edits: IIdentifiedSingleEditOperation[], endCursorState?: ICursorStateComputer | Selection[]): boolean;
+    edit(edit: TextEdit, reason: TextModelEditSource): boolean;
+    executeEdits(source: string | null | undefined | TextModelEditSource, edits: IIdentifiedSingleEditOperation[], endCursorState?: ICursorStateComputer | Selection[]): boolean;
     executeCommand(source: string | null | undefined, command: editorCommon.ICommand): void;
     executeCommands(source: string | null | undefined, commands: editorCommon.ICommand[]): void;
     createDecorationsCollection(decorations?: IModelDeltaDecoration[]): EditorDecorationsCollection;

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -60,7 +60,7 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
-import { TextModelEditReason, EditReasons } from '../../../common/textModelEditReason.js';
+import { TextModelEditSource, EditSources } from '../../../common/textModelEditSource.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import Severity$1 from '../../../../base/common/severity.js';
 
@@ -967,12 +967,12 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         }
         let sourceStr;
         let reason;
-        if (source instanceof TextModelEditReason) {
+        if (source instanceof TextModelEditSource) {
             reason = source;
             sourceStr = source.metadata.source;
         }
         else {
-            reason = EditReasons.unknown({ name: sourceStr });
+            reason = EditSources.unknown({ name: sourceStr });
             sourceStr = source;
         }
         this._onBeforeExecuteEdit.fire({ source: sourceStr ?? undefined });

package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js

@@ -539,6 +539,7 @@ let View = class View extends Disposable {
     _getLineHtml(model, options, tabSize, lineNumber, languageIdCodec) {
         const lineContent = model.getLineContent(lineNumber);
         const fontInfo = options.get(EditorOption.fontInfo);
+        const verticalScrollbarSize = options.get(EditorOption.scrollbar).verticalScrollbarSize;
         const lineTokens = LineTokens.createEmpty(lineContent, languageIdCodec);
         const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, model.mightContainNonBasicASCII());
         const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, model.mightContainRTL());
@@ -561,7 +562,9 @@ let View = class View extends Disposable {
             options.get(EditorOption.renderWhitespace),
             options.get(EditorOption.renderControlCharacters),
             options.get(EditorOption.fontLigatures) !== EditorFontLigatures.OFF,
-            null
+            null,
+            null,
+            verticalScrollbarSize
         )));
         return r.html;
     }

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js

@@ -19,10 +19,10 @@ import { LineRange } from '../../../../../common/core/ranges/lineRange.js';
 import { Position } from '../../../../../common/core/position.js';
 import { ScrollType } from '../../../../../common/editorCommon.js';
 import { BackgroundTokenizationState } from '../../../../../common/tokenizationTextModelPart.js';
-import { InlineDecoration, InlineDecorationType } from '../../../../../common/viewModel.js';
 import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
 import { Range } from '../../../../../common/core/range.js';
+import { InlineDecoration, InlineDecorationType } from '../../../../../common/viewModel/inlineDecorations.js';
 import { observableValue } from '../../../../../../base/common/observableInternal/observables/observableValue.js';
 import { derived } from '../../../../../../base/common/observableInternal/observables/derived.js';
 import { observableFromEvent } from '../../../../../../base/common/observableInternal/observables/observableFromEvent.js';

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.d.ts

@@ -3,7 +3,7 @@ import { EditorOption, FindComputedEditorOptionValueById } from "../../../../../
 import { FontInfo } from "../../../../../common/config/fontInfo.js";
 import { ModelLineProjectionData } from "../../../../../common/modelLineProjectionData.js";
 import { LineTokens } from "../../../../../common/tokens/lineTokens.js";
-import { InlineDecoration } from "../../../../../common/viewModel.js";
+import { InlineDecoration } from "../../../../../common/viewModel/inlineDecorations.js";
 export declare function renderLines(source: LineSource, options: RenderOptions, decorations: InlineDecoration[], domNode: HTMLElement, noExtra?: boolean): RenderLinesResult;
 export declare class LineSource {
     readonly lineTokens: LineTokens[];
@@ -24,9 +24,10 @@ export declare class RenderOptions {
     readonly renderWhitespace: FindComputedEditorOptionValueById<EditorOption.renderWhitespace>;
     readonly renderControlCharacters: boolean;
     readonly fontLigatures: FindComputedEditorOptionValueById<EditorOption.fontLigatures>;
+    readonly verticalScrollbarSize: number;
     readonly setWidth: boolean;
     static fromEditor(editor: ICodeEditor): RenderOptions;
-    constructor(tabSize: number, fontInfo: FontInfo, disableMonospaceOptimizations: boolean, typicalHalfwidthCharacterWidth: number, scrollBeyondLastColumn: number, lineHeight: number, lineDecorationsWidth: number, stopRenderingLineAfter: number, renderWhitespace: FindComputedEditorOptionValueById<EditorOption.renderWhitespace>, renderControlCharacters: boolean, fontLigatures: FindComputedEditorOptionValueById<EditorOption.fontLigatures>, setWidth?: boolean);
+    constructor(tabSize: number, fontInfo: FontInfo, disableMonospaceOptimizations: boolean, typicalHalfwidthCharacterWidth: number, scrollBeyondLastColumn: number, lineHeight: number, lineDecorationsWidth: number, stopRenderingLineAfter: number, renderWhitespace: FindComputedEditorOptionValueById<EditorOption.renderWhitespace>, renderControlCharacters: boolean, fontLigatures: FindComputedEditorOptionValueById<EditorOption.fontLigatures>, verticalScrollbarSize: number, setWidth?: boolean);
     withSetWidth(setWidth: boolean): RenderOptions;
     withScrollBeyondLastColumn(scrollBeyondLastColumn: number): RenderOptions;
 }

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js

@@ -71,10 +71,11 @@ class RenderOptions {
             modifiedEditorOptions.get(EditorOption.stopRenderingLineAfter),
             modifiedEditorOptions.get(EditorOption.renderWhitespace),
             modifiedEditorOptions.get(EditorOption.renderControlCharacters),
-            modifiedEditorOptions.get(EditorOption.fontLigatures)
+            modifiedEditorOptions.get(EditorOption.fontLigatures),
+            modifiedEditorOptions.get(EditorOption.scrollbar).verticalScrollbarSize
         ));
     }
-    constructor(tabSize, fontInfo, disableMonospaceOptimizations, typicalHalfwidthCharacterWidth, scrollBeyondLastColumn, lineHeight, lineDecorationsWidth, stopRenderingLineAfter, renderWhitespace, renderControlCharacters, fontLigatures, setWidth = true) {
+    constructor(tabSize, fontInfo, disableMonospaceOptimizations, typicalHalfwidthCharacterWidth, scrollBeyondLastColumn, lineHeight, lineDecorationsWidth, stopRenderingLineAfter, renderWhitespace, renderControlCharacters, fontLigatures, verticalScrollbarSize, setWidth = true) {
         this.tabSize = tabSize;
         this.fontInfo = fontInfo;
         this.disableMonospaceOptimizations = disableMonospaceOptimizations;
@@ -86,6 +87,7 @@ class RenderOptions {
         this.renderWhitespace = renderWhitespace;
         this.renderControlCharacters = renderControlCharacters;
         this.fontLigatures = fontLigatures;
+        this.verticalScrollbarSize = verticalScrollbarSize;
         this.setWidth = setWidth;
     }
     withSetWidth(setWidth) {
@@ -101,6 +103,7 @@ class RenderOptions {
             this.renderWhitespace,
             this.renderControlCharacters,
             this.fontLigatures,
+            this.verticalScrollbarSize,
             setWidth
         ));
     }
@@ -117,6 +120,7 @@ class RenderOptions {
             this.renderWhitespace,
             this.renderControlCharacters,
             this.fontLigatures,
+            this.verticalScrollbarSize,
             this.setWidth
         ));
     }
@@ -156,7 +160,9 @@ function renderOriginalLine(viewLineIdx, lineTokens, decorations, hasCharChanges
         options.renderWhitespace,
         options.renderControlCharacters,
         options.fontLigatures !== EditorFontLigatures.OFF,
-        null
+        null,
+        null,
+        options.verticalScrollbarSize
     )), sb);
     sb.appendString('</div>');
     return output.characterMapping.getHorizontalOffset(output.characterMapping.length);

package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.d.ts

@@ -1,4 +1,4 @@
-import { MarkdownRenderOptions, MarkedOptions } from "../../../../../base/browser/markdownRenderer.js";
+import { MarkdownRenderOptions } from "../../../../../base/browser/markdownRenderer.js";
 import { IMarkdownString, MarkdownStringTrustedOptions } from "../../../../../base/common/htmlContent.js";
 import { IDisposable } from "../../../../../base/common/lifecycle.js";
 import { IOpenerService } from "../../../../../platform/opener/common/opener.service.js";
@@ -18,7 +18,7 @@ export declare class MarkdownRenderer {
     private readonly _openerService;
     private static _ttpTokenizer;
     constructor(_options: IMarkdownRendererOptions, _languageService: ILanguageService, _openerService: IOpenerService);
-    render(markdown: IMarkdownString | undefined, options?: MarkdownRenderOptions, markedOptions?: MarkedOptions): IMarkdownRenderResult;
+    render(markdown: IMarkdownString | undefined, options?: MarkdownRenderOptions, outElement?: HTMLElement): IMarkdownRenderResult;
     private _getRenderOptions;
     protected openMarkdownLink(link: string, markdown: IMarkdownString): Promise<void>;
 }

package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.js

@@ -1,8 +1,8 @@
 
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
-import { createElement } from '../../../../../base/browser/dom.js';
 import { renderMarkdown } from '../../../../../base/browser/markdownRenderer.js';
+import { createElement } from '../../../../../base/browser/dom.js';
 import { createTrustedTypesPolicy } from '../../../../../base/browser/trustedTypes.js';
 import { onUnexpectedError } from '../../../../../base/common/errors.js';
 import { DisposableStore } from '../../../../../base/common/lifecycle.js';
@@ -28,13 +28,13 @@ let MarkdownRenderer = class MarkdownRenderer {
         this._languageService = _languageService;
         this._openerService = _openerService;
     }
-    render(markdown, options, markedOptions) {
+    render(markdown, options, outElement) {
         if (!markdown) {
-            const element = createElement('span');
+            const element = outElement ?? createElement('span');
             return { element, dispose: () => { } };
         }
         const disposables = ( new DisposableStore());
-        const rendered = disposables.add(renderMarkdown(markdown, { ...this._getRenderOptions(markdown, disposables), ...options }, markedOptions));
+        const rendered = disposables.add(renderMarkdown(markdown, { ...this._getRenderOptions(markdown, disposables), ...options }, outElement));
         rendered.element.classList.add('rendered-markdown');
         return {
             element: rendered.element,

package/vscode/src/vs/editor/common/commands/surroundSelectionCommand.js

@@ -20,7 +20,7 @@ class SurroundSelectionCommand {
             this._range.endColumn,
             this._range.endLineNumber,
             this._range.endColumn
-        )), this._charAfterSelection);
+        )), this._charAfterSelection || null);
     }
     computeCursorState(model, helper) {
         const inverseEditOperations = helper.getInverseEditOperations();

package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js

@@ -20,7 +20,7 @@ const editorConfiguration = {
             type: 'number',
             default: EDITOR_MODEL_DEFAULTS.tabSize,
             minimum: 1,
-            maximum: 16,
+            maximum: 100,
             markdownDescription: ( localize(
                 215,
                 "The number of spaces a tab is equal to. This setting is overridden based on the file contents when {0} is on.",
@@ -155,7 +155,10 @@ const editorConfiguration = {
                 235,
                 "Controls whether tree sitter parsing should be turned on and telemetry collected. Setting `editor.experimental.preferTreeSitter` for specific languages will take precedence."
             )),
-            tags: ['experimental', 'onExP']
+            tags: ['experimental'],
+            experiment: {
+                mode: 'startup'
+            }
         },
         'editor.experimental.preferTreeSitter.css': {
             type: 'boolean',
@@ -164,7 +167,10 @@ const editorConfiguration = {
                 236,
                 "Controls whether tree sitter parsing should be turned on for css. This will take precedence over `editor.experimental.treeSitterTelemetry` for css."
             )),
-            tags: ['experimental', 'onExP']
+            tags: ['experimental'],
+            experiment: {
+                mode: 'startup'
+            }
         },
         'editor.experimental.preferTreeSitter.typescript': {
             type: 'boolean',
@@ -173,7 +179,10 @@ const editorConfiguration = {
                 237,
                 "Controls whether tree sitter parsing should be turned on for typescript. This will take precedence over `editor.experimental.treeSitterTelemetry` for typescript."
             )),
-            tags: ['experimental', 'onExP']
+            tags: ['experimental'],
+            experiment: {
+                mode: 'startup'
+            }
         },
         'editor.experimental.preferTreeSitter.ini': {
             type: 'boolean',
@@ -182,7 +191,10 @@ const editorConfiguration = {
                 238,
                 "Controls whether tree sitter parsing should be turned on for ini. This will take precedence over `editor.experimental.treeSitterTelemetry` for ini."
             )),
-            tags: ['experimental', 'onExP']
+            tags: ['experimental'],
+            experiment: {
+                mode: 'startup'
+            }
         },
         'editor.experimental.preferTreeSitter.regex': {
             type: 'boolean',
@@ -191,7 +203,10 @@ const editorConfiguration = {
                 239,
                 "Controls whether tree sitter parsing should be turned on for regex. This will take precedence over `editor.experimental.treeSitterTelemetry` for regex."
             )),
-            tags: ['experimental', 'onExP']
+            tags: ['experimental'],
+            experiment: {
+                mode: 'startup'
+            }
         },
         'editor.language.brackets': {
             type: ['array', 'null'],