@lvce-editor/editor-worker 18.6.0 → 18.8.0

package/dist/editorWorkerMain.js

@@ -63,7 +63,7 @@ class AssertionError extends Error {
 const Object$1 = 1;
 const Number$1 = 2;
 const Array$1 = 3;
-const String = 4;
+const String$1 = 4;
 const Boolean$1 = 5;
 const Function$1 = 6;
 const Null = 7;
@@ -75,7 +75,7 @@ const getType = value => {
     case 'function':
       return Function$1;
     case 'string':
-      return String;
+      return String$1;
     case 'object':
       if (value === null) {
         return Null;
@@ -110,7 +110,7 @@ const array = value => {
 };
 const string = value => {
   const type = getType(value);
-  if (type !== String) {
+  if (type !== String$1) {
     throw new AssertionError('expected value to be of type string');
   }
 };
@@ -553,7 +553,7 @@ const execute$1 = (command, ...args) => {
 
 const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const get$9 = id => {
+const get$8 = id => {
   return callbacks[id];
 };
 const remove$9 = id => {
@@ -702,7 +702,7 @@ const warn$1 = (...args) => {
   console.warn(...args);
 };
 const resolve = (id, response) => {
-  const fn = get$9(id);
+  const fn = get$8(id);
   if (!fn) {
     console.log(response);
     warn$1(`callback ${id} may already be disposed`);
@@ -1083,18 +1083,6 @@ const create$b = async ({
   return rpc;
 };
 
-const Script$1 = 2;
-
-const CompletionWorker = 301;
-const DebugWorker = 55;
-const EditorWorker = 99;
-const ExtensionHostWorker = 44;
-const ExtensionManagementWorker = 9006;
-const IconThemeWorker = 7009;
-const MarkdownWorker = 300;
-const OpenerWorker = 4561;
-const RendererWorker$1 = 1;
-
 const createMockRpc = ({
   commandMap
 }) => {
@@ -1116,10 +1104,10 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$f = (id, rpc) => {
+const set$e = (id, rpc) => {
   rpcs[id] = rpc;
 };
-const get$8 = id => {
+const get$7 = id => {
   return rpcs[id];
 };
 const remove$8 = id => {
@@ -1130,18 +1118,18 @@ const remove$8 = id => {
 const create$a = rpcId => {
   return {
     async dispose() {
-      const rpc = get$8(rpcId);
+      const rpc = get$7(rpcId);
       await rpc.dispose();
     },
     // @ts-ignore
     invoke(method, ...params) {
-      const rpc = get$8(rpcId);
+      const rpc = get$7(rpcId);
       // @ts-ignore
       return rpc.invoke(method, ...params);
     },
     // @ts-ignore
     invokeAndTransfer(method, ...params) {
-      const rpc = get$8(rpcId);
+      const rpc = get$7(rpcId);
       // @ts-ignore
       return rpc.invokeAndTransfer(method, ...params);
     },
@@ -1149,7 +1137,7 @@ const create$a = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$f(rpcId, mockRpc);
+      set$e(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$8(rpcId);
@@ -1158,554 +1146,205 @@ const create$a = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$f(rpcId, rpc);
+      set$e(rpcId, rpc);
     }
   };
 };
 
+const Text$1 = 12;
+const Reference = 100;
+
+const AltKey = 'event.altKey';
+const Button = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const DeltaMode = 'event.deltaMode';
+const DeltaY = 'event.deltaY';
+
+const Backspace = 1;
+const Tab$1 = 2;
+const Enter = 3;
+const Escape = 8;
+const Space$1 = 9;
+const End = 255;
+const Home = 12;
+const LeftArrow = 13;
+const UpArrow = 14;
+const RightArrow = 15;
+const DownArrow = 16;
+const Delete$1 = 18;
+const KeyA = 29;
+const KeyC = 31;
+const KeyD = 32;
+const KeyF = 34;
+const KeyH = 36;
+const KeyJ = 38;
+const KeyK = 39;
+const KeyL = 40;
+const KeyO = 43;
+const KeyV = 50;
+const KeyX = 52;
+const KeyZ = 54;
+const F2 = 58;
+const F3 = 59;
+const F4 = 60;
+const F12 = 68;
+const Period = 87;
+const Slash$1 = 88;
+const BracketLeft = 90;
+const BracketRight = 92;
+
+const CodeGenerator = 1;
+const ColorPicker$1 = 2;
+const Completion = 3;
+const CompletionDetail = 4;
+const Find = 5;
+const Hover = 6;
+const Rename$1 = 7;
+const SourceAction$1 = 8;
+
+const CtrlCmd = 1 << 11 >>> 0;
+const Shift = 1 << 10 >>> 0;
+const Alt$1 = 1 << 9 >>> 0;
+
+const Editor$1 = 3;
+const SourceControl = 22;
+
+const Separator = 1;
+const None = 0;
+
+const CompletionWorker = 301;
+const DebugWorker = 55;
+const EditorWorker = 99;
+const ExtensionHostWorker = 44;
+const ExtensionManagementWorker = 9006;
+const IconThemeWorker = 7009;
+const MarkdownWorker = 300;
+const OpenerWorker = 4561;
+const RendererWorker$1 = 1;
+
+const FocusSelector = 'Viewlet.focusSelector';
+const SetCss$1 = 'Viewlet.setCss';
+const SetFocusContext$1 = 'Viewlet.setFocusContext';
+const SetPatches = 'Viewlet.setPatches';
+
+const FocusEditorText$1 = 12;
+const FocusExplorer = 13;
+
 const {
-  dispose: dispose$3,
   invoke: invoke$f,
-  invokeAndTransfer: invokeAndTransfer$2,
-  registerMockRpc: registerMockRpc$1,
-  set: set$e
+  set: set$d
 } = create$a(ExtensionHostWorker);
-const executeReferenceProvider = async (id, offset) => {
-  // @ts-ignore
-  return invoke$f('ExtensionHostReference.executeReferenceProvider', id, offset);
-};
-const executeFileReferenceProvider = async id => {
-  // @ts-ignore
-  return invoke$f('ExtensionHostReference.executeFileReferenceProvider', id);
-};
-const getRuntimeStatus = async extensionId => {
-  // @ts-ignore
-  return invoke$f('ExtensionHost.getRuntimeStatus', extensionId);
-};
-const getEnabledOutputProviderIds = async () => {
-  const channels = await invoke$f('Output.getEnabledProviders');
-  return channels;
-};
 
 const ExtensionHost = {
   __proto__: null,
-  dispose: dispose$3,
-  executeFileReferenceProvider,
-  executeReferenceProvider,
-  getEnabledOutputProviderIds,
-  getRuntimeStatus,
   invoke: invoke$f,
-  invokeAndTransfer: invokeAndTransfer$2,
-  registerMockRpc: registerMockRpc$1,
-  set: set$e
+  set: set$d
 };
 
 const {
   invoke: invoke$e,
-  set: set$d
+  set: set$c
 } = create$a(ExtensionManagementWorker);
 const getLanguages$1 = (platform, assetDir) => {
   return invoke$e('Extensions.getLanguages', platform, assetDir);
 };
 
 const {
-  dispose: dispose$2,
   invoke: invoke$d,
-  invokeAndTransfer: invokeAndTransfer$1,
-  registerMockRpc,
-  set: set$c
-} = create$a(RendererWorker$1);
-const searchFileHtml = async uri => {
-  return invoke$d('ExtensionHost.searchFileWithHtml', uri);
-};
-const getFilePathElectron = async file => {
-  return invoke$d('FileSystemHandle.getFilePathElectron', file);
-};
-const handleModifiedStatusChange = async (uri, modified) => {
-  return invoke$d('Main.handleModifiedStatusChange', uri, modified);
-};
-/**
- * @deprecated
- */
-const showContextMenu = async (x, y, id, ...args) => {
-  return invoke$d('ContextMenu.show', x, y, id, ...args);
+  set: set$b
+} = create$a(OpenerWorker);
+const openUrl = async (url, platform) => {
+  return invoke$d('Open.openUrl', url, platform);
 };
+
+const {
+  invoke: invoke$c,
+  invokeAndTransfer,
+  set: set$a
+} = create$a(RendererWorker$1);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke$d('ContextMenu.show2', uid, menuId, x, y, args);
-};
-const getElectronVersion = async () => {
-  return invoke$d('Process.getElectronVersion');
-};
-const applyBulkReplacement = async bulkEdits => {
-  await invoke$d('BulkReplacement.applyBulkReplacement', bulkEdits);
-};
-const setColorTheme = async id => {
-  return invoke$d(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
-};
-const getNodeVersion = async () => {
-  return invoke$d('Process.getNodeVersion');
-};
-const getBadgeCounts = async () => {
-  return invoke$d('Layout.getBadgeCounts');
-};
-const getChromeVersion = async () => {
-  return invoke$d('Process.getChromeVersion');
-};
-const getV8Version = async () => {
-  return invoke$d('Process.getV8Version');
-};
-const getFileHandles = async fileIds => {
-  const files = await invoke$d('FileSystemHandle.getFileHandles', fileIds);
-  return files;
-};
-const setWorkspacePath = async path => {
-  await invoke$d('Workspace.setPath', path);
-};
-const registerWebViewInterceptor = async (id, port) => {
-  await invokeAndTransfer$1('WebView.registerInterceptor', id, port);
-};
-const unregisterWebViewInterceptor = async id => {
-  await invoke$d('WebView.unregisterInterceptor', id);
-};
-const sendMessagePortToEditorWorker = async (port, rpcId) => {
-  const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToEditorWorker', port, command, rpcId);
-};
-const sendMessagePortToClipBoardWorker = async (port, rpcId) => {
-  const command = 'ClipBoard.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToClipBoardWorker', port, command, rpcId);
+  await invoke$c('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToOpenerWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToOpenerWorker', port, command, rpcId);
-};
-const sendMessagePortToMainAreaWorker = async (port, rpcId) => {
-  const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToMainAreaWorker', port, command, rpcId);
-};
-const sendMessagePortToErrorWorker = async (port, rpcId) => {
-  const command = 'Errors.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
-};
-const sendMessagePortToMarkdownWorker = async (port, rpcId) => {
-  const command = 'Markdown.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToMarkdownWorker', port, command, rpcId);
-};
-const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
-  const command = 'IconTheme.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
-};
-const sendMessagePortToFileSystemWorker = async (port, rpcId) => {
-  const command = 'FileSystem.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToOpenerWorker', port, command, rpcId);
 };
 const readFile = async uri => {
-  return invoke$d('FileSystem.readFile', uri);
-};
-const getWebViewSecret = async key => {
-  return invoke$d('WebView.getSecret', key);
-};
-const setWebViewPort = async (uid, port, origin, portType) => {
-  return invokeAndTransfer$1('WebView.setPort', uid, port, origin, portType);
-};
-const setFocus$1 = key => {
-  return invoke$d('Focus.setFocus', key);
-};
-const getFileIcon = async options => {
-  return invoke$d('IconTheme.getFileIcon', options);
-};
-const getColorThemeNames = async () => {
-  return invoke$d('ColorTheme.getColorThemeNames');
-};
-const disableExtension = async id => {
-  return invoke$d('ExtensionManagement.disable', id);
-};
-const enableExtension = async id => {
-  return invoke$d('ExtensionManagement.enable', id);
-};
-const disposeEditor = async uid => {
-  return invoke$d('Viewlet.dispose', uid);
-};
-const handleDebugChange = async params => {
-  return invoke$d('Run And Debug.handleChange', params);
-};
-const getFolderIcon = async options => {
-  return invoke$d('IconTheme.getFolderIcon', options);
+  return invoke$c('FileSystem.readFile', uri);
 };
 const handleWorkspaceRefresh = async () => {
-  return invoke$d('Layout.handleWorkspaceRefresh');
-};
-const closeWidget = async widgetId => {
-  return invoke$d('Viewlet.closeWidget', widgetId);
-};
-const createViewlet = async (viewletModuleId, editorUid, tabId, bounds, uri) => {
-  return invoke$d('Layout.createViewlet', viewletModuleId, editorUid, tabId, bounds, uri);
+  return invoke$c('Layout.handleWorkspaceRefresh');
 };
 const sendMessagePortToExtensionHostWorker = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
-};
-const getViewletModuleId = async uri => {
-  return invoke$d('Layout.getModuleId', uri);
-};
-const showPanel = async () => {
-  return invoke$d('Layout.showPanel');
-};
-const showPreview = async () => {
-  return invoke$d('Layout.showPreview');
-};
-const saveEditor = async () => {
-  return invoke$d('Editor.save');
-};
-const togglePanelView = async id => {
-  return invoke$d('Panel.toggleView', id);
-};
-const resizeViewlet = async (uid, dimensions) => {
-  return invoke$d('Viewlet.resize', uid, dimensions);
-};
-const sendMessagePortToFileSearchWorker = async (port, rpcId = 0) => {
-  const command = 'QuickPick.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSearchWorker', port, command, rpcId);
-};
-const sendMessagePortToSearchProcess = async port => {
-  await invokeAndTransfer$1('SendMessagePortToElectron.sendMessagePortToElectron', port, 'HandleMessagePortForSearchProcess.handleMessagePortForSearchProcess');
-};
-const confirm = async (message, options) => {
-  const result = await invoke$d('ConfirmPrompt.prompt', message, options);
-  return result;
-};
-const getRecentlyOpened = async () => {
-  return invoke$d(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
-};
-const getKeyBindings$1 = async () => {
-  return invoke$d('KeyBindingsInitial.getKeyBindings');
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
 };
 const writeClipBoardText = async text => {
-  await invoke$d('ClipBoard.writeText', /* text */text);
-};
-const writeFile = async (uri, text) => {
-  await invoke$d('FileSystem.writeFile', uri, text);
-};
-const handleUriChange = async (uri, newUri) => {
-  await invoke$d('Main.handleUriChange', uri, newUri);
+  await invoke$c('ClipBoard.writeText', /* text */text);
 };
 const readClipBoardText = async () => {
-  return invoke$d('ClipBoard.readText');
-};
-const writeClipBoardImage = async blob => {
-  await invoke$d('ClipBoard.writeImage', /* text */blob);
-};
-const searchFileMemory = async uri => {
-  return invoke$d('ExtensionHost.searchFileWithMemory', uri);
-};
-const searchFileFetch = async uri => {
-  return invoke$d('ExtensionHost.searchFileWithFetch', uri);
-};
-const showMessageBox = async options => {
-  return invoke$d('ElectronDialog.showMessageBox', options);
-};
-const handleDebugResumed = async params => {
-  await invoke$d('Run And Debug.handleResumed', params);
-};
-const openWidget = async name => {
-  await invoke$d('Viewlet.openWidget', name);
-};
-const getIcons = async requests => {
-  const icons = await invoke$d('IconTheme.getIcons', requests);
-  return icons;
+  return invoke$c('ClipBoard.readText');
 };
 const activateByEvent$1 = (event, assetDir, platform) => {
-  return invoke$d('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
-};
-const setAdditionalFocus = focusKey => {
-  return invoke$d('Focus.setAdditionalFocus', focusKey);
-};
-const getActiveEditorId = () => {
-  return invoke$d('GetActiveEditor.getActiveEditorId');
-};
-const getWorkspacePath = () => {
-  return invoke$d('Workspace.getPath');
-};
-const sendMessagePortToRendererProcess = async port => {
-  const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToRendererProcess', port, command, DebugWorker);
+  return invoke$c('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
 };
 const sendMessagePortToTextMeasurementWorker = async port => {
   const command = 'TextMeasurement.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
-};
-const sendMessagePortToSourceControlWorker = async port => {
-  const command = 'SourceControl.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToSourceControlWorker', port, command, 0);
-};
-const sendMessagePortToSharedProcess = async port => {
-  const command = 'HandleElectronMessagePort.handleElectronMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToSharedProcess', port, command, 0);
-};
-const sendMessagePortToFileSystemProcess = async (port, rpcId) => {
-  const command = 'HandleMessagePortForFileSystemProcess.handleMessagePortForFileSystemProcess';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToSharedProcess', port, command, rpcId);
-};
-const sendMessagePortToIframeWorker = async (port, rpcId) => {
-  const command = 'Iframes.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToIframeWorker', port, command, rpcId);
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
 };
 const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   const command = 'Extensions.handleMessagePort';
-  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 const getPreference = async key => {
-  return await invoke$d('Preferences.get', key);
-};
-const getAllExtensions = async () => {
-  return invoke$d('ExtensionManagement.getAllExtensions');
-};
-const rerenderEditor = async key => {
-  return invoke$d('Editor.rerender', key);
-};
-const handleDebugPaused = async params => {
-  await invoke$d('Run And Debug.handlePaused', params);
+  return await invoke$c('Preferences.get', key);
 };
 const openUri = async (uri, focus, options) => {
-  await invoke$d('Main.openUri', uri, focus, options);
+  await invoke$c('Main.openUri', uri, focus, options);
 };
 const sendMessagePortToSyntaxHighlightingWorker$1 = async port => {
-  await invokeAndTransfer$1('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort2');
-};
-const handleDebugScriptParsed = async script => {
-  await invoke$d('Run And Debug.handleScriptParsed', script);
-};
-const getWindowId = async () => {
-  return invoke$d('GetWindowId.getWindowId');
-};
-const getBlob = async uri => {
-  return invoke$d('FileSystem.getBlob', uri);
-};
-const getExtensionCommands = async () => {
-  return invoke$d('ExtensionHost.getCommands');
-};
-const showErrorDialog = async errorInfo => {
-  await invoke$d('ErrorHandling.showErrorDialog', errorInfo);
-};
-const getFolderSize = async uri => {
-  return await invoke$d('FileSystem.getFolderSize', uri);
-};
-const getExtension = async id => {
-  return invoke$d('ExtensionManagement.getExtension', id);
-};
-const getMarkdownDom = async html => {
-  return invoke$d('Markdown.getVirtualDom', html);
-};
-const renderMarkdown = async (markdown, options) => {
-  return invoke$d('Markdown.renderMarkdown', markdown, options);
-};
-const openNativeFolder = async uri => {
-  await invoke$d('OpenNativeFolder.openNativeFolder', uri);
-};
-const uninstallExtension = async id => {
-  return invoke$d('ExtensionManagement.uninstall', id);
-};
-const installExtension = async id => {
-  return invoke$d('ExtensionManagement.install', id);
-};
-const minimizeWindow = async () => {
-  return invoke$d('ElectronWindow.minimize');
-};
-const unmaximizeWindow = async () => {
-  return invoke$d('ElectronWindow.unmaximize');
-};
-const maximizeWindow = async () => {
-  return invoke$d('ElectronWindow.maximize');
-};
-const showSideBar = async (id, focus) => {
-  return invoke$d('SideBar.show', id, focus);
-};
-const closeWindow = async () => {
-  return invoke$d('ElectronWindow.close');
-};
-const openExtensionSearch = async () => {
-  return invoke$d('SideBar.openViewlet', 'Extensions');
-};
-const setExtensionsSearchValue = async searchValue => {
-  return invoke$d('Extensions.handleInput', searchValue, Script$1);
-};
-const openExternal$1 = async uri => {
-  await invoke$d('Open.openExternal', uri);
-};
-const openUrl$1 = async uri => {
-  await invoke$d('Open.openUrl', uri);
-};
-const getAllPreferences = async () => {
-  return invoke$d('Preferences.getAll');
-};
-const showSaveFilePicker = async () => {
-  return invoke$d('FilePicker.showSaveFilePicker');
-};
-const getLogsDir = async () => {
-  return invoke$d('PlatformPaths.getLogsDir');
-};
-const measureTextBlockHeight$1 = async (actualInput, fontFamily, fontSize, lineHeightPx, width) => {
-  return invoke$d(`MeasureTextHeight.measureTextBlockHeight`, actualInput, fontFamily, fontSize, lineHeightPx, width);
-};
-const refreshOutput = async () => {
-  await invoke$d('Output.refresh');
+  await invokeAndTransfer('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort2');
 };
 
 const RendererWorker = {
   __proto__: null,
   activateByEvent: activateByEvent$1,
-  applyBulkReplacement,
-  closeWidget,
-  closeWindow,
-  confirm,
-  createViewlet,
-  disableExtension,
-  dispose: dispose$2,
-  disposeEditor,
-  enableExtension,
-  getActiveEditorId,
-  getAllExtensions,
-  getAllPreferences,
-  getBadgeCounts,
-  getBlob,
-  getChromeVersion,
-  getColorThemeNames,
-  getElectronVersion,
-  getExtension,
-  getExtensionCommands,
-  getFileHandles,
-  getFileIcon,
-  getFilePathElectron,
-  getFolderIcon,
-  getFolderSize,
-  getIcons,
-  getKeyBindings: getKeyBindings$1,
-  getLogsDir,
-  getMarkdownDom,
-  getNodeVersion,
   getPreference,
-  getRecentlyOpened,
-  getV8Version,
-  getViewletModuleId,
-  getWebViewSecret,
-  getWindowId,
-  getWorkspacePath,
-  handleDebugChange,
-  handleDebugPaused,
-  handleDebugResumed,
-  handleDebugScriptParsed,
-  handleModifiedStatusChange,
-  handleUriChange,
   handleWorkspaceRefresh,
-  installExtension,
-  invoke: invoke$d,
-  invokeAndTransfer: invokeAndTransfer$1,
-  maximizeWindow,
-  measureTextBlockHeight: measureTextBlockHeight$1,
-  minimizeWindow,
-  openExtensionSearch,
-  openExternal: openExternal$1,
-  openNativeFolder,
+  invoke: invoke$c,
+  invokeAndTransfer,
   openUri,
-  openUrl: openUrl$1,
-  openWidget,
   readClipBoardText,
   readFile,
-  refreshOutput,
-  registerMockRpc,
-  registerWebViewInterceptor,
-  renderMarkdown,
-  rerenderEditor,
-  resizeViewlet,
-  saveEditor,
-  searchFileFetch,
-  searchFileHtml,
-  searchFileMemory,
-  sendMessagePortToClipBoardWorker,
-  sendMessagePortToEditorWorker,
-  sendMessagePortToErrorWorker,
   sendMessagePortToExtensionHostWorker,
   sendMessagePortToExtensionManagementWorker,
-  sendMessagePortToFileSearchWorker,
-  sendMessagePortToFileSystemProcess,
-  sendMessagePortToFileSystemWorker,
-  sendMessagePortToIconThemeWorker,
-  sendMessagePortToIframeWorker,
-  sendMessagePortToMainAreaWorker,
-  sendMessagePortToMarkdownWorker,
   sendMessagePortToOpenerWorker,
-  sendMessagePortToRendererProcess,
-  sendMessagePortToSearchProcess,
-  sendMessagePortToSharedProcess,
-  sendMessagePortToSourceControlWorker,
   sendMessagePortToSyntaxHighlightingWorker: sendMessagePortToSyntaxHighlightingWorker$1,
   sendMessagePortToTextMeasurementWorker,
-  set: set$c,
-  setAdditionalFocus,
-  setColorTheme,
-  setExtensionsSearchValue,
-  setFocus: setFocus$1,
-  setWebViewPort,
-  setWorkspacePath,
-  showContextMenu,
+  set: set$a,
   showContextMenu2,
-  showErrorDialog,
-  showMessageBox,
-  showPanel,
-  showPreview,
-  showSaveFilePicker,
-  showSideBar,
-  togglePanelView,
-  uninstallExtension,
-  unmaximizeWindow,
-  unregisterWebViewInterceptor,
-  writeClipBoardImage,
-  writeClipBoardText,
-  writeFile
-};
-
-const {
-  invoke: invoke$c,
-  set: set$b
-} = create$a(OpenerWorker);
-const openUrl = async (url, platform) => {
-  return invoke$c('Open.openUrl', url, platform);
+  writeClipBoardText
 };
 
 const {
   invoke: invoke$b,
-  set: set$a
+  set: set$9
 } = create$a(IconThemeWorker);
 
 const {
-  dispose: dispose$1,
   invoke: invoke$a,
-  invokeAndTransfer,
-  set: set$9
+  set: set$8
 } = create$a(MarkdownWorker);
-const tokenizeIncremental = (uid, languageId, oldLine, newLine, rowIndex, minLineY) => {
-  return invoke$a('TokenizeIncremental.tokenizeIncremental', uid, languageId, oldLine, newLine, rowIndex, minLineY);
-};
-const getTokensViewPort = (slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend) => {
-  return invoke$a('GetTokensViewport.getTokensViewport', slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
-};
-const loadTokenizer$1 = (languageId, tokenizerPath) => {
-  return invoke$a('Tokenizer.load', languageId, tokenizerPath);
-};
 
 const SyntaxHighlightingWorker = {
   __proto__: null,
-  dispose: dispose$1,
-  getTokensViewPort,
   invoke: invoke$a,
-  invokeAndTransfer,
-  loadTokenizer: loadTokenizer$1,
-  set: set$9,
-  tokenizeIncremental
+  set: set$8
 };
 
 const createLazyRpc = rpcId => {
@@ -1713,7 +1352,7 @@ const createLazyRpc = rpcId => {
   let factory;
   const createRpc = async () => {
     const rpc = await factory();
-    set$f(rpcId, rpc);
+    set$e(rpcId, rpc);
   };
   const ensureRpc = async () => {
     if (!rpcPromise) {
@@ -1724,12 +1363,12 @@ const createLazyRpc = rpcId => {
   return {
     async invoke(method, ...params) {
       await ensureRpc();
-      const rpc = get$8(rpcId);
+      const rpc = get$7(rpcId);
       return rpc.invoke(method, ...params);
     },
     async invokeAndTransfer(method, ...params) {
       await ensureRpc();
-      const rpc = get$8(rpcId);
+      const rpc = get$7(rpcId);
       return rpc.invokeAndTransfer(method, ...params);
     },
     setFactory(value) {
@@ -1878,7 +1517,7 @@ const launchWorker = async (name, url, intializeCommand) => {
     commandMap: {},
     isMessagePortOpen: true,
     async send(port) {
-      await invokeAndTransfer$1('IpcParent.create', {
+      await invokeAndTransfer('IpcParent.create', {
         method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
         name,
         port,
@@ -1929,18 +1568,27 @@ const loadContent$3 = async (state, parentUid) => {
   };
 };
 
+const editorStates = create$9();
 const {
-  get: get$7,
   getCommandIds,
   registerCommands,
-  set: set$8,
-  wrapCommand: wrapCommand$1,
+  wrapCommand,
   wrapGetter
-} = create$9();
+} = editorStates;
+const get$6 = id => {
+  return editorStates.get(id);
+};
+const getKeys$2 = () => {
+  const keys = editorStates.getKeys();
+  return keys.map(String);
+};
+const set$7 = (id, oldEditor, newEditor) => {
+  editorStates.set(id, oldEditor, newEditor);
+};
 
 const emptyIncrementalEdits = [];
 
-const ColorPicker$1 = 41;
+const ColorPicker = 41;
 const EditorCompletion = 9;
 const Empty = 0;
 const FindWidget = 16;
@@ -2021,76 +1669,9 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     x,
     y
   };
-  set$8(id, editor, editor);
+  set$7(id, editor, editor);
 };
 
-const AltKey = 'event.altKey';
-const Button = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const DeltaMode = 'event.deltaMode';
-const DeltaY = 'event.deltaY';
-
-const Backspace = 1;
-const Tab$1 = 2;
-const Enter = 3;
-const Escape = 8;
-const Space$1 = 9;
-const End = 255;
-const Home = 12;
-const LeftArrow = 13;
-const UpArrow = 14;
-const RightArrow = 15;
-const DownArrow = 16;
-const Delete$1 = 18;
-const KeyA = 29;
-const KeyC = 31;
-const KeyD = 32;
-const KeyF = 34;
-const KeyH = 36;
-const KeyJ = 38;
-const KeyK = 39;
-const KeyL = 40;
-const KeyO = 43;
-const KeyV = 50;
-const KeyX = 52;
-const KeyZ = 54;
-const F2 = 58;
-const F3 = 59;
-const F4 = 60;
-const F12 = 68;
-const Period = 87;
-const Slash$1 = 88;
-const BracketLeft = 90;
-const BracketRight = 92;
-
-const CodeGenerator = 1;
-const ColorPicker = 2;
-const Completion = 3;
-const CompletionDetail = 4;
-const Find = 5;
-const Hover = 6;
-const Rename$1 = 7;
-const SourceAction$1 = 8;
-
-const CtrlCmd = 1 << 11 >>> 0;
-const Shift = 1 << 10 >>> 0;
-const Alt$1 = 1 << 9 >>> 0;
-
-const Editor$1 = 3;
-const SourceControl = 22;
-
-const Separator = 1;
-const None = 0;
-
-const FocusSelector = 'Viewlet.focusSelector';
-const SetCss$1 = 'Viewlet.setCss';
-const SetFocusContext$1 = 'Viewlet.setFocusContext';
-const SetPatches = 'Viewlet.setPatches';
-
-const FocusEditorText$1 = 12;
-const FocusExplorer = 13;
-
 // TODO use numeric enum
 const CompositionUpdate = 'compositionUpdate';
 const ContentEditableInput = 'contentEditableInput';
@@ -2111,15 +1692,15 @@ const Rename = 'rename';
 const ToggleBlockComment$1 = 'toggleBlockComment';
 
 const map$1 = Object.create(null);
-const set$7 = (id, widget) => {
+const set$6 = (id, widget) => {
   map$1[id] = widget;
 };
-const get$6 = id => {
+const get$5 = id => {
   return map$1[id];
 };
 
 const getModule = id => {
-  return get$6(id);
+  return get$5(id);
 };
 
 const applyWidgetChange = async (editor, widget, changes) => {
@@ -2151,23 +1732,6 @@ const applyWidgetChanges = async (editor, changes) => {
   return latestEditor;
 };
 
-const editors = Object.create(null);
-const get$5 = id => {
-  number(id);
-  return editors[id];
-};
-const getKeys$2 = () => {
-  return Object.keys(editors);
-};
-const set$6 = (id, oldEditor, newEditor) => {
-  object(oldEditor);
-  object(newEditor);
-  editors[id] = {
-    newState: newEditor,
-    oldState: oldEditor
-  };
-};
-
 const clamp = (num, min, max) => {
   number(num);
   number(min);
@@ -3314,7 +2878,7 @@ const getRegexMatches = (text, regex) => {
 // Supports: http://, https://, ftp://, ftps://, file://
 // Also matches URLs without explicit scheme (www.example.com)
 // Excludes trailing quotes which are commonly used in JSON strings
-const URL_PATTERN = /(?:(?:https?|ftp|ftps|file):\/\/)?(?:www\.)?(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?(?:\/[^\s"']*)?/g;
+const URL_PATTERN = /(?:https?|ftps?|file):\/\/[^\s"']+|www\.[^\s"']+/g;
 
 // Regex to check if URL has a scheme (http://, https://, ftp://, etc.)
 const HAS_SCHEME_PATTERN = /^(?:https?|ftp|ftps|file):\/\//;
@@ -3465,7 +3029,7 @@ const notifyListeners = async (listenerType, method, ...params) => {
   // Notify all listeners in parallel
   const notifications = rpcIds.map(async rpcId => {
     try {
-      const rpc = get$8(rpcId);
+      const rpc = get$7(rpcId);
       if (rpc) {
         await rpc.invoke(method, ...params);
       }
@@ -3517,7 +3081,7 @@ const getTabCount = string => {
   return count;
 };
 
-const RE_ASCII = /^[\p{ASCII}]*$/u;
+const RE_ASCII = /^\p{ASCII}*$/u;
 const isAscii = line => {
   return RE_ASCII.test(line);
 };
@@ -3906,7 +3470,7 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
     ...newEditor,
     decorations: linkDecorations
   };
-  set$6(editor.uid, editor, newEditorWithDecorations);
+  set$7(editor.uid, editor, newEditorWithDecorations);
 
   // Notify main-area-worker about modified status change
   if (!editor.modified) {
@@ -4315,7 +3879,7 @@ const updateDiagnostics = async newState => {
     // @ts-ignore
     await invoke$6(TextDocumentSyncFull, newState.uri, newState.id, newState.languageId, content);
     const diagnostics = await executeDiagnosticProvider(newState);
-    const latest = get$5(newState.id);
+    const latest = get$6(newState.id);
     if (!latest) {
       return newState;
     }
@@ -4331,9 +3895,9 @@ const updateDiagnostics = async newState => {
       diagnostics,
       visualDecorations // Visual decorations (objects with x, y, width, height) for squiggly underlines
     };
-    set$6(newState.id, latest.oldState, newEditor);
+    set$7(newState.id, latest.oldState, newEditor);
     // @ts-ignore
-    await invoke$d('Editor.rerender', newState.id);
+    await invoke$c('Editor.rerender', newState.id);
     return newEditor;
   } catch (error) {
     // @ts-ignore
@@ -4478,7 +4042,7 @@ const createEditor = async ({
     focused: true,
     textInfos
   };
-  set$6(id, emptyEditor, newEditor4);
+  set$7(id, emptyEditor, newEditor4);
 
   // TODO only sync when needed
   // e.g. it might not always be necessary to send text to extension host worker
@@ -4491,7 +4055,7 @@ const createEditor = async ({
   }
   const completionsOnTypeRaw = await get$1('editor.completionsOnType');
   const completionsOnType = Boolean(completionsOnTypeRaw);
-  set$6(id, emptyEditor, {
+  set$7(id, emptyEditor, {
     ...newEditor4,
     completionsOnType
   });
@@ -4532,7 +4096,7 @@ const diff2 = uid => {
   const {
     newState,
     oldState
-  } = get$7(uid);
+  } = get$6(uid);
   const result = diff(oldState, newState);
   return result;
 };
@@ -4840,6 +4404,7 @@ const at = async (editor, eventX, eventY) => {
   number(eventY);
   const {
     charWidth,
+    deltaX,
     deltaY,
     fontFamily,
     fontSize,
@@ -4849,9 +4414,11 @@ const at = async (editor, eventX, eventY) => {
     lines,
     rowHeight,
     tabSize,
+    x,
     y
   } = editor;
   const rowIndex = Math.floor((eventY - y + deltaY) / rowHeight);
+  const relativeX = eventX - x + deltaX;
   if (rowIndex < 0) {
     return {
       columnIndex: 0,
@@ -4860,7 +4427,7 @@ const at = async (editor, eventX, eventY) => {
   }
   const clampedRowIndex = clamp(rowIndex, 0, lines.length - 1);
   const line = lines[clampedRowIndex];
-  const columnIndex = await getAccurateColumnIndex(line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX);
+  const columnIndex = await getAccurateColumnIndex(line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, relativeX);
   return {
     columnIndex,
     rowIndex: clampedRowIndex
@@ -4916,7 +4483,7 @@ const editorShowMessage = async (editor, rowIndex, columnIndex, message, isError
   const y$1 = y(editor, rowIndex);
   const displayErrorMessage = message;
   // @ts-ignore
-  await invoke$d('Editor.showOverlayMessage', editor, 'Viewlet.send', editor.uid, 'showOverlayMessage', x$1, y$1, displayErrorMessage);
+  await invoke$c('Editor.showOverlayMessage', editor, 'Viewlet.send', editor.uid, 'showOverlayMessage', x$1, y$1, displayErrorMessage);
   if (!isError) {
     const handleTimeout = () => {
       editorHideMessage(editor);
@@ -4973,7 +4540,7 @@ const braceCompletion = async (editor, text) => {
     // @ts-ignore
     const offset = offsetAt(editor, editor.cursor);
     // @ts-ignore
-    const result = await invoke$d('ExtensionHostBraceCompletion.executeBraceCompletionProvider', editor, offset, text);
+    const result = await invoke$c('ExtensionHostBraceCompletion.executeBraceCompletionProvider', editor, offset, text);
     if (result) {
       const closingBrace = getMatchingClosingBrace$1(text);
       const insertText = text + closingBrace;
@@ -5090,7 +4657,7 @@ const closeRename = async editor => {
   }
   const renameWidget = widgets[renameWidgetIndex];
   await invoke$5('Rename.close', renameWidget.newState.uid);
-  const latest = get$5(uid);
+  const latest = get$6(uid);
   const {
     newState
   } = latest;
@@ -5160,7 +4727,7 @@ const create$7 = () => {
 const create$6 = () => {
   const completionUid = create$7();
   const widget = {
-    id: ColorPicker,
+    id: ColorPicker$1,
     newState: {
       commands: [],
       height: 0,
@@ -5185,7 +4752,7 @@ const newStateGenerator$6 = (state, parentUid) => {
   return loadContent$3(state, parentUid);
 };
 const openColorPicker = async editor => {
-  return addWidgetToEditor(ColorPicker, ColorPicker$1, editor, create$6, newStateGenerator$6);
+  return addWidgetToEditor(ColorPicker$1, ColorPicker, editor, create$6, newStateGenerator$6);
 };
 
 const state$4 = {
@@ -5906,7 +5473,7 @@ const deleteWordRight = editor => {
 
 const findAllReferences$1 = async editor => {
   // @ts-ignore
-  await invoke$d('SideBar.show', 'References', /* focus */true);
+  await invoke$c('SideBar.show', 'References', /* focus */true);
   return editor;
 };
 
@@ -5994,7 +5561,7 @@ const getWordBefore = (editor, rowIndex, columnIndex) => {
 // @ts-ignore
 const getDefinition = async (editor, offset) => {
   // @ts-ignore
-  const definition = await invoke$d('ExtensionHostDefinition.executeDefinitionProvider', editor, offset);
+  const definition = await invoke$c('ExtensionHostDefinition.executeDefinitionProvider', editor, offset);
   return definition;
 };
 
@@ -6279,7 +5846,7 @@ const getNoLocationFoundMessage = info => {
 
 const getTypeDefinition = async (editor, offset) => {
   // @ts-ignore
-  const definition = await invoke$d('ExtensionHostTypeDefinition.executeTypeDefinitionProvider', editor, offset);
+  const definition = await invoke$c('ExtensionHostTypeDefinition.executeTypeDefinitionProvider', editor, offset);
   return definition;
 };
 
@@ -6639,11 +6206,7 @@ const handleMouseMoveWithAltKey = async (editor, x, y) => {
     // TODO make sure that editor is not disposed
 
     const definitionStartPosition = positionAt(editor, definition.startOffset);
-    const definitionEndPosition = positionAt(editor, definition.endOffset);
-    // @ts-ignore
-    const definitionRelativeStartX = definitionStartPosition.columnIndex;
-    // @ts-ignore
-    const definitionRelativeEndX = definitionEndPosition.columnIndex;
+    positionAt(editor, definition.endOffset);
     // const definitionRelativeY = definitionStartPosition.rowIndex - editor.minLineY
 
     const lineTokenMap = editor.lineCache[definitionStartPosition.rowIndex + 1];
@@ -6964,7 +6527,8 @@ const setDelta = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
   number(eventDeltaY);
   // @ts-ignore
   const {
-    deltaX} = editor;
+    deltaX
+  } = editor;
   if (eventDeltaX === 0) {
     return setDeltaY(editor, eventDeltaY);
   }
@@ -7060,7 +6624,7 @@ const indentMore = editor => {
 
 const getLanguageConfiguration = async editor => {
   // @ts-ignore
-  return invoke$d('Languages.getLanguageConfiguration', {
+  return invoke$c('Languages.getLanguageConfiguration', {
     languageId: editor.languageId,
     uri: editor.uri
   });
@@ -7417,7 +6981,7 @@ const newStateGenerator$4 = async (state, parentUid) => {
   } = state;
   const {
     newState
-  } = get$5(parentUid);
+  } = get$6(parentUid);
   const {
     languageId
   } = newState;
@@ -7470,18 +7034,18 @@ const launchFindWidgetWorker = async () => {
 const rpcId = 9002;
 const launch = async () => {
   // TODO race condition
-  if (get$8(rpcId)) {
+  if (get$7(rpcId)) {
     return;
   }
   const rpc = await launchFindWidgetWorker();
-  set$f(rpcId, rpc);
+  set$e(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
-  const rpc = get$8(rpcId);
+  const rpc = get$7(rpcId);
   return await rpc.invoke(method, ...params);
 };
 const dispose = async () => {
-  const rpc = get$8(rpcId);
+  const rpc = get$7(rpcId);
   remove$8(rpcId);
   if (rpc) {
     await rpc.dispose();
@@ -7493,7 +7057,7 @@ const dispose = async () => {
 };
 
 const getEditor = editorUid => {
-  const instance = get$5(editorUid);
+  const instance = get$6(editorUid);
   if (!instance) {
     throw new Error(`editor ${editorUid} not found`);
   }
@@ -7587,7 +7151,7 @@ const newStateGenerator$2 = async (state, parentUid) => {
   } = state;
   const {
     newState
-  } = get$5(parentUid);
+  } = get$6(parentUid);
   const {
     languageId
   } = newState;
@@ -7761,7 +7325,7 @@ const logError = async error => {
 };
 const handleError = async error => {
   try {
-    const prettyError = await logError(error);
+    await logError(error);
   } catch (otherError) {
     console.warn('ErrorHandling error');
     console.warn(otherError);
@@ -7779,7 +7343,7 @@ const isUntitledFile = uri => {
 };
 
 const saveNormalFile = async (uri, content) => {
-  await invoke$d('FileSystem.writeFile', uri, content);
+  await invoke$c('FileSystem.writeFile', uri, content);
 };
 
 const showFilePicker = async platform => {
@@ -7787,7 +7351,7 @@ const showFilePicker = async platform => {
   const {
     canceled,
     filePath
-  } = await invoke$c('Open.showSaveDialog', dialogTitle, [], platform);
+  } = await invoke$d('Open.showSaveDialog', dialogTitle, [], platform);
   if (canceled) {
     return '';
   }
@@ -7799,9 +7363,9 @@ const saveUntitledFile = async (uri, content, platform) => {
   if (!filePath) {
     return;
   }
-  await invoke$d('FileSystem.writeFile', filePath, content);
+  await invoke$c('FileSystem.writeFile', filePath, content);
   await handleWorkspaceRefresh();
-  await invoke$d('Main.handleUriChange', uri, filePath);
+  await invoke$c('Main.handleUriChange', uri, filePath);
   return filePath;
 };
 
@@ -7868,13 +7432,8 @@ const getNewSelections$4 = (selections, lines, getDelta) => {
   for (let i = 0; i < selections.length; i += 4) {
     // @ts-ignore
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(selections, i);
-    if (selectionStartRow === selectionEndRow && selectionStartColumn === selectionEndColumn) {
-      moveToPositionLeft(newSelections, i + 2, selectionStartRow, selectionStartColumn, lines, getDelta);
-      moveToPositionEqual(newSelections, i, selectionEndRow, selectionEndColumn);
-    } else {
-      moveToPositionLeft(newSelections, i + 2, selectionStartRow, selectionStartColumn, lines, getDelta);
-      moveToPositionEqual(newSelections, i, selectionEndRow, selectionEndColumn);
-    }
+    moveToPositionLeft(newSelections, i + 2, selectionStartRow, selectionStartColumn, lines, getDelta);
+    moveToPositionEqual(newSelections, i, selectionEndRow, selectionEndColumn);
   }
   return newSelections;
 };
@@ -8138,7 +7697,7 @@ const selectInsideString = editor => {
 
 const getNewSelections = async (editor, selections) => {
   // @ts-ignore
-  const newSelections = await invoke$d('ExtensionHostSelection.executeGrowSelection', editor, selections);
+  const newSelections = await invoke$c('ExtensionHostSelection.executeGrowSelection', editor, selections);
   if (newSelections.length === 0) {
     return selections;
   }
@@ -8551,7 +8110,7 @@ const newStateGenerator$1 = async (state, parentUid) => {
   } = state;
   const {
     newState
-  } = get$5(parentUid);
+  } = get$6(parentUid);
   const {
     languageId
   } = newState;
@@ -8571,7 +8130,7 @@ const showHover3 = async editor => {
 
 const EditorHover = 'EditorHover';
 const showHover = async state => {
-  await invoke$d('Viewlet.openWidget', EditorHover);
+  await invoke$c('Viewlet.openWidget', EditorHover);
   return state;
 };
 
@@ -8635,7 +8194,7 @@ const newStateGenerator = async (state, parentUid) => {
   } = state;
   const {
     newState
-  } = get$5(parentUid);
+  } = get$6(parentUid);
   const {
     languageId
   } = newState;
@@ -8883,6 +8442,27 @@ const getBlockComment = async (editor, offset) => {
 
 const RE_WHITESPACE_AT_START$1 = /^\s+/;
 const RE_WHITESPACE_AT_END = /\s+$/;
+const createDeleteEdit = (rowIndex, columnIndex, text) => {
+  return {
+    deleted: [text],
+    end: {
+      columnIndex: columnIndex + text.length,
+      rowIndex
+    },
+    inserted: [],
+    origin: ToggleBlockComment$1,
+    start: {
+      columnIndex,
+      rowIndex
+    }
+  };
+};
+const getRemoveBlockCommentEdits = (rowIndex, startRowIndex, startColumnIndex, endRowIndex, endColumnIndex, blockCommentStart, blockCommentEnd) => {
+  if (startRowIndex === endRowIndex) {
+    return [createDeleteEdit(rowIndex, startColumnIndex, blockCommentStart), createDeleteEdit(rowIndex, endColumnIndex - blockCommentStart.length, blockCommentEnd)];
+  }
+  return [createDeleteEdit(startRowIndex, startColumnIndex, blockCommentStart), createDeleteEdit(endRowIndex, endColumnIndex, blockCommentEnd)];
+};
 const getBlockCommentEdits = (editor, blockComment) => {
   const {
     selections
@@ -8914,75 +8494,19 @@ const getBlockCommentEdits = (editor, blockComment) => {
   }
   const changes = [];
   if (startColumnIndex !== -1 && endColumnIndex !== -1) {
-    if (startRowIndex === endRowIndex) {
-      const change1 = {
-        deleted: [blockCommentStart],
-        end: {
-          columnIndex: startColumnIndex + blockCommentStart.length,
-          rowIndex
-        },
-        inserted: [],
-        origin: ToggleBlockComment$1,
-        start: {
-          columnIndex: startColumnIndex,
-          rowIndex
-        }
-      };
-      const change2 = {
-        deleted: [blockCommentEnd],
-        end: {
-          columnIndex: endColumnIndex - blockCommentStart.length + blockCommentEnd.length,
-          rowIndex
-        },
-        inserted: [],
-        origin: ToggleBlockComment$1,
-        start: {
-          columnIndex: endColumnIndex - blockCommentStart.length,
-          rowIndex
-        }
-      };
-      changes.push(change1, change2);
-    } else {
-      const change1 = {
-        deleted: [blockCommentStart],
-        end: {
-          columnIndex: startColumnIndex + blockCommentStart.length,
-          rowIndex: startRowIndex
-        },
-        inserted: [],
-        origin: ToggleBlockComment$1,
-        start: {
-          columnIndex: startColumnIndex,
-          rowIndex: startRowIndex
-        }
-      };
-      const change2 = {
-        deleted: [blockCommentEnd],
-        end: {
-          columnIndex: endColumnIndex + blockCommentEnd.length,
-          rowIndex: endRowIndex
-        },
-        inserted: [],
-        origin: ToggleBlockComment$1,
-        start: {
-          columnIndex: endColumnIndex,
-          rowIndex: endRowIndex
-        }
-      };
-      changes.push(change1, change2);
-
-      // const oldRow1 = TextDocument.getLine(editor, startRowIndex)
-      // const newRow1 =
-      //   oldRow1.slice(0, startColumnIndex) +
-      //   oldRow1.slice(startColumnIndex + blockCommentStart.length)
-      // const oldRow2 = TextDocument.getLine(editor, endRowIndex)
-      // const newRow2 =
-      //   oldRow2.slice(0, endColumnIndex) +
-      //   oldRow2.slice(endColumnIndex + blockCommentEnd.length)
-      // // TODO use applyEdit to have undo functionality
-      // TextDocument.setLine(editor, startRowIndex, newRow1)
-      // TextDocument.setLine(editor, endRowIndex, newRow2)
-    }
+    changes.push(...getRemoveBlockCommentEdits(rowIndex, startRowIndex, startColumnIndex, endRowIndex, endColumnIndex, blockCommentStart, blockCommentEnd));
+
+    // const oldRow1 = TextDocument.getLine(editor, startRowIndex)
+    // const newRow1 =
+    //   oldRow1.slice(0, startColumnIndex) +
+    //   oldRow1.slice(startColumnIndex + blockCommentStart.length)
+    // const oldRow2 = TextDocument.getLine(editor, endRowIndex)
+    // const newRow2 =
+    //   oldRow2.slice(0, endColumnIndex) +
+    //   oldRow2.slice(endColumnIndex + blockCommentEnd.length)
+    // // TODO use applyEdit to have undo functionality
+    // TextDocument.setLine(editor, startRowIndex, newRow1)
+    // TextDocument.setLine(editor, endRowIndex, newRow2)
     // TODO move cursors
   } else {
     const whitespaceAtStart = line.match(RE_WHITESPACE_AT_START$1);
@@ -9252,7 +8776,7 @@ const typeWithAutoClosingQuote = (editor, text) => {
 const typeWithAutoClosingTag = async (editor, text) => {
   const offset = offsetAt(editor, editor.selections[0], editor.selections[1]);
   // @ts-ignore
-  const result = await invoke$d('ExtensionHostClosingTagCompletion.executeClosingTagProvider', editor, offset, text);
+  const result = await invoke$c('ExtensionHostClosingTagCompletion.executeClosingTagProvider', editor, offset, text);
   if (!result) {
     const changes = editorReplaceSelections(editor, [text], EditorType);
     return scheduleDocumentAndCursorsSelections(editor, changes);
@@ -9470,7 +8994,7 @@ const editorUnindent = editor => {
 
 const isFunctional = widgetId => {
   switch (widgetId) {
-    case ColorPicker:
+    case ColorPicker$1:
     case Completion:
     case Find:
     case Hover:
@@ -9515,7 +9039,7 @@ const addWidget$1 = (widget, id, render) => {
 
 const getWidgetInvoke = widgetId => {
   switch (widgetId) {
-    case ColorPicker:
+    case ColorPicker$1:
       return invoke$9;
     case Completion:
       return invoke$4;
@@ -9578,7 +9102,7 @@ const createFn = (key, name, widgetId) => {
       ...state,
       commands
     };
-    const latest = get$5(editor.uid).newState;
+    const latest = get$6(editor.uid).newState;
     const newEditor = updateWidget(latest, widgetId, newState);
     return newEditor;
   };
@@ -9875,7 +9399,7 @@ const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) =>
 };
 const getEditorHoverInfo = async (editorUid, position) => {
   number(editorUid);
-  const instance = get$5(editorUid);
+  const instance = get$6(editorUid);
   const editor = instance.newState;
   const {
     selections
@@ -9941,7 +9465,8 @@ const handleSashPointerDown = (state, eventX, eventY) => {
 const handleSashPointerMove = (state, eventX, eventY) => {
   // @ts-ignore
   const {
-    x} = state;
+    x
+  } = state;
   const minWidth = 100;
   const newWidth = Math.max(eventX - x, minWidth);
   return {
@@ -9992,13 +9517,13 @@ const HandleWheel = 'handleWheel';
 const Div = 4;
 const Input = 6;
 const Span = 8;
-const Text$1 = 12;
+const Text = 12;
 
 const text = data => {
   return {
     childCount: 0,
     text: data,
-    type: Text$1
+    type: Text
   };
 };
 
@@ -10035,7 +9560,9 @@ const hoverProblemDetail = {
   type: Span
 };
 const getChildCount = (lineInfos, documentation, diagnostics) => {
-  return lineInfos.length + documentation ? 1 : 0 + (diagnostics && diagnostics.length > 0) ? 1 : 0;
+  const documentationCount = documentation ? 1 : 0;
+  const diagnosticsCount = diagnostics && diagnostics.length > 0 ? 1 : 0;
+  return lineInfos.length + documentationCount + diagnosticsCount;
 };
 const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   const dom = [];
@@ -10271,12 +9798,12 @@ const getEditorSourceActions = async editorId => {
   }
   const {
     newState
-  } = get$5(editorId);
+  } = get$6(editorId);
   const {
     languageId
   } = newState;
   // @ts-ignore
-  const allActions = await invoke$d('GetEditorSourceActions.getEditorSourceActions');
+  const allActions = await invoke$c('GetEditorSourceActions.getEditorSourceActions');
   const filtered = filterActions(allActions, languageId);
   return filtered;
 };
@@ -10299,14 +9826,14 @@ const getWordAtOffset = editor => {
 };
 
 const setFocus = async focusKey => {
-  await invoke$d('Focus.setFocus', focusKey);
+  await invoke$c('Focus.setFocus', focusKey);
 };
 const unsetAdditionalFocus = async focusKey => {
   if (!focusKey) {
     return;
   }
   // @ts-ignore
-  await invoke$d('Focus.removeAdditionalFocus', focusKey);
+  await invoke$c('Focus.removeAdditionalFocus', focusKey);
 };
 
 const FocusEditor = 12;
@@ -10376,7 +9903,7 @@ const setSelections2 = (editorUid, selections) => {
     ...editor,
     selections
   };
-  set$6(editorUid, editor, newEditor);
+  set$7(editorUid, editor, newEditor);
 };
 const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
   const editor = getEditor(editorUid);
@@ -10395,7 +9922,7 @@ const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocu
     focused: true,
     widgets: newWidgets
   };
-  set$6(editorUid, editor, newEditor);
+  set$7(editorUid, editor, newEditor);
   await setFocus(FocusEditorText);
   if (unsetAdditionalFocus$1) {
     await unsetAdditionalFocus(unsetAdditionalFocus$1);
@@ -10407,7 +9934,7 @@ const closeFind2 = async editorUid => {
 const applyEdits2 = async (editorUid, edits) => {
   const editor = getEditor(editorUid);
   const newEditor = await applyEdit(editor, edits);
-  set$6(editorUid, editor, newEditor);
+  set$7(editorUid, editor, newEditor);
 };
 const getSourceActions = async editorUid => {
   const actions = await getEditorSourceActions(editorUid);
@@ -10870,7 +10397,7 @@ const getProblems = async () => {
   const keys = getKeys$2();
   const editors = keys.map(key => {
     const numericKey = parseInt(key);
-    const editor = get$5(numericKey);
+    const editor = get$6(numericKey);
     return editor;
   });
   const newEditors = editors.map(editor => editor.newState);
@@ -10985,7 +10512,7 @@ const handleMessagePort = async (port, rpcId) => {
     messagePort: port
   });
   if (rpcId) {
-    set$f(rpcId, rpc);
+    set$e(rpcId, rpc);
   }
 };
 
@@ -11018,7 +10545,7 @@ const getWidgetName = widgetId => {
 const saveWidgetState = async keys => {
   const savedStates = Object.create(null);
   for (const key of keys) {
-    const editor = get$5(parseInt(key));
+    const editor = get$6(parseInt(key));
     const {
       widgets
     } = editor.newState;
@@ -11037,7 +10564,7 @@ const restoreWidgetState = async (keys, savedStates) => {
   const newEditors = [];
   for (const key of keys) {
     const editorUid = parseInt(key);
-    const editor = get$5(editorUid);
+    const editor = get$6(editorUid);
     const {
       widgets
     } = editor.newState;
@@ -11084,12 +10611,12 @@ const hotReload = async () => {
   await relaunchWorkers();
   const newEditors = await restoreWidgetState(keys, savedStates);
   for (const editor of newEditors) {
-    set$6(editor.newState.uid, editor.oldState, editor.newState);
+    set$7(editor.newState.uid, editor.oldState, editor.newState);
   }
 
   // TODO ask renderer worker to rerender all editors
   // @ts-ignore
-  await invoke$d(`Editor.rerender`);
+  await invoke$c(`Editor.rerender`);
   isReloading = false;
 };
 
@@ -11134,7 +10661,7 @@ const createExtensionManagementWorkerRpc = async () => {
 const initializeExtensionManagementWorker = async () => {
   try {
     const rpc = await createExtensionManagementWorkerRpc();
-    set$d(rpc);
+    set$c(rpc);
   } catch {
     // ignore
   }
@@ -11161,7 +10688,7 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
     await sendMessagePortToSyntaxHighlightingWorker$1(port);
   } catch {
     // deprecated
-    await invokeAndTransfer$1(
+    await invokeAndTransfer(
     // @ts-ignore
     'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
   }
@@ -11198,7 +10725,7 @@ const initializeTextMeasurementWorker = async () => {
     commandMap: {},
     send
   });
-  set$a(rpc);
+  set$9(rpc);
 };
 
 const launchCompletionWorker = async () => {
@@ -11483,9 +11010,6 @@ const renderFocusContext$1 = (oldState, newState) => {
   return [SetFocusContext$1, newState.uid, FocusExplorer];
 };
 
-const Text = 12;
-const Reference = 100;
-
 const SetText = 1;
 const Replace = 2;
 const SetAttribute = 3;
@@ -11574,7 +11098,7 @@ const compareNodes = (oldNode, newNode) => {
     return patches;
   }
   // Handle text nodes
-  if (oldNode.type === Text && newNode.type === Text) {
+  if (oldNode.type === Text$1 && newNode.type === Text$1) {
     if (oldNode.text !== newNode.text) {
       patches.push({
         type: SetText,
@@ -11708,7 +11232,6 @@ const diffChildren = (oldChildren, newChildren, patches) => {
     patches.push({
       type: NavigateParent
     });
-    currentChildIndex = -1;
   }
   // Add remove patches in reverse order (highest index first)
   // This ensures indices remain valid as we remove
@@ -12010,28 +11533,28 @@ const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
-  } = get$7(uid);
-  set$8(uid, newState, newState);
+  } = get$6(uid);
+  set$7(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
 
 const addWidget = widget => {
-  const module = get$6(widget.id);
+  const module = get$5(widget.id);
   if (!module) {
     throw new Error('unsupported widget');
   }
   return module.add(widget);
 };
 const renderWidget = widget => {
-  const module = get$6(widget.id);
+  const module = get$5(widget.id);
   if (!module) {
     throw new Error('unsupported widget');
   }
   return module.render(widget);
 };
 const removeWidget = widget => {
-  const module = get$6(widget.id);
+  const module = get$5(widget.id);
   if (!module) {
     throw new Error('unsupported widget');
   }
@@ -12213,7 +11736,7 @@ const renderWidgets = {
 };
 const render$6 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets, renderFocusContext, renderAdditionalFocusContext];
 const renderEditor = async id => {
-  const instance = get$5(id);
+  const instance = get$6(id);
   if (!instance) {
     return [];
   }
@@ -12222,7 +11745,7 @@ const renderEditor = async id => {
     oldState
   } = instance;
   const commands = [];
-  set$6(id, newState, newState);
+  set$7(id, newState, newState);
   for (const item of render$6) {
     if (!item.isEqual(oldState, newState)) {
       const result = await item.apply(oldState, newState);
@@ -12299,7 +11822,7 @@ const unregisterListener = (listenerType, rpcId) => {
 };
 
 const invoke = async (method, ...params) => {
-  const worker = get$8(DebugWorker);
+  const worker = get$7(DebugWorker);
   return worker.invoke(method, ...params);
 };
 
@@ -12315,7 +11838,7 @@ const getKey = () => {
 const updateDebugInfo = async debugId => {
   const newInfo = await getDebugHighlight(debugId);
   const key = getKey();
-  const instance = get$5(key);
+  const instance = get$6(key);
   if (!instance) {
     return;
   }
@@ -12327,90 +11850,69 @@ const updateDebugInfo = async debugId => {
     ...newState,
     highlightedLine: newInfo.rowIndex
   };
-  set$6(key, oldState, newEditor);
+  set$7(key, oldState, newEditor);
   // @ts-ignore
-  await invoke$d('Editor.rerender', key);
-};
-
-// TODO wrap commands globally, not per editor
-// TODO only store editor state in editor worker, not in renderer worker also
-
-const wrapCommand = fn => async (editorUid, ...args) => {
-  const oldInstance = get$5(editorUid);
-  const state = oldInstance.newState;
-  const newEditor = await fn(state, ...args);
-  if (state === newEditor) {
-    return newEditor;
-  }
-  // TODO if editor did not change, no need to update furthur
-
-  // TODO combine neweditor with latest editor?
-
-  set$6(editorUid, state, newEditor);
-  const commands = await renderEditor(editorUid);
-  return {
-    ...newEditor,
-    commands
-  };
+  await invoke$c('Editor.rerender', key);
 };
 
+const wrapCommandOld = wrapCommand;
 const commandMap = {
   'ActivateByEvent.activateByEvent': activateByEvent,
   'CodeGenerator.accept': codeGeneratorAccept,
   'ColorPicker.loadContent': loadContent$3,
-  'Editor.addCursorAbove': wrapCommand(addCursorAbove),
-  'Editor.addCursorBelow': wrapCommand(addCursorBelow),
-  'Editor.applyDocumentEdits': wrapCommand(applyDocumentEdits),
-  'Editor.applyEdit': wrapCommand(applyEdit),
+  'Editor.addCursorAbove': wrapCommandOld(addCursorAbove),
+  'Editor.addCursorBelow': wrapCommandOld(addCursorBelow),
+  'Editor.applyDocumentEdits': wrapCommandOld(applyDocumentEdits),
+  'Editor.applyEdit': wrapCommandOld(applyEdit),
   'Editor.applyEdit2': applyEdits2,
-  'Editor.applyWorkspaceEdit': wrapCommand(applyWorkspaceEdit),
-  'Editor.braceCompletion': wrapCommand(braceCompletion),
-  'Editor.cancelSelection': wrapCommand(cancelSelection),
-  'Editor.closeCodeGenerator': wrapCommand(closeCodeGenerator),
-  'Editor.closeFind': wrapCommand(closeFind),
+  'Editor.applyWorkspaceEdit': wrapCommandOld(applyWorkspaceEdit),
+  'Editor.braceCompletion': wrapCommandOld(braceCompletion),
+  'Editor.cancelSelection': wrapCommandOld(cancelSelection),
+  'Editor.closeCodeGenerator': wrapCommandOld(closeCodeGenerator),
+  'Editor.closeFind': wrapCommandOld(closeFind),
   'Editor.closeFind2': closeFind2,
-  'Editor.closeRename': wrapCommand(closeRename),
-  'Editor.closeSourceAction': wrapCommand(closeSourceAction),
+  'Editor.closeRename': wrapCommandOld(closeRename),
+  'Editor.closeSourceAction': wrapCommandOld(closeSourceAction),
   'Editor.closeWidget2': closeWidget2,
-  'Editor.compositionEnd': wrapCommand(compositionEnd),
-  'Editor.compositionStart': wrapCommand(compositionStart),
-  'Editor.compositionUpdate': wrapCommand(compositionUpdate),
-  'Editor.contextMenu': wrapCommand(handleContextMenu),
-  'Editor.copy': wrapCommand(copy$1),
-  'Editor.copyLineDown': wrapCommand(copyLineDown),
-  'Editor.copyLineUp': wrapCommand(copyLineUp),
+  'Editor.compositionEnd': wrapCommandOld(compositionEnd),
+  'Editor.compositionStart': wrapCommandOld(compositionStart),
+  'Editor.compositionUpdate': wrapCommandOld(compositionUpdate),
+  'Editor.contextMenu': wrapCommandOld(handleContextMenu),
+  'Editor.copy': wrapCommandOld(copy$1),
+  'Editor.copyLineDown': wrapCommandOld(copyLineDown),
+  'Editor.copyLineUp': wrapCommandOld(copyLineUp),
   'Editor.create': createEditor,
   'Editor.create2': createEditor2,
-  'Editor.cursorCharacterLeft': wrapCommand(cursorCharacterLeft),
-  'Editor.cursorCharacterRight': wrapCommand(cursorCharacterRight),
-  'Editor.cursorDown': wrapCommand(cursorDown),
-  'Editor.cursorEnd': wrapCommand(cursorEnd),
-  'Editor.cursorHome': wrapCommand(cursorHome),
-  'Editor.cursorLeft': wrapCommand(cursorCharacterLeft),
-  'Editor.cursorRight': wrapCommand(cursorCharacterRight),
-  'Editor.cursorSet': wrapCommand(cursorSet),
-  'Editor.cursorUp': wrapCommand(cursorUp),
-  'Editor.cursorWordLeft': wrapCommand(cursorWordLeft),
-  'Editor.cursorWordPartLeft': wrapCommand(cursorWordPartLeft),
-  'Editor.cursorWordPartRight': wrapCommand(cursorWordPartRight),
-  'Editor.cursorWordRight': wrapCommand(cursorWordRight),
-  'Editor.cut': wrapCommand(cut$1),
-  'Editor.deleteAll': wrapCommand(deleteAll),
-  'Editor.deleteAllLeft': wrapCommand(deleteAllLeft),
-  'Editor.deleteAllRight': wrapCommand(deleteAllRight),
-  'Editor.deleteCharacterLeft': wrapCommand(deleteCharacterLeft),
-  'Editor.deleteCharacterRight': wrapCommand(deleteCharacterRight),
-  'Editor.deleteHorizontalRight': wrapCommand(editorDeleteHorizontalRight),
-  'Editor.deleteLeft': wrapCommand(deleteCharacterLeft),
-  'Editor.deleteRight': wrapCommand(deleteCharacterRight),
-  'Editor.deleteWordLeft': wrapCommand(deleteWordLeft),
-  'Editor.deleteWordPartLeft': wrapCommand(deleteWordPartLeft),
-  'Editor.deleteWordPartRight': wrapCommand(deleteWordPartRight),
-  'Editor.deleteWordRight': wrapCommand(deleteWordRight),
+  'Editor.cursorCharacterLeft': wrapCommandOld(cursorCharacterLeft),
+  'Editor.cursorCharacterRight': wrapCommandOld(cursorCharacterRight),
+  'Editor.cursorDown': wrapCommandOld(cursorDown),
+  'Editor.cursorEnd': wrapCommandOld(cursorEnd),
+  'Editor.cursorHome': wrapCommandOld(cursorHome),
+  'Editor.cursorLeft': wrapCommandOld(cursorCharacterLeft),
+  'Editor.cursorRight': wrapCommandOld(cursorCharacterRight),
+  'Editor.cursorSet': wrapCommandOld(cursorSet),
+  'Editor.cursorUp': wrapCommandOld(cursorUp),
+  'Editor.cursorWordLeft': wrapCommandOld(cursorWordLeft),
+  'Editor.cursorWordPartLeft': wrapCommandOld(cursorWordPartLeft),
+  'Editor.cursorWordPartRight': wrapCommandOld(cursorWordPartRight),
+  'Editor.cursorWordRight': wrapCommandOld(cursorWordRight),
+  'Editor.cut': wrapCommandOld(cut$1),
+  'Editor.deleteAll': wrapCommandOld(deleteAll),
+  'Editor.deleteAllLeft': wrapCommandOld(deleteAllLeft),
+  'Editor.deleteAllRight': wrapCommandOld(deleteAllRight),
+  'Editor.deleteCharacterLeft': wrapCommandOld(deleteCharacterLeft),
+  'Editor.deleteCharacterRight': wrapCommandOld(deleteCharacterRight),
+  'Editor.deleteHorizontalRight': wrapCommandOld(editorDeleteHorizontalRight),
+  'Editor.deleteLeft': wrapCommandOld(deleteCharacterLeft),
+  'Editor.deleteRight': wrapCommandOld(deleteCharacterRight),
+  'Editor.deleteWordLeft': wrapCommandOld(deleteWordLeft),
+  'Editor.deleteWordPartLeft': wrapCommandOld(deleteWordPartLeft),
+  'Editor.deleteWordPartRight': wrapCommandOld(deleteWordPartRight),
+  'Editor.deleteWordRight': wrapCommandOld(deleteWordRight),
   'Editor.diff2': diff2,
-  'Editor.executeWidgetCommand': wrapCommand(executeWidgetCommand),
-  'Editor.findAllReferences': wrapCommand(findAllReferences$1),
-  'Editor.format': wrapCommand(format),
+  'Editor.executeWidgetCommand': wrapCommandOld(executeWidgetCommand),
+  'Editor.findAllReferences': wrapCommandOld(findAllReferences$1),
+  'Editor.format': wrapCommandOld(format),
   'Editor.getCommandIds': getCommandIds,
   'Editor.getDiagnostics': getDiagnostics$1,
   'Editor.getKeyBindings': getKeyBindings,
@@ -12434,103 +11936,103 @@ const commandMap = {
   'Editor.getWordAtOffset2': getWordAtOffset2,
   'Editor.getWordBefore': getWordBefore,
   'Editor.getWordBefore2': getWordBefore2,
-  'Editor.goToDefinition': wrapCommand(goToDefinition),
-  'Editor.goToTypeDefinition': wrapCommand(goToTypeDefinition),
-  'Editor.handleBeforeInput': wrapCommand(handleBeforeInput),
-  'Editor.handleBeforeInputFromContentEditable': wrapCommand(handleBeforeInputFromContentEditable),
-  'Editor.handleBlur': wrapCommand(handleBlur$1),
+  'Editor.goToDefinition': wrapCommandOld(goToDefinition),
+  'Editor.goToTypeDefinition': wrapCommandOld(goToTypeDefinition),
+  'Editor.handleBeforeInput': wrapCommandOld(handleBeforeInput),
+  'Editor.handleBeforeInputFromContentEditable': wrapCommandOld(handleBeforeInputFromContentEditable),
+  'Editor.handleBlur': wrapCommandOld(handleBlur$1),
   'Editor.handleClickAtPosition': handleClickAtPosition,
-  'Editor.handleContextMenu': wrapCommand(handleContextMenu),
-  'Editor.handleDoubleClick': wrapCommand(handleDoubleClick),
-  'Editor.handleFocus': wrapCommand(handleFocus$1),
-  'Editor.handleMouseDown': wrapCommand(handleMouseDown),
-  'Editor.handleMouseMove': wrapCommand(handleMouseMove),
-  'Editor.handleMouseMoveWithAltKey': wrapCommand(handleMouseMoveWithAltKey),
+  'Editor.handleContextMenu': wrapCommandOld(handleContextMenu),
+  'Editor.handleDoubleClick': wrapCommandOld(handleDoubleClick),
+  'Editor.handleFocus': wrapCommandOld(handleFocus$1),
+  'Editor.handleMouseDown': wrapCommandOld(handleMouseDown),
+  'Editor.handleMouseMove': wrapCommandOld(handleMouseMove),
+  'Editor.handleMouseMoveWithAltKey': wrapCommandOld(handleMouseMoveWithAltKey),
   'Editor.handleNativeSelectionChange': editorHandleNativeSelectionChange,
-  'Editor.handlePointerCaptureLost': wrapCommand(handlePointerCaptureLost),
+  'Editor.handlePointerCaptureLost': wrapCommandOld(handlePointerCaptureLost),
   'Editor.handleScrollBarClick': handleScrollBarPointerDown,
-  'Editor.handleScrollBarHorizontalMove': wrapCommand(handleScrollBarHorizontalMove),
-  'Editor.handleScrollBarHorizontalPointerDown': wrapCommand(handleScrollBarHorizontalPointerDown),
-  'Editor.handleScrollBarMove': wrapCommand(handleScrollBarMove),
-  'Editor.handleScrollBarPointerDown': wrapCommand(handleScrollBarPointerDown),
-  'Editor.handleScrollBarVerticalMove': wrapCommand(handleScrollBarVerticalPointerMove),
-  'Editor.handleScrollBarVerticalPointerDown': wrapCommand(handleScrollBarPointerDown),
-  'Editor.handleScrollBarVerticalPointerMove': wrapCommand(handleScrollBarVerticalPointerMove),
-  'Editor.handleSingleClick': wrapCommand(handleSingleClick),
-  'Editor.handleTab': wrapCommand(handleTab),
-  'Editor.handleTouchEnd': wrapCommand(handleTouchEnd),
-  'Editor.handleTouchMove': wrapCommand(handleTouchMove),
-  'Editor.handleTouchStart': wrapCommand(handleTouchStart),
-  'Editor.handleTripleClick': wrapCommand(handleTripleClick),
+  'Editor.handleScrollBarHorizontalMove': wrapCommandOld(handleScrollBarHorizontalMove),
+  'Editor.handleScrollBarHorizontalPointerDown': wrapCommandOld(handleScrollBarHorizontalPointerDown),
+  'Editor.handleScrollBarMove': wrapCommandOld(handleScrollBarMove),
+  'Editor.handleScrollBarPointerDown': wrapCommandOld(handleScrollBarPointerDown),
+  'Editor.handleScrollBarVerticalMove': wrapCommandOld(handleScrollBarVerticalPointerMove),
+  'Editor.handleScrollBarVerticalPointerDown': wrapCommandOld(handleScrollBarPointerDown),
+  'Editor.handleScrollBarVerticalPointerMove': wrapCommandOld(handleScrollBarVerticalPointerMove),
+  'Editor.handleSingleClick': wrapCommandOld(handleSingleClick),
+  'Editor.handleTab': wrapCommandOld(handleTab),
+  'Editor.handleTouchEnd': wrapCommandOld(handleTouchEnd),
+  'Editor.handleTouchMove': wrapCommandOld(handleTouchMove),
+  'Editor.handleTouchStart': wrapCommandOld(handleTouchStart),
+  'Editor.handleTripleClick': wrapCommandOld(handleTripleClick),
   'Editor.hotReload': hotReload,
-  'Editor.indendLess': wrapCommand(indentLess),
-  'Editor.indentMore': wrapCommand(indentMore),
-  'Editor.insertLineBreak': wrapCommand(insertLineBreak),
-  'Editor.loadContent': wrapCommand$1(loadContent),
-  'Editor.moveLineDown': wrapCommand(moveLineDown),
-  'Editor.moveLineUp': wrapCommand(moveLineUp),
-  'Editor.moveRectangleSelection': wrapCommand(moveRectangleSelection),
-  'Editor.moveRectangleSelectionPx': wrapCommand(moveRectangleSelectionPx),
-  'Editor.moveSelection': wrapCommand(editorMoveSelection),
-  'Editor.moveSelectionPx': wrapCommand(moveSelectionPx),
+  'Editor.indendLess': wrapCommandOld(indentLess),
+  'Editor.indentMore': wrapCommandOld(indentMore),
+  'Editor.insertLineBreak': wrapCommandOld(insertLineBreak),
+  'Editor.loadContent': wrapCommand(loadContent),
+  'Editor.moveLineDown': wrapCommandOld(moveLineDown),
+  'Editor.moveLineUp': wrapCommandOld(moveLineUp),
+  'Editor.moveRectangleSelection': wrapCommandOld(moveRectangleSelection),
+  'Editor.moveRectangleSelectionPx': wrapCommandOld(moveRectangleSelectionPx),
+  'Editor.moveSelection': wrapCommandOld(editorMoveSelection),
+  'Editor.moveSelectionPx': wrapCommandOld(moveSelectionPx),
   'Editor.offsetAt': offsetAt,
-  'Editor.openCodeGenerator': wrapCommand(openCodeGenerator),
-  'Editor.openColorPicker': wrapCommand(openColorPicker),
-  'Editor.openCompletion': wrapCommand(openCompletion),
-  'Editor.openFind': wrapCommand(openFind),
-  'Editor.openFind2': wrapCommand(openFind2),
-  'Editor.openRename': wrapCommand(openRename),
-  'Editor.organizeImports': wrapCommand(organizeImports),
-  'Editor.paste': wrapCommand(paste),
-  'Editor.pasteText': wrapCommand(pasteText),
+  'Editor.openCodeGenerator': wrapCommandOld(openCodeGenerator),
+  'Editor.openColorPicker': wrapCommandOld(openColorPicker),
+  'Editor.openCompletion': wrapCommandOld(openCompletion),
+  'Editor.openFind': wrapCommandOld(openFind),
+  'Editor.openFind2': wrapCommandOld(openFind2),
+  'Editor.openRename': wrapCommandOld(openRename),
+  'Editor.organizeImports': wrapCommandOld(organizeImports),
+  'Editor.paste': wrapCommandOld(paste),
+  'Editor.pasteText': wrapCommandOld(pasteText),
   'Editor.render': renderEditor,
   'Editor.render2': render2,
   'Editor.renderEventListeners': renderEventListeners,
-  'Editor.replaceRange': wrapCommand(replaceRange),
-  'Editor.rerender': wrapCommand(rerender),
-  'Editor.save': wrapCommand(save),
+  'Editor.replaceRange': wrapCommandOld(replaceRange),
+  'Editor.rerender': wrapCommandOld(rerender),
+  'Editor.save': wrapCommandOld(save),
   'Editor.saveState': wrapGetter(saveState),
-  'Editor.selectAll': wrapCommand(selectAll),
-  'Editor.selectAllLeft': wrapCommand(editorSelectAllLeft),
-  'Editor.selectAllOccurrences': wrapCommand(selectAllOccurrences),
-  'Editor.selectAllRight': wrapCommand(editorSelectAllRight),
-  'Editor.selectCharacterLeft': wrapCommand(selectCharacterLeft),
-  'Editor.selectCharacterRight': wrapCommand(selectCharacterRight),
-  'Editor.selectDown': wrapCommand(selectDown),
-  'Editor.selectInsideString': wrapCommand(selectInsideString),
-  'Editor.selectionGrow': wrapCommand(selectionGrow),
-  'Editor.selectLine': wrapCommand(selectLine),
-  'Editor.selectNextOccurrence': wrapCommand(selectNextOccurrence),
-  'Editor.selectPreviousOccurrence': wrapCommand(selectPreviousOccurrence),
-  'Editor.selectUp': wrapCommand(selectUp),
-  'Editor.selectWord': wrapCommand(selectWord),
-  'Editor.selectWordLeft': wrapCommand(selectWordLeft),
-  'Editor.selectWordRight': wrapCommand(selectWordRight),
-  'Editor.setDebugEnabled': wrapCommand(setDebugEnabled),
-  'Editor.setDecorations': wrapCommand(setDecorations),
-  'Editor.setDelta': wrapCommand(setDelta),
-  'Editor.setDeltaY': wrapCommand(setDeltaY),
-  'Editor.setLanguageId': wrapCommand(setLanguageId),
-  'Editor.setSelections': wrapCommand(setSelections),
+  'Editor.selectAll': wrapCommandOld(selectAll),
+  'Editor.selectAllLeft': wrapCommandOld(editorSelectAllLeft),
+  'Editor.selectAllOccurrences': wrapCommandOld(selectAllOccurrences),
+  'Editor.selectAllRight': wrapCommandOld(editorSelectAllRight),
+  'Editor.selectCharacterLeft': wrapCommandOld(selectCharacterLeft),
+  'Editor.selectCharacterRight': wrapCommandOld(selectCharacterRight),
+  'Editor.selectDown': wrapCommandOld(selectDown),
+  'Editor.selectInsideString': wrapCommandOld(selectInsideString),
+  'Editor.selectionGrow': wrapCommandOld(selectionGrow),
+  'Editor.selectLine': wrapCommandOld(selectLine),
+  'Editor.selectNextOccurrence': wrapCommandOld(selectNextOccurrence),
+  'Editor.selectPreviousOccurrence': wrapCommandOld(selectPreviousOccurrence),
+  'Editor.selectUp': wrapCommandOld(selectUp),
+  'Editor.selectWord': wrapCommandOld(selectWord),
+  'Editor.selectWordLeft': wrapCommandOld(selectWordLeft),
+  'Editor.selectWordRight': wrapCommandOld(selectWordRight),
+  'Editor.setDebugEnabled': wrapCommandOld(setDebugEnabled),
+  'Editor.setDecorations': wrapCommandOld(setDecorations),
+  'Editor.setDelta': wrapCommandOld(setDelta),
+  'Editor.setDeltaY': wrapCommandOld(setDeltaY),
+  'Editor.setLanguageId': wrapCommandOld(setLanguageId),
+  'Editor.setSelections': wrapCommandOld(setSelections),
   'Editor.setSelections2': setSelections2,
-  'Editor.setText': wrapCommand(setText),
+  'Editor.setText': wrapCommandOld(setText),
   'Editor.showHover': showHover,
   'Editor.showHover2': showHover3,
   'Editor.showSourceActions': showSourceActions,
   'Editor.showSourceActions2': showSourceActions,
   'Editor.showSourceActions3': showSourceActions,
-  'Editor.sortLinesAscending': wrapCommand(sortLinesAscending),
-  'Editor.tabCompletion': wrapCommand(tabCompletion),
+  'Editor.sortLinesAscending': wrapCommandOld(sortLinesAscending),
+  'Editor.tabCompletion': wrapCommandOld(tabCompletion),
   'Editor.terminate': terminate,
-  'Editor.toggleBlockComment': wrapCommand(toggleBlockComment),
-  'Editor.toggleComment': wrapCommand(toggleComment),
-  'Editor.toggleLineComment': wrapCommand(editorToggleLineComment),
-  'Editor.type': wrapCommand(type),
-  'Editor.typeWithAutoClosing': wrapCommand(typeWithAutoClosing),
-  'Editor.undo': wrapCommand(undo),
-  'Editor.unIndent': wrapCommand(editorUnindent),
+  'Editor.toggleBlockComment': wrapCommandOld(toggleBlockComment),
+  'Editor.toggleComment': wrapCommandOld(toggleComment),
+  'Editor.toggleLineComment': wrapCommandOld(editorToggleLineComment),
+  'Editor.type': wrapCommandOld(type),
+  'Editor.typeWithAutoClosing': wrapCommandOld(typeWithAutoClosing),
+  'Editor.undo': wrapCommandOld(undo),
+  'Editor.unIndent': wrapCommandOld(editorUnindent),
   'Editor.updateDebugInfo': updateDebugInfo,
-  'Editor.updateDiagnostics': wrapCommand(updateDiagnostics),
+  'Editor.updateDiagnostics': wrapCommandOld(updateDiagnostics),
   'EditorCompletion.close': close$4,
   'EditorCompletion.closeDetails': closeDetails$1,
   'EditorCompletion.focusFirst': focusFirst$1,
@@ -12617,7 +12119,7 @@ const listen = async () => {
   const rpc = await create$b({
     commandMap: commandMap
   });
-  set$c(rpc);
+  set$a(rpc);
 };
 
 const CodeGeneratorInput = 'CodeGeneratorInput';
@@ -12843,7 +12345,7 @@ const add$1 = widget => {
   return addWidget$1(widget, 'EditorCompletionDetails', render$1);
 };
 const remove$1 = removeWidget$1;
-const handleEditorType = (editor, state) => {
+const handleEditorChange = (editor, state) => {
   const completionState = getCompletionState(editor);
   if (!completionState) {
     return editor;
@@ -12857,19 +12359,11 @@ const handleEditorType = (editor, state) => {
     x: detailX
   };
 };
+const handleEditorType = (editor, state) => {
+  return handleEditorChange(editor, state);
+};
 const handleEditorDeleteLeft = (editor, state) => {
-  const completionState = getCompletionState(editor);
-  if (!completionState) {
-    return editor;
-  }
-  const {
-    x
-  } = getPositionAtCursor$1(editor);
-  const detailX = x + completionState.width - state.borderSize;
-  return {
-    ...state,
-    x: detailX
-  };
+  return handleEditorChange(editor, state);
 };
 
 const EditorCompletionDetailWidget = {
@@ -12915,14 +12409,14 @@ const EditorHoverWidget = {
 };
 
 const registerWidgets = () => {
-  set$7(ColorPicker, EditorColorPickerWidget);
-  set$7(Completion, EditorCompletionWidget);
-  set$7(CompletionDetail, EditorCompletionDetailWidget);
-  set$7(Find, EditorFindWidget);
-  set$7(Hover, EditorHoverWidget);
-  set$7(Rename$1, EditorRenameWidget);
-  set$7(SourceAction$1, EditorSourceActionWidget);
-  set$7(CodeGenerator, EditorCodeGeneratorWidget);
+  set$6(ColorPicker$1, EditorColorPickerWidget);
+  set$6(Completion, EditorCompletionWidget);
+  set$6(CompletionDetail, EditorCompletionDetailWidget);
+  set$6(Find, EditorFindWidget);
+  set$6(Hover, EditorHoverWidget);
+  set$6(Rename$1, EditorRenameWidget);
+  set$6(SourceAction$1, EditorSourceActionWidget);
+  set$6(CodeGenerator, EditorCodeGeneratorWidget);
 };
 
 const handleUnhandledRejection = event => {