@lvce-editor/server 0.31.3 → 0.31.5

package/static/{33562c6 → b6fa9db}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -1,15 +1,15 @@
-const state$S = {
+const state$Q = {
   width: 0,
   height: 0
 };
 const get$f = () => {
   return {
-    width: state$S.width,
-    height: state$S.height
+    width: state$Q.width,
+    height: state$Q.height
   };
 };
 const set$g = (width, height) => {
-  state$S.width = width, state$S.height = height;
+  state$Q.width = width, state$Q.height = height;
 };
 
 class AssertionError extends Error {
@@ -86,17 +86,17 @@ const fn = value => {
   }
 };
 
-const state$R = {
+const state$P = {
   pending: Object.create(null)
 };
 const get$e = id => {
-  return state$R.pending[id];
+  return state$P.pending[id];
 };
 const has$1 = id => {
-  return id in state$R.pending;
+  return id in state$P.pending;
 };
 const set$f = (id, value) => {
-  state$R.pending[id] = value;
+  state$P.pending[id] = value;
 };
 
 const Web$1 = 1;
@@ -109,7 +109,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/33562c6';
+    return '/b6fa9db';
   }
 };
 const assetDir = getAssetDir();
@@ -230,11 +230,11 @@ const getCssId = path => {
   return 'Css' + path.replace('/css/parts/', '').replaceAll(Slash$2, Dash).replace('.css', EmptyString);
 };
 
-const state$Q = {
+const state$O = {
   id: 0
 };
 const create$19 = () => {
-  return ++state$Q.id;
+  return ++state$O.id;
 };
 
 const info$1 = (...args) => {
@@ -267,7 +267,7 @@ const withResolvers = () => {
   };
 };
 
-const state$P = {
+const state$N = {
   callbacks: Object.create(null)
 };
 const registerPromise = () => {
@@ -276,7 +276,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = withResolvers();
-  state$P.callbacks[id] = resolve;
+  state$N.callbacks[id] = resolve;
   return {
     id,
     promise
@@ -284,13 +284,13 @@ const registerPromise = () => {
 };
 const resolve = (id, args) => {
   number(id);
-  if (!(id in state$P.callbacks)) {
+  if (!(id in state$N.callbacks)) {
     console.log(args);
     warn$1(`callback ${id} may already be disposed`);
     return;
   }
-  state$P.callbacks[id](args);
-  delete state$P.callbacks[id];
+  state$N.callbacks[id](args);
+  delete state$N.callbacks[id];
 };
 
 const ENOENT = 'ENOENT';
@@ -315,7 +315,7 @@ const Blob$2 = 4;
 const CacheStorage = 5;
 const Callback = 6;
 const ClipBoard = 7;
-const ColorPicker$2 = 8;
+const ColorPicker$1 = 8;
 const ColorTheme$1 = 9;
 const ColorThemeFromJson = 10;
 const ContextMenu = 11;
@@ -446,7 +446,7 @@ const getModuleId$1 = commandId => {
     case 'ClipBoard':
       return ClipBoard;
     case 'ColorPicker':
-      return ColorPicker$2;
+      return ColorPicker$1;
     case 'ColorTheme':
       return ColorTheme$1;
     case 'ColorThemeFromJson':
@@ -619,7 +619,7 @@ const getModuleId$1 = commandId => {
   }
 };
 
-const state$O = {
+const state$M = {
   commands: Object.create(null),
   pendingModules: Object.create(null),
   async load(moduleId) {
@@ -642,26 +642,26 @@ const initializeModule = module => {
 };
 const loadModule$4 = async moduleId => {
   try {
-    const module = await state$O.load(moduleId);
+    const module = await state$M.load(moduleId);
     initializeModule(module);
   } catch (error) {
     throw new VError(error, `failed to load module ${moduleId}`);
   }
 };
 const getOrLoadModule = moduleId => {
-  if (!state$O.pendingModules[moduleId]) {
-    state$O.pendingModules[moduleId] = loadModule$4(moduleId);
+  if (!state$M.pendingModules[moduleId]) {
+    state$M.pendingModules[moduleId] = loadModule$4(moduleId);
   }
-  return state$O.pendingModules[moduleId];
+  return state$M.pendingModules[moduleId];
 };
 const loadCommand = command => getOrLoadModule(getModuleId$1(command));
 const register$2 = (commandId, listener) => {
-  state$O.commands[commandId] = listener;
+  state$M.commands[commandId] = listener;
 };
 const hasThrown = new Set();
 const execute$4 = (command, ...args) => {
-  if (command in state$O.commands) {
-    const fn = state$O.commands[command];
+  if (command in state$M.commands) {
+    const fn = state$M.commands[command];
     if (typeof fn !== 'function') {
       throw new TypeError(`[renderer-worker] Command ${command} is not a function`);
     }
@@ -670,7 +670,7 @@ const execute$4 = (command, ...args) => {
   return loadCommand(command)
   // TODO can skip then block in prod (only to prevent endless loop in dev)
   .then(() => {
-    if (!(command in state$O.commands)) {
+    if (!(command in state$M.commands)) {
       if (hasThrown.has(command)) {
         return;
       }
@@ -681,7 +681,7 @@ const execute$4 = (command, ...args) => {
   });
 };
 const setLoad = load => {
-  state$O.load = load;
+  state$M.load = load;
 };
 
 const Two = '2.0';
@@ -999,7 +999,7 @@ const invokeAndTransfer$8 = async (ipc, transfer, method, ...params) => {
 };
 
 /* istanbul ignore file */
-const state$N = {
+const state$L = {
   pendingMessages: [],
   /**
    * @type {any}
@@ -1012,19 +1012,19 @@ const getIpc = () => {
   });
 };
 const listen$1 = async () => {
-  console.assert(state$N.pendingMessages.length === 0);
+  console.assert(state$L.pendingMessages.length === 0);
   const ipc = await getIpc();
   handleIpc(ipc);
-  state$N.ipc = ipc;
+  state$L.ipc = ipc;
 };
 const invoke$8 = (method, ...params) => {
-  return invoke$9(state$N.ipc, method, ...params);
+  return invoke$9(state$L.ipc, method, ...params);
 };
 const invokeAndTransfer$7 = (method, transfer, ...params) => {
-  return invokeAndTransfer$8(state$N.ipc, transfer, method, ...params);
+  return invokeAndTransfer$8(state$L.ipc, transfer, method, ...params);
 };
 const sendAndTransfer = (message, transferables) => {
-  state$N.ipc.sendAndTransfer(message, transferables);
+  state$L.ipc.sendAndTransfer(message, transferables);
 };
 
 const actuallyLoadCssStyleSheet = async css => {
@@ -1687,7 +1687,7 @@ const getMessage$5 = error => {
   return `Error: ${error}`;
 };
 
-const state$M = {
+const state$K = {
   /**
    * @type {string[]}
    */
@@ -1720,14 +1720,14 @@ const showErrorDialog = async error => {
 };
 const warn = (...args) => {
   const stringified = JSON.stringify(args);
-  if (state$M.seenWarnings.includes(stringified)) {
+  if (state$K.seenWarnings.includes(stringified)) {
     return;
   }
-  state$M.seenWarnings.push(stringified);
+  state$K.seenWarnings.push(stringified);
   console.warn(...args);
 };
 
-const state$L = {
+const state$J = {
   /**
    * @type {any}
    */
@@ -1738,14 +1738,14 @@ const state$L = {
 const invoke$7 = async (method, ...params) => {
   const {
     ipc
-  } = state$L;
+  } = state$J;
   const result = await invoke$9(ipc, method, ...params);
   return result;
 };
 const invokeAndTransfer$6 = async (transfer, method, ...params) => {
   const {
     ipc
-  } = state$L;
+  } = state$J;
   const result = await invokeAndTransfer$8(ipc, transfer, method, ...params);
   return result;
 };
@@ -1924,36 +1924,24 @@ const canBeRestored$6 = async uri => {
 // 1. it decouples event emitter (e.g. Editor creation) from other module (Document syncing when editor was created)
 
 // TODO use normal event target
-const state$K = {
+const state$I = {
   listenerMap: Object.create(null)
 };
 const emitEvent = async (event, ...args) => {
-  const listeners = state$K.listenerMap[event] || [];
+  const listeners = state$I.listenerMap[event] || [];
   for (const listener of listeners) {
     await listener(...args);
   }
 };
 const addListener = (event, fn, options = {}) => {
-  state$K.listenerMap[event] ||= [];
-  if (state$K.listenerMap[event].includes(fn)) {
+  state$I.listenerMap[event] ||= [];
+  if (state$I.listenerMap[event].includes(fn)) {
     return;
   }
   if (options.prepend) {
-    state$K.listenerMap[event].unshift(fn);
+    state$I.listenerMap[event].unshift(fn);
   } else {
-    state$K.listenerMap[event].push(fn);
-  }
-};
-const removeListener = (event, fn) => {
-  const listeners = state$K.listenerMap[event];
-  if (!listeners) {
-    console.info(`[info] listener for event ${event} is not registered and cannot be unregistered`);
-    return;
-  }
-  const index = listeners.indexOf(fn);
-  listeners.splice(index, 1);
-  if (listeners.length === 0) {
-    delete state$K.listenerMap[event];
+    state$I.listenerMap[event].push(fn);
   }
 };
 
@@ -2003,7 +1991,7 @@ const openUri$1 = async (path, focus = true, props = {}) => {
   await execute$4( /* Main.openUri */'Main.openUri', /* uri */path, /* focus */focus, props);
 };
 
-const state$J = Object.create(null);
+const state$H = Object.create(null);
 const openSettingsJson = async () => {
   await openUri$1('app://settings.json');
 };
@@ -2034,25 +2022,25 @@ const hydrate$b = 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$J, preferences);
+    Object.assign(state$H, preferences);
   } catch (error) {
     logError(error);
   }
 };
 const get$c = key => {
-  return state$J[key];
+  return state$H[key];
 };
 const set$e = async (key, value) => {
-  state$J[key] = value;
+  state$H[key] = value;
   if (platform === Web$1) {
     const preferences = {
-      ...state$J,
+      ...state$H,
       [key]: value
     };
     await execute$4( /* LocalStorage.setJson */'LocalStorage.setJson', /* key */'preferences', /* value */preferences);
     return;
   }
-  const content = stringify(state$J);
+  const content = stringify(state$H);
   await writeFile$e('app://settings.json', content);
 };
 
@@ -2106,7 +2094,7 @@ const setThemeColor = async themeColor => {
 // 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$I = {
+const state$G = {
   watchedTheme: ''
 };
 const FALLBACK_COLOR_THEME_ID = 'slime';
@@ -2117,7 +2105,7 @@ const FALLBACK_COLOR_THEME_ID = 'slime';
 const applyColorTheme = async colorThemeId => {
   try {
     string(colorThemeId);
-    state$I.colorTheme = colorThemeId;
+    state$G.colorTheme = colorThemeId;
     const colorThemeCss = await getColorThemeCss(colorThemeId);
     await addCssStyleSheet('ContributedColorTheme', colorThemeCss);
     if (platform === Web$1) {
@@ -2137,10 +2125,10 @@ const setColorTheme$1 = async colorThemeId => {
   await set$e('workbench.colorTheme', colorThemeId);
 };
 const watch$2 = async id => {
-  if (state$I.watchedTheme === id) {
+  if (state$G.watchedTheme === id) {
     return;
   }
-  state$I.watchedTheme = id;
+  state$G.watchedTheme = id;
   await invoke$7('ExtensionHost.watchColorTheme', id);
 };
 const getPreferredColorTheme = () => {
@@ -2216,10 +2204,7 @@ const getBrowser$1 = () => {
   return 'chromium';
 };
 
-const state$H = {
-  // contexts: Object.create(null),
-  contexts: {}
-};
+const contexts = Object.create(null);
 
 // TODO all context keys should be numeric
 // comparing numbers is faster and more efficient than comparing strings every time
@@ -2228,27 +2213,27 @@ const state$H = {
 // Context.get(1), Context.get(2)
 
 const get$b = key => {
-  return state$H.contexts[key];
+  return contexts[key];
 };
 const set$d = (key, value) => {
-  state$H.contexts[key] = value;
+  contexts[key] = value;
 };
 const remove$9 = key => {
-  delete state$H.contexts[key];
+  delete contexts[key];
 };
 
-const state$G = {
+const state$F = {
   // TODO use numeric focus key
   currentFocus: ''
 };
 const get$a = () => {
-  return state$G.currentFocus;
+  return state$F.currentFocus;
 };
 const set$c = value => {
-  state$G.currentFocus = value;
+  state$F.currentFocus = value;
 };
 
-const state$F = {
+const state$E = {
   keyBindings: [],
   keyBindingSets: Object.create(null),
   /**
@@ -2261,7 +2246,7 @@ const state$F = {
   matchingKeyBindings: []
 };
 const getKeyBinding = identifier => {
-  for (const keyBinding of state$F.matchingKeyBindings) {
+  for (const keyBinding of state$E.matchingKeyBindings) {
     if (keyBinding.key === identifier) {
       return keyBinding;
     }
@@ -2284,26 +2269,26 @@ const getAvailableKeyBindings = keyBindings => {
   return new Uint32Array(keyBindings.map(getKey$1));
 };
 const update = () => {
-  const matchingKeyBindings = getMatchingKeyBindings(state$F.keyBindingSets);
+  const matchingKeyBindings = getMatchingKeyBindings(state$E.keyBindingSets);
   const keyBindingIdentifiers = getAvailableKeyBindings(matchingKeyBindings);
   invoke$8('KeyBindings.setIdentifiers', keyBindingIdentifiers);
-  state$F.matchingKeyBindings = matchingKeyBindings;
-  state$F.keyBindingIdentifiers = keyBindingIdentifiers;
+  state$E.matchingKeyBindings = matchingKeyBindings;
+  state$E.keyBindingIdentifiers = keyBindingIdentifiers;
 };
 const addKeyBindings$1 = (id, keyBindings) => {
   string(id);
   array(keyBindings);
-  if (id in state$F.keyBindingSets) {
+  if (id in state$E.keyBindingSets) {
     warn$1(`cannot add keybindings multiple times: ${id}`);
     return;
   }
-  state$F.keyBindingSets[id] = keyBindings;
+  state$E.keyBindingSets[id] = keyBindings;
   update();
 };
 const removeKeyBindings = id => {
   const {
     keyBindingSets
-  } = state$F;
+  } = state$E;
   if (!(id in keyBindingSets)) {
     warn$1(`cannot remove keybindings that are not registered: ${id}`);
     return;
@@ -2400,7 +2385,7 @@ const hydrate$9 = async () => {
   update();
 };
 
-const state$E = {
+const state$D = {
   /**
    * @type {any[]}
    */
@@ -2419,7 +2404,7 @@ const getIconThemeJson = async iconThemeId => {
       extensionPath: `${assetDir}/extensions/builtin.${iconThemeId}`
     };
   }
-  for (const webExtension of state$E.webExtensions) {
+  for (const webExtension of state$D.webExtensions) {
     if (webExtension.iconThemes) {
       for (const iconTheme of webExtension.iconThemes) {
         // TODO handle error when icon theme path is not of type string
@@ -2437,7 +2422,7 @@ const getIconThemeJson = async iconThemeId => {
 
 const initialIconTheme = undefined;
 
-const state$D = {
+const state$C = {
   seenFiles: [],
   seenFolders: [],
   hasWarned: [],
@@ -2567,7 +2552,7 @@ const setJson$1 = (key, value) => {
   return setJson$4(SessionStorage, key, value);
 };
 
-const state$C = {
+const state$B = {
   instances: Object.create(null),
   /**
    * @type {any}
@@ -2580,10 +2565,10 @@ const set$b = (key, value) => {
   object(value.factory);
   object(value.state);
   object(value.renderedState);
-  state$C.instances[key] = value;
+  state$B.instances[key] = value;
 };
 const getInstance = key => {
-  const fast = state$C.instances[key];
+  const fast = state$B.instances[key];
   if (fast) {
     return fast;
   }
@@ -2593,7 +2578,10 @@ const getInstance = key => {
   if (key === 'EditorText') {
     key = 'Editor';
   }
-  for (const value of Object.values(state$C.instances)) {
+  if (key === 'EditorCompletion') {
+    key = 'Editor';
+  }
+  for (const value of Object.values(state$B.instances)) {
     if (value.moduleId === key) {
       return value;
     }
@@ -2601,16 +2589,16 @@ const getInstance = key => {
   return undefined;
 };
 const hasInstance = key => {
-  return key in state$C.instances;
+  return key in state$B.instances;
 };
 const remove$8 = key => {
-  delete state$C.instances[key];
+  delete state$B.instances[key];
 };
 const getAllInstances = () => {
-  return state$C.instances;
+  return state$B.instances;
 };
 const getValues = () => {
-  return Object.values(state$C.instances);
+  return Object.values(state$B.instances);
 };
 const getState$1 = key => {
   const instance = getInstance(key);
@@ -2659,7 +2647,7 @@ const set$a = title => {
   return invoke$8('WindowTitle.set', title);
 };
 
-const state$B = {
+const state$A = {
   workspacePath: '',
   homeDir: '',
   pathSeparator: '',
@@ -2677,19 +2665,19 @@ const setPath = async path => {
   // TODO not in electron
   const pathSeparator = await getPathSeparator$9(path);
   // @ts-ignore
-  state$B.workspacePath = path;
+  state$A.workspacePath = path;
   // @ts-ignore
-  state$B.workspaceUri = path;
-  state$B.pathSeparator = pathSeparator;
+  state$A.workspaceUri = path;
+  state$A.pathSeparator = pathSeparator;
   await onWorkspaceChange();
 };
 const setUri = async uri => {
   const path = uri.slice('file://'.length);
-  state$B.workspacePath = path;
-  state$B.workspaceUri = uri;
+  state$A.workspacePath = path;
+  state$A.workspaceUri = uri;
   await onWorkspaceChange();
 };
-const close$a = () => {
+const close$9 = () => {
   return setPath('');
 };
 const getResolvedRootFromSharedProcess = async () => {
@@ -2707,12 +2695,12 @@ const getResolveRootFromSessionStorage = async () => {
   return resolvedRoot;
 };
 const isTest = () => {
-  return state$B.isTest;
+  return state$A.isTest;
 };
 const getResolvedRootFromRendererProcess = async href => {
   const url = new URL(href);
   if (href.includes('tests/')) {
-    state$B.isTest = true;
+    state$A.isTest = true;
     return {
       path: href,
       homeDir: '',
@@ -2761,7 +2749,7 @@ const getResolvedRoot = async href => {
   }
 };
 const getTitle$1 = workspacePath => {
-  const pathSeparator = state$B.pathSeparator;
+  const pathSeparator = state$A.pathSeparator;
   return workspacePath.slice(workspacePath.lastIndexOf(pathSeparator) + 1);
 };
 const getPathName = workspacePath => {
@@ -2771,41 +2759,41 @@ const getPathName = workspacePath => {
   return '';
 };
 const onWorkspaceChange = async () => {
-  const title = getTitle$1(state$B.workspacePath);
+  const title = getTitle$1(state$A.workspacePath);
   await set$a(title);
   if (platform === Web$1 || platform === Remote) {
-    const pathName = getPathName(state$B.workspacePath);
+    const pathName = getPathName(state$A.workspacePath);
     await setPathName(pathName);
   }
-  await emitEvent('workspace.change', state$B.workspacePath);
+  await emitEvent('workspace.change', state$A.workspacePath);
 };
 const hydrate$7 = async ({
   href
 }) => {
-  if (state$B.workspacePath) {
+  if (state$A.workspacePath) {
     return;
   }
   const resolvedRoot = await getResolvedRoot(href);
-  if (state$B.isTest) {
+  if (state$A.isTest) {
     return;
   }
-  if (state$B.workspacePath) {
+  if (state$A.workspacePath) {
     return;
   }
   // TODO why is this if statement here?
-  if (state$B.homeDir !== resolvedRoot.homeDir) {
-    state$B.homeDir = resolvedRoot.homeDir;
+  if (state$A.homeDir !== resolvedRoot.homeDir) {
+    state$A.homeDir = resolvedRoot.homeDir;
   }
   if (!canBeRestored$6(resolvedRoot.path)) {
     return;
   }
   // TODO how to check that path from renderer process is valid?
   // TODO also need to check whether it is a folder or file
-  state$B.workspacePath = resolvedRoot.path;
-  state$B.homeDir = resolvedRoot.homeDir;
-  state$B.pathSeparator = resolvedRoot.pathSeparator;
-  state$B.workspaceUri = resolvedRoot.uri;
-  state$B.source = resolvedRoot.source;
+  state$A.workspacePath = resolvedRoot.path;
+  state$A.homeDir = resolvedRoot.homeDir;
+  state$A.pathSeparator = resolvedRoot.pathSeparator;
+  state$A.workspaceUri = resolvedRoot.uri;
+  state$A.source = resolvedRoot.source;
   await onWorkspaceChange();
 };
 
@@ -2814,10 +2802,10 @@ const hydrate$7 = async ({
  * @returns
  */
 const getWorkspacePath = () => {
-  return state$B.workspacePath;
+  return state$A.workspacePath;
 };
 const getHomeDir = () => {
-  return state$B.homeDir;
+  return state$A.homeDir;
 };
 
 // TODO this should be in FileSystem module
@@ -2825,15 +2813,15 @@ const pathBaseName = path => {
   return path.slice(path.lastIndexOf('/') + 1);
 };
 const pathRelative = path => {
-  if (path.startsWith(state$B.workspacePath)) {
-    return path.slice(state$B.workspacePath.length + 1, path.lastIndexOf('/'));
+  if (path.startsWith(state$A.workspacePath)) {
+    return path.slice(state$A.workspacePath.length + 1, path.lastIndexOf('/'));
   }
   return path;
 };
 
 // TODO this should be in FileSystem module
 const pathDirName = path => {
-  const pathSeparator = state$B.pathSeparator || '/';
+  const pathSeparator = state$A.pathSeparator || '/';
   const index = path.lastIndexOf(pathSeparator);
   if (index === -1) {
     return EmptyString;
@@ -2842,9 +2830,9 @@ const pathDirName = path => {
 };
 const getAbsolutePath = relativePath => {
   if (relativePath.startsWith('./')) {
-    return `${state$B.workspacePath}/${relativePath.slice(2)}`; // TODO support windows paths
+    return `${state$A.workspacePath}/${relativePath.slice(2)}`; // TODO support windows paths
   }
-  return `${state$B.workspacePath}/${relativePath}`; // TODO support windows paths
+  return `${state$A.workspacePath}/${relativePath}`; // TODO support windows paths
 };
 
 const getStateToSave = () => {
@@ -2854,10 +2842,10 @@ const getStateToSave = () => {
     instances: savedInstances,
     mainEditors: [],
     workspace: {
-      path: state$B.workspacePath,
-      homeDir: state$B.homeDir,
-      pathSeparator: state$B.pathSeparator,
-      uri: state$B.workspaceUri
+      path: state$A.workspacePath,
+      homeDir: state$A.homeDir,
+      pathSeparator: state$A.pathSeparator,
+      uri: state$A.workspaceUri
     }
   };
 };
@@ -2892,14 +2880,14 @@ const getSavedViewletState = viewletId => {
   return getJson$2(viewletId);
 };
 
-const state$A = {
+const state$z = {
   idMap: Object.create(null)
 };
 const register$1 = (id, module) => {
-  state$A.idMap[id] = module;
+  state$z.idMap[id] = module;
 };
 const get$9 = id => {
-  return state$A.idMap[id];
+  return state$z.idMap[id];
 };
 
 const loadModule$3 = async (id, module) => {
@@ -2909,7 +2897,7 @@ const loadModule$3 = async (id, module) => {
     await (Array.isArray(module.Css) ? loadCssStyleSheets(module.Css) : loadCssStyleSheet(module.Css));
   }
   if (module.getDynamicCss) {
-    await addDynamicCss(id, module.getDynamicCss, state$J);
+    await addDynamicCss(id, module.getDynamicCss, state$H);
   }
 };
 
@@ -2918,17 +2906,17 @@ const ViewletManagerVisitorCss = {
   loadModule: loadModule$3
 };
 
-const state$z = {
+const state$y = {
   /**
    * @type {any[]}
    */
   menuEntries: []
 };
 const getAll = () => {
-  return state$z.menuEntries;
+  return state$y.menuEntries;
 };
 const add$1 = menuEntries => {
-  state$z.menuEntries = [...state$z.menuEntries, ...menuEntries];
+  state$y.menuEntries = [...state$y.menuEntries, ...menuEntries];
 };
 
 const loadModule$2 = (id, module) => {
@@ -2953,7 +2941,7 @@ const ActivityBar$5 = 'ActivityBar';
 const Audio$1 = 'Audio';
 const BrowserViewOverview = 'BrowserViewOverview';
 const Clock = 'Clock';
-const ColorPicker$1 = 'ColorPicker';
+const ColorPicker = 'ColorPicker';
 const Counter = 'Counter';
 const DebugConsole = 'Debug Console';
 const DefineKeyBinding = 'DefineKeyBinding';
@@ -3018,7 +3006,7 @@ const ViewletModuleId = {
   Audio: Audio$1,
   BrowserViewOverview,
   Clock,
-  ColorPicker: ColorPicker$1,
+  ColorPicker,
   Confirm: Confirm$1,
   Counter,
   DebugConsole,
@@ -3077,7 +3065,7 @@ const ViewletModuleId = {
 };
 
 // @ts-nocheck
-const state$y = {
+const state$x = {
   pendingModules: Object.create(null)
 };
 const ViewletState = {
@@ -3113,7 +3101,7 @@ const runFn = async (instance, id, key, fn, args) => {
     if (oldState === newState) {
       return;
     }
-    const commands = render$N(instance.factory, oldState, newState, newState.uid || id);
+    const commands = render$P(instance.factory, oldState, newState, newState.uid || id);
     setRenderedState(id, newState);
     await invoke$8( /* Viewlet.sendMultiple */kSendMultiple, /* commands */commands);
   } else {
@@ -3134,7 +3122,7 @@ const runFnWithSideEffect = async (instance, id, key, fn, ...args) => {
   object(newState);
   const renderedState = instance.renderedState;
   if (oldState !== newState) {
-    commands.push(...render$N(instance.factory, renderedState, newState));
+    commands.push(...render$P(instance.factory, renderedState, newState));
     setRenderedState(id, newState);
   }
   if (commands.length === 0) {
@@ -3325,7 +3313,7 @@ const maybeRegisterEvents = module => {
         }
         const uid = instance.uid || instance.state.uid;
         number(uid);
-        const commands = render$N(instance.factory, instance.renderedState, newState, uid, newState.parentUid);
+        const commands = render$P(instance.factory, instance.renderedState, newState, uid, newState.parentUid);
         instance.state = newState;
         instance.renderedState = newState;
         await invoke$8( /* Viewlet.sendMultiple */kSendMultiple, /* commands */commands);
@@ -3354,10 +3342,10 @@ const actuallyLoadModule = async (getModule, id) => {
   return module;
 };
 const loadModule = (getModule, id) => {
-  if (!(id in state$y.pendingModules)) {
-    state$y.pendingModules[id] = actuallyLoadModule(getModule, id);
+  if (!(id in state$x.pendingModules)) {
+    state$x.pendingModules[id] = actuallyLoadModule(getModule, id);
   }
-  return state$y.pendingModules[id];
+  return state$x.pendingModules[id];
 };
 
 // TODO add lots of unit tests for this
@@ -3599,7 +3587,7 @@ const load$7 = async (viewlet, focus = false, restore = false, restoreState = un
   }
   // console.timeEnd(`load/${viewlet.id}`)
 };
-const render$N = (module, oldState, newState, uid = newState.uid || module.name, parentUid = newState.parentUid) => {
+const render$P = (module, oldState, newState, uid = newState.uid || module.name, parentUid = newState.parentUid) => {
   return getRenderCommands(module, oldState, newState, uid, parentUid);
 };
 
@@ -3629,14 +3617,14 @@ const disposeBrowserViewQuickPick = () => {
   return invoke$7('ElectronBrowserViewQuickPick.disposeBrowserViewQuickPick');
 };
 
-const state$x = {
+const state$w = {
   id: 0
 };
 const set$9 = value => {
-  state$x.id = value;
+  state$w.id = value;
 };
 const get$8 = () => {
-  return state$x.id;
+  return state$w.id;
 };
 
 // TODO cache window id
@@ -3655,7 +3643,7 @@ const reload$3 = forward$2('ElectronWindow.reload');
 const minimize$2 = forward$2('ElectronWindow.minimize');
 const unmaximize$1 = forward$2('ElectronWindow.unmaximize');
 const maximize$2 = forward$2('ElectronWindow.maximize');
-const close$9 = forward$2('ElectronWindow.close');
+const close$8 = forward$2('ElectronWindow.close');
 const openNew$1 = forward$2('ElectronWindow.openNew');
 const toggleDevtools = forward$2('ElectronWindow.toggleDevtools');
 const zoomIn$1 = forward$2('ElectronWindow.zoomIn');
@@ -3732,15 +3720,15 @@ const handleKeyBinding$1 = async identifier => {
   // }
 };
 
-const state$w = {
+const state$v = {
   isQuickPickOpen: false
 };
 const isQuickPickOpen = () => {
-  return state$w.isQuickPickOpen;
+  return state$v.isQuickPickOpen;
 };
 const closeWidgetElectronQuickPick = async () => {
   const id = QuickPick;
-  state$w.isQuickPickOpen = false;
+  state$v.isQuickPickOpen = false;
   remove$8(id);
   await disposeBrowserViewQuickPick();
   // TODO restore focus to previously focused element
@@ -3756,7 +3744,7 @@ const focus$9 = async id => {
   if (instance && instance.factory.focus) {
     const oldState = instance.state;
     const newState = instance.factory.focus(oldState);
-    commands.push(...render$N(instance.factory, oldState, newState));
+    commands.push(...render$P(instance.factory, oldState, newState));
   }
   setFocusedInstance(instance);
   await invoke$8('Viewlet.sendMultiple', commands);
@@ -3862,7 +3850,7 @@ const showFunctional = id => {
   const instance = getInstance(id);
   const initialState = instance.factory.create();
   // TODO resize
-  const commands = render$N(instance.factory, initialState, instance.state);
+  const commands = render$P(instance.factory, initialState, instance.state);
   // TODO avoid side effect, instead return an array of
   // commands to send to shared process
   // @ts-ignore
@@ -3940,7 +3928,7 @@ const resize$n = (id, dimensions) => {
       // TODO handle promise rejection gracefully
       instance.factory.resizeEffect(newState);
     }
-    commands = render$N(instance.factory, instance.state, newState);
+    commands = render$P(instance.factory, instance.state, newState);
   } else {
     const result = instance.factory.resize(oldState, dimensions);
     newState = result.newState;
@@ -3958,7 +3946,7 @@ const handleFocusChange$3 = (id, isFocused) => {
   }
   const oldState = instance.state;
   const newState = instance.factory.handleFocusChange(oldState, isFocused);
-  const commands = render$N(instance.factory, instance.state, newState);
+  const commands = render$P(instance.factory, instance.state, newState);
   object(newState);
   array(commands);
   setState$1(id, newState);
@@ -3972,7 +3960,7 @@ const setStateFunctional = (id, newState) => {
   const instance = getInstance(id);
   if (instance && instance.factory && instance.factory.hasFunctionalRender) {
     const oldState = instance.state;
-    const commands = render$N(instance.factory, oldState, newState);
+    const commands = render$P(instance.factory, oldState, newState);
     instance.state = newState;
     return commands;
   }
@@ -4084,7 +4072,7 @@ const executeViewletCommand = async (uid, fnName, ...args) => {
   if (!hasInstance(uid)) {
     return;
   }
-  const commands = render$N(instance.factory, instance.renderedState, actualNewState);
+  const commands = render$P(instance.factory, instance.renderedState, actualNewState);
   if ('newState' in newState) {
     commands.push(...newState.commands);
   }
@@ -4194,7 +4182,7 @@ const getLanguageConfigurationPathFromExtensions = (extensions, languageId) => {
   return '';
 };
 const getLanguageConfigurationFromWebExtension = async languageId => {
-  const languageConfigurationPath = getLanguageConfigurationPathFromExtensions(state$E.webExtensions, languageId);
+  const languageConfigurationPath = getLanguageConfigurationPathFromExtensions(state$D.webExtensions, languageId);
   if (!languageConfigurationPath) {
     return undefined;
   }
@@ -4254,7 +4242,7 @@ const getNthFileExtension = (file, startIndex) => {
 
 // TODO merge all of this with extension host languages module
 
-const state$v = {
+const state$u = {
   loadState: false,
   isHydrating: false,
   fileNameMap: Object.create(null),
@@ -4270,53 +4258,53 @@ const state$v = {
   hasWarned: []
 };
 const getFirstLines = () => {
-  return state$v.firstLines;
+  return state$u.firstLines;
 };
 const hasLanguageByExtension = extension => {
-  return extension in state$v.extensionMap;
+  return extension in state$u.extensionMap;
 };
 const getLanguageByExtension = extension => {
-  return state$v.extensionMap[extension];
+  return state$u.extensionMap[extension];
 };
 const hasLanguageByFileName = fileName => {
-  return fileName in state$v.fileNameMap;
+  return fileName in state$u.fileNameMap;
 };
 const getLanguageByFileName = fileName => {
-  return state$v.fileNameMap[fileName];
+  return state$u.fileNameMap[fileName];
 };
 const getTokenizeFunctionPath$1 = languageId => {
   // TODO what if language.tokenize is not of type string? -> handle error gracefully
-  return state$v.tokenizerMap[languageId] || '';
+  return state$u.tokenizerMap[languageId] || '';
 };
 const setHydrating = value => {
-  state$v.isHydrating = value;
+  state$u.isHydrating = value;
 };
 const setLoaded = value => {
-  state$v.loaded = true;
+  state$u.loaded = true;
 };
 const addExtension = (extension, languageId) => {
-  state$v.extensionMap[extension] = languageId;
+  state$u.extensionMap[extension] = languageId;
 };
 const addFirstLine = (regex, languageId) => {
-  state$v.firstLines.push({
+  state$u.firstLines.push({
     regex,
     languageId
   });
 };
 const hasWarned = languageId => {
-  return state$v.hasWarned.includes(languageId);
+  return state$u.hasWarned.includes(languageId);
 };
 const addWarned = languageId => {
-  return state$v.hasWarned.push(languageId);
+  return state$u.hasWarned.push(languageId);
 };
 const addFileName = (fileName, languageId) => {
-  state$v.fileNameMap[fileName] = languageId;
+  state$u.fileNameMap[fileName] = languageId;
 };
 const addTokenizer = (languageId, tokenizer) => {
-  state$v.tokenizerMap[languageId] = tokenizer;
+  state$u.tokenizerMap[languageId] = tokenizer;
 };
 const hasLoaded$1 = () => {
-  return state$v.loaded;
+  return state$u.loaded;
 };
 
 // TODO merge all of this with extension host languages module
@@ -4506,7 +4494,7 @@ const getFileNameIcon = file => {
   string(file);
   const {
     iconTheme
-  } = state$D;
+  } = state$C;
   const fileNameLower = file.toLowerCase();
   if (!iconTheme) {
     return '';
@@ -4546,7 +4534,7 @@ const getFileIcon$3 = file => {
   return getFileNameIcon(file.name);
 };
 const getFolderNameIcon = folderName => {
-  const iconTheme = state$D.iconTheme;
+  const iconTheme = state$C.iconTheme;
   // @ts-ignore
   if (!iconTheme || !iconTheme.folderNames || !iconTheme.iconDefinitions) {
     return '';
@@ -4563,7 +4551,7 @@ const getFolderIcon = folder => {
   return getFolderNameIcon(folder.name);
 };
 const getFolderIconExpanded = folder => {
-  const iconTheme = state$D.iconTheme;
+  const iconTheme = state$C.iconTheme;
   if (!iconTheme) {
     return '';
   }
@@ -4592,7 +4580,7 @@ const getIcon$2 = dirent => {
     case CharacterDevice:
     case BlockDevice:
     case Socket:
-      return getAbsoluteIconPath(state$D.iconTheme, File$7);
+      return getAbsoluteIconPath(state$C.iconTheme, File$7);
     default:
       warn$1(`unsupported type ${dirent.type}`);
       return None$k;
@@ -4602,8 +4590,8 @@ const getIcon$2 = dirent => {
 const setIconTheme = async iconThemeId => {
   try {
     const iconTheme = await getIconThemeJson(iconThemeId);
-    state$D.iconTheme = iconTheme.json;
-    state$D.extensionPath = iconTheme.extensionPath;
+    state$C.iconTheme = iconTheme.json;
+    state$C.extensionPath = iconTheme.extensionPath;
     const instances = getAllInstances();
     // TODO have one recalculate style and one paint
     // @ts-ignore
@@ -4657,7 +4645,7 @@ const listen = method => {
 const launchSharedProcess = async () => {
   const ipc = await listen(Node);
   handleIpc(ipc);
-  state$L.ipc = ipc;
+  state$J.ipc = ipc;
 };
 
 const map$2 = Object.create(null);
@@ -4719,27 +4707,27 @@ const Fourteen = 14;
 const Fifteen = 15;
 const Sixteen = 16;
 
-const state$u = {
+const state$t = {
   listenerMap: Object.create(null),
   phase: Zero
 };
 const once = (event, listener) => {
-  if (state$u.phase >= event) {
+  if (state$t.phase >= event) {
     listener();
   } else {
     // TODO could also statically allocate listenermap at start as array[13]
-    state$u.listenerMap[event] ||= [];
-    state$u.listenerMap[event].push(listener);
+    state$t.listenerMap[event] ||= [];
+    state$t.listenerMap[event].push(listener);
   }
 };
 const mark$1 = event => {
-  const listeners = state$u.listenerMap[event] || [];
+  const listeners = state$t.listenerMap[event] || [];
   for (const listener of listeners) {
     listener();
   }
-  state$u.phase = event;
+  state$t.phase = event;
   if (event === Twelve) {
-    state$u.listenerMap = Object.create(null);
+    state$t.listenerMap = Object.create(null);
   }
 };
 
@@ -4767,7 +4755,7 @@ const load$4 = moduleId => {
       return Promise.resolve().then(function () { return Chrome_ipc; });
     case ClipBoard:
       return Promise.resolve().then(function () { return ClipBoard_ipc; });
-    case ColorPicker$2:
+    case ColorPicker$1:
       return Promise.resolve().then(function () { return ColorPicker_ipc; });
     case ColorTheme$1:
       return Promise.resolve().then(function () { return ColorTheme_ipc; });
@@ -5150,12 +5138,12 @@ const creareSessionId = () => {
   return `session-${new Date().toISOString()}`;
 };
 
-const state$t = {
+const state$s = {
   sessionId: ''
 };
 const getSessionId = () => {
-  state$t.sessionId ||= creareSessionId();
-  return state$t.sessionId;
+  state$s.sessionId ||= creareSessionId();
+  return state$s.sessionId;
 };
 
 const instanceOfAny = (object, constructors) => constructors.some(c => object instanceof c);
@@ -5445,7 +5433,7 @@ replaceTraps(oldTraps => ({
   }
 }));
 
-const state$s = {
+const state$r = {
   databases: Object.create(null),
   eventId: 0,
   dbVersion: 1,
@@ -5463,7 +5451,7 @@ const isDataCloneError = error => {
 
 const getDb$1 = async () => {
   // @ts-ignore
-  const db = await openDB('session', state$s.dbVersion, {
+  const db = await openDB('session', state$r.dbVersion, {
     async upgrade(db, oldVersion) {
       if (!db.objectStoreNames.contains('session')) {
         const objectStore = await db.createObjectStore('session', {
@@ -5478,8 +5466,8 @@ const getDb$1 = async () => {
   return db;
 };
 const getDbMemoized$1 = async () => {
-  state$s.cachedDb ||= await getDb$1();
-  return state$s.cachedDb;
+  state$r.cachedDb ||= await getDb$1();
+  return state$r.cachedDb;
 };
 const saveValue$1 = async (storeId, value) => {
   try {
@@ -5506,7 +5494,7 @@ const getValuesByIndexName$1 = async (storeId, indexName, only) => {
 };
 const getHandleDb = async () => {
   // @ts-ignore
-  const db = await openDB('handle', state$s.dbVersion, {
+  const db = await openDB('handle', state$r.dbVersion, {
     async upgrade(db, oldVersion) {
       if (!db.objectStoreNames.contains('file-handles-store')) {
         // @ts-ignore
@@ -5563,7 +5551,7 @@ const addSearchParam = (href, key, value) => {
   return parsedUrl.toString();
 };
 const replayCurrentSession = async () => {
-  if (!state$t.sessionId) {
+  if (!state$s.sessionId) {
     throw new VError('session replay is disabled in settings');
   }
   // TODO
@@ -5583,7 +5571,7 @@ const getSessionContent = async () => {
 const DONT_REPLAY = new Set(['Open.openUrl', 'Download.downloadFile']);
 const replaySession = async sessionId => {
   const events = await getEvents(sessionId);
-  const originalIpc = state$N.ipc;
+  const originalIpc = state$L.ipc;
   const originalSend = originalIpc.send.bind(originalIpc);
   const originalOnMessage = originalIpc.onmessage.bind(originalIpc);
   const wrappedSend = () => {};
@@ -5598,33 +5586,33 @@ const replaySession = async sessionId => {
     } else if ('method' in data) {
       switch (data.method) {
         case 'TitleBar.handleTitleBarButtonClickClose':
-          state$N.ipc.onmessage = originalOnMessage;
-          state$N.ipc.send = originalSend;
+          state$L.ipc.onmessage = originalOnMessage;
+          state$L.ipc.send = originalSend;
           await execute$4('ElectronWindow.close');
-          state$N.ipc.onmessage = wrappedOnMessage;
-          state$N.ipc.send = wrappedSend;
+          state$L.ipc.onmessage = wrappedOnMessage;
+          state$L.ipc.send = wrappedSend;
           break;
         case 'TitleBar.handleTitleBarButtonClickMinimize':
-          state$N.ipc.onmessage = originalOnMessage;
-          state$N.ipc.send = originalSend;
+          state$L.ipc.onmessage = originalOnMessage;
+          state$L.ipc.send = originalSend;
           await execute$4('ElectronWindow.minimize');
-          state$N.ipc.onmessage = wrappedOnMessage;
-          state$N.ipc.send = wrappedSend;
+          state$L.ipc.onmessage = wrappedOnMessage;
+          state$L.ipc.send = wrappedSend;
           break;
         case 'TitleBar.handleTitleBarButtonClickToggleMaximize':
-          state$N.ipc.onmessage = originalOnMessage;
-          state$N.ipc.send = originalSend;
+          state$L.ipc.onmessage = originalOnMessage;
+          state$L.ipc.send = originalSend;
           await execute$4('ElectronWindow.maximize');
-          state$N.ipc.onmessage = wrappedOnMessage;
-          state$N.ipc.send = wrappedSend;
+          state$L.ipc.onmessage = wrappedOnMessage;
+          state$L.ipc.send = wrappedSend;
           break;
       }
     } else {
       throw new Error('unexpected message from renderer worker');
     }
   };
-  state$N.ipc.send = wrappedSend;
-  state$N.ipc.onmessage = wrappedOnMessage;
+  state$L.ipc.send = wrappedSend;
+  state$L.ipc.onmessage = wrappedOnMessage;
   const callbacks = Object.create(null);
   const invoke = event => {
     return new Promise((resolve, reject) => {
@@ -5705,8 +5693,8 @@ const wrapIpc = (ipc, name, getData) => {
   return wrappedIpc;
 };
 const startRecording$1 = () => {
-  state$N.ipc = wrapIpc(state$N.ipc, 'renderer-process', event => event.data);
-  state$L.ipc = wrapIpc(state$L.ipc, 'shared-process', event => event);
+  state$L.ipc = wrapIpc(state$L.ipc, 'renderer-process', event => event.data);
+  state$J.ipc = wrapIpc(state$J.ipc, 'shared-process', event => event);
 };
 const openSession = async () => {
   await execute$4( /* Main.openUri */'Main.openUri', /* uri */'app://session.json');
@@ -5734,7 +5722,7 @@ const map$1 = {
   [Audio$1]: () => Promise.resolve().then(function () { return ViewletAudio_ipc; }),
   [BrowserViewOverview]: () => Promise.resolve().then(function () { return ViewletBrowserViewOverview_ipc; }),
   [Clock]: () => Promise.resolve().then(function () { return ViewletClock_ipc; }),
-  [ColorPicker$1]: () => Promise.resolve().then(function () { return ViewletColorPicker_ipc; }),
+  [ColorPicker]: () => Promise.resolve().then(function () { return ViewletColorPicker_ipc; }),
   [Confirm$1]: () => Promise.resolve().then(function () { return ViewletConfirm_ipc; }),
   [DebugConsole]: () => Promise.resolve().then(function () { return ViewletDebugConsole_ipc; }),
   [DefineKeyBinding]: () => Promise.resolve().then(function () { return ViewletDefineKeyBinding_ipc; }),
@@ -5954,7 +5942,7 @@ const GetColorThemeCssCachedLocalStorage = {
 
 // TODO high memory usage in idb because of transactionDoneMap
 
-const state$r = {
+const state$q = {
   databases: Object.create(null),
   dbVersion: 2,
   /**
@@ -5965,7 +5953,7 @@ const state$r = {
 const storeId = 'lvce-keyvalue';
 const getDb = async () => {
   // @ts-ignore
-  const db = await openDB(storeId, state$r.dbVersion, {
+  const db = await openDB(storeId, state$q.dbVersion, {
     async upgrade(db, oldVersion) {
       if (!db.objectStoreNames.contains(storeId)) {
         await db.createObjectStore(storeId, {
@@ -5977,8 +5965,8 @@ const getDb = async () => {
   return db;
 };
 const getDbMemoized = async () => {
-  state$r.cachedDb ||= await getDb();
-  return state$r.cachedDb;
+  state$q.cachedDb ||= await getDb();
+  return state$q.cachedDb;
 };
 const set$7 = async (key, value) => {
   try {
@@ -6032,8 +6020,6 @@ const GetColorThemeCssCachedNoop = {
 const BraceCompletionExecuteBraceCompletionProvider = 'ExtensionHostBraceCompletion.executeBraceCompletionProvider';
 const ClosingTagExecuteClosingTagProvider = 'ExtensionHostClosingTag.executeClosingTagProvider';
 const CommandExecute = 'ExtensionHostCommand.executeCommand';
-const CompletionExecute = 'ExtensionHostCompletion.execute';
-const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
 const DefinitionExecuteDefinitionProvider = 'ExtensionHostDefinition.executeDefinitionProvider';
 const ExtensionActivate = 'ExtensionHostExtension.activate';
 const FileSystemCreateFolder = 'ExtensionHostFileSystem.createFolder';
@@ -6120,7 +6106,7 @@ const getStaticWebExtensions = () => {
 };
 const getWebExtensionsWeb = async () => {
   const staticWebExtensions = await getStaticWebExtensions();
-  return [...staticWebExtensions, ...state$E.webExtensions];
+  return [...staticWebExtensions, ...state$D.webExtensions];
 };
 const isWebExtension = extension => {
   return extension && typeof extension.browser === 'string';
@@ -6129,7 +6115,7 @@ const getWebExtensionsDefault = async () => {
   const staticWebExtensions = await getStaticWebExtensions();
   const sharedProcessExtensions = await getSharedProcessExtensions$1();
   const sharedProcessWebExtensions = sharedProcessExtensions.filter(isWebExtension);
-  return [...staticWebExtensions, sharedProcessWebExtensions, ...state$E.webExtensions];
+  return [...staticWebExtensions, sharedProcessWebExtensions, ...state$D.webExtensions];
 };
 const getWebExtensions = async () => {
   try {
@@ -6140,7 +6126,7 @@ const getWebExtensions = async () => {
         return getWebExtensionsDefault();
     }
   } catch {
-    return state$E.webExtensions;
+    return state$D.webExtensions;
   }
 };
 
@@ -6174,7 +6160,7 @@ const addWebExtension = async path => {
     }
   }
   manifest.status = Resolved;
-  state$E.webExtensions.push(manifest);
+  state$D.webExtensions.push(manifest);
   if (manifest.languages) {
     // TODO handle case when languages is not of type array
     await addLanguages(manifest.languages);
@@ -6290,7 +6276,7 @@ const getExtensionAbsolutePath = (id, isWeb, isBuiltin, path, relativePath, orig
 
 const origin = typeof location === 'undefined' ? '' : location.origin;
 
-const state$q = {
+const state$p = {
   /**
    * @type {readonly any[]}
    */
@@ -6302,11 +6288,11 @@ const state$q = {
   activatedExtensions: Object.create(null)
 };
 const actuallyActivateExtension = async extension => {
-  if (!(extension.id in state$q.activatedExtensions)) {
+  if (!(extension.id in state$p.activatedExtensions)) {
     const absolutePath = getExtensionAbsolutePath(extension.id, extension.isWeb, extension.builtin, extension.path, extension.browser, origin);
-    state$q.activatedExtensions[extension.id] = invoke$6(ExtensionActivate, extension, absolutePath);
+    state$p.activatedExtensions[extension.id] = invoke$6(ExtensionActivate, extension, absolutePath);
   }
-  return state$q.activatedExtensions[extension.id];
+  return state$p.activatedExtensions[extension.id];
 };
 const actuallyActivateByEvent = async event => {
   // TODO should not query extensions multiple times
@@ -6332,14 +6318,14 @@ const actuallyActivateByEvent = async event => {
 const activateByEvent = async event => {
   string(event);
   if (event === 'none') {
-    const all = await Promise.all(Object.values(state$q.cachedActivationEvents));
+    const all = await Promise.all(Object.values(state$p.cachedActivationEvents));
     const flatAll = all.flat(1);
     return [flatAll[0]];
   }
-  if (!(event in state$q.cachedActivationEvents)) {
-    state$q.cachedActivationEvents[event] = actuallyActivateByEvent(event);
+  if (!(event in state$p.cachedActivationEvents)) {
+    state$p.cachedActivationEvents[event] = actuallyActivateByEvent(event);
   }
-  return state$q.cachedActivationEvents[event];
+  return state$p.cachedActivationEvents[event];
 };
 
 const executeProviders = async ({
@@ -6587,11 +6573,11 @@ const FileSystemData = {
 };
 
 const name$2m = 'Memory';
-const state$p = {
+const state$o = {
   files: Object.create(null)
 };
 const getDirent$2 = uri => {
-  return state$p.files[uri];
+  return state$o.files[uri];
 };
 const readFile$a = uri => {
   const dirent = getDirent$2(uri);
@@ -6608,7 +6594,7 @@ const ensureParentDir = uri => {
   let endIndex = uri.indexOf(Slash$1);
   while (endIndex >= 0) {
     const part = uri.slice(startIndex, endIndex + 1);
-    state$p.files[part] = {
+    state$o.files[part] = {
       type: Directory$1,
       content: ''
     };
@@ -6621,7 +6607,7 @@ const writeFile$a = (uri, content) => {
     dirent.content = content;
   } else {
     ensureParentDir(uri);
-    state$p.files[uri] = {
+    state$o.files[uri] = {
       type: File$6,
       content
     };
@@ -6632,7 +6618,7 @@ const mkdir$3 = uri => {
     uri += Slash$1;
   }
   ensureParentDir(uri);
-  state$p.files[uri] = {
+  state$o.files[uri] = {
     type: Directory$1,
     content: ''
   };
@@ -6642,13 +6628,13 @@ const getPathSeparator$5 = () => {
 };
 const remove$4 = uri => {
   const toDelete = [];
-  for (const key of Object.keys(state$p.files)) {
+  for (const key of Object.keys(state$o.files)) {
     if (key.startsWith(uri)) {
       toDelete.push(key);
     }
   }
   for (const key of toDelete) {
-    delete state$p.files[key];
+    delete state$o.files[key];
   }
 };
 const readDirWithFileTypes$4 = uri => {
@@ -6656,7 +6642,7 @@ const readDirWithFileTypes$4 = uri => {
     uri += Slash$1;
   }
   const dirents = [];
-  for (const [key, value] of Object.entries(state$p.files)) {
+  for (const [key, value] of Object.entries(state$o.files)) {
     if (key.startsWith(uri)) {
       switch (value.type) {
         case Directory$1:
@@ -6693,7 +6679,7 @@ const FileSystemMemory = {
   readDirWithFileTypes: readDirWithFileTypes$4,
   readFile: readFile$a,
   remove: remove$4,
-  state: state$p,
+  state: state$o,
   writeFile: writeFile$a
 };
 
@@ -6701,18 +6687,18 @@ const FileSystemMemory = {
 // FileSystemError
 
 const name$2l = 'Web';
-const state$o = {
+const state$n = {
   watchers: Object.create(null),
   saveListeners: [],
   files: Object.create(null)
 };
-state$o.files['/languages/index.dart'] = `void main() {
+state$n.files['/languages/index.dart'] = `void main() {
   print('Hello, World!');
 }`;
-state$o.files['/languages/index.js'] = `const add = (a, b) => {
+state$n.files['/languages/index.js'] = `const add = (a, b) => {
   return a + b;
 }`;
-state$o.files['/languages/scrolling.txt'] = `line 1
+state$n.files['/languages/scrolling.txt'] = `line 1
 line 2
 line 3
 line 4
@@ -6813,8 +6799,8 @@ line 98
 line 99
 line 100
 `;
-state$o.files['/languages/index.html'] = '<h1 class="abc">hello world</h1>';
-state$o.files['/languages/index.css'] = `h1 {
+state$n.files['/languages/index.html'] = '<h1 class="abc">hello world</h1>';
+state$n.files['/languages/index.css'] = `h1 {
   font-size: 24px;
 }
 
@@ -6834,7 +6820,7 @@ state$o.files['/languages/index.css'] = `h1 {
   tab-size: 2;
 }
 `;
-state$o.files['/languages/index.ex'] = `defmodule RealWorld do
+state$n.files['/languages/index.ex'] = `defmodule RealWorld do
   @moduledoc """
   RealWorld keeps the contexts that define your domain
   and business logic.
@@ -6842,7 +6828,7 @@ state$o.files['/languages/index.ex'] = `defmodule RealWorld do
   if it comes from the database, an external API or others.
   """
 end`;
-state$o.files['/languages/index.jl'] = `function mandelbrot(a)
+state$n.files['/languages/index.jl'] = `function mandelbrot(a)
 z = 0
 for i=1:50
 z = z^2 + a
@@ -6856,7 +6842,7 @@ abs(mandelbrot(complex(x, y))) < 2 ? print("*") : print(" ")
 end
 println()
 end`;
-state$o.files['/languages/index.pl'] = `#!/usr/bin/perl
+state$n.files['/languages/index.pl'] = `#!/usr/bin/perl
 #
 # The traditional first program.
 
@@ -6866,15 +6852,15 @@ use warnings;
 
 # Print a message.
 print "Hello, World!\n";`;
-state$o.files['/languages/index.kt'] = `fun main(args : Array<String>) {
+state$n.files['/languages/index.kt'] = `fun main(args : Array<String>) {
   println("Hello, World!")
 }`;
-state$o.files['/languages/index.java'] = `class HelloWorld {
+state$n.files['/languages/index.java'] = `class HelloWorld {
   public static void main(String[] args) {
       System.out.println("Hello, World!");
   }
 }`;
-state$o.files['/languages/index.cpp'] = `using namespace std;
+state$n.files['/languages/index.cpp'] = `using namespace std;
 
 template <class ANYTYPE>
 void thing(int a, Blah other_thing, double c=10, ANYTYPE f) {
@@ -6893,17 +6879,17 @@ int main(char arg_num, char** vargs) {
 
     #error I should be able to write single quotes in here: Don't make errors
 }`;
-state$o.files['/languages/index.env'] = 'KEY=42';
-state$o.files['/sample-folder/a.txt'] = '';
-state$o.files['/sample-folder/b.txt'] = '';
-state$o.files['/sample-folder/c.txt'] = '';
+state$n.files['/languages/index.env'] = 'KEY=42';
+state$n.files['/sample-folder/a.txt'] = '';
+state$n.files['/sample-folder/b.txt'] = '';
+state$n.files['/sample-folder/c.txt'] = '';
 
 // const getRelativePath = (path) => {
 //   return path.slice('/workspace'.length)
 // }
 
 const readFile$9 = async path => {
-  const file = state$o.files[path];
+  const file = state$n.files[path];
   if (file === undefined) {
     throw new Error(`file not found ${path}`);
   }
@@ -6925,7 +6911,7 @@ const createFolder = async path => {
   throw new Error('not implemented');
 };
 const writeFile$9 = async (path, content) => {
-  state$o.files[path] = content;
+  state$n.files[path] = content;
 };
 const getDirent$1 = (path, relativePath) => {
   const rest = path.slice(relativePath.length + 1);
@@ -6942,7 +6928,7 @@ const getDirent$1 = (path, relativePath) => {
 };
 const readDirWithFileTypes$3 = path => {
   const dirents = [];
-  for (const key in state$o.files) {
+  for (const key in state$n.files) {
     if (key.startsWith(path)) {
       const dirent = getDirent$1(key, path);
       if (!dirents.some(otherDirent => otherDirent.name === dirent.name)) {
@@ -6988,7 +6974,7 @@ const FileSystemWeb = {
   readFile: readFile$9,
   remove: remove$3,
   rename: rename$4,
-  state: state$o,
+  state: state$n,
   unwatch,
   unwatchAll,
   watch: watch$1,
@@ -6997,7 +6983,7 @@ const FileSystemWeb = {
 
 const canBeRestored$3 = true;
 const name$2k = 'Fetch';
-const state$n = {
+const state$m = {
   files: Object.create(null)
 };
 const readFile$8 = async uri => {
@@ -7057,7 +7043,7 @@ const FileSystemFetch = {
   readDirWithFileTypes: readDirWithFileTypes$2,
   readFile: readFile$8,
   remove: remove$2,
-  state: state$n,
+  state: state$m,
   writeFile: writeFile$8
 };
 
@@ -7332,13 +7318,13 @@ const getBaseName = (pathSeparator, path) => {
   return path.slice(path.lastIndexOf(pathSeparator) + 1);
 };
 
-const state$m = {
+const state$l = {
   handles: Object.create(null)
 };
 const addHandle = async (uri, handle) => {
   try {
     // TODO save handle in indexeddb
-    state$m.handles[uri] = handle;
+    state$l.handles[uri] = handle;
     await execute$4('IndexedDb.addHandle', uri, handle);
   } catch (error) {
     throw new VError(error, 'Failed to add handle');
@@ -7348,10 +7334,10 @@ const addHandles = async (parentUri, childHandles) => {
   const promises = [];
   for (const childHandle of childHandles) {
     const childUri = parentUri + '/' + childHandle.name;
-    if (childUri in state$m.handles) {
+    if (childUri in state$l.handles) {
       continue;
     }
-    state$m.handles[childUri] = childHandle;
+    state$l.handles[childUri] = childHandle;
     promises.push(addHandle(childUri, childHandle));
   }
   await Promise.all(promises);
@@ -7576,17 +7562,17 @@ class ContentSecurityPolicyError extends Error {
   }
 }
 
-const state$l = {
+const state$k = {
   /**
    * @type {any[]}
    */
   errors: []
 };
 const hasRecentErrors = () => {
-  return state$l.errors.length > 0;
+  return state$k.errors.length > 0;
 };
 const getRecentError = () => {
-  return state$l.errors.at(-1);
+  return state$k.errors.at(-1);
 };
 
 const getLineAndColumn = (text, start, end) => {
@@ -8898,9 +8884,9 @@ const formatAboutDate = isoDate => {
   return `${isoDate} (${ago})`;
 };
 
-const version = '0.31.3';
-const commit = '33562c6';
-const date = '2024-07-28T19:18:08.000Z';
+const version = '0.31.5';
+const commit = 'b6fa9db';
+const date = '2024-08-07T19:50:46.000Z';
 const getPid = () => {
   return invoke$7('Process.getPid');
 };
@@ -9426,7 +9412,7 @@ const unmaximize = () => {
       throw new Error('not implemented');
   }
 };
-const close$8 = () => {
+const close$7 = () => {
   switch (platform) {
     case Electron$1:
       return execute$4('ElectronWindow.close');
@@ -9477,7 +9463,7 @@ const zoomReset = () => {
 
 const name$29 = 'Chrome';
 const Commands$21 = {
-  close: close$8,
+  close: close$7,
   exit: exit$2,
   maximize: maximize$1,
   minimize: minimize$1,
@@ -9509,13 +9495,13 @@ const ClipBoard_ipc = {
 const open$7 = () => {
   console.log('TODO open color picker');
 };
-const close$7 = () => {
+const close$6 = () => {
   console.log('TODO close color picker');
 };
 
 const name$27 = 'ColorPicker';
 const Commands$1$ = {
-  close: close$7,
+  close: close$6,
   open: open$7
 };
 
@@ -10464,7 +10450,7 @@ const openFolder$5 = async () => {
 };
 
 // @ts-ignore
-const state$k = {
+const state$j = {
   dialog: undefined
 };
 const openFileWeb = () => {
@@ -10491,7 +10477,7 @@ const handleClick$d = async index => {
   // @ts-ignore
   const {
     options
-  } = state$k.dialog;
+  } = state$j.dialog;
   const option = options[index];
   // TODO handle case when index is out of bounds
   switch (option) {
@@ -10504,7 +10490,7 @@ const handleClick$d = async index => {
   }
 };
 const showMessage = async (message, options) => {
-  if (state$k.dialog) {
+  if (state$j.dialog) {
     console.info('cannot show multiple dialogs at the same time', message);
     return;
   }
@@ -10513,7 +10499,7 @@ const showMessage = async (message, options) => {
   // TODO on electron use native dialog
   options ||= ['Show Command Output', 'Cancel', 'Open Git Log'];
   // @ts-ignore
-  state$k.dialog = {
+  state$j.dialog = {
     message,
     options
   };
@@ -10591,7 +10577,6 @@ const Download_ipc = {
 };
 
 const OnRename = 'onRename';
-const OnCompletion = 'onCompletion';
 const OnBraceCompletion = 'onBraceCompletion';
 const OnDefinition = 'onDefinition';
 const OnFormatting = 'onFormatting';
@@ -10630,7 +10615,7 @@ const execute$2 = ({
   });
 };
 
-const combineResults$e = results => {
+const combineResults$d = results => {
   return results[0];
 };
 const executeDiagnosticProvider = editor => {
@@ -10641,7 +10626,7 @@ const executeDiagnosticProvider = editor => {
     args: [],
     noProviderFoundMessage: 'no diagnostic provider found',
     noProviderResult: [],
-    combineResults: combineResults$e
+    combineResults: combineResults$d
   });
 };
 
@@ -10688,7 +10673,7 @@ const getFontString = (fontWeight, fontSize, fontFamily) => {
   return `${fontWeight} ${fontSize}px ${fontFamily}`;
 };
 
-const state$j = {
+const state$i = {
   /**
    * @type {OffscreenCanvasRenderingContext2D|undefined|null}
    */
@@ -10700,11 +10685,11 @@ const state$j = {
  * @returns {OffscreenCanvasRenderingContext2D}
  */
 const getOrCreate$1 = createCtx => {
-  if (state$j.ctx) {
-    return state$j.ctx;
+  if (state$i.ctx) {
+    return state$i.ctx;
   }
-  state$j.ctx = createCtx();
-  return state$j.ctx;
+  state$i.ctx = createCtx();
+  return state$i.ctx;
 };
 
 const createCtx = () => {
@@ -10872,29 +10857,13 @@ const {
   invoke: invoke$5,
   invokeAndTransfer: invokeAndTransfer$4
 } = getOrCreateWorker(launchEditorWorker);
+const actualInvoke = invoke$5;
 
-// TDOO this doesn;t belong here
-const getSelectionText = (textDocument, range) => {
-  object(textDocument);
-  // console.log(range)
-  // console.log(textDocument)
-  const startRowIndex = range.start.rowIndex;
-  const startColumnIndex = range.start.columnIndex;
-  const endRowIndex = Math.min(range.end.rowIndex, textDocument.lines.length - 1);
-  const endColumnIndex = range.end.columnIndex;
-  if (startRowIndex === endRowIndex) {
-    // console.log(startRowIndex)
-    // console.log(textDocument.lines)
-    return [textDocument.lines[startRowIndex].slice(startColumnIndex, endColumnIndex)];
-  }
-  const selectedLines = [textDocument.lines[startRowIndex].slice(startColumnIndex), ...textDocument.lines.slice(startRowIndex + 1, endRowIndex), textDocument.lines[endRowIndex].slice(0, endColumnIndex)];
-  return selectedLines;
-};
 const offsetAt = async (textDocument, positionRowIndex, positionColumnIndex) => {
   object(textDocument);
   number(positionRowIndex);
   number(positionColumnIndex);
-  return invoke$5('Editor.offsetAt', textDocument, positionRowIndex, positionColumnIndex);
+  return actualInvoke('Editor.offsetAt', textDocument, positionRowIndex, positionColumnIndex);
 };
 const positionAt = (textDocument, offset) => {
   // console.log({ textDocument, offset })
@@ -11851,7 +11820,7 @@ const toElectronMenu = (map, rootId) => {
 };
 
 const menuEntries = [MenuEntriesFile, MenuEntriesEdit, MenuEntriesSelection, MenuEntriesView, MenuEntriesGo, MenuEntriesRun, MenuEntriesTerminal, MenuEntriesHelp, MenuEntriesTitleBar, MenuEntriesOpenRecent];
-const state$i = {
+const state$h = {
   commandMap: Object.create(null)
 };
 const setItems = async items => {
@@ -11873,7 +11842,7 @@ const hydrate = async () => {
     electronMenu,
     commandMap
   } = toElectronMenu(map, TitleBar$1);
-  state$i.commandMap = commandMap;
+  state$h.commandMap = commandMap;
   // console.log({ electronMenu })
   await setItems(electronMenu);
   // TODO get all menu items
@@ -11881,7 +11850,7 @@ const hydrate = async () => {
   // TODO add listener for when menu items change
 };
 const handleClick$c = async label => {
-  const commandPair = state$i.commandMap[label];
+  const commandPair = state$h.commandMap[label];
   if (!commandPair) {
     throw new Error(`no command found for ${label}`);
   }
@@ -11949,7 +11918,7 @@ const ElectronContextMenu_ipc = {
 
 const name$1S = 'ElectronWindow';
 const Commands$1J = {
-  close: close$9,
+  close: close$8,
   maximize: maximize$2,
   minimize: minimize$2,
   openNew: openNew$1,
@@ -11993,7 +11962,7 @@ const Exit_ipc = {
 };
 
 const STATUS_OFF = 0;
-const state$h = {
+const state$g = {
   status: STATUS_OFF,
   // TODO should be an enum state
   /**
@@ -12024,9 +11993,9 @@ const getWebExtensionManifest = async path => {
   };
 };
 const loadWebExtension = async path => {
-  object(state$h.extensionHostWorker);
+  object(state$g.extensionHostWorker);
   const manifest = await getWebExtensionManifest(path);
-  state$h.webExtensions.push(manifest);
+  state$g.webExtensions.push(manifest);
   // TODO use invoke
   // await new Promise((resolve) => {
   //   setTimeout(resolve, 120)
@@ -12200,7 +12169,7 @@ const IconTheme_ipc = {
   name: name$1J
 };
 
-const state$g = {
+const state$f = {
   uri: '',
   versionId: 0
 };
@@ -12212,11 +12181,11 @@ const TREE_ITEM_HEIGHT = 22;
 const TOP = TRIANGLE_OFFSET_TOP + (TREE_ITEM_HEIGHT - TRIANGLE_HEIGHT) / 2;
 const show$8 = async (uri, top, left) => {
   try {
-    const version = ++state$g.versionId;
+    const version = ++state$f.versionId;
     // TODO what to do on web? probably need to create blob url
     // or use https url for external images
     const blobUrl = await getBlobUrl$2(uri);
-    if (version !== state$g.versionId) {
+    if (version !== state$f.versionId) {
       return;
     }
     await invoke$8( /* Viewlet.hydrate */3028, /* id */'ImagePreview', /* imageUrl */blobUrl, /* top */top - TOP, /* left */left - WIDTH - SPACE);
@@ -12226,7 +12195,7 @@ const show$8 = async (uri, top, left) => {
   }
 };
 const hide$4 = async () => {
-  ++state$g.versionId;
+  ++state$f.versionId;
   await invoke$8( /* Viewlet.dispose */'Viewlet.dispose', /* id */'ImagePreview');
 };
 
@@ -12246,7 +12215,8 @@ const ImagePreview_ipc = {
 
 const name$1H = 'Focus';
 const Commands$1y = {
-  setFocus: setFocus
+  setFocus: setFocus,
+  setAdditionalFocus: setAdditionalFocus
 };
 
 const Focus_ipc = {
@@ -12279,24 +12249,24 @@ const getRipGrepArgs = ({
   return ripGrepArgs;
 };
 
-const state$f = {
+const state$e = {
   searches: Object.create(null)
 };
 const handleFinished = id => {
-  const search = state$f.searches[id];
+  const search = state$e.searches[id];
   if (!search) {
     return;
   }
   search.dispatchEvent(new Event('finished'));
-  delete state$f.searches[id];
+  delete state$e.searches[id];
 };
 const handleExit = id => {
-  const search = state$f.searches[id];
+  const search = state$e.searches[id];
   if (!search) {
     return;
   }
   search.dispatchEvent(new Event('exit'));
-  delete state$f.searches[id];
+  delete state$e.searches[id];
 };
 class RawDataEvent extends Event {
   constructor(data) {
@@ -12305,23 +12275,23 @@ class RawDataEvent extends Event {
   }
 }
 const handleData$2 = (id, data) => {
-  const search = state$f.searches[id];
+  const search = state$e.searches[id];
   if (!search) {
     return;
   }
   search.dispatchEvent(new RawDataEvent(data));
-  delete state$f.searches[id];
+  delete state$e.searches[id];
 };
 const handleCanceled = id => {
-  const search = state$f.searches[id];
+  const search = state$e.searches[id];
   if (!search) {
     return;
   }
   search.dispatchEvent(new Event('canceled'));
-  delete state$f.searches[id];
+  delete state$e.searches[id];
 };
 const handleError$2 = (id, error) => {
-  const search = state$f.searches[id];
+  const search = state$e.searches[id];
   if (!search) {
     return;
   }
@@ -12416,15 +12386,15 @@ const KeyBindingsInitial_ipc = {
   name: name$1C
 };
 
-const state$e = Object.create(null);
+const state$d = Object.create(null);
 const register = listener => {
   const id = create$19();
-  state$e[id] = listener;
+  state$d[id] = listener;
   return id;
 };
 const execute$1 = (id, ...args) => {
   number(id);
-  const listener = state$e[id];
+  const listener = state$d[id];
   if (!listener) {
     warn$1(`listener with id ${id} not found`);
     return;
@@ -12528,7 +12498,7 @@ const getMenuEntries$j = async (id, ...args) => {
 };
 
 const addKeyBindings = menuEntries => {
-  const keyBindings = state$F.matchingKeyBindings;
+  const keyBindings = state$E.matchingKeyBindings;
   const newMenuEntries = [];
   for (const menuEntry of menuEntries) {
     const keyBinding = getCommandKeyBinding(keyBindings, menuEntry.command, menuEntry.args);
@@ -12583,13 +12553,6 @@ const Chevron = 'Chevron';
 const ChevronRight = 'ChevronRight';
 const CloseMaskIcon = 'MaskIcon MaskIconClose';
 const ColoredMaskIcon = 'ColoredMaskIcon';
-const ColorPicker = 'ColorPicker';
-const ColorPickerBackgroundColor = 'ColorPickerBackgroundColor';
-const ColorPickerDark = 'ColorPickerDark';
-const ColorPickerLight = 'ColorPickerLight';
-const ColorPickerRectangle = 'ColorPickerRectangle';
-const ColorPickerSlider = 'ColorPickerSlider';
-const ColorPickerSliderThumb = 'ColorPickerSliderThumb';
 const DebugButton$1 = 'DebugButton';
 const DebugButtons = 'DebugButtons';
 const DebugConsoleBottom = 'DebugConsoleBottom';
@@ -12660,12 +12623,6 @@ const FocusOutline = 'FocusOutline';
 const Highlight = 'Highlight';
 const HighlightDeleted = 'HighlightDeleted';
 const HighlightInserted = 'HighlightInserted';
-const HoverDisplayString = 'HoverDisplayString';
-const HoverDocumentation = 'HoverDocumentation';
-const HoverEditorRow = 'HoverEditorRow';
-const HoverProblem = 'HoverProblem';
-const HoverProblemDetail = 'HoverProblemDetail';
-const HoverProblemMessage = 'HoverProblemMessage';
 const Icon = 'Icon';
 const IconButton = 'IconButton';
 const IconButtonDisabled = 'IconButtonDisabled';
@@ -13346,7 +13303,7 @@ const getVisible$2 = (items, focusedIndex, expanded, level) => {
   return visibleItems;
 };
 
-const state$d = {
+const state$c = {
   /**
    * @type {any[]}
    */
@@ -13377,16 +13334,16 @@ const getMenuHeight = items => {
   return height;
 };
 const getCurrentMenu = () => {
-  if (state$d.menus.length === 0) {
+  if (state$c.menus.length === 0) {
     warn$1('menu not available');
   }
-  return state$d.menus.at(-1);
+  return state$c.menus.at(-1);
 };
 const addMenuInternal = menu => {
-  if (state$d.menus.length > 5) {
+  if (state$c.menus.length > 5) {
     throw new Error('too many menus');
   }
-  state$d.menus.push(menu);
+  state$c.menus.push(menu);
   return menu;
 };
 const getMenuBounds = (x, y, items) => {
@@ -13418,7 +13375,7 @@ const show$7 = async (x, y, id, mouseBlocking = false, ...args) => {
     id,
     items,
     focusedIndex: -1,
-    level: state$d.menus.length,
+    level: state$c.menus.length,
     x: bounds.x,
     y: bounds.y
   });
@@ -13428,15 +13385,15 @@ const show$7 = async (x, y, id, mouseBlocking = false, ...args) => {
 };
 const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
   // TODO delete old menus
-  state$d.menus = state$d.menus.slice(0, level + 1);
-  const parentMenu = state$d.menus[level];
+  state$c.menus = state$c.menus.slice(0, level + 1);
+  const parentMenu = state$c.menus[level];
   const item = parentMenu.items[index];
   const subMenuItems = await getMenuEntries$j(item.id);
   const subMenu = addMenuInternal({
     id: item.id,
     items: subMenuItems,
     focusedIndex: -1,
-    level: state$d.menus.length,
+    level: state$c.menus.length,
     y: parentMenu.y + index * 25,
     x: parentMenu.x + MENU_WIDTH,
     enterX,
@@ -13482,7 +13439,7 @@ const getSelectIndexFunction = flags => {
   }
 };
 const selectIndex$5 = async (level, index) => {
-  const menu = state$d.menus[level];
+  const menu = state$c.menus[level];
   // TODO avoid assignment
   menu.focusedIndex = index;
   const item = menu.items[menu.focusedIndex];
@@ -13490,8 +13447,8 @@ const selectIndex$5 = async (level, index) => {
   fn(menu, item, index);
 };
 const selectItem$1 = text => {
-  for (let level = 0; level < state$d.menus.length; level++) {
-    const menu = state$d.menus[level];
+  for (let level = 0; level < state$c.menus.length; level++) {
+    const menu = state$c.menus[level];
     for (let i = 0; i < menu.items.length; i++) {
       const item = menu.items[i];
       if (item.label === text) {
@@ -13502,10 +13459,10 @@ const selectItem$1 = text => {
   throw new Error(`menu item not found: ${text}`);
 };
 const hide$3 = async (restoreFocus = true) => {
-  if (state$d.menus.length === 0) {
+  if (state$c.menus.length === 0) {
     return;
   }
-  state$d.menus = [];
+  state$c.menus = [];
   await invoke$8( /* Menu.hide */'Menu.hide', /* restoreFocus */restoreFocus);
 };
 
@@ -13514,8 +13471,8 @@ const hide$3 = async (restoreFocus = true) => {
 // with keyboard -> don't open submenu, only focus
 
 const hideSubMenus = async level => {
-  if (level < state$d.menus.length) {
-    state$d.menus = state$d.menus.slice(0, level + 1);
+  if (level < state$c.menus.length) {
+    state$c.menus = state$c.menus.slice(0, level + 1);
     await invoke$8( /* Menu.hideSubMenu */'Menu.hideSubMenu', /* level */level + 1);
   }
 };
@@ -13524,21 +13481,21 @@ const resolveAfterTimeout = fn => {
   setTimeout(fn, MENU_DELAY_TRIANGLE);
 };
 const handleMouseEnter$1 = async (level, index, enterX, enterY, enterTimeStamp) => {
-  state$d.latestTimeStamp = enterTimeStamp;
-  if (level >= state$d.menus.length) {
+  state$c.latestTimeStamp = enterTimeStamp;
+  if (level >= state$c.menus.length) {
     return;
   }
-  const menu = state$d.menus[level];
+  const menu = state$c.menus[level];
   if (menu.focusedIndex === index) {
     return;
   }
-  if (level < state$d.menus.length - 1) {
-    const subMenu = state$d.menus[level + 1];
+  if (level < state$c.menus.length - 1) {
+    const subMenu = state$c.menus[level + 1];
     const subMenuEnterX = subMenu.enterX;
     // TODO should check for triangle position here
     if (enterX >= subMenuEnterX) {
       await new Promise(resolveAfterTimeout);
-      if (state$d.latestTimeStamp !== enterTimeStamp) {
+      if (state$c.latestTimeStamp !== enterTimeStamp) {
         return;
       }
     }
@@ -13555,7 +13512,7 @@ const handleMouseEnter$1 = async (level, index, enterX, enterY, enterTimeStamp)
   }
 };
 const handleMouseLeave$1 = async () => {
-  const menu = state$d.menus[0];
+  const menu = state$c.menus[0];
   if (menu.items.length === 0) {
     return;
   }
@@ -13765,18 +13722,18 @@ const HandleMaximized = 'handleMaximized';
 const HandleUnmaximized = 'handleUnmaximized';
 const HandleMinimized = 'handleMinimized';
 
-const state$c = {
+const state$b = {
   isMaximized: false,
   isMinimized: false
 };
 const setMaximized = value => {
-  state$c.isMaximized = value;
+  state$b.isMaximized = value;
 };
 const setMinimized = value => {
-  state$c.isMinimized = value;
+  state$b.isMinimized = value;
 };
 const isMaximized = () => {
-  return state$c.isMaximized;
+  return state$b.isMaximized;
 };
 
 const handleMaximized = () => {
@@ -13813,7 +13770,7 @@ const PART_PANEL = 3;
 const PART_STATUS_BAR = 4;
 const PART_SIDE_BAR = 5;
 const PART_ACTIVITY_BAR = 6;
-const state$b = {
+const state$a = {
   focusedPart: PART_TITLE_BAR
 };
 const focusActivityBar = async () => {
@@ -13835,8 +13792,8 @@ const focusMain = async () => {
   await invoke$8( /* Main.focus */2145);
 };
 const focusPart = part => {
-  state$b.focusedPart = part;
-  switch (state$b.focusedPart) {
+  state$a.focusedPart = part;
+  switch (state$a.focusedPart) {
     case PART_TITLE_BAR:
       return focusTitleBar();
     case PART_MAIN:
@@ -13903,7 +13860,7 @@ const getVisiblePartPrevious = part => {
 };
 const getCurrentPart = () => {
   // TODO ask renderer process
-  return state$b.focusedPart;
+  return state$a.focusedPart;
 };
 const focusNextPart = async () => {
   const currentPart = getCurrentPart();
@@ -13934,12 +13891,12 @@ const Navigation_ipc = {
   name: name$1x
 };
 
-const state$a = {
+const state$9 = {
   notifications: []
 };
 const create$X = async (type, text) => {
   // @ts-ignore
-  state$a.notifications.push({
+  state$9.notifications.push({
     type,
     text
   });
@@ -13947,7 +13904,7 @@ const create$X = async (type, text) => {
 };
 const showWithOptions = async (type, text, options) => {
   // @ts-ignore
-  state$a.notifications.push({
+  state$9.notifications.push({
     type,
     text,
     options
@@ -13956,7 +13913,7 @@ const showWithOptions = async (type, text, options) => {
 };
 const handleClick$b = index => {
   console.log('handle click');
-  const notification = state$a.notifications[0];
+  const notification = state$9.notifications[0];
   if (!notification.options) {
     throw new Error('notification has no options that can be clicked');
   }
@@ -14287,7 +14244,7 @@ const Viewlet_ipc = {
 
 const name$1f = 'Window';
 const Commands$15 = {
-  close: close$8,
+  close: close$7,
   exit: exit$2,
   maximize: maximize$1,
   minimize: minimize$1,
@@ -14309,7 +14266,7 @@ const Commands$14 = {
   hydrate: hydrate$7,
   setPath: setPath,
   setUri: setUri,
-  close: close$a
+  close: close$9
 };
 
 const Workspace_ipc = {
@@ -14533,7 +14490,7 @@ const FileWatcher_ipc = {
   name: name$14
 };
 
-const combineResults$d = results => {
+const combineResults$c = results => {
   return results[0];
 };
 const executeGrowSelection = (editor, positions) => {
@@ -14543,7 +14500,7 @@ const executeGrowSelection = (editor, positions) => {
     method: SelectionExecuteSelectionProvider,
     args: [positions],
     noProviderFoundMessage: 'no selection provider found',
-    combineResults: combineResults$d
+    combineResults: combineResults$c
   });
 };
 
@@ -14558,7 +14515,7 @@ const ExtensionHostSelection_ipc = {
   name: name$13
 };
 
-const combineResults$c = results => {
+const combineResults$b = results => {
   return results[0];
 };
 const executeBraceCompletionProvider = (editor, offset, openingBrace) => {
@@ -14572,7 +14529,7 @@ const executeBraceCompletionProvider = (editor, offset, openingBrace) => {
     args: [offset, openingBrace],
     noProviderFoundMessage: 'no brace completion providers found',
     noProviderFoundResult: undefined,
-    combineResults: combineResults$c
+    combineResults: combineResults$b
   });
 };
 
@@ -14587,7 +14544,7 @@ const ExtensionHostBraceCompletion_ipc = {
   name: name$12
 };
 
-const combineResults$b = results => {
+const combineResults$a = results => {
   return results[0];
 };
 const executeDefinitionProvider = (editor, offset) => {
@@ -14597,7 +14554,7 @@ const executeDefinitionProvider = (editor, offset) => {
     method: DefinitionExecuteDefinitionProvider,
     args: [offset],
     noProviderFoundMessage: 'no definition provider found',
-    combineResults: combineResults$b
+    combineResults: combineResults$a
   });
 };
 
@@ -14612,7 +14569,7 @@ const ExtensionHostDefinition_ipc = {
   name: name$11
 };
 
-const combineResults$a = results => {
+const combineResults$9 = results => {
   return results[0];
 };
 const executeTypeDefinitionProvider = (editor, offset) => {
@@ -14623,7 +14580,7 @@ const executeTypeDefinitionProvider = (editor, offset) => {
     args: [offset],
     noProviderFoundMessage: 'No type definition provider found',
     noProviderFoundResult: undefined,
-    combineResults: combineResults$a
+    combineResults: combineResults$9
   });
 };
 
@@ -14638,7 +14595,7 @@ const ExtensionHostTypeDefinition_ipc = {
   name: name$10
 };
 
-const combineResults$9 = results => {
+const combineResults$8 = results => {
   return results[0] ?? [];
 };
 const executeOrganizeImports = editor => {
@@ -14649,7 +14606,7 @@ const executeOrganizeImports = editor => {
     args: [],
     noProviderFoundMessage: 'no code actions provider found',
     noProviderFoundResult: [],
-    combineResults: combineResults$9
+    combineResults: combineResults$8
   });
 };
 
@@ -14664,7 +14621,7 @@ const ExtensionHostOrganizeImports_ipc = {
   name: name$$
 };
 
-const combineResults$8 = results => {
+const combineResults$7 = results => {
   return results[0];
 };
 const executeTabCompletionProvider = (editor, offset) => {
@@ -14674,7 +14631,7 @@ const executeTabCompletionProvider = (editor, offset) => {
     method: TabCompletionExecuteTabCompletionProvider,
     args: [offset],
     noProviderFoundMessage: 'No tab completion provider found',
-    combineResults: combineResults$8,
+    combineResults: combineResults$7,
     noProviderFoundResult: undefined
   });
 };
@@ -14690,7 +14647,7 @@ const ExtensionHostTabCompletion_ipc = {
   name: name$_
 };
 
-const combineResults$7 = results => {
+const combineResults$6 = results => {
   return results[0];
 };
 const executeClosingTagProvider = (editor, offset, openingBrace) => {
@@ -14699,7 +14656,7 @@ const executeClosingTagProvider = (editor, offset, openingBrace) => {
     event: OnClosingTag,
     method: ClosingTagExecuteClosingTagProvider,
     args: [offset, openingBrace],
-    combineResults: combineResults$7,
+    combineResults: combineResults$6,
     noProviderFoundMessage: ''
   });
 };
@@ -14732,7 +14689,7 @@ const SendMessagePortToRendererProcess_ipc = {
   name: name$Y
 };
 
-const combineResults$6 = results => {
+const combineResults$5 = results => {
   return results[0];
 };
 const executeHoverProvider = (editor, offset) => {
@@ -14744,7 +14701,7 @@ const executeHoverProvider = (editor, offset) => {
     method: HoverExecute,
     args: [offset],
     noProviderFoundMessage: 'No hover provider found',
-    combineResults: combineResults$6
+    combineResults: combineResults$5
   });
 };
 
@@ -15002,7 +14959,6 @@ const HandlePointerDown = 'handlePointerDown';
 const HandlePointerOut = 'handlePointerOut';
 const HandlePointerOver = 'handlePointerOver';
 const HandleReadmeContextMenu = 'handleReadmeContextMenu';
-const HandleSashPointerDown = 'handleSashPointerDown';
 const HandleTableClick = 'handleTableClick';
 const HandleTableDoubleClick = 'handleTableDoubleClick';
 const HandleTitleBarButtonsClick = 'handleTitleBarButtonsClick';
@@ -15144,7 +15100,7 @@ const renderFocus$5 = {
     return ['setFocused', selector];
   }
 };
-const render$M = [renderDialog$1, renderFocus$5];
+const render$O = [renderDialog$1, renderFocus$5];
 
 const ViewletAbout_ipc = {
   __proto__: null,
@@ -15162,7 +15118,7 @@ const ViewletAbout_ipc = {
   hasFunctionalRootRender: hasFunctionalRootRender$o,
   loadContent: loadContent$Q,
   name: name$T,
-  render: render$M,
+  render: render$O,
   renderDialog: renderDialog$1,
   renderFocus: renderFocus$5
 };
@@ -15450,7 +15406,7 @@ const Commands$I = {
 };
 
 // prettier-ignore
-const LazyCommands$j = {
+const LazyCommands$i = {
   focus: () => Promise.resolve().then(function () { return ViewletActivityBarFocus; }),
   focusFirst: () => Promise.resolve().then(function () { return ViewletActivityBarFocusFirst; }),
   focusIndex: () => Promise.resolve().then(function () { return ViewletActivityBarFocusIndex; }),
@@ -15810,7 +15766,7 @@ const renderItems$5 = {
     return ['Viewlet.setDom2', dom];
   }
 };
-const render$L = [renderItems$5];
+const render$N = [renderItems$5];
 
 const getFilteredActivityBarItems = (items, height, itemHeight) => {
   const numberOfVisibleItems = getNumberOfVisibleItems$1({
@@ -15852,7 +15808,7 @@ const ViewletActivityBar_ipc = {
   Commands: Commands$I,
   Css: Css$J,
   Events: Events$6,
-  LazyCommands: LazyCommands$j,
+  LazyCommands: LazyCommands$i,
   Variables: Variables$9,
   create: create$U,
   focus: focus$8,
@@ -15868,7 +15824,7 @@ const ViewletActivityBar_ipc = {
   loadContent: loadContent$P,
   menus: menus$c,
   name: name$S,
-  render: render$L,
+  render: render$N,
   resize: resize$m,
   saveState: saveState$d,
   toggleActivityBarItem,
@@ -15995,7 +15951,7 @@ const renderAudio = {
     return ['Viewlet.setDom2', dom];
   }
 };
-const render$K = [renderAudio];
+const render$M = [renderAudio];
 
 const name$R = 'Audio';
 
@@ -16010,7 +15966,7 @@ const ViewletAudio_ipc = {
   hasFunctionalRootRender: hasFunctionalRootRender$m,
   loadContent: loadContent$O,
   name: name$R,
-  render: render$K
+  render: render$M
 };
 
 const create$S = (id, uri, x, y, width, height) => {
@@ -16054,7 +16010,7 @@ const renderOverview = {
     return ['setDom', dom];
   }
 };
-const render$J = [renderOverview];
+const render$L = [renderOverview];
 
 const Css$H = ["/css/parts/ViewletBrowserViewOverview.css"];
 
@@ -16064,7 +16020,7 @@ const ViewletBrowserViewOverview_ipc = {
   create: create$S,
   hasFunctionalRender: hasFunctionalRender$H,
   loadContent: loadContent$N,
-  render: render$J
+  render: render$L
 };
 
 const create$R = (id, uri, x, y, width, height) => {
@@ -16104,22 +16060,44 @@ const ViewletClock_ipc = {
   name: name$Q
 };
 
-const create$Q = () => {
+const create$Q = uid => {
   return {
     color: '',
     offsetX: 0,
     min: 0,
-    max: 0
+    max: 0,
+    commands: [],
+    uid
   };
 };
-const loadContent$L = state => {
-  return invoke$5('ColorPicker.loadContent', state);
+const render$K = async (oldState, newState) => {
+  // @ts-ignore
+  const commands = await actualInvoke('ColorPicker.render', oldState, newState);
+  return commands;
+};
+const loadContent$L = async state => {
+  const newState = await actualInvoke('ColorPicker.loadContent', state);
+  const commands = await render$K(state, newState);
+  return {
+    ...newState,
+    commands
+  };
 };
-const handleSliderPointerDown = (state, x, y) => {
-  return invoke$5('ColorPicker.handleSliderPointerDown', state, x, y);
+const handleSliderPointerDown = async (state, x, y) => {
+  const newState = await actualInvoke('ColorPicker.handleSliderPointerDown', state, x, y);
+  const commands = await render$K(state, newState);
+  return {
+    ...newState,
+    commands
+  };
 };
-const handleSliderPointerMove = (state, x, y) => {
-  return invoke$5('ColorPicker.handleSliderPointerMove', state, x, y);
+const handleSliderPointerMove = async (state, x, y) => {
+  const newState = await actualInvoke('ColorPicker.handleSliderPointerMove', state, x, y);
+  const commands = await render$K(state, newState);
+  return {
+    ...newState,
+    commands
+  };
 };
 
 // prettier-ignore
@@ -16129,101 +16107,42 @@ const Commands$F = {
 };
 
 // prettier-ignore
-const LazyCommands$i = {};
+const LazyCommands$h = {};
 
 const Css$G = ["/css/parts/ViewletColorPicker.css"];
 const Variables$8 = ['MainBackground', 'ColorPickerColor'];
 
 const name$P = 'ColorPicker';
 
-const getColorPickerVirtualDom = () => {
-  return [{
-    type: Div$1,
-    className: mergeClassNames(Viewlet, ColorPicker),
-    onPointerDown: HandlePointerDown,
-    childCount: 3
-  }, {
-    type: Div$1,
-    className: ColorPickerRectangle,
-    childCount: 3
-  }, {
-    type: Div$1,
-    className: ColorPickerBackgroundColor,
-    childCount: 0
-  }, {
-    type: Div$1,
-    className: ColorPickerLight,
-    childCount: 0
-  }, {
-    type: Div$1,
-    className: ColorPickerDark,
-    childCount: 0
-  }, {
-    type: Div$1,
-    className: ColorPickerSlider,
-    childCount: 0
-  }, {
-    type: Div$1,
-    className: ColorPickerSliderThumb,
-    childCount: 0
-  }];
-};
-
-const SetBounds = 'setBounds';
-const SetColor = 'setColor';
-const SetContentHeight = 'setContentHeight';
-const SetCursorOffset = 'setCursorOffset';
-const SetDragging = 'setDragging';
-const SetFocused = 'setFocused';
-const SetFocusedIndex = 'setFocusedIndex';
-const SetItemsHeight = 'setItemsHeight';
-const SetMenus = 'setMenus';
-const SetMessage = 'setMessage';
-const SetNegativeMargin = 'setNegativeMargin';
-const SetOffsetX = 'setOffsetX';
-const SetScrollBar = 'setScrollBar';
-const SetSearchValue = 'setSearchValue';
-const SetSize = 'setSize';
-const SetText = 'setText';
-const SetTitle = 'setTitle';
-const SetTransform = 'setTransform';
-const SetValue = 'setValue';
-const SetInputValue = 'setInputValue';
-
 const hasFunctionalRender$G = true;
 const hasFunctionalRootRender$l = true;
-const renderColor = {
-  isEqual(oldState, newState) {
-    return oldState.color === newState.color;
-  },
-  apply(oldState, newState) {
-    return [/* method */SetColor, /* color */newState.color];
-  }
-};
-const renderOffsetX = {
+const renderAll$2 = {
   isEqual(oldState, newState) {
-    return oldState.offsetX === newState.offsetX;
+    return newState.commands && newState.commands.length === 0;
   },
   apply(oldState, newState) {
-    return [/* method */SetOffsetX, /* offsetX */newState.offsetX];
-  }
-};
-const renderColorPicker = {
-  isEqual(oldState, newState) {
-    return oldState.min === newState.min && oldState.max === newState.max;
+    const commands = newState.commands;
+    newState.commands = [];
+    if (!commands) {
+      return [];
+    }
+    const adjustedCommands = commands.map(command => {
+      if (command[0] === 'Viewlet.setDom2') {
+        return ['Viewlet.setDom2', newState.uid, ...command.slice(1)];
+      }
+      return ['Viewlet.send', newState.uid, ...command];
+    });
+    return adjustedCommands;
   },
-  apply(oldState, newState) {
-    const dom = getColorPickerVirtualDom();
-    return ['Viewlet.setDom2', dom];
-  }
+  multiple: true
 };
-const render$I = [renderColorPicker, renderColor, renderOffsetX];
+const render$J = [renderAll$2];
 
 const ViewletColorPicker_ipc = {
   __proto__: null,
   Commands: Commands$F,
   Css: Css$G,
-  LazyCommands: LazyCommands$i,
+  LazyCommands: LazyCommands$h,
   Variables: Variables$8,
   create: create$Q,
   handleSliderPointerDown,
@@ -16232,7 +16151,7 @@ const ViewletColorPicker_ipc = {
   hasFunctionalRootRender: hasFunctionalRootRender$l,
   loadContent: loadContent$L,
   name: name$P,
-  render: render$I
+  render: render$J
 };
 
 const create$P = () => {
@@ -16305,7 +16224,7 @@ const renderFocus$4 = {
     return ['setFocused', newState.focused];
   }
 };
-const render$H = [renderDialog, renderFocus$4];
+const render$I = [renderDialog, renderFocus$4];
 
 const name$O = 'Confirm';
 
@@ -16323,7 +16242,7 @@ const ViewletConfirm_ipc = {
   hasFunctionalRootRender: hasFunctionalRootRender$k,
   loadContent: loadContent$K,
   name: name$O,
-  render: render$H,
+  render: render$I,
   renderDialog,
   renderFocus: renderFocus$4
 };
@@ -16448,7 +16367,7 @@ const renderText$1 = {
     return ['setDom', dom];
   }
 };
-const render$G = [renderText$1];
+const render$H = [renderText$1];
 
 const Button = 1;
 const Select = 2;
@@ -16632,7 +16551,7 @@ const ViewletDebugConsole_ipc = {
   hasFunctionalRender: hasFunctionalRender$E,
   loadContent: loadContent$J,
   name: name$N,
-  render: render$G,
+  render: render$H,
   renderActions: renderActions$a
 };
 
@@ -16813,7 +16732,7 @@ const renderDom$2 = {
     return ['Viewlet.setDom2', dom];
   }
 };
-const render$F = [renderDom$2, renderValue$5, renderFocus$3];
+const render$G = [renderDom$2, renderValue$5, renderFocus$3];
 
 const ViewletDefineKeyBinding_ipc = {
   __proto__: null,
@@ -16825,7 +16744,7 @@ const ViewletDefineKeyBinding_ipc = {
   hasFunctionalRender: hasFunctionalRender$D,
   hasFunctionalRootRender: hasFunctionalRootRender$j,
   loadContent: loadContent$I,
-  render: render$F
+  render: render$G
 };
 
 const create$M = () => {
@@ -16932,7 +16851,7 @@ const renderStack = {
     return [/* method */'setErrorStack', newState.stack];
   }
 };
-const render$E = [renderHeader$1, renderButtons, renderCodeFrame, renderMessage$4, renderStack];
+const render$F = [renderHeader$1, renderButtons, renderCodeFrame, renderMessage$4, renderStack];
 
 const name$M = 'Dialog';
 
@@ -16946,7 +16865,7 @@ const ViewletDialog_ipc = {
   hasFunctionalRender: hasFunctionalRender$C,
   loadContent: loadContent$H,
   name: name$M,
-  render: render$E
+  render: render$F
 };
 
 const diffWorkerUrl = `${assetDir}/packages/diff-worker/dist/diffWorkerMain.js`;
@@ -17033,7 +16952,7 @@ const TokenizePlainText = {
   tokenizeLine
 };
 
-const state$9 = {
+const state$8 = {
   tokenizers: Object.create(null),
   tokenizePaths: Object.create(null),
   listeners: [],
@@ -17044,26 +16963,26 @@ const state$9 = {
   connectedEditors: []
 };
 const has = languageId => {
-  return languageId in state$9.tokenizers;
+  return languageId in state$8.tokenizers;
 };
 const set$2 = (languageId, tokenizer) => {
-  state$9.tokenizers[languageId] = tokenizer;
+  state$8.tokenizers[languageId] = tokenizer;
 };
 const get$3 = languageId => {
-  return state$9.tokenizers[languageId];
+  return state$8.tokenizers[languageId];
 };
 const isPending = languageId => {
-  return languageId in state$9.pending;
+  return languageId in state$8.pending;
 };
 const removeConnectedEditor$1 = id => {
-  const index = state$9.connectedEditors.indexOf(id);
+  const index = state$8.connectedEditors.indexOf(id);
   if (index === -1) {
     return;
   }
-  state$9.connectedEditors.splice(index, 1);
+  state$8.connectedEditors.splice(index, 1);
 };
 const isConnectedEditor = id => {
-  return state$9.connectedEditors.includes(id);
+  return state$8.connectedEditors.includes(id);
 };
 
 const tokenizers = Object.create(null);
@@ -17326,7 +17245,7 @@ const loadContent$G = async (state, savedState) => {
 const Commands$A = {};
 
 // prettier-ignore
-const LazyCommands$h = {
+const LazyCommands$g = {
   setDeltaY: () => Promise.resolve().then(function () { return VirtualListSetDeltaY; }),
   handleWheel: () => Promise.resolve().then(function () { return VirtualListHandleWheel; })
 };
@@ -17335,7 +17254,7 @@ const create$J = (key, value, unit = '') => {
   return `--${key}: ${value}${unit};`;
 };
 
-const Css$B = [];
+const Css$B = ["/css/parts/Symbol.css", "/css/parts/ViewletEditorCompletion.css", "/css/parts/ViewletList.css"];
 const getDynamicCss$1 = preferences => {
   const styles = [];
   const fontSize = preferences['editor.fontSize'];
@@ -17487,7 +17406,7 @@ const getInitialLineState = initialLineState => {
   return deepCopy(initialLineState);
 };
 
-const state$8 = {
+const state$7 = {
   /**
    * @type {any}
    */
@@ -17502,10 +17421,10 @@ const flattenTokensArray = tokens => {
   return flattened;
 };
 const warnDeprecatedArrayReturn = (languageId, fn) => {
-  if (state$8.warned.includes(fn)) {
+  if (state$7.warned.includes(fn)) {
     return;
   }
-  state$8.warned.push(fn);
+  state$7.warned.push(fn);
   warn$1(`tokenizers without hasArrayReturn=false are deprecated (language ${languageId})`);
 };
 /**
@@ -17712,6 +17631,25 @@ const getVisibleDiffLinesWithTokens = (lines, changes, minLineY, maxLineY, langu
   return merged;
 };
 
+const SetBounds = 'setBounds';
+const SetContentHeight = 'setContentHeight';
+const SetCursorOffset = 'setCursorOffset';
+const SetDragging = 'setDragging';
+const SetFocused = 'setFocused';
+const SetFocusedIndex = 'setFocusedIndex';
+const SetItemsHeight = 'setItemsHeight';
+const SetMenus = 'setMenus';
+const SetMessage = 'setMessage';
+const SetNegativeMargin = 'setNegativeMargin';
+const SetScrollBar = 'setScrollBar';
+const SetSearchValue = 'setSearchValue';
+const SetSize = 'setSize';
+const SetText = 'setText';
+const SetTitle = 'setTitle';
+const SetTransform = 'setTransform';
+const SetValue = 'setValue';
+const SetInputValue = 'setInputValue';
+
 const hasFunctionalRender$B = true;
 const hasFunctionalRootRender$i = true;
 const renderChanges$1 = {
@@ -17734,7 +17672,7 @@ const renderScrollBar$2 = {
     return [/* method */SetScrollBar, /* scrollBarY */scrollBarY, /* scrollBarHeight */newState.scrollBarHeight];
   }
 };
-const render$D = [renderChanges$1, renderScrollBar$2];
+const render$E = [renderChanges$1, renderScrollBar$2];
 
 const saveState$c = state => {
   return {
@@ -17747,14 +17685,14 @@ const ViewletDiffEditor_ipc = {
   __proto__: null,
   Commands: Commands$A,
   Css: Css$A,
-  LazyCommands: LazyCommands$h,
+  LazyCommands: LazyCommands$g,
   create: create$K,
   getDynamicCss: getDynamicCss$1,
   hasFunctionalRender: hasFunctionalRender$B,
   hasFunctionalRootRender: hasFunctionalRootRender$i,
   loadContent: loadContent$G,
   name: name$L,
-  render: render$D,
+  render: render$E,
   saveState: saveState$c
 };
 
@@ -17963,7 +17901,7 @@ const renderPreviewTransform = {
     return ['setPreviewTransform', newState.previewTransform];
   }
 };
-const render$C = [renderElements, renderIframe$1, renderPreviewTransform];
+const render$D = [renderElements, renderIframe$1, renderPreviewTransform];
 
 const getActions$9 = () => {
   return [];
@@ -17998,7 +17936,7 @@ const ViewletE2eTest_ipc = {
   loadContent: loadContent$F,
   menus: menus$b,
   name: name$K,
-  render: render$C,
+  render: render$D,
   renderActions: renderActions$9,
   resize: resize$l
 };
@@ -18216,7 +18154,7 @@ const renderMessagePort = {
     return ['setPort', newState.portId, newState.iframeOrigin];
   }
 };
-const render$B = [renderTests, renderIframe, renderMessagePort];
+const render$C = [renderTests, renderIframe, renderMessagePort];
 
 const getActions$8 = () => {
   return [{
@@ -18254,69 +18192,11 @@ const ViewletE2eTests_ipc = {
   menus: menus$a,
   name: name$J,
   openInNewTab,
-  render: render$B,
+  render: render$C,
   renderActions: renderActions$8,
   runAll
 };
 
-const combineResults$5 = results => {
-  return results[0] ?? [];
-};
-const executeCompletionProvider = (editor, offset) => {
-  return execute$2({
-    editor,
-    event: OnCompletion,
-    method: CompletionExecute,
-    args: [offset],
-    noProviderFoundMessage: 'no completion provider found',
-    noProviderFoundResult: [],
-    combineResults: combineResults$5
-  });
-};
-const combineResultsResolve = items => {
-  return items[0] ?? undefined;
-};
-const executeResolveCompletionItem = (editor, offset, name, completionItem) => {
-  return execute$2({
-    editor,
-    event: OnCompletion,
-    method: CompletionResolveExecute,
-    args: [offset, name, completionItem],
-    noProviderFoundMessage: 'no completion provider found',
-    noProviderFoundResult: [],
-    combineResults: combineResultsResolve
-  });
-};
-
-// TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
-const getCompletions = async editor => {
-  const {
-    selections
-  } = editor;
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  // Editor.sync(editor)
-  const offset = await offsetAt(editor, rowIndex, columnIndex);
-  const completions = await executeCompletionProvider(editor, offset);
-  return completions;
-};
-
-// TODO don't send unnecessary parts of completion item like matches
-const resolveCompletion = async (editor, name, completionItem) => {
-  try {
-    object(editor);
-    string(name);
-    object(completionItem);
-    const rowIndex = editor.selections[0];
-    const columnIndex = editor.selections[1];
-    const offset = await offsetAt(editor, rowIndex, columnIndex);
-    const resolvedCompletionItem = await executeResolveCompletionItem(editor, offset, name, completionItem);
-    return resolvedCompletionItem;
-  } catch {
-    return undefined;
-  }
-};
-
 /**
  *
  * @param {any} editor
@@ -18503,7 +18383,7 @@ const addEmptyMatch$1 = item => {
     matches: EmptyMatches
   };
 };
-const filterCompletionItems$1 = (completionItems, word) => {
+const filterCompletionItems = (completionItems, word) => {
   if (word === EmptyString) {
     return completionItems.map(addEmptyMatch$1);
   }
@@ -18533,12 +18413,6 @@ const filterCompletionItems$1 = (completionItems, word) => {
   return filteredCompletions;
 };
 
-const getFinalDeltaY = (height, itemHeight, itemsLength) => {
-  const contentHeight = itemsLength * itemHeight;
-  const finalDeltaY = Math.max(contentHeight - height, 0);
-  return finalDeltaY;
-};
-
 const getListHeight$1 = (itemsLength, itemHeight, maxHeight) => {
   number(itemsLength);
   number(itemHeight);
@@ -18577,7 +18451,7 @@ const create$G = (id, uri, x, y, width, height) => {
     maxHeight: 150
   };
 };
-const getEditor$2 = () => {
+const getEditor$1 = () => {
   return getState(EditorText);
 };
 const getDisplayErrorMessage$1 = error => {
@@ -18616,7 +18490,7 @@ const handleEditorType = (state, editor, text) => {
   // @ts-ignore
   const y$1 = y(editor, rowIndex);
   const wordAtOffset = getWordAtOffset(editor);
-  const items = filterCompletionItems$1(unfilteredItems, wordAtOffset);
+  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
   const newMinLineY = 0;
   const newMaxLineY = Math.min(items.length, 8);
   const height = getListHeight$1(items.length, itemHeight, maxHeight);
@@ -18652,7 +18526,7 @@ const handleEditorDeleteLeft = (state, editor) => {
       disposed: true
     };
   }
-  const items = filterCompletionItems$1(unfilteredItems, wordAtOffset);
+  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
   const newMaxLineY = Math.min(items.length, 8);
   const height = getListHeight$1(items.length, itemHeight, maxHeight);
   return {
@@ -18681,49 +18555,17 @@ const disposeWithEditor = (state, editor) => {
 const handleEditorClick = disposeWithEditor;
 const handleEditorBlur = disposeWithEditor;
 const loadContent$D = async state => {
-  const {
-    itemHeight,
-    maxHeight
-  } = state;
-  const editor = getEditor$2();
-  const unfilteredItems = await getCompletions(editor);
-  const wordAtOffset = getWordAtOffset(editor);
-  const items = filterCompletionItems$1(unfilteredItems, wordAtOffset);
-  const rowIndex = editor.selections[0];
-  const columnIndex = editor.selections[1];
-  const x$1 = x(editor, rowIndex, columnIndex);
-  // @ts-ignore
-  const y$1 = y(editor, rowIndex);
-  const newMaxLineY = Math.min(items.length, 8);
-  editor.widgets = editor.widgets || [];
-  editor.widgets.push(EditorCompletion$1);
-  const itemsLength = items.length;
-  const newFocusedIndex = itemsLength === 0 ? -1 : 0;
-  const total = items.length;
-  const height = getListHeight$1(items.length, itemHeight, maxHeight);
-  const finalDeltaY = getFinalDeltaY(height, itemHeight, total);
-  return {
-    ...state,
-    unfilteredItems,
-    items,
-    x: x$1,
-    y: y$1,
-    maxLineY: newMaxLineY,
-    focusedIndex: newFocusedIndex,
-    finalDeltaY,
-    leadingWord: wordAtOffset,
-    height,
-    rowIndex,
-    columnIndex
-  };
+  const editor = getEditor$1();
+  const editorUid = editor.uid;
+  return actualInvoke('EditorCompletion.loadContent', editorUid, state);
 };
 const handleError$1 = async error => {
   const displayErrorMessage = getDisplayErrorMessage$1(error);
-  const editor = getEditor$2();
+  const editor = getEditor$1();
   await editorShowMessage( /* editor */editor, /* rowIndex */0, /* columnIndex */0, /* message */displayErrorMessage);
 };
 const loadingContent = () => {
-  const editor = getEditor$2();
+  const editor = getEditor$1();
   const rowIndex = editor.selections[0];
   const columnIndex = editor.selections[1];
   const x$1 = x(editor, rowIndex, columnIndex);
@@ -18732,16 +18574,16 @@ const loadingContent = () => {
   const changes = [/* Viewlet.send */'Viewlet.send', /* id */EditorCompletion$1, /* method */'showLoading', /* x */x$1, /* y */y$1];
   return changes;
 };
-const handleSelectionChange$1 = (state, selectionChanges) => {};
-const advance$1 = (state, word) => {
-  const filteredItems = filterCompletionItems$1(state.items, word);
+const handleSelectionChange = (state, selectionChanges) => {};
+const advance = (state, word) => {
+  const filteredItems = filterCompletionItems(state.items, word);
   return {
     ...state,
     filteredItems
   };
 };
 
-const LazyCommands$g = {
+const LazyCommands$f = {
   focusFirst: () => Promise.resolve().then(function () { return VirtualListFocusFirst; }),
   focusIndex: () => Promise.resolve().then(function () { return VirtualListFocusIndex; }),
   focusLast: () => Promise.resolve().then(function () { return VirtualListFocusLast; }),
@@ -18771,10 +18613,10 @@ const Commands$x = {
 };
 
 // prettier-ignore
-const LazyCommands$f = {
+const LazyCommands$e = {
   selectIndex: () => Promise.resolve().then(function () { return ViewletEditorCompletionSelectIndex; }),
   selectCurrent: () => Promise.resolve().then(function () { return ViewletEditorCompletionSelectCurrent; }),
-  ...LazyCommands$g
+  ...LazyCommands$f
 };
 
 const Css$x = ["/css/parts/ViewletEditorCompletion.css", "/css/parts/Symbol.css", "/css/parts/ViewletList.css"];
@@ -18794,31 +18636,7 @@ ${joinLines(styles)}
 };
 
 const getKeyBindings$e = () => {
-  return [{
-    key: DownArrow$1,
-    command: 'EditorCompletion.focusNext',
-    when: FocusEditorCompletions
-  }, {
-    key: UpArrow$1,
-    command: 'EditorCompletion.focusPrevious',
-    when: FocusEditorCompletions
-  }, {
-    key: Enter$2,
-    command: 'EditorCompletion.selectCurrent',
-    when: FocusEditorCompletions
-  }, {
-    key: Escape$2,
-    command: 'Editor.closeCompletion',
-    when: FocusEditorCompletions
-  }, {
-    key: End$1,
-    command: 'EditorCompletion.focusLast',
-    when: FocusEditorCompletions
-  }, {
-    key: Home$1,
-    command: 'EditorCompletion.focusFirst',
-    when: FocusEditorCompletions
-  }];
+  return [];
 };
 
 const getFileIconVirtualDom = icon => {
@@ -19017,7 +18835,7 @@ const renderItems$4 = {
     return ['setDom', dom];
   }
 };
-const renderBounds$3 = {
+const renderBounds$2 = {
   isEqual(oldState, newState) {
     return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.x === newState.x && oldState.y === newState.y;
   },
@@ -19063,7 +18881,7 @@ const renderScrollBar$1 = {
     return [/* method */SetScrollBar, /* scrollBarY */scrollBarY, /* scrollBarHeight */scrollBarHeight];
   }
 };
-const render$A = [renderItems$4, renderBounds$3, renderHeight$1, renderNegativeMargin, renderScrollBar$1];
+const render$B = [renderItems$4, renderBounds$2, renderHeight$1, renderNegativeMargin, renderScrollBar$1];
 
 const name$I = 'EditorCompletion';
 
@@ -19071,8 +18889,8 @@ const ViewletEditorCompletion_ipc = {
   __proto__: null,
   Commands: Commands$x,
   Css: Css$x,
-  LazyCommands: LazyCommands$f,
-  advance: advance$1,
+  LazyCommands: LazyCommands$e,
+  advance,
   create: create$G,
   dispose: dispose$r,
   getDynamicCss,
@@ -19082,13 +18900,13 @@ const ViewletEditorCompletion_ipc = {
   handleEditorDeleteLeft,
   handleEditorType,
   handleError: handleError$1,
-  handleSelectionChange: handleSelectionChange$1,
+  handleSelectionChange,
   handleWheel: handleWheel$4,
   hasFunctionalRender: hasFunctionalRender$y,
   loadContent: loadContent$D,
   loadingContent,
   name: name$I,
-  render: render$A,
+  render: render$B,
   setDeltaY: setDeltaY$4
 };
 
@@ -19108,48 +18926,37 @@ const create$F = (id, uri, x, y, width, height) => {
     resizedWidth: 250
   };
 };
+const render$A = async (oldState, newState) => {
+  // @ts-ignore
+  const commands = await actualInvoke('Hover.render', oldState, newState);
+  return commands;
+};
 const loadContent$C = async (state, savedState, position) => {
   const editor = getActiveEditor();
-  console.log('editor uid', editor.uid);
-  const hoverInfo = await invoke$5('Hover.getHoverInfo', editor.uid, position);
-  console.log({
-    editor,
-    hoverInfo,
-    position
-  });
-  if (!hoverInfo) {
-    return state;
-  }
-  const {
-    lineInfos,
-    documentation,
-    x,
-    y,
-    matchingDiagnostics
-  } = hoverInfo;
+  // @ts-ignore
+  const newState = await actualInvoke('Hover.loadContent', editor.uid, state, position);
+  const commands = await render$A(state, newState);
   return {
-    ...state,
-    lineInfos,
-    documentation,
-    x,
-    y,
-    diagnostics: matchingDiagnostics
+    ...newState,
+    commands
   };
 };
-const handleSashPointerDown$1 = (state, eventX, eventY) => {
-  return state;
+const handleSashPointerDown$1 = async (state, eventX, eventY) => {
+  // @ts-ignore
+  const newState = await actualInvoke('Hover.handleSashPointerDown', state, eventX, eventY);
+  const commands = await render$A(state, newState);
+  return {
+    ...newState,
+    commands
+  };
 };
-const handleSashPointerMove$1 = (state, eventX, eventY) => {
+const handleSashPointerMove$1 = async (state, eventX, eventY) => {
   // @ts-ignore
-  const {
-    x,
-    y
-  } = state;
-  const minWidth = 100;
-  const newWidth = Math.max(eventX - x, minWidth);
+  const newState = await actualInvoke('Hover.handleSashPointerMove', state, eventX, eventY);
+  const commands = await render$A(state, newState);
   return {
-    ...state,
-    resizedWidth: newWidth
+    ...newState,
+    commands
   };
 };
 const handleSashPointerUp$1 = (state, eventX, eventY) => {
@@ -19158,117 +18965,29 @@ const handleSashPointerUp$1 = (state, eventX, eventY) => {
 
 const Css$w = ["/css/parts/ViewletEditorHover.css"];
 
-const getLineInfoVirtualDom = lineInfo => {
-  const dom = [{
-    type: Div$1,
-    className: HoverEditorRow,
-    childCount: lineInfo.length / 2
-  }];
-  for (let i = 0; i < lineInfo.length; i += 2) {
-    const tokenText = lineInfo[i];
-    const tokenClass = lineInfo[i + 1];
-    dom.push({
-      type: Span$1,
-      className: tokenClass,
-      childCount: 1
-    },
-    // @ts-ignore
-    text(tokenText));
-  }
-  return dom;
-};
-const getLineInfosVirtualDom = lineInfos => {
-  const dom = lineInfos.flatMap(getLineInfoVirtualDom);
-  return dom;
-};
-
-const hoverProblemMessage = {
-  type: Span$1,
-  className: HoverProblemMessage,
-  childCount: 1
-};
-const hoverProblemDetail = {
-  type: Span$1,
-  className: HoverProblemDetail,
-  childCount: 1
-};
-const getChildCount = (lineInfos, documentation, diagnostics) => {
-  return lineInfos.length + documentation ? 1 : 0 + (diagnostics && diagnostics.length > 0) ? 1 : 0;
-};
-const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
-  const dom = [];
-  dom.push({
-    type: Div$1,
-    className: 'Viewlet EditorHover',
-    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1
-  });
-  if (diagnostics && diagnostics.length > 0) {
-    dom.push({
-      type: Div$1,
-      className: `${HoverDisplayString} ${HoverProblem}`,
-      childCount: diagnostics.length * 2
-    });
-    for (const diagnostic of diagnostics) {
-      dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(`${diagnostic.source} (${diagnostic.code})`));
-    }
-  }
-  if (lineInfos.length > 0) {
-    const lineInfosDom = getLineInfosVirtualDom(lineInfos);
-    dom.push({
-      type: Div$1,
-      className: HoverDisplayString,
-      childCount: lineInfos.length
-    }, ...lineInfosDom);
-  }
-  if (documentation) {
-    dom.push({
-      type: Div$1,
-      className: HoverDocumentation,
-      childCount: 1
-    }, text(documentation));
-  }
-  dom.push({
-    type: Div$1,
-    className: 'Sash SashVertical SashResize',
-    childCount: 0,
-    onPointerDown: HandleSashPointerDown
-  });
-  console.log({
-    dom
-  });
-  return dom;
-};
-
 const hasFunctionalRender$x = true;
 const hasFunctionalRootRender$f = true;
-const renderHover = {
+const renderAll$1 = {
   isEqual(oldState, newState) {
-    return oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.diagnostics === newState.diagnostics;
+    return newState.commands && newState.commands.length === 0;
   },
   apply(oldState, newState) {
-    const dom = getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics);
-    return [/* method */'Viewlet.setDom2', dom];
-  }
-};
-const renderBounds$2 = {
-  isEqual(oldState, newState) {
-    return oldState.x === newState.x && oldState.y === newState.y && oldState.resizedWidth === newState.resizedWidth;
+    const commands = newState.commands;
+    newState.commands = [];
+    if (!commands) {
+      return [];
+    }
+    const adjustedCommands = commands.map(command => {
+      if (command[0] === 'Viewlet.setDom2') {
+        return ['Viewlet.setDom2', newState.uid, ...command.slice(1)];
+      }
+      return ['Viewlet.send', newState.uid, ...command];
+    });
+    return adjustedCommands;
   },
-  apply(oldState, newState) {
-    // @ts-ignore
-    const {
-      x,
-      y,
-      width,
-      height,
-      resizedWidth,
-      uid
-    } = newState;
-    console.log('apply');
-    return [SetBounds, x, y, resizedWidth, height];
-  }
+  multiple: true
 };
-const render$z = [renderHover, renderBounds$2];
+const render$z = [renderAll$1];
 
 const name$H = 'EditorHover';
 const Commands$w = {
@@ -19643,7 +19362,7 @@ const Commands$v = {
 };
 
 // prettier-ignore
-const LazyCommands$e = {
+const LazyCommands$d = {
   copyImage: () => Promise.resolve().then(function () { return ViewletEditorImageCopyImage; }),
   copyPath: () => Promise.resolve().then(function () { return ViewletEditorImageCopyPath; }),
   handleContextMenu: () => Promise.resolve().then(function () { return ViewletEditorImageHandleContextMenu; })
@@ -19733,7 +19452,7 @@ const ViewletEditorImage_ipc = {
   __proto__: null,
   Commands: Commands$v,
   Css: Css$v,
-  LazyCommands: LazyCommands$e,
+  LazyCommands: LazyCommands$d,
   create: create$D,
   dispose: dispose$q,
   handleFocus: handleFocus$8,
@@ -20056,17 +19775,6 @@ const setDeltaY$3 = (state, value) => {
   };
 };
 
-const getSelectionPairs = (selections, i) => {
-  const first = selections[i];
-  const second = selections[i + 1];
-  const third = selections[i + 2];
-  const fourth = selections[i + 3];
-  if (first > third || first === third && second >= fourth) {
-    return [third, fourth, first, second, 1];
-  }
-  return [first, second, third, fourth, 0];
-};
-
 // TODO visible selections could also be uint16array
 // [top1, left1, width1, height1, top2, left2, width2, height2...]
 const getTabCount = string => {
@@ -20117,6 +19825,9 @@ const renderAll = {
       return [];
     }
     const adjustedCommands = commands.map(command => {
+      if (command[0] === 'Viewlet.create' || command[0] === 'Viewlet.send') {
+        return command;
+      }
       return ['Viewlet.send', newState.uid, ...command];
     });
     return adjustedCommands;
@@ -20449,11 +20160,11 @@ const loadContent$y = async (state, savedState, context) => {
   if (isFiraCode) {
     const fontName = unquoteString(fontFamily);
     const fontUrl = getFontUrl('/fonts/FiraCode-VariableFont.ttf');
-    await invoke$5('Font.ensure', fontName, fontUrl);
+    await actualInvoke('Font.ensure', fontName, fontUrl);
   }
   const isMonospaceFont = isFiraCode; // TODO an actual check for monospace font
   const fontWeight = 400;
-  await invoke$5('Editor.create', {
+  await actualInvoke('Editor.create', {
     id,
     content,
     savedDeltaY,
@@ -20483,7 +20194,7 @@ const loadContent$y = async (state, savedState, context) => {
   });
   // TODO send render commands directly from editor worker
   // to renderer process
-  const commands = await invoke$5('Editor.render', id);
+  const commands = await actualInvoke('Editor.render', id);
   return {
     ...newState2,
     commands
@@ -20586,7 +20297,9 @@ const wrapEditorCommand = id => {
     }
     const editor = args[0];
     const restArgs = args.slice(1);
-    const result = await invoke$5(`Editor.${id}`, editor.uid, ...restArgs);
+    const fullId = id.includes('.') ? id : `Editor.${id}`;
+    // @ts-ignore
+    const result = await actualInvoke(fullId, editor.uid, ...restArgs);
     if (result && result.commands) {
       return {
         ...editor,
@@ -20606,7 +20319,7 @@ const wrapEditorCommands = ids => {
   }
   return all;
 };
-const ids = ['addCursorAbove', 'addCursorBelow', 'applyEdit', 'braceCompletion', 'closeCompletion', 'compositionEnd', 'compositionStart', 'compositionUpdate', 'contextMenu', 'copy', 'copyLineDown', 'copyLineUp', 'cursorCharacterLeft', 'cursorCharacterRight', 'cursorDown', 'cursorEnd', 'cursorHome', 'cursorLeft', 'cursorRight', 'cursorSet', 'cursorUp', 'cursorWordLeft', 'cursorWordPartLeft', 'cursorWordPartRight', 'cursorWordRight', 'cut', 'deleteAllLeft', 'deleteAllRight', 'deleteCharacterLeft', 'deleteCharacterRight', 'deleteHorizontalRight', 'deleteLeft', 'deleteRight', 'deleteWordLeft', 'deleteWordPartLeft', 'deleteWordPartRight', 'deleteWordRight', 'findAllReferences', 'format', 'getWordAt', 'getWordBefore', 'goToDefinition', 'goToTypeDefinition', 'handleBeforeInput', 'handleBeforeInputFromContentEditable', 'handleBlur', 'handleContextMenu', 'handleDoubleClick', 'handleFocus', 'handleMouseDown', 'handleMouseMove', 'handleMouseMoveWithAltKey', 'handleNativeSelectionChange', 'handlePointerCaptureLost', 'handleScrollBarClick', 'handleScrollBarHorizontalMove', 'handleScrollBarHorizontalPointerDown', 'handleScrollBarMove', 'handleScrollBarPointerDown', 'handleScrollBarVerticalMove', 'handleScrollBarVerticalPointerDown', 'handleSingleClick', 'handleTab', 'handleTouchEnd', 'handleTouchMove', 'handleTouchStart', 'handleTripleClick', 'indentLess', 'indentMore', 'insertLineBreak', 'moveLineDown', 'moveLineUp', 'moveRectangleSelection', 'moveRectangleSelectionPx', 'moveSelection', 'moveSelectionPx', 'openFind', 'organizeImports', 'paste', 'pasteText', 'replaceRange', 'save', 'save', 'selectAll', 'selectAllLeft', 'selectAllOccurrences', 'selectAllRight', 'selectCharacterLeft', 'selectCharacterRight', 'selectDown', 'selectInsideString', 'selectionGrow', 'selectLine', 'selectNextOccurrence', 'selectUp', 'selectWord', 'selectWordLeft', 'selectWordRight', 'setDecorations', 'setDelta', 'setDeltaY', 'setSelections', 'showHover', 'showSourceActions', 'sortLinesAscending', 'tabCompletion', 'toggleBlockComment', 'toggleComment', 'toggleLineComment', 'type', 'undo', 'unIndent', 'setLanguageId'];
+const ids = ['addCursorAbove', 'addCursorBelow', 'applyEdit', 'braceCompletion', 'cancelSelection', 'closeCompletion', 'closeCompletion', 'compositionEnd', 'compositionStart', 'compositionUpdate', 'contextMenu', 'copy', 'copyLineDown', 'copyLineUp', 'cursorCharacterLeft', 'cursorCharacterRight', 'cursorDown', 'cursorEnd', 'cursorHome', 'cursorLeft', 'cursorRight', 'cursorSet', 'cursorUp', 'cursorWordLeft', 'cursorWordPartLeft', 'cursorWordPartRight', 'cursorWordRight', 'cut', 'deleteAllLeft', 'deleteAllRight', 'deleteCharacterLeft', 'deleteCharacterRight', 'deleteHorizontalRight', 'deleteLeft', 'deleteRight', 'deleteWordLeft', 'deleteWordPartLeft', 'deleteWordPartRight', 'deleteWordRight', 'findAllReferences', 'format', 'getWordAt', 'getWordBefore', 'goToDefinition', 'goToTypeDefinition', 'handleBeforeInput', 'handleBeforeInputFromContentEditable', 'handleBlur', 'handleContextMenu', 'handleDoubleClick', 'handleFocus', 'handleMouseDown', 'handleMouseMove', 'handleMouseMoveWithAltKey', 'handleNativeSelectionChange', 'handlePointerCaptureLost', 'handleScrollBarClick', 'handleScrollBarHorizontalMove', 'handleScrollBarHorizontalPointerDown', 'handleScrollBarMove', 'handleScrollBarPointerDown', 'handleScrollBarVerticalMove', 'handleScrollBarVerticalPointerDown', 'handleSingleClick', 'handleTab', 'handleTouchEnd', 'handleTouchMove', 'handleTouchStart', 'handleTripleClick', 'indentLess', 'indentMore', 'insertLineBreak', 'moveLineDown', 'moveLineUp', 'moveRectangleSelection', 'moveRectangleSelectionPx', 'moveSelection', 'moveSelectionPx', 'openCompletion', 'openFind', 'organizeImports', 'paste', 'pasteText', 'replaceRange', 'save', 'save', 'selectAll', 'selectAllLeft', 'selectAllOccurrences', 'selectAllRight', 'selectCharacterLeft', 'selectCharacterRight', 'selectDown', 'selectInsideString', 'selectionGrow', 'selectLine', 'selectNextOccurrence', 'selectUp', 'selectWord', 'selectWordLeft', 'selectWordRight', 'setDecorations', 'setDelta', 'setDeltaY', 'setLanguageId', 'setSelections', 'showHover', 'showSourceActions', 'sortLinesAscending', 'tabCompletion', 'toggleBlockComment', 'toggleComment', 'toggleLineComment', 'type', 'undo', 'unIndent', 'EditorCompletion.selectIndex', 'EditorCompletion.selectCurrent', 'EditorCompletion.dispose', 'EditorCompletion.focusFirst', 'EditorCompletion.focusIndex', 'EditorCompletion.focusLast', 'EditorCompletion.focusNext', 'EditorCompletion.focusNextPage', 'EditorCompletion.focusPrevious', 'EditorCompletion.focusPreviousPage', 'EditorCompletion.handleWheel', 'EditorCompletion.handleScrollBarMove', 'EditorCompletion.handleScrollBarThumbPointerMove', 'EditorCompletion.handleScrollBarClick', 'EditorCompletion.handleScrollBarCaptureLost', 'EditorCompletion.handleClickAt', 'EditorCompletion.scrollDown'];
 const Commands$s = {
   // TODO command to set cursor position
   ...wrapEditorCommands(ids),
@@ -20616,11 +20329,6 @@ const Commands$s = {
     return state;
   }
 };
-
-// prettier-ignore
-const LazyCommands$d = {
-  openCompletion: () => Promise.resolve().then(function () { return EditorCommandCompletion; })
-};
 const CommandsWithSideEffectsLazy$1 = {
   typeWithAutoClosing: () => {
     return {
@@ -20631,6 +20339,30 @@ const CommandsWithSideEffectsLazy$1 = {
 
 const getKeyBindings$c = () => {
   return [{
+    key: DownArrow$1,
+    command: 'EditorCompletion.focusNext',
+    when: FocusEditorCompletions
+  }, {
+    key: UpArrow$1,
+    command: 'EditorCompletion.focusPrevious',
+    when: FocusEditorCompletions
+  }, {
+    key: Enter$2,
+    command: 'EditorCompletion.selectCurrent',
+    when: FocusEditorCompletions
+  }, {
+    key: Escape$2,
+    command: 'Editor.closeCompletion',
+    when: FocusEditorCompletions
+  }, {
+    key: End$1,
+    command: 'EditorCompletion.focusLast',
+    when: FocusEditorCompletions
+  }, {
+    key: Home$1,
+    command: 'EditorCompletion.focusFirst',
+    when: FocusEditorCompletions
+  }, {
     key: CtrlCmd | RightArrow$1,
     command: 'Editor.cursorWordRight',
     when: FocusEditorText
@@ -20928,7 +20660,6 @@ const ViewletEditorText_ipc = {
   CommandsWithSideEffectsLazy: CommandsWithSideEffectsLazy$1,
   Css: Css$B,
   Events: Events$5,
-  LazyCommands: LazyCommands$d,
   contentLoaded: contentLoaded$7,
   contentLoadedEffects: contentLoadedEffects$2,
   create: create$z,
@@ -20958,7 +20689,7 @@ const create$y = (id, uri, x, y, width, height) => {
     message: ''
   };
 };
-const getEditor$1 = () => {
+const getEditor = () => {
   return getState(EditorText);
 };
 const getDisplayErrorMessage = error => {
@@ -20971,7 +20702,7 @@ const getDisplayErrorMessage = error => {
 };
 const setError = (state, error) => {
   const message = getDisplayErrorMessage(error);
-  const editor = getEditor$1();
+  const editor = getEditor();
   const rowIndex = 0;
   const columnIndex = 0;
   const x$1 = x(editor, rowIndex, columnIndex);
@@ -21437,7 +21168,7 @@ const getSavedRoot$1 = (savedState, workspacePath) => {
   return workspacePath;
 };
 const loadContent$w = async (state, savedState) => {
-  const root = getSavedRoot$1(savedState, state$B.workspacePath);
+  const root = getSavedRoot$1(savedState, state$A.workspacePath);
   // TODO path separator could be restored from saved state
   const pathSeparator = await getPathSeparator(root); // TODO only load path separator once
   const excluded = getExcluded();
@@ -21483,7 +21214,7 @@ const handleLanguagesChanged = state => {
   return updateIcons$1(state);
 };
 const handleWorkspaceChange$1 = async state => {
-  const newRoot = state$B.workspacePath;
+  const newRoot = state$A.workspacePath;
   const state1 = {
     ...state,
     root: newRoot
@@ -21784,7 +21515,7 @@ const handleFocus$6 = state => {
   setFocus(Explorer);
   return state;
 };
-const refresh$7 = state => {
+const refresh$6 = state => {
   console.log('TODO refresh explorer');
   return state;
 };
@@ -22428,7 +22159,7 @@ const Commands$q = {
   setDeltaY: setDeltaY$2,
   updateEditingValue: updateEditingValue,
   handleFocus: handleFocus$6,
-  refresh: refresh$7,
+  refresh: refresh$6,
   handleClickOpenFolder: handleClickOpenFolder
 };
 
@@ -22586,7 +22317,7 @@ const rename = () => {
 const deleteItem = () => {
   return i18nString(UiStrings$h.Delete);
 };
-const refresh$6 = () => {
+const refresh$5 = () => {
   return i18nString(UiStrings$h.RefreshExplorer);
 };
 const collapseAll$4 = () => {
@@ -23002,7 +22733,7 @@ const getActions$7 = root => {
     command: 'newFolder'
   }, {
     type: Button,
-    id: refresh$6(),
+    id: refresh$5(),
     icon: Refresh,
     command: 'refresh'
   }, {
@@ -23052,7 +22783,7 @@ const restoreState = savedState => {
       deltaY: 0
     };
   }
-  const root = getSavedRoot(savedState, state$B.workspacePath);
+  const root = getSavedRoot(savedState, state$A.workspacePath);
   let minLineY = 0;
   if (savedState && typeof savedState.minLineY === 'number') {
     minLineY = savedState.minLineY;
@@ -23141,7 +22872,7 @@ const ViewletExplorer_ipc = {
   newFile: newFile$1,
   newFolder: newFolder$1,
   openContainingFolder: openContainingFolder$2,
-  refresh: refresh$7,
+  refresh: refresh$6,
   removeDirent,
   renameDirent: renameDirent$1,
   render: render$s,
@@ -24013,6 +23744,12 @@ const ViewletExtensionDetail_ipc = {
 
 const ExtensionListItemHeight = 72;
 
+const getFinalDeltaY = (height, itemHeight, itemsLength) => {
+  const contentHeight = itemsLength * itemHeight;
+  const finalDeltaY = Math.max(contentHeight - height, 0);
+  return finalDeltaY;
+};
+
 const Installed = '@installed';
 const Enabled = '@enabled';
 const Disabled = '@disabled';
@@ -24138,7 +23875,7 @@ const noExtensionsFound = () => {
 const filter$1 = () => {
   return i18nString(UiStrings$f.Filter);
 };
-const refresh$5 = () => {
+const refresh$4 = () => {
   return i18nString(UiStrings$f.Refresh);
 };
 const extensions = () => {
@@ -24387,7 +24124,7 @@ const LazyCommands$a = {
   clearSearchResults: () => Promise.resolve().then(function () { return ViewletExtensionsClearSearchResults; }),
   handleInput: () => Promise.resolve().then(function () { return ViewletExtensionsHandleInput; }),
   handleFocus: () => Promise.resolve().then(function () { return ViewletExtensionsHandleFocus; }),
-  ...LazyCommands$g
+  ...LazyCommands$f
 };
 
 const Css$q = ["/css/parts/ViewletExtensions.css", "/css/parts/ViewletList.css"];
@@ -24722,7 +24459,7 @@ const render$q = [renderScrollBar, renderMessage$2, renderExtensions, renderSear
 const getActions$6 = () => {
   return [{
     type: Button,
-    id: refresh$5(),
+    id: refresh$4(),
     icon: Refresh
   }, {
     type: Button,
@@ -24804,50 +24541,6 @@ const ViewletExtensions_ipc = {
   toggleSuggest
 };
 
-// copied from https://github.com/microsoft/vscode/tree/main/src/vs/base/common/strings.ts by Microsoft (License MIT)
-
-const RE_ESCAPE = /[\\\{\}\*\+\?\|\^\$\.\[\]\(\)]/g;
-const escapeRegExpCharacters = value => {
-  return value.replaceAll(RE_ESCAPE, '\\$&');
-};
-
-const regexFlags = 'gi';
-const getSearchRegex = searchString => {
-  const escaped = escapeRegExpCharacters(searchString);
-  return new RegExp(escaped, regexFlags);
-};
-
-const findRegexMatches = (lines, regex) => {
-  const {
-    length
-  } = lines;
-  const matches = [];
-  for (let i = 0; i < length; i++) {
-    const line = lines[i];
-    let lastMatch;
-    do {
-      lastMatch = regex.exec(line);
-      if (!lastMatch) {
-        break;
-      }
-      matches.push(i, lastMatch.index);
-    } while (true);
-  }
-  return new Uint32Array(matches);
-};
-
-const findMatchesCaseInsensitive = (lines, searchString) => {
-  if (searchString.length === 0) {
-    return new Uint32Array([]);
-  }
-  const regex = getSearchRegex(searchString);
-  return findRegexMatches(lines, regex);
-};
-
-const getMatchCount = matches => {
-  return matches.length / 2;
-};
-
 const create$t = uid => {
   return {
     value: '',
@@ -24860,7 +24553,8 @@ const create$t = uid => {
     useRegularExpression: false,
     matchCase: false,
     matchWholeWord: false,
-    replacement: ''
+    replacement: '',
+    editorUid: 0
   };
 };
 const getPosition$1 = () => {
@@ -24894,35 +24588,22 @@ const loadContent$t = async state => {
   const {
     value,
     matches,
-    matchCount
-  } = await invoke$5('FindWidget.loadContent', editor.uid);
+    matchCount,
+    matchIndex
+  } = await actualInvoke('FindWidget.loadContent', editor.uid);
   return {
     ...state,
     value,
     matches,
-    matchIndex: 0,
-    matchCount
-  };
-};
-const refresh$4 = (state, value = state.value) => {
-  // TODO get focused editor
-  // highlight locations that match value
-  const editor = getActiveEditor();
-  const {
-    lines
-  } = editor;
-  const matches = findMatchesCaseInsensitive(lines, value);
-  const matchCount = getMatchCount(matches);
-  return {
-    ...state,
-    matches,
-    matchIndex: 0,
+    matchIndex,
     matchCount,
-    value
+    editorUid: editor.uid
   };
 };
-const handleInput$5 = (state, value) => {
-  return refresh$4(state, value);
+const handleInput$5 = async (state, value) => {
+  // TODO keep whole state and rendering in editor worker
+  const newState = await actualInvoke('FindWidget.handleInput', state, value);
+  return newState;
 };
 const handleFocus$5 = state => {
   setFocus(FindWidget);
@@ -24935,55 +24616,26 @@ const handleBlur$4 = state => {
 
 // TODO this function should be synchronous
 const focusIndex$8 = async (state, index) => {
-  const {
-    value,
-    matches,
-    matchIndex
-  } = state;
-  if (index === matchIndex) {
-    return state;
-  }
-  // TODO find next match and highlight it
-  const matchRowIndex = matches[index * 2];
-  const matchColumnIndex = matches[index * 2 + 1];
-  const newSelections = new Uint32Array([matchRowIndex, matchColumnIndex, matchRowIndex, matchColumnIndex + value.length]);
-  // TODO set selections synchronously and render input match index,
-  // input value and new selections at the same time
-  await execute$4('Editor.setSelections', newSelections);
-  return {
-    ...state,
-    matchIndex: index
-  };
+  const newState = await actualInvoke('FindWidget.focusIndex', state, index);
+  return newState;
 };
-const focusFirst$9 = state => {
-  return focusIndex$8(state, 0);
+const focusFirst$9 = async state => {
+  const newState = await actualInvoke('FindWidget.focusFirst', state);
+  return newState;
 };
-const focusLast$9 = state => {
-  const {
-    matchCount
-  } = state;
-  return focusIndex$8(state, matchCount - 1);
+const focusLast$9 = async state => {
+  const newState = await actualInvoke('FindWidget.focusLast', state);
+  return newState;
 };
-const focusNext$b = state => {
-  const {
-    matchIndex,
-    matchCount
-  } = state;
-  if (matchIndex === matchCount - 1) {
-    return focusFirst$9(state);
-  }
-  return focusIndex$8(state, matchIndex + 1);
+const focusNext$b = async state => {
+  const newState = await actualInvoke('FindWidget.focusNext', state);
+  return newState;
 };
-const focusPrevious$b = state => {
-  const {
-    matchIndex
-  } = state;
-  if (matchIndex === 0) {
-    return focusLast$9(state);
-  }
-  return focusIndex$8(state, matchIndex - 1);
+const focusPrevious$b = async state => {
+  const newState = await actualInvoke('FindWidget.focusPrevious', state);
+  return newState;
 };
-const close$6 = async state => {
+const close$5 = async state => {
   const {
     uid
   } = state;
@@ -24999,10 +24651,9 @@ const Commands$n = {
   focusNext: focusNext$b,
   focusPrevious: focusPrevious$b,
   handleInput: handleInput$5,
-  refresh: refresh$4,
   handleFocus: handleFocus$5,
   handleBlur: handleBlur$4,
-  close: close$6
+  close: close$5
 };
 
 // prettier-ignore
@@ -25117,7 +24768,7 @@ const previousMatch = () => {
 const nextMatch = () => {
   return i18nString(UiStrings$e.NextMatch);
 };
-const close$5 = () => {
+const close$4 = () => {
   return i18nString(UiStrings$e.Close);
 };
 
@@ -25153,7 +24804,7 @@ const renderDetails = {
       icon: ArrowDown,
       disabled: !buttonsEnabled
     }, {
-      label: close$5(),
+      label: close$4(),
       icon: Close,
       disabled: false
     }];
@@ -25203,7 +24854,7 @@ const ViewletFindWidget_ipc = {
   Commands: Commands$n,
   Css: Css$p,
   LazyCommands: LazyCommands$9,
-  close: close$6,
+  close: close$5,
   create: create$t,
   focusFirst: focusFirst$9,
   focusIndex: focusIndex$8,
@@ -25218,7 +24869,6 @@ const ViewletFindWidget_ipc = {
   hasFunctionalRender: hasFunctionalRender$p,
   loadContent: loadContent$t,
   name: name$y,
-  refresh: refresh$4,
   render: render$p
 };
 
@@ -28366,11 +28016,11 @@ const ViewletLayout_ipc = {
   toggleTitleBar
 };
 
-const state$7 = {
+const state$6 = {
   backgroundTabs: Object.create(null)
 };
 const add = (uri, props) => {
-  state$7.backgroundTabs[uri] = props;
+  state$6.backgroundTabs[uri] = props;
 };
 
 const measureTabWidth = (label, fontWeight, fontSize, fontFamily, letterSpacing) => {
@@ -30010,7 +29660,7 @@ const ViewletNoop_ipc = {
 const open$4 = async (id, file) => {
   await invoke$7( /* OutputChannel.open */'OutputChannel.open', id, /* path */file);
 };
-const close$4 = async id => {
+const close$3 = async id => {
   await invoke$7( /* OutputChannel.close */'OutputChannel.close', /* id */id);
 };
 
@@ -30100,7 +29750,7 @@ const handleError = async (state, data) => {
 const dispose$f = async state => {
   state.disposed = true;
   // TODO close output channel in shared process
-  await close$4('Output');
+  await close$3('Output');
 };
 const openFindWidget = async state => {
   // TODO use command.execute instead
@@ -31678,7 +31328,7 @@ const None$7 = '';
 
 // TODO avoid global variable
 
-const state$6 = {
+const state$5 = {
   // providerId: PROVIDER_NOOP,
   provider: QuickPickNoop,
   prefix: 'string-that-should-never-match-another-string'
@@ -31689,16 +31339,16 @@ const state$6 = {
  */
 const name$n = 'everything';
 const getPlaceholder$a = () => {
-  return state$6.provider.getPlaceholder();
+  return state$5.provider.getPlaceholder();
 };
 const getLabel$5 = () => {
   return '';
 };
 const getHelpEntries$8 = () => {
-  return state$6.provider.getHelpEntries();
+  return state$5.provider.getHelpEntries();
 };
 const getNoResults$9 = () => {
-  return state$6.provider.getNoResults();
+  return state$5.provider.getNoResults();
 };
 const getPrefix = value => {
   if (value.startsWith(Command)) {
@@ -31740,20 +31390,20 @@ const getQuickPickProvider = prefix => {
 const getPicks$a = async value => {
   const prefix = getPrefix(value);
   // TODO race condition
-  if (state$6.prefix !== prefix) {
-    state$6.prefix = prefix;
+  if (state$5.prefix !== prefix) {
+    state$5.prefix = prefix;
     // @ts-ignore
-    state$6.provider = await getQuickPickProvider(prefix);
+    state$5.provider = await getQuickPickProvider(prefix);
   }
   // TODO this line is a bit duplicated with getFilterValue
   const slicedValue = value.slice(prefix.length);
-  const picks = await state$6.provider.getPicks(slicedValue);
+  const picks = await state$5.provider.getPicks(slicedValue);
   return picks;
 };
 const selectPick$a = item => {
   const {
     provider
-  } = state$6;
+  } = state$5;
   return provider.selectPick(item);
 };
 const openCommandPalette = () => {
@@ -31763,18 +31413,18 @@ const openView = () => {
   // show('view ')
 };
 const getFilterValue$9 = value => {
-  return value.slice(state$6.prefix.length);
+  return value.slice(state$5.prefix.length);
 };
 const getPickFilterValue$5 = pick => {
   const {
     provider
-  } = state$6;
+  } = state$5;
   return provider.getPickFilterValue(pick);
 };
 const getPickDescription$4 = pick => {
   const {
     provider
-  } = state$6;
+  } = state$5;
   // @ts-ignore
   if (provider.getPickDescription) {
     // @ts-ignore
@@ -31785,21 +31435,21 @@ const getPickDescription$4 = pick => {
 const getPickLabel$5 = pick => {
   const {
     provider
-  } = state$6;
+  } = state$5;
   // @ts-ignore
   return provider.getPickLabel(pick);
 };
 const getPickIcon$5 = pick => {
   const {
     provider
-  } = state$6;
+  } = state$5;
   // @ts-ignore
   return provider.getPickIcon(pick);
 };
 const getPickFileIcon$2 = pick => {
   const {
     provider
-  } = state$6;
+  } = state$5;
   // @ts-ignore
   if (provider.getPickFileIcon) {
     // @ts-ignore
@@ -31825,7 +31475,7 @@ const QuickPickEveryThing = {
   openCommandPalette,
   openView,
   selectPick: selectPick$a,
-  state: state$6
+  state: state$5
 };
 
 const filterQuickPickItem = (pattern, word) => {
@@ -34372,7 +34022,7 @@ const handleUpdate = async (state, update) => {
         loaded: true
       };
     }
-    const root = state$B.workspacePath;
+    const root = state$A.workspacePath;
     const results = await textSearch$5(root, value, {
       threads,
       isCaseSensitive: matchCase,
@@ -34455,7 +34105,7 @@ const create$d = (id, uri, x, y, width, height) => {
     listFocused: false,
     listFocusedIndex: -1,
     inputSource: User,
-    workspacePath: state$B.workspacePath,
+    workspacePath: state$A.workspacePath,
     includeValue: '',
     excludeValue: '',
     detailsExpanded: false,
@@ -34668,7 +34318,7 @@ const LazyCommands$5 = {
   handleUpdate: () => Promise.resolve().then(function () { return ViewletSearchHandleUpdate; }),
   handleListFocus: () => Promise.resolve().then(function () { return ViewletSearchHandleListFocus; }),
   handleListBlur: () => Promise.resolve().then(function () { return ViewletSearchHandleListBlur; }),
-  ...LazyCommands$g,
+  ...LazyCommands$f,
   focusFirst: () => Promise.resolve().then(function () { return ViewletSearchFocusFirst; }),
   focusLast: () => Promise.resolve().then(function () { return ViewletSearchFocusLast; }),
   focusNext: () => Promise.resolve().then(function () { return ViewletSearchFocusNext; }),
@@ -35332,7 +34982,7 @@ const openViewlet = async (state, moduleId, focus = false, args) => {
     if (activityBar) {
       const oldState = activityBar.state;
       const newState = activityBar.factory.handleSideBarViewletChange(oldState, moduleId);
-      const extraCommands = render$N(activityBar.factory, oldState, newState, newState.uid);
+      const extraCommands = render$P(activityBar.factory, oldState, newState, newState.uid);
       activityBar.state = newState;
       commands.push(...extraCommands);
     }
@@ -35365,7 +35015,7 @@ const dispose$6 = state => {
 const openDefaultViewlet = async state => {
   await openViewlet(state, 'Explorer');
 };
-const close$3 = state => {
+const close$2 = state => {
   if (state.currentViewletId) {
     dispose$x(state.currentViewletId);
   }
@@ -35445,7 +35095,7 @@ const ViewletSideBar_ipc = {
   __proto__: null,
   Commands: Commands$8,
   Css: Css$c,
-  close: close$3,
+  close: close$2,
   contentLoaded,
   create: create$c,
   dispose: dispose$6,
@@ -35481,17 +35131,17 @@ const {
   dispose: dispose$5
 } = getOrCreateWorker(launchEmbedsWorker);
 
-const state$5 = {
+const state$4 = {
   refs: 0
 };
 const createWebContentsView = async (restoreId, fallThroughKeyBindings) => {
-  state$5.refs++;
+  state$4.refs++;
   return invoke$1('ElectronWebContentsView.createWebContentsView', restoreId, fallThroughKeyBindings);
 };
 const disposeWebContentsView = async id => {
   await invoke$1('ElectronWebContentsView.disposeWebContentsView', id);
-  state$5.refs--;
-  if (state$5.refs === 0) {
+  state$4.refs--;
+  if (state$4.refs === 0) {
     await dispose$5();
   }
 };
@@ -36130,7 +35780,7 @@ const ViewletSimpleBrowser_ipc = {
   show: show$2
 };
 
-const state$4 = {
+const state$3 = {
   cache: Object.create(null)
 };
 const getContextId = (groupId, type) => {
@@ -36140,14 +35790,14 @@ const getContextId = (groupId, type) => {
   return groupId;
 };
 const ensureActions = async () => {
-  if (Object.keys(state$4.cache).length > 0) {
+  if (Object.keys(state$3.cache).length > 0) {
     return;
   }
   const extensions = await getExtensions$1();
   for (const extension of extensions) {
     if (extension && extension['source-control-actions']) {
       for (const [key, value] of Object.entries(extension['source-control-actions'])) {
-        state$4.cache[key] = value;
+        state$3.cache[key] = value;
       }
     }
   }
@@ -36156,7 +35806,7 @@ const getSourceControlActions = async (providerId, groupId, type) => {
   string(groupId);
   await ensureActions();
   const contextId = getContextId(groupId, type);
-  const value = state$4.cache[contextId] || [];
+  const value = state$3.cache[contextId] || [];
   return value;
 };
 
@@ -36307,7 +35957,7 @@ const loadContent$a = async state => {
     height,
     minimumSliderSize
   } = state;
-  const root = state$B.workspacePath;
+  const root = state$A.workspacePath;
   const scheme = getProtocol(root);
   const enabledProviderIds = await getEnabledProviderIds(scheme, root);
   const {
@@ -36453,7 +36103,7 @@ const LazyCommands$3 = {
   handleButtonClick: () => Promise.resolve().then(function () { return ViewletSourceControlHandleButtonClick; }),
   acceptInput: () => Promise.resolve().then(function () { return ViewletSourceControlAcceptInput; }),
   handleFocus: () => Promise.resolve().then(function () { return ViewletSourceControlHandleFocus; }),
-  ...LazyCommands$g
+  ...LazyCommands$f
 };
 
 const Css$a = ["/css/parts/ViewletSourceControl.css"];
@@ -37237,7 +36887,7 @@ const loadContent$7 = async state => {
   } = await getTerminalSpawnOptions();
   const canvasTextId = create$19();
   const canvasCursorId = create$19();
-  await invoke$4('Terminal.create', canvasTextId, canvasCursorId, uid, state$B.workspacePath, command, args);
+  await invoke$4('Terminal.create', canvasTextId, canvasCursorId, uid, state$A.workspacePath, command, args);
   const terminal = {
     handleBlur() {
       return invoke$4('Terminal.handleBlur', uid);
@@ -37800,7 +37450,7 @@ const minimize = () => {
 const maximize = () => {
   return i18nString(UiStrings$3.Maximize);
 };
-const close$2 = () => {
+const close$1 = () => {
   return i18nString(UiStrings$3.Close);
 };
 
@@ -37822,7 +37472,7 @@ const getTitleBarButtonsElectron = () => {
       icon: 'Maximize',
       id: 'ToggleMaximize'
     }, {
-      label: close$2(),
+      label: close$1(),
       icon: 'ChromeClose',
       id: 'Close'
     }];
@@ -39103,7 +38753,7 @@ const splitRight$1 = () => {
 const newWindow = () => {
   return i18nString(UiStrings.NewWindow);
 };
-const close$1 = () => {
+const close = () => {
   return i18nString(UiStrings.Close);
 };
 const closeOthers$1 = () => {
@@ -39134,7 +38784,7 @@ const getMenuEntries$1 = () => {
   const uri = editor.uri;
   return [{
     id: 'tabClose',
-    label: close$1(),
+    label: close(),
     flags: None$j,
     command: 'Main.closeFocusedTab'
   }, {
@@ -39788,85 +39438,11 @@ const VirtualListScrollDown = {
   scrollDown
 };
 
-const replaceRange = (editor, ranges, replacement, origin) => {
-  const changes = [];
-  const rangesLength = ranges.length;
-  for (let i = 0; i < rangesLength; i += 4) {
-    const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(ranges, i);
-    const start = {
-      rowIndex: selectionStartRow,
-      columnIndex: selectionStartColumn
-    };
-    const end = {
-      rowIndex: selectionEndRow,
-      columnIndex: selectionEndColumn
-    };
-    const selection = {
-      start,
-      end
-    };
-    changes.push({
-      start: start,
-      end: end,
-      inserted: replacement,
-      deleted: getSelectionText(editor, selection),
-      origin
-    });
-  }
-  return changes;
-};
-
-const getEditor = () => {
-  return getState(EditorText);
-};
-const getEdits = async (state, editor, completionItem) => {
-  // @ts-ignore
-  const {
-    leadingWord,
-    uid
-  } = state;
-  const word = completionItem.label;
-  const resolvedItem = await resolveCompletion(editor, word, completionItem);
-  const inserted = resolvedItem ? resolvedItem.snippet : word;
-  // TODO type and dispose commands should be sent to renderer process at the same time
-  const {
-    selections
-  } = editor;
-  const [startRowIndex, startColumnIndex] = selections;
-  const leadingWordLength = leadingWord.length;
-  const replaceRange$1 = new Uint32Array([startRowIndex, startColumnIndex - leadingWordLength, startRowIndex, startColumnIndex]);
-  const changes = replaceRange(editor, replaceRange$1, [inserted], '');
-  return changes;
-};
-const select = async (state, completionItem) => {
-  const {
-    uid
-  } = state;
-  const editor = getEditor();
-  const changes = await getEdits(state, editor, completionItem);
-  const index = editor.widgets.indexOf(EditorCompletion$1);
-  if (index !== -1) {
-    editor.widgets.splice(index, 1);
-    editor.completionState = None$d;
-    editor.completionUid = 0;
-  }
-  await execute$4('Editor.applyEdit', changes);
-  await dispose$x(uid);
-  return state;
-};
 const selectIndex$1 = (state, index) => {
   const {
-    items
+    editorUid
   } = state;
-  if (index === -1) {
-    return state;
-  }
-  if (index > items.length) {
-    throw new Error('index too large');
-  }
-  const actualIndex = index;
-  const completionItem = items[actualIndex];
-  return select(state, completionItem);
+  return actualInvoke('EditorCompletion.selectIndex', editorUid, state, index);
 };
 
 const ViewletEditorCompletionSelectIndex = {
@@ -39876,9 +39452,9 @@ const ViewletEditorCompletionSelectIndex = {
 
 const selectCurrent = state => {
   const {
-    focusedIndex
+    editorUid
   } = state;
-  return selectIndex$1(state, focusedIndex);
+  return actualInvoke('EditorCompletion.selectCurrent', editorUid, state);
 };
 
 const ViewletEditorCompletionSelectCurrent = {
@@ -39917,236 +39493,6 @@ const ViewletEditorImageHandleContextMenu = {
   handleContextMenu: handleContextMenu$7
 };
 
-// based on https://github.com/bevacqua/fuzzysearch/blob/master/index.js
-
-const fuzzySearch = (needle, haystack) => {
-  needle = needle.toLowerCase();
-  haystack = haystack.toLowerCase();
-  const hlen = haystack.length;
-  const nlen = needle.length;
-  if (nlen > hlen) {
-    return false;
-  }
-  if (nlen === hlen) {
-    return needle === haystack;
-  }
-  outer: for (let i = 0, j = 0; i < nlen; i++) {
-    const nch = needle.charCodeAt(i);
-    while (j < hlen) {
-      if (haystack.charCodeAt(j++) === nch) {
-        continue outer;
-      }
-    }
-    return false;
-  }
-  return true;
-};
-
-// @ts-nocheck
-
-/**
- *
- * @param {string} line
- * @param {number} columnIndex
- * @returns
- */
-const getLeadingWord = (line, columnIndex) => {
-  console.log({
-    line
-  });
-  string(line);
-  number(columnIndex);
-  for (let i = columnIndex - 1; i >= 0; i--) {
-    if (!RE_CHARACTER.test(line[i])) {
-      console.log({
-        i,
-        columnIndex
-      });
-      return line.slice(i + 1, columnIndex);
-    }
-  }
-  return line.slice(0, columnIndex);
-};
-const filterCompletionItems = (completionItems, leadingWord) => {
-  const filterCompletionItem = completionItem => {
-    const labelMatch = fuzzySearch(leadingWord, completionItem.label);
-    return labelMatch;
-  };
-  console.log({
-    completionItems,
-    leadingWord
-  });
-  const filtered = completionItems.filter(filterCompletionItem);
-  return filtered;
-};
-const handleSelectionChange = (editor, selectionChanges) => {
-  const selection = selectionChanges[0];
-  const end = selection.end;
-  if (end.rowIndex !== state.rowIndex) {
-    close();
-    return;
-  }
-  const line = editor.lines[end.rowIndex];
-  const leadingWord = getLeadingWord(line, end.columnIndex);
-  const oldStart = state.columnIndex - state.leadingWord.length;
-  const newStart = end.columnIndex - leadingWord.length;
-  if (oldStart !== newStart) {
-    close();
-    return;
-  }
-  // TODO move completions widget and filter
-
-  // TODO this doesn't work for variable width characters (unicode/emoji)
-
-  const filteredCompletionItems = filterCompletionItems(state.completionItems, leadingWord);
-  state.filteredCompletionItems = filteredCompletionItems;
-  state.leadingWord = leadingWord;
-  console.log({
-    leadingWord
-  });
-  const x$1 = x(editor);
-  const y$1 = y(editor, editor.cursor);
-  invoke$8( /* Viewlet.send */'Viewlet.send', /* id */'EditorCompletion', /* method */'show', /* x */x$1, /* y */y$1, /* completionItems */filteredCompletionItems, /* reason */1);
-};
-const handleCursorChange = (anyEditor, cursorChange) => {
-  console.log('cursor changed');
-};
-
-// TODO there are still race conditions in this function:
-// - when open is called twice, previous dom nodes can either be reused or the previous dom nodes must be disposed
-
-const openCompletion = async (editor, openingReason = 1) => {
-  if (editor.completionUid !== 0) {
-    return editor;
-  }
-  const completionUid = create$19();
-  editor.completionUid = completionUid;
-  const widgetId = create$19();
-  const viewlet = create$16(load$5, EditorCompletion$1, widgetId, 'builtin://', 0, 0, 0, 0);
-  viewlet.show = false;
-  viewlet.uid = completionUid;
-  // @ts-ignore
-  const commands = await load$7(viewlet);
-  if (editor.completionUid !== completionUid) {
-    return editor;
-  }
-  await invoke$8('Viewlet.sendMultiple', commands);
-  return editor;
-
-  // if (state.isOpened) {
-  //   // TODO filter
-  //   console.log('is already open')
-  //   return
-  // }
-  // const loadingDelay = Preferences.get('completions.loadingDelay')
-
-  // console.log({ loadingDelay })
-  // state.abortController.abort()
-  // const abortController = new AbortController()
-  // state.abortController = abortController
-  // EditorBlur.registerListener(handleBlur) // TODO don't like side effect here
-
-  // // TODO when editor is disposed, close completions
-
-  // GlobalEventBus.addListener('editor.selectionChange', handleSelectionChange)
-  // GlobalEventBus.addListener('editor.cursorChange', handleCursorChange)
-  // state.isOpened = true
-  // state.openingReason = openingReason
-  // state.focusedIndex = 0
-  // state.rowIndex = editor.cursor.rowIndex
-  // state.columnIndex = editor.cursor.columnIndex
-  // state.editor = editor
-  // const line = editor.lines[editor.cursor.rowIndex]
-  // state.leadingWord = getLeadingWord(line, editor.cursor.columnIndex)
-  // // TODO race condition: when blur occurs before items arrive, should not show items
-  // await RendererProcess.invoke(
-  //   /* Viewlet.load */ 3030,
-  //   /* id */ 'EditorCompletion'
-  // )
-  // if (abortController.signal.aborted) {
-  //   console.info('canceled')
-  //   return
-  // }
-  // await RendererProcess.invoke(
-  //   /* Viewlet.openWidget */ 3030,
-  //   /* id */ 'EditorCompletion'
-  // )
-  // if (abortController.signal.aborted) {
-  //   console.info('canceled')
-  //   return
-  // }
-  // state.loadingTimeout = setTimeout(showLoading, loadingDelay)
-  // if (state.loadingTimeout !== -1) {
-  //   clearTimeout(state.loadingTimeout)
-  // }
-  // if (abortController.signal.aborted) {
-  //   console.info('canceled')
-  //   return
-  // }
-  // state.completionItems = newCompletionItems
-
-  // const filteredCompletionItems = filterCompletionItems(
-  //   state.completionItems,
-  //   state.leadingWord
-  // )
-  // state.filteredCompletionItems = filteredCompletionItems
-
-  // const x = EditorPosition.x(editor, editor.cursor)
-  // const y = EditorPosition.y(editor, editor.cursor)
-  // // TODO race condition: might already be dispose after each of these calls
-
-  // if (newCompletionItems.length === 0 && state.openingReason === 0) {
-  //   return
-  // }
-
-  // await RendererProcess.invoke(
-  //   /* Viewlet.send */ 'Viewlet.send',
-  //   /* id */ 'EditorCompletion',
-  //   /* method */ 'show',
-  //   /* x */ x,
-  //   /* y */ y,
-  //   /* items */ filteredCompletionItems,
-  //   /* reason */ state.openingReason,
-  //   /* focusedIndex */ state.focusedIndex
-  // )
-};
-const advance = word => {
-  const includesWord = completionItem => {
-    return completionItem.includes(word);
-  };
-  const filteredCompletions = state.completionItems.filter(includesWord);
-  invoke$8( /* EditorCompletion.open */836, /* items */filteredCompletions, /* reason */state.openingReason);
-};
-
-// export const onDidType = () => {}
-
-// TODO possible race condition
-// also should cancel when new open request comes in
-
-const RE_CHARACTER = new RegExp(/^\p{L}/, 'u');
-const openFromType = async (editor, text) => {
-  // if (isCharacter(text) || isTriggerCharacter(text)) {
-  //   await open(editor, 0)
-  // } else if (state.isOpened) {
-  //   await close()
-  // }
-  return getState$1(EditorText);
-};
-const close = async editor => {
-  removeListener('editor.selectionChange', handleSelectionChange);
-  removeListener('editor.cursorChange', handleCursorChange);
-  await dispose$x('EditorCompletion');
-  return editor;
-};
-
-const EditorCommandCompletion = {
-  __proto__: null,
-  advance,
-  close,
-  openCompletion,
-  openFromType
-};
-
 const makeExpanded = dirent => {
   if (dirent.type === Directory$1) {
     return {
@@ -42195,11 +41541,11 @@ const Cloud = 2;
 const Tag = 3;
 
 const name$4 = 'custom';
-const state$3 = {
+const state$2 = {
   args: []
 };
 const setArgs = args => {
-  state$3.args = args;
+  state$2.args = args;
 };
 const getPlaceholder$4 = () => {
   return '';
@@ -42218,13 +41564,13 @@ const getNoResults$4 = () => {
   };
 };
 const getPicks$4 = async searchValue => {
-  const items = state$3.args[1] || [];
+  const items = state$2.args[1] || [];
   return items;
 };
 const selectPick$4 = async pick => {
   const {
     args
-  } = state$3;
+  } = state$2;
   const resolve = args[2];
   resolve(pick);
   return {
@@ -42274,7 +41620,7 @@ const QuickPickEntriesCustom = {
   name: name$4,
   selectPick: selectPick$4,
   setArgs,
-  state: state$3
+  state: state$2
 };
 
 const getCommandsFromExtension = extension => {
@@ -42569,7 +41915,7 @@ const getNoResults = () => {
   };
 };
 const getPicks = async searchValue => {
-  const workspace = state$B.workspacePath;
+  const workspace = state$A.workspacePath;
   if (!workspace) {
     return [];
   }
@@ -42578,7 +41924,7 @@ const getPicks = async searchValue => {
   return files;
 };
 const selectPick = async pick => {
-  const workspace = state$B.workspacePath;
+  const workspace = state$A.workspacePath;
   const absolutePath = `${workspace}/${pick}`;
   await execute$4( /* Main.openUri */'Main.openUri', /* uri */absolutePath);
   return {
@@ -42917,18 +42263,18 @@ const launchSearchProcess = async () => {
   return ipc;
 };
 
-const state$2 = {
+const state$1 = {
   /**
    * @type {Promise<any>|undefined}
    */
   ipc: undefined
 };
 const getOrCreate = () => {
-  if (!state$2.ipc) {
+  if (!state$1.ipc) {
     // @ts-ignore
-    state$2.ipc = launchSearchProcess();
+    state$1.ipc = launchSearchProcess();
   }
-  return state$2.ipc;
+  return state$1.ipc;
 };
 const invoke = async (method, ...params) => {
   const ipc = await getOrCreate();
@@ -42955,7 +42301,7 @@ const TextSearchNode = {
 };
 
 const textSearch$3 = (scheme, root, query) => {
-  const entries = Object.entries(state$o.files);
+  const entries = Object.entries(state$n.files);
   const results = [];
   for (const [key, value] of entries) {
     if (value.includes(query)) {
@@ -44778,15 +44124,15 @@ const resolveGit$1 = () => {
   return invoke$7('GitLsFiles.resolveGit');
 };
 
-const state$1 = {
+const state = {
   resolvedGit: ''
 };
 const resolveGit = async () => {
   return resolveGit$1();
 };
 const getOrResolveGit = async () => {
-  state$1.resolvedGit ||= await resolveGit();
-  return state$1.resolvedGit;
+  state.resolvedGit ||= await resolveGit();
+  return state.resolvedGit;
 };
 const searchFile$5 = async (path, value) => {
   const limit = 512;
@@ -44805,14 +44151,14 @@ const searchFile$5 = async (path, value) => {
 const SearchFileWIthGitLsFiles = {
   __proto__: null,
   searchFile: searchFile$5,
-  state: state$1
+  state
 };
 
 const removeLeadingSlash$1 = file => {
   return file.slice(1);
 };
 const searchFile$4 = async (path, value) => {
-  const files = state$o.files;
+  const files = state$n.files;
   const keys = Object.keys(files).map(removeLeadingSlash$1);
   return keys;
 };
@@ -44823,7 +44169,7 @@ const SearchFileWeb = {
 };
 
 const searchFile$3 = async (path, value) => {
-  const files = state$p.files;
+  const files = state$o.files;
   const keys = Object.keys(files);
   return keys;
 };
@@ -44834,7 +44180,7 @@ const SearchFileMemfs = {
 };
 
 const removeLeadingSlash = path => {
-  const workspacePath = state$B.workspacePath;
+  const workspacePath = state$A.workspacePath;
   return path.slice(workspacePath.length - Fetch.length - 2);
 };
 const searchFile$2 = async (path, value) => {