monaco-editor-core 0.54.0-dev-20250910 → 0.54.0-dev-20250911
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/nls.keys.json +1 -1
- package/esm/nls.messages.de.js +2 -2
- package/esm/nls.messages.es.js +2 -2
- package/esm/nls.messages.fr.js +2 -2
- package/esm/nls.messages.it.js +2 -2
- package/esm/nls.messages.ja.js +2 -2
- package/esm/nls.messages.js +1 -1
- package/esm/nls.messages.json +1 -1
- package/esm/nls.messages.ko.js +2 -2
- package/esm/nls.messages.ru.js +2 -2
- package/esm/nls.messages.zh-cn.js +2 -2
- package/esm/nls.messages.zh-tw.js +2 -2
- package/esm/nls.metadata.json +8 -2
- package/esm/vs/base/browser/domSanitize.js +32 -21
- package/esm/vs/base/browser/domSanitize.js.map +1 -1
- package/esm/vs/base/browser/ui/codicons/codicon/codicon.ttf +0 -0
- package/esm/vs/base/common/codiconsLibrary.js +2 -0
- package/esm/vs/base/common/codiconsLibrary.js.map +1 -1
- package/esm/vs/editor/browser/config/editorConfiguration.js +1 -1
- package/esm/vs/editor/browser/controller/dragScrolling.js +4 -4
- package/esm/vs/editor/browser/controller/editContext/native/nativeEditContext.js +3 -3
- package/esm/vs/editor/browser/controller/editContext/native/screenReaderContentRich.js +3 -3
- package/esm/vs/editor/browser/controller/editContext/native/screenReaderSupport.js +6 -6
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.js +9 -9
- package/esm/vs/editor/browser/controller/mouseHandler.js +6 -6
- package/esm/vs/editor/browser/controller/mouseTarget.js +3 -3
- package/esm/vs/editor/browser/coreCommands.js +2 -2
- package/esm/vs/editor/browser/gpu/rectangleRenderer.js +1 -1
- package/esm/vs/editor/browser/gpu/viewGpuContext.js +1 -1
- package/esm/vs/editor/browser/observableCodeEditor.js +1 -1
- package/esm/vs/editor/browser/view/viewController.js +2 -2
- package/esm/vs/editor/browser/view/viewLayer.js +1 -1
- package/esm/vs/editor/browser/view/viewOverlays.js +4 -4
- package/esm/vs/editor/browser/view.js +5 -5
- package/esm/vs/editor/browser/viewParts/blockDecorations/blockDecorations.js +1 -1
- package/esm/vs/editor/browser/viewParts/contentWidgets/contentWidgets.js +3 -3
- package/esm/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.js +6 -6
- package/esm/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.js +8 -8
- package/esm/vs/editor/browser/viewParts/glyphMargin/glyphMargin.js +2 -2
- package/esm/vs/editor/browser/viewParts/indentGuides/indentGuides.js +2 -2
- package/esm/vs/editor/browser/viewParts/lineNumbers/lineNumbers.js +2 -2
- package/esm/vs/editor/browser/viewParts/linesDecorations/linesDecorations.js +2 -2
- package/esm/vs/editor/browser/viewParts/margin/margin.js +2 -2
- package/esm/vs/editor/browser/viewParts/minimap/minimap.js +5 -5
- package/esm/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.js +2 -2
- package/esm/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.js +4 -4
- package/esm/vs/editor/browser/viewParts/overviewRuler/overviewRuler.js +3 -3
- package/esm/vs/editor/browser/viewParts/rulers/rulers.js +2 -2
- package/esm/vs/editor/browser/viewParts/rulersGpu/rulersGpu.js +1 -1
- package/esm/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.js +3 -3
- package/esm/vs/editor/browser/viewParts/selections/selections.js +2 -2
- package/esm/vs/editor/browser/viewParts/viewCursors/viewCursor.js +2 -2
- package/esm/vs/editor/browser/viewParts/viewCursors/viewCursors.js +6 -6
- package/esm/vs/editor/browser/viewParts/viewLines/viewLineOptions.js +4 -4
- package/esm/vs/editor/browser/viewParts/viewLines/viewLines.js +11 -11
- package/esm/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.js +1 -1
- package/esm/vs/editor/browser/viewParts/viewZones/viewZones.js +2 -2
- package/esm/vs/editor/browser/viewParts/whitespace/whitespace.js +4 -4
- package/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +12 -12
- package/esm/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +4 -4
- package/esm/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js +3 -3
- package/esm/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +2 -2
- package/esm/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js +2 -2
- package/esm/vs/editor/browser/widget/diffEditor/features/gutterFeature.js +1 -1
- package/esm/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.js +1 -1
- package/esm/vs/editor/common/config/editorOptions.js +155 -154
- package/esm/vs/editor/common/config/editorOptions.js.map +1 -1
- package/esm/vs/editor/common/core/editorColorRegistry.js +68 -68
- package/esm/vs/editor/common/cursorCommon.js +19 -19
- package/esm/vs/editor/common/editorContextKeys.js +46 -46
- package/esm/vs/editor/common/languages/modesRegistry.js +1 -1
- package/esm/vs/editor/common/languages.js +56 -56
- package/esm/vs/editor/common/model/editStack.js +1 -1
- package/esm/vs/editor/common/standalone/standaloneEnums.js +86 -85
- package/esm/vs/editor/common/standalone/standaloneEnums.js.map +1 -1
- package/esm/vs/editor/common/standaloneStrings.js +10 -10
- package/esm/vs/editor/common/viewLayout/viewLayout.js +15 -15
- package/esm/vs/editor/common/viewLayout/viewLineRenderer.js +2 -2
- package/esm/vs/editor/common/viewModel/monospaceLineBreaksComputer.js +1 -1
- package/esm/vs/editor/common/viewModel/viewModelImpl.js +14 -14
- package/esm/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +6 -6
- package/esm/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +6 -6
- package/esm/vs/editor/contrib/caretOperations/browser/caretOperations.js +2 -2
- package/esm/vs/editor/contrib/caretOperations/browser/transpose.js +1 -1
- package/esm/vs/editor/contrib/clipboard/browser/clipboard.js +20 -20
- package/esm/vs/editor/contrib/codeAction/browser/codeAction.js +1 -1
- package/esm/vs/editor/contrib/codeAction/browser/codeActionCommands.js +29 -29
- package/esm/vs/editor/contrib/codeAction/browser/codeActionContributions.js +3 -3
- package/esm/vs/editor/contrib/codeAction/browser/codeActionController.js +3 -3
- package/esm/vs/editor/contrib/codeAction/browser/codeActionMenu.js +8 -8
- package/esm/vs/editor/contrib/codeAction/browser/codeActionModel.js +1 -1
- package/esm/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +9 -9
- package/esm/vs/editor/contrib/codelens/browser/codelensController.js +2 -2
- package/esm/vs/editor/contrib/colorPicker/browser/colorDetector.js +3 -3
- package/esm/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerCloseButton.js +1 -1
- package/esm/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.js +1 -1
- package/esm/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerContribution.js +1 -1
- package/esm/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.js +2 -2
- package/esm/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerActions.js +7 -7
- package/esm/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.js +1 -1
- package/esm/vs/editor/contrib/comment/browser/comment.js +6 -6
- package/esm/vs/editor/contrib/contextmenu/browser/contextmenu.js +12 -12
- package/esm/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +2 -2
- package/esm/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +4 -4
- package/esm/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +12 -12
- package/esm/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +8 -8
- package/esm/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +3 -3
- package/esm/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +2 -2
- package/esm/vs/editor/contrib/editorState/browser/keybindingCancellation.js +1 -1
- package/esm/vs/editor/contrib/find/browser/findController.js +17 -17
- package/esm/vs/editor/contrib/find/browser/findModel.js +6 -6
- package/esm/vs/editor/contrib/find/browser/findWidget.js +32 -32
- package/esm/vs/editor/contrib/folding/browser/folding.js +23 -23
- package/esm/vs/editor/contrib/folding/browser/foldingDecorations.js +9 -9
- package/esm/vs/editor/contrib/folding/browser/foldingDecorations.js.map +1 -1
- package/esm/vs/editor/contrib/fontZoom/browser/fontZoom.js +3 -3
- package/esm/vs/editor/contrib/format/browser/formatActions.js +2 -2
- package/esm/vs/editor/contrib/gotoError/browser/gotoError.js +8 -8
- package/esm/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +14 -14
- package/esm/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +39 -39
- package/esm/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.js +21 -11
- package/esm/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.js.map +1 -1
- package/esm/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +2 -2
- package/esm/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +4 -4
- package/esm/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +3 -3
- package/esm/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +3 -3
- package/esm/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +8 -8
- package/esm/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +3 -3
- package/esm/vs/editor/contrib/gpu/browser/gpuActions.js +4 -4
- package/esm/vs/editor/contrib/hover/browser/hoverActionIds.js +2 -2
- package/esm/vs/editor/contrib/hover/browser/hoverActions.js +24 -24
- package/esm/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +10 -10
- package/esm/vs/editor/contrib/hover/browser/markerHoverParticipant.js +6 -6
- package/esm/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +2 -2
- package/esm/vs/editor/contrib/indentation/browser/indentation.js +20 -20
- package/esm/vs/editor/contrib/inlayHints/browser/inlayHintsController.js +5 -5
- package/esm/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +8 -8
- package/esm/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.js +2 -2
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/commands.js +19 -19
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js +12 -12
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js +2 -2
- package/esm/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js +5 -5
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.js +5 -5
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.js +5 -5
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.js +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.js +20 -20
- package/esm/vs/editor/contrib/insertFinalNewLine/browser/insertFinalNewLine.js +1 -1
- package/esm/vs/editor/contrib/lineSelection/browser/lineSelection.js +1 -1
- package/esm/vs/editor/contrib/linesOperations/browser/linesOperations.js +32 -32
- package/esm/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +4 -4
- package/esm/vs/editor/contrib/links/browser/links.js +11 -11
- package/esm/vs/editor/contrib/links/browser/links.js.map +1 -1
- package/esm/vs/editor/contrib/longLinesHelper/browser/longLinesHelper.js +1 -1
- package/esm/vs/editor/contrib/message/browser/messageController.js +1 -1
- package/esm/vs/editor/contrib/middleScroll/browser/middleScrollController.js +1 -1
- package/esm/vs/editor/contrib/multicursor/browser/multicursor.js +36 -36
- package/esm/vs/editor/contrib/parameterHints/browser/parameterHints.js +1 -1
- package/esm/vs/editor/contrib/parameterHints/browser/parameterHintsModel.js +3 -3
- package/esm/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +4 -4
- package/esm/vs/editor/contrib/peekView/browser/peekView.js +18 -18
- package/esm/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js +1 -1
- package/esm/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.js +1 -1
- package/esm/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.js.map +1 -1
- package/esm/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +5 -5
- package/esm/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +32 -32
- package/esm/vs/editor/contrib/readOnlyMessage/browser/contribution.js +3 -3
- package/esm/vs/editor/contrib/rename/browser/rename.js +11 -11
- package/esm/vs/editor/contrib/rename/browser/renameWidget.js +7 -7
- package/esm/vs/editor/contrib/smartSelect/browser/smartSelect.js +5 -5
- package/esm/vs/editor/contrib/snippet/browser/snippetController2.js +4 -4
- package/esm/vs/editor/contrib/snippet/browser/snippetSession.js +2 -2
- package/esm/vs/editor/contrib/snippet/browser/snippetVariables.js +4 -4
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +11 -11
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js +17 -24
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js.map +1 -1
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.js +1 -1
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js +12 -3
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js.map +1 -1
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js +5 -5
- package/esm/vs/editor/contrib/suggest/browser/suggest.js +8 -8
- package/esm/vs/editor/contrib/suggest/browser/suggestController.js +14 -14
- package/esm/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js +2 -2
- package/esm/vs/editor/contrib/suggest/browser/suggestModel.js +11 -11
- package/esm/vs/editor/contrib/suggest/browser/suggestWidget.js +23 -23
- package/esm/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +5 -5
- package/esm/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +5 -5
- package/esm/vs/editor/contrib/suggest/browser/wordContextKey.js +3 -3
- package/esm/vs/editor/contrib/suggest/browser/wordDistance.js +1 -1
- package/esm/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +33 -33
- package/esm/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +4 -4
- package/esm/vs/editor/contrib/tokenization/browser/tokenization.js +1 -1
- package/esm/vs/editor/contrib/unicodeHighlighter/browser/bannerController.js +1 -1
- package/esm/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +27 -27
- package/esm/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +9 -9
- package/esm/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +9 -9
- package/esm/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +7 -7
- package/esm/vs/editor/contrib/wordOperations/browser/wordOperations.js +4 -4
- package/esm/vs/editor/editor.api.d.ts +93 -85
- package/esm/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js +1 -1
- package/esm/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +62 -62
- package/esm/vs/platform/action/common/actionCommonCategories.js +6 -6
- package/esm/vs/platform/actionWidget/browser/actionList.js +4 -4
- package/esm/vs/platform/actionWidget/browser/actionWidget.js +7 -7
- package/esm/vs/platform/actions/browser/menuEntryActionViewItem.js +5 -5
- package/esm/vs/platform/actions/browser/toolbar.js +2 -2
- package/esm/vs/platform/actions/common/menuService.js +2 -2
- package/esm/vs/platform/configuration/common/configurationRegistry.js +10 -10
- package/esm/vs/platform/contextkey/browser/contextKeyService.js +1 -1
- package/esm/vs/platform/contextkey/common/contextkey.js +9 -9
- package/esm/vs/platform/contextkey/common/contextkeys.js +9 -9
- package/esm/vs/platform/contextkey/common/scanner.js +5 -5
- package/esm/vs/platform/history/browser/contextScopedHistoryWidget.js +1 -1
- package/esm/vs/platform/keybinding/common/abstractKeybindingService.js +4 -4
- package/esm/vs/platform/list/browser/listService.js +27 -27
- package/esm/vs/platform/markers/common/markerService.js +2 -2
- package/esm/vs/platform/markers/common/markers.js +6 -6
- package/esm/vs/platform/quickinput/browser/commandsQuickAccess.js +7 -7
- package/esm/vs/platform/quickinput/browser/helpQuickAccess.js +1 -1
- package/esm/vs/platform/quickinput/browser/quickInput.js +20 -12
- package/esm/vs/platform/quickinput/browser/quickInput.js.map +1 -1
- package/esm/vs/platform/quickinput/browser/quickInputActions.js +42 -8
- package/esm/vs/platform/quickinput/browser/quickInputActions.js.map +1 -1
- package/esm/vs/platform/quickinput/browser/quickInputController.js +6 -64
- package/esm/vs/platform/quickinput/browser/quickInputController.js.map +1 -1
- package/esm/vs/platform/quickinput/browser/quickInputList.js +1 -1
- package/esm/vs/platform/quickinput/browser/quickInputUtils.js +1 -1
- package/esm/vs/platform/quickinput/browser/tree/quickInputTreeAccessibilityProvider.js +1 -1
- package/esm/vs/platform/quickinput/common/quickInput.js.map +1 -1
- package/esm/vs/platform/theme/common/colorUtils.js +2 -2
- package/esm/vs/platform/theme/common/colors/baseColors.js +17 -17
- package/esm/vs/platform/theme/common/colors/chartsColors.js +8 -8
- package/esm/vs/platform/theme/common/colors/editorColors.js +95 -95
- package/esm/vs/platform/theme/common/colors/inputColors.js +47 -47
- package/esm/vs/platform/theme/common/colors/listColors.js +36 -36
- package/esm/vs/platform/theme/common/colors/menuColors.js +7 -7
- package/esm/vs/platform/theme/common/colors/minimapColors.js +11 -11
- package/esm/vs/platform/theme/common/colors/miscColors.js +15 -15
- package/esm/vs/platform/theme/common/colors/quickpickColors.js +9 -9
- package/esm/vs/platform/theme/common/colors/searchColors.js +3 -3
- package/esm/vs/platform/theme/common/iconRegistry.js +6 -6
- package/esm/vs/platform/undoRedo/common/undoRedoService.js +20 -20
- package/esm/vs/platform/workspace/common/workspace.js +1 -1
- package/monaco.d.ts +93 -85
- package/package.json +2 -2
- package/version.txt +1 -1
|
@@ -59,7 +59,7 @@ let ScreenReaderSupport = class ScreenReaderSupport extends Disposable {
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
_instantiateScreenReaderContent() {
|
|
62
|
-
const renderRichContent = this._context.configuration.options.get(
|
|
62
|
+
const renderRichContent = this._context.configuration.options.get(107 /* EditorOption.renderRichScreenReaderContent */);
|
|
63
63
|
if (this._renderRichContent !== renderRichContent) {
|
|
64
64
|
this._renderRichContent = renderRichContent;
|
|
65
65
|
this._state.value = this._createScreenReaderContent(renderRichContent);
|
|
@@ -75,7 +75,7 @@ let ScreenReaderSupport = class ScreenReaderSupport extends Disposable {
|
|
|
75
75
|
}
|
|
76
76
|
_updateConfigurationSettings() {
|
|
77
77
|
const options = this._context.configuration.options;
|
|
78
|
-
const layoutInfo = options.get(
|
|
78
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
79
79
|
const wrappingColumn = layoutInfo.wrappingColumn;
|
|
80
80
|
this._contentLeft = layoutInfo.contentLeft;
|
|
81
81
|
this._contentWidth = layoutInfo.contentWidth;
|
|
@@ -89,15 +89,15 @@ let ScreenReaderSupport = class ScreenReaderSupport extends Disposable {
|
|
|
89
89
|
this._domNode.domNode.setAttribute('role', 'textbox');
|
|
90
90
|
this._domNode.domNode.setAttribute('aria-required', options.get(9 /* EditorOption.ariaRequired */) ? 'true' : 'false');
|
|
91
91
|
this._domNode.domNode.setAttribute('aria-multiline', 'true');
|
|
92
|
-
this._domNode.domNode.setAttribute('aria-autocomplete', options.get(
|
|
92
|
+
this._domNode.domNode.setAttribute('aria-autocomplete', options.get(104 /* EditorOption.readOnly */) ? 'none' : 'both');
|
|
93
93
|
this._domNode.domNode.setAttribute('aria-roledescription', localize(55, "editor"));
|
|
94
94
|
this._domNode.domNode.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
|
|
95
95
|
const tabSize = this._context.viewModel.model.getOptions().tabSize;
|
|
96
96
|
const spaceWidth = options.get(59 /* EditorOption.fontInfo */).spaceWidth;
|
|
97
97
|
this._domNode.domNode.style.tabSize = `${tabSize * spaceWidth}px`;
|
|
98
|
-
const wordWrapOverride2 = options.get(
|
|
99
|
-
const wordWrapOverride1 = (wordWrapOverride2 === 'inherit' ? options.get(
|
|
100
|
-
const wordWrap = (wordWrapOverride1 === 'inherit' ? options.get(
|
|
98
|
+
const wordWrapOverride2 = options.get(154 /* EditorOption.wordWrapOverride2 */);
|
|
99
|
+
const wordWrapOverride1 = (wordWrapOverride2 === 'inherit' ? options.get(153 /* EditorOption.wordWrapOverride1 */) : wordWrapOverride2);
|
|
100
|
+
const wordWrap = (wordWrapOverride1 === 'inherit' ? options.get(149 /* EditorOption.wordWrap */) : wordWrapOverride1);
|
|
101
101
|
this._domNode.domNode.style.textWrap = wordWrap === 'off' ? 'nowrap' : 'wrap';
|
|
102
102
|
}
|
|
103
103
|
onCursorStateChanged(e) {
|
|
@@ -104,7 +104,7 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
|
|
|
104
104
|
this._scrollLeft = 0;
|
|
105
105
|
this._scrollTop = 0;
|
|
106
106
|
const options = this._context.configuration.options;
|
|
107
|
-
const layoutInfo = options.get(
|
|
107
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
108
108
|
this._setAccessibilityOptions(options);
|
|
109
109
|
this._contentLeft = layoutInfo.contentLeft;
|
|
110
110
|
this._contentWidth = layoutInfo.contentWidth;
|
|
@@ -129,11 +129,11 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
|
|
|
129
129
|
this.textArea.setAttribute('spellcheck', 'false');
|
|
130
130
|
this.textArea.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
|
|
131
131
|
this.textArea.setAttribute('aria-required', options.get(9 /* EditorOption.ariaRequired */) ? 'true' : 'false');
|
|
132
|
-
this.textArea.setAttribute('tabindex', String(options.get(
|
|
132
|
+
this.textArea.setAttribute('tabindex', String(options.get(140 /* EditorOption.tabIndex */)));
|
|
133
133
|
this.textArea.setAttribute('role', 'textbox');
|
|
134
134
|
this.textArea.setAttribute('aria-roledescription', nls.localize(60, "editor"));
|
|
135
135
|
this.textArea.setAttribute('aria-multiline', 'true');
|
|
136
|
-
this.textArea.setAttribute('aria-autocomplete', options.get(
|
|
136
|
+
this.textArea.setAttribute('aria-autocomplete', options.get(104 /* EditorOption.readOnly */) ? 'none' : 'both');
|
|
137
137
|
this._ensureReadOnlyAttribute();
|
|
138
138
|
this.textAreaCover = createFastDomNode(document.createElement('div'));
|
|
139
139
|
this.textAreaCover.setPosition('absolute');
|
|
@@ -385,7 +385,7 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
|
|
|
385
385
|
}
|
|
386
386
|
_getWordBeforePosition(position) {
|
|
387
387
|
const lineContent = this._context.viewModel.getLineContent(position.lineNumber);
|
|
388
|
-
const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(
|
|
388
|
+
const wordSeparators = getMapForWordSeparators(this._context.configuration.options.get(148 /* EditorOption.wordSeparators */), []);
|
|
389
389
|
let column = position.column;
|
|
390
390
|
let distance = 0;
|
|
391
391
|
while (column > 1) {
|
|
@@ -423,7 +423,7 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
|
|
|
423
423
|
// we will size the textarea to match the width used for wrapping points computation (see `domLineBreaksComputer.ts`).
|
|
424
424
|
// This is because screen readers will read the text in the textarea and we'd like that the
|
|
425
425
|
// wrapping points in the textarea match the wrapping points in the editor.
|
|
426
|
-
const layoutInfo = options.get(
|
|
426
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
427
427
|
const wrappingColumn = layoutInfo.wrappingColumn;
|
|
428
428
|
if (wrappingColumn !== -1 && this._accessibilitySupport !== 1 /* AccessibilitySupport.Disabled */) {
|
|
429
429
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
@@ -438,7 +438,7 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
|
|
|
438
438
|
// --- begin event handlers
|
|
439
439
|
onConfigurationChanged(e) {
|
|
440
440
|
const options = this._context.configuration.options;
|
|
441
|
-
const layoutInfo = options.get(
|
|
441
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
442
442
|
this._setAccessibilityOptions(options);
|
|
443
443
|
this._contentLeft = layoutInfo.contentLeft;
|
|
444
444
|
this._contentWidth = layoutInfo.contentWidth;
|
|
@@ -451,8 +451,8 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
|
|
|
451
451
|
this.textArea.domNode.style.tabSize = `${tabSize * this._fontInfo.spaceWidth}px`;
|
|
452
452
|
this.textArea.setAttribute('aria-label', ariaLabelForScreenReaderContent(options, this._keybindingService));
|
|
453
453
|
this.textArea.setAttribute('aria-required', options.get(9 /* EditorOption.ariaRequired */) ? 'true' : 'false');
|
|
454
|
-
this.textArea.setAttribute('tabindex', String(options.get(
|
|
455
|
-
if (e.hasChanged(41 /* EditorOption.domReadOnly */) || e.hasChanged(
|
|
454
|
+
this.textArea.setAttribute('tabindex', String(options.get(140 /* EditorOption.tabIndex */)));
|
|
455
|
+
if (e.hasChanged(41 /* EditorOption.domReadOnly */) || e.hasChanged(104 /* EditorOption.readOnly */)) {
|
|
456
456
|
this._ensureReadOnlyAttribute();
|
|
457
457
|
}
|
|
458
458
|
if (e.hasChanged(2 /* EditorOption.accessibilitySupport */)) {
|
|
@@ -526,7 +526,7 @@ let TextAreaEditContext = class TextAreaEditContext extends AbstractEditContext
|
|
|
526
526
|
const options = this._context.configuration.options;
|
|
527
527
|
// When someone requests to disable IME, we set the "readonly" attribute on the <textarea>.
|
|
528
528
|
// This will prevent composition.
|
|
529
|
-
const useReadOnly = !IME.enabled || (options.get(41 /* EditorOption.domReadOnly */) && options.get(
|
|
529
|
+
const useReadOnly = !IME.enabled || (options.get(41 /* EditorOption.domReadOnly */) && options.get(104 /* EditorOption.readOnly */));
|
|
530
530
|
if (useReadOnly) {
|
|
531
531
|
this.textArea.setAttribute('readonly', 'true');
|
|
532
532
|
}
|
|
@@ -24,7 +24,7 @@ export class MouseHandler extends ViewEventHandler {
|
|
|
24
24
|
this.mouseTargetFactory = new MouseTargetFactory(this._context, viewHelper);
|
|
25
25
|
this._mouseDownOperation = this._register(new MouseDownOperation(this._context, this.viewController, this.viewHelper, this.mouseTargetFactory, (e, testEventTarget) => this._createMouseTarget(e, testEventTarget), (e) => this._getMouseColumn(e)));
|
|
26
26
|
this.lastMouseLeaveTime = -1;
|
|
27
|
-
this._height = this._context.configuration.options.get(
|
|
27
|
+
this._height = this._context.configuration.options.get(165 /* EditorOption.layoutInfo */).height;
|
|
28
28
|
const mouseEvents = new EditorMouseEventFactory(this.viewHelper.viewDomNode);
|
|
29
29
|
this._register(mouseEvents.onContextMenu(this.viewHelper.viewDomNode, (e) => this._onContextMenu(e, true)));
|
|
30
30
|
this._register(mouseEvents.onMouseMove(this.viewHelper.viewDomNode, (e) => {
|
|
@@ -126,9 +126,9 @@ export class MouseHandler extends ViewEventHandler {
|
|
|
126
126
|
}
|
|
127
127
|
// --- begin event handlers
|
|
128
128
|
onConfigurationChanged(e) {
|
|
129
|
-
if (e.hasChanged(
|
|
129
|
+
if (e.hasChanged(165 /* EditorOption.layoutInfo */)) {
|
|
130
130
|
// layout change
|
|
131
|
-
const height = this._context.configuration.options.get(
|
|
131
|
+
const height = this._context.configuration.options.get(165 /* EditorOption.layoutInfo */).height;
|
|
132
132
|
if (this._height !== height) {
|
|
133
133
|
this._height = height;
|
|
134
134
|
this._mouseDownOperation.onHeightChanged();
|
|
@@ -214,7 +214,7 @@ export class MouseHandler extends ViewEventHandler {
|
|
|
214
214
|
const targetIsContent = (t.type === 6 /* MouseTargetType.CONTENT_TEXT */ || t.type === 7 /* MouseTargetType.CONTENT_EMPTY */);
|
|
215
215
|
const targetIsGutter = (t.type === 2 /* MouseTargetType.GUTTER_GLYPH_MARGIN */ || t.type === 3 /* MouseTargetType.GUTTER_LINE_NUMBERS */ || t.type === 4 /* MouseTargetType.GUTTER_LINE_DECORATIONS */);
|
|
216
216
|
const targetIsLineNumbers = (t.type === 3 /* MouseTargetType.GUTTER_LINE_NUMBERS */);
|
|
217
|
-
const selectOnLineNumbers = this._context.configuration.options.get(
|
|
217
|
+
const selectOnLineNumbers = this._context.configuration.options.get(125 /* EditorOption.selectOnLineNumbers */);
|
|
218
218
|
const targetIsViewZone = (t.type === 8 /* MouseTargetType.CONTENT_VIEW_ZONE */ || t.type === 5 /* MouseTargetType.GUTTER_VIEW_ZONE */);
|
|
219
219
|
const targetIsWidget = (t.type === 9 /* MouseTargetType.CONTENT_WIDGET */);
|
|
220
220
|
let shouldHandle = e.leftButton || e.middleButton;
|
|
@@ -320,7 +320,7 @@ class MouseDownOperation extends Disposable {
|
|
|
320
320
|
// Overwrite the detail of the MouseEvent, as it will be sent out in an event and contributions might rely on it.
|
|
321
321
|
e.detail = this._mouseState.count;
|
|
322
322
|
const options = this._context.configuration.options;
|
|
323
|
-
if (!options.get(
|
|
323
|
+
if (!options.get(104 /* EditorOption.readOnly */)
|
|
324
324
|
&& options.get(42 /* EditorOption.dragAndDrop */)
|
|
325
325
|
&& !options.get(28 /* EditorOption.columnSelection */)
|
|
326
326
|
&& !this._mouseState.altKey // we don't support multiple mouse
|
|
@@ -401,7 +401,7 @@ class MouseDownOperation extends Disposable {
|
|
|
401
401
|
return MouseTarget.createOutsideEditor(mouseColumn, new Position(belowLineNumber, model.getLineMaxColumn(belowLineNumber)), 'below', outsideDistance);
|
|
402
402
|
}
|
|
403
403
|
const possibleLineNumber = viewLayout.getLineNumberAtVerticalOffset(viewLayout.getCurrentScrollTop() + e.relativePos.y);
|
|
404
|
-
const layoutInfo = this._context.configuration.options.get(
|
|
404
|
+
const layoutInfo = this._context.configuration.options.get(165 /* EditorOption.layoutInfo */);
|
|
405
405
|
const xLeftBoundary = layoutInfo.contentLeft;
|
|
406
406
|
if (e.relativePos.x <= xLeftBoundary) {
|
|
407
407
|
const outsideDistance = xLeftBoundary - e.relativePos.x;
|
|
@@ -177,11 +177,11 @@ export class HitTestContext {
|
|
|
177
177
|
constructor(context, viewHelper, lastRenderData) {
|
|
178
178
|
this.viewModel = context.viewModel;
|
|
179
179
|
const options = context.configuration.options;
|
|
180
|
-
this.layoutInfo = options.get(
|
|
180
|
+
this.layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
181
181
|
this.viewDomNode = viewHelper.viewDomNode;
|
|
182
182
|
this.viewLinesGpu = viewHelper.viewLinesGpu;
|
|
183
183
|
this.lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
184
|
-
this.stickyTabStops = options.get(
|
|
184
|
+
this.stickyTabStops = options.get(132 /* EditorOption.stickyTabStops */);
|
|
185
185
|
this.typicalHalfwidthCharacterWidth = options.get(59 /* EditorOption.fontInfo */).typicalHalfwidthCharacterWidth;
|
|
186
186
|
this.lastRenderData = lastRenderData;
|
|
187
187
|
this._context = context;
|
|
@@ -677,7 +677,7 @@ export class MouseTargetFactory {
|
|
|
677
677
|
}
|
|
678
678
|
getMouseColumn(relativePos) {
|
|
679
679
|
const options = this._context.configuration.options;
|
|
680
|
-
const layoutInfo = options.get(
|
|
680
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
681
681
|
const mouseContentHorizontalOffset = this._context.viewLayout.getCurrentScrollLeft() + relativePos.x - layoutInfo.contentLeft;
|
|
682
682
|
return MouseTargetFactory._getMouseColumn(mouseContentHorizontalOffset, options.get(59 /* EditorOption.fontInfo */).typicalHalfwidthCharacterWidth);
|
|
683
683
|
}
|
|
@@ -1660,7 +1660,7 @@ export var CoreEditingCommands;
|
|
|
1660
1660
|
activeElement.ownerDocument.execCommand('undo');
|
|
1661
1661
|
}
|
|
1662
1662
|
runEditorCommand(accessor, editor, args) {
|
|
1663
|
-
if (!editor.hasModel() || editor.getOption(
|
|
1663
|
+
if (!editor.hasModel() || editor.getOption(104 /* EditorOption.readOnly */) === true) {
|
|
1664
1664
|
return;
|
|
1665
1665
|
}
|
|
1666
1666
|
return editor.getModel().undo();
|
|
@@ -1674,7 +1674,7 @@ export var CoreEditingCommands;
|
|
|
1674
1674
|
activeElement.ownerDocument.execCommand('redo');
|
|
1675
1675
|
}
|
|
1676
1676
|
runEditorCommand(accessor, editor, args) {
|
|
1677
|
-
if (!editor.hasModel() || editor.getOption(
|
|
1677
|
+
if (!editor.hasModel() || editor.getOption(104 /* EditorOption.readOnly */) === true) {
|
|
1678
1678
|
return;
|
|
1679
1679
|
}
|
|
1680
1680
|
return editor.getModel().redo();
|
|
@@ -62,7 +62,7 @@ export class RectangleRenderer extends ViewEventHandler {
|
|
|
62
62
|
const updateBufferValues = (canvasDevicePixelWidth = this._canvas.width, canvasDevicePixelHeight = this._canvas.height) => {
|
|
63
63
|
bufferValues[0 /* Info.Offset_CanvasWidth____ */] = canvasDevicePixelWidth;
|
|
64
64
|
bufferValues[1 /* Info.Offset_CanvasHeight___ */] = canvasDevicePixelHeight;
|
|
65
|
-
bufferValues[2 /* Info.Offset_ViewportOffsetX */] = Math.ceil(this._context.configuration.options.get(
|
|
65
|
+
bufferValues[2 /* Info.Offset_ViewportOffsetX */] = Math.ceil(this._context.configuration.options.get(165 /* EditorOption.layoutInfo */).contentLeft * getActiveWindow().devicePixelRatio);
|
|
66
66
|
bufferValues[3 /* Info.Offset_ViewportOffsetY */] = 0;
|
|
67
67
|
bufferValues[4 /* Info.Offset_ViewportWidth__ */] = bufferValues[0 /* Info.Offset_CanvasWidth____ */] - bufferValues[2 /* Info.Offset_ViewportOffsetX */];
|
|
68
68
|
bufferValues[5 /* Info.Offset_ViewportHeight_ */] = bufferValues[1 /* Info.Offset_CanvasHeight___ */] - bufferValues[3 /* Info.Offset_ViewportOffsetY */];
|
|
@@ -110,7 +110,7 @@ let ViewGpuContext = class ViewGpuContext extends Disposable {
|
|
|
110
110
|
this.canvasDevicePixelDimensions = canvasDevicePixelDimensions;
|
|
111
111
|
const contentLeft = observableValue(this, 0);
|
|
112
112
|
this._register(this.configurationService.onDidChangeConfiguration(e => {
|
|
113
|
-
contentLeft.set(context.configuration.options.get(
|
|
113
|
+
contentLeft.set(context.configuration.options.get(165 /* EditorOption.layoutInfo */).contentLeft, undefined);
|
|
114
114
|
}));
|
|
115
115
|
this.contentLeft = contentLeft;
|
|
116
116
|
this.rectangleRenderer = this._instantiationService.createInstance(RectangleRenderer, context, this.contentLeft, this.devicePixelRatio, this.canvas.domNode, this.ctx, ViewGpuContext_1.device);
|
|
@@ -60,7 +60,7 @@ export class ObservableCodeEditor extends Disposable {
|
|
|
60
60
|
this._currentTransaction = undefined;
|
|
61
61
|
this._model = observableValue(this, this.editor.getModel());
|
|
62
62
|
this.model = this._model;
|
|
63
|
-
this.isReadonly = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(
|
|
63
|
+
this.isReadonly = observableFromEvent(this, this.editor.onDidChangeConfiguration, () => this.editor.getOption(104 /* EditorOption.readOnly */));
|
|
64
64
|
this._versionId = observableValueOpts({ owner: this, lazy: true }, this.editor.getModel()?.getVersionId() ?? null);
|
|
65
65
|
this.versionId = this._versionId;
|
|
66
66
|
this._selections = observableValueOpts({ owner: this, equalsFn: equalsIfDefined(itemsEquals(Selection.selectionsEqual)), lazy: true }, this.editor.getSelections() ?? null);
|
|
@@ -69,9 +69,9 @@ export class ViewController {
|
|
|
69
69
|
}
|
|
70
70
|
dispatchMouse(data) {
|
|
71
71
|
const options = this.configuration.options;
|
|
72
|
-
const selectionClipboardIsOn = (platform.isLinux && options.get(
|
|
72
|
+
const selectionClipboardIsOn = (platform.isLinux && options.get(121 /* EditorOption.selectionClipboard */));
|
|
73
73
|
const columnSelection = options.get(28 /* EditorOption.columnSelection */);
|
|
74
|
-
const scrollOnMiddleClick = options.get(
|
|
74
|
+
const scrollOnMiddleClick = options.get(171 /* EditorOption.scrollOnMiddleClick */);
|
|
75
75
|
if (data.middleButton && !selectionClipboardIsOn) {
|
|
76
76
|
if (scrollOnMiddleClick) {
|
|
77
77
|
// nothing to do here, handled in the contribution
|
|
@@ -193,7 +193,7 @@ export class VisibleLinesCollection {
|
|
|
193
193
|
}
|
|
194
194
|
// ---- begin view event handlers
|
|
195
195
|
onConfigurationChanged(e) {
|
|
196
|
-
if (e.hasChanged(
|
|
196
|
+
if (e.hasChanged(165 /* EditorOption.layoutInfo */)) {
|
|
197
197
|
return true;
|
|
198
198
|
}
|
|
199
199
|
return false;
|
|
@@ -152,14 +152,14 @@ export class ContentViewOverlays extends ViewOverlays {
|
|
|
152
152
|
constructor(context) {
|
|
153
153
|
super(context);
|
|
154
154
|
const options = this._context.configuration.options;
|
|
155
|
-
const layoutInfo = options.get(
|
|
155
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
156
156
|
this._contentWidth = layoutInfo.contentWidth;
|
|
157
157
|
this.domNode.setHeight(0);
|
|
158
158
|
}
|
|
159
159
|
// --- begin event handlers
|
|
160
160
|
onConfigurationChanged(e) {
|
|
161
161
|
const options = this._context.configuration.options;
|
|
162
|
-
const layoutInfo = options.get(
|
|
162
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
163
163
|
this._contentWidth = layoutInfo.contentWidth;
|
|
164
164
|
return super.onConfigurationChanged(e) || true;
|
|
165
165
|
}
|
|
@@ -176,7 +176,7 @@ export class MarginViewOverlays extends ViewOverlays {
|
|
|
176
176
|
constructor(context) {
|
|
177
177
|
super(context);
|
|
178
178
|
const options = this._context.configuration.options;
|
|
179
|
-
const layoutInfo = options.get(
|
|
179
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
180
180
|
this._contentLeft = layoutInfo.contentLeft;
|
|
181
181
|
this.domNode.setClassName('margin-view-overlays');
|
|
182
182
|
this.domNode.setWidth(1);
|
|
@@ -185,7 +185,7 @@ export class MarginViewOverlays extends ViewOverlays {
|
|
|
185
185
|
onConfigurationChanged(e) {
|
|
186
186
|
const options = this._context.configuration.options;
|
|
187
187
|
applyFontInfo(this.domNode, options.get(59 /* EditorOption.fontInfo */));
|
|
188
|
-
const layoutInfo = options.get(
|
|
188
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
189
189
|
this._contentLeft = layoutInfo.contentLeft;
|
|
190
190
|
return super.onConfigurationChanged(e) || true;
|
|
191
191
|
}
|
|
@@ -84,7 +84,7 @@ let View = class View extends ViewEventHandler {
|
|
|
84
84
|
this._context.addEventHandler(this);
|
|
85
85
|
this._viewParts = [];
|
|
86
86
|
// Keyboard handler
|
|
87
|
-
this._editContextEnabled = this._context.configuration.options.get(
|
|
87
|
+
this._editContextEnabled = this._context.configuration.options.get(170 /* EditorOption.effectiveEditContext */);
|
|
88
88
|
this._accessibilitySupport = this._context.configuration.options.get(2 /* EditorOption.accessibilitySupport */);
|
|
89
89
|
this._editContext = this._instantiateEditContext();
|
|
90
90
|
this._viewParts.push(this._editContext);
|
|
@@ -190,7 +190,7 @@ let View = class View extends ViewEventHandler {
|
|
|
190
190
|
this._pointerHandler = this._register(new PointerHandler(this._context, this._viewController, this._createPointerHandlerHelper()));
|
|
191
191
|
}
|
|
192
192
|
_instantiateEditContext() {
|
|
193
|
-
const usingExperimentalEditContext = this._context.configuration.options.get(
|
|
193
|
+
const usingExperimentalEditContext = this._context.configuration.options.get(170 /* EditorOption.effectiveEditContext */);
|
|
194
194
|
if (usingExperimentalEditContext) {
|
|
195
195
|
return this._instantiationService.createInstance(NativeEditContext, this._ownerID, this._context, this._overflowGuardContainer, this._viewController, this._createTextAreaHandlerHelper());
|
|
196
196
|
}
|
|
@@ -199,7 +199,7 @@ let View = class View extends ViewEventHandler {
|
|
|
199
199
|
}
|
|
200
200
|
}
|
|
201
201
|
_updateEditContext() {
|
|
202
|
-
const editContextEnabled = this._context.configuration.options.get(
|
|
202
|
+
const editContextEnabled = this._context.configuration.options.get(170 /* EditorOption.effectiveEditContext */);
|
|
203
203
|
const accessibilitySupport = this._context.configuration.options.get(2 /* EditorOption.accessibilitySupport */);
|
|
204
204
|
if (this._editContextEnabled === editContextEnabled && this._accessibilitySupport === accessibilitySupport) {
|
|
205
205
|
return;
|
|
@@ -303,7 +303,7 @@ let View = class View extends ViewEventHandler {
|
|
|
303
303
|
}
|
|
304
304
|
_applyLayout() {
|
|
305
305
|
const options = this._context.configuration.options;
|
|
306
|
-
const layoutInfo = options.get(
|
|
306
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
307
307
|
this.domNode.setWidth(layoutInfo.width);
|
|
308
308
|
this.domNode.setHeight(layoutInfo.height);
|
|
309
309
|
this._overflowGuardContainer.setWidth(layoutInfo.width);
|
|
@@ -314,7 +314,7 @@ let View = class View extends ViewEventHandler {
|
|
|
314
314
|
}
|
|
315
315
|
_getEditorClassName() {
|
|
316
316
|
const focused = this._editContext.isFocused() ? ' focused' : '';
|
|
317
|
-
return this._context.configuration.options.get(
|
|
317
|
+
return this._context.configuration.options.get(162 /* EditorOption.editorClassName */) + ' ' + getThemeTypeSelector(this._context.theme.type) + focused;
|
|
318
318
|
}
|
|
319
319
|
// --- begin event handlers
|
|
320
320
|
handleEvents(events) {
|
|
@@ -20,7 +20,7 @@ export class BlockDecorations extends ViewPart {
|
|
|
20
20
|
update() {
|
|
21
21
|
let didChange = false;
|
|
22
22
|
const options = this._context.configuration.options;
|
|
23
|
-
const layoutInfo = options.get(
|
|
23
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
24
24
|
const newContentWidth = layoutInfo.contentWidth - layoutInfo.verticalScrollbarWidth;
|
|
25
25
|
if (this.contentWidth !== newContentWidth) {
|
|
26
26
|
this.contentWidth = newContentWidth;
|
|
@@ -132,7 +132,7 @@ class Widget {
|
|
|
132
132
|
this._viewDomNode = viewDomNode;
|
|
133
133
|
this._actual = actual;
|
|
134
134
|
const options = this._context.configuration.options;
|
|
135
|
-
const layoutInfo = options.get(
|
|
135
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
136
136
|
const allowOverflow = options.get(4 /* EditorOption.allowOverflow */);
|
|
137
137
|
this.domNode = createFastDomNode(this._actual.getDomNode());
|
|
138
138
|
this.id = this._actual.getId();
|
|
@@ -156,8 +156,8 @@ class Widget {
|
|
|
156
156
|
}
|
|
157
157
|
onConfigurationChanged(e) {
|
|
158
158
|
const options = this._context.configuration.options;
|
|
159
|
-
if (e.hasChanged(
|
|
160
|
-
const layoutInfo = options.get(
|
|
159
|
+
if (e.hasChanged(165 /* EditorOption.layoutInfo */)) {
|
|
160
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
161
161
|
this._contentLeft = layoutInfo.contentLeft;
|
|
162
162
|
this._contentWidth = layoutInfo.contentWidth;
|
|
163
163
|
this._maxWidth = this._getMaxWidth();
|
|
@@ -15,9 +15,9 @@ export class AbstractLineHighlightOverlay extends DynamicViewOverlay {
|
|
|
15
15
|
super();
|
|
16
16
|
this._context = context;
|
|
17
17
|
const options = this._context.configuration.options;
|
|
18
|
-
const layoutInfo = options.get(
|
|
19
|
-
this._renderLineHighlight = options.get(
|
|
20
|
-
this._renderLineHighlightOnlyWhenFocus = options.get(
|
|
18
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
19
|
+
this._renderLineHighlight = options.get(110 /* EditorOption.renderLineHighlight */);
|
|
20
|
+
this._renderLineHighlightOnlyWhenFocus = options.get(111 /* EditorOption.renderLineHighlightOnlyWhenFocus */);
|
|
21
21
|
this._wordWrap = layoutInfo.isViewportWrapping;
|
|
22
22
|
this._contentLeft = layoutInfo.contentLeft;
|
|
23
23
|
this._contentWidth = layoutInfo.contentWidth;
|
|
@@ -57,9 +57,9 @@ export class AbstractLineHighlightOverlay extends DynamicViewOverlay {
|
|
|
57
57
|
}
|
|
58
58
|
onConfigurationChanged(e) {
|
|
59
59
|
const options = this._context.configuration.options;
|
|
60
|
-
const layoutInfo = options.get(
|
|
61
|
-
this._renderLineHighlight = options.get(
|
|
62
|
-
this._renderLineHighlightOnlyWhenFocus = options.get(
|
|
60
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
61
|
+
this._renderLineHighlight = options.get(110 /* EditorOption.renderLineHighlight */);
|
|
62
|
+
this._renderLineHighlightOnlyWhenFocus = options.get(111 /* EditorOption.renderLineHighlightOnlyWhenFocus */);
|
|
63
63
|
this._wordWrap = layoutInfo.isViewportWrapping;
|
|
64
64
|
this._contentLeft = layoutInfo.contentLeft;
|
|
65
65
|
this._contentWidth = layoutInfo.contentWidth;
|
|
@@ -15,11 +15,11 @@ export class EditorScrollbar extends ViewPart {
|
|
|
15
15
|
constructor(context, linesContent, viewDomNode, overflowGuardDomNode) {
|
|
16
16
|
super(context);
|
|
17
17
|
const options = this._context.configuration.options;
|
|
18
|
-
const scrollbar = options.get(
|
|
18
|
+
const scrollbar = options.get(117 /* EditorOption.scrollbar */);
|
|
19
19
|
const mouseWheelScrollSensitivity = options.get(83 /* EditorOption.mouseWheelScrollSensitivity */);
|
|
20
20
|
const fastScrollSensitivity = options.get(49 /* EditorOption.fastScrollSensitivity */);
|
|
21
|
-
const scrollPredominantAxis = options.get(
|
|
22
|
-
const inertialScroll = options.get(
|
|
21
|
+
const scrollPredominantAxis = options.get(120 /* EditorOption.scrollPredominantAxis */);
|
|
22
|
+
const inertialScroll = options.get(158 /* EditorOption.inertialScroll */);
|
|
23
23
|
const scrollbarOptions = {
|
|
24
24
|
listenOnDomNode: viewDomNode.domNode,
|
|
25
25
|
className: 'editor-scrollable' + ' ' + getThemeTypeSelector(context.theme.type),
|
|
@@ -79,7 +79,7 @@ export class EditorScrollbar extends ViewPart {
|
|
|
79
79
|
}
|
|
80
80
|
_setLayout() {
|
|
81
81
|
const options = this._context.configuration.options;
|
|
82
|
-
const layoutInfo = options.get(
|
|
82
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
83
83
|
this.scrollbarDomNode.setLeft(layoutInfo.contentLeft);
|
|
84
84
|
const minimap = options.get(81 /* EditorOption.minimap */);
|
|
85
85
|
const side = minimap.side;
|
|
@@ -105,14 +105,14 @@ export class EditorScrollbar extends ViewPart {
|
|
|
105
105
|
}
|
|
106
106
|
// --- begin event handlers
|
|
107
107
|
onConfigurationChanged(e) {
|
|
108
|
-
if (e.hasChanged(
|
|
108
|
+
if (e.hasChanged(117 /* EditorOption.scrollbar */)
|
|
109
109
|
|| e.hasChanged(83 /* EditorOption.mouseWheelScrollSensitivity */)
|
|
110
110
|
|| e.hasChanged(49 /* EditorOption.fastScrollSensitivity */)) {
|
|
111
111
|
const options = this._context.configuration.options;
|
|
112
|
-
const scrollbar = options.get(
|
|
112
|
+
const scrollbar = options.get(117 /* EditorOption.scrollbar */);
|
|
113
113
|
const mouseWheelScrollSensitivity = options.get(83 /* EditorOption.mouseWheelScrollSensitivity */);
|
|
114
114
|
const fastScrollSensitivity = options.get(49 /* EditorOption.fastScrollSensitivity */);
|
|
115
|
-
const scrollPredominantAxis = options.get(
|
|
115
|
+
const scrollPredominantAxis = options.get(120 /* EditorOption.scrollPredominantAxis */);
|
|
116
116
|
const newOpts = {
|
|
117
117
|
vertical: scrollbar.vertical,
|
|
118
118
|
horizontal: scrollbar.horizontal,
|
|
@@ -126,7 +126,7 @@ export class EditorScrollbar extends ViewPart {
|
|
|
126
126
|
};
|
|
127
127
|
this.scrollbar.updateOptions(newOpts);
|
|
128
128
|
}
|
|
129
|
-
if (e.hasChanged(
|
|
129
|
+
if (e.hasChanged(165 /* EditorOption.layoutInfo */)) {
|
|
130
130
|
this._setLayout();
|
|
131
131
|
}
|
|
132
132
|
return true;
|
|
@@ -101,7 +101,7 @@ export class GlyphMarginWidgets extends ViewPart {
|
|
|
101
101
|
this._widgets = {};
|
|
102
102
|
this._context = context;
|
|
103
103
|
const options = this._context.configuration.options;
|
|
104
|
-
const layoutInfo = options.get(
|
|
104
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
105
105
|
this.domNode = createFastDomNode(document.createElement('div'));
|
|
106
106
|
this.domNode.setClassName('glyph-margin-widgets');
|
|
107
107
|
this.domNode.setPosition('absolute');
|
|
@@ -126,7 +126,7 @@ export class GlyphMarginWidgets extends ViewPart {
|
|
|
126
126
|
// --- begin event handlers
|
|
127
127
|
onConfigurationChanged(e) {
|
|
128
128
|
const options = this._context.configuration.options;
|
|
129
|
-
const layoutInfo = options.get(
|
|
129
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
130
130
|
this._lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
131
131
|
this._glyphMargin = options.get(66 /* EditorOption.glyphMargin */);
|
|
132
132
|
this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
|
|
@@ -21,7 +21,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
|
|
|
21
21
|
this._context = context;
|
|
22
22
|
this._primaryPosition = null;
|
|
23
23
|
const options = this._context.configuration.options;
|
|
24
|
-
const wrappingInfo = options.get(
|
|
24
|
+
const wrappingInfo = options.get(166 /* EditorOption.wrappingInfo */);
|
|
25
25
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
26
26
|
this._spaceWidth = fontInfo.spaceWidth;
|
|
27
27
|
this._maxIndentLeft = wrappingInfo.wrappingColumn === -1 ? -1 : (wrappingInfo.wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
|
|
@@ -37,7 +37,7 @@ export class IndentGuidesOverlay extends DynamicViewOverlay {
|
|
|
37
37
|
// --- begin event handlers
|
|
38
38
|
onConfigurationChanged(e) {
|
|
39
39
|
const options = this._context.configuration.options;
|
|
40
|
-
const wrappingInfo = options.get(
|
|
40
|
+
const wrappingInfo = options.get(166 /* EditorOption.wrappingInfo */);
|
|
41
41
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
42
42
|
this._spaceWidth = fontInfo.spaceWidth;
|
|
43
43
|
this._maxIndentLeft = wrappingInfo.wrappingColumn === -1 ? -1 : (wrappingInfo.wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
|
|
@@ -29,8 +29,8 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
|
|
|
29
29
|
const lineNumbers = options.get(76 /* EditorOption.lineNumbers */);
|
|
30
30
|
this._renderLineNumbers = lineNumbers.renderType;
|
|
31
31
|
this._renderCustomLineNumbers = lineNumbers.renderFn;
|
|
32
|
-
this._renderFinalNewline = options.get(
|
|
33
|
-
const layoutInfo = options.get(
|
|
32
|
+
this._renderFinalNewline = options.get(109 /* EditorOption.renderFinalNewline */);
|
|
33
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
34
34
|
this._lineNumbersLeft = layoutInfo.lineNumbersLeft;
|
|
35
35
|
this._lineNumbersWidth = layoutInfo.lineNumbersWidth;
|
|
36
36
|
}
|
|
@@ -9,7 +9,7 @@ export class LinesDecorationsOverlay extends DedupOverlay {
|
|
|
9
9
|
super();
|
|
10
10
|
this._context = context;
|
|
11
11
|
const options = this._context.configuration.options;
|
|
12
|
-
const layoutInfo = options.get(
|
|
12
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
13
13
|
this._decorationsLeft = layoutInfo.decorationsLeft;
|
|
14
14
|
this._decorationsWidth = layoutInfo.decorationsWidth;
|
|
15
15
|
this._renderResult = null;
|
|
@@ -23,7 +23,7 @@ export class LinesDecorationsOverlay extends DedupOverlay {
|
|
|
23
23
|
// --- begin event handlers
|
|
24
24
|
onConfigurationChanged(e) {
|
|
25
25
|
const options = this._context.configuration.options;
|
|
26
|
-
const layoutInfo = options.get(
|
|
26
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
27
27
|
this._decorationsLeft = layoutInfo.decorationsLeft;
|
|
28
28
|
this._decorationsWidth = layoutInfo.decorationsWidth;
|
|
29
29
|
return true;
|
|
@@ -16,7 +16,7 @@ export class Margin extends ViewPart {
|
|
|
16
16
|
constructor(context) {
|
|
17
17
|
super(context);
|
|
18
18
|
const options = this._context.configuration.options;
|
|
19
|
-
const layoutInfo = options.get(
|
|
19
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
20
20
|
this._canUseLayerHinting = !options.get(39 /* EditorOption.disableLayerHinting */);
|
|
21
21
|
this._contentLeft = layoutInfo.contentLeft;
|
|
22
22
|
this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
|
|
@@ -39,7 +39,7 @@ export class Margin extends ViewPart {
|
|
|
39
39
|
// --- begin event handlers
|
|
40
40
|
onConfigurationChanged(e) {
|
|
41
41
|
const options = this._context.configuration.options;
|
|
42
|
-
const layoutInfo = options.get(
|
|
42
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
43
43
|
this._canUseLayerHinting = !options.get(39 /* EditorOption.disableLayerHinting */);
|
|
44
44
|
this._contentLeft = layoutInfo.contentLeft;
|
|
45
45
|
this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
|
|
@@ -32,17 +32,17 @@ const GUTTER_DECORATION_WIDTH = 2;
|
|
|
32
32
|
class MinimapOptions {
|
|
33
33
|
constructor(configuration, theme, tokensColorTracker) {
|
|
34
34
|
const options = configuration.options;
|
|
35
|
-
const pixelRatio = options.get(
|
|
36
|
-
const layoutInfo = options.get(
|
|
35
|
+
const pixelRatio = options.get(163 /* EditorOption.pixelRatio */);
|
|
36
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
37
37
|
const minimapLayout = layoutInfo.minimap;
|
|
38
38
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
39
39
|
const minimapOpts = options.get(81 /* EditorOption.minimap */);
|
|
40
40
|
this.renderMinimap = minimapLayout.renderMinimap;
|
|
41
41
|
this.size = minimapOpts.size;
|
|
42
42
|
this.minimapHeightIsEditorHeight = minimapLayout.minimapHeightIsEditorHeight;
|
|
43
|
-
this.scrollBeyondLastLine = options.get(
|
|
44
|
-
this.paddingTop = options.get(
|
|
45
|
-
this.paddingBottom = options.get(
|
|
43
|
+
this.scrollBeyondLastLine = options.get(119 /* EditorOption.scrollBeyondLastLine */);
|
|
44
|
+
this.paddingTop = options.get(96 /* EditorOption.padding */).top;
|
|
45
|
+
this.paddingBottom = options.get(96 /* EditorOption.padding */).bottom;
|
|
46
46
|
this.showSlider = minimapOpts.showSlider;
|
|
47
47
|
this.autohide = minimapOpts.autohide;
|
|
48
48
|
this.pixelRatio = pixelRatio;
|
|
@@ -16,7 +16,7 @@ export class ViewOverlayWidgets extends ViewPart {
|
|
|
16
16
|
super(context);
|
|
17
17
|
this._viewDomNode = viewDomNode;
|
|
18
18
|
const options = this._context.configuration.options;
|
|
19
|
-
const layoutInfo = options.get(
|
|
19
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
20
20
|
this._widgets = {};
|
|
21
21
|
this._verticalScrollbarWidth = layoutInfo.verticalScrollbarWidth;
|
|
22
22
|
this._minimapWidth = layoutInfo.minimap.minimapWidth;
|
|
@@ -41,7 +41,7 @@ export class ViewOverlayWidgets extends ViewPart {
|
|
|
41
41
|
// ---- begin view event handlers
|
|
42
42
|
onConfigurationChanged(e) {
|
|
43
43
|
const options = this._context.configuration.options;
|
|
44
|
-
const layoutInfo = options.get(
|
|
44
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
45
45
|
this._verticalScrollbarWidth = layoutInfo.verticalScrollbarWidth;
|
|
46
46
|
this._minimapWidth = layoutInfo.minimap.minimapWidth;
|
|
47
47
|
this._horizontalScrollbarHeight = layoutInfo.horizontalScrollbarHeight;
|
|
@@ -14,9 +14,9 @@ class Settings {
|
|
|
14
14
|
constructor(config, theme) {
|
|
15
15
|
const options = config.options;
|
|
16
16
|
this.lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
17
|
-
this.pixelRatio = options.get(
|
|
18
|
-
this.overviewRulerLanes = options.get(
|
|
19
|
-
this.renderBorder = options.get(
|
|
17
|
+
this.pixelRatio = options.get(163 /* EditorOption.pixelRatio */);
|
|
18
|
+
this.overviewRulerLanes = options.get(95 /* EditorOption.overviewRulerLanes */);
|
|
19
|
+
this.renderBorder = options.get(94 /* EditorOption.overviewRulerBorder */);
|
|
20
20
|
const borderColor = theme.getColor(editorOverviewRulerBorder);
|
|
21
21
|
this.borderColor = borderColor ? borderColor.toString() : null;
|
|
22
22
|
this.hideCursor = options.get(68 /* EditorOption.hideCursorInOverviewRuler */);
|
|
@@ -41,7 +41,7 @@ class Settings {
|
|
|
41
41
|
else {
|
|
42
42
|
this.backgroundColor = null;
|
|
43
43
|
}
|
|
44
|
-
const layoutInfo = options.get(
|
|
44
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
45
45
|
const position = layoutInfo.overviewRuler;
|
|
46
46
|
this.top = position.top;
|
|
47
47
|
this.right = position.right;
|