@lvce-editor/server 0.20.4 → 0.20.5

package/static/{d05077c → 31f132a}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -444,7 +444,7 @@ class VError extends Error {
   }
 }
 
-const state$V = {
+const state$W = {
   commands: Object.create(null),
   pendingModules: Object.create(null),
   async load(moduleId) {
@@ -469,7 +469,7 @@ const initializeModule = (module) => {
 
 const loadModule$1 = async (moduleId) => {
   try {
-    const module = await state$V.load(moduleId);
+    const module = await state$W.load(moduleId);
     initializeModule(module);
   } catch (error) {
     throw new VError(error, `failed to load module ${moduleId}`)
@@ -477,23 +477,23 @@ const loadModule$1 = async (moduleId) => {
 };
 
 const getOrLoadModule = (moduleId) => {
-  if (!state$V.pendingModules[moduleId]) {
-    state$V.pendingModules[moduleId] = loadModule$1(moduleId);
+  if (!state$W.pendingModules[moduleId]) {
+    state$W.pendingModules[moduleId] = loadModule$1(moduleId);
   }
-  return state$V.pendingModules[moduleId]
+  return state$W.pendingModules[moduleId]
 };
 
 const loadCommand = (command) => getOrLoadModule(getModuleId$1(command));
 
 const register$1 = (commandId, listener) => {
-  state$V.commands[commandId] = listener;
+  state$W.commands[commandId] = listener;
 };
 
 const hasThrown = new Set();
 
 const execute$5 = (command, ...args) => {
-  if (command in state$V.commands) {
-    const fn = state$V.commands[command];
+  if (command in state$W.commands) {
+    const fn = state$W.commands[command];
     if (typeof fn !== 'function') {
       throw new Error(`[renderer-worker] Command ${command} is not a function`)
     }
@@ -503,7 +503,7 @@ const execute$5 = (command, ...args) => {
     loadCommand(command)
       // TODO can skip then block in prod (only to prevent endless loop in dev)
       .then(() => {
-        if (!(command in state$V.commands)) {
+        if (!(command in state$W.commands)) {
           if (hasThrown.has(command)) {
             return
           }
@@ -516,7 +516,7 @@ const execute$5 = (command, ...args) => {
 };
 
 const setLoad = (load) => {
-  state$V.load = load;
+  state$W.load = load;
 };
 
 const Web$1 = 1;
@@ -531,36 +531,36 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/d05077c'
+    return '/31f132a'
   }
 };
 
 const assetDir = getAssetDir();
 
-const state$U = {
+const state$V = {
   pending: Object.create(null),
 };
 
-const get$7 = (id) => {
-  return state$U.pending[id]
+const get$8 = (id) => {
+  return state$V.pending[id]
 };
 
 const has$2 = (id) => {
-  return id in state$U.pending
+  return id in state$V.pending
 };
 
 const set$7 = (id, value) => {
-  state$U.pending[id] = value;
+  state$V.pending[id] = value;
 };
 
 const NotFound = 404;
 
-const state$T = {
+const state$U = {
   id: 0,
 };
 
 const create$12 = () => {
-  return ++state$T.id
+  return ++state$U.id
 };
 
 const info = (...args) => {
@@ -595,7 +595,7 @@ const withResolvers = () => {
   }
 };
 
-const state$S = {
+const state$T = {
   callbacks: Object.create(null),
   onceListeners: new Set(),
 };
@@ -603,30 +603,30 @@ const state$S = {
 const registerPromise = () => {
   const id = create$12();
   const { resolve, reject, promise } = withResolvers();
-  state$S.callbacks[id] = { resolve, reject };
+  state$T.callbacks[id] = { resolve, reject };
   return { id, promise }
 };
 
 // TODO merge resolve and resolveEmpty
 const resolve = (id, args) => {
   number(id);
-  if (!(id in state$S.callbacks)) {
+  if (!(id in state$T.callbacks)) {
     console.log(args);
     warn$1(`callback ${id} may already be disposed`);
     return
   }
-  state$S.callbacks[id].resolve(args);
-  delete state$S.callbacks[id];
+  state$T.callbacks[id].resolve(args);
+  delete state$T.callbacks[id];
 };
 
 const reject = (id, error) => {
   number(id);
-  if (!(id in state$S.callbacks)) {
+  if (!(id in state$T.callbacks)) {
     warn$1(`callback ${id} may already be disposed`);
     return
   }
-  state$S.callbacks[id].reject(error);
-  delete state$S.callbacks[id];
+  state$T.callbacks[id].reject(error);
+  delete state$T.callbacks[id];
 };
 
 const Two = '2.0';
@@ -882,7 +882,7 @@ const invoke$3 = async (ipc, method, ...params) => {
 
 /* istanbul ignore file */
 
-const state$R = {
+const state$S = {
   pendingMessages: [],
   /**
    * @type {any}
@@ -895,14 +895,14 @@ const getIpc = () => {
 };
 
 const listen$9 = async () => {
-  console.assert(state$R.pendingMessages.length === 0);
+  console.assert(state$S.pendingMessages.length === 0);
   const ipc = await getIpc();
   handleIpc(ipc, 'renderer process');
-  state$R.ipc = ipc;
+  state$S.ipc = ipc;
 };
 
 const invoke$2 = async (method, ...params) => {
-  return invoke$3(state$R.ipc, method, ...params)
+  return invoke$3(state$S.ipc, method, ...params)
 };
 
 const getText$4 = (response) => {
@@ -943,7 +943,7 @@ const loadCssStyleSheet = (id) => {
   if (!has$2(id)) {
     set$7(id, actuallyLoadCssStyleSheet(id));
   }
-  return get$7(id)
+  return get$8(id)
 };
 
 const loadCssStyleSheets = (css) => {
@@ -963,7 +963,7 @@ const addDynamicCss = (id, getCss, preferences) => {
   if (!has$2(id)) {
     set$7(id, actuallyAddDynamicCss(id, getCss, preferences));
   }
-  return get$7(id)
+  return get$8(id)
 };
 
 class HTTPError extends Error {
@@ -1086,6 +1086,35 @@ const responseTypes = {
 };
 const maxSafeTimeout = 2147483647;
 const stop$1 = Symbol("stop");
+const kyOptionKeys = {
+  json: true,
+  parseJson: true,
+  searchParams: true,
+  prefixUrl: true,
+  retry: true,
+  timeout: true,
+  hooks: true,
+  throwHttpErrors: true,
+  onDownloadProgress: true,
+  fetch: true
+};
+const requestOptionsRegistry = {
+  method: true,
+  headers: true,
+  body: true,
+  mode: true,
+  credentials: true,
+  cache: true,
+  redirect: true,
+  referrer: true,
+  referrerPolicy: true,
+  integrity: true,
+  keepalive: true,
+  signal: true,
+  window: true,
+  dispatcher: true,
+  duplex: true
+};
 const normalizeRequestMethod = (input) => requestMethods.includes(input) ? input.toUpperCase() : input;
 const retryMethods = ["get", "put", "head", "delete", "options", "trace"];
 const retryStatusCodes = [408, 413, 429, 500, 502, 503, 504];
@@ -1096,7 +1125,8 @@ const defaultRetryOptions = {
   statusCodes: retryStatusCodes,
   afterStatusCodes: retryAfterStatusCodes,
   maxRetryAfter: Number.POSITIVE_INFINITY,
-  backoffLimit: Number.POSITIVE_INFINITY
+  backoffLimit: Number.POSITIVE_INFINITY,
+  delay: (attemptCount) => 0.3 * 2 ** (attemptCount - 1) * 1e3
 };
 const normalizeRetryOptions = (retry = {}) => {
   if (typeof retry === "number") {
@@ -1117,7 +1147,7 @@ const normalizeRetryOptions = (retry = {}) => {
     afterStatusCodes: retryAfterStatusCodes
   };
 };
-async function timeout(request, abortController, options) {
+async function timeout(request, init, abortController, options) {
   return new Promise((resolve, reject) => {
     const timeoutId = setTimeout(() => {
       if (abortController) {
@@ -1125,7 +1155,7 @@ async function timeout(request, abortController, options) {
       }
       reject(new TimeoutError(request));
     }, options.timeout);
-    void options.fetch(request).then(resolve).catch(reject).then(() => {
+    void options.fetch(request, init).then(resolve).catch(reject).then(() => {
       clearTimeout(timeoutId);
     });
   });
@@ -1146,6 +1176,15 @@ async function delay(ms, {signal}) {
     }, ms);
   });
 }
+const findUnknownOptions = (request, options) => {
+  const unknownOptions = {};
+  for (const key in options) {
+    if (!(key in requestOptionsRegistry) && !(key in kyOptionKeys) && !(key in request)) {
+      unknownOptions[key] = options[key];
+    }
+  }
+  return unknownOptions;
+};
 class Ky {
   static create(input, options) {
     const ky2 = new Ky(input, options);
@@ -1320,8 +1359,8 @@ class Ky {
           return 0;
         }
       }
-      const BACKOFF_FACTOR = 0.3;
-      return Math.min(this._options.retry.backoffLimit, BACKOFF_FACTOR * 2 ** (this._retryCount - 1) * 1e3);
+      const retryDelay = this._options.retry.delay(this._retryCount);
+      return Math.min(this._options.retry.backoffLimit, retryDelay);
     }
     return 0;
   }
@@ -1365,10 +1404,11 @@ class Ky {
         return result;
       }
     }
+    const nonRequestOptions = findUnknownOptions(this.request, this._options);
     if (this._options.timeout === false) {
-      return this._options.fetch(this.request.clone());
+      return this._options.fetch(this.request.clone(), nonRequestOptions);
     }
-    return timeout(this.request.clone(), this.abortController, this._options);
+    return timeout(this.request.clone(), nonRequestOptions, this.abortController, this._options);
   }
   _stream(response, onDownloadProgress) {
     const totalBytes = Number(response.headers.get("content-length")) || 0;
@@ -2098,7 +2138,7 @@ const getMessage$8 = (error) => {
   return `Error: ${error}`
 };
 
-const state$Q = {
+const state$R = {
   /**
    * @type {string[]}
    */
@@ -2135,10 +2175,10 @@ const showErrorDialog = async (error) => {
 
 const warn = (...args) => {
   const stringified = JSON.stringify(args);
-  if (state$Q.seenWarnings.includes(stringified)) {
+  if (state$R.seenWarnings.includes(stringified)) {
     return
   }
-  state$Q.seenWarnings.push(stringified);
+  state$R.seenWarnings.push(stringified);
   console.warn(...args);
 };
 
@@ -2195,7 +2235,7 @@ const listen$8 = (method) => {
 
 /* istanbul ignore file */
 
-const state$P = {
+const state$Q = {
   /**
    * @type {any}
    */
@@ -2206,7 +2246,7 @@ const handleMessageFromSharedProcess = async (message) => {
   if (message.method) {
     const result = await execute$5(message.method, ...message.params);
     if (message.id) {
-      state$P.send({
+      state$Q.send({
         jsonrpc: Two,
         id: message.id,
         result,
@@ -2222,7 +2262,7 @@ const handleMessageFromSharedProcess = async (message) => {
 const listen$7 = async () => {
   const ipc = await listen$8(Node);
   ipc.onmessage = handleMessageFromSharedProcess;
-  state$P.ipc = ipc;
+  state$Q.ipc = ipc;
 };
 
 const invoke$1 = async (method, ...params) => {
@@ -2230,7 +2270,7 @@ const invoke$1 = async (method, ...params) => {
   //   console.warn('SharedProcess is not available on web')
   //   return
   // }
-  const result = await invoke$3(state$P.ipc, method, ...params);
+  const result = await invoke$3(state$Q.ipc, method, ...params);
   return result
 };
 
@@ -2293,7 +2333,7 @@ const Disk = '';
 
 // TODO lazyload different file system providers
 
-const state$O = {
+const state$P = {
   fileSystems: Object.create(null),
 };
 
@@ -2323,10 +2363,10 @@ const loadFileSystem = (procotol) => {
 };
 
 const getFileSystem = (protocol) => {
-  if (!(protocol in state$O.fileSystems)) {
-    state$O.fileSystems[protocol] = loadFileSystem(protocol);
+  if (!(protocol in state$P.fileSystems)) {
+    state$P.fileSystems[protocol] = loadFileSystem(protocol);
   }
-  return state$O.fileSystems[protocol]
+  return state$P.fileSystems[protocol]
 };
 
 const RE_PROTOCOL = /^([a-z\-]+):\/\//;
@@ -2467,27 +2507,27 @@ const canBeRestored$6 = async (uri) => {
 // pros
 // 1. it decouples event emitter (e.g. Editor creation) from other module (Document syncing when editor was created)
 
-const state$N = {
+const state$O = {
   listenerMap: Object.create(null),
 };
 
 const emitEvent = async (event, ...args) => {
-  const listeners = state$N.listenerMap[event] || [];
+  const listeners = state$O.listenerMap[event] || [];
   for (const listener of listeners) {
     await listener(...args);
   }
 };
 
 const addListener = (event, fn) => {
-  state$N.listenerMap[event] ||= [];
-  if (state$N.listenerMap[event].includes(fn)) {
+  state$O.listenerMap[event] ||= [];
+  if (state$O.listenerMap[event].includes(fn)) {
     return
   }
-  state$N.listenerMap[event].push(fn);
+  state$O.listenerMap[event].push(fn);
 };
 
 const removeListener$1 = (event, fn) => {
-  const listeners = state$N.listenerMap[event];
+  const listeners = state$O.listenerMap[event];
   if (!listeners) {
     console.info(
       `[info] listener for event ${event} is not registered and cannot be unregistered`
@@ -2497,7 +2537,7 @@ const removeListener$1 = (event, fn) => {
   const index = listeners.indexOf(fn);
   listeners.splice(index, 1);
   if (listeners.length === 0) {
-    delete state$N.listenerMap[event];
+    delete state$O.listenerMap[event];
   }
 };
 
@@ -2548,7 +2588,7 @@ const TextSearchSearch = 'TextSearch.search';
 
 const WorkspaceResolveRoot = 'Workspace.resolveRoot';
 
-const state$M = Object.create(null);
+const state$N = Object.create(null);
 
 const openSettingsJson = async () => {
   await execute$5(/* Main.openUri */ 'Main.openUri', /* uri */ 'app://settings.json');
@@ -2583,29 +2623,29 @@ const hydrate$a = async () => {
     // TODO should configuration be together with all other preferences (e.g. selecting color theme code is not needed on startup)
     // TODO probably not all preferences need to be kept in memory
     const preferences = await getPreferences();
-    Object.assign(state$M, preferences);
+    Object.assign(state$N, preferences);
   } catch (error) {
     logError(error);
   }
 };
 
-const get$6 = (key) => {
-  return state$M[key]
+const get$7 = (key) => {
+  return state$N[key]
 };
 
 const set$6 = async (key, value) => {
-  state$M[key] = value;
+  state$N[key] = value;
   if (platform === Web$1) {
-    const preferences = { ...state$M, [key]: value };
+    const preferences = { ...state$N, [key]: value };
     await execute$5(/* LocalStorage.setJson */ 'LocalStorage.setJson', /* key */ 'preferences', /* value */ preferences);
     return
   }
-  const content = stringify(state$M);
+  const content = stringify(state$N);
   await writeFile$f('app://settings.json', content);
 };
 
-const update$1 = async (settings) => {
-  const newSettings = { ...state$M, ...settings };
+const update$2 = async (settings) => {
+  const newSettings = { ...state$N, ...settings };
   const content = stringify(newSettings);
   await writeFile$f('app://settings.json', content);
   await emitEvent('preferences.changed');
@@ -2614,7 +2654,7 @@ const update$1 = async (settings) => {
 // TODO by default color theme should come from local storage, session storage, cache storage, indexeddb or blob url -> fast initial load
 // actual color theme can be computed after workbench has loaded (most times will be the same and doesn't need to be computed)
 
-const state$L = {
+const state$M = {
   watchedTheme: '',
 };
 
@@ -2635,7 +2675,7 @@ const getColorThemeCss = async (colorThemeId, colorThemeJson) => {
 const applyColorTheme = async (colorThemeId) => {
   try {
     string(colorThemeId);
-    state$L.colorTheme = colorThemeId;
+    state$M.colorTheme = colorThemeId;
     const colorThemeJson = await getColorThemeJson(colorThemeId);
     const colorThemeCss = await getColorThemeCss(colorThemeId, colorThemeJson);
     await addCssStyleSheet('ContributedColorTheme', colorThemeCss);
@@ -2643,7 +2683,7 @@ const applyColorTheme = async (colorThemeId) => {
       const themeColor = getMetaThemeColor(colorThemeJson) || '';
       await setThemeColor(themeColor);
     }
-    if (platform !== Web$1 && get$6('development.watchColorTheme')) {
+    if (platform !== Web$1 && get$7('development.watchColorTheme')) {
       watch$1(colorThemeId);
     }
   } catch (error) {
@@ -2658,15 +2698,15 @@ const setColorTheme$1 = async (colorThemeId) => {
 };
 
 const watch$1 = async (id) => {
-  if (state$L.watchedTheme === id) {
+  if (state$M.watchedTheme === id) {
     return
   }
-  state$L.watchedTheme = id;
+  state$M.watchedTheme = id;
   await invoke$1('ExtensionHost.watchColorTheme', id);
 };
 
 const getPreferredColorTheme = () => {
-  const preferredColorTheme = get$6('workbench.colorTheme');
+  const preferredColorTheme = get$7('workbench.colorTheme');
   return preferredColorTheme
 };
 
@@ -2719,34 +2759,107 @@ const getBrowser = () => {
   return 'chromium'
 };
 
-const state$K = {
+const state$L = {
   // contexts: Object.create(null),
   contexts: {},
 };
 
-const getAll$1 = () => {
-  return state$K.contexts
+// TODO all context keys should be numeric
+// comparing numbers is faster and more efficient than comparing strings every time
+// e.g. map 'focus.editor' -> 1
+// e.g. map 'focus.explorer' -> 2
+// Context.get(1), Context.get(2)
+
+const get$6 = (key) => {
+  return state$L.contexts[key]
 };
 
 const set$5 = (key, value) => {
-  state$K.contexts[key] = value;
+  state$L.contexts[key] = value;
 };
 
 const remove$9 = (key) => {
-  delete state$K.contexts[key];
+  delete state$L.contexts[key];
 };
 
-const state$J = {
+const state$K = {
   // TODO use numeric focus key
   currentFocus: '',
 };
 
 const get$5 = () => {
-  return state$J.currentFocus
+  return state$K.currentFocus
 };
 
 const set$4 = (value) => {
-  state$J.currentFocus = value;
+  state$K.currentFocus = value;
+};
+
+const state$J = {
+  keyBindings: [],
+  keyBindingSets: Object.create(null),
+  /**
+   * @type {Uint32Array}
+   */
+  keyBindingIdentifiers: new Uint32Array(),
+  /**
+   * @type {any}
+   */
+  matchingKeyBindings: [],
+};
+
+const getKeyBinding = (identifier) => {
+  for (const keyBinding of state$J.matchingKeyBindings) {
+    if (keyBinding.key === identifier) {
+      return keyBinding
+    }
+  }
+  return undefined
+};
+
+const getKey = (keyBinding) => {
+  return keyBinding.key
+};
+
+const getMatchingKeyBindings = (keyBindingSets) => {
+  const matchesContext = (keyBinding) => {
+    if (!keyBinding.when) {
+      return true
+    }
+    return get$6(keyBinding.when)
+  };
+  return Object.values(keyBindingSets).flat(1).filter(matchesContext)
+};
+
+const getAvailableKeyBindings = (keyBindings) => {
+  return new Uint32Array(keyBindings.map(getKey))
+};
+
+const update$1 = () => {
+  const matchingKeyBindings = getMatchingKeyBindings(state$J.keyBindingSets);
+  state$J.matchingKeyBindings = matchingKeyBindings;
+  state$J.keyBindingIdentifiers = getAvailableKeyBindings(matchingKeyBindings);
+  invoke$2('KeyBindings.setIdentifiers', state$J.keyBindingIdentifiers);
+};
+
+const addKeyBindings = (id, keyBindings) => {
+  array(keyBindings);
+  if (id in state$J.keyBindingSets) {
+    warn$1(`cannot add keybindings multiple times: ${id}`);
+    return
+  }
+  state$J.keyBindingSets[id] = keyBindings;
+  update$1();
+};
+
+const removeKeyBindings = (id) => {
+  const { keyBindingSets } = state$J;
+  if (!(id in keyBindingSets)) {
+    warn$1(`cannot remove keybindings that are not registered: ${id}`);
+    return
+  }
+  delete keyBindingSets[id];
+  update$1();
 };
 
 const setFocus = async (focusKey) => {
@@ -2755,8 +2868,7 @@ const setFocus = async (focusKey) => {
   }
   set$4(`focus.${focusKey}`);
   set$5(get$5(), true);
-  // TODO send matching keybindings to renderer process?
-  await invoke$2('Focus.setContext', getAll$1(), get$5());
+  update$1();
 };
 
 const setAdditionalFocus = (key) => {
@@ -2773,7 +2885,7 @@ const hydrate$8 = async () => {
   // maybe in env file / env service
   const browser = getBrowser();
   set$5(`browser.${browser}`, true);
-  await invoke$2('Focus.setContext', getAll$1(), get$5());
+  update$1();
 };
 
 const Resolved = 'resolved';
@@ -3001,7 +3113,7 @@ const hydrate$7 = async () => {
   const languages = await getLanguages();
   // TODO avoid side effect here, but how?
   await addLanguages(languages);
-  const useJsx = get$6('languages.jsFilesAsJsx');
+  const useJsx = get$7('languages.jsFilesAsJsx');
   if (useJsx) {
     addExtension('.js', 'jsx');
   }
@@ -3796,7 +3908,7 @@ const getResolvedRootFromRendererProcess = async (href) => {
   }
 
   if (platform === Web$1) {
-    const defaultWorkspace = get$6('workspace.defaultWorkspace');
+    const defaultWorkspace = get$7('workspace.defaultWorkspace');
     const resolvedRoot = {
       path: defaultWorkspace,
       homeDir: '',
@@ -3956,7 +4068,7 @@ const handleVisibilityChange = async (visibilityState) => {
 
 const hydrate$4 = async () => {
   // TODO should set up listener in renderer process
-  if (!get$6('workbench.saveStateOnVisibilityChange')) {
+  if (!get$7('workbench.saveStateOnVisibilityChange')) {
     console.info('[info] not saving state on visibility change - disabled by settings');
     return
   }
@@ -4371,7 +4483,7 @@ const actuallyLoadModule = async (getModule, id) => {
     }
   }
   if (module.getDynamicCss) {
-    await addDynamicCss(id, module.getDynamicCss, state$M);
+    await addDynamicCss(id, module.getDynamicCss, state$N);
   }
   maybeRegisterWrappedCommands(id, module);
   maybeRegisterEvents(module);
@@ -4455,7 +4567,7 @@ const load$8 = async (viewlet, focus = false, restore = false, restoreState = un
 
     if (module.getKeyBindings) {
       const keyBindings = module.getKeyBindings();
-      extraCommands.push(['Viewlet.addKeyBindings', viewletUid, keyBindings]);
+      addKeyBindings(viewletUid, keyBindings);
     }
 
     if (module.getChildren) {
@@ -4802,11 +4914,16 @@ const focus$d = async () => {
   return invoke$1('ElectronWindow.focus', windowId)
 };
 
-const handleKeyBinding = async (keyBinding) => {
+const handleKeyBinding = async (identifier) => {
+  number(identifier);
+  const keyBinding = getKeyBinding(identifier);
+  if (!keyBinding) {
+    throw new Error(`keybinding not found for identifier ${identifier}`)
+  }
   await execute$5(
     /* command */ keyBinding.command,
     // TODO should args always be defined? (probably yes -> monomorphism & simpler code since all objects are the same)
-    ...(keyBinding.args || [])
+    ...(keyBinding.args || []),
   );
   // TODO
   // else if (typeof keyBinding.command === 'string') {
@@ -4950,7 +5067,7 @@ const dispose$v = async (id) => {
     instance.factory.dispose(instance.state);
     await invoke$2(/* Viewlet.dispose */ 'Viewlet.dispose', /* id */ instanceUid);
     if (instance.factory.getKeyBindings) {
-      await invoke$2('Viewlet.removeKeyBindings', instanceUid);
+      removeKeyBindings(instanceUid);
     }
   } catch (error) {
     console.error(error);
@@ -4986,7 +5103,7 @@ const disposeFunctional = (id) => {
     const commands = [[/* Viewlet.dispose */ 'Viewlet.dispose', /* id */ uid]];
 
     if (instance.factory.getKeyBindings) {
-      commands.push(['Viewlet.removeKeyBindings', uid]);
+      removeKeyBindings(uid);
     }
     if (instance.factory.getChildren) {
       const children = instance.factory.getChildren(instance.state);
@@ -5224,7 +5341,7 @@ const disposeWidgetWithValue = async (id, value) => {
     number(uid);
     const commands = [[/* Viewlet.dispose */ 'Viewlet.dispose', /* id */ uid]];
     if (instance.factory.getKeyBindings) {
-      commands.push(['Viewlet.removeKeyBindings', uid]);
+      removeKeyBindings(uid);
     }
     if (instance.factory.getChildren) {
       const children = instance.factory.getChildren(instance.state);
@@ -5394,7 +5511,7 @@ const setIconTheme$1 = async (iconThemeId) => {
 };
 
 const hydrate$3 = async () => {
-  const iconThemeId = get$6('icon-theme') || 'vscode-icons';
+  const iconThemeId = get$7('icon-theme') || 'vscode-icons';
   await setIconTheme$1(iconThemeId);
 };
 
@@ -6238,7 +6355,7 @@ const DONT_REPLAY = new Set(['Open.openUrl', 'Download.downloadFile']);
 
 const replaySession = async (sessionId) => {
   const events = await getEvents(sessionId);
-  const originalIpc = state$R.ipc;
+  const originalIpc = state$S.ipc;
   const originalSend = originalIpc.send.bind(originalIpc);
   const originalOnMessage = originalIpc.onmessage.bind(originalIpc);
   const wrappedSend = () => {};
@@ -6253,33 +6370,33 @@ const replaySession = async (sessionId) => {
     } else if ('method' in data) {
       switch (data.method) {
         case 'TitleBar.handleTitleBarButtonClickClose':
-          state$R.ipc.onmessage = originalOnMessage;
-          state$R.ipc.send = originalSend;
+          state$S.ipc.onmessage = originalOnMessage;
+          state$S.ipc.send = originalSend;
           await execute$5('ElectronWindow.close');
-          state$R.ipc.onmessage = wrappedOnMessage;
-          state$R.ipc.send = wrappedSend;
+          state$S.ipc.onmessage = wrappedOnMessage;
+          state$S.ipc.send = wrappedSend;
           break
         case 'TitleBar.handleTitleBarButtonClickMinimize':
-          state$R.ipc.onmessage = originalOnMessage;
-          state$R.ipc.send = originalSend;
+          state$S.ipc.onmessage = originalOnMessage;
+          state$S.ipc.send = originalSend;
           await execute$5('ElectronWindow.minimize');
-          state$R.ipc.onmessage = wrappedOnMessage;
-          state$R.ipc.send = wrappedSend;
+          state$S.ipc.onmessage = wrappedOnMessage;
+          state$S.ipc.send = wrappedSend;
           break
         case 'TitleBar.handleTitleBarButtonClickToggleMaximize':
-          state$R.ipc.onmessage = originalOnMessage;
-          state$R.ipc.send = originalSend;
+          state$S.ipc.onmessage = originalOnMessage;
+          state$S.ipc.send = originalSend;
           await execute$5('ElectronWindow.maximize');
-          state$R.ipc.onmessage = wrappedOnMessage;
-          state$R.ipc.send = wrappedSend;
+          state$S.ipc.onmessage = wrappedOnMessage;
+          state$S.ipc.send = wrappedSend;
           break
       }
     } else {
       throw new Error('unexpected message from renderer worker')
     }
   };
-  state$R.ipc.send = wrappedSend;
-  state$R.ipc.onmessage = wrappedOnMessage;
+  state$S.ipc.send = wrappedSend;
+  state$S.ipc.onmessage = wrappedOnMessage;
   const callbacks = Object.create(null);
   const invoke = (event) => {
     return new Promise((resolve, reject) => {
@@ -6361,8 +6478,8 @@ const wrapIpc = (ipc, name, getData) => {
 };
 
 const startRecording$1 = () => {
-  state$R.ipc = wrapIpc(state$R.ipc, 'renderer-process', (event) => event.data);
-  state$P.ipc = wrapIpc(state$P.ipc, 'shared-process', (event) => event);
+  state$S.ipc = wrapIpc(state$S.ipc, 'renderer-process', (event) => event.data);
+  state$Q.ipc = wrapIpc(state$Q.ipc, 'shared-process', (event) => event);
 };
 
 const openSession = async () => {
@@ -6416,7 +6533,7 @@ const startup = async () => {
   mark(DidLoadPreferences);
 
   // TODO only load this if session replay is enabled in preferences
-  if (get$6('sessionReplay.enabled')) {
+  if (get$7('sessionReplay.enabled')) {
     mark(WillLoadSessionReplay);
     await startRecording$1();
     mark(DidLoadSessionReplay);
@@ -6515,7 +6632,7 @@ const startup = async () => {
 
   mark$1(Fourteen);
 
-  if (platform === Electron$1 && get$6('window.titleBarStyle') === 'native') {
+  if (platform === Electron$1 && get$7('window.titleBarStyle') === 'native') {
     await execute$5('ElectronApplicationMenu.hydrate');
   } else {
     mark(WillLoadTitleBar);
@@ -14822,17 +14939,17 @@ const kLinks = 'editor.links';
 const kTabSize = 'editor.tabSize';
 
 const getLetterSpacing = () => {
-  return get$6(kLetterSpacing) ?? 0.5
+  return get$7(kLetterSpacing) ?? 0.5
 };
 
 const loadContent$v = async (state, savedState, context) => {
   const { uri } = state;
-  const rowHeight = get$6(kLineHeight) || 20;
-  const fontSize = get$6(kFontSize) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
-  const fontFamily = get$6(kFontFamily) || 'Fira Code';
+  const rowHeight = get$7(kLineHeight) || 20;
+  const fontSize = get$7(kFontSize) || 15; // TODO find out if it is possible to use all numeric values for settings for efficiency, maybe settings could be an array
+  const fontFamily = get$7(kFontFamily) || 'Fira Code';
   const letterSpacing = getLetterSpacing();
-  const tabSize = get$6(kTabSize) || 2;
-  const links = get$6(kLinks) || false;
+  const tabSize = get$7(kTabSize) || 2;
+  const links = get$7(kLinks) || false;
   const content = await getContent(uri);
   const newState1 = setText$1(state, content);
   const languageId = getLanguageId(newState1);
@@ -15843,7 +15960,7 @@ const saveState$8 = (state) => {
 };
 
 const getExcluded = () => {
-  const excludedObject = get$6('files.exclude') || {};
+  const excludedObject = get$7('files.exclude') || {};
   const excluded = [];
   for (const [key, value] of Object.entries(excludedObject)) {
     if (value) {
@@ -19859,7 +19976,7 @@ const saveState$5 = (state) => {
 };
 
 const getSideBarLocationType = () => {
-  const location = get$6('workbench.sideBarLocation');
+  const location = get$7('workbench.sideBarLocation');
   switch (location) {
     case 'left':
       return Left$1
@@ -19879,7 +19996,7 @@ const getSavedPoints = (savedState) => {
 };
 
 const isNativeTitleBarStyle = () => {
-  return platform === Electron$1 && get$6('window.titleBarStyle') === 'native'
+  return platform === Electron$1 && get$7('window.titleBarStyle') === 'native'
 };
 const loadContent$n = (state, savedState) => {
   const { Layout } = savedState;
@@ -22054,7 +22171,7 @@ const handleTabContextMenu = async (state, eventX, eventY) => {
 
 const handleFocusChange$1 = (state, isFocused) => {
   if (!isFocused) {
-    const autoSavePreference = get$6('files.autoSave');
+    const autoSavePreference = get$7('files.autoSave');
     if (autoSavePreference === 'onFocusChange') {
       return save$1(state)
     }
@@ -25414,7 +25531,7 @@ const saveState$2 = (state) => {
 };
 
 const getThreads = () => {
-  const value = get$6('search.threads');
+  const value = get$7('search.threads');
   if (typeof value !== 'number' || value < 0 || value > 8) {
     return 0
   }
@@ -26318,7 +26435,7 @@ const loadContent$b = async (state, savedState) => {
   const iframeSrc = getUrlFromSavedState(savedState);
   // TODO load keybindings in parallel with creating browserview
   const keyBindings = await getKeyBindings$4();
-  const suggestionsEnabled = get$6('simpleBrowser.suggestions');
+  const suggestionsEnabled = get$7('simpleBrowser.suggestions');
   const browserViewX = x;
   const browserViewY = y + headerHeight;
   const browserViewWidth = width;
@@ -27588,7 +27705,7 @@ const toUint8Array = (data) => {
 
 const create$9 = (id) => {
   number(id);
-  const separateConnection = get$6('terminal.separateConnection');
+  const separateConnection = get$7('terminal.separateConnection');
   return {
     disposed: false,
     id: 0,
@@ -27763,7 +27880,7 @@ const getChildren$1 = (state) => {
 };
 
 const loadContent$6 = async (state) => {
-  const terminalTabsEnabled = get$6('terminal.tabs.enabled');
+  const terminalTabsEnabled = get$7('terminal.tabs.enabled');
 
   return {
     ...state,
@@ -28103,7 +28220,7 @@ const getTitleBarButtonsRemote = () => {
 };
 
 const getTitleBarButtonsElectron = () => {
-  if (get$6('window.titleBarStyle') === 'custom') {
+  if (get$7('window.titleBarStyle') === 'custom') {
     // TODO don't render title bar buttons on windows when electron window controls overlay is enabled
     return [
       { label: UiStrings$A.Minimize, icon: 'Minimize', id: 'Minimize' },
@@ -30514,7 +30631,7 @@ const ContentTracing_ipc = {
 };
 
 const hasContextMenuNativePreference = () => {
-  const value = get$6('window.titleBarStyle');
+  const value = get$7('window.titleBarStyle');
   return value === 'native'
 };
 
@@ -31045,8 +31162,8 @@ const getMemoryUsageContent = async () => {
   const sharedProcessMemoryUsage = await getSharedProcessMemoryUsage();
   const formattedSharedProcessMemoryUsage = formatNodeMemoryUsage(sharedProcessMemoryUsage);
   const userAgentSpecificMemory = await getPerformanceUserAgentSpecificMemory();
-  const totalSent = state$P.totalSent;
-  const totalReceived = state$P.totalReceived;
+  const totalSent = state$Q.totalSent;
+  const totalReceived = state$Q.totalReceived;
   const formattedRendererWorkerMemoryUsage = formatRendererWorkerData({
     userAgentSpecificMemory,
     sent: totalSent,
@@ -32290,6 +32407,7 @@ const name$v = 'KeyBindings';
 
 const Commands$r = {
   handleKeyBinding: handleKeyBinding,
+  setIdentifiers: undefined,
   hydrate: undefined,
 };
 
@@ -34126,7 +34244,7 @@ const TestFrameWorkComponentSearch = {
 };
 
 const update = async (settings) => {
-  await update$1(settings);
+  await update$2(settings);
 };
 
 const TestFrameWorkComponentSettings = {
@@ -38006,7 +38124,7 @@ const EditorCommandPaste = {
 };
 
 const getFormatOnSave = () => {
-  const value = get$6('editor.formatOnSave');
+  const value = get$7('editor.formatOnSave');
   return Boolean(value)
 };
 
@@ -39268,15 +39386,15 @@ const state$2 = {
 };
 
 const isAutoClosingBracketsEnabled = () => {
-  return Boolean(get$6('editor.autoClosingBrackets'))
+  return Boolean(get$7('editor.autoClosingBrackets'))
 };
 
 const isAutoClosingQuotesEnabled = () => {
-  return Boolean(get$6('editor.autoClosingQuotes'))
+  return Boolean(get$7('editor.autoClosingQuotes'))
 };
 
 const isQuickSuggestionsEnabled = () => {
-  return Boolean(get$6('editor.quickSuggestions'))
+  return Boolean(get$7('editor.quickSuggestions'))
 };
 
 const openCompletion = async (editor, text) => {
@@ -41491,7 +41609,7 @@ const QuickPickEntriesGoToLine = {
 const getModule$1 = (protocol) => {
   if (isEmptyString(protocol)) {
     // TODO only read preference once when opening quickpick
-    const preference = get$6('search.searchWith');
+    const preference = get$7('search.searchWith');
     if (preference === 'git-ls-files') {
       return Promise.resolve().then(function () { return SearchFileWIthGitLsFiles; })
     }