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
|
@@ -24,7 +24,7 @@ export class OverviewRuler extends ViewEventHandler {
|
|
|
24
24
|
this._zoneManager.setDOMHeight(0);
|
|
25
25
|
this._zoneManager.setOuterHeight(this._context.viewLayout.getScrollHeight());
|
|
26
26
|
this._zoneManager.setLineHeight(options.get(75 /* EditorOption.lineHeight */));
|
|
27
|
-
this._zoneManager.setPixelRatio(options.get(
|
|
27
|
+
this._zoneManager.setPixelRatio(options.get(163 /* EditorOption.pixelRatio */));
|
|
28
28
|
this._context.addEventHandler(this);
|
|
29
29
|
}
|
|
30
30
|
dispose() {
|
|
@@ -38,8 +38,8 @@ export class OverviewRuler extends ViewEventHandler {
|
|
|
38
38
|
this._zoneManager.setLineHeight(options.get(75 /* EditorOption.lineHeight */));
|
|
39
39
|
this._render();
|
|
40
40
|
}
|
|
41
|
-
if (e.hasChanged(
|
|
42
|
-
this._zoneManager.setPixelRatio(options.get(
|
|
41
|
+
if (e.hasChanged(163 /* EditorOption.pixelRatio */)) {
|
|
42
|
+
this._zoneManager.setPixelRatio(options.get(163 /* EditorOption.pixelRatio */));
|
|
43
43
|
this._domNode.setWidth(this._zoneManager.getDOMWidth());
|
|
44
44
|
this._domNode.setHeight(this._zoneManager.getDOMHeight());
|
|
45
45
|
this._domNode.domNode.width = this._zoneManager.getCanvasWidth();
|
|
@@ -18,7 +18,7 @@ export class Rulers extends ViewPart {
|
|
|
18
18
|
this.domNode.setClassName('view-rulers');
|
|
19
19
|
this._renderedRulers = [];
|
|
20
20
|
const options = this._context.configuration.options;
|
|
21
|
-
this._rulers = options.get(
|
|
21
|
+
this._rulers = options.get(116 /* EditorOption.rulers */);
|
|
22
22
|
this._typicalHalfwidthCharacterWidth = options.get(59 /* EditorOption.fontInfo */).typicalHalfwidthCharacterWidth;
|
|
23
23
|
}
|
|
24
24
|
dispose() {
|
|
@@ -27,7 +27,7 @@ export class Rulers extends ViewPart {
|
|
|
27
27
|
// --- begin event handlers
|
|
28
28
|
onConfigurationChanged(e) {
|
|
29
29
|
const options = this._context.configuration.options;
|
|
30
|
-
this._rulers = options.get(
|
|
30
|
+
this._rulers = options.get(116 /* EditorOption.rulers */);
|
|
31
31
|
this._typicalHalfwidthCharacterWidth = options.get(59 /* EditorOption.fontInfo */).typicalHalfwidthCharacterWidth;
|
|
32
32
|
return true;
|
|
33
33
|
}
|
|
@@ -31,7 +31,7 @@ export class RulersGpu extends ViewPart {
|
|
|
31
31
|
}
|
|
32
32
|
_updateEntries(reader) {
|
|
33
33
|
const options = this._context.configuration.options;
|
|
34
|
-
const rulers = options.get(
|
|
34
|
+
const rulers = options.get(116 /* EditorOption.rulers */);
|
|
35
35
|
const typicalHalfwidthCharacterWidth = options.get(59 /* EditorOption.fontInfo */).typicalHalfwidthCharacterWidth;
|
|
36
36
|
const devicePixelRatio = this._viewGpuContext.devicePixelRatio.read(reader);
|
|
37
37
|
for (let i = 0, len = rulers.length; i < len; i++) {
|
|
@@ -13,7 +13,7 @@ export class ScrollDecorationViewPart extends ViewPart {
|
|
|
13
13
|
this._updateWidth();
|
|
14
14
|
this._shouldShow = false;
|
|
15
15
|
const options = this._context.configuration.options;
|
|
16
|
-
const scrollbar = options.get(
|
|
16
|
+
const scrollbar = options.get(117 /* EditorOption.scrollbar */);
|
|
17
17
|
this._useShadows = scrollbar.useShadows;
|
|
18
18
|
this._domNode = createFastDomNode(document.createElement('div'));
|
|
19
19
|
this._domNode.setAttribute('role', 'presentation');
|
|
@@ -35,7 +35,7 @@ export class ScrollDecorationViewPart extends ViewPart {
|
|
|
35
35
|
}
|
|
36
36
|
_updateWidth() {
|
|
37
37
|
const options = this._context.configuration.options;
|
|
38
|
-
const layoutInfo = options.get(
|
|
38
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
39
39
|
if (layoutInfo.minimap.renderMinimap === 0 || (layoutInfo.minimap.minimapWidth > 0 && layoutInfo.minimap.minimapLeft === 0)) {
|
|
40
40
|
this._width = layoutInfo.width;
|
|
41
41
|
}
|
|
@@ -46,7 +46,7 @@ export class ScrollDecorationViewPart extends ViewPart {
|
|
|
46
46
|
// --- begin event handlers
|
|
47
47
|
onConfigurationChanged(e) {
|
|
48
48
|
const options = this._context.configuration.options;
|
|
49
|
-
const scrollbar = options.get(
|
|
49
|
+
const scrollbar = options.get(117 /* EditorOption.scrollbar */);
|
|
50
50
|
this._useShadows = scrollbar.useShadows;
|
|
51
51
|
this._updateWidth();
|
|
52
52
|
this._updateShouldShow();
|
|
@@ -42,7 +42,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
|
|
|
42
42
|
this._previousFrameVisibleRangesWithStyle = [];
|
|
43
43
|
this._context = context;
|
|
44
44
|
const options = this._context.configuration.options;
|
|
45
|
-
this._roundedSelection = options.get(
|
|
45
|
+
this._roundedSelection = options.get(115 /* EditorOption.roundedSelection */);
|
|
46
46
|
this._typicalHalfwidthCharacterWidth = options.get(59 /* EditorOption.fontInfo */).typicalHalfwidthCharacterWidth;
|
|
47
47
|
this._selections = [];
|
|
48
48
|
this._renderResult = null;
|
|
@@ -56,7 +56,7 @@ export class SelectionsOverlay extends DynamicViewOverlay {
|
|
|
56
56
|
// --- begin event handlers
|
|
57
57
|
onConfigurationChanged(e) {
|
|
58
58
|
const options = this._context.configuration.options;
|
|
59
|
-
this._roundedSelection = options.get(
|
|
59
|
+
this._roundedSelection = options.get(115 /* EditorOption.roundedSelection */);
|
|
60
60
|
this._typicalHalfwidthCharacterWidth = options.get(59 /* EditorOption.fontInfo */).typicalHalfwidthCharacterWidth;
|
|
61
61
|
return true;
|
|
62
62
|
}
|
|
@@ -32,7 +32,7 @@ export class ViewCursor {
|
|
|
32
32
|
this._context = context;
|
|
33
33
|
const options = this._context.configuration.options;
|
|
34
34
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
35
|
-
this._cursorStyle = options.get(
|
|
35
|
+
this._cursorStyle = options.get(161 /* EditorOption.effectiveCursorStyle */);
|
|
36
36
|
this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
|
|
37
37
|
this._lineCursorWidth = Math.min(options.get(37 /* EditorOption.cursorWidth */), this._typicalHalfwidthCharacterWidth);
|
|
38
38
|
this._lineCursorHeight = options.get(38 /* EditorOption.cursorHeight */);
|
|
@@ -86,7 +86,7 @@ export class ViewCursor {
|
|
|
86
86
|
onConfigurationChanged(e) {
|
|
87
87
|
const options = this._context.configuration.options;
|
|
88
88
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
89
|
-
this._cursorStyle = options.get(
|
|
89
|
+
this._cursorStyle = options.get(161 /* EditorOption.effectiveCursorStyle */);
|
|
90
90
|
this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
|
|
91
91
|
this._lineCursorWidth = Math.min(options.get(37 /* EditorOption.cursorWidth */), this._typicalHalfwidthCharacterWidth);
|
|
92
92
|
this._lineCursorHeight = options.get(38 /* EditorOption.cursorHeight */);
|
|
@@ -21,11 +21,11 @@ export class ViewCursors extends ViewPart {
|
|
|
21
21
|
constructor(context) {
|
|
22
22
|
super(context);
|
|
23
23
|
const options = this._context.configuration.options;
|
|
24
|
-
this._readOnly = options.get(
|
|
24
|
+
this._readOnly = options.get(104 /* EditorOption.readOnly */);
|
|
25
25
|
this._cursorBlinking = options.get(32 /* EditorOption.cursorBlinking */);
|
|
26
|
-
this._cursorStyle = options.get(
|
|
26
|
+
this._cursorStyle = options.get(161 /* EditorOption.effectiveCursorStyle */);
|
|
27
27
|
this._cursorSmoothCaretAnimation = options.get(33 /* EditorOption.cursorSmoothCaretAnimation */);
|
|
28
|
-
this._editContextEnabled = options.get(
|
|
28
|
+
this._editContextEnabled = options.get(170 /* EditorOption.effectiveEditContext */);
|
|
29
29
|
this._selectionIsEmpty = true;
|
|
30
30
|
this._isComposingInput = false;
|
|
31
31
|
this._isVisible = false;
|
|
@@ -64,11 +64,11 @@ export class ViewCursors extends ViewPart {
|
|
|
64
64
|
}
|
|
65
65
|
onConfigurationChanged(e) {
|
|
66
66
|
const options = this._context.configuration.options;
|
|
67
|
-
this._readOnly = options.get(
|
|
67
|
+
this._readOnly = options.get(104 /* EditorOption.readOnly */);
|
|
68
68
|
this._cursorBlinking = options.get(32 /* EditorOption.cursorBlinking */);
|
|
69
|
-
this._cursorStyle = options.get(
|
|
69
|
+
this._cursorStyle = options.get(161 /* EditorOption.effectiveCursorStyle */);
|
|
70
70
|
this._cursorSmoothCaretAnimation = options.get(33 /* EditorOption.cursorSmoothCaretAnimation */);
|
|
71
|
-
this._editContextEnabled = options.get(
|
|
71
|
+
this._editContextEnabled = options.get(170 /* EditorOption.effectiveEditContext */);
|
|
72
72
|
this._updateBlinking();
|
|
73
73
|
this._updateDomClassName();
|
|
74
74
|
this._primaryCursor.onConfigurationChanged(e);
|
|
@@ -7,9 +7,9 @@ export class ViewLineOptions {
|
|
|
7
7
|
this.themeType = themeType;
|
|
8
8
|
const options = config.options;
|
|
9
9
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
10
|
-
this.renderWhitespace = options.get(
|
|
10
|
+
this.renderWhitespace = options.get(113 /* EditorOption.renderWhitespace */);
|
|
11
11
|
this.experimentalWhitespaceRendering = options.get(47 /* EditorOption.experimentalWhitespaceRendering */);
|
|
12
|
-
this.renderControlCharacters = options.get(
|
|
12
|
+
this.renderControlCharacters = options.get(108 /* EditorOption.renderControlCharacters */);
|
|
13
13
|
this.spaceWidth = fontInfo.spaceWidth;
|
|
14
14
|
this.middotWidth = fontInfo.middotWidth;
|
|
15
15
|
this.wsmiddotWidth = fontInfo.wsmiddotWidth;
|
|
@@ -17,9 +17,9 @@ export class ViewLineOptions {
|
|
|
17
17
|
&& !options.get(40 /* EditorOption.disableMonospaceOptimizations */));
|
|
18
18
|
this.canUseHalfwidthRightwardsArrow = fontInfo.canUseHalfwidthRightwardsArrow;
|
|
19
19
|
this.lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
20
|
-
this.stopRenderingLineAfter = options.get(
|
|
20
|
+
this.stopRenderingLineAfter = options.get(133 /* EditorOption.stopRenderingLineAfter */);
|
|
21
21
|
this.fontLigatures = options.get(60 /* EditorOption.fontLigatures */);
|
|
22
|
-
this.verticalScrollbarSize = options.get(
|
|
22
|
+
this.verticalScrollbarSize = options.get(117 /* EditorOption.scrollbar */).verticalScrollbarSize;
|
|
23
23
|
this.useGpu = options.get(46 /* EditorOption.experimentalGpuAcceleration */) === 'on';
|
|
24
24
|
}
|
|
25
25
|
equals(other) {
|
|
@@ -74,11 +74,11 @@ export class ViewLines extends ViewPart {
|
|
|
74
74
|
const conf = this._context.configuration;
|
|
75
75
|
const options = this._context.configuration.options;
|
|
76
76
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
77
|
-
const wrappingInfo = options.get(
|
|
77
|
+
const wrappingInfo = options.get(166 /* EditorOption.wrappingInfo */);
|
|
78
78
|
this._lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
79
79
|
this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
|
|
80
80
|
this._isViewportWrapping = wrappingInfo.isViewportWrapping;
|
|
81
|
-
this._revealHorizontalRightPadding = options.get(
|
|
81
|
+
this._revealHorizontalRightPadding = options.get(114 /* EditorOption.revealHorizontalRightPadding */);
|
|
82
82
|
this._cursorSurroundingLines = options.get(35 /* EditorOption.cursorSurroundingLines */);
|
|
83
83
|
this._cursorSurroundingLinesStyle = options.get(36 /* EditorOption.cursorSurroundingLinesStyle */);
|
|
84
84
|
this._canUseLayerHinting = !options.get(39 /* EditorOption.disableLayerHinting */);
|
|
@@ -103,8 +103,8 @@ export class ViewLines extends ViewPart {
|
|
|
103
103
|
this._lastRenderedData = new LastRenderedData();
|
|
104
104
|
this._horizontalRevealRequest = null;
|
|
105
105
|
// sticky scroll widget
|
|
106
|
-
this._stickyScrollEnabled = options.get(
|
|
107
|
-
this._maxNumberStickyLines = options.get(
|
|
106
|
+
this._stickyScrollEnabled = options.get(131 /* EditorOption.stickyScroll */).enabled;
|
|
107
|
+
this._maxNumberStickyLines = options.get(131 /* EditorOption.stickyScroll */).maxLineCount;
|
|
108
108
|
}
|
|
109
109
|
dispose() {
|
|
110
110
|
this._asyncUpdateLineWidths.dispose();
|
|
@@ -117,25 +117,25 @@ export class ViewLines extends ViewPart {
|
|
|
117
117
|
// ---- begin view event handlers
|
|
118
118
|
onConfigurationChanged(e) {
|
|
119
119
|
this._visibleLines.onConfigurationChanged(e);
|
|
120
|
-
if (e.hasChanged(
|
|
120
|
+
if (e.hasChanged(166 /* EditorOption.wrappingInfo */)) {
|
|
121
121
|
this._maxLineWidth = 0;
|
|
122
122
|
}
|
|
123
123
|
const options = this._context.configuration.options;
|
|
124
124
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
125
|
-
const wrappingInfo = options.get(
|
|
125
|
+
const wrappingInfo = options.get(166 /* EditorOption.wrappingInfo */);
|
|
126
126
|
this._lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
127
127
|
this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
|
|
128
128
|
this._isViewportWrapping = wrappingInfo.isViewportWrapping;
|
|
129
|
-
this._revealHorizontalRightPadding = options.get(
|
|
129
|
+
this._revealHorizontalRightPadding = options.get(114 /* EditorOption.revealHorizontalRightPadding */);
|
|
130
130
|
this._cursorSurroundingLines = options.get(35 /* EditorOption.cursorSurroundingLines */);
|
|
131
131
|
this._cursorSurroundingLinesStyle = options.get(36 /* EditorOption.cursorSurroundingLinesStyle */);
|
|
132
132
|
this._canUseLayerHinting = !options.get(39 /* EditorOption.disableLayerHinting */);
|
|
133
133
|
// sticky scroll
|
|
134
|
-
this._stickyScrollEnabled = options.get(
|
|
135
|
-
this._maxNumberStickyLines = options.get(
|
|
134
|
+
this._stickyScrollEnabled = options.get(131 /* EditorOption.stickyScroll */).enabled;
|
|
135
|
+
this._maxNumberStickyLines = options.get(131 /* EditorOption.stickyScroll */).maxLineCount;
|
|
136
136
|
applyFontInfo(this.domNode, fontInfo);
|
|
137
137
|
this._onOptionsMaybeChanged();
|
|
138
|
-
if (e.hasChanged(
|
|
138
|
+
if (e.hasChanged(165 /* EditorOption.layoutInfo */)) {
|
|
139
139
|
this._maxLineWidth = 0;
|
|
140
140
|
}
|
|
141
141
|
return true;
|
|
@@ -635,7 +635,7 @@ export class ViewLines extends ViewPart {
|
|
|
635
635
|
}
|
|
636
636
|
_computeScrollLeftToReveal(horizontalRevealRequest) {
|
|
637
637
|
const viewport = this._context.viewLayout.getCurrentViewport();
|
|
638
|
-
const layoutInfo = this._context.configuration.options.get(
|
|
638
|
+
const layoutInfo = this._context.configuration.options.get(165 /* EditorOption.layoutInfo */);
|
|
639
639
|
const viewportStartX = viewport.left;
|
|
640
640
|
const viewportEndX = viewportStartX + viewport.width - layoutInfo.verticalScrollbarWidth;
|
|
641
641
|
let boxStartX = 1073741824 /* Constants.MAX_SAFE_SMALL_INTEGER */;
|
|
@@ -98,7 +98,7 @@ let ViewLinesGpu = class ViewLinesGpu extends ViewPart {
|
|
|
98
98
|
const updateBufferValues = (canvasDevicePixelWidth = this.canvas.width, canvasDevicePixelHeight = this.canvas.height) => {
|
|
99
99
|
bufferValues[0 /* Info.Offset_CanvasWidth____ */] = canvasDevicePixelWidth;
|
|
100
100
|
bufferValues[1 /* Info.Offset_CanvasHeight___ */] = canvasDevicePixelHeight;
|
|
101
|
-
bufferValues[2 /* Info.Offset_ViewportOffsetX */] = Math.ceil(this._context.configuration.options.get(
|
|
101
|
+
bufferValues[2 /* Info.Offset_ViewportOffsetX */] = Math.ceil(this._context.configuration.options.get(165 /* EditorOption.layoutInfo */).contentLeft * getActiveWindow().devicePixelRatio);
|
|
102
102
|
bufferValues[3 /* Info.Offset_ViewportOffsetY */] = 0;
|
|
103
103
|
bufferValues[4 /* Info.Offset_ViewportWidth__ */] = bufferValues[0 /* Info.Offset_CanvasWidth____ */] - bufferValues[2 /* Info.Offset_ViewportOffsetX */];
|
|
104
104
|
bufferValues[5 /* Info.Offset_ViewportHeight_ */] = bufferValues[1 /* Info.Offset_CanvasHeight___ */] - bufferValues[3 /* Info.Offset_ViewportOffsetY */];
|
|
@@ -16,7 +16,7 @@ export class ViewZones 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._lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
21
21
|
this._contentWidth = layoutInfo.contentWidth;
|
|
22
22
|
this._contentLeft = layoutInfo.contentLeft;
|
|
@@ -63,7 +63,7 @@ export class ViewZones extends ViewPart {
|
|
|
63
63
|
}
|
|
64
64
|
onConfigurationChanged(e) {
|
|
65
65
|
const options = this._context.configuration.options;
|
|
66
|
-
const layoutInfo = options.get(
|
|
66
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
67
67
|
this._lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
68
68
|
this._contentWidth = layoutInfo.contentWidth;
|
|
69
69
|
this._contentLeft = layoutInfo.contentLeft;
|
|
@@ -30,7 +30,7 @@ export class WhitespaceOverlay extends DynamicViewOverlay {
|
|
|
30
30
|
onConfigurationChanged(e) {
|
|
31
31
|
const newOptions = new WhitespaceOptions(this._context.configuration);
|
|
32
32
|
if (this._options.equals(newOptions)) {
|
|
33
|
-
return e.hasChanged(
|
|
33
|
+
return e.hasChanged(165 /* EditorOption.layoutInfo */);
|
|
34
34
|
}
|
|
35
35
|
this._options = newOptions;
|
|
36
36
|
return true;
|
|
@@ -247,11 +247,11 @@ class WhitespaceOptions {
|
|
|
247
247
|
this.renderWithSVG = false;
|
|
248
248
|
}
|
|
249
249
|
else if (experimentalWhitespaceRendering === 'svg') {
|
|
250
|
-
this.renderWhitespace = options.get(
|
|
250
|
+
this.renderWhitespace = options.get(113 /* EditorOption.renderWhitespace */);
|
|
251
251
|
this.renderWithSVG = true;
|
|
252
252
|
}
|
|
253
253
|
else {
|
|
254
|
-
this.renderWhitespace = options.get(
|
|
254
|
+
this.renderWhitespace = options.get(113 /* EditorOption.renderWhitespace */);
|
|
255
255
|
this.renderWithSVG = false;
|
|
256
256
|
}
|
|
257
257
|
this.spaceWidth = fontInfo.spaceWidth;
|
|
@@ -259,7 +259,7 @@ class WhitespaceOptions {
|
|
|
259
259
|
this.wsmiddotWidth = fontInfo.wsmiddotWidth;
|
|
260
260
|
this.canUseHalfwidthRightwardsArrow = fontInfo.canUseHalfwidthRightwardsArrow;
|
|
261
261
|
this.lineHeight = options.get(75 /* EditorOption.lineHeight */);
|
|
262
|
-
this.stopRenderingLineAfter = options.get(
|
|
262
|
+
this.stopRenderingLineAfter = options.get(133 /* EditorOption.stopRenderingLineAfter */);
|
|
263
263
|
}
|
|
264
264
|
equals(other) {
|
|
265
265
|
return (this.renderWhitespace === other.renderWhitespace
|
|
@@ -178,8 +178,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
178
178
|
this._register(this._configuration.onDidChange((e) => {
|
|
179
179
|
this._onDidChangeConfiguration.fire(e);
|
|
180
180
|
const options = this._configuration.options;
|
|
181
|
-
if (e.hasChanged(
|
|
182
|
-
const layoutInfo = options.get(
|
|
181
|
+
if (e.hasChanged(165 /* EditorOption.layoutInfo */)) {
|
|
182
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
183
183
|
this._onDidLayoutChange.fire(layoutInfo);
|
|
184
184
|
}
|
|
185
185
|
}));
|
|
@@ -221,7 +221,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
221
221
|
this._actions.set(internalAction.id, internalAction);
|
|
222
222
|
}
|
|
223
223
|
const isDropIntoEnabled = () => {
|
|
224
|
-
return !this._configuration.options.get(
|
|
224
|
+
return !this._configuration.options.get(104 /* EditorOption.readOnly */)
|
|
225
225
|
&& this._configuration.options.get(43 /* EditorOption.dropIntoEditor */).enabled;
|
|
226
226
|
};
|
|
227
227
|
this._register(new dom.DragAndDropObserver(this._domElement, {
|
|
@@ -300,7 +300,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
300
300
|
if (!this._modelData) {
|
|
301
301
|
return null;
|
|
302
302
|
}
|
|
303
|
-
return WordOperations.getWordAtPosition(this._modelData.model, this._configuration.options.get(
|
|
303
|
+
return WordOperations.getWordAtPosition(this._modelData.model, this._configuration.options.get(148 /* EditorOption.wordSeparators */), this._configuration.options.get(147 /* EditorOption.wordSegmenterLocales */), position);
|
|
304
304
|
}
|
|
305
305
|
getValue(options = null) {
|
|
306
306
|
if (!this._modelData) {
|
|
@@ -881,7 +881,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
881
881
|
if (!this._modelData) {
|
|
882
882
|
return false;
|
|
883
883
|
}
|
|
884
|
-
if (this._configuration.options.get(
|
|
884
|
+
if (this._configuration.options.get(104 /* EditorOption.readOnly */)) {
|
|
885
885
|
// read only editor => sorry!
|
|
886
886
|
return false;
|
|
887
887
|
}
|
|
@@ -892,7 +892,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
892
892
|
if (!this._modelData) {
|
|
893
893
|
return false;
|
|
894
894
|
}
|
|
895
|
-
if (this._configuration.options.get(
|
|
895
|
+
if (this._configuration.options.get(104 /* EditorOption.readOnly */)) {
|
|
896
896
|
// read only editor => sorry!
|
|
897
897
|
return false;
|
|
898
898
|
}
|
|
@@ -906,7 +906,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
906
906
|
if (!this._modelData) {
|
|
907
907
|
return false;
|
|
908
908
|
}
|
|
909
|
-
if (this._configuration.options.get(
|
|
909
|
+
if (this._configuration.options.get(104 /* EditorOption.readOnly */)) {
|
|
910
910
|
// read only editor => sorry!
|
|
911
911
|
return false;
|
|
912
912
|
}
|
|
@@ -1011,7 +1011,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
1011
1011
|
}
|
|
1012
1012
|
getLayoutInfo() {
|
|
1013
1013
|
const options = this._configuration.options;
|
|
1014
|
-
const layoutInfo = options.get(
|
|
1014
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
1015
1015
|
return layoutInfo;
|
|
1016
1016
|
}
|
|
1017
1017
|
createOverviewRuler(cssClassName) {
|
|
@@ -1182,7 +1182,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
1182
1182
|
}
|
|
1183
1183
|
const position = this._modelData.model.validatePosition(rawPosition);
|
|
1184
1184
|
const options = this._configuration.options;
|
|
1185
|
-
const layoutInfo = options.get(
|
|
1185
|
+
const layoutInfo = options.get(165 /* EditorOption.layoutInfo */);
|
|
1186
1186
|
const top = CodeEditorWidget_1._getVerticalOffsetForPosition(this._modelData, position.lineNumber, position.column) - this.getScrollTop();
|
|
1187
1187
|
const left = this._modelData.view.getOffsetForColumn(position.lineNumber, position.column) + layoutInfo.glyphMarginWidth + layoutInfo.lineNumbersWidth + layoutInfo.decorationsWidth - this.getScrollLeft();
|
|
1188
1188
|
const height = this.getLineHeightForPosition(position);
|
|
@@ -1273,7 +1273,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
|
|
|
1273
1273
|
break;
|
|
1274
1274
|
case 7 /* OutgoingViewModelEventKind.CursorStateChanged */: {
|
|
1275
1275
|
if (e.reachedMaxCursorCount) {
|
|
1276
|
-
const multiCursorLimit = this.getOption(
|
|
1276
|
+
const multiCursorLimit = this.getOption(89 /* EditorOption.multiCursorLimit */);
|
|
1277
1277
|
const message = nls.localize(80, "The number of cursors has been limited to {0}. Consider using [find and replace](https://code.visualstudio.com/docs/editor/codebasics#_find-and-replace) for larger changes or increase the editor multi cursor limit setting.", multiCursorLimit);
|
|
1278
1278
|
this._notificationService.prompt(Severity.Warning, message, [
|
|
1279
1279
|
{
|
|
@@ -1591,8 +1591,8 @@ class EditorContextKeysManager extends Disposable {
|
|
|
1591
1591
|
}
|
|
1592
1592
|
_updateFromConfig() {
|
|
1593
1593
|
const options = this._editor.getOptions();
|
|
1594
|
-
this._tabMovesFocus.set(options.get(
|
|
1595
|
-
this._editorReadonly.set(options.get(
|
|
1594
|
+
this._tabMovesFocus.set(options.get(164 /* EditorOption.tabFocusMode */) || TabFocus.getTabFocusMode());
|
|
1595
|
+
this._editorReadonly.set(options.get(104 /* EditorOption.readOnly */));
|
|
1596
1596
|
this._inDiffEditor.set(options.get(70 /* EditorOption.inDiffEditor */));
|
|
1597
1597
|
this._editorColumnSelection.set(options.get(28 /* EditorOption.columnSelection */));
|
|
1598
1598
|
}
|
|
@@ -424,9 +424,9 @@ let View = class View extends Disposable {
|
|
|
424
424
|
this._scrollbar.scanDomNode();
|
|
425
425
|
}
|
|
426
426
|
_createRow(item, lineHeight, width, originalOptions, originalModel, originalModelOpts, modifiedOptions, modifiedModel, modifiedModelOpts) {
|
|
427
|
-
const originalLayoutInfo = originalOptions.get(
|
|
427
|
+
const originalLayoutInfo = originalOptions.get(165 /* EditorOption.layoutInfo */);
|
|
428
428
|
const originalLineNumbersWidth = originalLayoutInfo.glyphMarginWidth + originalLayoutInfo.lineNumbersWidth;
|
|
429
|
-
const modifiedLayoutInfo = modifiedOptions.get(
|
|
429
|
+
const modifiedLayoutInfo = modifiedOptions.get(165 /* EditorOption.layoutInfo */);
|
|
430
430
|
const modifiedLineNumbersWidth = 10 + modifiedLayoutInfo.glyphMarginWidth + modifiedLayoutInfo.lineNumbersWidth;
|
|
431
431
|
let rowClassName = 'diff-review-row';
|
|
432
432
|
let lineNumbersExtraClassName = '';
|
|
@@ -531,11 +531,11 @@ let View = class View extends Disposable {
|
|
|
531
531
|
_getLineHtml(model, options, tabSize, lineNumber, languageIdCodec) {
|
|
532
532
|
const lineContent = model.getLineContent(lineNumber);
|
|
533
533
|
const fontInfo = options.get(59 /* EditorOption.fontInfo */);
|
|
534
|
-
const verticalScrollbarSize = options.get(
|
|
534
|
+
const verticalScrollbarSize = options.get(117 /* EditorOption.scrollbar */).verticalScrollbarSize;
|
|
535
535
|
const lineTokens = LineTokens.createEmpty(lineContent, languageIdCodec);
|
|
536
536
|
const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, model.mightContainNonBasicASCII());
|
|
537
537
|
const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, model.mightContainRTL());
|
|
538
|
-
const r = renderViewLine2(new RenderLineInput((fontInfo.isMonospace && !options.get(40 /* EditorOption.disableMonospaceOptimizations */)), fontInfo.canUseHalfwidthRightwardsArrow, lineContent, false, isBasicASCII, containsRTL, 0, lineTokens, [], tabSize, 0, fontInfo.spaceWidth, fontInfo.middotWidth, fontInfo.wsmiddotWidth, options.get(
|
|
538
|
+
const r = renderViewLine2(new RenderLineInput((fontInfo.isMonospace && !options.get(40 /* EditorOption.disableMonospaceOptimizations */)), fontInfo.canUseHalfwidthRightwardsArrow, lineContent, false, isBasicASCII, containsRTL, 0, lineTokens, [], tabSize, 0, fontInfo.spaceWidth, fontInfo.middotWidth, fontInfo.wsmiddotWidth, options.get(133 /* EditorOption.stopRenderingLineAfter */), options.get(113 /* EditorOption.renderWhitespace */), options.get(108 /* EditorOption.renderControlCharacters */), options.get(60 /* EditorOption.fontLigatures */) !== EditorFontLigatures.OFF, null, null, verticalScrollbarSize));
|
|
539
539
|
return r.html;
|
|
540
540
|
}
|
|
541
541
|
};
|
|
@@ -68,12 +68,12 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
|
|
|
68
68
|
updateImmediately.schedule();
|
|
69
69
|
} }));
|
|
70
70
|
this._register(this._editors.original.onDidChangeConfiguration((args) => {
|
|
71
|
-
if (args.hasChanged(
|
|
71
|
+
if (args.hasChanged(166 /* EditorOption.wrappingInfo */) || args.hasChanged(75 /* EditorOption.lineHeight */)) {
|
|
72
72
|
updateImmediately.schedule();
|
|
73
73
|
}
|
|
74
74
|
}));
|
|
75
75
|
this._register(this._editors.modified.onDidChangeConfiguration((args) => {
|
|
76
|
-
if (args.hasChanged(
|
|
76
|
+
if (args.hasChanged(166 /* EditorOption.wrappingInfo */) || args.hasChanged(75 /* EditorOption.lineHeight */)) {
|
|
77
77
|
updateImmediately.schedule();
|
|
78
78
|
}
|
|
79
79
|
}));
|
|
@@ -486,7 +486,7 @@ function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEd
|
|
|
486
486
|
function getAdditionalLineHeights(editor, viewZonesToIgnore) {
|
|
487
487
|
const viewZoneHeights = [];
|
|
488
488
|
const wrappingZoneHeights = [];
|
|
489
|
-
const hasWrapping = editor.getOption(
|
|
489
|
+
const hasWrapping = editor.getOption(166 /* EditorOption.wrappingInfo */).wrappingColumn !== -1;
|
|
490
490
|
const coordinatesConverter = editor._getViewModel().coordinatesConverter;
|
|
491
491
|
const editorLineHeight = editor.getOption(75 /* EditorOption.lineHeight */);
|
|
492
492
|
if (hasWrapping) {
|
|
@@ -43,7 +43,7 @@ export class InlineDiffDeletedCodeMargin extends Disposable {
|
|
|
43
43
|
this._diffActions.style.lineHeight = `${lineHeight}px`;
|
|
44
44
|
this._marginDomNode.appendChild(this._diffActions);
|
|
45
45
|
let currentLineNumberOffset = 0;
|
|
46
|
-
const useShadowDOM = _modifiedEditor.getOption(
|
|
46
|
+
const useShadowDOM = _modifiedEditor.getOption(144 /* EditorOption.useShadowDOM */) && !isIOS; // Do not use shadow dom on IOS #122035
|
|
47
47
|
const showContextMenu = (x, y) => {
|
|
48
48
|
this._contextMenuService.showContextMenu({
|
|
49
49
|
domForShadowRoot: useShadowDOM ? _modifiedEditor.getDomNode() ?? undefined : undefined,
|
|
@@ -75,7 +75,7 @@ export class InlineDiffDeletedCodeMargin extends Disposable {
|
|
|
75
75
|
await this._clipboardService.writeText(lineContent);
|
|
76
76
|
}));
|
|
77
77
|
}
|
|
78
|
-
const readOnly = _modifiedEditor.getOption(
|
|
78
|
+
const readOnly = _modifiedEditor.getOption(104 /* EditorOption.readOnly */);
|
|
79
79
|
if (!readOnly) {
|
|
80
80
|
actions.push(new Action('diff.inline.revertChange', localize(115, "Revert this change"), undefined, true, async () => {
|
|
81
81
|
this._editor.revert(this._diff);
|
package/esm/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js
CHANGED
|
@@ -61,8 +61,8 @@ export class RenderOptions {
|
|
|
61
61
|
static fromEditor(editor) {
|
|
62
62
|
const modifiedEditorOptions = editor.getOptions();
|
|
63
63
|
const fontInfo = modifiedEditorOptions.get(59 /* EditorOption.fontInfo */);
|
|
64
|
-
const layoutInfo = modifiedEditorOptions.get(
|
|
65
|
-
return new RenderOptions(editor.getModel()?.getOptions().tabSize || 0, fontInfo, modifiedEditorOptions.get(40 /* EditorOption.disableMonospaceOptimizations */), fontInfo.typicalHalfwidthCharacterWidth, modifiedEditorOptions.get(
|
|
64
|
+
const layoutInfo = modifiedEditorOptions.get(165 /* EditorOption.layoutInfo */);
|
|
65
|
+
return new RenderOptions(editor.getModel()?.getOptions().tabSize || 0, fontInfo, modifiedEditorOptions.get(40 /* EditorOption.disableMonospaceOptimizations */), fontInfo.typicalHalfwidthCharacterWidth, modifiedEditorOptions.get(118 /* EditorOption.scrollBeyondLastColumn */), modifiedEditorOptions.get(75 /* EditorOption.lineHeight */), layoutInfo.decorationsWidth, modifiedEditorOptions.get(133 /* EditorOption.stopRenderingLineAfter */), modifiedEditorOptions.get(113 /* EditorOption.renderWhitespace */), modifiedEditorOptions.get(108 /* EditorOption.renderControlCharacters */), modifiedEditorOptions.get(60 /* EditorOption.fontLigatures */), modifiedEditorOptions.get(117 /* EditorOption.scrollbar */).verticalScrollbarSize);
|
|
66
66
|
}
|
|
67
67
|
constructor(tabSize, fontInfo, disableMonospaceOptimizations, typicalHalfwidthCharacterWidth, scrollBeyondLastColumn, lineHeight, lineDecorationsWidth, stopRenderingLineAfter, renderWhitespace, renderControlCharacters, fontLigatures, verticalScrollbarSize, setWidth = true) {
|
|
68
68
|
this.tabSize = tabSize;
|
|
@@ -118,7 +118,7 @@ let DiffEditorGutter = class DiffEditorGutter extends Disposable {
|
|
|
118
118
|
},
|
|
119
119
|
}));
|
|
120
120
|
this._register(addDisposableListener(this.elements.gutter, EventType.MOUSE_WHEEL, (e) => {
|
|
121
|
-
if (this._editors.modified.getOption(
|
|
121
|
+
if (this._editors.modified.getOption(117 /* EditorOption.scrollbar */).handleMouseWheel) {
|
|
122
122
|
this._editors.modified.delegateScrollFromMouseWheelEvent(e);
|
|
123
123
|
}
|
|
124
124
|
}, { passive: false }));
|
|
@@ -130,7 +130,7 @@ let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {
|
|
|
130
130
|
});
|
|
131
131
|
const scrollTop = this._editors.modifiedScrollTop.read(reader);
|
|
132
132
|
const scrollHeight = this._editors.modifiedScrollHeight.read(reader);
|
|
133
|
-
const scrollBarOptions = this._editors.modified.getOption(
|
|
133
|
+
const scrollBarOptions = this._editors.modified.getOption(117 /* EditorOption.scrollbar */);
|
|
134
134
|
const state = new ScrollbarState(scrollBarOptions.verticalHasArrows ? scrollBarOptions.arrowSize : 0, scrollBarOptions.verticalScrollbarSize, 0, layoutInfo.height, scrollHeight, scrollTop);
|
|
135
135
|
viewportDomElement.setTop(state.getSliderPosition());
|
|
136
136
|
viewportDomElement.setHeight(state.getSliderSize());
|