@lvce-editor/server 0.38.0 → 0.38.2

package/static/{88bf6d7 → 6baa369}/packages/renderer-worker/dist/rendererWorkerMain.js

@@ -110,7 +110,7 @@ const getAssetDir = () => {
   // @ts-ignore
   {
     // @ts-ignore
-    return '/88bf6d7';
+    return '/6baa369';
   }
 };
 const assetDir = getAssetDir();
@@ -275,7 +275,7 @@ const set$f = (id, fn) => {
 const get$f = id => {
   return state$1$1.callbacks[id];
 };
-const remove$b = id => {
+const remove$a = id => {
   delete state$1$1.callbacks[id];
 };
 const state$N = {
@@ -318,7 +318,7 @@ const resolve = (id, args) => {
     return;
   }
   fn(args);
-  remove$b(id);
+  remove$a(id);
 };
 const create$2$1 = (method, params) => {
   const {
@@ -1936,7 +1936,7 @@ const readJson$3 = async (uri, encoding) => {
   const fileSystem = await getFileSystem(protocol);
   return fileSystem.readJson(path, encoding);
 };
-const remove$a = async uri => {
+const remove$9 = async uri => {
   const protocol = getProtocol(uri);
   const path = getPath$1(protocol, uri);
   const fileSystem = await getFileSystem(protocol);
@@ -1988,7 +1988,7 @@ const getBlob$4 = async uri => {
   const fileSystem = await getFileSystem(protocol);
   return fileSystem.getBlob(path);
 };
-const copy$a = async (sourceUri, targetUri) => {
+const copy$9 = async (sourceUri, targetUri) => {
   string(sourceUri);
   string(targetUri);
   // TODO what if it is not the same file system?
@@ -2336,7 +2336,7 @@ const get$c = key => {
 const set$d = (key, value) => {
   contexts[key] = value;
 };
-const remove$9 = key => {
+const remove$8 = key => {
   delete contexts[key];
 };
 
@@ -2415,7 +2415,7 @@ const removeKeyBindings = id => {
   update();
 };
 
-const Empty$1 = 0;
+const Empty = 0;
 const BrowserChromium = 1;
 const BrowserElectron = 2;
 const BrowserFirefox = 3;
@@ -2445,8 +2445,6 @@ const FocusDebugScope = 30;
 const FocusSearchReplaceInput = 31;
 const FocusSearchMatchCase = 32;
 const FocusSearchRegex = 33;
-const FocusSearchWholeWord = 34;
-const FocusSearchReplaceAll = 35;
 const FocusSearchPreserveCase = 36;
 const FocusSimpleBrowser = 37;
 const FocusSourceActions = 38;
@@ -2466,7 +2464,7 @@ const FocusEditorCodeGenerator = 52;
 const setFocus = focusKey => {
   number$1(focusKey);
   if (get$b()) {
-    remove$9(get$b());
+    remove$8(get$b());
   }
   set$c(focusKey);
   set$d(get$b(), true);
@@ -2489,7 +2487,7 @@ const getBrowserContextString = browser => {
     case 'chromium':
       return BrowserChromium;
     default:
-      return Empty$1;
+      return Empty;
   }
 };
 const hydrate$9 = async () => {
@@ -3270,7 +3268,7 @@ const getInstance = key => {
 const hasInstance = key => {
   return key in state$z.instances;
 };
-const remove$8 = key => {
+const remove$7 = key => {
   delete state$z.instances[key];
 };
 const getAllInstances = () => {
@@ -3508,12 +3506,6 @@ const pathDirName = path => {
   }
   return path.slice(0, index);
 };
-const getAbsolutePath = relativePath => {
-  if (relativePath.startsWith('./')) {
-    return `${state$y.workspacePath}/${relativePath.slice(2)}`; // TODO support windows paths
-  }
-  return `${state$y.workspacePath}/${relativePath}`; // TODO support windows paths
-};
 
 const getStateToSave = () => {
   const instances = getAllInstances();
@@ -3884,7 +3876,7 @@ const handleVisibilityChange = async visibilityState => {
 
 const saveViewletState = async id => {
   const instance = getInstance(id);
-  const savedState = serializeInstance(instance);
+  const savedState = await serializeInstance(instance);
   await setJson$3(id, savedState);
   if (instance && instance.factory.saveChildState) {
     const childIds = instance.factory.saveChildState(instance.state);
@@ -3983,7 +3975,7 @@ const Iframe = 'Iframe';
 const Implementations = 'Implementations';
 const KeyBindings = 'KeyBindings';
 const Layout = 'Layout';
-const List$3 = 'List';
+const List$2 = 'List';
 const Locations = 'Locations';
 const Main$3 = 'Main';
 const MainTabs = 'MainTabs';
@@ -3996,7 +3988,7 @@ const QuickPick = 'QuickPick';
 const References = 'References';
 const RunAndDebug = 'Run And Debug';
 const ScreenCapture = 'ScreenCapture';
-const Search$5 = 'Search';
+const Search$4 = 'Search';
 const SideBar$2 = 'SideBar';
 const SimpleBrowser$1 = 'SimpleBrowser';
 const SourceControl$3 = 'Source Control';
@@ -4051,7 +4043,7 @@ const ViewletModuleId = {
   InlineDiffEditor: InlineDiffEditor$1,
   KeyBindings,
   Layout,
-  List: List$3,
+  List: List$2,
   Locations,
   Main: Main$3,
   MainTabs,
@@ -4065,7 +4057,7 @@ const ViewletModuleId = {
   References,
   RunAndDebug,
   ScreenCapture,
-  Search: Search$5,
+  Search: Search$4,
   SideBar: SideBar$2,
   SimpleBrowser: SimpleBrowser$1,
   SourceControl: SourceControl$3,
@@ -4718,7 +4710,7 @@ const isQuickPickOpen = () => {
 const closeWidgetElectronQuickPick = async () => {
   const id = QuickPick;
   state$s.isQuickPickOpen = false;
-  remove$8(id);
+  remove$7(id);
   await disposeBrowserViewQuickPick();
   // TODO restore focus to previously focused element
   await focus$a();
@@ -4789,7 +4781,7 @@ const dispose$w = async id => {
     throw new Error(`Failed to dispose viewlet ${id}: ${error}`);
   }
   instance.status = 'disposed';
-  remove$8(id);
+  remove$7(id);
   await emitEvent(`Viewlet.dispose.${id}`);
 };
 const disposeFunctional = id => {
@@ -4826,8 +4818,8 @@ const disposeFunctional = id => {
       }
     }
     instance.status = 'disposed';
-    remove$8(id);
-    remove$8(uid);
+    remove$7(id);
+    remove$7(uid);
     return commands;
   } catch (error) {
     console.error(error);
@@ -4888,8 +4880,8 @@ const hideFunctional = id => {
       }
     }
     instance.status = 'disposed';
-    remove$8(id);
-    remove$8(uid);
+    remove$7(id);
+    remove$7(uid);
     return commands;
   } catch (error) {
     console.error(error);
@@ -5107,8 +5099,8 @@ const disposeWidgetWithValue = async (id, value) => {
       }
     }
     instance.status = 'disposed';
-    remove$8(id);
-    remove$8(uid);
+    remove$7(id);
+    remove$7(uid);
     await invoke$e('Viewlet.sendMultiple', commands);
     // return commands
     const parentInstance = getInstance(KeyBindings);
@@ -5160,7 +5152,7 @@ const getIconTheme = () => {
   return state$r.iconTheme;
 };
 
-const File$6 = '_file';
+const File$5 = '_file';
 const Folder = '_folder';
 const FolderOpen = '_folder_open';
 const None$k = '';
@@ -5170,7 +5162,7 @@ const CharacterDevice = 2;
 const Directory$1 = 3;
 const DirectoryExpanded = 4;
 const DirectoryExpanding = 5;
-const File$5 = 7;
+const File$4 = 7;
 const Socket = 8;
 const Symlink = 9;
 const SymLinkFile = 10;
@@ -5218,7 +5210,7 @@ const getFileNameIcon = file => {
       return getAbsoluteIconPath(iconTheme, languageIcon);
     }
   }
-  return getAbsoluteIconPath(iconTheme, File$6);
+  return getAbsoluteIconPath(iconTheme, File$5);
 };
 const getFileIcon$2 = file => {
   return getFileNameIcon(file.name);
@@ -5258,7 +5250,7 @@ const getFolderIconExpanded = folder => {
 };
 const getIcon$2 = dirent => {
   switch (dirent.type) {
-    case File$5:
+    case File$4:
     case SymLinkFile:
       return getFileIcon$2(dirent);
     case Directory$1:
@@ -5270,7 +5262,7 @@ const getIcon$2 = dirent => {
     case CharacterDevice:
     case BlockDevice:
     case Socket:
-      return getAbsoluteIconPath(getIconTheme(), File$6);
+      return getAbsoluteIconPath(getIconTheme(), File$5);
     default:
       warn$1(`unsupported type ${dirent.type}`);
       return None$k;
@@ -6461,7 +6453,7 @@ const map = {
   [References]: () => Promise.resolve().then(function () { return ViewletReferences_ipc; }),
   [RunAndDebug]: () => Promise.resolve().then(function () { return ViewletRunAndDebug_ipc; }),
   [ScreenCapture]: () => Promise.resolve().then(function () { return ViewletScreenCapture_ipc; }),
-  [Search$5]: () => Promise.resolve().then(function () { return ViewletSearch_ipc; }),
+  [Search$4]: () => Promise.resolve().then(function () { return ViewletSearch_ipc; }),
   [SideBar$2]: () => Promise.resolve().then(function () { return ViewletSideBar_ipc; }),
   [SimpleBrowser$1]: () => Promise.resolve().then(function () { return ViewletSimpleBrowser_ipc; }),
   [SourceControl$3]: () => Promise.resolve().then(function () { return ViewletSourceControl_ipc; }),
@@ -6875,7 +6867,7 @@ const readFile$d = uri => {
     noProviderFoundMessage: 'no file system provider found'
   });
 };
-const remove$7 = uri => {
+const remove$6 = uri => {
   const protocol = getProtocol(uri);
   const path = getPath$1(protocol, uri);
   return executeProvider({
@@ -6972,7 +6964,7 @@ const ExtensionHostFileSystem = {
   mkdir: mkdir$6,
   readDirWithFileTypes: readDirWithFileTypes$7,
   readFile: readFile$d,
-  remove: remove$7,
+  remove: remove$6,
   rename: rename$5,
   writeFile: writeFile$d
 };
@@ -7010,7 +7002,7 @@ const readDirWithFileTypes$6 = () => {
 const rename$4 = async (oldUri, newUri) => {
   throw new Error('not allowed');
 };
-const remove$6 = async path => {
+const remove$5 = async path => {
   throw new Error('not allowed');
 };
 const mkdir$5 = async path => {
@@ -7029,19 +7021,19 @@ const FileSystemApp = {
   name: name$2n,
   readDirWithFileTypes: readDirWithFileTypes$6,
   readFile: readFile$c,
-  remove: remove$6,
+  remove: remove$5,
   rename: rename$4,
   writeFile: writeFile$c
 };
 
 const name$2m = 'Data';
-const copy$9 = (source, target) => {
+const copy$8 = (source, target) => {
   throw new Error('not implemented');
 };
 const readFile$b = path => {
   return path;
 };
-const remove$5 = path => {
+const remove$4 = path => {
   throw new Error('not implemented');
 };
 const rename$3 = (oldUri, newUri) => {
@@ -7066,7 +7058,7 @@ const getPathSeparator$6 = () => {
 
 const FileSystemData = {
   __proto__: null,
-  copy: copy$9,
+  copy: copy$8,
   ensureFile: ensureFile$1,
   getBlobUrl: getBlobUrl$3,
   getPathSeparator: getPathSeparator$6,
@@ -7074,7 +7066,7 @@ const FileSystemData = {
   name: name$2m,
   readDirWithFileTypes: readDirWithFileTypes$5,
   readFile: readFile$b,
-  remove: remove$5,
+  remove: remove$4,
   rename: rename$3,
   writeFile: writeFile$b
 };
@@ -7121,7 +7113,7 @@ const mkdir$3 = uri => {
 const getPathSeparator$5 = () => {
   return Slash$1;
 };
-const remove$4 = uri => {
+const remove$3 = uri => {
   return invoke$b('FileSystemMemory.remove', uri);
 };
 const readDirWithFileTypes$4 = uri => {
@@ -7153,7 +7145,7 @@ const FileSystemMemory = {
   name: name$2l,
   readDirWithFileTypes: readDirWithFileTypes$4,
   readFile: readFile$a,
-  remove: remove$4,
+  remove: remove$3,
   writeFile: writeFile$a
 };
 
@@ -7369,7 +7361,7 @@ const readFile$9 = async path => {
   }
   return file;
 };
-const remove$3 = async path => {
+const remove$2 = async path => {
   throw new Error('not implemented');
 };
 const rename$2 = async (oldPath, newPath) => {
@@ -7446,7 +7438,7 @@ const FileSystemWeb = {
   onDidSave,
   readDirWithFileTypes: readDirWithFileTypes$3,
   readFile: readFile$9,
-  remove: remove$3,
+  remove: remove$2,
   rename: rename$2,
   state: state$l,
   unwatch,
@@ -7474,7 +7466,7 @@ const mkdir$1 = uri => {
 const getPathSeparator$3 = () => {
   return Slash$1;
 };
-const remove$2 = uri => {
+const remove$1 = uri => {
   return invoke$b('FileSystemFetch.remove', uri);
 };
 const readDirWithFileTypes$2 = async uri => {
@@ -7497,7 +7489,7 @@ const FileSystemFetch = {
   name: name$2j,
   readDirWithFileTypes: readDirWithFileTypes$2,
   readFile: readFile$8,
-  remove: remove$2,
+  remove: remove$1,
   state: state$k,
   writeFile: writeFile$8
 };
@@ -7514,7 +7506,7 @@ const toUri = item => {
   }
   return `file://${item}`;
 };
-const copy$8 = (source, target) => {
+const copy$7 = (source, target) => {
   source = toUri(source);
   target = toUri(target);
   return invoke$d(FileSystemCopy, /* source */source, /* target */target);
@@ -7527,7 +7519,7 @@ const readJson$2 = path => {
   path = toUri(path);
   return invoke$d(FileSystemReadJson, /* path */path);
 };
-const remove$1 = path => {
+const remove = path => {
   path = toUri(path);
   return invoke$d(FileSystemRemove$1, /* path */path);
 };
@@ -7584,7 +7576,7 @@ const FileSystemDisk = {
   __proto__: null,
   canBeRestored: canBeRestored$2,
   chmod,
-  copy: copy$8,
+  copy: copy$7,
   ensureFile,
   getBlob: getBlob$1,
   getBlobUrl: getBlobUrl$1,
@@ -7595,7 +7587,7 @@ const FileSystemDisk = {
   readDirWithFileTypes: readDirWithFileTypes$1,
   readFile: readFile$7,
   readJson: readJson$2,
-  remove: remove$1,
+  remove,
   rename: rename$1,
   stat,
   writeFile: writeFile$7
@@ -7618,14 +7610,14 @@ const Prompt = 'prompt';
 const Denied = 'denied';
 
 const Directory = 'directory';
-const File$4 = 'file';
+const File$3 = 'file';
 
 const getDirentType = fileHandleKind => {
   switch (fileHandleKind) {
     case Directory:
       return Directory$1;
-    case File$4:
-      return File$5;
+    case File$3:
+      return File$4;
     default:
       return Unknown$1;
   }
@@ -7641,21 +7633,6 @@ class FileNotFoundError extends Error {
 
 // based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/common/arrays.ts#L625 (License MIT)
 
-const insertInto = (array, start, newItems) => {
-  const originalLength = array.length;
-  const newItemsLength = newItems.length;
-  array.length = originalLength + newItemsLength;
-  // Move the items after the start index, start from the end so that we don't overwrite any value.
-  for (let i = originalLength - 1; i >= start; i--) {
-    array[i + newItemsLength] = array[i];
-  }
-  for (let i = 0; i < newItemsLength; i++) {
-    array[i + start] = newItems[i];
-  }
-};
-const push = (array, newItems) => {
-  insertInto(array, array.length, newItems);
-};
 const last$1 = array => {
   return array.at(-1);
 };
@@ -7674,12 +7651,6 @@ const fromAsync = async asyncIterable => {
 const isLastIndex = (array, index) => {
   return index === array.length - 1;
 };
-const toSpliced = (array, index, deleteCount, ...inserted) => {
-  return [...array.slice(0, index), ...inserted, ...array.slice(index + deleteCount)];
-};
-const remove = (array, index, deleteCount) => {
-  return toSpliced(array, index, deleteCount);
-};
 const removeElement = (array, element) => {
   const index = array.indexOf(element);
   if (index === -1) {
@@ -8707,7 +8678,7 @@ const CallExpression = 'CallExpression';
 const ExportAllDeclaration = 'ExportAllDeclaration';
 const ExportNamedDeclaration = 'ExportNamedDeclaration';
 const ExpressionStatement = 'ExpressionStatement';
-const File$3 = 'File';
+const File$2 = 'File';
 const Import = 'Import';
 const ImportDeclaration = 'ImportDeclaration';
 const Program = 'Program';
@@ -8727,7 +8698,7 @@ const walk = (node, visitor) => {
   }
   visitor(node);
   switch (node.type) {
-    case File$3:
+    case File$2:
       walk(node.program, visitor);
       break;
     case Program:
@@ -8958,7 +8929,7 @@ const UiStrings$s = {
 const ok$1 = () => {
   return i18nString(UiStrings$s.Ok);
 };
-const copy$7 = () => {
+const copy$6 = () => {
   return i18nString(UiStrings$s.Copy);
 };
 
@@ -9085,7 +9056,7 @@ const showAboutElectron = async () => {
   const options = {
     windowId,
     message: productNameLong,
-    buttons: [copy$7(), ok$1()],
+    buttons: [copy$6(), ok$1()],
     type: Info,
     detail
   };
@@ -9825,7 +9796,7 @@ const UiStrings$q = {
   Cancel: 'Cancel',
   Ok: 'Ok'
 };
-const cancel$1 = () => {
+const cancel = () => {
   return i18nString(UiStrings$q.Cancel);
 };
 const ok = () => {
@@ -9835,7 +9806,7 @@ const ok = () => {
 const prompt$1 = async (message, {
   confirmMessage = ok(),
   title = '',
-  cancelMessage = cancel$1()
+  cancelMessage = cancel()
 } = {}) => {
   // TODO always ask shared process for prompts
   // when running in electron it uses native prompts
@@ -10647,7 +10618,7 @@ const openFile$3 = () => {
       return openFileElectron();
   }
 };
-const handleClick$c = async index => {
+const handleClick$b = async index => {
   // @ts-ignore
   const {
     options
@@ -10684,7 +10655,7 @@ const showMessage = async (message, options) => {
       // TODO can this even happen?
       return;
     }
-    await handleClick$c(index);
+    await handleClick$b(index);
   } else {
     await openWidget(Dialog, message, options);
   }
@@ -10694,7 +10665,7 @@ const name$1Y = 'Dialog';
 const Commands$1P = {
   // @ts-ignore
   close: undefined,
-  handleClick: handleClick$c,
+  handleClick: handleClick$b,
   openFile: openFile$3,
   openFolder: openFolder$5,
   showMessage: showMessage
@@ -10891,7 +10862,7 @@ const findAllImplementations = () => {
 const cut$1 = () => {
   return i18nString(UiStrings$p.Cut);
 };
-const copy$6 = () => {
+const copy$5 = () => {
   return i18nString(UiStrings$p.Copy);
 };
 const paste$1 = () => {
@@ -11002,7 +10973,7 @@ const ActivityBar$4 = 1;
 const Edit = 2;
 const Editor$1 = 3;
 const Explorer$2 = 4;
-const File$2 = 5;
+const File$1 = 5;
 const Go = 6;
 const Help$1 = 7;
 const ManageExtension = 8;
@@ -11015,7 +10986,7 @@ const Terminal = 14;
 const TitleBar$1 = 15;
 const View$2 = 16;
 const ActivityBarAdditionalViews = 17;
-const Search$4 = 18;
+const Search$3 = 18;
 const ExtensionDetailReadme = 20;
 const SimpleBrowser = 21;
 const SourceControl$2 = 22;
@@ -11044,7 +11015,7 @@ const getMenuEntries$s = () => {
     command: /* Editor.cut */'Editor.cut'
   }, {
     id: 'copy',
-    label: copy$6(),
+    label: copy$5(),
     flags: None$j,
     command: /* Editor.copy */'Editor.copy'
   }, {
@@ -11110,7 +11081,7 @@ const exit$1 = () => {
   return i18nString(UiStrings$o.Exit);
 };
 
-const id$m = File$2;
+const id$m = File$1;
 const getMenuEntries$r = () => {
   const entries = [{
     id: 'newFile',
@@ -11290,7 +11261,7 @@ const Extensions$1 = 'Extensions';
 const Files = 'Files';
 const Refresh$1 = 'Refresh';
 const RecordKey = 'RecordKey';
-const Search$3 = 'Search';
+const Search$2 = 'Search';
 const SettingsGear = 'SettingsGear';
 const SourceControl$1 = 'SourceControl';
 const SplitHorizontal = 'SplitHorizontal';
@@ -11665,7 +11636,7 @@ const hydrate = async () => {
   // TODO send menu items to electron
   // TODO add listener for when menu items change
 };
-const handleClick$b = async label => {
+const handleClick$a = async label => {
   const commandPair = state$h.commandMap[label];
   if (!commandPair) {
     throw new Error(`no command found for ${label}`);
@@ -11681,7 +11652,7 @@ const name$1V = 'ElectronApplicationMenu';
 
 // prettier-ignore
 const Commands$1L = {
-  handleClick: handleClick$b,
+  handleClick: handleClick$a,
   hydrate: hydrate
 };
 
@@ -11922,7 +11893,7 @@ const Commands$1A = {
   mkdir: mkdir$7,
   readDirWithFileTypes: readDirWithFileTypes$8,
   readFile: readFile$e,
-  remove: remove$a,
+  remove: remove$9,
   writeFile: writeFile$e
 };
 
@@ -11937,7 +11908,9 @@ const Commands$1z = {
   // TODO command necessary?
   // TODO hydrate should be an alias for reload/load
   hydrate: hydrate$4,
-  setIconTheme: setIconTheme
+  setIconTheme: setIconTheme,
+  getFileIcon: getFileIcon$2,
+  getIcon: getIcon$2
 };
 
 const IconTheme_ipc = {
@@ -12271,9 +12244,8 @@ const getMenuEntriesWithKeyBindings = async (id, ...args) => {
 };
 
 const Button$4 = 'button';
-const CheckBox$1 = 'checkbox';
 const Document = 'document';
-const List$2 = 'list';
+const List$1 = 'list';
 const ListItem$1 = 'listitem';
 const Menu$1 = 'menu';
 const MenuBar = 'menubar';
@@ -12302,7 +12274,6 @@ const Button$3 = 'Button';
 const ButtonPrimary = 'ButtonPrimary';
 const Chevron = 'Chevron';
 const ChevronRight = 'ChevronRight';
-const CloseMaskIcon = 'MaskIcon MaskIconClose';
 const DebugButton$1 = 'DebugButton';
 const DebugButtons = 'DebugButtons';
 const DebugConsoleBottom = 'DebugConsoleBottom';
@@ -12333,7 +12304,6 @@ const EditorRowDeletion = 'EditorRow Deletion';
 const EditorRowInsertion = 'EditorRow Insertion';
 const EditorRows = 'EditorRows';
 const EditorTabCloseButton = 'EditorTabCloseButton';
-const Empty = '';
 const Explorer$1 = 'Explorer';
 const ExtensionDetailDescription = 'ExtensionDetailDescription';
 const ExtensionDetailHeader = 'ExtensionDetailHeader';
@@ -12345,8 +12315,6 @@ const Filter$4 = 'Filter';
 const FilterBadge = 'FilterBadge';
 const FocusOutline = 'FocusOutline';
 const Highlight = 'Highlight';
-const HighlightDeleted = 'HighlightDeleted';
-const HighlightInserted = 'HighlightInserted';
 const Icon = 'Icon';
 const IconButton = 'IconButton';
 const InlineDiffEditor = 'InlineDiffEditor';
@@ -12355,7 +12323,6 @@ const InputBox = 'InputBox';
 const Insertion$1 = 'Insertion';
 const Label = 'Label';
 const LabelDetail = 'LabelDetail';
-const List$1 = 'List';
 const LocationList = 'LocationList';
 const LocationsMessage = 'LocationsMessage';
 const MainTab = 'MainTab';
@@ -12364,7 +12331,6 @@ const MarginTopAuto = 'MarginTopAuto';
 const Markdown = 'Markdown';
 const MaskIcon = 'MaskIcon';
 const MaskIconChevronDown = 'MaskIconChevronDown';
-const MaskIconChevronRight = 'MaskIconChevronRight';
 const MediaContent = 'MediaContent';
 const MediaElement = 'MediaElement';
 const MediaErrorMessage = 'MediaErrorMessage';
@@ -12377,7 +12343,6 @@ const MenuItemSubMenu = 'MenuItemSubMenu';
 const MenuItemSubMenuArrowRight = 'MenuItemSubMenuArrowRight';
 const Message$1 = 'Message';
 const MessageAction = 'MessageAction';
-const MultilineInputBox = 'MultilineInputBox';
 const Option$1 = 'Option';
 const PanelTab = 'PanelTab';
 const PanelTabSelected = 'PanelTabSelected';
@@ -12406,14 +12371,6 @@ const SashVertical = 'SashVertical';
 const ScrollBar = 'ScrollBar';
 const ScrollBarLarge = 'ScrollBarLarge';
 const ScrollBarThumb = 'ScrollBarThumb';
-const Search$2 = 'Search';
-const SearchField = 'SearchField';
-const SearchFieldButtons = 'SearchFieldButtons';
-const SearchFieldContainer = 'SearchFieldContainer';
-const SearchHeader = 'SearchHeader';
-const SearchHeaderTop = 'SearchHeaderTop';
-const SearchRemove = 'SearchRemove';
-const SearchToggleButtonExpanded = 'SearchToggleButtonExpanded';
 const Select$2 = 'Select';
 const SimpleBrowserHeader = 'SimpleBrowserHeader';
 const SourceControlBadge = 'SourceControlBadge';
@@ -12440,9 +12397,7 @@ const TitleBarEntryActive = 'TitleBarEntryActive';
 const TitleBarTopLevelEntry = 'TitleBarTopLevelEntry';
 const TitleBarTopLevelEntryLabel = 'TitleBarTopLevelEntryLabel';
 const TreeItem = 'TreeItem';
-const TreeItemActive = 'TreeItemActive';
 const Viewlet = 'Viewlet';
-const ViewletSearchMessage = 'ViewletSearchMessage';
 const Welcome = 'Welcome';
 const WelcomeMessage = 'WelcomeMessage';
 
@@ -12773,8 +12728,6 @@ const THead = 14;
 const Tr = 15;
 const I = 16;
 const Img$1 = 17;
-const Ins = 20;
-const Del = 21;
 const H2$1 = 22;
 const H3$1 = 23;
 const H4$1 = 24;
@@ -12803,7 +12756,6 @@ const Data$1 = 57;
 const Time$1 = 58;
 const Tfoot$1 = 59;
 const Video = 61;
-const TextArea = 62;
 const Select$1 = 63;
 const Option = 64;
 
@@ -13134,7 +13086,7 @@ const getSelectIndexFunction = flags => {
       return selectIndexDefault;
   }
 };
-const selectIndex$4 = async (level, index) => {
+const selectIndex$3 = async (level, index) => {
   const menu = state$c.menus[level];
   // TODO avoid assignment
   menu.focusedIndex = index;
@@ -13148,7 +13100,7 @@ const selectItem$1 = text => {
     for (let i = 0; i < menu.items.length; i++) {
       const item = menu.items[i];
       if (item.label === text) {
-        return selectIndex$4(level, i);
+        return selectIndex$3(level, i);
       }
     }
   }
@@ -13197,7 +13149,7 @@ const handleMouseEnter$1 = async (level, index, enterX, enterY, enterTimeStamp)
     }
   }
   const item = menu.items[index];
-  await focusIndex$a(menu, index);
+  await focusIndex$9(menu, index);
   switch (item.flags) {
     case /* SubMenu */4:
       await showSubMenuAtEnter(menu.level, index, enterX, enterY);
@@ -13216,7 +13168,7 @@ const handleMouseLeave$1 = async () => {
   menu.focusedIndex = -1;
   await invoke$e(/* Menu.focusIndex */'Menu.focusIndex', /* level */menu.level, /* oldFocusedIndex */oldFocusedIndex, /* newFocusedIndex */-1);
 };
-const focusIndex$a = async (menu, index) => {
+const focusIndex$9 = async (menu, index) => {
   if (menu.items.length === 0) {
     return;
   }
@@ -13237,21 +13189,21 @@ const getIndexToFocusNextStartingAt = (items, startIndex) => {
 const getIndexToFocusFirst = items => {
   return getIndexToFocusNextStartingAt(items, 0);
 };
-const focusFirst$9 = async () => {
+const focusFirst$8 = async () => {
   const menu = getCurrentMenu();
   if (menu.items.length === 0) {
     return;
   }
   const indexToFocus = getIndexToFocusFirst(menu.items);
-  await focusIndex$a(menu, indexToFocus);
+  await focusIndex$9(menu, indexToFocus);
 };
 const getIndexToFocusLast = items => {
   return getIndexToFocusPreviousStartingAt(items, items.length - 1);
 };
-const focusLast$9 = async () => {
+const focusLast$8 = async () => {
   const menu = getCurrentMenu();
   const indexToFocus = getIndexToFocusPreviousStartingAt(menu.items, menu.items.length - 1);
-  await focusIndex$a(menu, indexToFocus);
+  await focusIndex$9(menu, indexToFocus);
 };
 
 // TODO this code seems a bit too complicated, maybe it can be simplified
@@ -13269,13 +13221,13 @@ const getIndexToFocusPrevious = menu => {
   const startIndex = menu.focusedIndex === -1 ? menu.items.length - 1 : menu.focusedIndex - 1;
   return getIndexToFocusPreviousStartingAt(menu.items, startIndex);
 };
-const focusPrevious$c = async () => {
+const focusPrevious$b = async () => {
   const menu = getCurrentMenu();
   if (menu.items.length === 0) {
     return;
   }
   const indexToFocus = getIndexToFocusPrevious(menu);
-  await focusIndex$a(menu, indexToFocus);
+  await focusIndex$9(menu, indexToFocus);
 };
 const canBeFocused = item => {
   switch (item.flags) {
@@ -13290,13 +13242,13 @@ const getIndexToFocusNext = menu => {
   const startIndex = menu.focusedIndex + 1;
   return getIndexToFocusNextStartingAt(menu.items, startIndex);
 };
-const focusNext$c = async () => {
+const focusNext$b = async () => {
   const menu = getCurrentMenu();
   if (menu.items.length === 0) {
     return;
   }
   const indexToFocus = getIndexToFocusNext(menu);
-  await focusIndex$a(menu, indexToFocus);
+  await focusIndex$9(menu, indexToFocus);
 };
 
 // TODO handle printable letter and focus item that starts with that letter
@@ -13307,15 +13259,15 @@ const focusNext$c = async () => {
 
 const name$1A = 'Menu';
 const Commands$1p = {
-  focusFirst: focusFirst$9,
-  focusIndex: focusIndex$a,
-  focusLast: focusLast$9,
-  focusNext: focusNext$c,
-  focusPrevious: focusPrevious$c,
+  focusFirst: focusFirst$8,
+  focusIndex: focusIndex$9,
+  focusLast: focusLast$8,
+  focusNext: focusNext$b,
+  focusPrevious: focusPrevious$b,
   handleMouseEnter: handleMouseEnter$1,
   handleMouseLeave: handleMouseLeave$1,
   hide: hide$3,
-  selectIndex: selectIndex$4,
+  selectIndex: selectIndex$3,
   selectItem: selectItem$1,
   show: show$7
 };
@@ -13607,7 +13559,7 @@ const showWithOptions = async (type, text, options) => {
   });
   await invoke$e(/* Notification.createWithOptions */993, /* type */type, /* text */text, /* options */options);
 };
-const handleClick$a = index => {
+const handleClick$9 = index => {
   console.log('handle click');
   const notification = state$9.notifications[0];
   if (!notification.options) {
@@ -13628,7 +13580,7 @@ const name$1w = 'Notification';
 const Commands$1l = {
   create: create$V,
   dispose: dispose$v,
-  handleClick: handleClick$a,
+  handleClick: handleClick$9,
   showWithOptions: showWithOptions
 };
 
@@ -15041,17 +14993,17 @@ const handleClickClose$3 = async state => {
   await closeWidget(About$1);
   return state;
 };
-const handleFocusIn$2 = state => {
+const handleFocusIn$1 = state => {
   setFocus(About);
   return state;
 };
-const focusNext$b = async state => {
+const focusNext$a = async state => {
   const newState = await invoke$a('About.focusNext', state);
   const commands = await invoke$a('About.render', state, newState);
   newState.commands = commands;
   return newState;
 };
-const focusPrevious$b = async state => {
+const focusPrevious$a = async state => {
   const newState = await invoke$a('About.focusPrevious', state);
   const commands = await invoke$a('About.render', state, newState);
   newState.commands = commands;
@@ -15062,9 +15014,9 @@ const Commands$E = {
   handleClickClose: handleClickClose$3,
   handleClickCopy: handleClickCopy,
   handleClickOk: handleClickOk$1,
-  handleFocusIn: handleFocusIn$2,
-  focusNext: focusNext$b,
-  focusPrevious: focusPrevious$b
+  handleFocusIn: handleFocusIn$1,
+  focusNext: focusNext$a,
+  focusPrevious: focusPrevious$a
 };
 
 const Css$G = ["/css/parts/ViewletAbout.css", "/css/parts/ViewletDialog.css"];
@@ -15121,13 +15073,13 @@ const ViewletAbout_ipc = {
   Commands: Commands$E,
   Css: Css$G,
   create: create$R,
-  focusNext: focusNext$b,
-  focusPrevious: focusPrevious$b,
+  focusNext: focusNext$a,
+  focusPrevious: focusPrevious$a,
   getKeyBindings: getKeyBindings$h,
   handleClickClose: handleClickClose$3,
   handleClickCopy,
   handleClickOk: handleClickOk$1,
-  handleFocusIn: handleFocusIn$2,
+  handleFocusIn: handleFocusIn$1,
   hasFunctionalRender: hasFunctionalRender$F,
   hasFunctionalRootRender: hasFunctionalRootRender$n,
   loadContent: loadContent$M,
@@ -15204,9 +15156,9 @@ const getActivityBarItems = () => {
     flags: Tab | Enabled,
     keyShortcuts: 'Control+Shift+E'
   }, {
-    id: Search$5,
+    id: Search$4,
     title: search(),
-    icon: Search$3,
+    icon: Search$2,
     flags: Tab | Enabled,
     keyShortcuts: 'Control+Shift+F'
   }, {
@@ -15282,7 +15234,7 @@ const getFilteredActivityBarItems$1 = (items, height, itemHeight) => {
 const ListItem = 22;
 const ActivityBarItem = 48;
 
-const focusIndex$9 = (state, index) => {
+const focusIndex$8 = (state, index) => {
   return {
     ...state,
     focusedIndex: index,
@@ -15292,7 +15244,7 @@ const focusIndex$9 = (state, index) => {
 
 const ViewletActivityBarFocusIndex = {
   __proto__: null,
-  focusIndex: focusIndex$9
+  focusIndex: focusIndex$8
 };
 
 // TODO rename viewlet parameter to something else (e.g. clicking settings opens context menu not settings viewlet)
@@ -15405,7 +15357,7 @@ const focus$8 = state => {
     focusedIndex
   } = state;
   const indexToFocus = focusedIndex === -1 ? 0 : focusedIndex;
-  return focusIndex$9(state, indexToFocus);
+  return focusIndex$8(state, indexToFocus);
 };
 
 // prettier-ignore
@@ -15418,7 +15370,7 @@ const Commands$D = {
 };
 
 // prettier-ignore
-const LazyCommands$e = {
+const LazyCommands$d = {
   focus: () => Promise.resolve().then(function () { return ViewletActivityBarFocus; }),
   focusFirst: () => Promise.resolve().then(function () { return ViewletActivityBarFocusFirst; }),
   focusIndex: () => Promise.resolve().then(function () { return ViewletActivityBarFocusIndex; }),
@@ -15635,11 +15587,8 @@ const HandleFilterInput = 'handleFilterInput';
 const HandleFocus = 'handleFocus';
 const HandleFocusIn = 'handleFocusIn';
 const HandleFocusOut = 'handleFocusOut';
-const HandleHeaderClick = 'handleHeaderClick';
-const HandleHeaderFocusIn = 'handleHeaderFocusIn';
 const HandleInput = 'handleInput';
 const HandleKeyDown = 'handleKeyDown';
-const HandleListBlur = 'handleListBlur';
 const HandleMouseDown = 'handleMouseDown';
 const HandleMouseOut = 'handleMouseOut';
 const HandleMouseOver = 'handleMouseOver';
@@ -15853,7 +15802,7 @@ const ViewletActivityBar_ipc = {
   Commands: Commands$D,
   Css: Css$F,
   Events: Events$6,
-  LazyCommands: LazyCommands$e,
+  LazyCommands: LazyCommands$d,
   Variables: Variables$8,
   create: create$Q,
   focus: focus$8,
@@ -16108,7 +16057,7 @@ const handleClickClose$2 = async state => {
   await closeWidget(Confirm$1);
   return state;
 };
-const handleFocusIn$1 = state => {
+const handleFocusIn = state => {
   setFocus(Confirm);
   return state;
 };
@@ -16116,7 +16065,7 @@ const handleFocusIn$1 = state => {
 const Commands$A = {
   handleClickClose: handleClickClose$2,
   handleClickOk: handleClickOk,
-  handleFocusIn: handleFocusIn$1
+  handleFocusIn: handleFocusIn
 };
 
 const Css$C = ["/css/parts/ViewletAbout.css", "/css/parts/ViewletDialog.css"];
@@ -16140,7 +16089,7 @@ const renderDialog$1 = {
     return ['Viewlet.setDom2', dom];
   }
 };
-const renderFocus$4 = {
+const renderFocus$3 = {
   isEqual(oldState, newState) {
     return oldState.focused === newState.focused;
   },
@@ -16148,7 +16097,7 @@ const renderFocus$4 = {
     return ['setFocused', newState.focused];
   }
 };
-const render$E = [renderDialog$1, renderFocus$4];
+const render$E = [renderDialog$1, renderFocus$3];
 
 const name$L = 'Confirm';
 
@@ -16161,14 +16110,14 @@ const ViewletConfirm_ipc = {
   handleClickCancel,
   handleClickClose: handleClickClose$2,
   handleClickOk,
-  handleFocusIn: handleFocusIn$1,
+  handleFocusIn,
   hasFunctionalRender: hasFunctionalRender$B,
   hasFunctionalRootRender: hasFunctionalRootRender$k,
   loadContent: loadContent$H,
   name: name$L,
   render: render$E,
   renderDialog: renderDialog$1,
-  renderFocus: renderFocus$4
+  renderFocus: renderFocus$3
 };
 
 const formatResult = result => {
@@ -16208,7 +16157,7 @@ const loadContent$G = async state => {
     text: ''
   };
 };
-const handleInput$6 = (state, value) => {
+const handleInput$5 = (state, value) => {
   return {
     ...state,
     inputValue: value
@@ -16236,7 +16185,7 @@ const clear$2 = state => {
 };
 
 const Commands$z = {
-  handleInput: handleInput$6,
+  handleInput: handleInput$5,
   handleFocus: handleFocus$6,
   evaluate: evaluate,
   clear: clear$2
@@ -16470,7 +16419,7 @@ const ViewletDebugConsole_ipc = {
   getKeyBindings: getKeyBindings$e,
   getQuickPickMenuEntries: getQuickPickMenuEntries$3,
   handleFocus: handleFocus$6,
-  handleInput: handleInput$6,
+  handleInput: handleInput$5,
   hasFunctionalRender: hasFunctionalRender$A,
   loadContent: loadContent$G,
   name: name$K,
@@ -16509,7 +16458,7 @@ const UiStrings$h = {
 const pressDesiredKeyCombinationThenPressEnter = () => {
   return i18nString(UiStrings$h.PressDesiredKeyCombinationThenPressEnter);
 };
-const copy$5 = () => {
+const copy$4 = () => {
   return i18nString(UiStrings$h.Copy);
 };
 const copyCommandId = () => {
@@ -16620,7 +16569,7 @@ const renderValue$3 = {
     return ['setValue', newState.value];
   }
 };
-const renderFocus$3 = {
+const renderFocus$2 = {
   isEqual(oldState, newState) {
     return oldState.focused === newState.focused;
   },
@@ -16637,7 +16586,7 @@ const renderDom$2 = {
     return ['Viewlet.setDom2', dom];
   }
 };
-const render$C = [renderDom$2, renderValue$3, renderFocus$3];
+const render$C = [renderDom$2, renderValue$3, renderFocus$2];
 
 const ViewletDefineKeyBinding_ipc = {
   __proto__: null,
@@ -16691,7 +16640,7 @@ const loadContent$E = (state, savedState, ...args) => {
   };
 };
 const dispose$r = async state => {};
-const handleClick$9 = async (state, index) => {
+const handleClick$8 = async (state, index) => {
   const {
     options
   } = state;
@@ -16710,7 +16659,7 @@ const handleClick$9 = async (state, index) => {
 
 const Commands$x = {
   close: dispose$r,
-  handleClick: handleClick$9
+  handleClick: handleClick$8
 };
 
 const Css$z = ["/css/parts/ViewletDialog.css"];
@@ -16766,7 +16715,7 @@ const ViewletDialog_ipc = {
   Css: Css$z,
   create: create$J,
   dispose: dispose$r,
-  handleClick: handleClick$9,
+  handleClick: handleClick$8,
   hasFunctionalRender: hasFunctionalRender$y,
   loadContent: loadContent$E,
   name: name$J,
@@ -17150,7 +17099,7 @@ const loadContent$D = async (state, savedState) => {
 const Commands$w = {};
 
 // prettier-ignore
-const LazyCommands$d = {
+const LazyCommands$c = {
   setDeltaY: () => Promise.resolve().then(function () { return VirtualListSetDeltaY; }),
   handleWheel: () => Promise.resolve().then(function () { return VirtualListHandleWheel; })
 };
@@ -17591,7 +17540,7 @@ const ViewletDiffEditor_ipc = {
   __proto__: null,
   Commands: Commands$w,
   Css: Css$x,
-  LazyCommands: LazyCommands$d,
+  LazyCommands: LazyCommands$c,
   create: create$H,
   getDynamicCss,
   hasFunctionalRender: hasFunctionalRender$x,
@@ -17686,7 +17635,7 @@ const handleLoad$1 = async state => {
     iframeOrigin
   };
 };
-const handleClickAt$6 = async (state, eventX, eventY) => {
+const handleClickAt$5 = async (state, eventX, eventY) => {
   console.log('click', eventX, eventY);
   return state;
 };
@@ -17712,7 +17661,7 @@ const resize$m = (state, dimensions) => {
 };
 
 const Commands$v = {
-  handleClickAt: handleClickAt$6,
+  handleClickAt: handleClickAt$5,
   handleSashCornerPointerDown: handleSashCornerPointerDown,
   handleSashCornerPointerMove: handleSashCornerPointerMove,
   handleSashCornerPointerUp: handleSashCornerPointerUp
@@ -17816,7 +17765,7 @@ const ViewletE2eTest_ipc = {
   create: create$E,
   executeTest: executeTest$1,
   getKeyBindings: getKeyBindings$d,
-  handleClickAt: handleClickAt$6,
+  handleClickAt: handleClickAt$5,
   handleLoad: handleLoad$1,
   handleSashCornerPointerDown,
   handleSashCornerPointerMove,
@@ -17904,7 +17853,7 @@ const getIndex$3 = (stateY, eventY) => {
   const index = Math.floor((eventY - stateY) / rowHeight);
   return index;
 };
-const handleClickAt$5 = async (state, eventX, eventY) => {
+const handleClickAt$4 = async (state, eventX, eventY) => {
   console.log('click', eventX, eventY);
   const index = getIndex$3(state.y, eventY);
   const item = state.tests[index];
@@ -17916,7 +17865,7 @@ const runAll = state => {
   console.log('run all');
   return state;
 };
-const handleContextMenu$a = async (state, button, x, y) => {
+const handleContextMenu$9 = async (state, button, x, y) => {
   const index = getIndex$3(state.y, y);
   // @ts-ignore
   state.index = index;
@@ -17939,10 +17888,10 @@ const openInNewTab = async state => {
 };
 
 const Commands$u = {
-  handleClickAt: handleClickAt$5,
+  handleClickAt: handleClickAt$4,
   handleLoad: handleLoad,
   runAll: runAll,
-  handleContextMenu: handleContextMenu$a,
+  handleContextMenu: handleContextMenu$9,
   openInNewTab: openInNewTab
 };
 
@@ -18074,8 +18023,8 @@ const ViewletE2eTests_ipc = {
   create: create$D,
   executeTest,
   getKeyBindings: getKeyBindings$c,
-  handleClickAt: handleClickAt$5,
-  handleContextMenu: handleContextMenu$a,
+  handleClickAt: handleClickAt$4,
+  handleContextMenu: handleContextMenu$9,
   handleLoad,
   hasFunctionalRender: hasFunctionalRender$v,
   hasFunctionalRootRender: hasFunctionalRootRender$g,
@@ -19369,7 +19318,7 @@ const compareStringNumeric = (a, b) => {
 const priorityMapFoldersFirst = {
   [Directory$1]: 1,
   [SymLinkFolder]: 1,
-  [File$5]: 0,
+  [File$4]: 0,
   [SymLinkFile]: 0,
   [Unknown$1]: 0,
   [Socket]: 0
@@ -19387,7 +19336,7 @@ const sortExplorerItems = rawDirents => {
   rawDirents.sort(compareDirent);
 };
 
-const focusIndex$8 = (state, index) => {
+const focusIndex$7 = (state, index) => {
   const {
     minLineY,
     maxLineY
@@ -19428,7 +19377,7 @@ const focusIndex$8 = (state, index) => {
 
 const ViewletExplorerFocusIndex = {
   __proto__: null,
-  focusIndex: focusIndex$8
+  focusIndex: focusIndex$7
 };
 
 const getIndexFromPosition = (state, eventX, eventY) => {
@@ -19497,7 +19446,7 @@ const hasSymbolicLinks = rawDirents => {
 };
 const getSymlinkType = type => {
   switch (type) {
-    case File$5:
+    case File$4:
       return SymLinkFile;
     case Directory$1:
       return SymLinkFolder;
@@ -19833,7 +19782,7 @@ const removeDirent = async state => {
   const absolutePath = dirent.path;
   try {
     // TODO handle error
-    await remove$a(absolutePath);
+    await remove$9(absolutePath);
   } catch (error) {
     // TODO vscode shows error as alert (no stacktrace) and retry button
     // maybe should show alert as well, but where to put stacktrace?
@@ -20075,7 +20024,7 @@ const handleFocus$5 = state => {
   setFocus(Explorer);
   return state;
 };
-const refresh$6 = state => {
+const refresh$5 = state => {
   console.log('TODO refresh explorer');
   return state;
 };
@@ -20170,7 +20119,7 @@ const handleClickDirectoryExpanded$1 = (state, dirent, index, keepFocus) => {
 };
 const getClickFn = direntType => {
   switch (direntType) {
-    case File$5:
+    case File$4:
     case SymLinkFile:
       return handleClickFile$1;
     case Directory$1:
@@ -20192,13 +20141,13 @@ const getClickFn = direntType => {
       throw new Error(`unsupported dirent type ${direntType}`);
   }
 };
-const handleClick$8 = (state, index, keepFocus = false) => {
+const handleClick$7 = (state, index, keepFocus = false) => {
   const {
     items,
     minLineY
   } = state;
   if (index === -1) {
-    return focusIndex$8(state, -1);
+    return focusIndex$7(state, -1);
   }
   const actualIndex = index + minLineY;
   const dirent = items[actualIndex];
@@ -20209,18 +20158,18 @@ const handleClick$8 = (state, index, keepFocus = false) => {
   const clickFn = getClickFn(dirent.type);
   return clickFn(state, dirent, actualIndex, keepFocus);
 };
-const handleClickAt$4 = (state, button, x, y) => {
+const handleClickAt$3 = (state, button, x, y) => {
   if (button !== LeftClick) {
     return state;
   }
   const index = getIndexFromPosition(state, x, y);
-  return handleClick$8(state, index);
+  return handleClick$7(state, index);
 };
 const handleClickCurrent$1 = state => {
-  return handleClick$8(state, state.focusedIndex - state.minLineY);
+  return handleClick$7(state, state.focusedIndex - state.minLineY);
 };
 const handleClickCurrentButKeepFocus$1 = state => {
-  return handleClick$8(state, state.focusedIndex - state.minLineY, /* keepFocus */true);
+  return handleClick$7(state, state.focusedIndex - state.minLineY, /* keepFocus */true);
 };
 const scrollUp = () => {};
 const scrollDown$1 = () => {};
@@ -20230,7 +20179,7 @@ const handleClickSymLink = async (state, dirent, index) => {
   const realPath = await getRealPath$1(dirent.path);
   const type = await stat$1(realPath);
   switch (type) {
-    case File$5:
+    case File$4:
       return handleClickFile$1(state, dirent, index);
     default:
       throw new Error(`unsupported file type ${type}`);
@@ -20246,7 +20195,7 @@ const handleArrowRightDirectoryExpanded = (state, dirent) => {
   }
   const nextDirent = items[focusedIndex + 1];
   if (nextDirent.depth === dirent.depth + 1) {
-    return focusIndex$8(state, focusedIndex + 1);
+    return focusIndex$7(state, focusedIndex + 1);
   }
 };
 const handleArrowRight$2 = async state => {
@@ -20259,7 +20208,7 @@ const handleArrowRight$2 = async state => {
   }
   const dirent = items[focusedIndex];
   switch (dirent.type) {
-    case File$5:
+    case File$4:
     case SymLinkFile:
       return state;
     case Directory$1:
@@ -20278,7 +20227,7 @@ const focusParentFolder = state => {
   if (parentStartIndex === -1) {
     return state;
   }
-  return focusIndex$8(state, parentStartIndex);
+  return focusIndex$7(state, parentStartIndex);
 };
 const handleArrowLeft$2 = state => {
   const {
@@ -20291,7 +20240,7 @@ const handleArrowLeft$2 = state => {
   const dirent = items[focusedIndex];
   switch (dirent.type) {
     case Directory$1:
-    case File$5:
+    case File$4:
     case SymLinkFile:
       return focusParentFolder(state);
     case DirectoryExpanded:
@@ -20699,8 +20648,8 @@ const Commands$q = {
   handleArrowLeft: handleArrowLeft$2,
   handleArrowRight: handleArrowRight$2,
   handleBlur: handleBlur$5,
-  handleClick: handleClick$8,
-  handleClickAt: handleClickAt$4,
+  handleClick: handleClick$7,
+  handleClickAt: handleClickAt$3,
   handleClickCurrent: handleClickCurrent$1,
   handleClickCurrentButKeepFocus: handleClickCurrentButKeepFocus$1,
   handleCopy: handleCopy,
@@ -20719,12 +20668,12 @@ const Commands$q = {
   setDeltaY: setDeltaY$2,
   updateEditingValue: updateEditingValue,
   handleFocus: handleFocus$5,
-  refresh: refresh$6,
+  refresh: refresh$5,
   handleClickOpenFolder: handleClickOpenFolder
 };
 
 // prettier-ignore
-const LazyCommands$c = {
+const LazyCommands$b = {
   expandRecursively: () => Promise.resolve().then(function () { return ViewletExplorerExpandRecursively; }),
   focus: () => Promise.resolve().then(function () { return ViewletExplorerFocus; }),
   focusFirst: () => Promise.resolve().then(function () { return ViewletExplorerFocusFirst; }),
@@ -20859,7 +20808,7 @@ const openInIntegratedTerminal = () => {
 const cut = () => {
   return i18nString(UiStrings$g.Cut);
 };
-const copy$4 = () => {
+const copy$3 = () => {
   return i18nString(UiStrings$g.Copy);
 };
 const paste = () => {
@@ -20877,7 +20826,7 @@ const rename = () => {
 const deleteItem = () => {
   return i18nString(UiStrings$g.Delete);
 };
-const refresh$5 = () => {
+const refresh$4 = () => {
   return i18nString(UiStrings$g.RefreshExplorer);
 };
 const collapseAll$4 = () => {
@@ -20932,7 +20881,7 @@ const menuEntryCut = {
 };
 const menuEntryCopy = {
   id: 'copy',
-  label: copy$4(),
+  label: copy$3(),
   flags: RestoreFocus,
   command: 'Explorer.handleCopy'
 };
@@ -20998,7 +20947,7 @@ const getMenuEntries$d = () => {
   switch (focusedDirent.type) {
     case Directory$1:
       return getMenuEntriesDirectory();
-    case File$5:
+    case File$4:
       return getMenuEntriesFile();
     default:
       return getMenuEntriesDefault$1();
@@ -21303,7 +21252,7 @@ const getActions$7 = root => {
     command: 'newFolder'
   }, {
     type: Button,
-    id: refresh$5(),
+    id: refresh$4(),
     icon: Refresh,
     command: 'refresh'
   }, {
@@ -21404,7 +21353,7 @@ const ViewletExplorer_ipc = {
   Commands: Commands$q,
   Css: Css$t,
   Events: Events$4,
-  LazyCommands: LazyCommands$c,
+  LazyCommands: LazyCommands$b,
   cancelEdit,
   collapseAll: collapseAll$5,
   computeRenamedDirent,
@@ -21419,8 +21368,8 @@ const ViewletExplorer_ipc = {
   handleArrowLeft: handleArrowLeft$2,
   handleArrowRight: handleArrowRight$2,
   handleBlur: handleBlur$5,
-  handleClick: handleClick$8,
-  handleClickAt: handleClickAt$4,
+  handleClick: handleClick$7,
+  handleClickAt: handleClickAt$3,
   handleClickCurrent: handleClickCurrent$1,
   handleClickCurrentButKeepFocus: handleClickCurrentButKeepFocus$1,
   handleClickOpenFolder,
@@ -21442,7 +21391,7 @@ const ViewletExplorer_ipc = {
   newFile: newFile$1,
   newFolder: newFolder$1,
   openContainingFolder: openContainingFolder$2,
-  refresh: refresh$6,
+  refresh: refresh$5,
   removeDirent,
   renameDirent: renameDirent$1,
   render: render$t,
@@ -21668,7 +21617,7 @@ const Commands$p = {
 };
 
 // prettier-ignore
-const LazyCommands$b = {
+const LazyCommands$a = {
   handleReadmeContextMenu: () => Promise.resolve().then(function () { return ViewletExtensionDetailHandleReadmeContextMenu; })
 };
 
@@ -21683,7 +21632,7 @@ const UiStrings$f = {
   OpenImageInNewTab: 'Open Image in New Tab',
   SaveImageAs: 'Save Image as'
 };
-const copy$3 = () => {
+const copy$2 = () => {
   return i18nString(UiStrings$f.Copy);
 };
 const openImageInNewTab = () => {
@@ -21721,7 +21670,7 @@ const getMenuEntries$c = props => {
   }
   menuEntries.push({
     id: 'copy',
-    label: copy$3(),
+    label: copy$2(),
     flags: None$j,
     command: 'ClipBoard.execCopy'
   });
@@ -22279,7 +22228,7 @@ const ViewletExtensionDetail_ipc = {
   __proto__: null,
   Commands: Commands$p,
   Css: Css$s,
-  LazyCommands: LazyCommands$b,
+  LazyCommands: LazyCommands$a,
   create: create$w,
   handleIconError,
   hasFunctionalRender: hasFunctionalRender$r,
@@ -22362,7 +22311,7 @@ const UiStrings$e = {
 const noExtensionsFound = () => {
   return i18nString(UiStrings$e.NoExtensionsFound);
 };
-const refresh$4 = () => {
+const refresh$3 = () => {
   return i18nString(UiStrings$e.Refresh);
 };
 const enable = () => {
@@ -22385,7 +22334,7 @@ const viewsAndMoreActions = () => {
 };
 
 // TODO debounce
-const handleInput$5 = async (state, value) => {
+const handleInput$4 = async (state, value) => {
   try {
     const {
       allExtensions,
@@ -22446,7 +22395,7 @@ const handleInput$5 = async (state, value) => {
 
 const ViewletExtensionsHandleInput = {
   __proto__: null,
-  handleInput: handleInput$5
+  handleInput: handleInput$4
 };
 
 const SUGGESTIONS = ['@builtin', '@disabled', '@enabled', '@installed', '@outdated', '@sort:installs', '@id:', '@category'];
@@ -22484,7 +22433,7 @@ const create$v = (id, uri, x, y, width, height) => {
     placeholder: ''
   };
 };
-const getSavedValue$2 = savedState => {
+const getSavedValue$1 = savedState => {
   if (savedState && savedState.searchValue) {
     return savedState.searchValue;
   }
@@ -22494,11 +22443,11 @@ const loadContent$v = async (state, savedState) => {
   const {
     width
   } = state;
-  const searchValue = getSavedValue$2(savedState);
+  const searchValue = getSavedValue$1(savedState);
   // TODO just get local extensions on demand (not when query string is already different)
   const allExtensions = await getAllExtensions();
   const size = getViewletSize(width);
-  const newState = await handleInput$5({
+  const newState = await handleInput$4({
     ...state,
     allExtensions,
     size
@@ -22590,7 +22539,7 @@ const handleBlur$4 = state => {
   };
 };
 
-const LazyCommands$a = {
+const LazyCommands$9 = {
   focusFirst: () => Promise.resolve().then(function () { return VirtualListFocusFirst; }),
   focusIndex: () => Promise.resolve().then(function () { return VirtualListFocusIndex; }),
   focusLast: () => Promise.resolve().then(function () { return VirtualListFocusLast; }),
@@ -22620,7 +22569,7 @@ const Commands$o = {
 };
 
 // prettier-ignore
-const LazyCommands$9 = {
+const LazyCommands$8 = {
   handleClick: () => Promise.resolve().then(function () { return ViewletExtensionsHandleClick; }),
   handleClickCurrent: () => Promise.resolve().then(function () { return ViewletExtensionsHandleClickCurrent; }),
   handleClickCurrentButKeepFocus: () => Promise.resolve().then(function () { return ViewletExtensionsHandleClickCurrentButKeepFocus; }),
@@ -22628,7 +22577,7 @@ const LazyCommands$9 = {
   clearSearchResults: () => Promise.resolve().then(function () { return ViewletExtensionsClearSearchResults; }),
   handleInput: () => Promise.resolve().then(function () { return ViewletExtensionsHandleInput; }),
   handleFocus: () => Promise.resolve().then(function () { return ViewletExtensionsHandleFocus; }),
-  ...LazyCommands$a
+  ...LazyCommands$9
 };
 const wrapCommand$1 = fn => {
   const wrapped = async (state, ...args) => {
@@ -22642,8 +22591,8 @@ const wrapCommand$1 = fn => {
 for (const [key, value] of Object.entries(Commands$o)) {
   Commands$o[key] = wrapCommand$1(value);
 }
-for (const [key, value] of Object.entries(LazyCommands$9)) {
-  LazyCommands$9[key] = async () => {
+for (const [key, value] of Object.entries(LazyCommands$8)) {
+  LazyCommands$8[key] = async () => {
     const module = await value();
     const fn = module[key];
     return {
@@ -22750,7 +22699,7 @@ const render$r = [renderDialog];
 const getActions$6 = () => {
   return [{
     type: Button,
-    id: refresh$4(),
+    id: refresh$3(),
     icon: Refresh
   }, {
     type: Button,
@@ -22808,7 +22757,7 @@ const ViewletExtensions_ipc = {
   __proto__: null,
   Commands: Commands$o,
   Css: Css$r,
-  LazyCommands: LazyCommands$9,
+  LazyCommands: LazyCommands$8,
   closeSuggest,
   create: create$v,
   dispose: dispose$m,
@@ -22908,7 +22857,7 @@ const getDisplayReferences = references => {
         name,
         lineText: '',
         icon: getIcon$2({
-          type: File$5,
+          type: File$4,
           path: reference.uri,
           name
         }),
@@ -22961,7 +22910,7 @@ const UiStrings$d = {
   ManyResultsInManyFiles: '{PH1} results in {PH2} files',
   Locations: 'Locations'
 };
-const noResults$2 = () => {
+const noResults$1 = () => {
   return i18nString(UiStrings$d.NoResults);
 };
 const oneResultInOneFile = () => {
@@ -22970,12 +22919,12 @@ const oneResultInOneFile = () => {
 const locations = () => {
   return i18nString(UiStrings$d.Locations);
 };
-const manyResultsInOneFile$1 = resultCount => {
+const manyResultsInOneFile = resultCount => {
   return i18nString(UiStrings$d.ManyResultsInOneFile, {
     PH1: resultCount
   });
 };
-const manyResultsInManyFiles$1 = (resultCount, fileCount) => {
+const manyResultsInManyFiles = (resultCount, fileCount) => {
   return i18nString(UiStrings$d.ManyResultsInManyFiles, {
     PH1: resultCount,
     PH2: fileCount
@@ -22986,15 +22935,15 @@ const getMessage$1 = (resultCount, fileCount) => {
   number$1(resultCount);
   number$1(fileCount);
   if (resultCount === 0) {
-    return noResults$2();
+    return noResults$1();
   }
   if (resultCount === 1 && fileCount === 1) {
     return oneResultInOneFile();
   }
   if (fileCount === 1) {
-    return manyResultsInOneFile$1(resultCount);
+    return manyResultsInOneFile(resultCount);
   }
-  return manyResultsInManyFiles$1(resultCount, fileCount);
+  return manyResultsInManyFiles(resultCount, fileCount);
 };
 
 const first = () => {
@@ -23083,7 +23032,7 @@ const selectIndexCollapsed = (state, index) => {
     focusedIndex: index
   };
 };
-const selectIndex$3 = (state, index) => {
+const selectIndex$2 = (state, index) => {
   const displayReference = state.displayReferences[index];
   switch (displayReference.type) {
     case Leaf:
@@ -23097,13 +23046,13 @@ const selectIndex$3 = (state, index) => {
       return state;
   }
 };
-const focusIndex$7 = (state, index) => {
+const focusIndex$6 = (state, index) => {
   return {
     ...state,
     focusedIndex: index
   };
 };
-const focusFirst$8 = state => {
+const focusFirst$7 = state => {
   const {
     displayReferences
   } = state;
@@ -23111,50 +23060,50 @@ const focusFirst$8 = state => {
     return state;
   }
   const firstIndex = first();
-  return focusIndex$7(state, firstIndex);
+  return focusIndex$6(state, firstIndex);
 };
-const focusPrevious$a = state => {
+const focusPrevious$9 = state => {
   const {
     displayReferences,
     focusedIndex
   } = state;
   const previousIndex = previousNoCycle(displayReferences, focusedIndex);
-  return focusIndex$7(state, previousIndex);
+  return focusIndex$6(state, previousIndex);
 };
-const focusNext$a = state => {
+const focusNext$9 = state => {
   const {
     displayReferences,
     focusedIndex
   } = state;
   const nextIndex = nextNoCycle(displayReferences, focusedIndex);
-  return focusIndex$7(state, nextIndex);
+  return focusIndex$6(state, nextIndex);
 };
-const focusLast$8 = state => {
+const focusLast$7 = state => {
   const {
     displayReferences
   } = state;
   const lastIndex = last(displayReferences);
-  return focusIndex$7(state, lastIndex);
+  return focusIndex$6(state, lastIndex);
 };
 const selectCurrent$1 = state => {
   if (state.focusedIndex === -1) {
     return state;
   }
-  return selectIndex$3(state, state.focusedIndex);
+  return selectIndex$2(state, state.focusedIndex);
 };
 
 const ViewletLocations = {
   __proto__: null,
   create: create$u,
   dispose: dispose$l,
-  focusFirst: focusFirst$8,
-  focusIndex: focusIndex$7,
-  focusLast: focusLast$8,
-  focusNext: focusNext$a,
-  focusPrevious: focusPrevious$a,
+  focusFirst: focusFirst$7,
+  focusIndex: focusIndex$6,
+  focusLast: focusLast$7,
+  focusNext: focusNext$9,
+  focusPrevious: focusPrevious$9,
   loadContent: loadContent$u,
   selectCurrent: selectCurrent$1,
-  selectIndex: selectIndex$3
+  selectIndex: selectIndex$2
 };
 
 // TODO speed up this function by 130% by not running activation event (onReferences) again and again
@@ -23405,7 +23354,7 @@ const loadContent$s = async (state, savedState) => {
 const Commands$m = {};
 
 // prettier-ignore
-const LazyCommands$8 = {
+const LazyCommands$7 = {
   setDeltaY: () => Promise.resolve().then(function () { return VirtualListSetDeltaY; }),
   handleWheel: () => Promise.resolve().then(function () { return VirtualListHandleWheel; })
 };
@@ -23568,7 +23517,7 @@ const ViewletInlineDiffEditor_ipc = {
   __proto__: null,
   Commands: Commands$m,
   Css: Css$q,
-  LazyCommands: LazyCommands$8,
+  LazyCommands: LazyCommands$7,
   create: create$s,
   getDynamicCss,
   hasFunctionalRender: hasFunctionalRender$o,
@@ -23653,7 +23602,7 @@ const saveState$7 = state => {
     value
   };
 };
-const getSavedValue$1 = savedState => {
+const getSavedValue = savedState => {
   if (savedState && savedState.value) {
     return savedState.value;
   }
@@ -23675,7 +23624,7 @@ const loadContent$r = async (state, savedState) => {
   const keyBindings = await getKeyBindings$i();
   const parsedKeyBindings = await invoke$2('ParseKeyBindings.parseKeyBindings', keyBindings);
   const maxVisibleItems = getMaxVisibleItems(height, searchHeaderHeight, tableHeaderHeight, rowHeight);
-  const savedValue = getSavedValue$1(savedState);
+  const savedValue = getSavedValue(savedState);
   const filteredKeyBindings = await invoke$2('FilterKeyBindings.filterKeyBindings', parsedKeyBindings, savedValue);
   const listHeight = height - searchHeaderHeight - tableHeaderHeight;
   const contentHeight = 2121;
@@ -23703,7 +23652,7 @@ const loadContent$r = async (state, savedState) => {
   newState.commands = commands;
   return newState;
 };
-const handleInput$4 = async (state, value) => {
+const handleInput$3 = async (state, value) => {
   const {
     parsedKeyBindings,
     maxVisibleItems
@@ -23755,7 +23704,7 @@ const getIndex$1 = (state, eventX, eventY) => {
   const row = Math.floor(relativeY / rowHeight);
   return minLineY + row;
 };
-const handleClick$7 = (state, eventX, eventY) => {
+const handleClick$6 = (state, eventX, eventY) => {
   const {
     padding,
     editIconSize,
@@ -23834,13 +23783,13 @@ const handleResizerMove = (state, eventX) => {
     columnWidth3: newColumnWidth3
   };
 };
-const focusFirst$7 = state => {
+const focusFirst$6 = state => {
   return {
     ...state,
     selectedIndex: 0
   };
 };
-const focusLast$7 = state => {
+const focusLast$6 = state => {
   const {
     filteredKeyBindings
   } = state;
@@ -23849,11 +23798,11 @@ const focusLast$7 = state => {
     selectedIndex: filteredKeyBindings.length - 1
   };
 };
-const handleContextMenu$9 = async (state, button, x, y) => {
+const handleContextMenu$8 = async (state, button, x, y) => {
   await show$a(x, y, KeyBindingsTable);
   return state;
 };
-const focusNext$9 = state => {
+const focusNext$8 = state => {
   const {
     selectedIndex,
     filteredKeyBindings
@@ -23863,7 +23812,7 @@ const focusNext$9 = state => {
     selectedIndex: Math.min(selectedIndex + 1, filteredKeyBindings.length - 1)
   };
 };
-const focusPrevious$9 = state => {
+const focusPrevious$8 = state => {
   const {
     selectedIndex
   } = state;
@@ -23874,18 +23823,18 @@ const focusPrevious$9 = state => {
 };
 
 const Commands$l = {
-  handleClick: handleClick$7,
-  handleInput: handleInput$4,
+  handleClick: handleClick$6,
+  handleInput: handleInput$3,
   handleResizerClick: handleResizerClick,
   handleResizerMove: handleResizerMove,
   handleWheel: handleWheel$1,
   handleDoubleClick: handleDoubleClick,
   handleDefineKeyBindingDisposed: handleDefineKeyBindingDisposed,
-  focusNext: focusNext$9,
-  focusPrevious: focusPrevious$9,
-  focusFirst: focusFirst$7,
-  focusLast: focusLast$7,
-  handleContextMenu: handleContextMenu$9
+  focusNext: focusNext$8,
+  focusPrevious: focusPrevious$8,
+  focusFirst: focusFirst$6,
+  focusLast: focusLast$6,
+  handleContextMenu: handleContextMenu$8
 };
 const wrapCommand = fn => {
   const wrapped = async (state, ...args) => {
@@ -23951,7 +23900,7 @@ const id$7 = KeyBindingsTable;
 const getMenuEntries$a = () => {
   return [{
     id: 'copy',
-    label: copy$5(),
+    label: copy$4(),
     flags: None$j,
     command: 'KeyBindings.copy'
   }, {
@@ -24044,16 +23993,16 @@ const ViewletKeyBindings_ipc = {
   Commands: Commands$l,
   Css: Css$p,
   create: create$r,
-  focusFirst: focusFirst$7,
-  focusLast: focusLast$7,
-  focusNext: focusNext$9,
-  focusPrevious: focusPrevious$9,
+  focusFirst: focusFirst$6,
+  focusLast: focusLast$6,
+  focusNext: focusNext$8,
+  focusPrevious: focusPrevious$8,
   getKeyBindings: getKeyBindings$8,
-  handleClick: handleClick$7,
-  handleContextMenu: handleContextMenu$9,
+  handleClick: handleClick$6,
+  handleContextMenu: handleContextMenu$8,
   handleDefineKeyBindingDisposed,
   handleDoubleClick,
-  handleInput: handleInput$4,
+  handleInput: handleInput$3,
   handleResizerClick,
   handleResizerMove,
   handleWheel: handleWheel$1,
@@ -26019,7 +25968,7 @@ const ViewletMainCloseEditor = {
   closeEditor
 };
 
-const focusIndex$6 = async (state, index) => {
+const focusIndex$5 = async (state, index) => {
   const {
     groups,
     tabHeight,
@@ -26098,30 +26047,30 @@ const focus$6 = (state, getIndex) => {
     activeIndex
   } = group;
   const index = getIndex(editors, activeIndex);
-  return focusIndex$6(state, index);
+  return focusIndex$5(state, index);
 };
 const getFirstindex = () => {
   return 0;
 };
-const focusFirst$6 = state => {
+const focusFirst$5 = state => {
   return focus$6(state, getFirstindex);
 };
 const getLastIndex = editors => {
   return editors.length - 1;
 };
-const focusLast$6 = state => {
+const focusLast$5 = state => {
   return focus$6(state, getLastIndex);
 };
 const getPreviousIndex = (editors, activeIndex) => {
   return activeIndex === 0 ? editors.length - 1 : activeIndex - 1;
 };
-const focusPrevious$8 = state => {
+const focusPrevious$7 = state => {
   return focus$6(state, getPreviousIndex);
 };
 const getNextIndex = (editors, activeIndex) => {
   return activeIndex === editors.length - 1 ? 0 : activeIndex + 1;
 };
-const focusNext$8 = state => {
+const focusNext$7 = state => {
   return focus$6(state, getNextIndex);
 };
 
@@ -26160,7 +26109,7 @@ const handleTabClick = (state, button, eventX, eventY) => {
   }
   switch (button) {
     case LeftClick:
-      return focusIndex$6(state, index);
+      return focusIndex$5(state, index);
     case MiddleClick:
       return closeEditor(state, index);
     default:
@@ -26170,11 +26119,11 @@ const handleTabClick = (state, button, eventX, eventY) => {
 
 const ViewletMainFocusIndex = {
   __proto__: null,
-  focusFirst: focusFirst$6,
-  focusIndex: focusIndex$6,
-  focusLast: focusLast$6,
-  focusNext: focusNext$8,
-  focusPrevious: focusPrevious$8,
+  focusFirst: focusFirst$5,
+  focusIndex: focusIndex$5,
+  focusLast: focusLast$5,
+  focusNext: focusNext$7,
+  focusPrevious: focusPrevious$7,
   handleTabClick
 };
 
@@ -26225,7 +26174,7 @@ const openUri = async (state, uri, focus = true, {
   for (let i = 0; i < editors.length; i++) {
     const editor = editors[i];
     if (editor.uri === uri) {
-      return focusIndex$6(state, i);
+      return focusIndex$5(state, i);
     }
   }
   // TODO editor needs to be disposed when closing
@@ -26873,7 +26822,7 @@ const CommandsWithSideEffectsLazy = {
   handleDropFilePath: () => Promise.resolve().then(function () { return ViewletMainHandleDropFilePath; }),
   splitRight: () => Promise.resolve().then(function () { return ViewletMainSplitRight; })
 };
-const LazyCommands$7 = {
+const LazyCommands$6 = {
   handleTabsWheel: () => Promise.resolve().then(function () { return ViewletMainHandleTabsWheel; }),
   handleTabClick: () => Promise.resolve().then(function () { return ViewletMainFocusIndex; }),
   handleTabsPointerOver: () => Promise.resolve().then(function () { return ViewletMainHandleTabsPointerOver; }),
@@ -27197,7 +27146,7 @@ const ViewletMain_ipc = {
   CommandsWithSideEffects,
   CommandsWithSideEffectsLazy,
   Css: Css$n,
-  LazyCommands: LazyCommands$7,
+  LazyCommands: LazyCommands$6,
   Variables: Variables$7,
   contentLoaded: contentLoaded$5,
   create: create$p,
@@ -27653,7 +27602,7 @@ const hidePanel = async state => {
   await execute$4('Layout.hidePanel');
   return state;
 };
-const selectIndex$2 = async (state, index) => {
+const selectIndex$1 = async (state, index) => {
   await openViewlet$1(state, state.views[index]);
   return {
     ...state,
@@ -27672,7 +27621,7 @@ const handleFilterInput$1 = async (state, value) => {
 };
 
 const Commands$f = {
-  selectIndex: selectIndex$2,
+  selectIndex: selectIndex$1,
   hidePanel: hidePanel,
   handleClickAction: handleClickAction,
   handleFilterInput: handleFilterInput$1
@@ -27766,7 +27715,7 @@ const ViewletPanel_ipc = {
   render: render$k,
   resize: resize$f,
   saveState: saveState$4,
-  selectIndex: selectIndex$2,
+  selectIndex: selectIndex$1,
   setBadgeCount
 };
 
@@ -27834,7 +27783,7 @@ const atLineColumn = (line, column) => {
     PH2: column
   });
 };
-const copy$2 = () => {
+const copy$1 = () => {
   return i18nString(UiStrings$b.Copy);
 };
 const clearFilter$1 = () => {
@@ -27949,20 +27898,20 @@ const handleEditorChange = async editor => {
   const problems = await getProblems();
   await execute$4('Problems.setProblems', problems);
 };
-const handleContextMenu$8 = async (state, eventX, eventY) => {
+const handleContextMenu$7 = async (state, eventX, eventY) => {
   await show$a(eventX, eventY, Problems$2);
   return state;
 };
 const contentLoadedEffects$1 = state => {
   addListener('editor.change', handleEditorChange);
 };
-const focusIndex$5 = (state, index) => {
+const focusIndex$4 = (state, index) => {
   return {
     ...state,
     focusedIndex: index
   };
 };
-const focusPrevious$7 = state => {
+const focusPrevious$6 = state => {
   const {
     focusedIndex
   } = state;
@@ -27971,7 +27920,7 @@ const focusPrevious$7 = state => {
     focusedIndex: focusedIndex - 1
   };
 };
-const focusNext$7 = state => {
+const focusNext$6 = state => {
   const {
     focusedIndex
   } = state;
@@ -27980,7 +27929,7 @@ const focusNext$7 = state => {
     focusedIndex: focusedIndex + 1
   };
 };
-const handleClickAt$3 = (state, eventX, eventY) => {
+const handleClickAt$2 = (state, eventX, eventY) => {
   const {
     problems,
     x,
@@ -27989,11 +27938,11 @@ const handleClickAt$3 = (state, eventX, eventY) => {
   } = state;
   setFocus(Problems);
   if (problems.length === 0) {
-    return focusIndex$5(state, -1);
+    return focusIndex$4(state, -1);
   }
   const index = getListIndex(eventX, eventY, x, y, 0, itemHeight);
   if (index > problems.length) {
-    return focusIndex$5(state, -1);
+    return focusIndex$4(state, -1);
   }
   return {
     ...state,
@@ -28123,13 +28072,13 @@ const Commands$e = {
   clearFilter: clearFilter,
   collapseAll: collapseAll$2,
   copyMessage: copyMessage,
-  focusIndex: focusIndex$5,
-  focusNext: focusNext$7,
-  focusPrevious: focusPrevious$7,
+  focusIndex: focusIndex$4,
+  focusNext: focusNext$6,
+  focusPrevious: focusPrevious$6,
   getBadgeCount: getBadgeCount,
-  handleClickAt: handleClickAt$3,
+  handleClickAt: handleClickAt$2,
   handleBlur: handleBlur$2,
-  handleContextMenu: handleContextMenu$8,
+  handleContextMenu: handleContextMenu$7,
   handleFilterInput: handleFilterInput,
   handleArrowLeft: handleArrowLeft$1,
   handleArrowRight: handleArrowRight$1,
@@ -28192,7 +28141,7 @@ const id$6 = Problems$2;
 const getMenuEntries$9 = () => {
   return [{
     id: 'copy',
-    label: copy$2(),
+    label: copy$1(),
     flags: None$j,
     command: 'Problems.copy'
   }, {
@@ -28710,16 +28659,16 @@ const ViewletProblems_ipc = {
   copyMessage,
   create: create$k,
   dispose: dispose$e,
-  focusIndex: focusIndex$5,
-  focusNext: focusNext$7,
-  focusPrevious: focusPrevious$7,
+  focusIndex: focusIndex$4,
+  focusNext: focusNext$6,
+  focusPrevious: focusPrevious$6,
   getBadgeCount,
   getKeyBindings: getKeyBindings$5,
   handleArrowLeft: handleArrowLeft$1,
   handleArrowRight: handleArrowRight$1,
   handleBlur: handleBlur$2,
-  handleClickAt: handleClickAt$3,
-  handleContextMenu: handleContextMenu$8,
+  handleClickAt: handleClickAt$2,
+  handleContextMenu: handleContextMenu$7,
   handleFilterInput,
   handleIconThemeChange: handleIconThemeChange$2,
   hasFunctionalRender: hasFunctionalRender$i,
@@ -28737,7 +28686,7 @@ const ViewletProblems_ipc = {
 };
 
 const CommandPalette = 'quickPick://commandPalette';
-const File$1 = 'quickPick://file';
+const File = 'quickPick://file';
 const EveryThing = 'quickPick://everything';
 const Noop = 'quickPick://noop';
 const Number$2 = 'quickPick://number';
@@ -28751,7 +28700,7 @@ const Custom = 'quickPick://custom';
 const load = moduleId => {
   switch (moduleId) {
     case CommandPalette:
-    case File$1:
+    case File:
     case EveryThing:
     case WorkspaceSymbol$1:
       return Promise.resolve().then(function () { return QuickPickEveryThing; });
@@ -28817,7 +28766,7 @@ const files = () => {
 const goToFile = () => {
   return i18nString(UiStrings$a.GoToFile);
 };
-const noResults$1 = () => {
+const noResults = () => {
   return i18nString(UiStrings$a.NoResults);
 };
 const selectToOpen = () => {
@@ -28844,7 +28793,7 @@ const getHelpEntries$9 = () => {
   return [];
 };
 const getNoResults$a = () => {
-  return noResults$1();
+  return noResults();
 };
 const getPicks$b = async value => {
   return [];
@@ -29378,9 +29327,9 @@ const selectItem = (state, label) => {
   if (index === -1) {
     return state;
   }
-  return selectIndex$1(state, index);
+  return selectIndex(state, index);
 };
-const selectIndex$1 = async (state, index, button = /* left */0) => {
+const selectIndex = async (state, index, button = /* left */0) => {
   const {
     minLineY,
     provider,
@@ -29413,7 +29362,7 @@ const selectIndex$1 = async (state, index, button = /* left */0) => {
   // }
 };
 const selectCurrentIndex = state => {
-  return selectIndex$1(state, state.focusedIndex);
+  return selectIndex(state, state.focusedIndex);
 };
 
 // TODO use reactive Programming
@@ -29431,7 +29380,7 @@ const selectCurrentIndex = state => {
 // })
 
 // TODO merge this with virtual list
-const handleClickAt$2 = (state, x, y) => {
+const handleClickAt$1 = (state, x, y) => {
   const {
     top,
     headerHeight,
@@ -29439,21 +29388,21 @@ const handleClickAt$2 = (state, x, y) => {
   } = state;
   const relativeY = y - top - headerHeight;
   const index = Math.floor(relativeY / itemHeight);
-  return selectIndex$1(state, index);
+  return selectIndex(state, index);
 };
 
 // prettier-ignore
 const Commands$d = {
   handleBlur: handleBlur$1,
-  handleClickAt: handleClickAt$2,
+  handleClickAt: handleClickAt$1,
   handleWheel: handleWheel$3,
   selectCurrentIndex: selectCurrentIndex,
-  selectIndex: selectIndex$1,
+  selectIndex: selectIndex,
   selectItem: selectItem
 };
 
 // prettier-ignore
-const LazyCommands$6 = {
+const LazyCommands$5 = {
   focusFirst: () => Promise.resolve().then(function () { return ViewletQuickPickFocusFirst; }),
   focusIndex: () => Promise.resolve().then(function () { return ViewletQuickPickFocusIndex; }),
   focusLast: () => Promise.resolve().then(function () { return ViewletQuickPickFocusLast; }),
@@ -29681,7 +29630,7 @@ const renderHeight = {
     return [/* method */SetItemsHeight, /* height */height];
   }
 };
-const renderFocus$2 = {
+const renderFocus$1 = {
   isEqual(oldState, newState) {
     return oldState.focused === newState.focused;
   },
@@ -29690,7 +29639,7 @@ const renderFocus$2 = {
     return ['Viewlet.focusSelector', selector];
   }
 };
-const render$i = [renderFocus$2, renderItems$2, renderValue$2, renderCursorOffset, renderFocusedIndex$1, renderHeight];
+const render$i = [renderFocus$1, renderItems$2, renderValue$2, renderCursorOffset, renderFocusedIndex$1, renderHeight];
 
 const name$o = 'QuickPick';
 
@@ -29698,20 +29647,20 @@ const ViewletQuickPick_ipc = {
   __proto__: null,
   Commands: Commands$d,
   Css: Css$j,
-  LazyCommands: LazyCommands$6,
+  LazyCommands: LazyCommands$5,
   Variables: Variables$5,
   create: create$j,
   dispose: dispose$d,
   getKeyBindings: getKeyBindings$4,
   handleBlur: handleBlur$1,
-  handleClickAt: handleClickAt$2,
+  handleClickAt: handleClickAt$1,
   handleWheel: handleWheel$3,
   hasFunctionalRender: hasFunctionalRender$h,
   loadContent: loadContent$j,
   name: name$o,
   render: render$i,
   selectCurrentIndex,
-  selectIndex: selectIndex$1,
+  selectIndex,
   selectItem,
   setDeltaY: setDeltaY$4
 };
@@ -29830,7 +29779,7 @@ const UiStrings$9 = {
   Clear: 'Clear',
   CollapseAll: 'Collapse All'
 };
-const refresh$3 = () => {
+const refresh$2 = () => {
   return i18nString(UiStrings$9.Refresh);
 };
 const clear$1 = () => {
@@ -29843,7 +29792,7 @@ const collapseAll$1 = () => {
 const getActions$3 = () => {
   return [{
     type: Button,
-    id: refresh$3(),
+    id: refresh$2(),
     icon: Refresh$1,
     command: 'refresh'
   }, {
@@ -30596,10 +30545,10 @@ const handleArrowUp = state => {
 const handleArrowDown = state => {
   return state;
 };
-const focusPrevious$6 = state => {
+const focusPrevious$5 = state => {
   return state;
 };
-const focusNext$6 = state => {
+const focusNext$5 = state => {
   return state;
 };
 const setPauseOnExceptions = async (state, value) => {
@@ -30689,8 +30638,8 @@ const Commands$b = {
   handleArrowUp: handleArrowUp,
   handleArrowDown: handleArrowDown,
   handleArrowRight: handleArrowRight,
-  focusPrevious: focusPrevious$6,
-  focusNext: focusNext$6,
+  focusPrevious: focusPrevious$5,
+  focusNext: focusNext$5,
   handleClickCheckBox: handleClickCheckBox
 };
 
@@ -31371,8 +31320,8 @@ const ViewletRunAndDebug_ipc = {
   contentLoaded: contentLoaded$1,
   create: create$h,
   dispose: dispose$b,
-  focusNext: focusNext$6,
-  focusPrevious: focusPrevious$6,
+  focusNext: focusNext$5,
+  focusPrevious: focusPrevious$5,
   getKeyBindings: getKeyBindings$3,
   handleArrowDown,
   handleArrowLeft,
@@ -31499,27 +31448,6 @@ const ViewletScreenCapture_ipc = {
   render: render$g
 };
 
-const getSearchFocusKey = key => {
-  switch (key) {
-    case 'search-value':
-      return FocusSearchInput;
-    case 'search-replace-value':
-      return FocusSearchReplaceInput;
-    case 'Match Case':
-      return FocusSearchMatchCase;
-    case 'Match Whole Word':
-      return FocusSearchWholeWord;
-    case 'Use Regular Expression':
-      return FocusSearchRegex;
-    case 'Replace All':
-      return FocusSearchReplaceAll;
-    case 'Preserve Case':
-      return FocusSearchPreserveCase;
-    default:
-      return Empty$1;
-  }
-};
-
 const textSearchWorkerUrl = `${assetDir}/packages/text-search-worker/dist/textSearchWorkerMain.js`;
 
 const getConfiguredWorkerUrl = () => {
@@ -31549,372 +31477,33 @@ const {
   invokeAndTransfer: invokeAndTransfer$1
 } = getOrCreateWorker(launchTextSearchWorker);
 
-const textSearch = async (root, query, options) => {
-  string(root);
-  string(query);
-  const results = await invoke$1('TextSearch.textSearch', root, query, options, assetDir);
-  return results;
-};
-const cancel = async searchId => {
-  // TODO
-  // await SharedProcess.invoke(
-  //   /* Search.cancel */ 'Search.cancel',
-  //   /* searchId */ state.searchId
-  // )
-};
-
-const File = 1;
-const Match = 2;
-
-const getTextSearchResultCounts = results => {
-  let resultCount = 0;
-  let fileCount = 0;
-  for (const result of results) {
-    switch (result.type) {
-      case File:
-        fileCount++;
-        break;
-      case Match:
-        resultCount++;
-        break;
-    }
-  }
-  return {
-    fileCount,
-    resultCount
-  };
-};
-
-/**
- * @enum {string}
- */
-const UiStrings$6 = {
-  NoResults: 'No results found',
-  Oneresult: '1 result in 1 file',
-  ManyResultsInOneFile: '{PH1} results in 1 file',
-  ManyResultsInManyFiles: '{PH1} results in {PH2} files',
-  ReplaceAll: 'Replace All',
-  Replace: 'Replace',
-  ConfirmReplaceAll: 'Replace All?',
-  ConfirmReplaceOneOccurrenceInOneFile: "Replace 1 occurrence across 1 file with '{PH1}'",
-  ConfirmReplaceOneOccurrenceInOneFileNoValue: 'Replace 1 occurrence across 1 file',
-  ConfirmReplaceManyOccurrencesInOneFile: "Replace {PH1} occurrences across 1 file with '{PH2}'",
-  ConfirmReplaceManyOccurrencesInOneFileNoValue: 'Replace {PH1} occurrences across 1 file',
-  ConfirmReplaceManyOccurrencesInManyFiles: "Replace {PH1} occurrences across {PH2} files with '{PH3}'",
-  ConfirmReplaceManyOccurrencesInManyFilesNoValue: 'Replace {PH1} occurrences across {PH2} files',
-  ReplacedOneOccurrenceInOneFile: "Replaced 1 occurrence across 1 file with '{PH1}'",
-  ReplacedManyOccurrencesInOneFile: "Replaced {PH1} occurrences across 1 file with '{PH2}'",
-  ReplacedManyOccurrencesInManyFiles: "Replaced {PH1} occurrences across {PH2} files with '{PH3}'",
-  CopyPath: 'Copy Path',
-  Dismiss: 'Dismiss',
-  Refresh: 'Refresh',
-  ClearSearchResults: 'Clear Search Results',
-  OpenNewSearchEditor: 'Open New Search Editor',
-  ViewAsTree: 'View as Tree',
-  CollapseAll: 'Collapse All'
-};
-const noResults = () => {
-  return i18nString(UiStrings$6.NoResults);
-};
-const oneResult = () => {
-  return i18nString(UiStrings$6.Oneresult);
-};
-const manyResultsInOneFile = resultCount => {
-  return i18nString(UiStrings$6.ManyResultsInOneFile, {
-    PH1: resultCount
-  });
-};
-const manyResultsInManyFiles = (resultCount, fileResultCount) => {
-  return i18nString(UiStrings$6.ManyResultsInManyFiles, {
-    PH1: resultCount,
-    PH2: fileResultCount
-  });
-};
-const confirmReplaceOneOccurrenceInOneFile = replacement => {
-  return i18nString(UiStrings$6.ConfirmReplaceOneOccurrenceInOneFile, {
-    PH1: replacement
-  });
-};
-const confirmReplaceOneOccurrenceInOneFileNoValue = () => {
-  return i18nString(UiStrings$6.ConfirmReplaceOneOccurrenceInOneFileNoValue);
-};
-const confirmReplaceManyOccurrencesInOneFile = (matchCount, replacement) => {
-  return i18nString(UiStrings$6.ConfirmReplaceManyOccurrencesInOneFile, {
-    PH1: matchCount,
-    PH2: replacement
-  });
-};
-const confirmReplaceManyOccurrencesInOneFileNoValue = matchCount => {
-  return i18nString(UiStrings$6.ConfirmReplaceManyOccurrencesInOneFileNoValue, {
-    PH1: matchCount
-  });
-};
-const confirmReplaceManyOccurrencesInManyFiles = (matchCount, fileCount, replacement) => {
-  number$1(matchCount);
-  number$1(fileCount);
-  string(replacement);
-  return i18nString(UiStrings$6.ConfirmReplaceManyOccurrencesInManyFiles, {
-    PH1: matchCount,
-    PH2: fileCount,
-    PH3: replacement
-  });
-};
-const confirmReplaceManyOccurrencesInManyFilesNoValue = (matchCount, fileCount) => {
-  number$1(matchCount);
-  number$1(fileCount);
-  return i18nString(UiStrings$6.ConfirmReplaceManyOccurrencesInManyFilesNoValue, {
-    PH1: matchCount,
-    PH2: fileCount
-  });
-};
-const replacedOneOccurrenceInOneFile = replacement => {
-  return i18nString(UiStrings$6.ReplacedOneOccurrenceInOneFile, {
-    PH1: replacement
-  });
-};
-const replacedManyOccurrencesInOneFile = (matchCount, replacement) => {
-  return i18nString(UiStrings$6.ReplacedOneOccurrenceInOneFile, {
-    PH1: matchCount,
-    PH2: replacement
-  });
-};
-const replacedManyOccurrencesInManyFiles = (matchCount, fileCount, replacement) => {
-  return i18nString(UiStrings$6.ReplacedManyOccurrencesInManyFiles, {
-    PH1: matchCount,
-    PH2: fileCount,
-    PH3: replacement
-  });
-};
-const replaceAll$2 = () => {
-  return i18nString(UiStrings$6.ReplaceAll);
-};
-const replace = () => {
-  return i18nString(UiStrings$6.Replace);
-};
-const dismiss = () => {
-  return i18nString(UiStrings$6.Dismiss);
-};
-const copyPath = () => {
-  return i18nString(UiStrings$6.CopyPath);
-};
-const refresh$2 = () => {
-  return i18nString(UiStrings$6.Refresh);
-};
-const clearSearchResults$2 = () => {
-  return i18nString(UiStrings$6.ClearSearchResults);
-};
-const openNewSearchEditor = () => {
-  return i18nString(UiStrings$6.OpenNewSearchEditor);
-};
-const viewAsTree$1 = () => {
-  return i18nString(UiStrings$6.ViewAsTree);
-};
-const collapseAll = () => {
-  return i18nString(UiStrings$6.CollapseAll);
-};
-
-const getStatusMessage = (resultCount, fileResultCount) => {
-  number$1(resultCount);
-  number$1(fileResultCount);
-  if (resultCount === 0) {
-    return noResults();
-  }
-  if (resultCount === 1) {
-    return oneResult();
-  }
-  if (fileResultCount === 1) {
-    return manyResultsInOneFile(resultCount);
-  }
-  return manyResultsInManyFiles(resultCount, fileResultCount);
-};
-
-const handleUpdate = async (state, update) => {
-  const partialNewState = {
-    ...state,
-    ...update
-  };
-  try {
-    const {
-      height,
-      itemHeight,
-      minimumSliderSize,
-      headerHeight,
-      matchCase,
-      value,
-      threads,
-      useRegularExpression
-    } = partialNewState;
-    if (isEmptyString(value)) {
-      return {
-        ...partialNewState,
-        minLineY: 0,
-        maxLineY: 0,
-        deltaY: 0,
-        items: [],
-        matchIndex: 0,
-        matchCount: 0,
-        message: '',
-        loaded: true
-      };
-    }
-    const root = state$y.workspacePath;
-    const results = await textSearch(root, value, {
-      threads,
-      isCaseSensitive: matchCase,
-      useRegularExpression
-    });
-    if (!Array.isArray(results)) {
-      throw new TypeError('results must be of type array');
-    }
-    const {
-      fileCount,
-      resultCount
-    } = getTextSearchResultCounts(results);
-    const message = getStatusMessage(resultCount, fileCount);
-    const total = results.length;
-    const contentHeight = total * itemHeight;
-    const listHeight = height - headerHeight;
-    const scrollBarHeight = getScrollBarSize(height, contentHeight, minimumSliderSize);
-    const numberOfVisible = getNumberOfVisibleItems(listHeight, itemHeight);
-    const maxLineY = Math.min(numberOfVisible, total);
-    const finalDeltaY = Math.max(contentHeight - listHeight, 0);
-    return {
-      ...partialNewState,
-      minLineY: 0,
-      deltaY: 0,
-      value,
-      items: results,
-      message,
-      maxLineY: maxLineY,
-      scrollBarHeight,
-      finalDeltaY,
-      threads,
-      fileCount,
-      matchCount: resultCount,
-      loaded: true
-    };
-  } catch (error) {
-    logError(error);
-    return {
-      ...partialNewState,
-      message: `${error}`,
-      items: [],
-      matchCount: 0,
-      fileCount: 0,
-      minLineY: 0,
-      maxLineY: 0
-    };
-  }
-};
-
-const ViewletSearchHandleUpdate = {
-  __proto__: null,
-  handleUpdate
-};
-
 const create$f = (id, uri, x, y, width, height) => {
   return {
     uid: id,
-    searchResults: [],
-    stats: {},
-    searchId: -1,
-    value: '',
-    disposed: false,
-    fileCount: 0,
     x,
     y,
     width,
     height,
-    ...create$I({
-      itemHeight: ListItem,
-      minimumSliderSize: minimumSliderSize,
-      headerHeight: 61 // TODO
-    }),
-    threads: 0,
-    replaceExpanded: false,
-    useRegularExpression: false,
-    matchCase: false,
-    matchWholeWord: false,
-    replacement: '',
-    matchCount: 0,
-    listFocused: false,
-    listFocusedIndex: -1,
-    inputSource: User,
-    workspacePath: state$y.workspacePath,
-    includeValue: '',
-    excludeValue: '',
-    detailsExpanded: false,
-    focus: Empty$1,
-    loaded: false,
-    message: '',
-    collapsedPaths: []
+    commands: []
   };
 };
-const getSavedValue = savedState => {
-  if (savedState && savedState.value) {
-    return savedState.value;
-  }
-  return '';
-};
-const getSavedReplaceExpanded = savedState => {
-  if (savedState && 'replaceExpanded' in savedState) {
-    return savedState.replaceExpanded;
-  }
-  return false;
-};
-const getSavedCollapsedPaths = savedState => {
-  if (savedState && 'collapsedPaths' in savedState && Array.isArray(savedState.collapsedPaths) && savedState.collapsedPaths.every(path => typeof path === 'string')) {
-    return savedState.collapsedPaths;
-  }
-  return [];
-};
-const getThreads = () => {
-  const value = get$d('search.threads');
-  if (typeof value !== 'number' || value < 0 || value > 8) {
-    return 0;
-  }
-  return value;
-};
 const loadContent$f = async (state, savedState) => {
-  const savedValue = getSavedValue(savedState);
-  const savedReplaceExpanded = getSavedReplaceExpanded(savedState);
-  const savedCollapsedPaths = getSavedCollapsedPaths(savedState);
-  const threads = getThreads();
-  if (savedValue) {
-    return handleUpdate(state, {
-      value: savedValue,
-      threads,
-      replaceExpanded: savedReplaceExpanded,
-      inputSource: Script$1,
-      collapsedPaths: savedCollapsedPaths
-    });
-  }
+  await invoke$1('TextSearch.create', state.uid, state.x, state.y, state.width, state.height, state$y.workspacePath, assetDir);
+  await invoke$1('TextSearch.loadContent', state.uid, savedState);
+  const commands = await invoke$1('TextSearch.render', state.uid);
   return {
     ...state,
-    threads,
-    replaceExpanded: savedReplaceExpanded,
-    loaded: true
+    commands
   };
 };
 const handleIconThemeChange$1 = state => {
-  const {
-    items
-  } = state;
-  const newItems = [...items];
   return {
-    ...state,
-    items: newItems
+    ...state
   };
 };
 const dispose$8 = async state => {
-  // TODO cancel pending search
-  // @ts-ignore
-  if (state.state === 'searching') {
-    await cancel();
-  }
   return {
-    ...state,
-    disposed: true
+    ...state
   };
 };
 
@@ -31928,147 +31517,71 @@ const dispose$8 = async state => {
 // TODO send results to renderer process
 // TODO use virtual list because there might be many results
 
-const handleInput$3 = (state, value, inputSource = Script$1) => {
-  return handleUpdate(state, {
-    value,
-    inputSource
-  });
-};
-const submit = state => {
-  return handleUpdate(state, {
-    value: state.value,
-    inputSource: User
-  });
-};
-const focusSearchValue = state => {
-  return {
-    ...state,
-    focus: FocusSearchInput
-  };
-};
-const focusSearchValueNext = state => {
-  const {
-    replaceExpanded
-  } = state;
-  if (replaceExpanded) {
-    return focusReplaceValue(state);
-  }
-  return focusMatchCase(state);
-};
-const focusMatchCasePrevious = state => {
-  const {
-    replaceExpanded
-  } = state;
-  if (replaceExpanded) {
-    return focusReplaceValue(state);
-  }
-  return focusSearchValue(state);
-};
-const focusReplaceValuePrevious = state => {
-  return focusSearchValue(state);
-};
-const focusReplaceValueNext = state => {
-  return focusMatchCase(state);
-};
-const focusRegexNext = state => {
-  return focusPreserveCase(state);
-};
-const focusPreserveCasePrevious = state => {
-  return focusRegex(state);
-};
-const focusReplaceValue = state => {
-  return {
-    ...state,
-    focus: FocusSearchReplaceInput
-  };
-};
-const focusMatchCase = state => {
-  return {
-    ...state,
-    focus: FocusSearchMatchCase
-  };
-};
-const focusPreserveCase = state => {
-  return {
-    ...state,
-    focus: FocusSearchPreserveCase
-  };
-};
-const focusMatchWholeWord = state => {
-  return {
-    ...state,
-    focus: FocusSearchWholeWord
-  };
-};
-const focusRegex = state => {
-  return {
-    ...state,
-    focus: FocusSearchRegex
-  };
-};
-const focusReplaceAll = state => {
-  return {
-    ...state,
-    focus: FocusSearchReplaceAll
-  };
-};
-const handleFocusIn = async (state, key) => {
-  const focusKey = getSearchFocusKey(key);
-  if (state.focus === focusKey) {
-    return state;
-  }
-  setFocus(focusKey);
-  return {
-    ...state,
-    focus: focusKey
+const wrapTextSearchCommand = key => {
+  const fn = async (state, ...args) => {
+    await invoke$1(`TextSearch.${key}`, state.uid, ...args);
+    const commands = await invoke$1('TextSearch.render', state.uid);
+    return {
+      ...state,
+      commands
+    };
   };
+  return fn;
 };
 
 const Commands$a = {
-  focusMatchCase: focusMatchCase,
-  focusMatchCasePrevious: focusMatchCasePrevious,
-  focusMatchWholeWord: focusMatchWholeWord,
-  focusRegex: focusRegex,
-  focusRegexNext: focusRegexNext,
-  focusReplaceAll: focusReplaceAll,
-  focusReplaceValue: focusReplaceValue,
-  focusPreserveCasePrevious: focusPreserveCasePrevious,
-  focusReplaceValueNext: focusReplaceValueNext,
-  focusReplaceValuePrevious: focusReplaceValuePrevious,
-  focusSearchValue: focusSearchValue,
-  focusSearchValueNext: focusSearchValueNext,
-  handleFocusIn: handleFocusIn,
-  handleInput: handleInput$3,
-  submit: submit
-};
-
-// prettier-ignore
-const LazyCommands$5 = {
-  handleContextMenu: () => Promise.resolve().then(function () { return ViewletSearchHandleContextMenu; }),
-  handleContextMenuKeyboard: () => Promise.resolve().then(function () { return ViewletSearchHandleContextMenuKeyBoard; }),
-  handleContextMenuMouseAt: () => Promise.resolve().then(function () { return ViewletSearchHandleContextMenuMouseAt; }),
-  toggleReplace: () => Promise.resolve().then(function () { return ViewletSearchToggleReplace; }),
-  toggleUseRegularExpression: () => Promise.resolve().then(function () { return ViewletSearchToggleUseRegularExpression; }),
-  toggleMatchWholeWord: () => Promise.resolve().then(function () { return ViewletSearchToggleMatchWholeWord; }),
-  toggleMatchCase: () => Promise.resolve().then(function () { return ViewletSearchToggleMatchCase; }),
-  replaceAll: () => Promise.resolve().then(function () { return ViewletSearchReplaceAll; }),
-  handleReplaceInput: () => Promise.resolve().then(function () { return ViewletSearchHandleReplaceInput; }),
-  handleUpdate: () => Promise.resolve().then(function () { return ViewletSearchHandleUpdate; }),
-  handleListFocus: () => Promise.resolve().then(function () { return ViewletSearchHandleListFocus; }),
-  handleListBlur: () => Promise.resolve().then(function () { return ViewletSearchHandleListBlur; }),
-  ...LazyCommands$a,
-  focusFirst: () => Promise.resolve().then(function () { return ViewletSearchFocusFirst; }),
-  focusLast: () => Promise.resolve().then(function () { return ViewletSearchFocusLast; }),
-  focusNext: () => Promise.resolve().then(function () { return ViewletSearchFocusNext; }),
-  focusPrevious: () => Promise.resolve().then(function () { return ViewletSearchFocusPrevious; }),
-  handleClick: () => Promise.resolve().then(function () { return ViewletSearchHandleClick; }),
-  handleClickAt: () => Promise.resolve().then(function () { return ViewletSearchHandleClick; }),
-  selectIndex: () => Promise.resolve().then(function () { return ViewletSearchSelectIndex; }),
-  dismissItem: () => Promise.resolve().then(function () { return ViewletSearchDismissItem; }),
-  copy: () => Promise.resolve().then(function () { return ViewletSearchCopy; }),
-  refresh: () => Promise.resolve().then(function () { return ViewletSearchRefresh; }),
-  clearSearchResults: () => Promise.resolve().then(function () { return ViewletSearchClearSearchResults; })
-};
+  clearSearchResults: wrapTextSearchCommand('clearSearchResults'),
+  copy: wrapTextSearchCommand('copy'),
+  dismissItem: wrapTextSearchCommand('dismissItem'),
+  focusFirst: wrapTextSearchCommand('focusFirst'),
+  focusIndex: wrapTextSearchCommand('focusIndex'),
+  focusLast: wrapTextSearchCommand('focusLast'),
+  focusMatchCase: wrapTextSearchCommand('focusMatchCase'),
+  focusMatchCasePrevious: wrapTextSearchCommand('focusMatchCasePrevious'),
+  focusMatchWholeWord: wrapTextSearchCommand('focusMatchWholeWord'),
+  focusNext: wrapTextSearchCommand('focusNext'),
+  focusNextPage: wrapTextSearchCommand('focusNextPage'),
+  focusPreserveCasePrevious: wrapTextSearchCommand('focusPreserveCasePrevious'),
+  focusPrevious: wrapTextSearchCommand('focusPrevious'),
+  focusPreviousPage: wrapTextSearchCommand('focusPreviousPage'),
+  focusRegex: wrapTextSearchCommand('focusRegex'),
+  focusRegexNext: wrapTextSearchCommand('focusRegexNext'),
+  focusReplaceAll: wrapTextSearchCommand('focusReplaceAll'),
+  focusReplaceValue: wrapTextSearchCommand('focusReplaceValue'),
+  focusReplaceValueNext: wrapTextSearchCommand('focusReplaceValueNext'),
+  focusReplaceValuePrevious: wrapTextSearchCommand('focusReplaceValuePrevious'),
+  focusSearchValue: wrapTextSearchCommand('focusSearchValue'),
+  focusSearchValueNext: wrapTextSearchCommand('focusSearchValueNext'),
+  handleClick: wrapTextSearchCommand('handleClick'),
+  handleClickAt: wrapTextSearchCommand('handleClickAt'),
+  handleContextMenu: wrapTextSearchCommand('handleContextMenu'),
+  handleContextMenuKeyboard: wrapTextSearchCommand('handleContextMenuKeyboard'),
+  handleContextMenuMouseAt: wrapTextSearchCommand('handleContextMenuMouseAt'),
+  handleFocusIn: wrapTextSearchCommand('handleFocusIn'),
+  handleInput: wrapTextSearchCommand('handleInput'),
+  handleListBlur: wrapTextSearchCommand('handleListBlur'),
+  handleListFocus: wrapTextSearchCommand('handleListFocus'),
+  handleReplaceInput: wrapTextSearchCommand('handleReplaceInput'),
+  handleScrollBarCaptureLost: wrapTextSearchCommand('handleScrollBarCaptureLost'),
+  handleScrollBarClick: wrapTextSearchCommand('handleScrollBarClick'),
+  handleScrollBarMove: wrapTextSearchCommand('handleScrollBarMove'),
+  handleScrollBarThumbPointerMove: wrapTextSearchCommand('handleScrollBarThumbPointerMove'),
+  handleTouchEnd: wrapTextSearchCommand('handleTouchEnd'),
+  handleTouchMove: wrapTextSearchCommand('handleTouchMove'),
+  handleTouchStart: wrapTextSearchCommand('handleTouchStart'),
+  handleUpdate: wrapTextSearchCommand('handleUpdate'),
+  handleWheel: wrapTextSearchCommand('handleWheel'),
+  refresh: wrapTextSearchCommand('refresh'),
+  replaceAll: wrapTextSearchCommand('replaceAll'),
+  scrollDown: wrapTextSearchCommand('scrollDown'),
+  selectIndex: wrapTextSearchCommand('selectIndex'),
+  submit: wrapTextSearchCommand('submit'),
+  toggleMatchCase: wrapTextSearchCommand('toggleMatchCase'),
+  toggleMatchWholeWord: wrapTextSearchCommand('toggleMatchWholeWord'),
+  toggleReplace: wrapTextSearchCommand('toggleReplace'),
+  toggleUseRegularExpression: wrapTextSearchCommand('toggleUseRegularExpression')
+};
+const saveState$2 = wrapTextSearchCommand('saveState');
 
 const Css$f = ["/css/parts/SearchToggleButton.css", "/css/parts/ViewletSearch.css"];
 
@@ -32136,7 +31649,57 @@ const getKeyBindings$2 = () => {
   }];
 };
 
-const id$4 = Search$4;
+/**
+ * @enum {string}
+ */
+const UiStrings$6 = {
+  NoResults: 'No results found',
+  Oneresult: '1 result in 1 file',
+  ManyResultsInOneFile: '{PH1} results in 1 file',
+  ManyResultsInManyFiles: '{PH1} results in {PH2} files',
+  ReplaceAll: 'Replace All',
+  Replace: 'Replace',
+  ConfirmReplaceAll: 'Replace All?',
+  ConfirmReplaceOneOccurrenceInOneFile: "Replace 1 occurrence across 1 file with '{PH1}'",
+  ConfirmReplaceOneOccurrenceInOneFileNoValue: 'Replace 1 occurrence across 1 file',
+  ConfirmReplaceManyOccurrencesInOneFile: "Replace {PH1} occurrences across 1 file with '{PH2}'",
+  ConfirmReplaceManyOccurrencesInOneFileNoValue: 'Replace {PH1} occurrences across 1 file',
+  ConfirmReplaceManyOccurrencesInManyFiles: "Replace {PH1} occurrences across {PH2} files with '{PH3}'",
+  ConfirmReplaceManyOccurrencesInManyFilesNoValue: 'Replace {PH1} occurrences across {PH2} files',
+  ReplacedOneOccurrenceInOneFile: "Replaced 1 occurrence across 1 file with '{PH1}'",
+  ReplacedManyOccurrencesInOneFile: "Replaced {PH1} occurrences across 1 file with '{PH2}'",
+  ReplacedManyOccurrencesInManyFiles: "Replaced {PH1} occurrences across {PH2} files with '{PH3}'",
+  CopyPath: 'Copy Path',
+  Dismiss: 'Dismiss',
+  Refresh: 'Refresh',
+  ClearSearchResults: 'Clear Search Results',
+  OpenNewSearchEditor: 'Open New Search Editor',
+  ViewAsTree: 'View as Tree',
+  CollapseAll: 'Collapse All'
+};
+const dismiss = () => {
+  return i18nString(UiStrings$6.Dismiss);
+};
+const copyPath = () => {
+  return i18nString(UiStrings$6.CopyPath);
+};
+const refresh$1 = () => {
+  return i18nString(UiStrings$6.Refresh);
+};
+const clearSearchResults$1 = () => {
+  return i18nString(UiStrings$6.ClearSearchResults);
+};
+const openNewSearchEditor = () => {
+  return i18nString(UiStrings$6.OpenNewSearchEditor);
+};
+const viewAsTree$1 = () => {
+  return i18nString(UiStrings$6.ViewAsTree);
+};
+const collapseAll = () => {
+  return i18nString(UiStrings$6.CollapseAll);
+};
+
+const id$4 = Search$3;
 const getMenuEntries$7 = () => {
   return [{
     id: 'dismiss',
@@ -32161,417 +31724,31 @@ const menus$3 = [MenuEntriesSearch];
 
 const name$l = 'Search';
 
-const getDisplayResult = (result, itemHeight, i, setSize, searchTermLength, replacement, focusedIndex) => {
-  const {
-    type,
-    text,
-    lineNumber,
-    start
-  } = result;
-  const posInSet = i + 1;
-  const top = i * itemHeight;
-  const focused = i === focusedIndex;
-  switch (type) {
-    case File:
-      const path = text;
-      const absolutePath = getAbsolutePath(path);
-      const baseName = pathBaseName(path);
-      return {
-        title: absolutePath,
-        type: File,
-        text: baseName,
-        icon: getFileIcon$2({
-          name: baseName
-        }),
-        posInSet,
-        setSize,
-        top,
-        lineNumber,
-        matchStart: 0,
-        matchLength: 0,
-        replacement: '',
-        depth: 0,
-        matchCount: 0,
-        focused
-      };
-    case Match:
-      return {
-        title: text,
-        type: Match,
-        text: text,
-        icon: '',
-        posInSet,
-        setSize,
-        top,
-        lineNumber,
-        matchStart: start,
-        matchLength: searchTermLength,
-        replacement,
-        depth: 1,
-        matchCount: 0,
-        focused
-      };
-    default:
-      throw new Error('unexpected search result type');
-  }
-};
-
-const getFilteredResults = (results, collapsedPaths) => {
-  const filteredResults = [];
-  let isExcluded = false;
-  for (const result of results) {
-    if (result.type === File) {
-      if (collapsedPaths.includes(result.text)) {
-        isExcluded = true;
-      } else {
-        isExcluded = false;
-      }
-    }
-    if (!isExcluded) {
-      filteredResults.push(result);
-    }
-  }
-  return filteredResults;
-};
-const getDisplayResults = (results, itemHeight, resultCount, searchTerm, minLineY, maxLineY, replacement, collapsedPaths, focusedIndex) => {
-  const displayResults = [];
-  const filteredResults = getFilteredResults(results, collapsedPaths);
-  const setSize = resultCount;
-  const searchTermLength = searchTerm.length;
-  let fileResult = {
-    matchCount: 0
-  };
-  for (let i = minLineY; i < maxLineY; i++) {
-    const result = filteredResults[i];
-    const displayResult = getDisplayResult(result, itemHeight, i, setSize, searchTermLength, replacement, focusedIndex);
-    displayResults.push(displayResult);
-    if (result.type === File) {
-      fileResult = displayResult;
-    } else {
-      fileResult.matchCount++;
-    }
-  }
-  return displayResults;
-};
-
-const getSearchFieldButtonVirtualDom = button => {
-  const {
-    icon,
-    checked,
-    title
-  } = button;
-  return [{
-    type: Div$1,
-    className: `SearchFieldButton ${checked ? 'SearchFieldButtonChecked' : ''}`,
-    title,
-    role: CheckBox$1,
-    ariaChecked: checked,
-    tabIndex: 0,
-    childCount: 1
-  }, {
-    type: Div$1,
-    className: `MaskIcon ${icon}`,
-    childCount: 0
-  }];
-};
-
-const getSearchFieldVirtualDom = (name, placeholder, onInput, insideButtons, outsideButtons, onFocus = '') => {
-  const dom = [{
-    type: Div$1,
-    className: SearchField,
-    role: None$h,
-    childCount: 2
-  }, {
-    type: TextArea,
-    className: MultilineInputBox,
-    spellcheck: false,
-    autocapitalize: 'off',
-    autocorrect: 'off',
-    placeholder,
-    name,
-    onInput,
-    onFocus,
-    childCount: 0
-  }, {
-    type: Div$1,
-    className: SearchFieldButtons,
-    childCount: insideButtons.length
-  }, ...insideButtons.flatMap(getSearchFieldButtonVirtualDom)];
-  if (outsideButtons.length > 0) {
-    dom.unshift({
-      type: Div$1,
-      className: SearchFieldContainer,
-      role: None$h,
-      childCount: 1 + outsideButtons.length
-    });
-    dom.push(...outsideButtons.flatMap(getSearchFieldButtonVirtualDom));
-  }
-  return dom;
-};
-
-const getSearchHeaderVirtualDom = (replaceExpanded, matchCase, matchWholeWord, useRegularExpression, detailsExpanded) => {
-  const dom = [{
-    type: Div$1,
-    className: SearchHeader,
-    role: None$h,
-    childCount: 2,
-    onClick: HandleHeaderClick,
-    onFocusIn: HandleHeaderFocusIn
-  }, {
-    type: Div$1,
-    className: SearchHeaderTop,
-    role: None$h,
-    childCount: 2
-  }, {
-    type: Button$2,
-    className: `IconButton SearchToggleButton ${replaceExpanded ? SearchToggleButtonExpanded : ''}`,
-    title: 'Toggle Replace',
-    ariaLabel: 'Toggle Replace',
-    ariaExpanded: replaceExpanded,
-    childCount: 1,
-    'data-command': 'toggleReplace'
-  }, {
-    type: Div$1,
-    className: `${MaskIcon} ${replaceExpanded ? MaskIconChevronDown : MaskIconChevronRight}`,
-    childCount: 0
-  }, {
-    type: Div$1,
-    className: 'SearchHeaderTopRight',
-    role: None$h,
-    childCount: replaceExpanded ? 2 : 1
-  }, ...getSearchFieldVirtualDom('search-value', 'Search', 'handleInput', [{
-    icon: 'MaskIconCaseSensitive',
-    checked: matchCase,
-    title: 'Match Case'
-  }, {
-    icon: 'MaskIconWholeWord',
-    checked: matchWholeWord,
-    title: 'Match Whole Word'
-  }, {
-    icon: 'MaskIconRegex',
-    checked: useRegularExpression,
-    title: 'Use Regular Expression'
-  }], [])];
-  if (replaceExpanded) {
-    dom.push(...getSearchFieldVirtualDom('search-replace-value', 'Replace', 'handleReplaceInput', [{
-      icon: 'MaskIconPreserveCase',
-      checked: false,
-      title: 'Preserve Case'
-    }], [{
-      icon: 'MaskIconReplaceAll',
-      checked: false,
-      title: 'Replace All'
-    }]));
-  }
-  if (detailsExpanded) {
-    console.log({
-      detailsExpanded
-    });
-    dom[0].childCount++;
-    dom.push({
-      type: Div$1,
-      className: 'SearchHeaderDetails',
-      childCount: 4
-    }, text('files to include'), {
-      type: Input,
-      childCount: 0
-    }, text('files to exclude'), {
-      type: Input,
-      childCount: 0
-    });
-  }
-  return dom;
-};
-
-const PaddingLeft = '1rem';
-const PaddingRight = '12px';
-
-const deleted = {
-  type: Del,
-  className: HighlightDeleted,
-  childCount: 1
-};
-const inserted = {
-  type: Ins,
-  className: HighlightInserted,
-  childCount: 1
-};
-const highlighted = {
-  type: Span$1,
-  className: Highlight,
-  childCount: 1
-};
-const getLabelVirtualDom = (displayText, matchLength, matchStart, replacement) => {
-  const dom = [];
-  const label = {
-    type: Div$1,
-    className: Label + ' Grow',
-    childCount: 1
-  };
-  dom.push(label);
-  if (matchLength) {
-    const before = displayText.slice(0, matchStart);
-    const highlight = displayText.slice(matchStart, matchStart + matchLength);
-    const after = displayText.slice(matchStart + matchLength);
-    if (replacement) {
-      dom.push(text(before), deleted, text(highlight), inserted, text(replacement), text(after));
-      label.childCount = 4;
-    } else {
-      label.childCount = 3;
-      dom.push(text(before), highlighted, text(highlight), text(after));
-    }
-  } else {
-    dom.push(text(displayText));
-  }
-  return dom;
-};
-const renderRow = rowInfo => {
-  // @ts-ignore
-  const {
-    top,
-    type,
-    matchStart,
-    matchLength,
-    text: displayText,
-    title,
-    icon,
-    setSize,
-    posInSet,
-    depth,
-    replacement,
-    matchCount,
-    focused
-  } = rowInfo;
-  const treeItem = {
-    type: Div$1,
-    role: TreeItem$1,
-    className: TreeItem,
-    title,
-    ariaSetSize: setSize,
-    ariaLevel: depth,
-    ariaPosInSet: posInSet,
-    ariaLabel: title,
-    ariaDescription: '',
-    childCount: 1,
-    paddingLeft: `${Number(depth) + 1}rem`,
-    // TODO use classname and dynamic css
-    paddingRight: PaddingRight
-  };
-  if (focused) {
-    treeItem.className += ' ' + TreeItemActive;
-  }
-  switch (type) {
-    case File:
-      treeItem.ariaExpanded = 'true';
-      break;
-  }
-  const dom = [];
-  dom.push(treeItem);
-  if (type === File) {
-    treeItem.childCount += 2;
-    dom.push(getChevronDownVirtualDom(), getFileIconVirtualDom(icon));
-  }
-  dom.push(...getLabelVirtualDom(displayText, matchLength, matchStart, replacement));
-  if (matchCount) {
-    treeItem.childCount++;
-    dom.push(...getBadgeVirtualDom(SourceControlBadge, matchCount));
-  }
-  treeItem.childCount++;
-  dom.push({
-    type: Div$1,
-    className: SearchRemove,
-    childCount: 1
-  }, {
-    type: Div$1,
-    className: CloseMaskIcon,
-    childCount: 0
-  });
-  return dom;
-};
-const getSearchResultsVirtualDom = visibleItems => {
-  return visibleItems.flatMap(renderRow);
-};
-
-const getSearchVirtualDom = (visibleItems, replaceExpanded, matchCase, matchWholeWord, useRegularExpression, message, detailsExpanded, focusOutline) => {
-  /**
-   * @type {any[]}
-   */
-  const dom = [];
-  dom.push({
-    type: Div$1,
-    className: mergeClassNames(Viewlet, Search$2),
-    childCount: 2
-  });
-  dom.push(...getSearchHeaderVirtualDom(replaceExpanded, matchCase, matchWholeWord, useRegularExpression, detailsExpanded));
-  dom.push({
-    type: Div$1,
-    className: ViewletSearchMessage,
-    role: Status,
-    tabIndex: 0,
-    childCount: 1
-  }, text(message));
-  dom.push({
-    type: Div$1,
-    className: mergeClassNames(Viewlet, List$1, focusOutline ? FocusOutline : Empty),
-    role: Tree,
-    tabIndex: 0,
-    childCount: visibleItems.length,
-    onClick: HandleClick,
-    onBlur: HandleListBlur
-  });
-  dom.push(...getSearchResultsVirtualDom(visibleItems));
-  return dom;
-};
-
 const hasFunctionalRender$e = true;
 const hasFunctionalRootRender$8 = true;
 const renderItems$1 = {
   isEqual(oldState, newState) {
-    return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.replacement === newState.replacement && oldState.replaceExpanded === newState.replaceExpanded && oldState.matchCase === newState.matchCase && oldState.matchWholeWord === newState.matchWholeWord && oldState.useRegularExpression === newState.useRegularExpression && oldState.message === newState.message && oldState.detailsExpanded === newState.detailsExpanded && oldState.loaded === newState.loaded && oldState.collapsedPaths === newState.collapsedPaths && oldState.listFocusedIndex === newState.listFocusedIndex && oldState.listFocused === newState.listFocused;
+    return newState.commands.length === 0;
   },
   apply(oldState, newState) {
-    const displayResults = getDisplayResults(newState.items, newState.itemHeight, newState.fileCount, newState.value, newState.minLineY, newState.maxLineY, newState.replacement, newState.collapsedPaths, newState.focusedIndex);
-    const focusOutline = newState.listFocused && newState.listFocusedIndex === -1;
-    const dom = getSearchVirtualDom(displayResults, newState.replaceExpanded, newState.matchCase, newState.matchWholeWord, newState.useRegularExpression, newState.message, newState.detailsExpanded, focusOutline);
-    return ['Viewlet.setDom2', dom];
-  }
-};
-const getSelector = focusKey => {
-  switch (focusKey) {
-    case FocusSearchInput:
-      return '[name="search-value"]';
-    case FocusSearchReplaceInput:
-      return '[name="search-replace-value"]';
-    case FocusSearchMatchCase:
-      return '[title="Match Case"]';
-    case FocusSearchPreserveCase:
-      return '[title="Preserve Case"]';
-    case FocusSearchRegex:
-      return '[title="Use Regular Expression"]';
-    default:
-      return '';
-  }
-};
-const renderFocus$1 = {
-  isEqual(oldState, newState) {
-    return oldState.focus === newState.focus;
+    const commands = newState.commands;
+    // @ts-ignore
+    newState.commands = [];
+    return commands;
   },
-  apply(oldState, newState) {
-    const selector = getSelector(newState.focus);
-    return ['setFocus', selector];
-  }
+  multiple: true
 };
-const render$f = [renderItems$1, renderFocus$1];
+const render$f = [renderItems$1];
 
 const getActions$2 = () => {
   return [{
     type: Button,
-    id: refresh$2(),
+    id: refresh$1(),
     icon: Refresh,
     command: 'refresh'
   }, {
     type: Button,
-    id: clearSearchResults$2(),
+    id: clearSearchResults$1(),
     icon: ClearAll,
     command: 'clearSearchResults'
   }, {
@@ -32608,41 +31785,14 @@ const resize$c = (state, dimensions) => {
   };
 };
 
-const saveState$2 = state => {
-  const {
-    value,
-    replaceExpanded
-  } = state;
-  return {
-    value,
-    replaceExpanded
-  };
-};
-
 const ViewletSearch_ipc = {
   __proto__: null,
   Commands: Commands$a,
   Css: Css$f,
-  LazyCommands: LazyCommands$5,
   create: create$f,
   dispose: dispose$8,
-  focusMatchCase,
-  focusMatchCasePrevious,
-  focusMatchWholeWord,
-  focusPreserveCase,
-  focusPreserveCasePrevious,
-  focusRegex,
-  focusRegexNext,
-  focusReplaceAll,
-  focusReplaceValue,
-  focusReplaceValueNext,
-  focusReplaceValuePrevious,
-  focusSearchValue,
-  focusSearchValueNext,
   getKeyBindings: getKeyBindings$2,
-  handleFocusIn,
   handleIconThemeChange: handleIconThemeChange$1,
-  handleInput: handleInput$3,
   hasFunctionalRender: hasFunctionalRender$e,
   hasFunctionalResize: hasFunctionalResize$9,
   hasFunctionalRootRender: hasFunctionalRootRender$8,
@@ -32652,8 +31802,7 @@ const ViewletSearch_ipc = {
   render: render$f,
   renderActions: renderActions$2,
   resize: resize$c,
-  saveState: saveState$2,
-  submit
+  saveState: saveState$2
 };
 
 const create$e = (id, uri, x, y, width, height) => {
@@ -33339,7 +32488,7 @@ const UiStrings$5 = {
 const inspectElement$2 = () => {
   return i18nString(UiStrings$5.InspectElement);
 };
-const copy$1 = () => {
+const copy = () => {
   return i18nString(UiStrings$5.Copy);
 };
 const openLinkInNewTab = () => {
@@ -33388,7 +32537,7 @@ const getMenuEntriesSelectionText = (x, y, params) => {
   } = params;
   return [{
     id: 'copy',
-    label: copy$1(),
+    label: copy(),
     flags: None$j,
     command: 'ElectronClipBoard.writeText',
     args: [selectionText]
@@ -33579,7 +32728,7 @@ const state$1 = {
   cache: Object.create(null)
 };
 const getContextId = (groupId, type) => {
-  if (type === File$5) {
+  if (type === File$4) {
     return `${groupId}-item`;
   }
   return groupId;
@@ -33718,7 +32867,7 @@ const getDisplayItemsGroup = (group, isExpanded) => {
         decorationIcon: icon,
         decorationIconTitle: iconTitle,
         decorationStrikeThrough: strikeThrough,
-        type: File$5,
+        type: File$4,
         badgeCount: 0,
         groupId: id
       });
@@ -33840,7 +32989,7 @@ const handleInput$1 = (state, text) => {
   };
 };
 const updateIcon = displayItem => {
-  if (displayItem.type === File$5) {
+  if (displayItem.type === File$4) {
     return {
       ...displayItem,
       icon: getFileIcon$2({
@@ -33909,7 +33058,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$a
+  ...LazyCommands$9
 };
 
 const Css$c = ["/css/parts/ViewletSourceControl.css"];
@@ -33972,7 +33121,7 @@ const viewAsTree = () => {
 const commitAndPush = () => {
   return i18nString(UiStrings$4.CommitAndPush);
 };
-const refresh$1 = () => {
+const refresh = () => {
   return i18nString(UiStrings$4.Refresh);
 };
 const messageEnterToCommitOnMaster = () => {
@@ -34031,6 +33180,9 @@ const name$i = 'Source Control';
 
 const emptySourceControlButtons = [];
 
+const PaddingLeft = '1rem';
+const PaddingRight = '12px';
+
 const getLabelClassName = decorationStrikeThrough => {
   let className = Label + ' Grow';
   if (decorationStrikeThrough) {
@@ -34281,7 +33433,7 @@ const getActions$1 = () => {
     command: ''
   }, {
     type: Button,
-    id: refresh$1(),
+    id: refresh(),
     icon: Refresh,
     command: ''
   }];
@@ -34473,7 +33625,7 @@ const itemRightUpdate = (state, newItem) => {
     statusBarItemsRight: newStatusBarItemsRight
   };
 };
-const handleClick$6 = (state, name) => {
+const handleClick$5 = (state, name) => {
   console.log({
     name
   });
@@ -34484,7 +33636,7 @@ const handleClick$6 = (state, name) => {
 
 const Commands$6 = {
   updateStatusBarItems: updateStatusBarItems,
-  handleClick: handleClick$6
+  handleClick: handleClick$5
 };
 
 const Css$b = [];
@@ -34555,7 +33707,7 @@ const ViewletStatusBar_ipc = {
   Variables: Variables$3,
   contentLoadedEffects,
   create: create$b,
-  handleClick: handleClick$6,
+  handleClick: handleClick$5,
   hasFunctionalRender: hasFunctionalRender$a,
   hasFunctionalResize: hasFunctionalResize$6,
   itemLeftCreate,
@@ -34943,7 +34095,7 @@ const addTerminal = async state => {
     selectedIndex: newSelectedIndex
   };
 };
-const focusIndex$4 = async (state, index) => {
+const focusIndex$3 = async (state, index) => {
   object(state);
   number$1(index);
   const {
@@ -34984,7 +34136,7 @@ const focusIndex$4 = async (state, index) => {
   };
 };
 const handleClickTab = (state, index) => {
-  return focusIndex$4(state, index);
+  return focusIndex$3(state, index);
 };
 const resize$6 = (state, dimensions) => {
   const {
@@ -35037,7 +34189,7 @@ const getTerminalTabsDom = (tabs, x, y, width, height, selectedIndex) => {
     left: x,
     width,
     height,
-    role: List$2,
+    role: List$1,
     ariaLabel: 'Terminal tabs'
   }, tabs.length)];
   for (let i = 0; i < tabs.length; i++) {
@@ -35091,7 +34243,7 @@ const ViewletTerminals_ipc = {
   Css: Css$8,
   addTerminal,
   create: create$8,
-  focusIndex: focusIndex$4,
+  focusIndex: focusIndex$3,
   getChildren: getChildren$1,
   handleClickTab,
   hasFunctionalRender: hasFunctionalRender$7,
@@ -36588,7 +35740,7 @@ const help = () => {
 
 const getMenuEntries$4 = () => {
   return [{
-    id: File$2,
+    id: File$1,
     label: file(),
     flags: None$j
   }, {
@@ -36621,7 +35773,7 @@ const MenuEntriesTitleBarWeb = {
 
 const getMenuEntries$3 = () => {
   return [{
-    id: File$2,
+    id: File$1,
     label: file(),
     flags: SubMenu$1
   }, {
@@ -36704,7 +35856,7 @@ const getMenuEntries$2 = () => {
     command: /* Editor.cut */'Editor.cut'
   }, {
     id: 'copy',
-    label: copy$6(),
+    label: copy$5(),
     flags: None$j,
     command: /* Editor.copy */'Editor.copy'
   }, {
@@ -36874,7 +36026,7 @@ const MenuEntriesMain = {
 
 const focus$2 = state => {
   const indexToFocus = state.focusedIndex === -1 ? 0 : state.focusedIndex;
-  return focusIndex$9(state, indexToFocus);
+  return focusIndex$8(state, indexToFocus);
 };
 
 const ViewletActivityBarFocus = {
@@ -36882,47 +36034,47 @@ const ViewletActivityBarFocus = {
   focus: focus$2
 };
 
-const focusFirst$5 = state => {
-  return focusIndex$9(state, 0);
+const focusFirst$4 = state => {
+  return focusIndex$8(state, 0);
 };
 
 const ViewletActivityBarFocusFirst = {
   __proto__: null,
-  focusFirst: focusFirst$5
+  focusFirst: focusFirst$4
 };
 
-const focusLast$5 = state => {
-  return focusIndex$9(state, lastIndex(state.activityBarItems));
+const focusLast$4 = state => {
+  return focusIndex$8(state, lastIndex(state.activityBarItems));
 };
 
 const ViewletActivityBarFocusLast = {
   __proto__: null,
-  focusLast: focusLast$5
+  focusLast: focusLast$4
 };
 
-const focusNext$5 = state => {
+const focusNext$4 = state => {
   // TODO can never be -1 -> always set when sidebar changes
   if (state.focusedIndex === state.activityBarItems.length - 1) {
     return state;
   }
-  return focusIndex$9(state, state.focusedIndex + 1);
+  return focusIndex$8(state, state.focusedIndex + 1);
 };
 
 const ViewletActivityBarFocusNext = {
   __proto__: null,
-  focusNext: focusNext$5
+  focusNext: focusNext$4
 };
 
-const focusPrevious$5 = state => {
+const focusPrevious$4 = state => {
   if (state.focusedIndex === 0) {
     return state;
   }
-  return focusIndex$9(state, state.focusedIndex - 1);
+  return focusIndex$8(state, state.focusedIndex - 1);
 };
 
 const ViewletActivityBarFocusPrevious = {
   __proto__: null,
-  focusPrevious: focusPrevious$5
+  focusPrevious: focusPrevious$4
 };
 
 const handleClickSettings = async (state, x, y, viewletId) => {
@@ -36949,7 +36101,7 @@ const handleClickOther = async (state, x, y, viewletId) => {
   }
   return state;
 };
-const handleClick$5 = async (state, button, index, x, y) => {
+const handleClick$4 = async (state, button, index, x, y) => {
   if (button !== LeftClick) {
     return state;
   }
@@ -36970,7 +36122,7 @@ const handleClick$5 = async (state, button, index, x, y) => {
 
 const ViewletActivityBarHandleClick = {
   __proto__: null,
-  handleClick: handleClick$5
+  handleClick: handleClick$4
 };
 
 const getPosition = (state, index) => {
@@ -36999,7 +36151,7 @@ const selectCurrent = state => {
     return;
   }
   const position = getPosition(state, state.focusedIndex);
-  return handleClick$5(state, LeftClick, state.focusedIndex, position.x, position.y);
+  return handleClick$4(state, LeftClick, state.focusedIndex, position.x, position.y);
 };
 
 const ViewletActivityBarSelectCurrent = {
@@ -37017,14 +36169,14 @@ const ViewletActivityBarHandleFocus = {
   handleFocus: handleFocus$3
 };
 
-const handleContextMenu$7 = async (state, button, x, y) => {
+const handleContextMenu$6 = async (state, button, x, y) => {
   await show$a(x, y, ActivityBar$4);
   return state;
 };
 
 const ViewletActivityBarHandleContextMenu = {
   __proto__: null,
-  handleContextMenu: handleContextMenu$7
+  handleContextMenu: handleContextMenu$6
 };
 
 const setDeltaY = (state, value) => {
@@ -37099,7 +36251,7 @@ const expandRecursively = async state => {
   // TODO this is very inefficient
   const getChildDirentsRecursively = async dirent => {
     switch (dirent.type) {
-      case File$5:
+      case File$4:
         return [dirent];
       case Directory$1:
       case DirectoryExpanding:
@@ -37162,7 +36314,7 @@ const ViewletExplorerFocus = {
   focus: focus$1
 };
 
-const focusFirst$4 = state => {
+const focusFirst$3 = state => {
   const {
     focusedIndex,
     items
@@ -37170,15 +36322,15 @@ const focusFirst$4 = state => {
   if (items.length === 0 || focusedIndex === 0) {
     return state;
   }
-  return focusIndex$8(state, 0);
+  return focusIndex$7(state, 0);
 };
 
 const ViewletExplorerFocusFirst = {
   __proto__: null,
-  focusFirst: focusFirst$4
+  focusFirst: focusFirst$3
 };
 
-const focusLast$4 = state => {
+const focusLast$3 = state => {
   const {
     focusedIndex,
     items
@@ -37187,15 +36339,15 @@ const focusLast$4 = state => {
   if (items.length === 0 || focusedIndex === lastIndex$1) {
     return state;
   }
-  return focusIndex$8(state, lastIndex$1);
+  return focusIndex$7(state, lastIndex$1);
 };
 
 const ViewletExplorerFocusLast = {
   __proto__: null,
-  focusLast: focusLast$4
+  focusLast: focusLast$3
 };
 
-const focusNext$4 = state => {
+const focusNext$3 = state => {
   const {
     focusedIndex,
     items
@@ -37203,16 +36355,16 @@ const focusNext$4 = state => {
   if (focusedIndex === lastIndex(items)) {
     return state;
   }
-  return focusIndex$8(state, focusedIndex + 1);
+  return focusIndex$7(state, focusedIndex + 1);
 };
 
 const ViewletExplorerFocusNext = {
   __proto__: null,
-  focusNext: focusNext$4
+  focusNext: focusNext$3
 };
 
 const focusNone = state => {
-  return focusIndex$8(state, -1);
+  return focusIndex$7(state, -1);
 };
 
 const ViewletExplorerFocusNone = {
@@ -37220,7 +36372,7 @@ const ViewletExplorerFocusNone = {
   focusNone
 };
 
-const focusPrevious$4 = state => {
+const focusPrevious$3 = state => {
   const {
     focusedIndex,
     items
@@ -37230,20 +36382,20 @@ const focusPrevious$4 = state => {
       if (items.length === 0) {
         return state;
       }
-      return focusIndex$8(state, lastIndex(items));
+      return focusIndex$7(state, lastIndex(items));
     case 0:
       return state;
     default:
-      return focusIndex$8(state, focusedIndex - 1);
+      return focusIndex$7(state, focusedIndex - 1);
   }
 };
 
 const ViewletExplorerFocusPrevious = {
   __proto__: null,
-  focusPrevious: focusPrevious$4
+  focusPrevious: focusPrevious$3
 };
 
-const handleContextMenuKeyboard$1 = async state => {
+const handleContextMenuKeyboard = async state => {
   const {
     focusedIndex,
     x,
@@ -37259,10 +36411,10 @@ const handleContextMenuKeyboard$1 = async state => {
 
 const ViewletExplorerHandleContextMenuKeyboard = {
   __proto__: null,
-  handleContextMenuKeyboard: handleContextMenuKeyboard$1
+  handleContextMenuKeyboard
 };
 
-const handleContextMenuMouseAt$1 = async (state, x, y) => {
+const handleContextMenuMouseAt = async (state, x, y) => {
   number$1(x);
   number$1(y);
   const focusedIndex = getIndexFromPosition(state, x, y);
@@ -37276,21 +36428,21 @@ const handleContextMenuMouseAt$1 = async (state, x, y) => {
 
 const ViewletExplorerHandleContextMenuMouseAt = {
   __proto__: null,
-  handleContextMenuMouseAt: handleContextMenuMouseAt$1
+  handleContextMenuMouseAt
 };
 
-const handleContextMenu$6 = (state, button, x, y) => {
+const handleContextMenu$5 = (state, button, x, y) => {
   switch (button) {
     case Keyboard:
-      return handleContextMenuKeyboard$1(state);
+      return handleContextMenuKeyboard(state);
     default:
-      return handleContextMenuMouseAt$1(state, x, y);
+      return handleContextMenuMouseAt(state, x, y);
   }
 };
 
 const ViewletExplorerHandleContextMenu = {
   __proto__: null,
-  handleContextMenu: handleContextMenu$6
+  handleContextMenu: handleContextMenu$5
 };
 
 const isEqual = (a, b) => {
@@ -37392,7 +36544,7 @@ const handleDropIntoFolder = async (state, dirent, index, files) => {
   for (const file of files) {
     const baseName = pathBaseName(file);
     const to = dirent.path + pathSeparator + baseName;
-    await copy$a(file, to);
+    await copy$9(file, to);
   }
   const childDirents = await getChildDirents(pathSeparator, dirent);
   const mergedDirents = getMergedDirents$2(items, index, dirent, childDirents);
@@ -37425,7 +36577,7 @@ const handleDropIndex = (state, index, files) => {
     case Directory$1:
     case DirectoryExpanded:
       return handleDropIntoFolder(state, dirent, index, files);
-    case File$5:
+    case File$4:
       return handleDropIntoFile(state, dirent, index, files);
     default:
       return state;
@@ -37488,7 +36640,7 @@ const handlePasteCopy = async (state, nativeFiles) => {
   // TODO what if folder is big and it takes a long time
   for (const source of nativeFiles.files) {
     const target = join(state.pathSeperator, state.root, getBaseName(state.pathSeparator, source));
-    await copy$a(source, target);
+    await copy$9(source, target);
   }
   const stateNow = getState('Explorer');
   if (stateNow.disposed) {
@@ -37769,7 +36921,7 @@ const acceptEdit = state => {
   } = state;
   switch (editingType) {
     case CreateFile:
-      return acceptCreate(state, File$5, createFile$2);
+      return acceptCreate(state, File$4, createFile$2);
     case CreateFolder:
       return acceptCreate(state, Directory$1, mkdir$7);
     case Rename:
@@ -37841,7 +36993,7 @@ const focusIndexScrollDown = (state, index, listHeight, itemHeight, itemsLength)
     deltaY: newDeltaY
   };
 };
-const focusIndex$3 = (state, index) => {
+const focusIndex$2 = (state, index) => {
   const {
     itemHeight,
     minLineY,
@@ -37878,44 +37030,44 @@ const focusIndex$3 = (state, index) => {
 
 const VirtualListFocusIndex = {
   __proto__: null,
-  focusIndex: focusIndex$3
+  focusIndex: focusIndex$2
 };
 
-const focusFirst$3 = state => {
+const focusFirst$2 = state => {
   const firstIndex = first();
-  return focusIndex$3(state, firstIndex);
+  return focusIndex$2(state, firstIndex);
 };
 
 const VirtualListFocusFirst = {
   __proto__: null,
-  focusFirst: focusFirst$3
+  focusFirst: focusFirst$2
 };
 
-const focusLast$3 = state => {
+const focusLast$2 = state => {
   const {
     items
   } = state;
   const lastIndex = last(items);
-  return focusIndex$3(state, lastIndex);
+  return focusIndex$2(state, lastIndex);
 };
 
 const VirtualListFocusLast = {
   __proto__: null,
-  focusLast: focusLast$3
+  focusLast: focusLast$2
 };
 
-const focusNext$3 = state => {
+const focusNext$2 = state => {
   const {
     focusedIndex,
     items
   } = state;
   const nextIndex = next(items, focusedIndex);
-  return focusIndex$3(state, nextIndex);
+  return focusIndex$2(state, nextIndex);
 };
 
 const VirtualListFocusNext = {
   __proto__: null,
-  focusNext: focusNext$3
+  focusNext: focusNext$2
 };
 
 const focusNextPage = state => {
@@ -37929,7 +37081,7 @@ const focusNextPage = state => {
     return state;
   }
   const indexNextPage = Math.min(maxLineY + (maxLineY - minLineY) - 2, lastIndex(items));
-  return focusIndex$3(state, indexNextPage);
+  return focusIndex$2(state, indexNextPage);
 };
 
 const VirtualListFocusNextPage = {
@@ -37937,7 +37089,7 @@ const VirtualListFocusNextPage = {
   focusNextPage
 };
 
-const focusPrevious$3 = state => {
+const focusPrevious$2 = state => {
   const {
     focusedIndex,
     items
@@ -37946,12 +37098,12 @@ const focusPrevious$3 = state => {
     return state;
   }
   const previousIndex = previous(items, focusedIndex);
-  return focusIndex$3(state, previousIndex);
+  return focusIndex$2(state, previousIndex);
 };
 
 const VirtualListFocusPrevious = {
   __proto__: null,
-  focusPrevious: focusPrevious$3
+  focusPrevious: focusPrevious$2
 };
 
 const focusPreviousPage = state => {
@@ -37964,7 +37116,7 @@ const focusPreviousPage = state => {
     return state;
   }
   const indexPreviousPage = Math.max(minLineY - (maxLineY - minLineY) + 1, 0);
-  return focusIndex$3(state, indexPreviousPage);
+  return focusIndex$2(state, indexPreviousPage);
 };
 
 const VirtualListFocusPreviousPage = {
@@ -38151,7 +37303,7 @@ const VirtualListHandleScrollBarCaptureLost = {
   handleScrollBarCaptureLost
 };
 
-const handleClickAt$1 = async (state, eventX, eventY) => {
+const handleClickAt = async (state, eventX, eventY) => {
   const {
     x,
     y,
@@ -38166,7 +37318,7 @@ const handleClickAt$1 = async (state, eventX, eventY) => {
 
 const VirtualListHandleClickAt = {
   __proto__: null,
-  handleClickAt: handleClickAt$1
+  handleClickAt
 };
 
 const scrollDown = state => {
@@ -38183,7 +37335,7 @@ const VirtualListScrollDown = {
   scrollDown
 };
 
-const handleClick$4 = async (state, index) => {
+const handleClick$3 = async (state, index) => {
   const {
     items,
     minLineY
@@ -38192,19 +37344,19 @@ const handleClick$4 = async (state, index) => {
   const extension = items[actualIndex];
   const uri = `extension-detail://${extension.id}`;
   await execute$4('Main.openUri', uri);
-  return focusIndex$3(state, actualIndex);
+  return focusIndex$2(state, actualIndex);
 };
 
 const ViewletExtensionsHandleClick = {
   __proto__: null,
-  handleClick: handleClick$4
+  handleClick: handleClick$3
 };
 
 const handleClickCurrent = state => {
   const {
     focusedIndex
   } = state;
-  return handleClick$4(state, focusedIndex);
+  return handleClick$3(state, focusedIndex);
 };
 
 const ViewletExtensionsHandleClickCurrent = {
@@ -38216,7 +37368,7 @@ const handleClickCurrentButKeepFocus = state => {
   const {
     focusedIndex
   } = state;
-  return handleClick$4(state, focusedIndex);
+  return handleClick$3(state, focusedIndex);
 };
 
 const ViewletExtensionsHandleClickCurrentButKeepFocus = {
@@ -38225,7 +37377,7 @@ const ViewletExtensionsHandleClickCurrentButKeepFocus = {
 };
 
 // TODO pass index instead
-const handleContextMenu$5 = async (state, button, x, y) => {
+const handleContextMenu$4 = async (state, button, x, y) => {
   // TODO use focused index when when context menu button is -1 (keyboard)
   await show$a(x, y, ManageExtension);
   return state;
@@ -38233,16 +37385,16 @@ const handleContextMenu$5 = async (state, button, x, y) => {
 
 const ViewletExtensionsHandleContextMenu = {
   __proto__: null,
-  handleContextMenu: handleContextMenu$5
+  handleContextMenu: handleContextMenu$4
 };
 
-const clearSearchResults$1 = state => {
-  return handleInput$5(state, '');
+const clearSearchResults = state => {
+  return handleInput$4(state, '');
 };
 
 const ViewletExtensionsClearSearchResults = {
   __proto__: null,
-  clearSearchResults: clearSearchResults$1
+  clearSearchResults
 };
 
 const handleFocus$2 = state => {
@@ -39025,7 +38177,7 @@ const ViewletMainHandleTabsPointerOut = {
   handleTabsPointerOut
 };
 
-const handleContextMenu$4 = async (state, x, y) => {
+const handleContextMenu$3 = async (state, x, y) => {
   number$1(x);
   number$1(y);
   await show$a(x, y, Main$2);
@@ -39034,7 +38186,7 @@ const handleContextMenu$4 = async (state, x, y) => {
 
 const ViewletMainHandleContextMenu = {
   __proto__: null,
-  handleContextMenu: handleContextMenu$4
+  handleContextMenu: handleContextMenu$3
 };
 
 const findFileReferences = state => {
@@ -39757,7 +38909,7 @@ const QuickPickEntriesFile = {
   selectPick
 };
 
-const focusIndex$2 = async (state, index) => {
+const focusIndex$1 = async (state, index) => {
   const {
     provider,
     maxVisibleItems,
@@ -39801,56 +38953,56 @@ const focusIndex$2 = async (state, index) => {
 
 const ViewletQuickPickFocusIndex = {
   __proto__: null,
-  focusIndex: focusIndex$2
+  focusIndex: focusIndex$1
 };
 
-const focusFirst$2 = state => {
-  return focusIndex$2(state, first());
+const focusFirst$1 = state => {
+  return focusIndex$1(state, first());
 };
 
 const ViewletQuickPickFocusFirst = {
   __proto__: null,
-  focusFirst: focusFirst$2
+  focusFirst: focusFirst$1
 };
 
-const focusLast$2 = state => {
+const focusLast$1 = state => {
   const {
     items
   } = state;
-  return focusIndex$2(state, last(items));
+  return focusIndex$1(state, last(items));
 };
 
 const ViewletQuickPickFocusLast = {
   __proto__: null,
-  focusLast: focusLast$2
+  focusLast: focusLast$1
 };
 
-const focusNext$2 = state => {
+const focusNext$1 = state => {
   const {
     items,
     focusedIndex
   } = state;
   const nextIndex = next(items, focusedIndex);
-  return focusIndex$2(state, nextIndex);
+  return focusIndex$1(state, nextIndex);
 };
 
 const ViewletQuickPickFocusNext = {
   __proto__: null,
-  focusNext: focusNext$2
+  focusNext: focusNext$1
 };
 
-const focusPrevious$2 = state => {
+const focusPrevious$1 = state => {
   const {
     items,
     focusedIndex
   } = state;
   const previousIndex = previous(items, focusedIndex);
-  return focusIndex$2(state, previousIndex);
+  return focusIndex$1(state, previousIndex);
 };
 
 const ViewletQuickPickFocusPrevious = {
   __proto__: null,
-  focusPrevious: focusPrevious$2
+  focusPrevious: focusPrevious$1
 };
 
 // TODO when user types letters -> no need to query provider again -> just filter existing results
@@ -40037,604 +39189,6 @@ const ViewletQuickPickHandleBeforeInput = {
   handleBeforeInput
 };
 
-const handleContextMenuKeyboard = async state => {
-  const x = state.x; // TODO
-  const y = state.y; // TODO
-  await show$a(x, y, Search$4);
-  return state;
-};
-
-const ViewletSearchHandleContextMenuKeyBoard = {
-  __proto__: null,
-  handleContextMenuKeyboard
-};
-
-const handleContextMenuMouseAt = async (state, x, y) => {
-  await show$a(x, y, Search$4);
-  return state;
-};
-
-const ViewletSearchHandleContextMenuMouseAt = {
-  __proto__: null,
-  handleContextMenuMouseAt
-};
-
-const handleContextMenu$3 = (state, button, x, y) => {
-  switch (button) {
-    case Keyboard:
-      return handleContextMenuKeyboard(state);
-    default:
-      return handleContextMenuMouseAt(state, x, y);
-  }
-};
-
-const ViewletSearchHandleContextMenu = {
-  __proto__: null,
-  handleContextMenu: handleContextMenu$3
-};
-
-const toggleReplace = state => {
-  const {
-    replaceExpanded
-  } = state;
-  return {
-    ...state,
-    replaceExpanded: !replaceExpanded
-  };
-};
-
-const ViewletSearchToggleReplace = {
-  __proto__: null,
-  toggleReplace
-};
-
-const toggleUseRegularExpression = state => {
-  const {
-    useRegularExpression
-  } = state;
-  return {
-    ...state,
-    useRegularExpression: !useRegularExpression
-  };
-};
-
-const ViewletSearchToggleUseRegularExpression = {
-  __proto__: null,
-  toggleUseRegularExpression
-};
-
-const toggleMatchWholeWord = state => {
-  const {
-    matchWholeWord
-  } = state;
-  return {
-    ...state,
-    matchWholeWord: !matchWholeWord
-  };
-};
-
-const ViewletSearchToggleMatchWholeWord = {
-  __proto__: null,
-  toggleMatchWholeWord
-};
-
-const toggleMatchCase = state => {
-  const {
-    matchCase
-  } = state;
-  return handleUpdate(state, {
-    matchCase: !matchCase
-  });
-};
-
-const ViewletSearchToggleMatchCase = {
-  __proto__: null,
-  toggleMatchCase
-};
-
-const getReplacedAllMessage = (matchCount, fileCount, replacement) => {
-  if (matchCount === 1) {
-    return replacedOneOccurrenceInOneFile(replacement);
-  }
-  if (fileCount === 1) {
-    return replacedManyOccurrencesInOneFile(matchCount, replacement);
-  }
-  return replacedManyOccurrencesInManyFiles(matchCount, fileCount, replacement);
-};
-
-const getReplaceAllConfirmText = (matchCount, fileCount, replacement) => {
-  if (matchCount === 1) {
-    if (replacement) {
-      return confirmReplaceOneOccurrenceInOneFile(replacement);
-    }
-    return confirmReplaceOneOccurrenceInOneFileNoValue();
-  }
-  if (fileCount === 1) {
-    if (replacement) {
-      return confirmReplaceManyOccurrencesInOneFile(matchCount, replacement);
-    }
-    return confirmReplaceManyOccurrencesInOneFileNoValue(matchCount);
-  }
-  if (replacement) {
-    return confirmReplaceManyOccurrencesInManyFiles(matchCount, fileCount, replacement);
-  }
-  return confirmReplaceManyOccurrencesInManyFilesNoValue(matchCount, fileCount);
-};
-
-const getBulkReplacementEdits = (workspacePath, matches) => {
-  string(workspacePath);
-  array(matches);
-  const files = [];
-  const ranges = [];
-  let currentRanges = [];
-  for (const match of matches) {
-    // @ts-ignore
-    const {
-      type,
-      title,
-      text
-    } = match;
-    switch (type) {
-      case File:
-        ranges.push(currentRanges.length);
-        push(ranges, currentRanges);
-        const absolutePath = `${workspacePath}/${text.slice(2)}`;
-        files.push(absolutePath); // TODO
-        currentRanges = [];
-        break;
-      case Match:
-        currentRanges.push(match.lineNumber - 1, match.matchStart, match.lineNumber - 1, match.matchStart + match.matchLength);
-        break;
-    }
-  }
-  ranges.push(currentRanges.length);
-  push(ranges, currentRanges);
-  return {
-    files,
-    ranges: ranges.slice(1)
-  };
-};
-
-const replaceAll$1 = async (workspacePath, items, replacement) => {
-  const {
-    files,
-    ranges
-  } = getBulkReplacementEdits(workspacePath, items);
-  await execute$4('BulkReplacement.applyBulkReplacement', files, ranges, replacement);
-};
-
-const replaceAllAndPrompt = async (workspacePath, items, replacement, matchCount, fileCount) => {
-  string(workspacePath);
-  array(items);
-  string(replacement);
-  number$1(matchCount);
-  number$1(fileCount);
-  const confirmTitle = replaceAll$2();
-  const confirmAccept = replace();
-  const confirmText = getReplaceAllConfirmText(matchCount, fileCount, replacement);
-  const shouldReplace = await execute$4('ConfirmPrompt.prompt', confirmText, {
-    title: confirmTitle,
-    confirmMessage: confirmAccept
-  });
-  if (!shouldReplace) {
-    return false;
-  }
-  await replaceAll$1(workspacePath, items, replacement);
-  return true;
-};
-
-const replaceAll = async state => {
-  const {
-    items,
-    replacement,
-    matchCount,
-    fileCount,
-    workspacePath
-  } = state;
-  const replaced = await replaceAllAndPrompt(workspacePath, items, replacement, matchCount, fileCount);
-  if (!replaced) {
-    return state;
-  }
-  const replacedAllMessage = getReplacedAllMessage(matchCount, fileCount, replacement);
-  return {
-    ...state,
-    fileCount: 0,
-    matchCount: 0,
-    items: [],
-    message: replacedAllMessage,
-    minLineY: 0,
-    maxLineY: 0
-  };
-};
-
-const ViewletSearchReplaceAll = {
-  __proto__: null,
-  replaceAll
-};
-
-const handleReplaceInput = (state, value) => {
-  return {
-    ...state,
-    replacement: value
-  };
-};
-
-const ViewletSearchHandleReplaceInput = {
-  __proto__: null,
-  handleReplaceInput
-};
-
-const handleListFocus = state => {
-  return {
-    ...state,
-    listFocused: true,
-    listFocusedIndex: -1
-  };
-};
-
-const ViewletSearchHandleListFocus = {
-  __proto__: null,
-  handleListFocus
-};
-
-const handleListBlur = state => {
-  return {
-    ...state,
-    listFocused: false
-  };
-};
-
-const ViewletSearchHandleListBlur = {
-  __proto__: null,
-  handleListBlur
-};
-
-const focusIndex$1 = (state, index) => {
-  return {
-    ...state,
-    listFocusedIndex: index,
-    listFocused: true
-  };
-};
-
-const focusFirst$1 = state => {
-  const firstIndex = first();
-  return focusIndex$1(state, firstIndex);
-};
-
-const ViewletSearchFocusFirst = {
-  __proto__: null,
-  focusFirst: focusFirst$1
-};
-
-const focusLast$1 = state => {
-  const {
-    items
-  } = state;
-  const lastIndex = last(items);
-  return focusIndex$1(state, lastIndex);
-};
-
-const ViewletSearchFocusLast = {
-  __proto__: null,
-  focusLast: focusLast$1
-};
-
-const focusNext$1 = state => {
-  const {
-    items,
-    listFocusedIndex
-  } = state;
-  const nextIndex = nextNoCycle(items, listFocusedIndex);
-  return focusIndex$1(state, nextIndex);
-};
-
-const ViewletSearchFocusNext = {
-  __proto__: null,
-  focusNext: focusNext$1
-};
-
-const focusPrevious$1 = state => {
-  const {
-    items,
-    listFocusedIndex
-  } = state;
-  const previousIndex = previousNoCycle(items, listFocusedIndex);
-  return focusIndex$1(state, previousIndex);
-};
-
-const ViewletSearchFocusPrevious = {
-  __proto__: null,
-  focusPrevious: focusPrevious$1
-};
-
-const getFileIndex = (items, index) => {
-  for (let i = index; i >= 0; i--) {
-    const item = items[i];
-    if (item.type === File) {
-      return i;
-    }
-  }
-  return -1;
-};
-const selectIndexFile = async (state, searchResult, index) => {
-  const {
-    collapsedPaths
-  } = state;
-  const path = getAbsolutePath(searchResult.text);
-  string(path);
-  return {
-    ...state,
-    collapsedPaths: [...collapsedPaths, path],
-    listFocusedIndex: index,
-    listFocused: true
-  };
-};
-const selectIndexPreview = async (state, searchResult, index) => {
-  const {
-    items
-  } = state;
-  const fileIndex = getFileIndex(items, index);
-  if (fileIndex === -1) {
-    throw new Error('Search result is missing file');
-  }
-  const {
-    lineNumber
-  } = searchResult;
-  // console.log({ searchResult })
-  const fileResult = items[fileIndex];
-  const path = getAbsolutePath(fileResult.text);
-  string(path);
-  await openUri$1(path, true, {
-    selections: new Uint32Array([lineNumber, 0, lineNumber, 0])
-  });
-  return {
-    ...state,
-    listFocusedIndex: index,
-    listFocused: false
-  };
-};
-const selectIndex = (state, index, isClose) => {
-  if (index === -1) {
-    return {
-      ...state,
-      listFocused: true,
-      listFocusedIndex: -1
-    };
-  }
-  const {
-    items
-  } = state;
-  const searchResult = items[index];
-  switch (searchResult.type) {
-    case File:
-      return selectIndexFile(state, searchResult, index);
-    case Match:
-      return selectIndexPreview(state, searchResult, index);
-    default:
-      throw new Error(`unexpected search result type ${searchResult.type}`);
-  }
-};
-
-const ViewletSearchSelectIndex = {
-  __proto__: null,
-  selectIndex
-};
-
-const handleClickOutside = state => {
-  return {
-    ...state,
-    listFocusedIndex: -1,
-    listFocused: true
-  };
-};
-const handleClick$3 = (state, index, isClose) => {
-  const {
-    minLineY,
-    items
-  } = state;
-  const actualIndex = index + minLineY;
-  const isOutside = actualIndex > items.length;
-  if (isOutside) {
-    return handleClickOutside(state);
-  }
-  return selectIndex(state, actualIndex);
-};
-const handleClickAt = (state, eventX, eventY) => {
-  const {
-    y,
-    itemHeight,
-    x,
-    width,
-    replaceExpanded
-  } = state;
-  const top = replaceExpanded ? 94.19 : 57; // TODO search store boxes height integer
-  const relativeY = eventY - y - top;
-  const relativeIndex = Math.floor(relativeY / itemHeight);
-  return handleClick$3(state, relativeIndex);
-};
-
-const ViewletSearchHandleClick = {
-  __proto__: null,
-  handleClick: handleClick$3,
-  handleClickAt
-};
-
-const getSetSize = (items, index) => {
-  let setSize = 0;
-  for (let i = index + 1; i < items.length; i++) {
-    if (items[i].type === File) {
-      break;
-    }
-    setSize++;
-  }
-  return setSize;
-};
-const getRemoveIndicesFile = (items, item, index, matchCount, fileCount) => {
-  const setSize = getSetSize(items, index);
-  return {
-    startIndex: index,
-    removeCount: setSize + 1,
-    newFocusedIndex: index + setSize + 1 < items.length ? index : index - 1,
-    newFileCount: fileCount - 1,
-    newMatchCount: matchCount - setSize
-  };
-};
-const getRemoveIndicesMatch = (items, index, matchCount, fileCount) => {
-  for (let i = index; i >= 0; i--) {
-    if (items[i].type === File) {
-      const setSize = getSetSize(items, i);
-      if (setSize === 1) {
-        return {
-          startIndex: i,
-          removeCount: 2,
-          newFocusedIndex: i - 1,
-          newFileCount: fileCount - 1,
-          newMatchCount: matchCount - 1
-        };
-      }
-      return {
-        startIndex: index,
-        removeCount: 1,
-        newFocusedIndex: index,
-        newFileCount: fileCount,
-        newMatchCount: matchCount - 1
-      };
-    }
-  }
-  throw new Error('could not compute indices to remove');
-};
-const getRemoveIndices = (items, index, matchCount, fileCount) => {
-  const item = items[index];
-  switch (item.type) {
-    case File:
-      return getRemoveIndicesFile(items, item, index, matchCount, fileCount);
-    case Match:
-      return getRemoveIndicesMatch(items, index, matchCount, fileCount);
-    default:
-      throw new Error('unknown search result type');
-  }
-};
-const removeItemFromItems = (items, index, matchCount, fileCount) => {
-  const {
-    startIndex,
-    removeCount,
-    newFocusedIndex,
-    newFileCount,
-    newMatchCount
-  } = getRemoveIndices(items, index, matchCount, fileCount);
-  const newItems = remove(items, startIndex, removeCount);
-  return {
-    newItems,
-    newFocusedIndex,
-    newFileCount,
-    newMatchCount
-  };
-};
-const getNewMinMax = (newItemsLength, minLineY, maxLineY, deltaY, itemHeight) => {
-  if (maxLineY > newItemsLength) {
-    const diff = maxLineY - minLineY;
-    const newMinLineY = Math.max(newItemsLength - diff, 0);
-    const newDeltaY = newMinLineY * itemHeight;
-    return {
-      newDeltaY,
-      newMinLineY,
-      newMaxLineY: newItemsLength
-    };
-  }
-  return {
-    newDeltaY: deltaY,
-    newMinLineY: minLineY,
-    newMaxLineY: maxLineY
-  };
-};
-const dismissItem = state => {
-  const {
-    items,
-    listFocusedIndex,
-    fileCount,
-    matchCount,
-    minLineY,
-    maxLineY,
-    deltaY,
-    itemHeight
-  } = state;
-  if (listFocusedIndex === -1) {
-    return state;
-  }
-  const {
-    newItems,
-    newFocusedIndex,
-    newMatchCount,
-    newFileCount
-  } = removeItemFromItems(items, listFocusedIndex, matchCount, fileCount);
-  const message = getStatusMessage(newMatchCount, newFileCount);
-  const {
-    newMinLineY,
-    newMaxLineY,
-    newDeltaY
-  } = getNewMinMax(newItems.length, minLineY, maxLineY, deltaY, itemHeight);
-  return {
-    ...state,
-    items: newItems,
-    listFocusedIndex: newFocusedIndex,
-    message,
-    matchCount: newMatchCount,
-    fileCount: newFileCount,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    deltaY: newDeltaY
-  };
-};
-
-const ViewletSearchDismissItem = {
-  __proto__: null,
-  dismissItem
-};
-
-const copy = async state => {
-  const {
-    items,
-    listFocusedIndex
-  } = state;
-  if (listFocusedIndex === -1) {
-    return state;
-  }
-  const item = items[listFocusedIndex];
-  await execute$4(ClipBoardWriteText, item.text);
-  return state;
-};
-
-const ViewletSearchCopy = {
-  __proto__: null,
-  copy
-};
-
-const refresh = state => {
-  return handleUpdate(state, {});
-};
-
-const ViewletSearchRefresh = {
-  __proto__: null,
-  refresh
-};
-
-const clearSearchResults = state => {
-  return {
-    ...state,
-    value: '',
-    items: [],
-    minLineY: 0,
-    maxLineY: 0,
-    message: ''
-  };
-};
-
-const ViewletSearchClearSearchResults = {
-  __proto__: null,
-  clearSearchResults
-};
-
 const openExternal = async state => {
   const {
     iframeSrc
@@ -40900,7 +39454,7 @@ const handleClick$2 = async (state, index) => {
       return handleClickDirectory(state);
     case DirectoryExpanded:
       return handleClickDirectoryExpanded(state);
-    case File$5:
+    case File$4:
       return handleClickFile(state, item);
     default:
       console.warn(`unknown item type: ${item.type}`);
@@ -41705,7 +40259,7 @@ const copyFilesElectron = async (root, pathSeparator, files) => {
     const from = await getFilePathElectron(file);
     // const from = file.path
     const to = join(pathSeparator, root, file.name);
-    await copy$a(from, to);
+    await copy$9(from, to);
   }
 };
 const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
@@ -41769,7 +40323,7 @@ const uploadHandle = (fileSystemHandle, pathSeparator, root, uploadHandles) => {
     kind
   } = fileSystemHandle;
   switch (kind) {
-    case File$4:
+    case File$3:
       return uploadFile(fileSystemHandle, pathSeparator, root);
     case Directory:
       // @ts-ignore