@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/editor/browser/editorBrowser.js

@@ -1,4 +1,33 @@
 import { EditorType } from '../common/editorCommon.js';
+var ContentWidgetPositionPreference;
+( (function(ContentWidgetPositionPreference) {
+    ContentWidgetPositionPreference[ContentWidgetPositionPreference["EXACT"] = 0] = "EXACT";
+    ContentWidgetPositionPreference[ContentWidgetPositionPreference["ABOVE"] = 1] = "ABOVE";
+    ContentWidgetPositionPreference[ContentWidgetPositionPreference["BELOW"] = 2] = "BELOW";
+})(ContentWidgetPositionPreference || (ContentWidgetPositionPreference = {})));
+var OverlayWidgetPositionPreference;
+( (function(OverlayWidgetPositionPreference) {
+    OverlayWidgetPositionPreference[OverlayWidgetPositionPreference["TOP_RIGHT_CORNER"] = 0] = "TOP_RIGHT_CORNER";
+    OverlayWidgetPositionPreference[OverlayWidgetPositionPreference["BOTTOM_RIGHT_CORNER"] = 1] = "BOTTOM_RIGHT_CORNER";
+    OverlayWidgetPositionPreference[OverlayWidgetPositionPreference["TOP_CENTER"] = 2] = "TOP_CENTER";
+})(OverlayWidgetPositionPreference || (OverlayWidgetPositionPreference = {})));
+var MouseTargetType;
+( (function(MouseTargetType) {
+    MouseTargetType[MouseTargetType["UNKNOWN"] = 0] = "UNKNOWN";
+    MouseTargetType[MouseTargetType["TEXTAREA"] = 1] = "TEXTAREA";
+    MouseTargetType[MouseTargetType["GUTTER_GLYPH_MARGIN"] = 2] = "GUTTER_GLYPH_MARGIN";
+    MouseTargetType[MouseTargetType["GUTTER_LINE_NUMBERS"] = 3] = "GUTTER_LINE_NUMBERS";
+    MouseTargetType[MouseTargetType["GUTTER_LINE_DECORATIONS"] = 4] = "GUTTER_LINE_DECORATIONS";
+    MouseTargetType[MouseTargetType["GUTTER_VIEW_ZONE"] = 5] = "GUTTER_VIEW_ZONE";
+    MouseTargetType[MouseTargetType["CONTENT_TEXT"] = 6] = "CONTENT_TEXT";
+    MouseTargetType[MouseTargetType["CONTENT_EMPTY"] = 7] = "CONTENT_EMPTY";
+    MouseTargetType[MouseTargetType["CONTENT_VIEW_ZONE"] = 8] = "CONTENT_VIEW_ZONE";
+    MouseTargetType[MouseTargetType["CONTENT_WIDGET"] = 9] = "CONTENT_WIDGET";
+    MouseTargetType[MouseTargetType["OVERVIEW_RULER"] = 10] = "OVERVIEW_RULER";
+    MouseTargetType[MouseTargetType["SCROLLBAR"] = 11] = "SCROLLBAR";
+    MouseTargetType[MouseTargetType["OVERLAY_WIDGET"] = 12] = "OVERLAY_WIDGET";
+    MouseTargetType[MouseTargetType["OUTSIDE_EDITOR"] = 13] = "OUTSIDE_EDITOR";
+})(MouseTargetType || (MouseTargetType = {})));
 function isCodeEditor(thing) {
     if (thing && typeof thing.getEditorType === 'function') {
         return thing.getEditorType() === EditorType.ICodeEditor;
@@ -38,4 +67,4 @@ function getIEditor(thing) {
     }
     return null;
 }
-export { getCodeEditor, getIEditor, isCodeEditor, isCompositeEditor, isDiffEditor };
+export { ContentWidgetPositionPreference, MouseTargetType, OverlayWidgetPositionPreference, getCodeEditor, getIEditor, isCodeEditor, isCompositeEditor, isDiffEditor };

package/vscode/src/vs/editor/browser/editorExtensions.js

@@ -9,13 +9,22 @@ import { CommandsRegistry } from '../../platform/commands/common/commands.js';
 import { ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
-import { KeybindingsRegistry } from '../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingWeight, KeybindingsRegistry } from '../../platform/keybinding/common/keybindingsRegistry.js';
 import { Registry } from '../../platform/registry/common/platform.js';
 import { ITelemetryService } from '../../platform/telemetry/common/telemetry.service.js';
 import { assertType } from '../../base/common/types.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../base/common/keyCodes.js';
 import { ILogService } from '../../platform/log/common/log.service.js';
 import { getActiveElement } from '../../base/browser/dom.js';
 const _moduleId = "vs/editor/browser/editorExtensions";
+var EditorContributionInstantiation;
+( ((function(EditorContributionInstantiation) {
+    EditorContributionInstantiation[EditorContributionInstantiation["Eager"] = 0] = "Eager";
+    EditorContributionInstantiation[EditorContributionInstantiation["AfterFirstRender"] = 1] = "AfterFirstRender";
+    EditorContributionInstantiation[EditorContributionInstantiation["BeforeFirstInteraction"] = 2] = "BeforeFirstInteraction";
+    EditorContributionInstantiation[EditorContributionInstantiation["Eventually"] = 3] = "Eventually";
+    EditorContributionInstantiation[EditorContributionInstantiation["Lazy"] = 4] = "Lazy";
+})(EditorContributionInstantiation || (EditorContributionInstantiation = {}))));
 class Command {
     constructor(opts) {
         this.id = opts.id;
@@ -374,8 +383,8 @@ const UndoCommand = registerCommand(( (new MultiCommand({
     id: 'undo',
     precondition: undefined,
     kbOpts: {
-        weight: 0 ,
-        primary: 2048  | 56
+        weight: KeybindingWeight.EditorCore,
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyZ
     },
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
@@ -394,10 +403,10 @@ const RedoCommand = registerCommand(( (new MultiCommand({
     id: 'redo',
     precondition: undefined,
     kbOpts: {
-        weight: 0 ,
-        primary: 2048  | 55 ,
-        secondary: [2048  | 1024  | 56 ],
-        mac: { primary: 2048  | 1024  | 56  }
+        weight: KeybindingWeight.EditorCore,
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyY,
+        secondary: [KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyZ],
+        mac: { primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.KeyZ }
     },
     menuOpts: [{
             menuId: MenuId.MenubarEditMenu,
@@ -416,9 +425,9 @@ const SelectAllCommand = registerCommand(( (new MultiCommand({
     id: 'editor.action.selectAll',
     precondition: undefined,
     kbOpts: {
-        weight: 0 ,
+        weight: KeybindingWeight.EditorCore,
         kbExpr: null,
-        primary: 2048  | 31
+        primary: KeyMod$1.CtrlCmd | KeyCode.KeyA
     },
     menuOpts: [{
             menuId: MenuId.MenubarSelectionMenu,
@@ -432,4 +441,4 @@ const SelectAllCommand = registerCommand(( (new MultiCommand({
             order: 1
         }]
 }))));
-export { Command, EditorAction, EditorAction2, EditorCommand, EditorExtensionsRegistry, MultiCommand, MultiEditorAction, ProxyCommand, RedoCommand, SelectAllCommand, UndoCommand, registerDiffEditorContribution, registerEditorAction, registerEditorCommand, registerEditorContribution, registerInstantiatedEditorAction, registerModelAndPositionCommand, registerMultiEditorAction };
+export { Command, EditorAction, EditorAction2, EditorCommand, EditorContributionInstantiation, EditorExtensionsRegistry, MultiCommand, MultiEditorAction, ProxyCommand, RedoCommand, SelectAllCommand, UndoCommand, registerDiffEditorContribution, registerEditorAction, registerEditorCommand, registerEditorContribution, registerInstantiatedEditorAction, registerModelAndPositionCommand, registerMultiEditorAction };

package/vscode/src/vs/editor/browser/services/abstractCodeEditorService.js

@@ -299,12 +299,12 @@ class DecorationSubTypeOptionsProvider {
         this._parentTypeKey = providerArgs.parentTypeKey;
         this.refCount = 0;
         this._beforeContentRules = ( new DecorationCSSRules(
-            3 ,
+            ModelDecorationCSSRuleType.BeforeContentClassName,
             providerArgs,
             themeService
         ));
         this._afterContentRules = ( new DecorationCSSRules(
-            4 ,
+            ModelDecorationCSSRuleType.AfterContentClassName,
             providerArgs,
             themeService
         ));
@@ -357,16 +357,16 @@ class DecorationTypeOptionsProvider {
             }
             return null;
         };
-        this.className = createCSSRules(0 );
-        const inlineData = createInlineCSSRules(1 );
+        this.className = createCSSRules(ModelDecorationCSSRuleType.ClassName);
+        const inlineData = createInlineCSSRules(ModelDecorationCSSRuleType.InlineClassName);
         if (inlineData) {
             this.inlineClassName = inlineData.className;
             this.inlineClassNameAffectsLetterSpacing = inlineData.hasLetterSpacing;
         }
-        this.beforeContentClassName = createCSSRules(3 );
-        this.afterContentClassName = createCSSRules(4 );
+        this.beforeContentClassName = createCSSRules(ModelDecorationCSSRuleType.BeforeContentClassName);
+        this.afterContentClassName = createCSSRules(ModelDecorationCSSRuleType.AfterContentClassName);
         if (providerArgs.options.beforeInjectedText && providerArgs.options.beforeInjectedText.contentText) {
-            const beforeInlineData = createInlineCSSRules(5 );
+            const beforeInlineData = createInlineCSSRules(ModelDecorationCSSRuleType.BeforeInjectedTextClassName);
             this.beforeInjectedText = {
                 content: providerArgs.options.beforeInjectedText.contentText,
                 inlineClassName: beforeInlineData?.className,
@@ -374,14 +374,14 @@ class DecorationTypeOptionsProvider {
             };
         }
         if (providerArgs.options.afterInjectedText && providerArgs.options.afterInjectedText.contentText) {
-            const afterInlineData = createInlineCSSRules(6 );
+            const afterInlineData = createInlineCSSRules(ModelDecorationCSSRuleType.AfterInjectedTextClassName);
             this.afterInjectedText = {
                 content: providerArgs.options.afterInjectedText.contentText,
                 inlineClassName: afterInlineData?.className,
                 inlineClassNameAffectsLetterSpacing: afterInlineData?.hasLetterSpacing || providerArgs.options.afterInjectedText.affectsLetterSpacing
             };
         }
-        this.glyphMarginClassName = createCSSRules(2 );
+        this.glyphMarginClassName = createCSSRules(ModelDecorationCSSRuleType.GlyphMarginClassName);
         const options = providerArgs.options;
         this.isWholeLine = Boolean(options.isWholeLine);
         this.stickiness = options.rangeBehavior;
@@ -502,37 +502,37 @@ class DecorationCSSRules {
         const options = this._providerArgs.options;
         let unthemedCSS, lightCSS, darkCSS;
         switch (this._ruleType) {
-            case 0 :
+            case ModelDecorationCSSRuleType.ClassName:
                 unthemedCSS = this.getCSSTextForModelDecorationClassName(options);
                 lightCSS = this.getCSSTextForModelDecorationClassName(options.light);
                 darkCSS = this.getCSSTextForModelDecorationClassName(options.dark);
                 break;
-            case 1 :
+            case ModelDecorationCSSRuleType.InlineClassName:
                 unthemedCSS = this.getCSSTextForModelDecorationInlineClassName(options);
                 lightCSS = this.getCSSTextForModelDecorationInlineClassName(options.light);
                 darkCSS = this.getCSSTextForModelDecorationInlineClassName(options.dark);
                 break;
-            case 2 :
+            case ModelDecorationCSSRuleType.GlyphMarginClassName:
                 unthemedCSS = this.getCSSTextForModelDecorationGlyphMarginClassName(options);
                 lightCSS = this.getCSSTextForModelDecorationGlyphMarginClassName(options.light);
                 darkCSS = this.getCSSTextForModelDecorationGlyphMarginClassName(options.dark);
                 break;
-            case 3 :
+            case ModelDecorationCSSRuleType.BeforeContentClassName:
                 unthemedCSS = this.getCSSTextForModelDecorationContentClassName(options.before);
                 lightCSS = this.getCSSTextForModelDecorationContentClassName(options.light && options.light.before);
                 darkCSS = this.getCSSTextForModelDecorationContentClassName(options.dark && options.dark.before);
                 break;
-            case 4 :
+            case ModelDecorationCSSRuleType.AfterContentClassName:
                 unthemedCSS = this.getCSSTextForModelDecorationContentClassName(options.after);
                 lightCSS = this.getCSSTextForModelDecorationContentClassName(options.light && options.light.after);
                 darkCSS = this.getCSSTextForModelDecorationContentClassName(options.dark && options.dark.after);
                 break;
-            case 5 :
+            case ModelDecorationCSSRuleType.BeforeInjectedTextClassName:
                 unthemedCSS = this.getCSSTextForModelDecorationContentClassName(options.beforeInjectedText);
                 lightCSS = this.getCSSTextForModelDecorationContentClassName(options.light && options.light.beforeInjectedText);
                 darkCSS = this.getCSSTextForModelDecorationContentClassName(options.dark && options.dark.beforeInjectedText);
                 break;
-            case 6 :
+            case ModelDecorationCSSRuleType.AfterInjectedTextClassName:
                 unthemedCSS = this.getCSSTextForModelDecorationContentClassName(options.afterInjectedText);
                 lightCSS = this.getCSSTextForModelDecorationContentClassName(options.light && options.light.afterInjectedText);
                 darkCSS = this.getCSSTextForModelDecorationContentClassName(options.dark && options.dark.afterInjectedText);
@@ -644,6 +644,16 @@ class DecorationCSSRules {
         return value;
     }
 }
+var ModelDecorationCSSRuleType;
+( (function(ModelDecorationCSSRuleType) {
+    ModelDecorationCSSRuleType[ModelDecorationCSSRuleType["ClassName"] = 0] = "ClassName";
+    ModelDecorationCSSRuleType[ModelDecorationCSSRuleType["InlineClassName"] = 1] = "InlineClassName";
+    ModelDecorationCSSRuleType[ModelDecorationCSSRuleType["GlyphMarginClassName"] = 2] = "GlyphMarginClassName";
+    ModelDecorationCSSRuleType[ModelDecorationCSSRuleType["BeforeContentClassName"] = 3] = "BeforeContentClassName";
+    ModelDecorationCSSRuleType[ModelDecorationCSSRuleType["AfterContentClassName"] = 4] = "AfterContentClassName";
+    ModelDecorationCSSRuleType[ModelDecorationCSSRuleType["BeforeInjectedTextClassName"] = 5] = "BeforeInjectedTextClassName";
+    ModelDecorationCSSRuleType[ModelDecorationCSSRuleType["AfterInjectedTextClassName"] = 6] = "AfterInjectedTextClassName";
+})(ModelDecorationCSSRuleType || (ModelDecorationCSSRuleType = {})));
 class CSSNameHelper {
     static getClassName(key, type) {
         return 'ced-' + key + '-' + type;
@@ -653,10 +663,10 @@ class CSSNameHelper {
         if (parentKey) {
             selector = selector + '.' + this.getClassName(parentKey, ruleType);
         }
-        if (ruleType === 3 ) {
+        if (ruleType === ModelDecorationCSSRuleType.BeforeContentClassName) {
             selector += '::before';
         }
-        else if (ruleType === 4 ) {
+        else if (ruleType === ModelDecorationCSSRuleType.AfterContentClassName) {
             selector += '::after';
         }
         return selector;

package/vscode/src/vs/editor/browser/services/editorWorkerService.js

@@ -4,6 +4,7 @@ import { Disposable, dispose, toDisposable, DisposableStore } from '../../../bas
 import { SimpleWorkerClient, logOnceWebWorkerWarning } from '../../../base/common/worker/simpleWorker.js';
 import { DefaultWorkerFactory } from '../../../base/browser/defaultWorkerFactory.js';
 import { Range } from '../../common/core/range.js';
+import { CompletionItemKind } from '../../common/languages.js';
 import { ILanguageConfigurationService } from '../../common/languages/languageConfigurationRegistry.js';
 import { EditorSimpleWorker } from '../../common/services/editorSimpleWorker.js';
 import { IModelService } from '../../common/services/model.js';
@@ -186,7 +187,7 @@ class WordBasedCompletionItemProvider {
             duration: data.duration,
             suggestions: ( data.words.map((word) => {
                 return {
-                    kind: 18 ,
+                    kind: CompletionItemKind.Text,
                     label: word,
                     insertText: word,
                     range: { insert, replace }

package/vscode/src/vs/editor/browser/services/hoverService/hoverService.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerSingleton, InstantiationType } from '../../../../platform/instantiation/common/extensions.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -17,9 +17,10 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { HoverWidget } from './hoverWidget.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { getActiveElement, isAncestorOfActiveElement, getWindow, addDisposableListener, isAncestor, EventType } from '../../../../base/browser/dom.js';
+import { getActiveElement, isAncestorOfActiveElement, isHTMLElement, getWindow, addDisposableListener, isAncestor, EventType } from '../../../../base/browser/dom.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { ResultKind } from '../../../../platform/keybinding/common/keybindingResolver.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { ILayoutService } from '../../../../platform/layout/browser/layoutService.service.js';
 import { mainWindow } from '../../../../base/browser/window.js';
@@ -33,6 +34,7 @@ let HoverService = class HoverService extends Disposable {
         this._keybindingService = _keybindingService;
         this._layoutService = _layoutService;
         this._accessibilityService = _accessibilityService;
+        this._existingHovers = ( new Map());
         contextMenuService.onDidShowContextMenu(() => this.hideHover());
         this._contextViewHandler = this._register(( new ContextViewHandler(this._layoutService)));
     }
@@ -49,7 +51,9 @@ let HoverService = class HoverService extends Disposable {
         const activeElement = getActiveElement();
         if (!skipLastFocusedUpdate) {
             if (trapFocus && activeElement) {
-                this._lastFocusedElementBeforeOpen = activeElement;
+                if (!activeElement.classList.contains('monaco-hover')) {
+                    this._lastFocusedElementBeforeOpen = activeElement;
+                }
             }
             else {
                 this._lastFocusedElementBeforeOpen = undefined;
@@ -71,7 +75,7 @@ let HoverService = class HoverService extends Disposable {
             hoverDisposables.dispose();
         }, undefined, hoverDisposables);
         if (!options.container) {
-            const targetElement = options.target instanceof HTMLElement ? options.target : options.target.targetElements[0];
+            const targetElement = isHTMLElement(options.target) ? options.target : options.target.targetElements[0];
             options.container = this._layoutService.getContainer(getWindow(targetElement));
         }
         this._contextViewHandler.showContextView(( new HoverContextViewDelegate(hover, focus)), options.container);
@@ -140,7 +144,7 @@ let HoverService = class HoverService extends Disposable {
         }
         const event = ( new StandardKeyboardEvent(e));
         const keybinding = this._keybindingService.resolveKeyboardEvent(event);
-        if (( keybinding.getSingleModifierDispatchChords().some(value => !!value)) || this._keybindingService.softDispatch(event, event.target).kind !== 0 ) {
+        if (( keybinding.getSingleModifierDispatchChords().some(value => !!value)) || this._keybindingService.softDispatch(event, event.target).kind !== ResultKind.NoMatchingKb) {
             return;
         }
         if (hideOnKeyDown && (!this._currentHoverOptions?.trapFocus || e.key !== 'Tab')) {
@@ -181,11 +185,11 @@ let HoverService = class HoverService extends Disposable {
                 hoverWidget = undefined;
             }
         };
-        const triggerShowHover = (delay, focus, target) => {
+        const triggerShowHover = (delay, focus, target, trapFocus) => {
             return ( new TimeoutTimer(async () => {
                 if (!hoverWidget || hoverWidget.isDisposed) {
                     hoverWidget = ( new UpdatableHoverWidget(hoverDelegate, target || htmlElement, delay > 0));
-                    await hoverWidget.update(typeof content === 'function' ? content() : content, focus, options);
+                    await hoverWidget.update(typeof content === 'function' ? content() : content, focus, { ...options, trapFocus });
                 }
             }, delay));
         };
@@ -213,14 +217,14 @@ let HoverService = class HoverService extends Disposable {
             if (hoverDelegate.placement === undefined || hoverDelegate.placement === 'mouse') {
                 const onMouseMove = (e) => {
                     target.x = e.x + 10;
-                    if ((e.target instanceof HTMLElement) && getHoverTargetElement(e.target, htmlElement) !== htmlElement) {
+                    if ((isHTMLElement(e.target)) && getHoverTargetElement(e.target, htmlElement) !== htmlElement) {
                         hideHover(true, true);
                     }
                 };
                 toDispose.add(addDisposableListener(htmlElement, EventType.MOUSE_MOVE, onMouseMove, true));
             }
             hoverPreparation = toDispose;
-            if ((e.target instanceof HTMLElement) && getHoverTargetElement(e.target, htmlElement) !== htmlElement) {
+            if ((isHTMLElement(e.target)) && getHoverTargetElement(e.target, htmlElement) !== htmlElement) {
                 return;
             }
             toDispose.add(triggerShowHover(hoverDelegate.delay, false, target));
@@ -257,6 +261,7 @@ let HoverService = class HoverService extends Disposable {
                 await hoverWidget?.update(content, undefined, hoverOptions);
             },
             dispose: () => {
+                this._existingHovers.delete(htmlElement);
                 mouseOverDomEmitter.dispose();
                 mouseLeaveEmitter.dispose();
                 mouseDownEmitter.dispose();
@@ -265,8 +270,19 @@ let HoverService = class HoverService extends Disposable {
                 hideHover(true, true);
             }
         };
+        this._existingHovers.set(htmlElement, hover);
         return hover;
     }
+    triggerUpdatableHover(target) {
+        const hover = this._existingHovers.get(target);
+        if (hover) {
+            hover.show(true);
+        }
+    }
+    dispose() {
+        this._existingHovers.forEach(hover => hover.dispose());
+        super.dispose();
+    }
 };
 HoverService = ( __decorate([
     ( __param(0, IInstantiationService)),
@@ -314,7 +330,7 @@ function getHoverTargetElement(element, stopElement) {
     }
     return element;
 }
-registerSingleton(IHoverService, HoverService, 1 );
+registerSingleton(IHoverService, HoverService, InstantiationType.Delayed);
 registerThemingParticipant((theme, collector) => {
     const hoverBorder = theme.getColor(editorHoverBorder);
     if (hoverBorder) {