From 2a243d07feb59ccdefa415f7d58ce862b762ff24 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Mon, 24 Jan 2022 11:49:42 +0100 Subject: [PATCH] Fixes nightly release --- package-lock.json | 24 +- package.json | 4 +- test/unit/all.js | 3 +- website/playground/monaco.d.ts.txt | 374 +++++++++++++++-------------- website/typedoc/monaco.d.ts | 374 +++++++++++++++-------------- 5 files changed, 408 insertions(+), 371 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6c87d145..3e303a0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -61,9 +61,9 @@ "dev": true }, "acorn": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", - "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", + "integrity": "sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==", "dev": true }, "acorn-globals": { @@ -972,9 +972,9 @@ } }, "jsdom": { - "version": "18.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-18.1.0.tgz", - "integrity": "sha512-q6QFAfSGLEUqRJ+GCV6vn6ItZCMARWh1d33wiJZPxc+wMNw7HK71JPmQ4C2lIZAsBH8TiJu4uplach/UcrC6bQ==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-19.0.0.tgz", + "integrity": "sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==", "dev": true, "requires": { "abab": "^2.0.5", @@ -1159,9 +1159,9 @@ } }, "monaco-editor-core": { - "version": "0.32.0-dev.20220110", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.32.0-dev.20220110.tgz", - "integrity": "sha512-XF6xIUAmziM57p+lorG3IXHg0jCuxIL6mqv0WhXcSmtg4oEJFAQy/aT9+3fDbDIyJ+b0oSJga2e38K5PH5ajJQ==", + "version": "0.32.0-dev.20220124", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.32.0-dev.20220124.tgz", + "integrity": "sha512-R1MawhuYlGGRNI2jF2jC1z894XGG9NyQnZ6TXLgo88ygaAQUvxp0q4pQp+rkL0x2Q0DZF1CbvclKJlxfniAdiw==", "dev": true }, "mri": { @@ -1962,9 +1962,9 @@ "dev": true }, "ws": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", - "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz", + "integrity": "sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==", "dev": true }, "xml-name-validator": { diff --git a/package.json b/package.json index 32fd7619..5d4cc960 100644 --- a/package.json +++ b/package.json @@ -38,10 +38,10 @@ "esbuild-plugin-alias": "^0.2.1", "glob": "^7.2.0", "husky": "^7.0.4", - "jsdom": "^18.1.0", + "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.1.3", - "monaco-editor-core": "0.32.0-dev.20220110", + "monaco-editor-core": "0.32.0-dev.20220124", "playwright": "^1.16.3", "prettier": "^2.4.1", "pretty-quick": "^3.1.1", diff --git a/test/unit/all.js b/test/unit/all.js index ab080a30..49edd26d 100644 --- a/test/unit/all.js +++ b/test/unit/all.js @@ -21,13 +21,14 @@ global.self = global; global.document.queryCommandSupported = function () { return false; }; + global.window = { location: {}, navigator: tmp.window.navigator, matchMedia: function () { return { matches: false, - addListener: function () {} + addEventListener: function () {} }; } }; diff --git a/website/playground/monaco.d.ts.txt b/website/playground/monaco.d.ts.txt index 86df5b53..8ae98738 100644 --- a/website/playground/monaco.d.ts.txt +++ b/website/playground/monaco.d.ts.txt @@ -1356,6 +1356,44 @@ declare namespace monaco.editor { id: string; } + /** + * A single edit operation, that acts as a simple replace. + * i.e. Replace text at `range` with `text` in model. + */ + export interface ISingleEditOperation { + /** + * The range to replace. This can be empty to emulate a simple insert. + */ + range: IRange; + /** + * The text to replace with. This can be null to emulate a simple delete. + */ + text: string | null; + /** + * This indicates that this operation has "insert" semantics. + * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved. + */ + forceMoveMarkers?: boolean; + } + + /** + * Word inside a model. + */ + export interface IWordAtPosition { + /** + * The word. + */ + readonly word: string; + /** + * The column where the word starts. + */ + readonly startColumn: number; + /** + * The column where the word ends. + */ + readonly endColumn: number; + } + /** * Vertical Lane in the overview ruler of the editor. */ @@ -1511,6 +1549,18 @@ declare namespace monaco.editor { * The data can be read when injected texts at a given position are queried. */ readonly attachedData?: unknown; + /** + * Configures cursor stops around injected text. + * Defaults to {@link InjectedTextCursorStops.Both}. + */ + readonly cursorStops?: InjectedTextCursorStops | null; + } + + export enum InjectedTextCursorStops { + Both = 0, + Right = 1, + Left = 2, + None = 3 } /** @@ -1549,24 +1599,6 @@ declare namespace monaco.editor { readonly options: IModelDecorationOptions; } - /** - * Word inside a model. - */ - export interface IWordAtPosition { - /** - * The word. - */ - readonly word: string; - /** - * The column where the word starts. - */ - readonly startColumn: number; - /** - * The column where the word ends. - */ - readonly endColumn: number; - } - /** * End of line character preference. */ @@ -1613,26 +1645,6 @@ declare namespace monaco.editor { CRLF = 1 } - /** - * A single edit operation, that acts as a simple replace. - * i.e. Replace text at `range` with `text` in model. - */ - export interface ISingleEditOperation { - /** - * The range to replace. This can be empty to emulate a simple insert. - */ - range: IRange; - /** - * The text to replace with. This can be null to emulate a simple delete. - */ - text: string | null; - /** - * This indicates that this operation has "insert" semantics. - * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved. - */ - forceMoveMarkers?: boolean; - } - /** * A single edit operation, that has an identifier. */ @@ -2082,6 +2094,37 @@ declare namespace monaco.editor { isAttachedToEditor(): boolean; } + /** + * A change + */ + export interface IChange { + readonly originalStartLineNumber: number; + readonly originalEndLineNumber: number; + readonly modifiedStartLineNumber: number; + readonly modifiedEndLineNumber: number; + } + + /** + * A character level change. + */ + export interface ICharChange extends IChange { + readonly originalStartColumn: number; + readonly originalEndColumn: number; + readonly modifiedStartColumn: number; + readonly modifiedEndColumn: number; + } + + /** + * A line change + */ + export interface ILineChange extends IChange { + readonly charChanges: ICharChange[] | undefined; + } + export interface IDimension { + width: number; + height: number; + } + /** * A builder and helper for edit operations for a command. */ @@ -2174,38 +2217,6 @@ declare namespace monaco.editor { readonly newModelUrl: Uri | null; } - export interface IDimension { - width: number; - height: number; - } - - /** - * A change - */ - export interface IChange { - readonly originalStartLineNumber: number; - readonly originalEndLineNumber: number; - readonly modifiedStartLineNumber: number; - readonly modifiedEndLineNumber: number; - } - - /** - * A character level change. - */ - export interface ICharChange extends IChange { - readonly originalStartColumn: number; - readonly originalEndColumn: number; - readonly modifiedStartColumn: number; - readonly modifiedEndColumn: number; - } - - /** - * A line change - */ - export interface ILineChange extends IChange { - readonly charChanges: ICharChange[] | undefined; - } - export interface IContentSizeChangedEvent { readonly contentWidth: number; readonly contentHeight: number; @@ -3220,6 +3231,11 @@ declare namespace monaco.editor { * Defaults to true. */ foldingImportsByDefault?: boolean; + /** + * Maximum number of foldable regions. + * Defaults to 5000. + */ + foldingMaximumRegions?: number; /** * Controls whether the fold actions in the gutter stay always visible or hide unless the mouse is over the gutter. * Defaults to 'mouseover'. @@ -4185,97 +4201,98 @@ declare namespace monaco.editor { foldingStrategy = 38, foldingHighlight = 39, foldingImportsByDefault = 40, - unfoldOnClickAfterEndOfLine = 41, - fontFamily = 42, - fontInfo = 43, - fontLigatures = 44, - fontSize = 45, - fontWeight = 46, - formatOnPaste = 47, - formatOnType = 48, - glyphMargin = 49, - gotoLocation = 50, - hideCursorInOverviewRuler = 51, - hover = 52, - inDiffEditor = 53, - inlineSuggest = 54, - letterSpacing = 55, - lightbulb = 56, - lineDecorationsWidth = 57, - lineHeight = 58, - lineNumbers = 59, - lineNumbersMinChars = 60, - linkedEditing = 61, - links = 62, - matchBrackets = 63, - minimap = 64, - mouseStyle = 65, - mouseWheelScrollSensitivity = 66, - mouseWheelZoom = 67, - multiCursorMergeOverlapping = 68, - multiCursorModifier = 69, - multiCursorPaste = 70, - occurrencesHighlight = 71, - overviewRulerBorder = 72, - overviewRulerLanes = 73, - padding = 74, - parameterHints = 75, - peekWidgetDefaultFocus = 76, - definitionLinkOpensInPeek = 77, - quickSuggestions = 78, - quickSuggestionsDelay = 79, - readOnly = 80, - renameOnType = 81, - renderControlCharacters = 82, - renderFinalNewline = 83, - renderLineHighlight = 84, - renderLineHighlightOnlyWhenFocus = 85, - renderValidationDecorations = 86, - renderWhitespace = 87, - revealHorizontalRightPadding = 88, - roundedSelection = 89, - rulers = 90, - scrollbar = 91, - scrollBeyondLastColumn = 92, - scrollBeyondLastLine = 93, - scrollPredominantAxis = 94, - selectionClipboard = 95, - selectionHighlight = 96, - selectOnLineNumbers = 97, - showFoldingControls = 98, - showUnused = 99, - snippetSuggestions = 100, - smartSelect = 101, - smoothScrolling = 102, - stickyTabStops = 103, - stopRenderingLineAfter = 104, - suggest = 105, - suggestFontSize = 106, - suggestLineHeight = 107, - suggestOnTriggerCharacters = 108, - suggestSelection = 109, - tabCompletion = 110, - tabIndex = 111, - unicodeHighlighting = 112, - unusualLineTerminators = 113, - useShadowDOM = 114, - useTabStops = 115, - wordSeparators = 116, - wordWrap = 117, - wordWrapBreakAfterCharacters = 118, - wordWrapBreakBeforeCharacters = 119, - wordWrapColumn = 120, - wordWrapOverride1 = 121, - wordWrapOverride2 = 122, - wrappingIndent = 123, - wrappingStrategy = 124, - showDeprecated = 125, - inlayHints = 126, - editorClassName = 127, - pixelRatio = 128, - tabFocusMode = 129, - layoutInfo = 130, - wrappingInfo = 131 + foldingMaximumRegions = 41, + unfoldOnClickAfterEndOfLine = 42, + fontFamily = 43, + fontInfo = 44, + fontLigatures = 45, + fontSize = 46, + fontWeight = 47, + formatOnPaste = 48, + formatOnType = 49, + glyphMargin = 50, + gotoLocation = 51, + hideCursorInOverviewRuler = 52, + hover = 53, + inDiffEditor = 54, + inlineSuggest = 55, + letterSpacing = 56, + lightbulb = 57, + lineDecorationsWidth = 58, + lineHeight = 59, + lineNumbers = 60, + lineNumbersMinChars = 61, + linkedEditing = 62, + links = 63, + matchBrackets = 64, + minimap = 65, + mouseStyle = 66, + mouseWheelScrollSensitivity = 67, + mouseWheelZoom = 68, + multiCursorMergeOverlapping = 69, + multiCursorModifier = 70, + multiCursorPaste = 71, + occurrencesHighlight = 72, + overviewRulerBorder = 73, + overviewRulerLanes = 74, + padding = 75, + parameterHints = 76, + peekWidgetDefaultFocus = 77, + definitionLinkOpensInPeek = 78, + quickSuggestions = 79, + quickSuggestionsDelay = 80, + readOnly = 81, + renameOnType = 82, + renderControlCharacters = 83, + renderFinalNewline = 84, + renderLineHighlight = 85, + renderLineHighlightOnlyWhenFocus = 86, + renderValidationDecorations = 87, + renderWhitespace = 88, + revealHorizontalRightPadding = 89, + roundedSelection = 90, + rulers = 91, + scrollbar = 92, + scrollBeyondLastColumn = 93, + scrollBeyondLastLine = 94, + scrollPredominantAxis = 95, + selectionClipboard = 96, + selectionHighlight = 97, + selectOnLineNumbers = 98, + showFoldingControls = 99, + showUnused = 100, + snippetSuggestions = 101, + smartSelect = 102, + smoothScrolling = 103, + stickyTabStops = 104, + stopRenderingLineAfter = 105, + suggest = 106, + suggestFontSize = 107, + suggestLineHeight = 108, + suggestOnTriggerCharacters = 109, + suggestSelection = 110, + tabCompletion = 111, + tabIndex = 112, + unicodeHighlighting = 113, + unusualLineTerminators = 114, + useShadowDOM = 115, + useTabStops = 116, + wordSeparators = 117, + wordWrap = 118, + wordWrapBreakAfterCharacters = 119, + wordWrapBreakBeforeCharacters = 120, + wordWrapColumn = 121, + wordWrapOverride1 = 122, + wordWrapOverride2 = 123, + wrappingIndent = 124, + wrappingStrategy = 125, + showDeprecated = 126, + inlayHints = 127, + editorClassName = 128, + pixelRatio = 129, + tabFocusMode = 130, + layoutInfo = 131, + wrappingInfo = 132 } export const EditorOptions: { @@ -4321,6 +4338,7 @@ declare namespace monaco.editor { foldingStrategy: IEditorOption; foldingHighlight: IEditorOption; foldingImportsByDefault: IEditorOption; + foldingMaximumRegions: IEditorOption; unfoldOnClickAfterEndOfLine: IEditorOption; fontFamily: IEditorOption; fontInfo: IEditorOption; @@ -4423,6 +4441,18 @@ declare namespace monaco.editor { export type FindComputedEditorOptionValueById = NonNullable]>>; + export interface IEditorConstructionOptions extends IEditorOptions { + /** + * The initial editor dimension (to avoid measuring the container). + */ + dimension?: IDimension; + /** + * Place overflow widgets inside an external DOM node. + * Defaults to an internal DOM node. + */ + overflowWidgetsDomNode?: HTMLElement; + } + /** * A view zone is a full horizontal rectangle that 'pushes' text down. * The editor reserves space for view zones when rendering. @@ -4823,18 +4853,6 @@ declare namespace monaco.editor { readonly languageId: string | null; } - export interface IEditorConstructionOptions extends IEditorOptions { - /** - * The initial editor dimension (to avoid measuring the container). - */ - dimension?: IDimension; - /** - * Place overflow widgets inside an external DOM node. - * Defaults to an internal DOM node. - */ - overflowWidgetsDomNode?: HTMLElement; - } - export interface IDiffEditorConstructionOptions extends IDiffEditorOptions { /** * The initial editor dimension (to avoid measuring the container). @@ -5320,7 +5338,6 @@ declare namespace monaco.editor { export class BareFontInfo { readonly _bareFontInfoBrand: void; - readonly zoomLevel: number; readonly pixelRatio: number; readonly fontFamily: string; readonly fontWeight: string; @@ -6851,8 +6868,9 @@ declare namespace monaco.languages { export interface InlayHintLabelPart { label: string; - collapsible?: boolean; - action?: Command | Location; + tooltip?: string | IMarkdownString; + command?: Command; + location?: Location; } export interface InlayHint { @@ -6860,8 +6878,8 @@ declare namespace monaco.languages { tooltip?: string | IMarkdownString; position: IPosition; kind: InlayHintKind; - whitespaceBefore?: boolean; - whitespaceAfter?: boolean; + paddingLeft?: boolean; + paddingRight?: boolean; } export interface InlayHintList { diff --git a/website/typedoc/monaco.d.ts b/website/typedoc/monaco.d.ts index 86df5b53..8ae98738 100644 --- a/website/typedoc/monaco.d.ts +++ b/website/typedoc/monaco.d.ts @@ -1356,6 +1356,44 @@ declare namespace monaco.editor { id: string; } + /** + * A single edit operation, that acts as a simple replace. + * i.e. Replace text at `range` with `text` in model. + */ + export interface ISingleEditOperation { + /** + * The range to replace. This can be empty to emulate a simple insert. + */ + range: IRange; + /** + * The text to replace with. This can be null to emulate a simple delete. + */ + text: string | null; + /** + * This indicates that this operation has "insert" semantics. + * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved. + */ + forceMoveMarkers?: boolean; + } + + /** + * Word inside a model. + */ + export interface IWordAtPosition { + /** + * The word. + */ + readonly word: string; + /** + * The column where the word starts. + */ + readonly startColumn: number; + /** + * The column where the word ends. + */ + readonly endColumn: number; + } + /** * Vertical Lane in the overview ruler of the editor. */ @@ -1511,6 +1549,18 @@ declare namespace monaco.editor { * The data can be read when injected texts at a given position are queried. */ readonly attachedData?: unknown; + /** + * Configures cursor stops around injected text. + * Defaults to {@link InjectedTextCursorStops.Both}. + */ + readonly cursorStops?: InjectedTextCursorStops | null; + } + + export enum InjectedTextCursorStops { + Both = 0, + Right = 1, + Left = 2, + None = 3 } /** @@ -1549,24 +1599,6 @@ declare namespace monaco.editor { readonly options: IModelDecorationOptions; } - /** - * Word inside a model. - */ - export interface IWordAtPosition { - /** - * The word. - */ - readonly word: string; - /** - * The column where the word starts. - */ - readonly startColumn: number; - /** - * The column where the word ends. - */ - readonly endColumn: number; - } - /** * End of line character preference. */ @@ -1613,26 +1645,6 @@ declare namespace monaco.editor { CRLF = 1 } - /** - * A single edit operation, that acts as a simple replace. - * i.e. Replace text at `range` with `text` in model. - */ - export interface ISingleEditOperation { - /** - * The range to replace. This can be empty to emulate a simple insert. - */ - range: IRange; - /** - * The text to replace with. This can be null to emulate a simple delete. - */ - text: string | null; - /** - * This indicates that this operation has "insert" semantics. - * i.e. forceMoveMarkers = true => if `range` is collapsed, all markers at the position will be moved. - */ - forceMoveMarkers?: boolean; - } - /** * A single edit operation, that has an identifier. */ @@ -2082,6 +2094,37 @@ declare namespace monaco.editor { isAttachedToEditor(): boolean; } + /** + * A change + */ + export interface IChange { + readonly originalStartLineNumber: number; + readonly originalEndLineNumber: number; + readonly modifiedStartLineNumber: number; + readonly modifiedEndLineNumber: number; + } + + /** + * A character level change. + */ + export interface ICharChange extends IChange { + readonly originalStartColumn: number; + readonly originalEndColumn: number; + readonly modifiedStartColumn: number; + readonly modifiedEndColumn: number; + } + + /** + * A line change + */ + export interface ILineChange extends IChange { + readonly charChanges: ICharChange[] | undefined; + } + export interface IDimension { + width: number; + height: number; + } + /** * A builder and helper for edit operations for a command. */ @@ -2174,38 +2217,6 @@ declare namespace monaco.editor { readonly newModelUrl: Uri | null; } - export interface IDimension { - width: number; - height: number; - } - - /** - * A change - */ - export interface IChange { - readonly originalStartLineNumber: number; - readonly originalEndLineNumber: number; - readonly modifiedStartLineNumber: number; - readonly modifiedEndLineNumber: number; - } - - /** - * A character level change. - */ - export interface ICharChange extends IChange { - readonly originalStartColumn: number; - readonly originalEndColumn: number; - readonly modifiedStartColumn: number; - readonly modifiedEndColumn: number; - } - - /** - * A line change - */ - export interface ILineChange extends IChange { - readonly charChanges: ICharChange[] | undefined; - } - export interface IContentSizeChangedEvent { readonly contentWidth: number; readonly contentHeight: number; @@ -3220,6 +3231,11 @@ declare namespace monaco.editor { * Defaults to true. */ foldingImportsByDefault?: boolean; + /** + * Maximum number of foldable regions. + * Defaults to 5000. + */ + foldingMaximumRegions?: number; /** * Controls whether the fold actions in the gutter stay always visible or hide unless the mouse is over the gutter. * Defaults to 'mouseover'. @@ -4185,97 +4201,98 @@ declare namespace monaco.editor { foldingStrategy = 38, foldingHighlight = 39, foldingImportsByDefault = 40, - unfoldOnClickAfterEndOfLine = 41, - fontFamily = 42, - fontInfo = 43, - fontLigatures = 44, - fontSize = 45, - fontWeight = 46, - formatOnPaste = 47, - formatOnType = 48, - glyphMargin = 49, - gotoLocation = 50, - hideCursorInOverviewRuler = 51, - hover = 52, - inDiffEditor = 53, - inlineSuggest = 54, - letterSpacing = 55, - lightbulb = 56, - lineDecorationsWidth = 57, - lineHeight = 58, - lineNumbers = 59, - lineNumbersMinChars = 60, - linkedEditing = 61, - links = 62, - matchBrackets = 63, - minimap = 64, - mouseStyle = 65, - mouseWheelScrollSensitivity = 66, - mouseWheelZoom = 67, - multiCursorMergeOverlapping = 68, - multiCursorModifier = 69, - multiCursorPaste = 70, - occurrencesHighlight = 71, - overviewRulerBorder = 72, - overviewRulerLanes = 73, - padding = 74, - parameterHints = 75, - peekWidgetDefaultFocus = 76, - definitionLinkOpensInPeek = 77, - quickSuggestions = 78, - quickSuggestionsDelay = 79, - readOnly = 80, - renameOnType = 81, - renderControlCharacters = 82, - renderFinalNewline = 83, - renderLineHighlight = 84, - renderLineHighlightOnlyWhenFocus = 85, - renderValidationDecorations = 86, - renderWhitespace = 87, - revealHorizontalRightPadding = 88, - roundedSelection = 89, - rulers = 90, - scrollbar = 91, - scrollBeyondLastColumn = 92, - scrollBeyondLastLine = 93, - scrollPredominantAxis = 94, - selectionClipboard = 95, - selectionHighlight = 96, - selectOnLineNumbers = 97, - showFoldingControls = 98, - showUnused = 99, - snippetSuggestions = 100, - smartSelect = 101, - smoothScrolling = 102, - stickyTabStops = 103, - stopRenderingLineAfter = 104, - suggest = 105, - suggestFontSize = 106, - suggestLineHeight = 107, - suggestOnTriggerCharacters = 108, - suggestSelection = 109, - tabCompletion = 110, - tabIndex = 111, - unicodeHighlighting = 112, - unusualLineTerminators = 113, - useShadowDOM = 114, - useTabStops = 115, - wordSeparators = 116, - wordWrap = 117, - wordWrapBreakAfterCharacters = 118, - wordWrapBreakBeforeCharacters = 119, - wordWrapColumn = 120, - wordWrapOverride1 = 121, - wordWrapOverride2 = 122, - wrappingIndent = 123, - wrappingStrategy = 124, - showDeprecated = 125, - inlayHints = 126, - editorClassName = 127, - pixelRatio = 128, - tabFocusMode = 129, - layoutInfo = 130, - wrappingInfo = 131 + foldingMaximumRegions = 41, + unfoldOnClickAfterEndOfLine = 42, + fontFamily = 43, + fontInfo = 44, + fontLigatures = 45, + fontSize = 46, + fontWeight = 47, + formatOnPaste = 48, + formatOnType = 49, + glyphMargin = 50, + gotoLocation = 51, + hideCursorInOverviewRuler = 52, + hover = 53, + inDiffEditor = 54, + inlineSuggest = 55, + letterSpacing = 56, + lightbulb = 57, + lineDecorationsWidth = 58, + lineHeight = 59, + lineNumbers = 60, + lineNumbersMinChars = 61, + linkedEditing = 62, + links = 63, + matchBrackets = 64, + minimap = 65, + mouseStyle = 66, + mouseWheelScrollSensitivity = 67, + mouseWheelZoom = 68, + multiCursorMergeOverlapping = 69, + multiCursorModifier = 70, + multiCursorPaste = 71, + occurrencesHighlight = 72, + overviewRulerBorder = 73, + overviewRulerLanes = 74, + padding = 75, + parameterHints = 76, + peekWidgetDefaultFocus = 77, + definitionLinkOpensInPeek = 78, + quickSuggestions = 79, + quickSuggestionsDelay = 80, + readOnly = 81, + renameOnType = 82, + renderControlCharacters = 83, + renderFinalNewline = 84, + renderLineHighlight = 85, + renderLineHighlightOnlyWhenFocus = 86, + renderValidationDecorations = 87, + renderWhitespace = 88, + revealHorizontalRightPadding = 89, + roundedSelection = 90, + rulers = 91, + scrollbar = 92, + scrollBeyondLastColumn = 93, + scrollBeyondLastLine = 94, + scrollPredominantAxis = 95, + selectionClipboard = 96, + selectionHighlight = 97, + selectOnLineNumbers = 98, + showFoldingControls = 99, + showUnused = 100, + snippetSuggestions = 101, + smartSelect = 102, + smoothScrolling = 103, + stickyTabStops = 104, + stopRenderingLineAfter = 105, + suggest = 106, + suggestFontSize = 107, + suggestLineHeight = 108, + suggestOnTriggerCharacters = 109, + suggestSelection = 110, + tabCompletion = 111, + tabIndex = 112, + unicodeHighlighting = 113, + unusualLineTerminators = 114, + useShadowDOM = 115, + useTabStops = 116, + wordSeparators = 117, + wordWrap = 118, + wordWrapBreakAfterCharacters = 119, + wordWrapBreakBeforeCharacters = 120, + wordWrapColumn = 121, + wordWrapOverride1 = 122, + wordWrapOverride2 = 123, + wrappingIndent = 124, + wrappingStrategy = 125, + showDeprecated = 126, + inlayHints = 127, + editorClassName = 128, + pixelRatio = 129, + tabFocusMode = 130, + layoutInfo = 131, + wrappingInfo = 132 } export const EditorOptions: { @@ -4321,6 +4338,7 @@ declare namespace monaco.editor { foldingStrategy: IEditorOption; foldingHighlight: IEditorOption; foldingImportsByDefault: IEditorOption; + foldingMaximumRegions: IEditorOption; unfoldOnClickAfterEndOfLine: IEditorOption; fontFamily: IEditorOption; fontInfo: IEditorOption; @@ -4423,6 +4441,18 @@ declare namespace monaco.editor { export type FindComputedEditorOptionValueById = NonNullable]>>; + export interface IEditorConstructionOptions extends IEditorOptions { + /** + * The initial editor dimension (to avoid measuring the container). + */ + dimension?: IDimension; + /** + * Place overflow widgets inside an external DOM node. + * Defaults to an internal DOM node. + */ + overflowWidgetsDomNode?: HTMLElement; + } + /** * A view zone is a full horizontal rectangle that 'pushes' text down. * The editor reserves space for view zones when rendering. @@ -4823,18 +4853,6 @@ declare namespace monaco.editor { readonly languageId: string | null; } - export interface IEditorConstructionOptions extends IEditorOptions { - /** - * The initial editor dimension (to avoid measuring the container). - */ - dimension?: IDimension; - /** - * Place overflow widgets inside an external DOM node. - * Defaults to an internal DOM node. - */ - overflowWidgetsDomNode?: HTMLElement; - } - export interface IDiffEditorConstructionOptions extends IDiffEditorOptions { /** * The initial editor dimension (to avoid measuring the container). @@ -5320,7 +5338,6 @@ declare namespace monaco.editor { export class BareFontInfo { readonly _bareFontInfoBrand: void; - readonly zoomLevel: number; readonly pixelRatio: number; readonly fontFamily: string; readonly fontWeight: string; @@ -6851,8 +6868,9 @@ declare namespace monaco.languages { export interface InlayHintLabelPart { label: string; - collapsible?: boolean; - action?: Command | Location; + tooltip?: string | IMarkdownString; + command?: Command; + location?: Location; } export interface InlayHint { @@ -6860,8 +6878,8 @@ declare namespace monaco.languages { tooltip?: string | IMarkdownString; position: IPosition; kind: InlayHintKind; - whitespaceBefore?: boolean; - whitespaceAfter?: boolean; + paddingLeft?: boolean; + paddingRight?: boolean; } export interface InlayHintList {