@codingame/monaco-vscode-api 3.2.3 → 4.0.0

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

@@ -1,6 +1,16 @@
 import './selections.css.js';
 import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
-import { editorSelectionForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorSelectionForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 class HorizontalRangeWithStyle {
     constructor(other) {
@@ -35,7 +45,6 @@ class SelectionsOverlay extends DynamicViewOverlay {
         this._previousFrameVisibleRangesWithStyle = [];
         this._context = context;
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(67 );
         this._roundedSelection = options.get(101 );
         this._typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
         this._selections = [];
@@ -49,7 +58,6 @@ class SelectionsOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(67 );
         this._roundedSelection = options.get(101 );
         this._typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
         return true;
@@ -181,33 +189,28 @@ class SelectionsOverlay extends DynamicViewOverlay {
         }
         return linesVisibleRanges;
     }
-    _createSelectionPiece(top, height, className, left, width) {
+    _createSelectionPiece(top, bottom, className, left, width) {
         return ('<div class="cslr '
             + className
-            + '" style="top:'
-            + ( top.toString())
-            + 'px;left:'
-            + ( left.toString())
-            + 'px;width:'
-            + ( width.toString())
-            + 'px;height:'
-            + height + 'px;"></div>');
+            + '" style="'
+            + 'top:' + ( top.toString()) + 'px;'
+            + 'bottom:' + ( bottom.toString()) + 'px;'
+            + 'left:' + ( left.toString()) + 'px;'
+            + 'width:' + ( width.toString()) + 'px;' + '"></div>');
     }
     _actualRenderOneSelection(output2, visibleStartLineNumber, hasMultipleSelections, visibleRanges) {
         if (visibleRanges.length === 0) {
             return;
         }
         const visibleRangesHaveStyle = !!visibleRanges[0].ranges[0].startStyle;
-        const fullLineHeight = ( (this._lineHeight).toString());
-        const reducedLineHeight = ( (this._lineHeight - 1).toString());
         const firstLineNumber = visibleRanges[0].lineNumber;
         const lastLineNumber = visibleRanges[visibleRanges.length - 1].lineNumber;
         for (let i = 0, len = visibleRanges.length; i < len; i++) {
             const lineVisibleRanges = visibleRanges[i];
             const lineNumber = lineVisibleRanges.lineNumber;
             const lineIndex = lineNumber - visibleStartLineNumber;
-            const lineHeight = hasMultipleSelections ? (lineNumber === lastLineNumber || lineNumber === firstLineNumber ? reducedLineHeight : fullLineHeight) : fullLineHeight;
             const top = hasMultipleSelections ? (lineNumber === firstLineNumber ? 1 : 0) : 0;
+            const bottom = hasMultipleSelections ? (lineNumber !== firstLineNumber && lineNumber === lastLineNumber ? 1 : 0) : 0;
             let innerCornerOutput = '';
             let restOfSelectionOutput = '';
             for (let j = 0, lenJ = lineVisibleRanges.ranges.length; j < lenJ; j++) {
@@ -216,7 +219,7 @@ class SelectionsOverlay extends DynamicViewOverlay {
                     const startStyle = visibleRange.startStyle;
                     const endStyle = visibleRange.endStyle;
                     if (startStyle.top === 1  || startStyle.bottom === 1 ) {
-                        innerCornerOutput += this._createSelectionPiece(top, lineHeight, SelectionsOverlay.SELECTION_CLASS_NAME, visibleRange.left - SelectionsOverlay.ROUNDED_PIECE_WIDTH, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
+                        innerCornerOutput += this._createSelectionPiece(top, bottom, SelectionsOverlay.SELECTION_CLASS_NAME, visibleRange.left - SelectionsOverlay.ROUNDED_PIECE_WIDTH, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
                         let className = SelectionsOverlay.EDITOR_BACKGROUND_CLASS_NAME;
                         if (startStyle.top === 1 ) {
                             className += ' ' + SelectionsOverlay.SELECTION_TOP_RIGHT;
@@ -224,10 +227,10 @@ class SelectionsOverlay extends DynamicViewOverlay {
                         if (startStyle.bottom === 1 ) {
                             className += ' ' + SelectionsOverlay.SELECTION_BOTTOM_RIGHT;
                         }
-                        innerCornerOutput += this._createSelectionPiece(top, lineHeight, className, visibleRange.left - SelectionsOverlay.ROUNDED_PIECE_WIDTH, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
+                        innerCornerOutput += this._createSelectionPiece(top, bottom, className, visibleRange.left - SelectionsOverlay.ROUNDED_PIECE_WIDTH, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
                     }
                     if (endStyle.top === 1  || endStyle.bottom === 1 ) {
-                        innerCornerOutput += this._createSelectionPiece(top, lineHeight, SelectionsOverlay.SELECTION_CLASS_NAME, visibleRange.left + visibleRange.width, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
+                        innerCornerOutput += this._createSelectionPiece(top, bottom, SelectionsOverlay.SELECTION_CLASS_NAME, visibleRange.left + visibleRange.width, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
                         let className = SelectionsOverlay.EDITOR_BACKGROUND_CLASS_NAME;
                         if (endStyle.top === 1 ) {
                             className += ' ' + SelectionsOverlay.SELECTION_TOP_LEFT;
@@ -235,7 +238,7 @@ class SelectionsOverlay extends DynamicViewOverlay {
                         if (endStyle.bottom === 1 ) {
                             className += ' ' + SelectionsOverlay.SELECTION_BOTTOM_LEFT;
                         }
-                        innerCornerOutput += this._createSelectionPiece(top, lineHeight, className, visibleRange.left + visibleRange.width, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
+                        innerCornerOutput += this._createSelectionPiece(top, bottom, className, visibleRange.left + visibleRange.width, SelectionsOverlay.ROUNDED_PIECE_WIDTH);
                     }
                 }
                 let className = SelectionsOverlay.SELECTION_CLASS_NAME;
@@ -255,7 +258,7 @@ class SelectionsOverlay extends DynamicViewOverlay {
                         className += ' ' + SelectionsOverlay.SELECTION_BOTTOM_RIGHT;
                     }
                 }
-                restOfSelectionOutput += this._createSelectionPiece(top, lineHeight, className, visibleRange.left, visibleRange.width);
+                restOfSelectionOutput += this._createSelectionPiece(top, bottom, className, visibleRange.left, visibleRange.width);
             }
             output2[lineIndex][0] += innerCornerOutput;
             output2[lineIndex][1] += restOfSelectionOutput;

package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursor.js

@@ -17,8 +17,14 @@ class ViewCursorRenderData {
         this.textContentClassName = textContentClassName;
     }
 }
+var CursorPlurality;
+( (function(CursorPlurality) {
+    CursorPlurality[CursorPlurality["Single"] = 0] = "Single";
+    CursorPlurality[CursorPlurality["MultiPrimary"] = 1] = "MultiPrimary";
+    CursorPlurality[CursorPlurality["MultiSecondary"] = 2] = "MultiSecondary";
+})(CursorPlurality || (CursorPlurality = {})));
 class ViewCursor {
-    constructor(context) {
+    constructor(context, plurality) {
         this._context = context;
         const options = this._context.configuration.options;
         const fontInfo = options.get(50 );
@@ -35,6 +41,8 @@ class ViewCursor {
         applyFontInfo(this._domNode, fontInfo);
         this._domNode.setDisplay('none');
         this._position = ( new Position(1, 1));
+        this._pluralityClass = '';
+        this.setPlurality(plurality);
         this._lastRenderedContent = '';
         this._renderData = null;
     }
@@ -44,6 +52,20 @@ class ViewCursor {
     getPosition() {
         return this._position;
     }
+    setPlurality(plurality) {
+        switch (plurality) {
+            default:
+            case CursorPlurality.Single:
+                this._pluralityClass = '';
+                break;
+            case CursorPlurality.MultiPrimary:
+                this._pluralityClass = 'cursor-primary';
+                break;
+            case CursorPlurality.MultiSecondary:
+                this._pluralityClass = 'cursor-secondary';
+                break;
+        }
+    }
     show() {
         if (!this._isVisible) {
             this._domNode.setVisibility('inherit');
@@ -168,7 +190,7 @@ class ViewCursor {
             this._lastRenderedContent = this._renderData.textContent;
             this._domNode.domNode.textContent = this._lastRenderedContent;
         }
-        this._domNode.setClassName(`cursor ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME} ${this._renderData.textContentClassName}`);
+        this._domNode.setClassName(`cursor ${this._pluralityClass} ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME} ${this._renderData.textContentClassName}`);
         this._domNode.setDisplay('block');
         this._domNode.setTop(this._renderData.top);
         this._domNode.setLeft(this._renderData.left);
@@ -185,4 +207,4 @@ class ViewCursor {
         };
     }
 }
-export { ViewCursor };
+export { CursorPlurality, ViewCursor };

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

@@ -2,9 +2,9 @@ import './viewCursors.css.js';
 import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
 import { TimeoutTimer } from '../../../../base/common/async.js';
 import { ViewPart } from '../../view/viewPart.js';
-import { ViewCursor } from './viewCursor.js';
+import { ViewCursor, CursorPlurality } from './viewCursor.js';
 import { TextEditorCursorStyle } from '../../../common/config/editorOptions.js';
-import { editorCursorForeground, editorCursorBackground } from '../../../common/core/editorColorRegistry.js';
+import { editorCursorForeground, editorCursorBackground, editorMultiCursorPrimaryForeground, editorMultiCursorPrimaryBackground, editorMultiCursorSecondaryForeground, editorMultiCursorSecondaryBackground } from '../../../common/core/editorColorRegistry.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
 import { WindowIntervalTimer, getWindow } from '../../../../base/browser/dom.js';
@@ -20,7 +20,7 @@ class ViewCursors extends ViewPart {
         this._selectionIsEmpty = true;
         this._isComposingInput = false;
         this._isVisible = false;
-        this._primaryCursor = ( new ViewCursor(this._context));
+        this._primaryCursor = ( new ViewCursor(this._context, CursorPlurality.Single));
         this._secondaryCursors = [];
         this._renderData = [];
         this._domNode = createFastDomNode(document.createElement('div'));
@@ -69,12 +69,13 @@ class ViewCursors extends ViewPart {
     _onCursorPositionChanged(position, secondaryPositions, reason) {
         const pauseAnimation = (this._secondaryCursors.length !== secondaryPositions.length
             || ((this._cursorSmoothCaretAnimation === 'explicit' && reason !== 3) ));
+        this._primaryCursor.setPlurality(secondaryPositions.length ? CursorPlurality.MultiPrimary : CursorPlurality.Single);
         this._primaryCursor.onCursorPositionChanged(position, pauseAnimation);
         this._updateBlinking();
         if (this._secondaryCursors.length < secondaryPositions.length) {
             const addCnt = secondaryPositions.length - this._secondaryCursors.length;
             for (let i = 0; i < addCnt; i++) {
-                const newCursor = ( new ViewCursor(this._context));
+                const newCursor = ( new ViewCursor(this._context, CursorPlurality.MultiSecondary));
                 this._domNode.domNode.insertBefore(newCursor.getDomNode().domNode, this._primaryCursor.getDomNode().domNode.nextSibling);
                 this._secondaryCursors.push(newCursor);
             }
@@ -292,15 +293,22 @@ class ViewCursors extends ViewPart {
     }
 }
 registerThemingParticipant((theme, collector) => {
-    const caret = theme.getColor(editorCursorForeground);
-    if (caret) {
-        let caretBackground = theme.getColor(editorCursorBackground);
-        if (!caretBackground) {
-            caretBackground = caret.opposite();
-        }
-        collector.addRule(`.monaco-editor .cursors-layer .cursor { background-color: ${caret}; border-color: ${caret}; color: ${caretBackground}; }`);
-        if (isHighContrast(theme.type)) {
-            collector.addRule(`.monaco-editor .cursors-layer.has-selection .cursor { border-left: 1px solid ${caretBackground}; border-right: 1px solid ${caretBackground}; }`);
+    const cursorThemes = [
+        { class: '.cursor', foreground: editorCursorForeground, background: editorCursorBackground },
+        { class: '.cursor-primary', foreground: editorMultiCursorPrimaryForeground, background: editorMultiCursorPrimaryBackground },
+        { class: '.cursor-secondary', foreground: editorMultiCursorSecondaryForeground, background: editorMultiCursorSecondaryBackground },
+    ];
+    for (const cursorTheme of cursorThemes) {
+        const caret = theme.getColor(cursorTheme.foreground);
+        if (caret) {
+            let caretBackground = theme.getColor(cursorTheme.background);
+            if (!caretBackground) {
+                caretBackground = caret.opposite();
+            }
+            collector.addRule(`.monaco-editor .cursors-layer ${cursorTheme.class} { background-color: ${caret}; border-color: ${caret}; color: ${caretBackground}; }`);
+            if (isHighContrast(theme.type)) {
+                collector.addRule(`.monaco-editor .cursors-layer.has-selection ${cursorTheme.class} { border-left: 1px solid ${caretBackground}; border-right: 1px solid ${caretBackground}; }`);
+            }
         }
     }
 });

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

@@ -7,7 +7,7 @@ class ViewZones extends ViewPart {
     constructor(context) {
         super(context);
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._lineHeight = options.get(67 );
         this._contentWidth = layoutInfo.contentWidth;
         this._contentLeft = layoutInfo.contentLeft;
@@ -53,7 +53,7 @@ class ViewZones extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._lineHeight = options.get(67 );
         this._contentWidth = layoutInfo.contentWidth;
         this._contentLeft = layoutInfo.contentLeft;

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

@@ -21,7 +21,7 @@ class WhitespaceOverlay extends DynamicViewOverlay {
     onConfigurationChanged(e) {
         const newOptions = ( new WhitespaceOptions(this._context.configuration));
         if (this._options.equals(newOptions)) {
-            return e.hasChanged(144 );
+            return e.hasChanged(145 );
         }
         this._options = newOptions;
         return true;
@@ -182,7 +182,7 @@ class WhitespaceOverlay extends DynamicViewOverlay {
         }
         if (USE_SVG) {
             maxLeft = Math.round(maxLeft + spaceWidth);
-            return (`<svg style="position:absolute;width:${maxLeft}px;height:${lineHeight}px" viewBox="0 0 ${maxLeft} ${lineHeight}" xmlns="http://www.w3.org/2000/svg" fill="${color}">`
+            return (`<svg style="bottom:0;position:absolute;width:${maxLeft}px;height:${lineHeight}px" viewBox="0 0 ${maxLeft} ${lineHeight}" xmlns="http://www.w3.org/2000/svg" fill="${color}">`
                 + result
                 + `</svg>`);
         }

package/vscode/src/vs/editor/browser/widget/{codeEditorContributions.js → codeEditor/codeEditorContributions.js}

@@ -1,6 +1,6 @@
-import { runWhenWindowIdle, getWindow } from '../../../base/browser/dom.js';
-import { onUnexpectedError } from '../../../base/common/errors.js';
-import { Disposable, DisposableMap } from '../../../base/common/lifecycle.js';
+import { runWhenWindowIdle, getWindow } from '../../../../base/browser/dom.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { Disposable, DisposableMap } from '../../../../base/common/lifecycle.js';
 class CodeEditorContributions extends Disposable {
     constructor() {
         super();

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

@@ -1,65 +1,56 @@
-import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import '../services/markerDecorations.js';
-import { DragAndDropObserver, getWindow, scheduleAtNextAnimationFrame, trackFocus } from '../../../base/browser/dom.js';
-import { onUnexpectedError } from '../../../base/common/errors.js';
-import { createEventDeliveryQueue, Emitter } from '../../../base/common/event.js';
-import { hash } from '../../../base/common/hash.js';
-import { Disposable, dispose } from '../../../base/common/lifecycle.js';
-import { Schemas } from '../../../base/common/network.js';
-import './media/editor.css.js';
-import { applyFontInfo } from '../config/domFontInfo.js';
-import { EditorConfiguration } from '../config/editorConfiguration.js';
-import { TabFocus } from '../config/tabFocus.js';
-import { EditorExtensionsRegistry } from '../editorExtensions.js';
-import { ICodeEditorService } from '../services/codeEditorService.js';
-import { View } from '../view.js';
-import { DOMLineBreaksComputerFactory } from '../view/domLineBreaksComputer.js';
-import { ViewUserInputEvents } from '../view/viewUserInputEvents.js';
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import '../../services/markerDecorations.js';
+import { DragAndDropObserver, getWindow, scheduleAtNextAnimationFrame, trackFocus } from '../../../../base/browser/dom.js';
+import { onUnexpectedError } from '../../../../base/common/errors.js';
+import { createEventDeliveryQueue, Emitter } from '../../../../base/common/event.js';
+import { hash } from '../../../../base/common/hash.js';
+import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
+import { Schemas } from '../../../../base/common/network.js';
+import './editor.css.js';
+import { applyFontInfo } from '../../config/domFontInfo.js';
+import { EditorConfiguration } from '../../config/editorConfiguration.js';
+import { TabFocus } from '../../config/tabFocus.js';
+import { EditorExtensionsRegistry } from '../../editorExtensions.js';
+import { ICodeEditorService } from '../../services/codeEditorService.js';
+import { View } from '../../view.js';
+import { DOMLineBreaksComputerFactory } from '../../view/domLineBreaksComputer.js';
+import { ViewUserInputEvents } from '../../view/viewUserInputEvents.js';
 import { CodeEditorContributions } from './codeEditorContributions.js';
-import { filterValidationDecorations } from '../../common/config/editorOptions.js';
-import { CursorColumns } from '../../common/core/cursorColumns.js';
-import { editorUnnecessaryCodeOpacity } from '../../common/core/editorColorRegistry.js';
-import { Position } from '../../common/core/position.js';
-import { Range } from '../../common/core/range.js';
-import { Selection } from '../../common/core/selection.js';
-import { WordOperations } from '../../common/cursor/cursorWordOperations.js';
-import { InternalEditorAction } from '../../common/editorAction.js';
-import { EditorType } from '../../common/editorCommon.js';
-import { EditorContextKeys } from '../../common/editorContextKeys.js';
-import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
-import { ModelDecorationOptions } from '../../common/model/textModel.js';
-import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';
-import { MonospaceLineBreaksComputerFactory } from '../../common/viewModel/monospaceLineBreaksComputer.js';
-import { ViewModel } from '../../common/viewModel/viewModelImpl.js';
-import { localizeWithPath } from '../../../nls.js';
-import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
-import { ICommandService } from '../../../platform/commands/common/commands.js';
-import { IContextKeyService } from '../../../platform/contextkey/common/contextkey.js';
-import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
-import { ServiceCollection } from '../../../platform/instantiation/common/serviceCollection.js';
-import { Severity, INotificationService } from '../../../platform/notification/common/notification.js';
-import { editorErrorForeground, editorWarningForeground, editorInfoForeground, editorHintForeground } from '../../../platform/theme/common/colorRegistry.js';
-import { registerThemingParticipant, IThemeService } from '../../../platform/theme/common/themeService.js';
+import { filterValidationDecorations } from '../../../common/config/editorOptions.js';
+import { CursorColumns } from '../../../common/core/cursorColumns.js';
+import { editorUnnecessaryCodeOpacity } from '../../../common/core/editorColorRegistry.js';
+import { Position } from '../../../common/core/position.js';
+import { Range } from '../../../common/core/range.js';
+import { Selection } from '../../../common/core/selection.js';
+import { WordOperations } from '../../../common/cursor/cursorWordOperations.js';
+import { InternalEditorAction } from '../../../common/editorAction.js';
+import { EditorType } from '../../../common/editorCommon.js';
+import { EditorContextKeys } from '../../../common/editorContextKeys.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ModelDecorationOptions } from '../../../common/model/textModel.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
+import { ViewModel } from '../../../common/viewModel/viewModelImpl.js';
+import { localizeWithPath } from '../../../../nls.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
+import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorErrorForeground, editorWarningForeground, editorInfoForeground, editorHintForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
+import { registerThemingParticipant, IThemeService } from '../../../../platform/theme/common/themeService.js';
 var CodeEditorWidget_1;
-let EDITOR_ID = 0;
-class ModelData {
-    constructor(model, viewModel, view, hasRealView, listenersToRemove, attachedView) {
-        this.model = model;
-        this.viewModel = viewModel;
-        this.view = view;
-        this.hasRealView = hasRealView;
-        this.listenersToRemove = listenersToRemove;
-        this.attachedView = attachedView;
-    }
-    dispose() {
-        dispose(this.listenersToRemove);
-        this.model.onBeforeDetached(this.attachedView);
-        if (this.hasRealView) {
-            this.view.dispose();
-        }
-        this.viewModel.dispose();
-    }
-}
 let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     static { CodeEditorWidget_1 = this; }
     static { this.dropIntoEditorDecorationOptions = ModelDecorationOptions.register({
@@ -167,8 +158,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this._register(this._configuration.onDidChange((e) => {
             this._onDidChangeConfiguration.fire(e);
             const options = this._configuration.options;
-            if (e.hasChanged(144 )) {
-                const layoutInfo = options.get(144 );
+            if (e.hasChanged(145 )) {
+                const layoutInfo = options.get(145 );
                 this._onDidLayoutChange.fire(layoutInfo);
             }
         }));
@@ -303,7 +294,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         if (!this._modelData) {
             return null;
         }
-        return WordOperations.getWordAtPosition(this._modelData.model, this._configuration.options.get(130 ), position);
+        return WordOperations.getWordAtPosition(this._modelData.model, this._configuration.options.get(131 ), this._configuration.options.get(130 ), position);
     }
     getValue(options = null) {
         if (!this._modelData) {
@@ -757,7 +748,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
             }
             case "paste" : {
                 const args = payload;
-                this._paste(source, args.text || '', args.pasteOnNewLine || false, args.multicursorText || null, args.mode || null);
+                this._paste(source, args.text || '', args.pasteOnNewLine || false, args.multicursorText || null, args.mode || null, args.clipboardEvent);
                 return;
             }
             case "cut" :
@@ -812,8 +803,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         }
         this._modelData.viewModel.compositionType(text, replacePrevCharCnt, replaceNextCharCnt, positionDelta, source);
     }
-    _paste(source, text, pasteOnNewLine, multicursorText, mode) {
-        if (!this._modelData || text.length === 0) {
+    _paste(source, text, pasteOnNewLine, multicursorText, mode, clipboardEvent) {
+        if (!this._modelData) {
             return;
         }
         const viewModel = this._modelData.viewModel;
@@ -822,6 +813,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         const endPosition = viewModel.getSelection().getStartPosition();
         if (source === 'keyboard') {
             this._onDidPaste.fire({
+                clipboardEvent,
                 range: ( new Range(
                     startPosition.lineNumber,
                     startPosition.column,
@@ -1003,7 +995,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     }
     getLayoutInfo() {
         const options = this._configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         return layoutInfo;
     }
     createOverviewRuler(cssClassName) {
@@ -1171,7 +1163,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         }
         const position = this._modelData.model.validatePosition(rawPosition);
         const options = this._configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         const top = CodeEditorWidget_1._getVerticalOffsetForPosition(this._modelData, position.lineNumber, position.column) - this.getScrollTop();
         const left = this._modelData.view.getOffsetForColumn(position.lineNumber, position.column) + layoutInfo.glyphMarginWidth + layoutInfo.lineNumbersWidth + layoutInfo.decorationsWidth - this.getScrollLeft();
         return {
@@ -1257,7 +1249,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                     if (e.reachedMaxCursorCount) {
                         const multiCursorLimit = this.getOption(80 );
                         const message = ( localizeWithPath(
-                            'vs/editor/browser/widget/codeEditorWidget',
+                            'vs/editor/browser/widget/codeEditor/codeEditorWidget',
                             'cursors.maximum',
                             "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
@@ -1271,7 +1263,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                             },
                             {
                                 label: ( localizeWithPath(
-                                    'vs/editor/browser/widget/codeEditorWidget',
+                                    'vs/editor/browser/widget/codeEditor/codeEditorWidget',
                                     'goToSetting',
                                     'Increase Multi Cursor Limit'
                                 )),
@@ -1491,6 +1483,25 @@ CodeEditorWidget = CodeEditorWidget_1 = ( __decorate([
     ( __param(10, ILanguageConfigurationService)),
     ( __param(11, ILanguageFeaturesService))
 ], CodeEditorWidget));
+let EDITOR_ID = 0;
+class ModelData {
+    constructor(model, viewModel, view, hasRealView, listenersToRemove, attachedView) {
+        this.model = model;
+        this.viewModel = viewModel;
+        this.view = view;
+        this.hasRealView = hasRealView;
+        this.listenersToRemove = listenersToRemove;
+        this.attachedView = attachedView;
+    }
+    dispose() {
+        dispose(this.listenersToRemove);
+        this.model.onBeforeDetached(this.attachedView);
+        if (this.hasRealView) {
+            this.view.dispose();
+        }
+        this.viewModel.dispose();
+    }
+}
 class BooleanEventEmitter extends Disposable {
     constructor(_emitterOptions) {
         super();

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

@@ -0,0 +1,4 @@
+import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = "::-ms-clear{display:none}.monaco-editor .editor-widget input{color:inherit}.monaco-editor{-webkit-text-size-adjust:100%;color:var(--vscode-editor-foreground);overflow:visible;position:relative}.monaco-editor,.monaco-editor-background{background-color:var(--vscode-editor-background)}.monaco-editor .rangeHighlight{background-color:var(--vscode-editor-rangeHighlightBackground);border:1px solid var(--vscode-editor-rangeHighlightBorder);box-sizing:border-box}.monaco-editor.hc-black .rangeHighlight,.monaco-editor.hc-light .rangeHighlight{border-style:dotted}.monaco-editor .symbolHighlight{background-color:var(--vscode-editor-symbolHighlightBackground);border:1px solid var(--vscode-editor-symbolHighlightBorder);box-sizing:border-box}.monaco-editor.hc-black .symbolHighlight,.monaco-editor.hc-light .symbolHighlight{border-style:dotted}.monaco-editor .overflow-guard{overflow:hidden;position:relative}.monaco-editor .view-overlays{position:absolute;top:0}.monaco-editor .margin-view-overlays>div,.monaco-editor .view-overlays>div{position:absolute;width:100%}.monaco-editor .margin-view-overlays>div>div,.monaco-editor .view-overlays>div>div{bottom:0}.monaco-editor .squiggly-error{border-bottom:4px double var(--vscode-editorError-border)}.monaco-editor .squiggly-error:before{background:var(--vscode-editorError-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-warning{border-bottom:4px double var(--vscode-editorWarning-border)}.monaco-editor .squiggly-warning:before{background:var(--vscode-editorWarning-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-info{border-bottom:4px double var(--vscode-editorInfo-border)}.monaco-editor .squiggly-info:before{background:var(--vscode-editorInfo-background);content:\"\";display:block;height:100%;width:100%}.monaco-editor .squiggly-hint{border-bottom:2px dotted var(--vscode-editorHint-border)}.monaco-editor.showUnused .squiggly-unnecessary{border-bottom:2px dashed var(--vscode-editorUnnecessaryCode-border)}.monaco-editor.showDeprecated .squiggly-inline-deprecated{text-decoration:line-through;text-decoration-color:var(--vscode-editor-foreground,inherit)}";
+n(css,{});
+export { css, css as default };

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

@@ -0,0 +1,44 @@
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { mixin } from '../../../../base/common/objects.js';
+import { ICodeEditorService } from '../../services/codeEditorService.js';
+import { CodeEditorWidget } from './codeEditorWidget.js';
+import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
+import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+let EmbeddedCodeEditorWidget = class EmbeddedCodeEditorWidget extends CodeEditorWidget {
+    constructor(domElement, options, codeEditorWidgetOptions, parentEditor, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService) {
+        super(domElement, { ...parentEditor.getRawOptions(), overflowWidgetsDomNode: parentEditor.getOverflowWidgetsDomNode() }, codeEditorWidgetOptions, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);
+        this._parentEditor = parentEditor;
+        this._overwriteOptions = options;
+        super.updateOptions(this._overwriteOptions);
+        this._register(parentEditor.onDidChangeConfiguration((e) => this._onParentConfigurationChanged(e)));
+    }
+    getParentEditor() {
+        return this._parentEditor;
+    }
+    _onParentConfigurationChanged(e) {
+        super.updateOptions(this._parentEditor.getRawOptions());
+        super.updateOptions(this._overwriteOptions);
+    }
+    updateOptions(newOptions) {
+        mixin(this._overwriteOptions, newOptions, true);
+        super.updateOptions(this._overwriteOptions);
+    }
+};
+EmbeddedCodeEditorWidget = ( __decorate([
+    ( __param(4, IInstantiationService)),
+    ( __param(5, ICodeEditorService)),
+    ( __param(6, ICommandService)),
+    ( __param(7, IContextKeyService)),
+    ( __param(8, IThemeService)),
+    ( __param(9, INotificationService)),
+    ( __param(10, IAccessibilityService)),
+    ( __param(11, ILanguageConfigurationService)),
+    ( __param(12, ILanguageFeaturesService))
+], EmbeddedCodeEditorWidget));
+export { EmbeddedCodeEditorWidget };