npm - @lvce-editor/editor-worker - Versions diffs - 6.3.0 → 7.0.0 - Mend

@lvce-editor/editor-worker 6.3.0 → 7.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/dist/editorWorkerMain.js +565 -1488
package/package.json +1 -1

package/dist/editorWorkerMain.js CHANGED Viewed

@@ -263,7 +263,7 @@ const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(message, errorProperty);
 };
-const create$e = (message, result) => {
+const create$d = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -272,7 +272,7 @@ const create$e = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$e(message, resultProperty);
+  return create$d(message, resultProperty);
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
@@ -1082,7 +1082,7 @@ const invoke$6 = async (method, ...params) => {
   return await worker.invoke(method, ...params);
 };
-const loadContent$3 = async (state, parentUid) => {
+const loadContent$2 = async (state, parentUid) => {
   const {
     uid,
     x,
@@ -1129,17 +1129,17 @@ const getModule$2 = id => {
   return get$5(id);
 };
-const applyWidgetChange = (editor, widget, changes) => {
+const applyWidgetChange = async (editor, widget, changes) => {
   const module = getModule$2(widget.id);
   if (changes.length === 1 && changes[0].origin === EditorType && module.handleEditorType) {
-    const newState = module.handleEditorType(editor, widget.newState);
+    const newState = await module.handleEditorType(editor, widget.newState);
     return {
       ...widget,
       newState
     };
   }
   if (changes.length === 1 && changes[0].origin === DeleteLeft && module.handleEditorDeleteLeft) {
-    const newState = module.handleEditorDeleteLeft(editor, widget.newState);
+    const newState = await module.handleEditorDeleteLeft(editor, widget.newState);
     return {
       ...widget,
       newState
@@ -1148,14 +1148,14 @@ const applyWidgetChange = (editor, widget, changes) => {
   return widget;
 };
-const applyWidgetChanges = (editor, changes) => {
+const applyWidgetChanges = async (editor, changes) => {
   const widgets = editor.widgets || [];
   if (widgets.length === 0) {
     return widgets;
   }
   const newWidgets = [];
   for (const widget of widgets) {
-    const newWidget = applyWidgetChange(editor, widget, changes);
+    const newWidget = await applyWidgetChange(editor, widget, changes);
     if (newWidget.newState) {
       newWidgets.push(newWidget);
     }
@@ -1163,6 +1163,20 @@ const applyWidgetChanges = (editor, changes) => {
   return newWidgets;
 };
+const editors = Object.create(null);
+const get$4 = id => {
+  number(id);
+  return editors[id];
+};
+const set$4 = (id, oldEditor, newEditor) => {
+  object(oldEditor);
+  object(newEditor);
+  editors[id] = {
+    oldState: oldEditor,
+    newState: newEditor
+  };
+};
 const clamp = (num, min, max) => {
   number(num);
   number(min);
@@ -1214,7 +1228,7 @@ const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
 };
 // TODO this should be in a separate scrolling module
-const setDeltaY$3 = (state, value) => {
+const setDeltaY$2 = (state, value) => {
   object(state);
   number(value);
   const {
@@ -1365,15 +1379,11 @@ const getText$1 = state => {
 // TDOO this doesn;t belong here
 const getSelectionText = (textDocument, range) => {
   object(textDocument);
-  // console.log(range)
-  // console.log(textDocument)
   const startRowIndex = range.start.rowIndex;
   const startColumnIndex = range.start.columnIndex;
   const endRowIndex = Math.min(range.end.rowIndex, textDocument.lines.length - 1);
   const endColumnIndex = range.end.columnIndex;
   if (startRowIndex === endRowIndex) {
-    // console.log(startRowIndex)
-    // console.log(textDocument.lines)
     return [textDocument.lines[startRowIndex].slice(startColumnIndex, endColumnIndex)];
   }
   const selectedLines = [textDocument.lines[startRowIndex].slice(startColumnIndex), ...textDocument.lines.slice(startRowIndex + 1, endRowIndex), textDocument.lines[endRowIndex].slice(0, endColumnIndex)];
@@ -1448,9 +1458,9 @@ const getSelectionPairs = (selections, i) => {
   return [first, second, third, fourth, 0];
 };
-const EmptyString$1 = '';
+const EmptyString = '';
 const NewLine = '\n';
-const Space$2 = ' ';
+const Space$1 = ' ';
 const Tab$1 = '\t';
 const DoubleQuote$1 = '"';
@@ -1534,7 +1544,7 @@ const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing,
 const normalizeText = (text, normalize, tabSize) => {
   if (normalize) {
-    return text.replaceAll(Tab$1, Space$2.repeat(tabSize));
+    return text.replaceAll(Tab$1, Space$1.repeat(tabSize));
   }
   return text;
 };
@@ -1822,9 +1832,9 @@ const applyEdit$1 = (editor, changes) => {
 // TODO
 const setDeltaYFixedValue$1 = (editor, value) => {
-  return setDeltaY$3(editor, value);
+  return setDeltaY$2(editor, value);
 };
-const setDeltaY$2 = (editor, value) => {
+const setDeltaY$1 = (editor, value) => {
   return setDeltaYFixedValue$1(editor, editor.deltaY + value);
 };
 const isAutoClosingChange = change => {
@@ -1869,7 +1879,7 @@ const scheduleSelections = (editor, selectionEdits) => {
  * @param {Uint32Array|undefined} selectionChanges
  * @returns
  */
-const scheduleDocumentAndCursorsSelections = (editor, changes, selectionChanges = undefined) => {
+const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionChanges = undefined) => {
   object(editor);
   array(changes);
   if (changes.length === 0) {
@@ -1898,7 +1908,8 @@ const scheduleDocumentAndCursorsSelections = (editor, changes, selectionChanges
     invalidStartIndex,
     autoClosingRanges
   };
-  const newWidgets = applyWidgetChanges(newEditor, changes);
+  set$4(editor.uid, editor, newEditor);
+  const newWidgets = await applyWidgetChanges(newEditor, changes);
   const newEditor2 = {
     ...newEditor,
     widgets: newWidgets
@@ -1931,11 +1942,7 @@ const scheduleDocumentAndCursorsSelectionIsUndo = (editor, changes) => {
 // @ts-ignore
 const scheduleDocument = async (editor, changes) => {
-  // console.log('before')
-  // console.log([...editor.lines])
   const newLines = applyEdits(editor, changes);
-  // console.log('after')
-  // console.log([...editor.lines])
   const invalidStartIndex = changes[0].start.rowIndex;
   // if (editor.undoStack) {
   //   editor.undoStack.push(changes)
@@ -2017,23 +2024,6 @@ const setText = (editor, text) => {
   };
 };
-const editors = Object.create(null);
-const get$4 = id => {
-  number(id);
-  return editors[id];
-};
-const set$4 = (id, oldEditor, newEditor) => {
-  number(id);
-  object(oldEditor);
-  object(newEditor);
-  editors[id] = {
-    oldState: oldEditor,
-    newState: newEditor
-  };
-};
-const CompletionExecute = 'ExtensionHostCompletion.execute';
-const CompletionResolveExecute = 'ExtensionHostCompletion.executeResolve';
 const HoverExecute = 'ExtensionHostHover.execute';
 const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompletionProvider';
 const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
@@ -2111,7 +2101,7 @@ const waitForFirstMessage = async port => {
   return event;
 };
-const create$d = async () => {
+const create$c = async () => {
   const {
     port1,
     port2
@@ -2156,7 +2146,7 @@ const wrap$2 = port => {
 const IpcParentWithExtensionHostWorker = {
   __proto__: null,
-  create: create$d,
+  create: create$c,
   wrap: wrap$2
 };
@@ -2164,7 +2154,7 @@ const sendMessagePortToRendererProcess = async port => {
   await invokeAndTransfer('SendMessagePortToRendererProcess.sendMessagePortToRendererProcess', port, 'HandleMessagePort.handleMessagePort');
 };
-const create$c = async () => {
+const create$b = async () => {
   const {
     port1,
     port2
@@ -2209,7 +2199,7 @@ const wrap$1 = port => {
 const IpcParentWithRendererProcess = {
   __proto__: null,
-  create: create$c,
+  create: create$b,
   wrap: wrap$1
 };
@@ -2217,7 +2207,7 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
   await invokeAndTransfer('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
 };
-const create$b = async () => {
+const create$a = async () => {
   const {
     port1,
     port2
@@ -2262,7 +2252,7 @@ const wrap = port => {
 const IpcParentWithSyntaxHighlightingWorker = {
   __proto__: null,
-  create: create$b,
+  create: create$a,
   wrap
 };
@@ -2279,7 +2269,7 @@ const getModule$1 = method => {
   }
 };
-const create$a = async ({
+const create$9 = async ({
   method,
   ...options
 }) => {
@@ -2297,7 +2287,7 @@ const create$a = async ({
 const createRpc = method => {
   let _ipc;
   const listen = async () => {
-    const ipc = await create$a({
+    const ipc = await create$9({
       method
     });
     handleIpc(ipc);
@@ -2321,7 +2311,6 @@ const {
   invoke: invoke$5} = createRpc(ExtensionHostWorker);
 const ColorPicker$1 = 41;
-const CompletionDetail$1 = 999;
 const EditorCompletion = 9;
 const Empty = 0;
 const FindWidget = 16;
@@ -2334,7 +2323,6 @@ const measureCharacterWidth = (fontWeight, fontSize, fontFamily, letterSpacing)
   return measureTextWidth('a', fontWeight, fontSize, fontFamily, letterSpacing, false, 0);
 };
-const OnCompletion = 'onCompletion';
 const OnDiagnostic = 'onDiagnostic';
 const OnHover = 'onHover';
 const OnTabCompletion = 'onTabCompletion';
@@ -2557,7 +2545,7 @@ const createEditor = async ({
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
   const newEditor2 = setText(newEditor1, content);
-  const newEditor3 = setDeltaY$3(newEditor2, 0);
+  const newEditor3 = setDeltaY$2(newEditor2, 0);
   const newEditor4 = {
     ...newEditor3,
     focused: true
@@ -2692,7 +2680,7 @@ const getAccurateColumnIndexAscii = (line, guess, averageCharWidth, eventX, font
 const supported = () => {
   return 'Segmenter' in Intl;
 };
-const create$9 = () => {
+const create$8 = () => {
   // @ts-ignore
   const segmenter = new Intl.Segmenter();
   return {
@@ -2730,7 +2718,7 @@ const create$9 = () => {
 // @ts-ignore
 const getAccurateColumnIndexUnicode = (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing) => {
-  const segmenter = create$9();
+  const segmenter = create$8();
   const segments = segmenter.getSegments(line);
   const isMonospaceFont = false;
   const charWidth = 0;
@@ -3002,24 +2990,6 @@ const closeCodeGenerator = editor => {
   };
 };
-const isCompletionWidget = widget => {
-  return widget.id === Completion;
-};
-const closeCompletion = editor => {
-  const {
-    widgets
-  } = editor;
-  const completionWidgetIndex = widgets.findIndex(isCompletionWidget);
-  if (completionWidgetIndex === -1) {
-    return editor;
-  }
-  const newWidgets = removeEditorWidget(widgets, Completion);
-  return {
-    ...editor,
-    widgets: newWidgets
-  };
-};
 const isMatchingWidget$1 = widget => {
   return widget.id === Find;
 };
@@ -3039,24 +3009,60 @@ const closeFind = editor => {
   };
 };
+const launchRenameWorker = async () => {
+  const name = 'Rename Worker';
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  await invokeAndTransfer('IpcParent.create', {
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
+    url: 'renameWorkerMain.js',
+    name: name,
+    raw: true,
+    port: port1
+  });
+  const rpc = await MessagePortRpcParent.create({
+    commandMap: {},
+    messagePort: port2,
+    isMessagePortOpen: true
+  });
+  port2.start();
+  return rpc;
+};
+let workerPromise$2;
+const getOrCreate$2 = () => {
+  if (!workerPromise$2) {
+    workerPromise$2 = launchRenameWorker();
+  }
+  return workerPromise$2;
+};
+const invoke$4 = async (method, ...params) => {
+  const worker = await getOrCreate$2();
+  return await worker.invoke(method, ...params);
+};
 // TODO duplicate code
 const isRenameWidget = widget => {
   return widget.id === Rename;
 };
-const closeRename = editor => {
+const closeRename = async editor => {
   const {
-    widgets
+    widgets,
+    uid
   } = editor;
   const renameWidgetIndex = widgets.findIndex(isRenameWidget);
   if (renameWidgetIndex === -1) {
     return editor;
   }
-  const newWidgets = removeEditorWidget(widgets, Rename);
-  return {
-    ...editor,
-    focused: true,
-    widgets: newWidgets
-  };
+  const renameWidget = widgets[renameWidgetIndex];
+  await invoke$4('Rename.close', renameWidget.newState.uid);
+  const latest = get$4(uid);
+  const {
+    newState
+  } = latest;
+  return newState;
 };
 const isMatchingWidget = widget => {
@@ -3096,6 +3102,12 @@ const setFocus = async focusKey => {
   }
   await invoke$7('Focus.setFocus', focusKey);
 };
+const unsetAdditionalFocus = async focusKey => {
+  if (!focusKey) {
+    return;
+  }
+  await invoke$7('Focus.removeAdditionalFocus', focusKey);
+};
 const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGenerator, fullFocus) => {
   const {
@@ -3127,12 +3139,12 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   return newEditor;
 };
-const create$8 = () => {
+const create$7 = () => {
   return Math.random();
 };
-const create$7 = () => {
-  const completionUid = create$8();
+const create$6 = () => {
+  const completionUid = create$7();
   const widget = {
     id: ColorPicker,
     oldState: {
@@ -3155,11 +3167,11 @@ const create$7 = () => {
   return widget;
 };
-const newStateGenerator$4 = (state, parentUid) => {
-  return loadContent$3(state, parentUid);
+const newStateGenerator$5 = (state, parentUid) => {
+  return loadContent$2(state, parentUid);
 };
 const openColorPicker = async editor => {
-  return addWidgetToEditor(ColorPicker, ColorPicker$1, editor, create$7, newStateGenerator$4);
+  return addWidgetToEditor(ColorPicker, ColorPicker$1, editor, create$6, newStateGenerator$5);
 };
 const state$6 = {
@@ -3404,7 +3416,7 @@ const characterLeft = (line, columnIndex) => {
   if (!supported()) {
     return 1;
   }
-  const segmenter = create$9();
+  const segmenter = create$8();
   const last = segmenter.at(line, columnIndex - 1);
   return columnIndex - last.index;
 };
@@ -3415,12 +3427,12 @@ const characterRight = (line, columnIndex) => {
   if (!supported()) {
     return 1;
   }
-  const segmenter = create$9();
+  const segmenter = create$8();
   const next = segmenter.at(line, columnIndex);
   return next.segment.length;
 };
 const isWhitespace = char => {
-  return char === Space$2 || char === Tab$1;
+  return char === Space$1 || char === Tab$1;
 };
 const lineCharacterStart = (line, columnIndex) => {
   if (line.length === 0) {
@@ -3942,7 +3954,7 @@ const getWordAt$2 = (line, columnIndex) => {
   const matchBefore = before.match(RE_WORD_END$1);
   const after = line.slice(columnIndex);
   const matchAfter = after.match(RE_WORD_START$1);
-  let word = EmptyString$1;
+  let word = EmptyString;
   if (matchBefore) {
     word += matchBefore[0];
   }
@@ -3959,7 +3971,7 @@ const getWordBefore$1 = (line, columnIndex) => {
   if (matchBefore) {
     return matchBefore[0];
   }
-  return EmptyString$1;
+  return EmptyString;
 };
 const getWordAt$1 = (editor, rowIndex, columnIndex) => {
@@ -4020,7 +4032,6 @@ const MoveLineUp = 'Move Line Up';
 const NoCodeActionsAvailable = 'No code actions available';
 const NoDefinitionFound = 'No definition found';
 const NoDefinitionFoundFor = "No definition found for '{PH1}'";
-const NoResults = 'No Results';
 const NoTypeDefinitionFound = 'No type definition found';
 const NoTypeDefinitionFoundFor = "No type definition found for '{PH1}'";
 const SourceAction = 'Source Action';
@@ -4042,9 +4053,6 @@ const noTypeDefinitionFoundFor = word => {
 const noTypeDefinitionFound = () => {
   return i18nString(NoTypeDefinitionFound);
 };
-const noResults = () => {
-  return i18nString(NoResults);
-};
 const sourceAction = () => {
   return i18nString(SourceAction);
 };
@@ -4683,7 +4691,6 @@ const getNewPercent$1 = (size, scrollBarSize, relativeX) => {
     return 0;
   }
   // if (relativeY <= editor.scrollBarHeight / 2) {
-  //   console.log('clicked at top')
   //   // clicked at top
   //   return 0
   // }
@@ -4769,7 +4776,6 @@ const getNewPercent = (state, relativeY) => {
     scrollBarHeight
   } = state;
   // if (relativeY <= editor.scrollBarHeight / 2) {
-  //   console.log('clicked at top')
   //   // clicked at top
   //   return 0
   // }
@@ -4848,7 +4854,6 @@ const handleTouchEnd = (editor, touchEvent) => {
   //     EditorCursorSet.cursorSet(editor, position)
   //   }
   // } else {
-  //   console.log('different position')
   // }
 };
@@ -4871,8 +4876,8 @@ const handleTouchStart = (editor, touchEvent) => {
 };
 // @ts-ignore
-const setDeltaY$1 = (editor, deltaY) => {
-  return setDeltaY$2(editor, deltaY);
+const setDeltaY = (editor, deltaY) => {
+  return setDeltaY$1(editor, deltaY);
 };
 // @ts-ignore
@@ -4889,11 +4894,11 @@ const setDelta = (editor, deltaMode, eventDeltaX, eventDeltaY) => {
   const {
     deltaX} = editor;
   if (eventDeltaX === 0) {
-    return setDeltaY$1(editor, eventDeltaY);
+    return setDeltaY(editor, eventDeltaY);
   }
   const newDeltaX = clamp(deltaX + eventDeltaX, 0, Number.POSITIVE_INFINITY);
   return {
-    ...setDeltaY$1(editor, eventDeltaY),
+    ...setDeltaY(editor, eventDeltaY),
     deltaX: newDeltaX
   };
 };
@@ -5257,8 +5262,8 @@ const moveSelectionPx = (editor, x, y) => {
 const Script = 2;
 const Unknown$1 = 0;
-const create$6 = () => {
-  const completionUid = create$8();
+const create$5 = () => {
+  const completionUid = create$7();
   const widget = {
     id: CodeGenerator,
     oldState: {
@@ -5285,7 +5290,7 @@ const create$6 = () => {
   return widget;
 };
-const newStateGenerator$3 = async state => {
+const newStateGenerator$4 = async state => {
   const latestState = {
     ...state,
     x: 100,
@@ -5297,575 +5302,163 @@ const newStateGenerator$3 = async state => {
 };
 const openCodeGenerator = async editor => {
   const fullFocus = true;
-  return addWidgetToEditor(CodeGenerator, FocusCodeGenerator, editor, create$6, newStateGenerator$3, fullFocus);
+  return addWidgetToEditor(CodeGenerator, FocusCodeGenerator, editor, create$5, newStateGenerator$4, fullFocus);
 };
-const create$5 = () => {
-  const completionUid = create$8();
+const create$4 = () => {
+  const completionUid = create$7();
   const completionWidget = {
     id: Completion,
     oldState: {
-      items: [],
-      itemHeight: 20,
-      maxHeight: 150,
-      minLineY: 0,
-      maxLineY: 0,
       uid: completionUid,
-      focusedIndex: -1,
       x: 0,
       y: 0,
       width: 0,
       height: 0,
-      deltaY: 0,
-      finalDeltaY: 0,
-      focused: false,
-      headerHeight: 0
+      commands: []
     },
     newState: {
-      items: [],
-      itemHeight: 20,
-      maxHeight: 150,
-      minLineY: 0,
-      maxLineY: 10,
       uid: completionUid,
-      focusedIndex: -1,
       x: 0,
       y: 0,
       width: 0,
       height: 0,
-      deltaY: 0,
-      finalDeltaY: 0,
-      headerHeight: 0,
-      focused: false
+      commands: []
     }
   };
   return completionWidget;
 };
-const executeCompletionProvider = async (editor, offset) => {
-  return execute({
-    editor,
-    event: OnCompletion,
-    method: CompletionExecute,
-    args: [offset],
-    noProviderFoundMessage: 'no completion provider found',
-    noProviderFoundResult: []});
+const launchCompletionWorker = async () => {
+  const name = 'Completion Worker';
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  await invokeAndTransfer('IpcParent.create', {
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
+    url: 'completionWorkerMain.js',
+    name: name,
+    raw: true,
+    port: port1
+  });
+  const rpc = await MessagePortRpcParent.create({
+    commandMap: {},
+    messagePort: port2,
+    isMessagePortOpen: true
+  });
+  port2.start();
+  await rpc.invoke('Completions.initialize');
+  return rpc;
 };
-const executeResolveCompletionItem = async (editor, offset, name, completionItem) => {
-  return execute({
-    editor,
-    event: OnCompletion,
-    method: CompletionResolveExecute,
-    args: [offset, name, completionItem],
-    noProviderFoundMessage: 'no completion provider found',
-    noProviderFoundResult: []});
+let workerPromise$1;
+const getOrCreate$1 = () => {
+  if (!workerPromise$1) {
+    workerPromise$1 = launchCompletionWorker();
+  }
+  return workerPromise$1;
+};
+const invoke$3 = async (method, ...params) => {
+  const worker = await getOrCreate$1();
+  return await worker.invoke(method, ...params);
 };
-const getOffsetAtCursor = editor => {
+const newStateGenerator$3 = async (state, parentUid) => {
   const {
-    selections
+    uid,
+    x,
+    y,
+    width,
+    height
+  } = state;
+  const editor = get$4(parentUid);
+  const {
+    languageId
   } = editor;
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  const offset = offsetAt(editor, rowIndex, columnIndex);
-  return offset;
+  await invoke$3('Completions.create', uid, x, y, width, height, parentUid, languageId);
+  await invoke$3('Completions.loadContent', uid);
+  const diff = await invoke$3('Completions.diff2', uid);
+  const commands = await invoke$3('Completions.render2', uid, diff);
+  return {
+    ...state,
+    commands
+  };
 };
-// TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
-const getCompletions = async editor => {
-  const offset = getOffsetAtCursor(editor);
-  const completions = await executeCompletionProvider(editor, offset);
-  return completions;
+const openCompletion = async editor => {
+  const fullFocus = false;
+  return addWidgetToEditor(Completion, EditorCompletion, editor, create$4, newStateGenerator$3, fullFocus);
 };
-// TODO don't send unnecessary parts of completion item like matches
-const resolveCompletion = async (editor, name, completionItem) => {
-  try {
-    object(editor);
-    string(name);
-    object(completionItem);
-    const offset = getOffsetAtCursor(editor);
-    // @ts-ignore
-    const resolvedCompletionItem = await executeResolveCompletionItem(editor, offset, name, completionItem);
-    return resolvedCompletionItem;
-  } catch {
-    return undefined;
-  }
+const create$3 = () => {
+  const uid = create$7();
+  const widget = {
+    id: Find,
+    oldState: {
+      uid,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      commands: [],
+      editorUid: 0
+    },
+    newState: {
+      uid,
+      x: 0,
+      y: 0,
+      width: 0,
+      height: 0,
+      commands: [],
+      editorUid: 0
+    }
+  };
+  return widget;
 };
-const None$1 = 1;
-const Diagonal = 1;
-const Left = 2;
-// based on https://github.com/microsoft/vscode/blob/3059063b805ed0ac10a6d9539e213386bfcfb852/src/vs/base/common/filters.ts by Microsoft (License MIT)
-const createTable = size => {
-  const table = [];
-  for (let i = 0; i < size; i++) {
-    const row = new Uint8Array(size);
-    table.push(row);
-  }
-  return table;
-};
-const EmptyMatches$1 = [];
-const Dash = '-';
-const Dot = '.';
-const EmptyString = '';
-const Space$1 = ' ';
-const Underline = '_';
-const T = 't';
-const isLowerCase = char => {
-  return char === char.toLowerCase();
-};
-const isUpperCase = char => {
-  return char === char.toUpperCase();
-};
-// based on https://github.com/microsoft/vscode/blob/3059063b805ed0ac10a6d9539e213386bfcfb852/src/vs/base/common/filters.ts by Microsoft (License MIT)
-const isGap = (columnCharBefore, columnChar) => {
-  switch (columnCharBefore) {
-    case Dash:
-    case Underline:
-    case EmptyString:
-    case T:
-    case Space$1:
-    case Dot:
-      return true;
-  }
-  if (isLowerCase(columnCharBefore) && isUpperCase(columnChar)) {
-    return true;
-  }
-  return false;
+const launchFindWidgetWorker = async () => {
+  const name = 'Find Widget Worker';
+  const {
+    port1,
+    port2
+  } = getPortTuple();
+  await invokeAndTransfer('IpcParent.create', {
+    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
+    url: 'findWidgetWorkerMain.js',
+    name: name,
+    raw: true,
+    port: port1
+  });
+  const rpc = await MessagePortRpcParent.create({
+    commandMap: {},
+    messagePort: port2,
+    isMessagePortOpen: true
+  });
+  port2.start();
+  return rpc;
 };
-// based on https://github.com/microsoft/vscode/blob/3059063b805ed0ac10a6d9539e213386bfcfb852/src/vs/base/common/filters.ts by Microsoft (License MIT)
-const getScore = (rowCharLow, rowChar, columnCharBefore, columnCharLow, columnChar, isDiagonalMatch) => {
-  if (rowCharLow !== columnCharLow) {
-    return -1;
-  }
-  const isMatch = rowChar === columnChar;
-  if (isMatch) {
-    if (isDiagonalMatch) {
-      return 8;
-    }
-    if (isGap(columnCharBefore, columnChar)) {
-      return 8;
-    }
-    return 5;
-  }
-  if (isGap(columnCharBefore, columnChar)) {
-    return 8;
+let workerPromise;
+const getOrCreate = () => {
+  if (!workerPromise) {
+    workerPromise = launchFindWidgetWorker();
   }
-  return 5;
+  return workerPromise;
+};
+const invoke$2 = async (method, ...params) => {
+  const worker = await getOrCreate();
+  return await worker.invoke(method, ...params);
 };
-// based on https://github.com/microsoft/vscode/blob/3059063b805ed0ac10a6d9539e213386bfcfb852/src/vs/base/common/filters.ts by Microsoft (License MIT)
-const isPatternInWord = (patternLow, patternPos, patternLen, wordLow, wordPos, wordLen) => {
-  while (patternPos < patternLen && wordPos < wordLen) {
-    if (patternLow[patternPos] === wordLow[wordPos]) {
-      patternPos += 1;
-    }
-    wordPos += 1;
+const getEditor = editorUid => {
+  const instance = get$4(editorUid);
+  if (!instance) {
+    throw new Error(`editor ${editorUid} not found`);
   }
-  return patternPos === patternLen; // pattern must be exhausted
-};
-// based on https://github.com/microsoft/vscode/blob/3059063b805ed0ac10a6d9539e213386bfcfb852/src/vs/base/common/filters.ts by Microsoft (License MIT)
-const traceHighlights = (table, arrows, patternLength, wordLength) => {
-  let row = patternLength;
-  let column = wordLength;
-  const matches = [];
-  while (row >= 1 && column >= 1) {
-    const arrow = arrows[row][column];
-    if (arrow === Left) {
-      column--;
-    } else if (arrow === Diagonal) {
-      row--;
-      column--;
-      const start = column + 1;
-      while (row >= 1 && column >= 1) {
-        const arrow = arrows[row][column];
-        if (arrow === Left) {
-          break;
-        }
-        if (arrow === Diagonal) {
-          row--;
-          column--;
-        }
-      }
-      const end = column;
-      matches.unshift(end, start);
-    }
-  }
-  matches.unshift(table[patternLength][wordLength - 1]);
-  return matches;
-};
-// based on https://github.com/microsoft/vscode/blob/3059063b805ed0ac10a6d9539e213386bfcfb852/src/vs/base/common/filters.ts by Microsoft (License MIT)
-const gridSize = 128;
-const table = createTable(gridSize);
-const arrows = createTable(gridSize);
-const fuzzySearch = (pattern, word) => {
-  const patternLength = Math.min(pattern.length, gridSize - 1);
-  const wordLength = Math.min(word.length, gridSize - 1);
-  const patternLower = pattern.toLowerCase();
-  const wordLower = word.toLowerCase();
-  if (!isPatternInWord(patternLower, 0, patternLength, wordLower, 0, wordLength)) {
-    return EmptyMatches$1;
-  }
-  let strongMatch = false;
-  for (let row = 1; row < patternLength + 1; row++) {
-    const rowChar = pattern[row - 1];
-    const rowCharLow = patternLower[row - 1];
-    for (let column = 1; column < wordLength + 1; column++) {
-      const columnChar = word[column - 1];
-      const columnCharLow = wordLower[column - 1];
-      const columnCharBefore = word[column - 2] || '';
-      const isDiagonalMatch = arrows[row - 1][column - 1] === Diagonal;
-      const score = getScore(rowCharLow, rowChar, columnCharBefore, columnCharLow, columnChar, isDiagonalMatch);
-      if (row === 1 && score > 5) {
-        strongMatch = true;
-      }
-      let diagonalScore = score + table[row - 1][column - 1];
-      if (isDiagonalMatch && score !== -1) {
-        diagonalScore += 2;
-      }
-      const leftScore = table[row][column - 1];
-      if (leftScore > diagonalScore) {
-        table[row][column] = leftScore;
-        arrows[row][column] = Left;
-      } else {
-        table[row][column] = diagonalScore;
-        arrows[row][column] = Diagonal;
-      }
-    }
-  }
-  if (!strongMatch) {
-    return EmptyMatches$1;
-  }
-  const highlights = traceHighlights(table, arrows, patternLength, wordLength);
-  return highlights;
-};
-const Deprecated = 1 << 0;
-const EmptyMatches = [];
-const addEmptyMatch = item => {
-  return {
-    ...item,
-    matches: EmptyMatches
-  };
-};
-const filterCompletionItems = (completionItems, word) => {
-  if (word === EmptyString$1) {
-    return completionItems.map(addEmptyMatch);
-  }
-  const filteredCompletions = [];
-  const deprecated = [];
-  for (const completionItem of completionItems) {
-    const {
-      label,
-      flags
-    } = completionItem;
-    const result = fuzzySearch(word, label);
-    if (result.length > 0) {
-      if (flags & Deprecated) {
-        // TODO avoid mutation
-        completionItem.matches = EmptyMatches;
-        deprecated.push(completionItem);
-      } else {
-        // TODO avoid mutation
-        completionItem.matches = result;
-        filteredCompletions.push(completionItem);
-      }
-    }
-  }
-  if (deprecated.length > 0) {
-    filteredCompletions.push(...deprecated);
-  }
-  return filteredCompletions;
-};
-const getEditor = editorUid => {
-  const instance = get$4(editorUid);
-  if (!instance) {
-    throw new Error(`editor ${editorUid} not found`);
-  }
-  const {
-    newState
-  } = instance;
-  return newState;
-};
-const getFinalDeltaY = (height, itemHeight, itemsLength) => {
-  const contentHeight = itemsLength * itemHeight;
-  const finalDeltaY = Math.max(contentHeight - height, 0);
-  return finalDeltaY;
-};
-const getListHeight = (itemsLength, itemHeight, maxHeight) => {
-  number(itemsLength);
-  number(itemHeight);
-  number(maxHeight);
-  if (itemsLength === 0) {
-    return itemHeight;
-  }
-  const totalHeight = itemsLength * itemHeight;
-  return Math.min(totalHeight, maxHeight);
-};
-const getPositionAtCursor$1 = editor => {
-  const {
-    selections
-  } = editor;
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  const x$1 = x(editor, rowIndex, columnIndex);
-  const y$1 = y(editor, rowIndex);
-  return {
-    x: x$1,
-    y: y$1,
-    rowIndex,
-    columnIndex
-  };
-};
-const RE_WORD = /[\w\-]+$/;
-const getWordAtOffset = editor => {
-  const {
-    lines,
-    selections
-  } = editor;
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  const line = lines[rowIndex];
-  const part = line.slice(0, columnIndex);
-  const wordMatch = part.match(RE_WORD);
-  if (wordMatch) {
-    return wordMatch[0];
-  }
-  return '';
-};
-const handleEditorType$2 = (editorUid, state, text) => {
-  const editor = getEditor(editorUid);
-  const {
-    unfilteredItems,
-    itemHeight,
-    maxHeight
-  } = state;
-  const rowIndex = editor.selections[0];
-  const columnIndex = editor.selections[1];
-  const x$1 = x(editor, rowIndex, columnIndex);
-  // @ts-ignore
-  const y$1 = y(editor, rowIndex);
-  const wordAtOffset = getWordAtOffset(editor);
-  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
-  const newMinLineY = 0;
-  const newMaxLineY = Math.min(items.length, 8);
-  const height = getListHeight(items.length, itemHeight, maxHeight);
-  const finalDeltaY = items.length * itemHeight - height;
-  return {
-    ...state,
-    items,
-    x: x$1,
-    y: y$1,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    leadingWord: wordAtOffset,
-    height,
-    finalDeltaY
-  };
-};
-const handleEditorDeleteLeft$2 = (editorUid, state) => {
-  const editor = getEditor(editorUid);
-  const {
-    unfilteredItems,
-    itemHeight,
-    maxHeight
-  } = state;
-  const rowIndex = editor.selections[0];
-  const columnIndex = editor.selections[1];
-  const x$1 = x(editor, rowIndex, columnIndex);
-  // @ts-ignore
-  const y$1 = y(editor, rowIndex);
-  const wordAtOffset = getWordAtOffset(editor);
-  if (!wordAtOffset) {
-    editor.completionState = None$1;
-    return {
-      ...state,
-      disposed: true
-    };
-  }
-  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
-  const newMaxLineY = Math.min(items.length, 8);
-  const height = getListHeight(items.length, itemHeight, maxHeight);
-  return {
-    ...state,
-    items,
-    x: x$1,
-    y: y$1,
-    maxLineY: newMaxLineY,
-    leadingWord: wordAtOffset,
-    height
-  };
-};
-const dispose = state => {
-  return {
-    ...state,
-    disposed: true
-  };
-};
-const disposeWithEditor = (state, editor) => {
-  editor.completionState = None$1;
-  editor.completionUid = 0;
-  // Focus.removeAdditionalFocus(FocusKey.EditorCompletion)
-  return dispose(state);
-};
-const handleEditorClick = disposeWithEditor;
-const handleEditorBlur = disposeWithEditor;
-const loadContent$2 = async (editorUid, state) => {
-  const editor = getEditor(editorUid);
-  const {
-    itemHeight,
-    maxHeight
-  } = state;
-  const unfilteredItems = await getCompletions(editor);
-  const wordAtOffset = getWordAtOffset(editor);
-  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
-  const {
-    rowIndex,
-    columnIndex,
-    x,
-    y
-  } = getPositionAtCursor$1(editor);
-  const newMaxLineY = Math.min(items.length, 8);
-  editor.widgets = editor.widgets || [];
-  // editor.widgets.push(ViewletModuleId.EditorCompletion)
-  const itemsLength = items.length;
-  const newFocusedIndex = itemsLength === 0 ? -1 : 0;
-  const total = items.length;
-  const height = getListHeight(items.length, itemHeight, maxHeight);
-  const finalDeltaY = getFinalDeltaY(height, itemHeight, total);
-  return {
-    ...state,
-    unfilteredItems,
-    items,
-    x,
-    y,
-    maxLineY: newMaxLineY,
-    focusedIndex: newFocusedIndex,
-    finalDeltaY,
-    leadingWord: wordAtOffset,
-    height,
-    rowIndex,
-    columnIndex,
-    editorUid,
-    width: 200
-  };
-};
-const advance = (state, word) => {
-  const filteredItems = filterCompletionItems(state.items, word);
-  return {
-    ...state,
-    filteredItems
-  };
-};
-const openCompletion = async editor => {
-  const {
-    widgets,
-    uid
-  } = editor;
-  if (hasWidget(widgets, Completion)) {
-    return editor;
-  }
-  const completionWidget = create$5();
-  const newWidgets = [...widgets, completionWidget];
-  const newEditor = {
-    ...editor,
-    widgets: newWidgets
-  };
-  set$4(uid, editor, newEditor);
-  const newCompletionWidget = await loadContent$2(uid, completionWidget.newState);
-  const FocusEditorCompletions = EditorCompletion;
-  await setAdditionalFocus(FocusEditorCompletions);
-  const latestEditor = getEditor(uid);
-  if (!latestEditor.widgets.includes(completionWidget)) {
-    return editor;
-  }
-  const index = latestEditor.widgets.indexOf(completionWidget);
-  const latestWidgets = [...latestEditor.widgets.slice(0, index), {
-    ...completionWidget,
-    newState: newCompletionWidget
-  }, ...latestEditor.widgets.slice(index + 1)];
-  return {
-    ...latestEditor,
-    widgets: latestWidgets
-  };
-};
-const create$4 = () => {
-  const uid = create$8();
-  const widget = {
-    id: Find,
-    oldState: {
-      uid,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
-      commands: [],
-      editorUid: 0
-    },
-    newState: {
-      uid,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
-      commands: [],
-      editorUid: 0
-    }
-  };
-  return widget;
-};
-const launchFindWidgetWorker = async () => {
-  const name = 'Find Widget Worker';
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  await invokeAndTransfer('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: 'findWidgetWorkerMain.js',
-    name: name,
-    raw: true,
-    port: port1
-  });
-  const rpc = await MessagePortRpcParent.create({
-    commandMap: {},
-    messagePort: port2,
-    isMessagePortOpen: true
-  });
-  port2.start();
-  return rpc;
-};
-let workerPromise$2;
-const getOrCreate$2 = () => {
-  if (!workerPromise$2) {
-    workerPromise$2 = launchFindWidgetWorker();
-  }
-  return workerPromise$2;
-};
-const invoke$4 = async (method, ...params) => {
-  const worker = await getOrCreate$2();
-  return await worker.invoke(method, ...params);
+  const {
+    newState
+  } = instance;
+  return newState;
 };
 const loadContent$1 = async (state, parentUid) => {
@@ -5879,16 +5472,16 @@ const loadContent$1 = async (state, parentUid) => {
     width,
     height
   } = editor;
-  await invoke$4('FindWidget.create', uid, x, y, width, height, parentUid);
-  await invoke$4('FindWidget.loadContent', uid);
-  const diff = await invoke$4('FindWidget.diff2', uid);
-  const commands = await invoke$4('FindWidget.render2', uid, diff);
+  await invoke$2('FindWidget.create', uid, x, y, width, height, parentUid);
+  await invoke$2('FindWidget.loadContent', uid);
+  const diff = await invoke$2('FindWidget.diff2', uid);
+  const commands = await invoke$2('FindWidget.render2', uid, diff);
   return {
     ...state,
     commands
   };
 };
-const close = async state => {
+const close$1 = async state => {
   // TODO
   // await Viewlet.closeWidget(uid)
   return {
@@ -5902,15 +5495,31 @@ const newStateGenerator$2 = (state, parentUid) => {
 };
 const openFind2 = async editor => {
   const fullFocus = true;
-  return addWidgetToEditor(ColorPicker, FindWidget, editor, create$4, newStateGenerator$2, fullFocus);
+  return addWidgetToEditor(ColorPicker, FindWidget, editor, create$3, newStateGenerator$2, fullFocus);
 };
 const openFind = async state => {
   return openFind2(state);
 };
-const create$3 = () => {
-  const completionUid = create$8();
+const getPositionAtCursor$1 = editor => {
+  const {
+    selections
+  } = editor;
+  const rowIndex = selections[0];
+  const columnIndex = selections[1];
+  const x$1 = x(editor, rowIndex, columnIndex);
+  const y$1 = y(editor, rowIndex);
+  return {
+    x: x$1,
+    y: y$1,
+    rowIndex,
+    columnIndex
+  };
+};
+const create$2 = () => {
+  const completionUid = create$7();
   const renameWidget = {
     id: Rename,
     oldState: {
@@ -5933,40 +5542,6 @@ const create$3 = () => {
   return renameWidget;
 };
-const launchRenameWorker = async () => {
-  const name = 'Rename Worker';
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  await invokeAndTransfer('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: 'renameWorkerMain.js',
-    name: name,
-    raw: true,
-    port: port1
-  });
-  const rpc = await MessagePortRpcParent.create({
-    commandMap: {},
-    messagePort: port2,
-    isMessagePortOpen: true
-  });
-  port2.start();
-  return rpc;
-};
-let workerPromise$1;
-const getOrCreate$1 = () => {
-  if (!workerPromise$1) {
-    workerPromise$1 = launchRenameWorker();
-  }
-  return workerPromise$1;
-};
-const invoke$3 = async (method, ...params) => {
-  const worker = await getOrCreate$1();
-  return await worker.invoke(method, ...params);
-};
 const newStateGenerator$1 = async (state, parentUid) => {
   // const editor: any = {}
   const {
@@ -5976,10 +5551,10 @@ const newStateGenerator$1 = async (state, parentUid) => {
     width,
     height
   } = state;
-  await invoke$3('Rename.create', uid, x, y, width, height, parentUid);
-  await invoke$3('Rename.loadContent', uid);
-  const diff = await invoke$3('Rename.diff2', uid);
-  const commands = await invoke$3('Rename.render2', uid, diff);
+  await invoke$4('Rename.create', uid, x, y, width, height, parentUid);
+  await invoke$4('Rename.loadContent', uid);
+  const diff = await invoke$4('Rename.diff2', uid);
+  const commands = await invoke$4('Rename.render2', uid, diff);
   return {
     ...state,
     commands
@@ -5997,7 +5572,7 @@ const openRename = async editor => {
     return editor;
   }
   const fullFocus = true;
-  return addWidgetToEditor(Rename, FocusEditorRename$1, editor, create$3, newStateGenerator$1, fullFocus);
+  return addWidgetToEditor(Rename, FocusEditorRename$1, editor, create$2, newStateGenerator$1, fullFocus);
 };
 const getOrganizeImportEdits = async editor => {
@@ -6727,7 +6302,7 @@ const getEnabled$1 = () => {
 const {
   listen: listen$3,
-  invoke: invoke$2
+  invoke: invoke$1
 } = createRpc(SyntaxHighlightingWorker);
 /**
@@ -6797,7 +6372,7 @@ const loadTokenizer = async (languageId, tokenizePath) => {
     return;
   }
   if (getEnabled$1()) {
-    const tokenMap = await invoke$2('Tokenizer.load', languageId, tokenizePath);
+    const tokenMap = await invoke$1('Tokenizer.load', languageId, tokenizePath);
     set$1(languageId, tokenMap);
     return;
   }
@@ -6902,8 +6477,8 @@ const setSelections = (editor, selections) => {
   };
 };
-const create$2 = () => {
-  const uid = create$8();
+const create$1 = () => {
+  const uid = create$7();
   const widget = {
     id: Hover,
     oldState: {
@@ -6956,18 +6531,18 @@ const getHover = async (editor, offset) => {
 let _ipc;
 const listen$2 = async () => {
-  const ipc = await create$a({
+  const ipc = await create$9({
     method: RendererProcess
   });
   handleIpc(ipc);
   _ipc = ipc;
 };
-const invoke$1 = async (method, ...args) => {
+const invoke = async (method, ...args) => {
   return invoke$9(_ipc, method, ...args);
 };
 const measureTextBlockHeight = async (text, fontFamily, fontSize, lineHeight, width) => {
-  return invoke$1('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
+  return invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
 };
 const deepCopy = value => {
@@ -7173,7 +6748,7 @@ const newStateGenerator = async state => {
   return loadHoverContent(state);
 };
 const showHover2 = async editor => {
-  return addWidgetToEditor(Hover, FocusEditorHover, editor, create$2, newStateGenerator);
+  return addWidgetToEditor(Hover, FocusEditorHover, editor, create$1, newStateGenerator);
 };
 const EditorHover = 'EditorHover';
@@ -7236,8 +6811,8 @@ const loadSourceActions = async (editor, state) => {
   };
 };
-const create$1 = () => {
-  const completionUid = create$8();
+const create = () => {
+  const completionUid = create$7();
   const widget = {
     id: SourceAction$1,
     oldState: {
@@ -7268,7 +6843,7 @@ const showSourceActions = async editor => {
   const newStateGenerator = async state => {
     return loadSourceActions(editor, state);
   };
-  return addWidgetToEditor(SourceAction$1, SourceActions, editor, create$1, newStateGenerator);
+  return addWidgetToEditor(SourceAction$1, SourceActions, editor, create, newStateGenerator);
 };
 const compareString = (a, b) => {
@@ -7341,6 +6916,16 @@ const executeTabCompletionProvider = async (editor, offset) => {
   });
 };
+const getOffsetAtCursor = editor => {
+  const {
+    selections
+  } = editor;
+  const rowIndex = selections[0];
+  const columnIndex = selections[1];
+  const offset = offsetAt(editor, rowIndex, columnIndex);
+  return offset;
+};
 const getTabCompletion = async editor => {
   const offset = getOffsetAtCursor(editor);
   const completions = await executeTabCompletionProvider(editor, offset);
@@ -7887,7 +7472,6 @@ const typeWithAutoClosing = async (editor, text) => {
   return newEditor;
   // if (isBrace(text)) {
-  //   console.log('is brace')
   //   return editorTypeWithBraceCompletion(editor, text)
   // }
   // if (isSlash(text)) {
@@ -8051,242 +7635,151 @@ const editorUnindent = editor => {
 // editor.lines //?
-const isCompletionDetailWidget = widget => {
-  return widget.id === CompletionDetail;
-};
-const closeDetails = editor => {
-  const {
-    widgets
-  } = editor;
-  const index = widgets.findIndex(isCompletionDetailWidget);
-  if (index === -1) {
-    return editor;
+const isFunctional = widgetId => {
+  switch (widgetId) {
+    case ColorPicker:
+    case Rename:
+    case Completion:
+    case Find:
+      return true;
+    default:
+      return false;
   }
-  const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
-  return {
-    ...editor,
-    widgets: newWidgets
-  };
-};
-const focusIndex$1 = (state, index) => {
-  const newState = {
-    ...state,
-    focusedIndex: index,
-    focused: true
-  };
-  return newState;
-};
-const focusFirst = state => {
-  const firstIndex = 0;
-  return focusIndex$1(state, firstIndex);
-};
-const focusNext$1 = state => {
-  const nextIndex = state.focusedIndex + 1;
-  return focusIndex$1(state, nextIndex);
-};
-const focusPrevious = state => {
-  const previousIndex = state.focusedIndex - 1;
-  return focusIndex$1(state, previousIndex);
 };
-// TODO optimize this function to return the minimum number
-// of visible items needed, e.g. when not scrolled 5 items with
-// 20px fill 100px but when scrolled 6 items are needed
-const getNumberOfVisibleItems = (listHeight, itemHeight) => {
-  return Math.ceil(listHeight / itemHeight) + 1;
-};
-const setDeltaY = (state, value) => {
-  object(state);
-  number(value);
+const addWidget$1 = (widget, id, render) => {
+  const commands = render(widget);
+  // TODO how to generate a unique integer id
+  // that doesn't collide with ids created in renderer worker?
+  // @ts-ignore
   const {
-    itemHeight,
-    finalDeltaY,
-    deltaY,
-    height,
-    headerHeight
-  } = state;
-  const listHeight = height - headerHeight;
-  const newDeltaY = clamp(value, 0, finalDeltaY);
-  if (deltaY === newDeltaY) {
-    return state;
+    uid
+  } = widget.newState;
+  const allCommands = [];
+  allCommands.push(['Viewlet.createFunctionalRoot', id, uid, isFunctional(widget.id)]);
+  allCommands.push(...commands);
+  if (isFunctional(widget.id)) {
+    allCommands.push(['Viewlet.appendToBody', uid]);
+  } else {
+    allCommands.push(['Viewlet.send', uid, 'appendWidget']);
   }
-  // TODO when it only moves by one px, extensions don't need to be rerendered, only negative margin
-  const minLineY = Math.floor(newDeltaY / itemHeight);
-  const maxLineY = minLineY + getNumberOfVisibleItems(listHeight, itemHeight);
-  return {
-    ...state,
-    deltaY: newDeltaY,
-    minLineY,
-    maxLineY
-  };
-};
-const handleWheel$1 = (state, deltaMode, deltaY) => {
-  number(deltaMode);
-  number(deltaY);
-  return setDeltaY(state, state.deltaY + deltaY);
-};
-const handleWheel = (state, deltaMode, deltaY) => {
-  const newState = handleWheel$1(state, deltaMode, deltaY);
-  return newState;
+  const focusCommandIndex = allCommands.findIndex(command => {
+    return command[2] === 'focus' || command[0] === 'Viewlet.focusSelector';
+  });
+  // TODO have separate rendering functions, e.g.
+  // 1. renderDom
+  // 2. renderAriaAnnouncement
+  // 3. renderFocus
+  // to ensure that focus is always after the element is added to the dom
+  if (focusCommandIndex !== -1) {
+    const command = allCommands[focusCommandIndex];
+    allCommands.splice(focusCommandIndex, 1);
+    allCommands.push(command);
+  }
+  return allCommands;
 };
-const create = () => {
-  const completionUid = create$8();
-  const completionWidget = {
-    id: CompletionDetail,
-    oldState: {
-      content: '',
-      uid: completionUid,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
-      borderSize: 1
-    },
-    newState: {
-      content: '',
-      uid: completionUid,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
-      borderSize: 1
-    }
-  };
-  return completionWidget;
-};
+const AppendToBody = 'Viewlet.appendToBody';
+const Focus = 'focus';
+const RegisterEventListeners = 'Viewlet.registerEventListeners';
+const SetSelectionByName = 'Viewlet.setSelectionByName';
+const SetValueByName = 'Viewlet.setValueByName';
+const SetFocusContext = 'Viewlet.setFocusContext';
+const SetBounds = 'setBounds';
+const SetBounds2 = 'Viewlet.setBounds';
+const SetCss = 'Viewlet.setCss';
+const SetDom2 = 'Viewlet.setDom2';
+const SetUid = 'Viewlet.setUid';
-const getCompletionDetailBounds = (completionBounds, borderSize) => {
-  return {
-    x: completionBounds.x + completionBounds.width - borderSize,
-    y: completionBounds.y,
-    width: 100,
-    height: 100
-  };
+const renderFull$4 = (oldState, newState) => {
+  const commands = [...newState.commands];
+  // @ts-ignore
+  newState.commands = [];
+  return commands;
 };
-const getWidgetState = (editor, id) => {
+const render$c = widget => {
+  const commands = renderFull$4(widget.oldState, widget.newState);
+  const wrappedCommands = [];
   const {
-    widgets
-  } = editor;
-  for (const widget of widgets) {
-    if (widget.id === id) {
-      return widget.newState;
+    uid
+  } = widget.newState;
+  for (const command of commands) {
+    if (command[0] === SetDom2 || command[0] === SetCss || command[0] === AppendToBody || command[0] === SetBounds2 || command[0] === RegisterEventListeners || command[0] === SetSelectionByName || command[0] === SetValueByName || command[0] === SetFocusContext || command[0] === SetUid || command[0] === 'Viewlet.focusSelector') {
+      wrappedCommands.push(command);
+    } else {
+      wrappedCommands.push(['Viewlet.send', uid, ...command]);
     }
   }
-  return undefined;
+  return wrappedCommands;
 };
-const getCompletionState = editor => {
-  return getWidgetState(editor, Completion);
+const add$7 = widget => {
+  return addWidget$1(widget, 'EditorRename', render$c);
 };
-const openDetails = editor => {
-  const child = getCompletionState(editor);
-  if (!child) {
-    return editor;
-  }
-  // TODO avoid closure
-  const newStateGenerator = state => {
-    const borderSize = 1;
-    const newestState = {
+const remove$7 = widget => {
+  return [['Viewlet.dispose', widget.newState.uid]];
+};
+const createFn = key => {
+  const fn = async state => {
+    const {
+      uid
+    } = state;
+    await invoke$3(`Completions.${key}`, uid);
+    const diff = await invoke$3('Completions.diff2', uid);
+    const commands = await invoke$3('Completions.render2', uid, diff);
+    return {
       ...state,
-      content: 'abc',
-      ...getCompletionDetailBounds(child, borderSize)
+      commands
     };
-    return newestState;
-  };
-  return addWidgetToEditor(CompletionDetail, CompletionDetail$1, editor, create, newStateGenerator);
-};
-const getEdits = async (editor, completionItem) => {
-  const child = getCompletionState(editor);
-  // @ts-ignore
-  const {
-    leadingWord} = child;
-  const word = completionItem.label;
-  const resolvedItem = await resolveCompletion(editor, word, completionItem);
-  const inserted = resolvedItem ? resolvedItem.snippet : word;
-  // TODO type and dispose commands should be sent to renderer process at the same time
-  const {
-    selections
-  } = editor;
-  const [startRowIndex, startColumnIndex] = selections;
-  const leadingWordLength = leadingWord.length;
-  const replaceRange$1 = new Uint32Array([startRowIndex, startColumnIndex - leadingWordLength, startRowIndex, startColumnIndex]);
-  const changes = replaceRange(editor, replaceRange$1, [inserted], '');
-  return changes;
-};
-const select = async (editor, completionItem) => {
-  const changes = await getEdits(editor, completionItem);
-  const index = editor.widgets.indexOf
-  // ViewletModuleId.EditorCompletion
-  ();
-  if (index !== -1) {
-    editor.widgets.splice(index, 1);
-    editor.completionState = None$1;
-    editor.completionUid = 0;
-  }
-  // TODO dispose completion widget
-  // TODO apply edit in editor worker instead of asking renderer worker
-  // await RendererWorker.invoke('Viewlet.dispose', state.uid)
-  const {
-    widgets
-  } = editor;
-  const newWidgets = removeEditorWidget(widgets, Completion);
-  const intermediateEditor = await applyEdit(editor, changes);
-  return {
-    ...intermediateEditor,
-    widgets: newWidgets
   };
+  return fn;
 };
-const selectIndex = (editor, index) => {
-  const child = getCompletionState(editor);
-  if (!child) {
-    return editor;
-  }
-  const {
-    items
-  } = child;
-  if (index === -1) {
-    return editor;
-  }
-  if (index > items.length) {
-    throw new Error('index too large');
-  }
-  const actualIndex = index;
-  const completionItem = items[actualIndex];
-  return select(editor, completionItem);
-};
-const selectCurrent = editor => {
-  const child = getCompletionState(editor);
-  if (!child) {
-    return editor;
+const createFns = keys => {
+  const fns = Object.create(null);
+  for (const key of keys) {
+    fns[key] = createFn(key);
   }
-  const {
-    focusedIndex
-  } = child;
-  return selectIndex(editor, focusedIndex);
-};
-const getCompletionDetailState = editor => {
-  return getWidgetState(editor, CompletionDetail);
+  return fns;
 };
+const {
+  focusFirst,
+  focusIndex: focusIndex$1,
+  focusLast,
+  focusNext: focusNext$1,
+  focusPrevious,
+  handleEditorBlur,
+  handleEditorClick,
+  handleEditorDeleteLeft: handleEditorDeleteLeft$1,
+  handleEditorType: handleEditorType$1,
+  openDetails,
+  selectCurrent,
+  selectIndex,
+  toggleDetails,
+  closeDetails,
+  handleWheel,
+  close
+} = createFns(['handleEditorType', 'focusFirst', 'focusNext', 'focusPrevious', 'focusLast', 'handleEditorDeleteLeft', 'openDetails', 'focusIndex', 'handleEditorBlur', 'handleEditorClick', 'openDetails', 'selectCurrent', 'selectIndex', 'toggleDetails', 'closeDetails', 'handleWheel', 'close']);
-const toggleDetails = editor => {
-  const child = getCompletionDetailState(editor);
-  if (!child) {
-    return openDetails(editor);
-  }
-  return closeDetails(editor);
+const EditorCompletionWidget = {
+  __proto__: null,
+  add: add$7,
+  close,
+  closeDetails,
+  focusFirst,
+  focusIndex: focusIndex$1,
+  focusLast,
+  focusNext: focusNext$1,
+  focusPrevious,
+  handleEditorBlur,
+  handleEditorClick,
+  handleEditorDeleteLeft: handleEditorDeleteLeft$1,
+  handleEditorType: handleEditorType$1,
+  handleWheel,
+  openDetails,
+  remove: remove$7,
+  render: render$c,
+  selectCurrent,
+  selectIndex,
+  toggleDetails
 };
 const loadContent = async (editorUid, state, position) => {
@@ -8331,22 +7824,16 @@ const handleSashPointerUp = (state, eventX, eventY) => {
 const CodeGeneratorInput$1 = 'CodeGeneratorInput';
 const CodeGeneratorMessage = 'CodeGeneratorMessage';
 const CodeGeneratorWidget = 'CodeGeneratorWidget';
-const ColoredMaskIcon = 'ColoredMaskIcon';
 const DiagnosticError = 'DiagnosticError';
 const DiagnosticWarning = 'DiagnosticWarning';
 const CompletionDetailCloseButton = 'CompletionDetailCloseButton';
 const CompletionDetailContent = 'CompletionDetailContent';
 const Diagnostic = 'Diagnostic';
-const EditorCompletionItem = 'EditorCompletionItem';
-const EditorCompletionItemDeprecated = 'EditorCompletionItemDeprecated';
-const EditorCompletionItemFocused = 'EditorCompletionItemFocused';
-const EditorCompletionItemHighlight = 'EditorCompletionItemHighlight';
 const EditorCursor = 'EditorCursor';
 const EditorRow = 'EditorRow';
 const EditorSelection = 'EditorSelection';
 const EditorSourceActions = 'EditorSourceActions';
 const EditorSourceActionsList = 'EditorSourceActionsList';
-const FileIcon = 'FileIcon';
 const HoverDisplayString = 'HoverDisplayString';
 const HoverDocumentation = 'HoverDocumentation';
 const HoverEditorRow = 'HoverEditorRow';
@@ -8355,7 +7842,6 @@ const HoverProblemDetail = 'HoverProblemDetail';
 const HoverProblemMessage = 'HoverProblemMessage';
 const IconClose = 'IconClose';
 const InputBox = 'InputBox';
-const Label = 'Label';
 const MaskIcon = 'MaskIcon';
 const MaskIconSymbolFile = 'MaskIconSymbolFile';
 const SourceActionHeading = 'SourceActionHeading';
@@ -8383,7 +7869,6 @@ const Div = 4;
 const Input = 6;
 const Span = 8;
 const Text = 12;
-const Img = 17;
 const text = data => {
   return {
@@ -8469,21 +7954,6 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   return dom;
 };
-const AppendToBody = 'Viewlet.appendToBody';
-const Focus = 'focus';
-const RegisterEventListeners = 'Viewlet.registerEventListeners';
-const SetSelectionByName = 'Viewlet.setSelectionByName';
-const SetValueByName = 'Viewlet.setValueByName';
-const SetFocusContext = 'Viewlet.setFocusContext';
-const SetBounds = 'setBounds';
-const SetBounds2 = 'Viewlet.setBounds';
-const SetContentHeight = 'setContentHeight';
-const SetCss = 'Viewlet.setCss';
-const SetDom2 = 'Viewlet.setDom2';
-const SetNegativeMargin = 'setNegativeMargin';
-const SetScrollBar = 'setScrollBar';
-const SetUid = 'Viewlet.setUid';
 const renderHoverDom = {
   isEqual(oldState, newState) {
     return oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.diagnostics === newState.diagnostics;
@@ -8493,7 +7963,7 @@ const renderHoverDom = {
     return [/* method */SetDom2, dom];
   }
 };
-const renderBounds$4 = {
+const renderBounds$3 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y;
   },
@@ -8507,10 +7977,10 @@ const renderBounds$4 = {
     return [SetBounds, x, y, width, height];
   }
 };
-const render$d = [renderHoverDom, renderBounds$4];
+const render$b = [renderHoverDom, renderBounds$3];
 const renderHover = (oldState, newState) => {
   const commands = [];
-  for (const item of render$d) {
+  for (const item of render$b) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -8536,39 +8006,19 @@ const focusNext = state => {
   return focusIndex(state, nextIndex);
 };
-const launchCompletionWorker = async () => {
-  const name = 'Completion Worker';
-  const {
-    port1,
-    port2
-  } = getPortTuple();
-  await invokeAndTransfer('IpcParent.create', {
-    method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url: 'completionWorkerMain.js',
-    name: name,
-    raw: true,
-    port: port1
-  });
-  const rpc = await MessagePortRpcParent.create({
-    commandMap: {},
-    messagePort: port2,
-    isMessagePortOpen: true
-  });
-  port2.start();
-  await rpc.invoke('Completions.initialize');
-  return rpc;
-};
-let workerPromise;
-const getOrCreate = () => {
-  if (!workerPromise) {
-    workerPromise = launchCompletionWorker();
+const getWidgetInvoke = widgetId => {
+  switch (widgetId) {
+    case ColorPicker:
+      return invoke$6;
+    case Completion:
+      return invoke$3;
+    case Find:
+      return invoke$2;
+    case Rename:
+      return invoke$4;
+    default:
+      return undefined;
   }
-  return workerPromise;
-};
-const invoke = async (method, ...params) => {
-  const worker = await getOrCreate();
-  return await worker.invoke(method, ...params);
 };
 const updateWidget = (editor, widgetId, newState) => {
@@ -8591,20 +8041,8 @@ const updateWidget = (editor, widgetId, newState) => {
   };
 };
-const getInvoke = widgetId => {
-  switch (widgetId) {
-    case ColorPicker:
-      return invoke$6;
-    case Completion:
-      return invoke;
-    case Find:
-      return invoke$4;
-    default:
-      return undefined;
-  }
-};
 const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...params) => {
-  const invoke = getInvoke(widgetId);
+  const invoke = getWidgetInvoke(widgetId);
   const actualMethod = method.slice(name.length + 1);
   const widget = editor.widgets.find(widget => widget.id === widgetId);
   if (!widget) {
@@ -8625,7 +8063,7 @@ const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...par
   }
   const diff = await invoke(`${name}.diff2`, uid);
   const commands = await invoke(`${name}.render2`, uid, diff);
-  const childIndex = latestEditor.widgets.findIndex(isWidget);
+  const childIndex = editor.widgets.findIndex(isWidget);
   if (childIndex === -1) {
     return latestEditor;
   }
@@ -8634,10 +8072,41 @@ const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...par
     ...childWidget.newState,
     commands
   };
-  const newEditor = updateWidget(editor, widgetId, newState);
+  const newEditor = updateWidget(latestEditor, widgetId, newState);
   return newEditor;
 };
+const RE_WORD = /[\w\-]+$/;
+const getWordAtOffset = editor => {
+  const {
+    lines,
+    selections
+  } = editor;
+  const rowIndex = selections[0];
+  const columnIndex = selections[1];
+  const line = lines[rowIndex];
+  const part = line.slice(0, columnIndex);
+  const wordMatch = part.match(RE_WORD);
+  if (wordMatch) {
+    return wordMatch[0];
+  }
+  return '';
+};
+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 getPositionAtCursor = editorUid => {
   const editor = getEditor(editorUid);
   return getPositionAtCursor$1(editor);
@@ -8673,29 +8142,36 @@ const getSelections2 = editorUid => {
   } = editor;
   return selections;
 };
-const closeFind2 = async editorUid => {
-  // console.log('close find')
+const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
   const editor = getEditor(editorUid);
+  const invoke = getWidgetInvoke(widgetId);
   const {
     widgets
   } = editor;
-  const index = widgets.findIndex(widget => widget.id === Find);
+  const index = widgets.findIndex(widget => widget.id === widgetId);
   if (index === -1) {
     return;
   }
-  const findWidget = widgets[index];
-  await invoke$4('FindWidget.dispose', findWidget.newState.uid);
+  await invoke(`${widgetName}.dispose`);
   const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
-  // TODO transfer focus to editor
   const newEditor = {
     ...editor,
     widgets: newWidgets,
     focused: true
   };
   set$4(editorUid, editor, newEditor);
-  // console.log('before rerender')
-  // await RendererWorker.invoke('Editor.rerender', editorUid)
-  // console.log('after rerender')
+  await setFocus(FocusEditorText);
+  if (unsetAdditionalFocus$1) {
+    await unsetAdditionalFocus(unsetAdditionalFocus$1);
+  }
+};
+const closeFind2 = async editorUid => {
+  await closeWidget2(editorUid, Find, 'FindWidget', 0);
+};
+const applyEdits2 = async (editorUid, edits) => {
+  const editor = getEditor(editorUid);
+  const newEditor = await applyEdit(editor, edits);
+  set$4(editorUid, editor, newEditor);
 };
 const pending = Object.create(null);
@@ -8792,20 +8268,6 @@ const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
 const Alt = 1 << 9 >>> 0;
-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 getKeyBindings = () => {
   return [{
     key: Escape,
@@ -8913,7 +8375,7 @@ const getKeyBindings = () => {
     when: FocusEditorCompletions
   }, {
     key: Escape,
-    command: 'Editor.closeCompletion',
+    command: 'EditorCompletion.close',
     when: FocusEditorCompletions
   }, {
     key: End,
@@ -9346,7 +8808,7 @@ const moveLineUp = editor => {
 };
 const Link$1 = 'Link';
-const Function$1 = 'Function';
+const Function = 'Function';
 const Parameter = 'Parameter';
 const Type = 'Type';
 const VariableName = 'VariableName';
@@ -9405,7 +8867,7 @@ const getDecorationClassName = type => {
     case Ts3073:
     case Ts3077:
     case Ts3088:
-      return Function$1;
+      return Function;
     case Ts1792:
     case Ts1793:
       return Parameter;
@@ -9576,10 +9038,10 @@ const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncr
         languageId,
         invalidStartIndex
       };
-      return invoke$2('GetTokensViewport.getTokensViewport', slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
+      return invoke$1('GetTokensViewport.getTokensViewport', slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
     }
     // TODO only send needed lines of text
-    return invoke$2('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
+    return invoke$1('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
   }
   return getTokensViewport(editor, startLineIndex, endLineIndex);
 };
@@ -9728,7 +9190,6 @@ const getLineInfoDefault = (line, tokenResults, embeddedResults, decorations, To
       const decorationType = decorations[++decorationIndex];
       // @ts-ignore
       decorations[++decorationIndex];
-      // console.log('MATCHING DECORATION', {
       //   decorationIndex,
       //   decorationLength,
       //   decorationType,
@@ -9936,7 +9397,7 @@ const getIncrementalEdits = async (oldState, newState) => {
       } = newState;
       const oldLine = oldState.lines[rowIndex];
       const newLine = lines[rowIndex];
-      const incrementalEdits = await invoke$2('TokenizeIncremental.tokenizeIncremental', newState.uid, newState.languageId, oldLine, newLine, rowIndex, newState.minLineY);
+      const incrementalEdits = await invoke$1('TokenizeIncremental.tokenizeIncremental', newState.uid, newState.languageId, oldLine, newLine, rowIndex, newState.minLineY);
       if (incrementalEdits && incrementalEdits.length === 1) {
         return incrementalEdits;
       }
@@ -9964,7 +9425,7 @@ const getSelectionsVirtualDom = selections => {
   return dom;
 };
-const addWidget$1 = widget => {
+const addWidget = widget => {
   const module = get$5(widget.id);
   if (!module) {
     throw new Error('unsupported widget');
@@ -10114,7 +9575,7 @@ const renderWidgets = {
     }
     const addCommands = [];
     for (const addedWidget of addedWidgets) {
-      const childCommands = addWidget$1(addedWidget);
+      const childCommands = addWidget(addedWidget);
       if (childCommands.length > 0) {
         addCommands.push(...childCommands);
       }
@@ -10138,7 +9599,7 @@ const renderWidgets = {
   },
   multiple: true
 };
-const render$c = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
+const render$a = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets];
 const renderEditor = async id => {
   const instance = get$4(id);
   if (!instance) {
@@ -10150,7 +9611,7 @@ const renderEditor = async id => {
   } = instance;
   const commands = [];
   set$4(id, newState, newState);
-  for (const item of render$c) {
+  for (const item of render$a) {
     if (!item.isEqual(oldState, newState)) {
       const result = await item.apply(oldState, newState);
       // @ts-ignore
@@ -10216,7 +9677,7 @@ const keep = [
 // 'ColorPicker.handleSliderPointerDown',
 // 'ColorPicker.handleSliderPointerMove',
 // 'ColorPicker.loadContent',
-'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'Editor.getKeyBindings', 'Editor.getPositionAtCursor', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getLines2', 'Editor.closeFind2', 'Editor.getSelections2', 'Editor.getQuickPickMenuEntries',
+'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'Editor.getKeyBindings', 'Editor.getPositionAtCursor', 'Editor.getWordAt2', 'Editor.getWordAtOffset2', 'Editor.getWordBefore2', 'Editor.getLines2', 'Editor.applyEdit2', 'Editor.applyEdits2', 'Editor.closeFind2', 'Editor.closeWidget2', 'Editor.getSelections2', 'Editor.getQuickPickMenuEntries',
 // 'ColorPicker.render',
 'Editor.getText', 'Editor.getSelections', 'Font.ensure', 'SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize', 'ActivateByEvent.activateByEvent'];
@@ -10300,14 +9761,13 @@ const wrapCommands = commands => {
 const commandMap = {
   'ActivateByEvent.activateByEvent': activateByEvent,
   'CodeGenerator.accept': codeGeneratorAccept,
-  'ColorPicker.loadContent': loadContent$3,
+  'ColorPicker.loadContent': loadContent$2,
   'Editor.addCursorAbove': addCursorAbove,
   'Editor.addCursorBelow': addCursorBelow,
   'Editor.applyEdit': applyEdit,
   'Editor.braceCompletion': braceCompletion,
   'Editor.cancelSelection': cancelSelection,
   'Editor.closeCodeGenerator': closeCodeGenerator,
-  'Editor.closeCompletion': closeCompletion,
   'Editor.closeFind': closeFind,
   'Editor.closeRename': closeRename,
   'Editor.closeSourceAction': closeSourceAction,
@@ -10342,24 +9802,26 @@ const commandMap = {
   'Editor.deleteRight': deleteCharacterRight,
   'Editor.deleteWordLeft': deleteWordLeft,
   'Editor.deleteWordPartLeft': deleteWordPartLeft,
+  'Editor.applyEdit2': applyEdits2,
+  'Editor.closeFind2': closeFind2,
+  'Editor.closeWidget2': closeWidget2,
   'Editor.deleteWordPartRight': deleteWordPartRight,
   'Editor.deleteWordRight': deleteWordRight,
   'Editor.executeWidgetCommand': executeWidgetCommand,
   'Editor.findAllReferences': findAllReferences,
   'Editor.format': format,
   'Editor.getKeyBindings': getKeyBindings,
+  'Editor.getLines2': getLines2,
   'Editor.getPositionAtCursor': getPositionAtCursor,
   'Editor.getQuickPickMenuEntries': getQuickPickMenuEntries,
   'Editor.getSelections': getSelections,
+  'Editor.getSelections2': getSelections2,
   'Editor.getText': getText,
   'Editor.getWordAt': getWordAt$1,
   'Editor.getWordAt2': getWordAt,
   'Editor.getWordAtOffset2': getWordAtOffset2,
-  'Editor.getWordBefore2': getWordBefore2,
   'Editor.getWordBefore': getWordBefore,
-  'Editor.getLines2': getLines2,
-  'Editor.getSelections2': getSelections2,
-  'Editor.closeFind2': closeFind2,
+  'Editor.getWordBefore2': getWordBefore2,
   'Editor.goToDefinition': goToDefinition,
   'Editor.goToTypeDefinition': goToTypeDefinition,
   'Editor.handleBeforeInput': handleBeforeInput,
@@ -10400,6 +9862,21 @@ const commandMap = {
   'Editor.openCodeGenerator': openCodeGenerator,
   'Editor.openColorPicker': openColorPicker,
   'Editor.openCompletion': openCompletion,
+  'EditorCompletion.closeDetails': closeDetails,
+  'EditorCompletion.focusFirst': focusFirst,
+  'EditorCompletion.focusIndex': focusIndex$1,
+  'EditorCompletion.focusNext': focusNext$1,
+  'EditorCompletion.focusPrevious': focusPrevious,
+  'EditorCompletion.handleEditorBlur': handleEditorBlur,
+  'EditorCompletion.handleEditorClick': handleEditorClick,
+  'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft$1,
+  'EditorCompletion.handleEditorType': handleEditorType$1,
+  'EditorCompletion.handleWheel': handleWheel,
+  'EditorCompletion.openDetails': openDetails,
+  'EditorCompletion.selectCurrent': selectCurrent,
+  'EditorCompletion.close': close,
+  'EditorCompletion.selectIndex': selectIndex,
+  'EditorCompletion.toggleDetails': toggleDetails,
   'Editor.openFind': openFind,
   'Editor.openFind2': openFind2,
   'Editor.openRename': openRename,
@@ -10429,7 +9906,7 @@ const commandMap = {
   'Editor.selectWordRight': selectWordRight,
   'Editor.setDecorations': setDecorations,
   'Editor.setDelta': setDelta,
-  'Editor.setDeltaY': setDeltaY$1,
+  'Editor.setDeltaY': setDeltaY,
   'Editor.setLanguageId': setLanguageId,
   'Editor.setSelections': setSelections,
   'Editor.showHover': showHover,
@@ -10446,24 +9923,8 @@ const commandMap = {
   'Editor.undo': undo,
   'Editor.unIndent': editorUnindent,
   'Editor.updateDiagnostics': updateDiagnostics,
-  'EditorCompletion.advance': advance,
-  'EditorCompletion.closeDetails': closeDetails,
-  'EditorCompletion.focusFirst': focusFirst,
-  'EditorCompletion.focusIndex': focusIndex$1,
-  'EditorCompletion.focusNext': focusNext$1,
-  'EditorCompletion.focusPrevious': focusPrevious,
-  'EditorCompletion.handleEditorBlur': handleEditorBlur,
-  'EditorCompletion.handleEditorClick': handleEditorClick,
-  'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft$2,
-  'EditorCompletion.handleEditorType': handleEditorType$2,
-  'EditorCompletion.handleWheel': handleWheel,
-  'EditorCompletion.loadContent': loadContent$2,
-  'EditorCompletion.openDetails': openDetails,
-  'EditorCompletion.selectCurrent': selectCurrent,
-  'EditorCompletion.selectIndex': selectIndex,
-  'EditorCompletion.toggleDetails': toggleDetails,
   'EditorSourceActions.focusNext': focusNext,
-  'FindWidget.close': close,
+  'FindWidget.close': close$1,
   'FindWidget.loadContent': loadContent$1,
   'Font.ensure': ensure,
   'Hover.getHoverInfo': getEditorHoverInfo,
@@ -10523,55 +9984,13 @@ const listen$1 = async ({
   return ipc;
 };
-const listen = async () => {
-  register(commandMap);
-  const ipc = await listen$1({
-    method: Auto()
-  });
-  handleIpc(ipc);
-  listen$5(ipc);
-};
-const isFunctional = widgetId => {
-  switch (widgetId) {
-    case ColorPicker:
-    case Rename:
-    case Find:
-      return true;
-    default:
-      return false;
-  }
-};
-const addWidget = (widget, id, render) => {
-  const commands = render(widget);
-  // TODO how to generate a unique integer id
-  // that doesn't collide with ids created in renderer worker?
-  // @ts-ignore
-  const {
-    uid
-  } = widget.newState;
-  const allCommands = [];
-  allCommands.push(['Viewlet.createFunctionalRoot', id, uid, isFunctional(widget.id)]);
-  allCommands.push(...commands);
-  if (isFunctional(widget.id)) {
-    allCommands.push(['Viewlet.appendToBody', uid]);
-  } else {
-    allCommands.push(['Viewlet.send', uid, 'appendWidget']);
-  }
-  const focusCommandIndex = allCommands.findIndex(command => {
-    return command[2] === 'focus' || command[0] === 'Viewlet.focusSelector';
-  });
-  // TODO have separate rendering functions, e.g.
-  // 1. renderDom
-  // 2. renderAriaAnnouncement
-  // 3. renderFocus
-  // to ensure that focus is always after the element is added to the dom
-  if (focusCommandIndex !== -1) {
-    const command = allCommands[focusCommandIndex];
-    allCommands.splice(focusCommandIndex, 1);
-    allCommands.push(command);
-  }
-  return allCommands;
+const listen = async () => {
+  register(commandMap);
+  const ipc = await listen$1({
+    method: Auto()
+  });
+  handleIpc(ipc);
+  listen$5(ipc);
 };
 const removeWidget = widget => {
@@ -10610,7 +10029,7 @@ const renderContent$1 = {
     return [SetDom2, newState.uid, dom];
   }
 };
-const renderBounds$3 = {
+const renderBounds$2 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
   },
@@ -10632,10 +10051,10 @@ const renderFocus = {
     return [Focus, '.CodeGeneratorInput', newState.focusSource];
   }
 };
-const render$b = [renderContent$1, renderBounds$3, renderFocus];
-const renderFull$4 = (oldState, newState) => {
+const render$9 = [renderContent$1, renderBounds$2, renderFocus];
+const renderFull$3 = (oldState, newState) => {
   const commands = [];
-  for (const item of render$b) {
+  for (const item of render$9) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -10643,8 +10062,8 @@ const renderFull$4 = (oldState, newState) => {
   return commands;
 };
-const render$a = widget => {
-  const commands = renderFull$4(widget.oldState, widget.newState);
+const render$8 = widget => {
+  const commands = renderFull$3(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
@@ -10659,27 +10078,27 @@ const render$a = widget => {
   }
   return wrappedCommands;
 };
-const add$7 = widget => {
-  return addWidget(widget, 'EditorCodeGenerator', render$a);
+const add$6 = widget => {
+  return addWidget$1(widget, 'EditorCodeGenerator', render$8);
 };
-const remove$7 = removeWidget;
+const remove$6 = removeWidget;
 const EditorCodeGeneratorWidget = {
   __proto__: null,
-  add: add$7,
-  remove: remove$7,
-  render: render$a
+  add: add$6,
+  remove: remove$6,
+  render: render$8
 };
-const renderFull$3 = (oldState, newState) => {
+const renderFull$2 = (oldState, newState) => {
   const commands = [...newState.commands];
   // @ts-ignore
   newState.commands = [];
   return commands;
 };
-const render$9 = widget => {
-  const commands = renderFull$3(widget.oldState, widget.newState);
+const render$7 = widget => {
+  const commands = renderFull$2(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
@@ -10693,18 +10112,18 @@ const render$9 = widget => {
   }
   return wrappedCommands;
 };
-const add$6 = widget => {
-  return addWidget(widget, 'ColorPicker', render$9);
+const add$5 = widget => {
+  return addWidget$1(widget, 'ColorPicker', render$7);
 };
-const remove$6 = removeWidget;
+const remove$5 = removeWidget;
 const Commands$1 = {};
 const EditorColorPickerWidget = {
   __proto__: null,
   Commands: Commands$1,
-  add: add$6,
-  remove: remove$6,
-  render: render$9
+  add: add$5,
+  remove: remove$5,
+  render: render$7
 };
 const getCompletionDetailVirtualDom = content => {
@@ -10748,7 +10167,7 @@ const renderContent = {
     return [SetDom2, newState.uid, dom];
   }
 };
-const renderBounds$2 = {
+const renderBounds$1 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
   },
@@ -10762,13 +10181,29 @@ const renderBounds$2 = {
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
   }
 };
-const render$8 = [renderContent, renderBounds$2];
-const renderFull$2 = (oldState, newState) => {
-  return renderParts(render$8, oldState, newState);
+const render$6 = [renderContent, renderBounds$1];
+const renderFull$1 = (oldState, newState) => {
+  return renderParts(render$6, oldState, newState);
 };
-const render$7 = widget => {
-  const commands = renderFull$2(widget.oldState, widget.newState);
+const getWidgetState = (editor, id) => {
+  const {
+    widgets
+  } = editor;
+  for (const widget of widgets) {
+    if (widget.id === id) {
+      return widget.newState;
+    }
+  }
+  return undefined;
+};
+const getCompletionState = editor => {
+  return getWidgetState(editor, Completion);
+};
+const render$5 = widget => {
+  const commands = renderFull$1(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
@@ -10782,11 +10217,11 @@ const render$7 = widget => {
   }
   return wrappedCommands;
 };
-const add$5 = widget => {
-  return addWidget(widget, 'EditorCompletionDetails', render$7);
+const add$4 = widget => {
+  return addWidget$1(widget, 'EditorCompletionDetails', render$5);
 };
-const remove$5 = removeWidget;
-const handleEditorType$1 = (editor, state) => {
+const remove$4 = removeWidget;
+const handleEditorType = (editor, state) => {
   const completionState = getCompletionState(editor);
   if (!completionState) {
     return editor;
@@ -10800,7 +10235,7 @@ const handleEditorType$1 = (editor, state) => {
     x: detailX
   };
 };
-const handleEditorDeleteLeft$1 = (editor, state) => {
+const handleEditorDeleteLeft = (editor, state) => {
   const completionState = getCompletionState(editor);
   if (!completionState) {
     return editor;
@@ -10816,357 +10251,6 @@ const handleEditorDeleteLeft$1 = (editor, state) => {
 };
 const EditorCompletionDetailWidget = {
-  __proto__: null,
-  add: add$5,
-  handleEditorDeleteLeft: handleEditorDeleteLeft$1,
-  handleEditorType: handleEditorType$1,
-  remove: remove$5,
-  render: render$7
-};
-const None = 'none';
-const Option = 'option';
-const getFileIconVirtualDom = icon => {
-  return {
-    type: Img,
-    className: FileIcon,
-    src: icon,
-    role: None,
-    childCount: 0
-  };
-};
-const getIconDom = (fileIcon, symbolName) => {
-  if (fileIcon) {
-    return getFileIconVirtualDom(fileIcon);
-  }
-  return {
-    type: Div,
-    className: `${ColoredMaskIcon} ${symbolName}`,
-    childCount: 0
-  };
-};
-const label1 = {
-  type: Div,
-  className: Label,
-  childCount: 1
-};
-const completionHighlight = {
-  type: Span,
-  className: EditorCompletionItemHighlight,
-  childCount: 1
-};
-const getHighlightedLabelDom = (label, highlights) => {
-  if (highlights.length === 0) {
-    return [label1, text(label)];
-  }
-  const dom = [];
-  const labelDom = {
-    type: Div,
-    className: Label,
-    childCount: 0
-  };
-  dom.push(labelDom);
-  let position = 0;
-  for (let i = 0; i < highlights.length; i += 2) {
-    const highlightStart = highlights[i];
-    const highlightEnd = highlights[i + 1];
-    if (position < highlightStart) {
-      const beforeText = label.slice(position, highlightStart);
-      labelDom.childCount++;
-      dom.push(text(beforeText));
-    }
-    const highlightText = label.slice(highlightStart, highlightEnd);
-    labelDom.childCount++;
-    dom.push(completionHighlight, text(highlightText));
-    position = highlightEnd;
-  }
-  if (position < label.length) {
-    const afterText = label.slice(position);
-    labelDom.childCount++;
-    dom.push(text(afterText));
-  }
-  return dom;
-};
-const getCompletionItemVirtualDom = visibleItem => {
-  const {
-    top,
-    label,
-    symbolName,
-    highlights,
-    focused,
-    deprecated,
-    fileIcon
-  } = visibleItem;
-  let className = EditorCompletionItem;
-  if (focused) {
-    className += ' ' + EditorCompletionItemFocused;
-  }
-  if (deprecated) {
-    className += ' ' + EditorCompletionItemDeprecated;
-  }
-  return [{
-    type: Div,
-    role: Option,
-    className,
-    top,
-    childCount: 2
-  }, getIconDom(fileIcon, symbolName), ...getHighlightedLabelDom(label, highlights)];
-};
-const getCompletionItemsVirtualDom = visibleItems => {
-  if (visibleItems.length === 0) {
-    return [{
-      type: Div,
-      childCount: 1
-    }, text(noResults())];
-  }
-  const root = {
-    type: Div,
-    childCount: visibleItems.length
-  };
-  const dom = [root, ...visibleItems.flatMap(getCompletionItemVirtualDom)];
-  return dom;
-};
-const Property = 1;
-const Value = 2;
-const Function = 3;
-const Variable = 4;
-const Keyword = 5;
-const Folder = 6;
-const File = 7;
-const Field = 8;
-const SymbolProperty = 'SymbolProperty';
-const SymbolValue = 'SymbolValue';
-const SymbolFunction = 'SymbolFunction';
-const SymbolVariable = 'SymbolVariable';
-const SymbolKeyword = 'SymbolKeyword';
-const SymbolDefault = 'SymbolDefault';
-const SymbolField = 'SymbolField';
-const SymbolNone = '';
-const getSymbolName = kind => {
-  switch (kind) {
-    case Property:
-      return SymbolProperty;
-    case Value:
-      return SymbolValue;
-    case Function:
-      return SymbolFunction;
-    case Variable:
-      return SymbolVariable;
-    case Keyword:
-      return SymbolKeyword;
-    case Field:
-      return SymbolField;
-    case File:
-      return SymbolNone;
-    default:
-      return SymbolDefault;
-  }
-};
-// TODO
-const getCompletionFileIcon = kind => {
-  switch (kind) {
-    case File:
-      return EmptyString$1;
-    case Folder:
-      return EmptyString$1;
-    default:
-      return EmptyString$1;
-  }
-};
-const getHighlights = item => {
-  const {
-    matches
-  } = item;
-  return matches.slice(1);
-};
-const getLabel = item => {
-  return item.label;
-};
-const getVisibleIem = (item, itemHeight, leadingWord, i, focusedIndex) => {
-  return {
-    label: getLabel(item),
-    symbolName: getSymbolName(item.kind),
-    top: i * itemHeight,
-    highlights: getHighlights(item),
-    focused: i === focusedIndex,
-    deprecated: item.flags & Deprecated,
-    fileIcon: getCompletionFileIcon(item.kind)
-  };
-};
-const getVisibleItems = (filteredItems, itemHeight, leadingWord, minLineY, maxLineY, focusedIndex) => {
-  const visibleItems = [];
-  for (let i = minLineY; i < maxLineY; i++) {
-    const filteredItem = filteredItems[i];
-    visibleItems.push(getVisibleIem(filteredItem, itemHeight, leadingWord, i, focusedIndex));
-  }
-  return visibleItems;
-};
-const renderItems = {
-  isEqual(oldState, newState) {
-    return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex;
-  },
-  apply(oldState, newState) {
-    const visibleItems = getVisibleItems(newState.items, newState.itemHeight, newState.leadingWord, newState.minLineY, newState.maxLineY, newState.focusedIndex);
-    const dom = getCompletionItemsVirtualDom(visibleItems);
-    return ['setDom', dom];
-  }
-};
-const renderBounds$1 = {
-  isEqual(oldState, newState) {
-    return oldState.items === newState.items && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.x === newState.x && oldState.y === newState.y;
-  },
-  apply(oldState, newState) {
-    const {
-      x,
-      y,
-      width,
-      height
-    } = newState;
-    return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
-  }
-};
-const renderHeight = {
-  isEqual(oldState, newState) {
-    return oldState.items.length === newState.items.length;
-  },
-  apply(oldState, newState) {
-    const {
-      itemHeight
-    } = newState;
-    const contentHeight = newState.items.length * itemHeight;
-    return [/* method */SetContentHeight, /* contentHeight */contentHeight];
-  }
-};
-const renderNegativeMargin = {
-  isEqual(oldState, newState) {
-    return oldState.deltaY === newState.deltaY;
-  },
-  apply(oldState, newState) {
-    return [/* method */SetNegativeMargin, /* negativeMargin */-newState.deltaY];
-  }
-};
-const renderScrollBar = {
-  isEqual(oldState, newState) {
-    return oldState.negativeMargin === newState.negativeMargin && oldState.deltaY === newState.deltaY && oldState.height === newState.height && oldState.finalDeltaY === newState.finalDeltaY && oldState.items.length === newState.items.length;
-  },
-  apply(oldState, newState) {
-    const total = newState.items.length;
-    const contentHeight = total * newState.itemHeight;
-    const scrollBarHeight = getScrollBarSize(newState.height, contentHeight, newState.minimumSliderSize);
-    const scrollBarY = getScrollBarY(newState.deltaY, newState.finalDeltaY, newState.height - newState.headerHeight, scrollBarHeight);
-    return [/* method */SetScrollBar, /* scrollBarY */scrollBarY, /* scrollBarHeight */scrollBarHeight];
-  }
-};
-const render$6 = [renderItems, renderBounds$1, renderHeight, renderNegativeMargin, renderScrollBar];
-const renderCompletion = (oldState, newState) => {
-  const commands = [];
-  for (const item of render$6) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
-  }
-  return commands;
-};
-const render$5 = widget => {
-  const commands = renderCompletion(widget.oldState, widget.newState);
-  const wrappedCommands = [];
-  const {
-    uid
-  } = widget.newState;
-  for (const command of commands) {
-    wrappedCommands.push(['Viewlet.send', uid, ...command]);
-  }
-  return wrappedCommands;
-};
-const add$4 = widget => {
-  const commands = render$5(widget);
-  const id = 'EditorCompletion';
-  // TODO how to generate a unique integer id
-  // that doesn't collide with ids created in renderer worker?
-  const {
-    uid
-  } = widget.newState;
-  const allCommands = [];
-  allCommands.push(['Viewlet.create', id, uid]);
-  allCommands.push(...commands);
-  return allCommands;
-};
-const remove$4 = removeWidget;
-const handleEditorType = (editor, state) => {
-  const {
-    unfilteredItems,
-    itemHeight,
-    maxHeight
-  } = state;
-  const {
-    x,
-    y,
-    rowIndex,
-    columnIndex
-  } = getPositionAtCursor$1(editor);
-  const wordAtOffset = getWordBefore(editor, rowIndex, columnIndex);
-  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
-  const newMinLineY = 0;
-  const newMaxLineY = Math.min(items.length, 8);
-  const height = getListHeight(items.length, itemHeight, maxHeight);
-  const finalDeltaY = items.length * itemHeight - height;
-  return {
-    ...state,
-    items,
-    x,
-    y,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    leadingWord: wordAtOffset,
-    height,
-    finalDeltaY
-  };
-};
-const handleEditorDeleteLeft = (editor, state) => {
-  const {
-    unfilteredItems,
-    itemHeight,
-    maxHeight
-  } = state;
-  const {
-    x,
-    y,
-    rowIndex,
-    columnIndex
-  } = getPositionAtCursor$1(editor);
-  const wordAtOffset = getWordBefore(editor, rowIndex, columnIndex);
-  if (!wordAtOffset) {
-    return undefined;
-  }
-  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
-  const newMaxLineY = Math.min(items.length, 8);
-  const height = getListHeight(items.length, itemHeight, maxHeight);
-  return {
-    ...state,
-    items,
-    x,
-    y,
-    maxLineY: newMaxLineY,
-    leadingWord: wordAtOffset,
-    height
-  };
-};
-const EditorCompletionWidget = {
   __proto__: null,
   add: add$4,
   handleEditorDeleteLeft,
@@ -11175,7 +10259,7 @@ const EditorCompletionWidget = {
   render: render$5
 };
-const renderFull$1 = (oldState, newState) => {
+const renderFull = (oldState, newState) => {
   const commands = [...newState.commands];
   // @ts-ignore
   newState.commands = [];
@@ -11183,7 +10267,7 @@ const renderFull$1 = (oldState, newState) => {
 };
 const render$4 = widget => {
-  const commands = renderFull$1(widget.oldState, widget.newState);
+  const commands = renderFull(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
@@ -11198,7 +10282,7 @@ const render$4 = widget => {
   return wrappedCommands;
 };
 const add$3 = widget => {
-  return addWidget(widget, 'FindWidget', render$4);
+  return addWidget$1(widget, 'FindWidget', render$4);
 };
 const remove$3 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
@@ -11229,7 +10313,7 @@ const render$3 = widget => {
   return wrappedCommands;
 };
 const add$2 = widget => {
-  return addWidget(widget, 'EditorHover', render$3);
+  return addWidget$1(widget, 'EditorHover', render$3);
 };
 const remove$2 = removeWidget;
@@ -11240,15 +10324,8 @@ const EditorHoverWidget = {
   render: render$3
 };
-const renderFull = (oldState, newState) => {
-  const commands = [...newState.commands];
-  // @ts-ignore
-  newState.commands = [];
-  return commands;
-};
 const render$2 = widget => {
-  const commands = renderFull(widget.oldState, widget.newState);
+  const commands = renderFull$4(widget.oldState, widget.newState);
   const wrappedCommands = [];
   const {
     uid
@@ -11263,7 +10340,7 @@ const render$2 = widget => {
   return wrappedCommands;
 };
 const add$1 = widget => {
-  return addWidget(widget, 'EditorRename', render$2);
+  return addWidget$1(widget, 'EditorRename', render$2);
 };
 const remove$1 = removeWidget;
@@ -11399,7 +10476,7 @@ const render = widget => {
   return wrappedCommands;
 };
 const add = widget => {
-  return addWidget(widget, 'EditorSourceActions', render);
+  return addWidget$1(widget, 'EditorSourceActions', render);
 };
 const remove = removeWidget;