@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/base/browser/dom.js

@@ -6,6 +6,7 @@ import { _runWhenIdle, AbstractIdleValue, IntervalTimer, TimeoutTimer } from '..
 import { onUnexpectedError } from '../common/errors.js';
 import { Emitter, Event } from '../common/event.js';
 import { sanitize, addHook, removeHook } from './dompurify/dompurify.js';
+import { KeyCode } from '../common/keyCodes.js';
 import { Disposable, DisposableStore, toDisposable } from '../common/lifecycle.js';
 import { RemoteAuthorities, FileAccess, Schemas } from '../common/network.js';
 import { isIOS, isMacintosh, isLinux } from '../common/platform.js';
@@ -115,7 +116,7 @@ function _wrapAsStandardKeyboardEvent(handler) {
 }
 const addStandardDisposableListener = function addStandardDisposableListener(node, type, handler, useCapture) {
     let wrapHandler = handler;
-    if (type === 'click' || type === 'mousedown') {
+    if (type === 'click' || type === 'mousedown' || type === 'contextmenu') {
         wrapHandler = _wrapAsStandardMouseEvent(getWindow(node), handler);
     }
     else if (type === 'keydown' || type === 'keypress' || type === 'keyup') {
@@ -520,7 +521,7 @@ function isAncestorUsingFlowTo(testChild, testAncestor) {
         if (node === testAncestor) {
             return true;
         }
-        if (node instanceof HTMLElement) {
+        if (isHTMLElement(node)) {
             const flowToParentElement = getParentFlowToElement(node);
             if (flowToParentElement) {
                 node = flowToParentElement;
@@ -770,6 +771,21 @@ function removeCSSRulesContainingSelector(ruleName, style = getSharedStyleSheet(
 function isCSSStyleRule(rule) {
     return typeof rule.selectorText === 'string';
 }
+function isHTMLElement(e) {
+    return e instanceof HTMLElement || e instanceof getWindow(e).HTMLElement;
+}
+function isHTMLAnchorElement(e) {
+    return e instanceof HTMLAnchorElement || e instanceof getWindow(e).HTMLAnchorElement;
+}
+function isHTMLTextAreaElement(e) {
+    return e instanceof HTMLTextAreaElement || e instanceof getWindow(e).HTMLTextAreaElement;
+}
+function isHTMLInputElement(e) {
+    return e instanceof HTMLInputElement || e instanceof getWindow(e).HTMLInputElement;
+}
+function isHTMLButtonElement(e) {
+    return e instanceof HTMLButtonElement || e instanceof getWindow(e).HTMLButtonElement;
+}
 function isMouseEvent(e) {
     return e instanceof MouseEvent || e instanceof getWindow(e).MouseEvent;
 }
@@ -867,7 +883,7 @@ function restoreParentsScrollTop(node, state) {
 }
 class FocusTracker extends Disposable {
     static hasFocusWithin(element) {
-        if (element instanceof HTMLElement) {
+        if (isHTMLElement(element)) {
             const shadowRoot = getShadowRoot(element);
             const activeElement = (shadowRoot ? shadowRoot.activeElement : element.ownerDocument.activeElement);
             return isAncestor(activeElement, element);
@@ -895,7 +911,7 @@ class FocusTracker extends Disposable {
         const onBlur = () => {
             if (hasFocus) {
                 loosingFocus = true;
-                (element instanceof HTMLElement ? getWindow(element) : element).setTimeout(() => {
+                (isHTMLElement(element) ? getWindow(element) : element).setTimeout(() => {
                     if (loosingFocus) {
                         loosingFocus = false;
                         hasFocus = false;
@@ -917,7 +933,7 @@ class FocusTracker extends Disposable {
         };
         this._register(addDisposableListener(element, EventType.FOCUS, onFocus, true));
         this._register(addDisposableListener(element, EventType.BLUR, onBlur, true));
-        if (element instanceof HTMLElement) {
+        if (isHTMLElement(element)) {
             this._register(addDisposableListener(element, EventType.FOCUS_IN, () => this._refreshStateHandler()));
             this._register(addDisposableListener(element, EventType.FOCUS_OUT, () => this._refreshStateHandler()));
         }
@@ -1280,7 +1296,7 @@ class ModifierKeyEmitter extends Emitter {
                 return;
             }
             const event = ( new StandardKeyboardEvent(e));
-            if (event.keyCode === 6  && e.repeat) {
+            if (event.keyCode === KeyCode.Alt && e.repeat) {
                 return;
             }
             if (e.altKey && !this._keyStatus.altKey) {
@@ -1295,7 +1311,7 @@ class ModifierKeyEmitter extends Emitter {
             else if (e.shiftKey && !this._keyStatus.shiftKey) {
                 this._keyStatus.lastKeyPressed = 'shift';
             }
-            else if (event.keyCode !== 6 ) {
+            else if (event.keyCode !== KeyCode.Alt) {
                 this._keyStatus.lastKeyPressed = undefined;
             }
             else {
@@ -1478,7 +1494,7 @@ function h(tag, ...args) {
     }
     if (children) {
         for (const c of children) {
-            if (c instanceof HTMLElement) {
+            if (isHTMLElement(c)) {
                 el.appendChild(c);
             }
             else if (typeof c === 'string') {
@@ -1540,4 +1556,4 @@ function trackAttributes(from, to, filter) {
     }));
     return disposables;
 }
-export { $, DetectedFullscreenMode, Dimension, DragAndDropObserver, EventHelper, EventType, ModifierKeyEmitter, Namespace, WindowIdleValue, WindowIntervalTimer, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener, addDisposableGenericMouseUpListener, addDisposableListener, addDisposableThrottledListener, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, addStandardDisposableListener, after, animate, append, asCSSPropertyValue, asCSSUrl, asCssValueWithDefault, basicMarkupHtmlTags, clearNode, cloneGlobalStylesheets, computeScreenAwareSize, copyAttributes, createCSSRule, createLinkElement, createMetaElement, createStyleSheet, createStyleSheet2, detectFullscreen, disposableWindowInterval, finalHandler, findParentWithClass, getActiveDocument, getActiveElement, getActiveWindow, getClientArea, getComputedStyle, getContentHeight, getContentWidth, getDocument, getDomNodePagePosition, getDomNodeZoomLevel, getLargestChildWidth, getShadowRoot, getTopLeftOffset, getTotalHeight, getTotalScrollWidth, getTotalWidth, getWindow, getWindowById, getWindowId, getWindows, getWindowsCount, h, hasParentWithClass, hasWindow, hide, hookDomPurifyHrefAndSrcSanitizer, isActiveDocument, isActiveElement, isAncestor, isAncestorOfActiveElement, isAncestorUsingFlowTo, isDragEvent, isEventLike, isGlobalStylesheet, isInShadowDOM, isKeyboardEvent, isMouseEvent, isPointerEvent, isShadowRoot, measure, modify, multibyteAwareBtoa, onDidRegisterWindow, onDidUnregisterWindow, onWillUnregisterWindow, position, prepend, registerWindow, removeCSSRulesContainingSelector, reset, restoreParentsScrollTop, runAtThisOrScheduleAtNextAnimationFrame, runWhenWindowIdle, safeInnerHtml, saveParentsScrollTop, scheduleAtNextAnimationFrame, setParentFlowTo, setVisibility, sharedMutationObserver, show, size, trackAttributes, trackFocus, triggerDownload, triggerUpload, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess };
+export { $, DetectedFullscreenMode, Dimension, DragAndDropObserver, EventHelper, EventType, ModifierKeyEmitter, Namespace, WindowIdleValue, WindowIntervalTimer, addDisposableGenericMouseDownListener, addDisposableGenericMouseMoveListener, addDisposableGenericMouseUpListener, addDisposableListener, addDisposableThrottledListener, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, addStandardDisposableListener, after, animate, append, asCSSPropertyValue, asCSSUrl, asCssValueWithDefault, basicMarkupHtmlTags, clearNode, cloneGlobalStylesheets, computeScreenAwareSize, copyAttributes, createCSSRule, createLinkElement, createMetaElement, createStyleSheet, createStyleSheet2, detectFullscreen, disposableWindowInterval, finalHandler, findParentWithClass, getActiveDocument, getActiveElement, getActiveWindow, getClientArea, getComputedStyle, getContentHeight, getContentWidth, getDocument, getDomNodePagePosition, getDomNodeZoomLevel, getLargestChildWidth, getShadowRoot, getTopLeftOffset, getTotalHeight, getTotalScrollWidth, getTotalWidth, getWindow, getWindowById, getWindowId, getWindows, getWindowsCount, h, hasParentWithClass, hasWindow, hide, hookDomPurifyHrefAndSrcSanitizer, isActiveDocument, isActiveElement, isAncestor, isAncestorOfActiveElement, isAncestorUsingFlowTo, isDragEvent, isEventLike, isGlobalStylesheet, isHTMLAnchorElement, isHTMLButtonElement, isHTMLElement, isHTMLInputElement, isHTMLTextAreaElement, isInShadowDOM, isKeyboardEvent, isMouseEvent, isPointerEvent, isShadowRoot, measure, modify, multibyteAwareBtoa, onDidRegisterWindow, onDidUnregisterWindow, onWillUnregisterWindow, position, prepend, registerWindow, removeCSSRulesContainingSelector, reset, restoreParentsScrollTop, runAtThisOrScheduleAtNextAnimationFrame, runWhenWindowIdle, safeInnerHtml, saveParentsScrollTop, scheduleAtNextAnimationFrame, setParentFlowTo, setVisibility, sharedMutationObserver, show, size, trackAttributes, trackFocus, triggerDownload, triggerUpload, windowOpenNoOpener, windowOpenPopup, windowOpenWithSuccess };

package/vscode/src/vs/base/browser/formattedTextRenderer.js

@@ -37,31 +37,43 @@ class StringStream {
         this.index++;
     }
 }
+var FormatType;
+( (function(FormatType) {
+    FormatType[FormatType["Invalid"] = 0] = "Invalid";
+    FormatType[FormatType["Root"] = 1] = "Root";
+    FormatType[FormatType["Text"] = 2] = "Text";
+    FormatType[FormatType["Bold"] = 3] = "Bold";
+    FormatType[FormatType["Italics"] = 4] = "Italics";
+    FormatType[FormatType["Action"] = 5] = "Action";
+    FormatType[FormatType["ActionClose"] = 6] = "ActionClose";
+    FormatType[FormatType["Code"] = 7] = "Code";
+    FormatType[FormatType["NewLine"] = 8] = "NewLine";
+})(FormatType || (FormatType = {})));
 function _renderFormattedText(element, treeNode, actionHandler, renderCodeSegments) {
     let child;
-    if (treeNode.type === 2 ) {
+    if (treeNode.type === FormatType.Text) {
         child = document.createTextNode(treeNode.content || '');
     }
-    else if (treeNode.type === 3 ) {
+    else if (treeNode.type === FormatType.Bold) {
         child = document.createElement('b');
     }
-    else if (treeNode.type === 4 ) {
+    else if (treeNode.type === FormatType.Italics) {
         child = document.createElement('i');
     }
-    else if (treeNode.type === 7  && renderCodeSegments) {
+    else if (treeNode.type === FormatType.Code && renderCodeSegments) {
         child = document.createElement('code');
     }
-    else if (treeNode.type === 5  && actionHandler) {
+    else if (treeNode.type === FormatType.Action && actionHandler) {
         const a = document.createElement('a');
         actionHandler.disposables.add(addStandardDisposableListener(a, 'click', (event) => {
             actionHandler.callback(String(treeNode.index), event);
         }));
         child = a;
     }
-    else if (treeNode.type === 8 ) {
+    else if (treeNode.type === FormatType.NewLine) {
         child = document.createElement('br');
     }
-    else if (treeNode.type === 1 ) {
+    else if (treeNode.type === FormatType.Root) {
         child = element;
     }
     if (child && element !== child) {
@@ -75,7 +87,7 @@ function _renderFormattedText(element, treeNode, actionHandler, renderCodeSegmen
 }
 function parseFormattedText(content, parseCodeSegments) {
     const root = {
-        type: 1 ,
+        type: FormatType.Root,
         children: []
     };
     let actionViewItemIndex = 0;
@@ -84,17 +96,17 @@ function parseFormattedText(content, parseCodeSegments) {
     const stream = ( new StringStream(content));
     while (!stream.eos()) {
         let next = stream.next();
-        const isEscapedFormatType = ((next === '\\' && formatTagType(stream.peek(), parseCodeSegments) !== 0) );
+        const isEscapedFormatType = (next === '\\' && formatTagType(stream.peek(), parseCodeSegments) !== FormatType.Invalid);
         if (isEscapedFormatType) {
             next = stream.next();
         }
         if (!isEscapedFormatType && isFormatTag(next, parseCodeSegments) && next === stream.peek()) {
             stream.advance();
-            if (current.type === 2 ) {
+            if (current.type === FormatType.Text) {
                 current = stack.pop();
             }
             const type = formatTagType(next, parseCodeSegments);
-            if (current.type === type || ((current.type === 5  && type === 6) )) {
+            if (current.type === type || (current.type === FormatType.Action && type === FormatType.ActionClose)) {
                 current = stack.pop();
             }
             else {
@@ -102,7 +114,7 @@ function parseFormattedText(content, parseCodeSegments) {
                     type: type,
                     children: []
                 };
-                if (type === 5 ) {
+                if (type === FormatType.Action) {
                     newCurrent.index = actionViewItemIndex;
                     actionViewItemIndex++;
                 }
@@ -112,17 +124,17 @@ function parseFormattedText(content, parseCodeSegments) {
             }
         }
         else if (next === '\n') {
-            if (current.type === 2 ) {
+            if (current.type === FormatType.Text) {
                 current = stack.pop();
             }
             current.children.push({
-                type: 8
+                type: FormatType.NewLine
             });
         }
         else {
-            if (current.type !== 2 ) {
+            if (current.type !== FormatType.Text) {
                 const textCurrent = {
-                    type: 2 ,
+                    type: FormatType.Text,
                     content: next
                 };
                 current.children.push(textCurrent);
@@ -134,28 +146,28 @@ function parseFormattedText(content, parseCodeSegments) {
             }
         }
     }
-    if (current.type === 2 ) {
+    if (current.type === FormatType.Text) {
         current = stack.pop();
     }
     return root;
 }
 function isFormatTag(char, supportCodeSegments) {
-    return formatTagType(char, supportCodeSegments) !== 0 ;
+    return formatTagType(char, supportCodeSegments) !== FormatType.Invalid;
 }
 function formatTagType(char, supportCodeSegments) {
     switch (char) {
         case '*':
-            return 3 ;
+            return FormatType.Bold;
         case '_':
-            return 4 ;
+            return FormatType.Italics;
         case '[':
-            return 5 ;
+            return FormatType.Action;
         case ']':
-            return 6 ;
+            return FormatType.ActionClose;
         case '`':
-            return supportCodeSegments ? 7  : 0 ;
+            return supportCodeSegments ? FormatType.Code : FormatType.Invalid;
         default:
-            return 0 ;
+            return FormatType.Invalid;
     }
 }
 export { createElement, renderFormattedText, renderText };

package/vscode/src/vs/base/browser/keyboardEvent.js

@@ -1,5 +1,5 @@
 import { isFirefox, isWebKit } from './browser.js';
-import { KeyCodeUtils, EVENT_KEY_CODE_MAP } from '../common/keyCodes.js';
+import { KeyCode, KeyCodeUtils, EVENT_KEY_CODE_MAP, KeyMod as KeyMod$1 } from '../common/keyCodes.js';
 import { KeyCodeChord } from '../common/keybindings.js';
 import { isMacintosh, isLinux } from '../common/platform.js';
 function extractKeyCode(e) {
@@ -9,41 +9,41 @@ function extractKeyCode(e) {
     }
     const keyCode = e.keyCode;
     if (keyCode === 3) {
-        return 7 ;
+        return KeyCode.PauseBreak;
     }
     else if (isFirefox) {
         switch (keyCode) {
-            case 59: return 85 ;
+            case 59: return KeyCode.Semicolon;
             case 60:
                 if (isLinux) {
-                    return 97 ;
+                    return KeyCode.IntlBackslash;
                 }
                 break;
-            case 61: return 86 ;
-            case 107: return 109 ;
-            case 109: return 111 ;
-            case 173: return 88 ;
+            case 61: return KeyCode.Equal;
+            case 107: return KeyCode.NumpadAdd;
+            case 109: return KeyCode.NumpadSubtract;
+            case 173: return KeyCode.Minus;
             case 224:
                 if (isMacintosh) {
-                    return 57 ;
+                    return KeyCode.Meta;
                 }
                 break;
         }
     }
     else if (isWebKit) {
         if (isMacintosh && keyCode === 93) {
-            return 57 ;
+            return KeyCode.Meta;
         }
         else if (!isMacintosh && keyCode === 92) {
-            return 57 ;
+            return KeyCode.Meta;
         }
     }
-    return EVENT_KEY_CODE_MAP[keyCode] || 0 ;
+    return EVENT_KEY_CODE_MAP[keyCode] || KeyCode.Unknown;
 }
-const ctrlKeyMod = ((isMacintosh ? 256  : 2048) );
-const altKeyMod = 512 ;
-const shiftKeyMod = 1024 ;
-const metaKeyMod = ((isMacintosh ? 2048  : 256) );
+const ctrlKeyMod = (isMacintosh ? KeyMod$1.WinCtrl : KeyMod$1.CtrlCmd);
+const altKeyMod = KeyMod$1.Alt;
+const shiftKeyMod = KeyMod$1.Shift;
+const metaKeyMod = (isMacintosh ? KeyMod$1.CtrlCmd : KeyMod$1.WinCtrl);
 function printKeyboardEvent(e) {
     const modifiers = [];
     if (e.ctrlKey) {
@@ -89,10 +89,10 @@ class StandardKeyboardEvent {
         this.altGraphKey = e.getModifierState?.('AltGraph');
         this.keyCode = extractKeyCode(e);
         this.code = e.code;
-        this.ctrlKey = this.ctrlKey || this.keyCode === 5 ;
-        this.altKey = this.altKey || this.keyCode === 6 ;
-        this.shiftKey = this.shiftKey || this.keyCode === 4 ;
-        this.metaKey = this.metaKey || this.keyCode === 57 ;
+        this.ctrlKey = this.ctrlKey || this.keyCode === KeyCode.Ctrl;
+        this.altKey = this.altKey || this.keyCode === KeyCode.Alt;
+        this.shiftKey = this.shiftKey || this.keyCode === KeyCode.Shift;
+        this.metaKey = this.metaKey || this.keyCode === KeyCode.Meta;
         this._asKeybinding = this._computeKeybinding();
         this._asKeyCodeChord = this._computeKeyCodeChord();
     }
@@ -113,8 +113,8 @@ class StandardKeyboardEvent {
         return this._asKeybinding === other;
     }
     _computeKeybinding() {
-        let key = 0 ;
-        if (this.keyCode !== 5  && this.keyCode !== 4  && this.keyCode !== 6  && this.keyCode !== 57 ) {
+        let key = KeyCode.Unknown;
+        if (this.keyCode !== KeyCode.Ctrl && this.keyCode !== KeyCode.Shift && this.keyCode !== KeyCode.Alt && this.keyCode !== KeyCode.Meta) {
             key = this.keyCode;
         }
         let result = 0;
@@ -134,8 +134,8 @@ class StandardKeyboardEvent {
         return result;
     }
     _computeKeyCodeChord() {
-        let key = 0 ;
-        if (this.keyCode !== 5  && this.keyCode !== 4  && this.keyCode !== 6  && this.keyCode !== 57 ) {
+        let key = KeyCode.Unknown;
+        if (this.keyCode !== KeyCode.Ctrl && this.keyCode !== KeyCode.Shift && this.keyCode !== KeyCode.Alt && this.keyCode !== KeyCode.Meta) {
             key = this.keyCode;
         }
         return ( new KeyCodeChord(this.ctrlKey, this.shiftKey, this.altKey, this.metaKey, key));