@lvce-editor/editor-worker 19.29.1 → 19.29.3

package/dist/editorWorkerMain.js

@@ -1151,7 +1151,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$i = (id, rpc) => {
+const set$g = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$9 = id => {
@@ -1184,7 +1184,7 @@ const create$a = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$i(rpcId, mockRpc);
+      set$g(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove$8(rpcId);
@@ -1193,7 +1193,7 @@ const create$a = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$i(rpcId, rpc);
+      set$g(rpcId, rpc);
     }
   };
 };
@@ -1436,7 +1436,6 @@ const DebugWorker = 55;
 const DialogWorker = 7014;
 const EditorWorker = 99;
 const ErrorWorker = 3308;
-const ExtensionHostWorker = 44;
 const ExtensionManagementWorker = 9006;
 const IconThemeWorker = 7009;
 const MarkdownWorker = 300;
@@ -1450,33 +1449,22 @@ const SetPatches = 'Viewlet.setPatches';
 
 const FocusEditorText$1 = 12;
 
-const {
-  invoke: invoke$h,
-  set: set$h
-} = create$a(DialogWorker);
-
-const {
-  invoke: invoke$g,
-  set: set$g
-} = create$a(ErrorWorker);
-
 const {
   invoke: invoke$f,
   set: set$f
-} = create$a(ExtensionHostWorker);
-
-const ExtensionHost = {
-  __proto__: null,
-  invoke: invoke$f,
-  set: set$f
-};
+} = create$a(DialogWorker);
 
 const {
   invoke: invoke$e,
   set: set$e
+} = create$a(ErrorWorker);
+
+const {
+  invoke: invoke$d,
+  set: set$d
 } = create$a(ExtensionManagementWorker);
 const getLanguages$1 = (platform, assetDir) => {
-  return invoke$e('Extensions.getLanguages', platform, assetDir);
+  return invoke$d('Extensions.getLanguages', platform, assetDir);
 };
 
 const createLazyRpc = rpcId => {
@@ -1492,7 +1480,7 @@ const createLazyRpc = rpcId => {
       throw new Error('Lazy RPC launch was superseded');
     }
     activeRpc = rpc;
-    set$i(rpcId, rpc);
+    set$g(rpcId, rpc);
     return rpc;
   };
   const ensureRpc = async () => {
@@ -1553,29 +1541,29 @@ const createLazyRpc = rpcId => {
 };
 
 const {
-  invoke: invoke$d,
-  set: set$d
+  invoke: invoke$c,
+  set: set$c
 } = create$a(OpenerWorker);
 const openUrl = async (url, platform) => {
-  return invoke$d('Open.openUrl', url, platform);
+  return invoke$c('Open.openUrl', url, platform);
 };
 
 const {
-  invoke: invoke$c,
-  set: set$c
+  invoke: invoke$b,
+  set: set$b
 } = create$a(IconThemeWorker);
 
 const {
-  invoke: invoke$b,
+  invoke: invoke$a,
   invokeAndTransfer,
-  set: set$b
+  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$b('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$a('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToOpenerWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
@@ -1590,23 +1578,16 @@ const sendMessagePortToErrorWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToErrorWorker', port, command, rpcId);
 };
 const readFile$1 = async uri => {
-  return invoke$b('FileSystem.readFile', uri);
+  return invoke$a('FileSystem.readFile', uri);
 };
 const handleWorkspaceRefresh = async () => {
-  return invoke$b('Layout.handleWorkspaceRefresh');
-};
-const sendMessagePortToExtensionHostWorker = async (port, rpcId = 0) => {
-  const command = 'HandleMessagePort.handleMessagePort2';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
+  return invoke$a('Layout.handleWorkspaceRefresh');
 };
 const writeClipBoardText = async text => {
-  await invoke$b('ClipBoard.writeText', /* text */text);
+  await invoke$a('ClipBoard.writeText', /* text */text);
 };
 const readClipBoardText = async () => {
-  return invoke$b('ClipBoard.readText');
-};
-const activateByEvent$1 = (event, assetDir, platform) => {
-  return invoke$b('ExtensionHostManagement.activateByEvent', event, assetDir, platform);
+  return invoke$a('ClipBoard.readText');
 };
 const sendMessagePortToTextMeasurementWorker = async port => {
   const command = 'TextMeasurement.handleMessagePort';
@@ -1617,10 +1598,10 @@ const sendMessagePortToExtensionManagementWorker$1 = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
 const getPreference = async key => {
-  return await invoke$b('Preferences.get', key);
+  return await invoke$a('Preferences.get', key);
 };
 const openUri = async (uri, focus, options) => {
-  await invoke$b('Main.openUri', {
+  await invoke$a('Main.openUri', {
     ...options,
     focus,
     uri
@@ -1632,35 +1613,33 @@ const sendMessagePortToSyntaxHighlightingWorker$1 = async port => {
 
 const RendererWorker = {
   __proto__: null,
-  activateByEvent: activateByEvent$1,
   getPreference,
   handleWorkspaceRefresh,
-  invoke: invoke$b,
+  invoke: invoke$a,
   invokeAndTransfer,
   openUri,
   readClipBoardText,
   readFile: readFile$1,
   sendMessagePortToDialogWorker,
   sendMessagePortToErrorWorker,
-  sendMessagePortToExtensionHostWorker,
   sendMessagePortToExtensionManagementWorker: sendMessagePortToExtensionManagementWorker$1,
   sendMessagePortToOpenerWorker,
   sendMessagePortToSyntaxHighlightingWorker: sendMessagePortToSyntaxHighlightingWorker$1,
   sendMessagePortToTextMeasurementWorker,
-  set: set$b,
+  set: set$a,
   showContextMenu2,
   writeClipBoardText
 };
 
 const {
-  invoke: invoke$a,
-  set: set$a
+  invoke: invoke$9,
+  set: set$9
 } = create$a(MarkdownWorker);
 
 const SyntaxHighlightingWorker = {
   __proto__: null,
-  invoke: invoke$a,
-  set: set$a
+  invoke: invoke$9,
+  set: set$9
 };
 
 const toCommandId = key => {
@@ -1914,7 +1893,7 @@ const activateByEvent = async (event, assetDir, platform) => {
   string(event);
   // Assert.string(assetDir)
   // Assert.number(platform)
-  await activateByEvent$1(event, assetDir, platform);
+  await invoke$d('Extensions.activateByEvent', event);
 };
 
 const codeGeneratorAccept = state => {
@@ -1924,9 +1903,9 @@ const codeGeneratorAccept = state => {
 
 const ModuleWorkerAndWorkaroundForChromeDevtoolsBug = 6;
 
-const launchWorker = async (name, url, intializeCommand) => {
+const launchWorker = async (name, url, intializeCommand, commandMap = {}) => {
   const rpc = await create$e({
-    commandMap: {},
+    commandMap,
     isMessagePortOpen: true,
     async send(port) {
       await invokeAndTransfer('IpcParent.create', {
@@ -1957,7 +1936,7 @@ const getOrCreate$3 = () => {
   }
   return state$c.workerPromise;
 };
-const invoke$9 = async (method, ...params) => {
+const invoke$8 = async (method, ...params) => {
   const worker = await getOrCreate$3();
   return await worker.invoke(method, ...params);
 };
@@ -1970,10 +1949,10 @@ const loadContent$3 = async (state, parentUid) => {
     x,
     y
   } = state;
-  await invoke$9('ColorPicker.create', uid, x, y, width, height, parentUid);
-  await invoke$9('ColorPicker.loadContent', uid);
-  const diff = await invoke$9('ColorPicker.diff2', uid);
-  const commands = await invoke$9('ColorPicker.render2', uid, diff);
+  await invoke$8('ColorPicker.create', uid, x, y, width, height, parentUid);
+  await invoke$8('ColorPicker.loadContent', uid);
+  const diff = await invoke$8('ColorPicker.diff2', uid);
+  const commands = await invoke$8('ColorPicker.render2', uid, diff);
   return {
     ...state,
     commands
@@ -1994,7 +1973,7 @@ const getKeys$2 = () => {
   const keys = editorStates.getKeys();
   return keys.map(String);
 };
-const set$9 = (id, oldEditor, newEditor) => {
+const set$8 = (id, oldEditor, newEditor) => {
   editorStates.set(id, oldEditor, newEditor);
 };
 
@@ -2006,6 +1985,14 @@ const Empty = 0;
 const FindWidget = 16;
 const FocusEditorHover = 51;
 const FocusEditorRename$1 = 11;
+const FocusFindWidgetCloseButton = 48;
+const FocusFindWidgetNextMatchButton = 49;
+const FocusFindWidgetOptions = 44;
+const FocusFindWidgetPreviousMatchButton = 50;
+const FocusFindWidgetReplace$1 = 43;
+const FocusFindWidgetReplaceAllButton = 47;
+const FocusFindWidgetReplaceButton = 46;
+const FocusFindWidgetToggleReplace = 42;
 const SourceActions = 38;
 const FocusCodeGenerator = 52;
 
@@ -2100,7 +2087,7 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     x,
     y
   };
-  set$9(id, editor, editor);
+  set$8(id, editor, editor);
 };
 
 // TODO use numeric enum
@@ -2123,7 +2110,7 @@ const Rename = 'rename';
 const ToggleBlockComment$1 = 'toggleBlockComment';
 
 const map$1 = Object.create(null);
-const set$8 = (id, widget) => {
+const set$7 = (id, widget) => {
   map$1[id] = widget;
 };
 const get$7 = id => {
@@ -2596,8 +2583,8 @@ const getEnabled$1 = () => {
 };
 
 const {
-  invoke: invoke$8,
-  set: set$7
+  invoke: invoke$7,
+  set: set$6
 } = SyntaxHighlightingWorker;
 
 const state$9 = {
@@ -2608,7 +2595,7 @@ const state$9 = {
 const has = languageId => {
   return Object.hasOwn(state$9.tokenizers, languageId);
 };
-const set$6 = (languageId, tokenizer) => {
+const set$5 = (languageId, tokenizer) => {
   state$9.tokenizers[languageId] = tokenizer;
 };
 const get$6 = languageId => {
@@ -2632,7 +2619,7 @@ const isPending = languageId => {
 };
 
 const tokenMaps = Object.create(null);
-const set$5 = (languageId, tokenMap) => {
+const set$4 = (languageId, tokenMap) => {
   tokenMaps[languageId] = tokenMap;
 };
 const get$5 = languageId => {
@@ -2647,8 +2634,8 @@ const loadTokenizer = async (languageId, tokenizePath) => {
   setTokenizePath(languageId, tokenizePath);
   if (getEnabled$1()) {
     // @ts-ignore
-    const tokenMap = await invoke$8('Tokenizer.load', languageId, tokenizePath);
-    set$5(languageId, tokenMap);
+    const tokenMap = await invoke$7('Tokenizer.load', languageId, tokenizePath);
+    set$4(languageId, tokenMap);
     return;
   }
   try {
@@ -2664,8 +2651,8 @@ const loadTokenizer = async (languageId, tokenizePath) => {
       console.warn(`tokenizer.TokenMap should be an object in "${tokenizePath}"`);
       return;
     }
-    set$5(languageId, tokenizer.TokenMap);
-    set$6(languageId, tokenizer);
+    set$4(languageId, tokenizer.TokenMap);
+    set$5(languageId, tokenizer);
   } catch (error) {
     // TODO better error handling
     console.error(error);
@@ -2682,7 +2669,7 @@ const getTokenizer = languageId => {
 };
 
 const tokenizers = Object.create(null);
-const set$4 = (id, value) => {
+const set$3 = (id, value) => {
   tokenizers[id] = value;
 };
 const get$4 = id => {
@@ -2835,13 +2822,13 @@ const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncr
         invalidStartIndex,
         languageId
       };
-      return invoke$8('GetTokensViewport.getTokensViewport', slimEditor,
+      return invoke$7('GetTokensViewport.getTokensViewport', slimEditor,
       // @ts-ignore
       startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
     }
     // TODO only send needed lines of text
     // @ts-ignore
-    return invoke$8('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
+    return invoke$7('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
   }
   return getTokensViewport(editor, startLineIndex, endLineIndex);
 };
@@ -3500,7 +3487,7 @@ const getIncrementalEdits = async (oldState, newState) => {
       const oldLine = oldState.lines[rowIndex];
       const newLine = lines[rowIndex];
       // @ts-ignore
-      const incrementalEdits = await invoke$8(
+      const incrementalEdits = await invoke$7(
       // @ts-ignore
       'TokenizeIncremental.tokenizeIncremental', newState.uid,
       // @ts-ignore
@@ -3780,12 +3767,12 @@ const splitLines = lines => {
 };
 
 const {
-  invoke: invoke$7,
+  invoke: invoke$6,
   readFile} = RendererWorker;
 
 const notifyTabModifiedStatusChange = async (uri, modified) => {
   try {
-    await invoke$7('Main.handleModifiedStatusChange', uri, modified);
+    await invoke$6('Main.handleModifiedStatusChange', uri, modified);
   } catch {
     // ignore
   }
@@ -3822,7 +3809,7 @@ const measureTextWidthFast = async (text, charWidth) => {
 };
 
 const measureTextWidthSlow = async (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
-  const width = await invoke$c('TextMeasurement.measureTextWidth', text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
+  const width = await invoke$b('TextMeasurement.measureTextWidth', text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth);
   return width;
 };
 
@@ -4090,7 +4077,7 @@ const getSelectionFromChange = change => {
     start: newPosition
   };
 };
-const setSelections$1 = (editor, selections) => {
+const setSelections$2 = (editor, selections) => {
   object(editor);
   const {
     foldingRanges = []
@@ -4208,7 +4195,7 @@ const applyAutoClosingRangesEdit = (editor, changes) => {
   return newAutoClosingRanges;
 };
 const scheduleSelections = (editor, selectionEdits) => {
-  return setSelections$1(editor, selectionEdits);
+  return setSelections$2(editor, selectionEdits);
 };
 const updateLines = (editor, lines) => {
   const newEditor = {
@@ -4259,7 +4246,7 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
     ...newEditor,
     decorations: linkDecorations
   };
-  set$9(editor.uid, editor, newEditorWithDecorations);
+  set$8(editor.uid, editor, newEditorWithDecorations);
 
   // Notify main-area-worker about modified status change
   if (!editor.modified) {
@@ -4453,15 +4440,6 @@ const emptyEditor = {
   y: 0
 };
 
-const HoverExecute = 'ExtensionHostHover.execute';
-const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
-const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
-
-const {
-  invoke: invoke$6,
-  set: set$3
-} = ExtensionHost;
-
 const getFileExtensionIndex = file => {
   string(file);
   return file.lastIndexOf(Dot);
@@ -4687,15 +4665,10 @@ const createEditor = async ({
     focused: true,
     textInfos
   };
-  set$9(id, emptyEditor, newEditor4);
-
-  // TODO only sync when needed
-  // e.g. it might not always be necessary to send text to extension host worker
-  // @ts-ignore
-  await invoke$6(TextDocumentSyncFull, uri, id, languageId, content);
+  set$8(id, emptyEditor, newEditor4);
   const completionsOnTypeRaw = await get$3('editor.completionsOnType');
   const completionsOnType = Boolean(completionsOnTypeRaw);
-  set$9(id, emptyEditor, {
+  set$8(id, emptyEditor, {
     ...newEditor4,
     completionsOnType
   });
@@ -4726,7 +4699,7 @@ const createStandaloneEditor = async ({
   const createdEditor = get$8(id).newState;
   await loadTokenizer(languageId, tokenizePath);
   const tokenizerId = createdEditor.tokenizerId + 1;
-  set$4(tokenizerId, getTokenizer(languageId));
+  set$3(tokenizerId, getTokenizer(languageId));
   const configuredEditor = {
     ...createdEditor,
     charWidth,
@@ -4768,7 +4741,7 @@ const createStandaloneEditor = async ({
     cursorInfos,
     selectionInfos
   };
-  set$9(id, createdEditor, finalEditor);
+  set$8(id, createdEditor, finalEditor);
 };
 
 const isEqual$4 = (oldState, newState) => {
@@ -4903,7 +4876,7 @@ const renderWidgets$1 = (oldState, newState) => {
   record(newState.uid, declaredRevision);
   const widgetUids = newWidgets.map(widget => widget.newState.uid);
   const allCommands = [...addCommands, ...changeCommands, ['Viewlet.setWidgets', newState.uid, declaredRevision, widgetUids]];
-  return allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext' && item[0] !== 'Viewlet.appendToBody');
+  return allCommands.filter(item => item[0] !== 'Viewlet.appendToBody' && (item[0] !== 'Viewlet.setFocusContext' || item.length >= 3));
 };
 
 const disposeEditor = async editorUid => {
@@ -4913,7 +4886,7 @@ const disposeEditor = async editorUid => {
   }
   for (const widget of editor.widgets) {
     if (widget.id === ColorPicker$1) {
-      await invoke$9('ColorPicker.dispose', widget.newState.uid);
+      await invoke$8('ColorPicker.dispose', widget.newState.uid);
     }
   }
   const commands = renderWidgets$1(editor, {
@@ -5013,7 +4986,7 @@ const error = (...args) => {
   console.error(...args);
 };
 
-const applyDocumentEdits = (editor, edits) => {
+const applyDocumentEdits$1 = (editor, edits) => {
   if (!Array.isArray(edits)) {
     warn('something is wrong with format on save', edits);
     return editor;
@@ -5104,7 +5077,7 @@ const applyWorkspaceEdit = async (editor, changes) => {
     }
     const text = await readFile(uri);
     const newText = applyEditsToText(text, edits);
-    await invoke$7('FileSystem.writeFile', uri, newText);
+    await invoke$6('FileSystem.writeFile', uri, newText);
   }
   return currentEditor;
 };
@@ -5129,8 +5102,8 @@ const closeWidgetsMaybe = widgets => {
 };
 
 const logError = async (error, prefix) => {
-  const prettyError = await invoke$g('Errors.prepare', error);
-  await invoke$g('Errors.print', prettyError, prefix);
+  const prettyError = await invoke$e('Errors.prepare', error);
+  await invoke$e('Errors.print', prettyError, prefix);
 };
 const logFallback = (error, prefix) => {
   if (prefix) {
@@ -5155,7 +5128,7 @@ const getFormattingEdits = async editor => {
     text: getText$1(editor),
     uri: editor.uri
   };
-  return invoke$e('Extensions.executeFormattingProvider', textDocument);
+  return invoke$d('Extensions.executeFormattingProvider', textDocument);
 };
 
 const expectedErrorMessage$1 = 'Failed to execute formatting provider: FormattingError:';
@@ -5389,7 +5362,7 @@ const expectedErrorMessage = 'Failed to execute formatting provider: FormattingE
 const format = async editor => {
   try {
     const edits = await getFormattingEdits(editor);
-    return applyDocumentEdits(editor, edits);
+    return applyDocumentEdits$1(editor, edits);
   } catch (error) {
     if (isFormattingError(error)) {
       console.error('Formatting Error:',
@@ -5416,7 +5389,7 @@ const isUntitledFile = uri => {
 };
 
 const saveNormalFile = async (uri, content) => {
-  await invoke$b('FileSystem.writeFile', uri, content);
+  await invoke$a('FileSystem.writeFile', uri, content);
 };
 
 const showFilePicker = async platform => {
@@ -5424,7 +5397,7 @@ const showFilePicker = async platform => {
   const {
     canceled,
     filePath
-  } = await invoke$d('Open.showSaveDialog', dialogTitle, [], platform);
+  } = await invoke$c('Open.showSaveDialog', dialogTitle, [], platform);
   if (canceled) {
     return '';
   }
@@ -5436,9 +5409,9 @@ const saveUntitledFile = async (uri, content, platform) => {
   if (!filePath) {
     return;
   }
-  await invoke$b('FileSystem.writeFile', filePath, content);
+  await invoke$a('FileSystem.writeFile', filePath, content);
   await handleWorkspaceRefresh();
-  await invoke$b('Main.handleUriChange', uri, filePath);
+  await invoke$a('Main.handleUriChange', uri, filePath);
   return filePath;
 };
 
@@ -5448,7 +5421,7 @@ const isPermissionDeniedError = error => {
 };
 const showSaveErrorDialog = async error => {
   if (isPermissionDeniedError(error)) {
-    await invoke$h('ElectronDialog.showMessageBox', {
+    await invoke$f('ElectronDialog.showMessageBox', {
       buttons: ['OK'],
       defaultId: 0,
       message: "You don't have permission to save changes to this file.",
@@ -5457,7 +5430,7 @@ const showSaveErrorDialog = async error => {
     });
     return;
   }
-  await invoke$h('ElectronDialog.showMessageBox', {
+  await invoke$f('ElectronDialog.showMessageBox', {
     buttons: ['OK'],
     defaultId: 0,
     detail: error.message,
@@ -5534,6 +5507,27 @@ const handleBlur$1 = async editor => {
   return save(newEditor);
 };
 
+const getTextDocument$3 = editor => ({
+  documentId: editor.id || editor.uid,
+  languageId: editor.languageId,
+  text: getText$1(editor),
+  uri: editor.uri
+});
+const execute = async ({
+  args,
+  editor,
+  kind,
+  method,
+  noProviderFoundResult = undefined
+}) => {
+  const textDocument = getTextDocument$3(editor);
+  const result = await invoke$d('Extensions.executeLanguageProvider', kind, method, textDocument, ...args);
+  if (!result.found) {
+    return noProviderFoundResult;
+  }
+  return result.result;
+};
+
 const replaceRange = (editor, ranges, replacement, origin) => {
   const changes = [];
   const columnDeltas = new Map();
@@ -5604,8 +5598,12 @@ const getMatchingClosingBrace$1 = brace => {
 const braceCompletion = async (editor, text) => {
   try {
     const offset = getCursorOffset(editor);
-    // @ts-ignore
-    const result = await invoke$b('ExtensionHostBraceCompletion.executeBraceCompletionProvider', editor, offset, text);
+    const result = await execute({
+      args: [offset, text],
+      editor,
+      kind: 'brace completion',
+      method: 'provideBraceCompletion'
+    });
     if (result) {
       const closingBrace = getMatchingClosingBrace$1(text);
       const insertText = text + closingBrace;
@@ -5693,7 +5691,7 @@ const closeCompletion = editor => {
 const isMatchingWidget$1 = widget => {
   return widget.id === Find;
 };
-const closeFind = editor => {
+const closeFind$1 = editor => {
   const {
     widgets
   } = editor;
@@ -6758,7 +6756,7 @@ const deleteWordRight = editor => {
 
 const findAllReferences$1 = async editor => {
   // @ts-ignore
-  await invoke$b('SideBar.show', 'References', /* focus */true);
+  await invoke$a('SideBar.show', 'References', /* focus */true);
   return editor;
 };
 
@@ -6840,9 +6838,12 @@ const getWordBefore = (editor, rowIndex, columnIndex) => {
 
 // @ts-ignore
 const getDefinition = async (editor, offset) => {
-  // @ts-ignore
-  const definition = await invoke$b('ExtensionHostDefinition.executeDefinitionProvider', editor, offset);
-  return definition;
+  return execute({
+    args: [offset],
+    editor,
+    kind: 'definition',
+    method: 'provideDefinition'
+  });
 };
 
 const emptyObject = {};
@@ -7130,9 +7131,12 @@ const getNoLocationFoundMessage = info => {
 };
 
 const getTypeDefinition = async (editor, offset) => {
-  // @ts-ignore
-  const definition = await invoke$b('ExtensionHostTypeDefinition.executeTypeDefinitionProvider', editor, offset);
-  return definition;
+  return execute({
+    args: [offset],
+    editor,
+    kind: 'type definition',
+    method: 'provideTypeDefinition'
+  });
 };
 
 const getLocation = async (editor, rowIndex, columnIndex) => {
@@ -7582,26 +7586,6 @@ const create$5 = () => {
   return widget;
 };
 
-const OnDiagnostic = 'onDiagnostic';
-const OnHover = 'onHover';
-const OnTabCompletion = 'onTabCompletion';
-
-const execute = async ({
-  args,
-  assetDir,
-  editor,
-  event,
-  method,
-  noProviderFoundMessage,
-  noProviderFoundResult = undefined,
-  platform
-}) => {
-  const fullEvent = `${event}:${editor.languageId}`;
-  await activateByEvent(fullEvent, assetDir, platform);
-  const result = await invoke$6(method, editor.uid, ...args);
-  return result;
-};
-
 const getTextDocument$2 = editor => {
   return {
     documentId: editor.id || editor.uid,
@@ -7612,22 +7596,12 @@ const getTextDocument$2 = editor => {
 };
 const executeIsolatedHoverProvider = async (editor, offset) => {
   const textDocument = getTextDocument$2(editor);
-  return invoke$e('Extensions.executeHoverProvider', textDocument, offset);
+  return invoke$d('Extensions.executeHoverProvider', textDocument, offset);
 };
 const executeHoverProvider = async (editor, offset) => {
   object(editor);
   number(offset);
-  const isolatedHover = await executeIsolatedHoverProvider(editor, offset);
-  if (isolatedHover) {
-    return isolatedHover;
-  }
-  return execute({
-    args: [offset],
-    editor,
-    event: OnHover,
-    method: HoverExecute,
-    noProviderFoundMessage: 'No hover provider found'
-  });
+  return executeIsolatedHoverProvider(editor, offset);
 };
 
 const getHover = async (editor, offset) => {
@@ -7805,8 +7779,8 @@ const showHover = async (editor, position, token) => {
   if (latestEditor === newEditor || !latestInstance || latestInstance.newState !== latestEditor || get$1().token !== token) {
     return;
   }
-  set$9(editor.uid, latestInstance.oldState, newEditor);
-  await invoke$b('Editor.renderPending', editor.uid);
+  set$8(editor.uid, latestInstance.oldState, newEditor);
+  await invoke$a('Editor.renderPending', editor.uid);
 };
 
 // TODO several things can happen:
@@ -8108,7 +8082,7 @@ const continueScrollingAndMovingSelection = async editorUid => {
     }
   };
   const newEditorWithDerivedState = await updateDerivedState(editor, nextEditor);
-  set$9(editor.uid, editor, newEditorWithDerivedState);
+  set$8(editor.uid, editor, newEditorWithDerivedState);
   requestAnimationFrame(() => continueScrollingAndMovingSelection(editorUid));
 };
 
@@ -8381,8 +8355,6 @@ const handleTouchMove = (editor, touchEvent) => {
 };
 
 const handleUriChange = async (editor, newUri) => {
-  const content = getText$1(editor);
-  await invoke$6(TextDocumentSyncFull, newUri, editor.id, editor.languageId, content);
   return {
     ...editor,
     uri: newUri
@@ -8468,7 +8440,7 @@ const indentMore = editor => {
 
 const getLanguageConfiguration = async editor => {
   // @ts-ignore
-  return invoke$b('Languages.getLanguageConfiguration', {
+  return invoke$a('Languages.getLanguageConfiguration', {
     languageId: editor.languageId,
     uri: editor.uri
   });
@@ -8707,10 +8679,83 @@ const addWidget = (widget, id, render) => {
   return allCommands;
 };
 
+const getEditor$1 = editorUid => {
+  const instance = get$8(editorUid);
+  if (!instance) {
+    throw new Error(`editor ${editorUid} not found`);
+  }
+  const {
+    newState
+  } = instance;
+  return newState;
+};
+
+const setFocus = async focusKey => {
+  await invoke$a('Focus.setFocus', focusKey);
+};
+const unsetAdditionalFocus = async focusKey => {
+  if (!focusKey) {
+    return;
+  }
+  // @ts-ignore
+  await invoke$a('Focus.removeAdditionalFocus', focusKey);
+};
+
+const FocusEditor = 12;
+const FocusEditorCompletions = 9;
+const FocusEditorRename = 11;
+const FocusEditorText = 12;
+const FocusFindWidget = 16;
+const FocusSourceActions = 38;
+const FocusFindWidgetReplace = 43;
+const FocusEditorCodeGenerator = 52;
+const FocusColorPicker = 41;
+
+const updateEditor = async (editorUid, editor, newEditor) => {
+  if (newEditor === editor) {
+    return;
+  }
+  const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
+  set$8(editorUid, editor, newEditorWithDerivedState);
+};
+const applyDocumentEdits = async (editorUid, edits) => {
+  const editor = getEditor$1(editorUid);
+  const newEditor = await applyDocumentEdits$1(editor, edits);
+  await updateEditor(editorUid, editor, newEditor);
+};
+const closeFind = async editorUid => {
+  const editor = getEditor$1(editorUid);
+  const newEditor = closeFind$1(editor);
+  await updateEditor(editorUid, editor, newEditor);
+  await setFocus(FocusEditorText);
+};
+const getLines = editorUid => {
+  return getEditor$1(editorUid).lines;
+};
+const getSelections$1 = editorUid => {
+  return getEditor$1(editorUid).selections;
+};
+const setSelections$1 = async (editorUid, selections) => {
+  const editor = getEditor$1(editorUid);
+  const newEditor = {
+    ...editor,
+    selections
+  };
+  await updateEditor(editorUid, editor, newEditor);
+};
+
+const getFindWidgetWorkerCommandMap = () => ({
+  'Editor.applyDocumentEdits': applyDocumentEdits,
+  'Editor.closeFind2': closeFind,
+  'Editor.getLines2': getLines,
+  'Editor.getSelections2': getSelections$1,
+  'Editor.setSelections2': setSelections$1
+});
+
 const launchFindWidgetWorker = async () => {
   const name = 'Find Widget Worker';
   const url = 'findWidgetWorkerMain.js';
-  return launchWorker(name, url);
+  return launchWorker(name, url, undefined, getFindWidgetWorkerCommandMap());
 };
 
 const rpcId = 9002;
@@ -8720,7 +8765,7 @@ const launch = async () => {
     return;
   }
   const rpc = await launchFindWidgetWorker();
-  set$i(rpcId, rpc);
+  set$g(rpcId, rpc);
 };
 const invoke$3 = async (method, ...params) => {
   const rpc = get$9(rpcId);
@@ -8781,7 +8826,7 @@ const invoke$1 = async (method, ...params) => {
 const getWidgetInvoke = widgetId => {
   switch (widgetId) {
     case ColorPicker$1:
-      return invoke$9;
+      return invoke$8;
     case Completion:
       return invoke$4;
     case Find:
@@ -8835,7 +8880,7 @@ const getEditorByWidgetUid = (widgetUid, widgetId) => {
   }
   return undefined;
 };
-const getEditor$1 = (editorOrUid, widgetId) => {
+const getEditor = (editorOrUid, widgetId) => {
   if (editorOrUid && editorOrUid.widgets) {
     return editorOrUid;
   }
@@ -8853,7 +8898,7 @@ const createFn = (key, name, widgetId) => {
     return key === 'close' || key === 'handleClickButton' && args.includes(Close);
   };
   const fn = async (editorOrUid, ...args) => {
-    const editor = getEditor$1(editorOrUid, widgetId);
+    const editor = getEditor(editorOrUid, widgetId);
     if (!editor) {
       return editorOrUid;
     }
@@ -8886,7 +8931,7 @@ const createFn = (key, name, widgetId) => {
         widgetRevision,
         widgets: removeEditorWidget(latest.widgets, widgetId)
       };
-      set$9(editor.uid, latest, newEditor);
+      set$8(editor.uid, latest, newEditor);
       return newEditor;
     }
     const newState = {
@@ -8894,7 +8939,7 @@ const createFn = (key, name, widgetId) => {
       commands
     };
     const newEditor = updateWidget(latest, widgetId, newState);
-    set$9(editor.uid, latest, newEditor);
+    set$8(editor.uid, editor, newEditor);
     return newEditor;
   };
   return fn;
@@ -8931,10 +8976,13 @@ const render$c = widget => {
   const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
+    editorUid,
     uid
   } = widget.newState;
   for (const command of commands) {
-    if (commandsToForward$5.includes(command[0])) {
+    if (command[0] === SetFocusContext) {
+      wrappedCommands.push([command[0], editorUid, ...command.slice(1)]);
+    } else if (commandsToForward$5.includes(command[0])) {
       wrappedCommands.push(command);
     } else {
       wrappedCommands.push(['Viewlet.send', uid, ...command]);
@@ -9053,22 +9101,11 @@ const create$2 = () => {
   return widget;
 };
 
-const getEditor = editorUid => {
-  const instance = get$8(editorUid);
-  if (!instance) {
-    throw new Error(`editor ${editorUid} not found`);
-  }
-  const {
-    newState
-  } = instance;
-  return newState;
-};
-
 const loadContent$2 = async (state, parentUid) => {
   const {
     uid
   } = state;
-  const editor = getEditor(parentUid);
+  const editor = getEditor$1(parentUid);
   const {
     height,
     width,
@@ -9200,18 +9237,19 @@ const openRename = async editor => {
 };
 
 const getOrganizeImportEdits = async editor => {
-  const edits = await execute({
-    args: [],
-    editor,
-    event: 'onLanguage',
-    method: 'ExtensionHostOrganizeImports.execute'
-  });
-  return edits;
+  const textDocument = {
+    documentId: editor.id || editor.uid,
+    languageId: editor.languageId,
+    text: getText$1(editor),
+    uri: editor.uri
+  };
+  const result = await invoke$d('Extensions.executeOrganizeImportsProvider', textDocument);
+  return result.found ? result.result ?? [] : [];
 };
 
 const organizeImports = async editor => {
   const edits = await getOrganizeImportEdits(editor);
-  return applyDocumentEdits(editor, edits);
+  return applyDocumentEdits$1(editor, edits);
 };
 
 // @ts-ignore
@@ -9497,11 +9535,14 @@ const selectInsideString = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
-// import * as ExtensionHostSelection from '../ExtensionHost/ExtensionHostSelection.ts'
-
 const getNewSelections = async (editor, selections) => {
-  // @ts-ignore
-  const newSelections = await invoke$b('ExtensionHostSelection.executeGrowSelection', editor, selections);
+  const newSelections = await execute({
+    args: [selections],
+    editor,
+    kind: 'selection',
+    method: 'provideSelections',
+    noProviderFoundResult: []
+  });
   if (newSelections.length === 0) {
     return selections;
   }
@@ -9754,7 +9795,7 @@ const setLanguageId = async (editor, languageId, tokenizePath) => {
   await loadTokenizer(languageId, tokenizePath);
   const tokenizer = getTokenizer(languageId);
   const newTokenizerId = tokenizerId + 1;
-  set$4(newTokenizerId, tokenizer);
+  set$3(newTokenizerId, tokenizer);
   return {
     ...editor,
     focused: true,
@@ -9865,7 +9906,7 @@ const executeSignatureHelpProvider = async (editor, offset) => {
   object(editor);
   number(offset);
   const textDocument = getTextDocument$1(editor);
-  return invoke$e('Extensions.executeSignatureHelpProvider', textDocument, offset);
+  return invoke$d('Extensions.executeSignatureHelpProvider', textDocument, offset);
 };
 
 const getSignatureHelp = async (editor, offset) => {
@@ -10066,9 +10107,8 @@ const executeTabCompletionProvider = async (editor, offset) => {
   return execute({
     args: [offset],
     editor,
-    event: OnTabCompletion,
-    method: TabCompletionExecuteTabCompletionProvider,
-    noProviderFoundMessage: 'No tab completion provider found',
+    kind: 'tab completion',
+    method: 'provideTabCompletion',
     noProviderFoundResult: undefined
   });
 };
@@ -10195,18 +10235,13 @@ const tabCompletion = async editor => {
 };
 
 const getBlockComment = async (editor, offset) => {
-  const {
-    assetDir,
-    platform
-  } = editor;
-  // TODO ask extension host worker,
-  // execute block comment provider with
-  // URI, language id, offset
-  // and the extension returns a matching block comment or undefined
   try {
-    await activateByEvent(`onLanguage:${editor.languageId}`, assetDir, platform);
-    // @ts-ignore
-    const blockComment = await invoke$6(`ExtensionHostCommment.execute`, editor.uid, offset);
+    const blockComment = await execute({
+      args: [offset],
+      editor,
+      kind: 'comment',
+      method: 'provideComment'
+    });
     if (blockComment) {
       return blockComment;
     }
@@ -10566,8 +10601,12 @@ 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$b('ExtensionHostClosingTagCompletion.executeClosingTagProvider', editor, offset, text);
+  const result = await execute({
+    args: [offset, text],
+    editor,
+    kind: 'closing tag',
+    method: 'provideClosingTag'
+  });
   if (!result) {
     const changes = editorReplaceSelections(editor, [text], EditorType);
     return scheduleDocumentAndCursorsSelections(editor, changes);
@@ -11219,7 +11258,7 @@ const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...par
   const isWidget = widget => {
     return widget.id === widgetId;
   };
-  const latestEditor = getEditor(editor.uid);
+  const latestEditor = getEditor$1(editor.uid);
   const childIndex1 = latestEditor.widgets.findIndex(isWidget);
   if (childIndex1 === -1) {
     return latestEditor;
@@ -11246,13 +11285,8 @@ const getEditorSourceActions = async editorId => {
   const {
     newState
   } = get$8(editorId);
-  const offset = getOffsetAtCursor$1(newState);
-  return execute({
-    args: [offset],
-    editor: newState,
-    event: 'onLanguage',
-    method: 'ExtensionHostCodeActions.getSourceActions'
-  });
+  const extensions = await invoke$d('Extensions.getAllExtensions', newState.assetDir, newState.platform);
+  return extensions.flatMap(extension => extension.codeActions || []).filter(action => action.languageId === newState.languageId);
 };
 
 /* eslint-disable sonarjs/super-linear-regex */
@@ -11274,90 +11308,64 @@ const getWordAtOffset = editor => {
   return '';
 };
 
-const setFocus = async focusKey => {
-  await invoke$b('Focus.setFocus', focusKey);
-};
-const unsetAdditionalFocus = async focusKey => {
-  if (!focusKey) {
-    return;
-  }
-  // @ts-ignore
-  await invoke$b('Focus.removeAdditionalFocus', focusKey);
-};
-
-const FocusEditor = 12;
-const FocusEditorCompletions = 9;
-const FocusEditorRename = 11;
-const FocusEditorText = 12;
-const FocusFindWidget = 16;
-const FocusSourceActions = 38;
-const FocusFindWidgetReplace = 43;
-const FocusFindWidgetReplaceButton = 46;
-const FocusFindWidgetReplaceAllButton = 47;
-const FocusFindWidgetCloseButton = 48;
-const FocusFindWidgetNextMatchButton = 49;
-const FocusFindWidgetPreviousMatchButton = 50;
-const FocusEditorCodeGenerator = 52;
-const FocusColorPicker = 41;
-
 const getPositionAtCursor = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return getPositionAtCursor$1(editor);
 };
 const getUri = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return editor.uri;
 };
 const getLanguageId = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return editor.languageId;
 };
 const getOffsetAtCursor = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return getOffsetAtCursor$1(editor);
 };
 const getWordAt = (editorUid, rowIndex, columnIndex) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     word
   } = getWordAt$1(editor, rowIndex, columnIndex);
   return word;
 };
 const getWordAtOffset2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const word = getWordAtOffset(editor);
   return word;
 };
 const getWordBefore2 = (editorUid, rowIndex, columnIndex) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const word = getWordBefore(editor, rowIndex, columnIndex);
   return word;
 };
 const getLines2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     lines
   } = editor;
   return lines;
 };
 const getSelections2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     selections
   } = editor;
   return selections;
 };
 const setSelections2 = async (editorUid, selections) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const newEditor = {
     ...editor,
     selections
   };
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$9(editorUid, editor, newEditorWithDerivedState);
+  set$8(editorUid, editor, newEditorWithDerivedState);
 };
 const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const widgetRevision = next(editorUid);
   const invoke = getWidgetInvoke(widgetId);
   const {
@@ -11377,7 +11385,7 @@ const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocu
     widgets: newWidgets
   };
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$9(editorUid, editor, newEditorWithDerivedState);
+  set$8(editorUid, editor, newEditorWithDerivedState);
   await setFocus(FocusEditorText);
   if (unsetAdditionalFocus$1) {
     await unsetAdditionalFocus(unsetAdditionalFocus$1);
@@ -11387,17 +11395,17 @@ const closeFind2 = async editorUid => {
   await closeWidget2(editorUid, Find, 'FindWidget', 0);
 };
 const applyEdits2 = async (editorUid, edits) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const newEditor = await applyEdit(editor, edits);
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
-  set$9(editorUid, editor, newEditorWithDerivedState);
+  set$8(editorUid, editor, newEditorWithDerivedState);
 };
 const getSourceActions = async editorUid => {
   const actions = await getEditorSourceActions(editorUid);
   return actions;
 };
 const getDiagnostics$1 = async editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     diagnostics
   } = editor;
@@ -11405,9 +11413,21 @@ const getDiagnostics$1 = async editorUid => {
 };
 
 const ensure = async (fontName, fontUrl) => {
-  await invoke$c('TextMeasurement.ensureFont', fontName, fontUrl);
+  await invoke$b('TextMeasurement.ensureFont', fontName, fontUrl);
 };
 
+const findWidgetFocusContexts = [FindWidget, FocusFindWidgetReplace$1, FocusFindWidgetOptions, FocusFindWidgetToggleReplace, FocusFindWidgetPreviousMatchButton, FocusFindWidgetNextMatchButton, FocusFindWidgetCloseButton, FocusFindWidgetReplaceButton, FocusFindWidgetReplaceAllButton];
+const getFindWidgetFocusKeyBindings = () => {
+  return findWidgetFocusContexts.flatMap(focusContext => [{
+    command: 'FindWidget.focusNextElement',
+    key: Tab$1,
+    when: focusContext
+  }, {
+    command: 'FindWidget.focusPreviousElement',
+    key: Shift | Tab$1,
+    when: focusContext
+  }]);
+};
 const getKeyBindings = () => {
   return [{
     command: 'Editor.closeColorPicker',
@@ -11437,6 +11457,10 @@ const getKeyBindings = () => {
     command: 'EditorSourceActions.selectCurrent',
     key: Enter,
     when: FocusSourceActions
+  }, {
+    command: 'FindWidget.replace',
+    key: Enter,
+    when: FocusFindWidgetReplace
   }, {
     command: 'FindWidget.focusNext',
     key: Enter,
@@ -11457,62 +11481,10 @@ const getKeyBindings = () => {
     command: 'FindWidget.focusNext',
     key: F4,
     when: FocusFindWidget
-  }, {
-    command: 'FindWidget.focusToggleReplace',
-    key: Shift | Tab$1,
-    when: FocusFindWidget
-  }, {
-    command: 'FindWidget.focusReplace',
-    key: Tab$1,
-    when: FocusFindWidget
-  }, {
-    command: 'FindWidget.focusPreviousMatchButton',
-    key: Tab$1,
-    when: FocusFindWidgetReplace
-  }, {
+  }, ...getFindWidgetFocusKeyBindings(), {
     command: 'FindWidget.replaceAll',
     key: Alt$1 | CtrlCmd | Enter,
     when: FocusFindWidgetReplace
-  }, {
-    command: 'FindWidget.focusNextMatchButton',
-    key: Tab$1,
-    when: FocusFindWidgetPreviousMatchButton
-  }, {
-    command: 'FindWidget.focusReplace',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetPreviousMatchButton
-  }, {
-    command: 'FindWidget.focusPreviousMatchButton',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetNextMatchButton
-  }, {
-    command: 'FindWidget.focusCloseButton',
-    key: Tab$1,
-    when: FocusFindWidgetNextMatchButton
-  }, {
-    command: 'FindWidget.focusNextMatchButton',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetCloseButton
-  }, {
-    command: 'FindWidget.focusReplaceButton',
-    key: Tab$1,
-    when: FocusFindWidgetCloseButton
-  }, {
-    command: 'FindWidget.focusFind',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetReplace
-  }, {
-    command: 'FindWidget.focusReplaceAllButton',
-    key: Tab$1,
-    when: FocusFindWidgetReplaceButton
-  }, {
-    command: 'FindWidget.focusCloseButton',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetReplaceButton
-  }, {
-    command: 'FindWidget.focusReplaceButton',
-    key: Shift | Tab$1,
-    when: FocusFindWidgetReplaceAllButton
   }, {
     command: 'EditorCompletion.focusNext',
     key: DownArrow,
@@ -11990,7 +11962,7 @@ const getQuickPickMenuEntries = () => {
 };
 
 const getSelections = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     selections
   } = editor;
@@ -11999,7 +11971,7 @@ const getSelections = editorUid => {
 
 const getText = editorUid => {
   number(editorUid);
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     lines
   } = editor;
@@ -12023,7 +11995,7 @@ const handleMessagePort = async (port, rpcId) => {
     messagePort: port
   });
   if (rpcId) {
-    set$i(rpcId, rpc);
+    set$g(rpcId, rpc);
   }
 };
 
@@ -12277,12 +12249,12 @@ const hotReload = async () => {
     await relaunchWorkers();
     const newEditors = await restoreWidgetState(keys, savedStates);
     for (const editor of newEditors) {
-      set$9(editor.newState.uid, editor.oldState, editor.newState);
+      set$8(editor.newState.uid, editor.oldState, editor.newState);
     }
 
     // TODO ask renderer worker to rerender all editors
     // @ts-ignore
-    await invoke$b(`Editor.rerender`);
+    await invoke$a(`Editor.rerender`);
   } finally {
     state.isReloading = false;
   }
@@ -12315,7 +12287,7 @@ const initializeSyntaxHighlighting = async (syntaxHighlightingEnabled, syncIncre
   if (syntaxHighlightingEnabled) {
     setEnabled$1(true);
     const syntaxRpc = await createSyntaxHighlightingWorkerRpc();
-    set$7(syntaxRpc);
+    set$6(syntaxRpc);
   }
   if (syncIncremental) {
     setEnabled(true);
@@ -12385,7 +12357,7 @@ const loadContent = async (state, savedState) => {
   await loadTokenizer(computedLanguageId, tokenizePath);
   const tokenizer = getTokenizer(computedLanguageId);
   const newTokenizerId = state.tokenizerId + 1;
-  set$4(newTokenizerId, tokenizer);
+  set$3(newTokenizerId, tokenizer);
   const newEditor0 = {
     ...state,
     charWidth,
@@ -12456,11 +12428,6 @@ const loadContent = async (state, savedState) => {
     focused: true,
     textInfos
   };
-
-  // TODO only sync when needed
-  // e.g. it might not always be necessary to send text to extension host worker
-  // @ts-ignore
-  await invoke$6(TextDocumentSyncFull, uri, id, computedLanguageId, content);
   const completionsOnTypeRaw = await get$3('editor.completionsOnType');
   const completionsOnType = Boolean(completionsOnTypeRaw);
   const newEditor5 = {
@@ -13286,7 +13253,7 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get$8(uid);
-  set$9(uid, newState, newState);
+  set$8(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -13383,7 +13350,7 @@ const renderEditor = async id => {
     oldState
   } = instance;
   const commands = [];
-  set$9(id, newState, newState);
+  set$8(id, newState, newState);
   for (const item of render$7) {
     if (item.isEqual(oldState, newState)) {
       continue;
@@ -13487,13 +13454,12 @@ const saveState = (state, savedState) => {
   };
 };
 
-const sendMessagePortToExtensionHostWorker2 = async (port, initialCommand, rpcId) => {
-  await sendMessagePortToExtensionHostWorker(port, rpcId);
-};
-
 const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   await sendMessagePortToExtensionManagementWorker$1(port, rpcId);
 };
+const sendDeprecatedExtensionHostPortToExtensionManagementWorker = async (port, _initialCommand, rpcId) => {
+  await sendMessagePortToExtensionManagementWorker$1(port, rpcId);
+};
 
 const setDebugEnabled = (state, enabled) => {
   return state;
@@ -13539,9 +13505,9 @@ const updateDebugInfo = async debugId => {
     ...newState,
     highlightedLine: newInfo.rowIndex
   };
-  set$9(key, oldState, newEditor);
+  set$8(key, oldState, newEditor);
   // @ts-ignore
-  await invoke$b('Editor.rerender', key);
+  await invoke$a('Editor.rerender', key);
 };
 
 const getTextDocument = editor => {
@@ -13554,26 +13520,10 @@ const getTextDocument = editor => {
 };
 const executeIsolatedDiagnosticProvider = async editor => {
   const textDocument = getTextDocument(editor);
-  return invoke$e('Extensions.executeDiagnosticProvider', textDocument);
+  return invoke$d('Extensions.executeDiagnosticProvider', textDocument);
 };
 const executeDiagnosticProvider = async editor => {
-  const isolatedDiagnostics = await executeIsolatedDiagnosticProvider(editor);
-  if (isolatedDiagnostics.length > 0) {
-    return isolatedDiagnostics;
-  }
-  const {
-    assetDir,
-    platform
-  } = editor;
-  return execute({
-    args: [],
-    assetDir,
-    editor,
-    event: OnDiagnostic,
-    method: 'ExtensionHost.executeDiagnosticProvider',
-    noProviderFoundMessage: 'no diagnostic provider found',
-    platform
-  });
+  return executeIsolatedDiagnosticProvider(editor);
 };
 
 const getDiagnosticType = diagnostic => {
@@ -13654,9 +13604,6 @@ const mergeLinksWithDiagnosticDecorations = (editor, diagnosticDecorations) => {
 };
 
 const getDiagnostics = async editor => {
-  const content = getText$1(editor);
-  // @ts-ignore
-  await invoke$6(TextDocumentSyncFull, editor.uri, editor.id, editor.languageId, content);
   return executeDiagnosticProvider(editor);
 };
 const addDiagnostics = async (editor, diagnostics) => {
@@ -13688,7 +13635,7 @@ const updateDiagnostics = async editor => {
       return editor;
     }
     const newEditor = await addDiagnostics(latest.newState, diagnostics);
-    set$9(editor.id, latest.oldState, newEditor);
+    set$8(editor.id, latest.oldState, newEditor);
     return newEditor;
   } catch (error) {
     return handleError(error, editor);
@@ -13729,14 +13676,14 @@ const wrapCommand = fn => async (uid, ...args) => {
       return newEditor;
     }
     const newEditorWithDerivedState = await updateDerivedState(state, newEditor);
-    set$9(uid, state, newEditorWithDerivedState);
+    set$8(uid, state, newEditorWithDerivedState);
     let finalEditor = newEditorWithDerivedState;
     if (editorDiagnosticEffect.isActive(state, newEditorWithDerivedState)) {
       finalEditor = await editorDiagnosticEffect.apply(newEditorWithDerivedState);
       if (!get$8(uid)) {
         return finalEditor;
       }
-      set$9(uid, state, finalEditor);
+      set$8(uid, state, finalEditor);
     }
     const {
       initial,
@@ -13766,7 +13713,7 @@ const wrapCommand = fn => async (uid, ...args) => {
           undoStack: finalEditor.undoStack,
           visualDecorations: finalEditor.visualDecorations
         });
-        set$9(otherUid, instance.oldState, synchronizedEditor);
+        set$8(otherUid, instance.oldState, synchronizedEditor);
       }
     }
     return finalEditor;
@@ -13784,7 +13731,7 @@ const commandMap = {
   'ColorPicker.loadContent': loadContent$3,
   'Editor.addCursorAbove': wrapCommand(addCursorAbove),
   'Editor.addCursorBelow': wrapCommand(addCursorBelow),
-  'Editor.applyDocumentEdits': wrapCommand(applyDocumentEdits),
+  'Editor.applyDocumentEdits': wrapCommand(applyDocumentEdits$1),
   'Editor.applyEdit': wrapCommand(applyEdit),
   'Editor.applyEdit2': applyEdits2,
   'Editor.applyWorkspaceEdit': wrapCommand(applyWorkspaceEdit),
@@ -13793,7 +13740,7 @@ const commandMap = {
   'Editor.closeCodeGenerator': wrapCommand(closeCodeGenerator),
   'Editor.closeColorPicker': wrapCommand(closeColorPicker),
   'Editor.closeCompletion': wrapCommand(closeCompletion),
-  'Editor.closeFind': wrapCommand(closeFind),
+  'Editor.closeFind': wrapCommand(closeFind$1),
   'Editor.closeFind2': closeFind2,
   'Editor.closeRename': wrapCommand(closeRename),
   'Editor.closeSourceAction': wrapCommand(closeSourceAction),
@@ -14008,7 +13955,6 @@ const commandMap = {
   'EditorSourceAction.selectItem': selectItem,
   'EditorSourceAction.toggleDetails': toggleDetails,
   'EditorSourceActions.focusNext': focusNext$1,
-  'ExtensionHostManagement.activateByEvent': activateByEvent,
   'FindWidget.close': close$4,
   'FindWidget.focusCloseButton': focusCloseButton,
   'FindWidget.focusFind': focusFind,
@@ -14049,7 +13995,7 @@ const commandMap = {
   'Listener.register': registerListener,
   'Listener.registerListener': registerListener$1,
   'Listener.unregister': unregisterListener,
-  'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker': sendMessagePortToExtensionHostWorker2,
+  'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker': sendDeprecatedExtensionHostPortToExtensionManagementWorker,
   'SendMessagePortToExtensionManagementWorker.sendMessagePortToExtensionManagementWorker': sendMessagePortToExtensionManagementWorker
 };
 for (const [key, value] of Object.entries(commandMap)) {
@@ -14066,23 +14012,7 @@ const initializeErrorWorker = async () => {
       return sendMessagePortToErrorWorker(port, EditorWorker);
     }
   });
-  set$g(rpc);
-};
-
-const createExtensionHostRpc = async () => {
-  const initialCommand = 'HandleMessagePort.handleMessagePort2';
-  const rpc = await create$d({
-    commandMap: {},
-    async send(port) {
-      await sendMessagePortToExtensionHostWorker2(port, initialCommand, EditorWorker);
-    }
-  });
-  return rpc;
-};
-
-const initializeExtensionHost = async () => {
-  const extensionHostRpc = await createExtensionHostRpc();
-  set$3(extensionHostRpc);
+  set$e(rpc);
 };
 
 const createExtensionManagementWorkerRpc = async () => {
@@ -14098,7 +14028,7 @@ const createExtensionManagementWorkerRpc = async () => {
 const initializeExtensionManagementWorker = async () => {
   try {
     const rpc = await createExtensionManagementWorkerRpc();
-    set$e(rpc);
+    set$d(rpc);
   } catch {
     // ignore
   }
@@ -14113,14 +14043,14 @@ const initializeOpenerWorker = async () => {
     commandMap: {},
     send: send$1
   });
-  set$d(rpc);
+  set$c(rpc);
 };
 
 const initializeRendererWorker = async () => {
   const rpc = await create$b({
     commandMap: commandMap
   });
-  set$b(rpc);
+  set$a(rpc);
 };
 
 const send = port => {
@@ -14131,17 +14061,17 @@ const initializeTextMeasurementWorker = async () => {
     commandMap: {},
     send
   });
-  set$c(rpc);
+  set$b(rpc);
 };
 
 const listen = async () => {
   registerCommands(commandMap);
-  await Promise.all([initializeRendererWorker(), initializeErrorWorker(), initializeExtensionHost(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeOpenerWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeErrorWorker(), initializeExtensionManagementWorker(), initializeTextMeasurementWorker(), initializeOpenerWorker()]);
   const dialogRpc = await create$d({
     commandMap: {},
     send: sendMessagePortToDialogWorker
   });
-  set$h(dialogRpc);
+  set$f(dialogRpc);
 };
 
 const CodeGeneratorInput = 'CodeGeneratorInput';
@@ -14461,15 +14391,15 @@ const EditorMessageWidget = {
 };
 
 const registerWidgets = () => {
-  set$8(ColorPicker$1, EditorColorPickerWidget);
-  set$8(Completion, EditorCompletionWidget);
-  set$8(CompletionDetail, EditorCompletionDetailWidget);
-  set$8(Find, EditorFindWidget);
-  set$8(Hover, EditorHoverWidget);
-  set$8(Message, EditorMessageWidget);
-  set$8(Rename$1, EditorRenameWidget);
-  set$8(SourceAction$1, EditorSourceActionWidget);
-  set$8(CodeGenerator, EditorCodeGeneratorWidget);
+  set$7(ColorPicker$1, EditorColorPickerWidget);
+  set$7(Completion, EditorCompletionWidget);
+  set$7(CompletionDetail, EditorCompletionDetailWidget);
+  set$7(Find, EditorFindWidget);
+  set$7(Hover, EditorHoverWidget);
+  set$7(Message, EditorMessageWidget);
+  set$7(Rename$1, EditorRenameWidget);
+  set$7(SourceAction$1, EditorSourceActionWidget);
+  set$7(CodeGenerator, EditorCodeGeneratorWidget);
 };
 
 const handleUnhandledRejection = event => {