@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/base/common/keybindingLabels.js

@@ -1,11 +1,12 @@
+import { OperatingSystem } from './platform.js';
 import { localizeWithPath } from '../../nls.js';
 const _moduleId = "vs/base/common/keybindingLabels";
 class ModifierLabelProvider {
     constructor(mac, windows, linux = windows) {
         this.modifierLabels = [null];
-        this.modifierLabels[2 ] = mac;
-        this.modifierLabels[1 ] = windows;
-        this.modifierLabels[3 ] = linux;
+        this.modifierLabels[OperatingSystem.Macintosh] = mac;
+        this.modifierLabels[OperatingSystem.Windows] = windows;
+        this.modifierLabels[OperatingSystem.Linux] = linux;
     }
     toLabel(OS, chords, keyLabelProvider) {
         if (chords.length === 0) {

package/vscode/src/vs/base/common/keybindings.js

@@ -1,4 +1,14 @@
 import { illegalArgument } from './errors.js';
+import { KeyCode, ScanCode } from './keyCodes.js';
+import { OperatingSystem } from './platform.js';
+var BinaryKeybindingsMask;
+( (function(BinaryKeybindingsMask) {
+    BinaryKeybindingsMask[BinaryKeybindingsMask["CtrlCmd"] = 2048] = "CtrlCmd";
+    BinaryKeybindingsMask[BinaryKeybindingsMask["Shift"] = 1024] = "Shift";
+    BinaryKeybindingsMask[BinaryKeybindingsMask["Alt"] = 512] = "Alt";
+    BinaryKeybindingsMask[BinaryKeybindingsMask["WinCtrl"] = 256] = "WinCtrl";
+    BinaryKeybindingsMask[BinaryKeybindingsMask["KeyCode"] = 255] = "KeyCode";
+})(BinaryKeybindingsMask || (BinaryKeybindingsMask = {})));
 function decodeKeybinding(keybinding, OS) {
     if (typeof keybinding === 'number') {
         if (keybinding === 0) {
@@ -23,13 +33,13 @@ function decodeKeybinding(keybinding, OS) {
     }
 }
 function createSimpleKeybinding(keybinding, OS) {
-    const ctrlCmd = (keybinding & 2048  ? true : false);
-    const winCtrl = (keybinding & 256  ? true : false);
-    const ctrlKey = (OS === 2  ? winCtrl : ctrlCmd);
-    const shiftKey = (keybinding & 1024  ? true : false);
-    const altKey = (keybinding & 512  ? true : false);
-    const metaKey = (OS === 2  ? ctrlCmd : winCtrl);
-    const keyCode = ((keybinding & 255) );
+    const ctrlCmd = (keybinding & BinaryKeybindingsMask.CtrlCmd ? true : false);
+    const winCtrl = (keybinding & BinaryKeybindingsMask.WinCtrl ? true : false);
+    const ctrlKey = (OS === OperatingSystem.Macintosh ? winCtrl : ctrlCmd);
+    const shiftKey = (keybinding & BinaryKeybindingsMask.Shift ? true : false);
+    const altKey = (keybinding & BinaryKeybindingsMask.Alt ? true : false);
+    const metaKey = (OS === OperatingSystem.Macintosh ? ctrlCmd : winCtrl);
+    const keyCode = (keybinding & BinaryKeybindingsMask.KeyCode);
     return ( new KeyCodeChord(ctrlKey, shiftKey, altKey, metaKey, keyCode));
 }
 class KeyCodeChord {
@@ -56,18 +66,20 @@ class KeyCodeChord {
         return `K${ctrl}${shift}${alt}${meta}${this.keyCode}`;
     }
     isModifierKey() {
-        return (this.keyCode === 0
-            || this.keyCode === 5
-            || this.keyCode === 57
-            || this.keyCode === 6  || this.keyCode === 4) ;
+        return (this.keyCode === KeyCode.Unknown
+            || this.keyCode === KeyCode.Ctrl
+            || this.keyCode === KeyCode.Meta
+            || this.keyCode === KeyCode.Alt
+            || this.keyCode === KeyCode.Shift);
     }
     toKeybinding() {
         return ( new Keybinding([this]));
     }
     isDuplicateModifierCase() {
-        return (((this.ctrlKey && this.keyCode === 5) )
-            || ((this.shiftKey && this.keyCode === 4) )
-            || ((this.altKey && this.keyCode === 6) ) || (this.metaKey && this.keyCode === 57) );
+        return ((this.ctrlKey && this.keyCode === KeyCode.Ctrl)
+            || (this.shiftKey && this.keyCode === KeyCode.Shift)
+            || (this.altKey && this.keyCode === KeyCode.Alt)
+            || (this.metaKey && this.keyCode === KeyCode.Meta));
     }
 }
 class ScanCodeChord {
@@ -94,9 +106,10 @@ class ScanCodeChord {
         return `S${ctrl}${shift}${alt}${meta}${this.scanCode}`;
     }
     isDuplicateModifierCase() {
-        return ((this.ctrlKey && ((this.scanCode === 157  || this.scanCode === 161) ))
-            || (this.shiftKey && ((this.scanCode === 158  || this.scanCode === 162) ))
-            || (this.altKey && ((this.scanCode === 159  || this.scanCode === 163) )) || (this.metaKey && (this.scanCode === 160  || this.scanCode === 164) ));
+        return ((this.ctrlKey && (this.scanCode === ScanCode.ControlLeft || this.scanCode === ScanCode.ControlRight))
+            || (this.shiftKey && (this.scanCode === ScanCode.ShiftLeft || this.scanCode === ScanCode.ShiftRight))
+            || (this.altKey && (this.scanCode === ScanCode.AltLeft || this.scanCode === ScanCode.AltRight))
+            || (this.metaKey && (this.scanCode === ScanCode.MetaLeft || this.scanCode === ScanCode.MetaRight)));
     }
 }
 class Keybinding {

package/vscode/src/vs/base/common/labels.js

@@ -1,7 +1,7 @@
 import { firstOrDefault } from './arrays.js';
 import { hasDriveLetter, toSlashes } from './extpath.js';
 import { posix, sep, win32 } from './path.js';
-import { isWindows, OS, isMacintosh } from './platform.js';
+import { isWindows, OperatingSystem, OS, isMacintosh } from './platform.js';
 import { extUri, extUriIgnorePathCase } from './resources.js';
 import { rtrim, startsWithIgnoreCase } from './strings.js';
 function getPathLabel(resource, formatting) {
@@ -13,13 +13,13 @@ function getPathLabel(resource, formatting) {
         }
     }
     let absolutePath = resource.fsPath;
-    if (os === 1  && !isWindows) {
+    if (os === OperatingSystem.Windows && !isWindows) {
         absolutePath = absolutePath.replace(/\//g, '\\');
     }
-    else if (os !== 1  && isWindows) {
+    else if (os !== OperatingSystem.Windows && isWindows) {
         absolutePath = absolutePath.replace(/\\/g, '/');
     }
-    if (os !== 1  && tildifier?.userHome) {
+    if (os !== OperatingSystem.Windows && tildifier?.userHome) {
         const userHome = tildifier.userHome.fsPath;
         let userHomeCandidate;
         if (resource.scheme !== tildifier.userHome.scheme && resource.path[0] === posix.sep && resource.path[1] !== posix.sep) {
@@ -30,12 +30,12 @@ function getPathLabel(resource, formatting) {
         }
         absolutePath = tildify(userHomeCandidate, userHome, os);
     }
-    const pathLib = os === 1  ? win32 : posix;
-    return pathLib.normalize(normalizeDriveLetter(absolutePath, os === 1 ));
+    const pathLib = os === OperatingSystem.Windows ? win32 : posix;
+    return pathLib.normalize(normalizeDriveLetter(absolutePath, os === OperatingSystem.Windows));
 }
 function getRelativePathLabel(resource, relativePathProvider, os) {
-    const pathLib = os === 1  ? win32 : posix;
-    const extUriLib = os === 3  ? extUri : extUriIgnorePathCase;
+    const pathLib = os === OperatingSystem.Windows ? win32 : posix;
+    const extUriLib = os === OperatingSystem.Linux ? extUri : extUriIgnorePathCase;
     const workspace = relativePathProvider.getWorkspace();
     const firstFolder = firstOrDefault(workspace.folders);
     if (!firstFolder) {
@@ -72,7 +72,7 @@ function normalizeDriveLetter(path, isWindowsOS = isWindows) {
 }
 let normalizedUserHomeCached = Object.create(null);
 function tildify(path, userHome, os = OS) {
-    if (os === 1  || !path || !userHome) {
+    if (os === OperatingSystem.Windows || !path || !userHome) {
         return path;
     }
     let normalizedUserHome = normalizedUserHomeCached.original === userHome ? normalizedUserHomeCached.normalized : undefined;
@@ -88,7 +88,7 @@ function tildify(path, userHome, os = OS) {
     if (isWindows) {
         normalizedPath = toSlashes(normalizedPath);
     }
-    if (os === 3  ? normalizedPath.startsWith(normalizedUserHome) : startsWithIgnoreCase(normalizedPath, normalizedUserHome)) {
+    if (os === OperatingSystem.Linux ? normalizedPath.startsWith(normalizedUserHome) : startsWithIgnoreCase(normalizedPath, normalizedUserHome)) {
         return `~/${normalizedPath.substr(normalizedUserHome.length)}`;
     }
     return path;

package/vscode/src/vs/base/common/lifecycle.js

@@ -446,6 +446,11 @@ class DisposableMap {
         this._store.get(key)?.dispose();
         this._store.delete(key);
     }
+    deleteAndLeak(key) {
+        const value = this._store.get(key);
+        this._store.delete(key);
+        return value;
+    }
     keys() {
         return ( this._store.keys());
     }

package/vscode/src/vs/base/common/map.js

@@ -127,6 +127,12 @@ class ResourceSet {
         return ( this.keys());
     }
 }
+var Touch;
+( (function(Touch) {
+    Touch[Touch["None"] = 0] = "None";
+    Touch[Touch["AsOld"] = 1] = "AsOld";
+    Touch[Touch["AsNew"] = 2] = "AsNew";
+})(Touch || (Touch = {})));
 class LinkedMap {
     constructor() {
         this[_c] = 'LinkedMap';
@@ -158,34 +164,34 @@ class LinkedMap {
     has(key) {
         return ( this._map.has(key));
     }
-    get(key, touch = 0 ) {
+    get(key, touch = Touch.None) {
         const item = this._map.get(key);
         if (!item) {
             return undefined;
         }
-        if (touch !== 0 ) {
+        if (touch !== Touch.None) {
             this.touch(item, touch);
         }
         return item.value;
     }
-    set(key, value, touch = 0 ) {
+    set(key, value, touch = Touch.None) {
         let item = this._map.get(key);
         if (item) {
             item.value = value;
-            if (touch !== 0 ) {
+            if (touch !== Touch.None) {
                 this.touch(item, touch);
             }
         }
         else {
             item = { key, value, next: undefined, previous: undefined };
             switch (touch) {
-                case 0 :
+                case Touch.None:
                     this.addItemLast(item);
                     break;
-                case 1 :
+                case Touch.AsOld:
                     this.addItemFirst(item);
                     break;
-                case 2 :
+                case Touch.AsNew:
                     this.addItemLast(item);
                     break;
                 default:
@@ -422,10 +428,10 @@ class LinkedMap {
         if (!this._head || !this._tail) {
             throw ( new Error('Invalid list'));
         }
-        if (((touch !== 1  && touch !== 2) )) {
+        if ((touch !== Touch.AsOld && touch !== Touch.AsNew)) {
             return;
         }
-        if (touch === 1 ) {
+        if (touch === Touch.AsOld) {
             if (item === this._head) {
                 return;
             }
@@ -445,7 +451,7 @@ class LinkedMap {
             this._head = item;
             this._state++;
         }
-        else if (touch === 2 ) {
+        else if (touch === Touch.AsNew) {
             if (item === this._tail) {
                 return;
             }
@@ -500,14 +506,14 @@ class Cache extends LinkedMap {
         this._ratio = Math.min(Math.max(0, ratio), 1);
         this.checkTrim();
     }
-    get(key, touch = 2 ) {
+    get(key, touch = Touch.AsNew) {
         return super.get(key, touch);
     }
     peek(key) {
-        return super.get(key, 0 );
+        return super.get(key, Touch.None);
     }
     set(key, value) {
-        super.set(key, value, 2 );
+        super.set(key, value, Touch.AsNew);
         return this;
     }
     checkTrim() {
@@ -671,4 +677,4 @@ function mapsStrictEqualIgnoreOrder(a, b) {
     }
     return true;
 }
-export { BidirectionalMap, CounterSet, LRUCache, LinkedMap, MRUCache, ResourceMap, ResourceSet, SetMap, getOrSet, mapsStrictEqualIgnoreOrder };
+export { BidirectionalMap, CounterSet, LRUCache, LinkedMap, MRUCache, ResourceMap, ResourceSet, SetMap, Touch, getOrSet, mapsStrictEqualIgnoreOrder };

package/vscode/src/vs/base/common/marshalling.js

@@ -1,5 +1,6 @@
 import { VSBuffer } from './buffer.js';
 import { URI } from './uri.js';
+import { MarshalledId } from './marshallingIds.js';
 function stringify(obj) {
     return JSON.stringify(obj, replacer);
 }
@@ -11,7 +12,7 @@ function parse(text) {
 function replacer(key, value) {
     if (value instanceof RegExp) {
         return {
-            $mid: 2 ,
+            $mid: MarshalledId.Regexp,
             source: value.source,
             flags: value.flags,
         };
@@ -24,9 +25,9 @@ function revive(obj, depth = 0) {
     }
     if (typeof obj === 'object') {
         switch (obj.$mid) {
-            case 1 : return URI.revive(obj);
-            case 2 : return ( new RegExp(obj.source, obj.flags));
-            case 17 : return ( new Date(obj.source));
+            case MarshalledId.Uri: return URI.revive(obj);
+            case MarshalledId.Regexp: return ( new RegExp(obj.source, obj.flags));
+            case MarshalledId.Date: return ( new Date(obj.source));
         }
         if (obj instanceof VSBuffer
             || obj instanceof Uint8Array) {

package/vscode/src/vs/base/common/marshallingIds.js

@@ -0,0 +1,22 @@
+var MarshalledId;
+( (function(MarshalledId) {
+    MarshalledId[MarshalledId["Uri"] = 1] = "Uri";
+    MarshalledId[MarshalledId["Regexp"] = 2] = "Regexp";
+    MarshalledId[MarshalledId["ScmResource"] = 3] = "ScmResource";
+    MarshalledId[MarshalledId["ScmResourceGroup"] = 4] = "ScmResourceGroup";
+    MarshalledId[MarshalledId["ScmProvider"] = 5] = "ScmProvider";
+    MarshalledId[MarshalledId["CommentController"] = 6] = "CommentController";
+    MarshalledId[MarshalledId["CommentThread"] = 7] = "CommentThread";
+    MarshalledId[MarshalledId["CommentThreadInstance"] = 8] = "CommentThreadInstance";
+    MarshalledId[MarshalledId["CommentThreadReply"] = 9] = "CommentThreadReply";
+    MarshalledId[MarshalledId["CommentNode"] = 10] = "CommentNode";
+    MarshalledId[MarshalledId["CommentThreadNode"] = 11] = "CommentThreadNode";
+    MarshalledId[MarshalledId["TimelineActionContext"] = 12] = "TimelineActionContext";
+    MarshalledId[MarshalledId["NotebookCellActionContext"] = 13] = "NotebookCellActionContext";
+    MarshalledId[MarshalledId["NotebookActionContext"] = 14] = "NotebookActionContext";
+    MarshalledId[MarshalledId["TerminalContext"] = 15] = "TerminalContext";
+    MarshalledId[MarshalledId["TestItemContext"] = 16] = "TestItemContext";
+    MarshalledId[MarshalledId["Date"] = 17] = "Date";
+    MarshalledId[MarshalledId["TestMessageMenuArgs"] = 18] = "TestMessageMenuArgs";
+})(MarshalledId || (MarshalledId = {})));
+export { MarshalledId };