@lvce-editor/editor-worker 1.16.0 → 2.1.0

package/dist/editorWorkerMain.js

@@ -109,6 +109,120 @@ const handleSliderPointerMove = (state, x, y) => {
   };
 };
 
+const ColoredMaskIcon = 'ColoredMaskIcon';
+const ColorPicker = 'ColorPicker';
+const ColorPickerBackgroundColor = 'ColorPickerBackgroundColor';
+const ColorPickerDark = 'ColorPickerDark';
+const ColorPickerLight = 'ColorPickerLight';
+const ColorPickerRectangle = 'ColorPickerRectangle';
+const ColorPickerSlider = 'ColorPickerSlider';
+const ColorPickerSliderThumb = 'ColorPickerSliderThumb';
+const Diagnostic = 'Diagnostic';
+const EditorCompletionItem = 'EditorCompletionItem';
+const EditorCompletionItemDeprecated = 'EditorCompletionItemDeprecated';
+const EditorCompletionItemFocused = 'EditorCompletionItemFocused';
+const EditorCompletionItemHighlight = 'EditorCompletionItemHighlight';
+const EditorCursor = 'EditorCursor';
+const EditorRow = 'EditorRow';
+const EditorSelection = 'EditorSelection';
+const FileIcon = 'FileIcon';
+const HoverDisplayString = 'HoverDisplayString';
+const HoverDocumentation = 'HoverDocumentation';
+const HoverEditorRow = 'HoverEditorRow';
+const HoverProblem = 'HoverProblem';
+const HoverProblemDetail = 'HoverProblemDetail';
+const HoverProblemMessage = 'HoverProblemMessage';
+const Label = 'Label';
+const Viewlet = 'Viewlet';
+
+const HandlePointerDown = 'handlePointerDown';
+const HandleSashPointerDown = 'handleSashPointerDown';
+
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
+const Div = 4;
+const Span = 8;
+const Text = 12;
+const Img = 17;
+
+const getColorPickerVirtualDom = () => {
+  return [{
+    type: Div,
+    className: mergeClassNames(Viewlet, ColorPicker),
+    onPointerDown: HandlePointerDown,
+    childCount: 3
+  }, {
+    type: Div,
+    className: ColorPickerRectangle,
+    childCount: 3
+  }, {
+    type: Div,
+    className: ColorPickerBackgroundColor,
+    childCount: 0
+  }, {
+    type: Div,
+    className: ColorPickerLight,
+    childCount: 0
+  }, {
+    type: Div,
+    className: ColorPickerDark,
+    childCount: 0
+  }, {
+    type: Div,
+    className: ColorPickerSlider,
+    childCount: 0
+  }, {
+    type: Div,
+    className: ColorPickerSliderThumb,
+    childCount: 0
+  }];
+};
+
+const SetBounds = 'setBounds';
+const SetColor = 'setColor';
+const SetContentHeight = 'setContentHeight';
+const SetNegativeMargin = 'setNegativeMargin';
+const SetOffsetX = 'setOffsetX';
+const SetScrollBar = 'setScrollBar';
+
+const renderColor = {
+  isEqual(oldState, newState) {
+    return oldState.color === newState.color;
+  },
+  apply(oldState, newState) {
+    return [/* method */SetColor, /* color */newState.color];
+  }
+};
+const renderOffsetX = {
+  isEqual(oldState, newState) {
+    return oldState.offsetX === newState.offsetX;
+  },
+  apply(oldState, newState) {
+    return [/* method */SetOffsetX, /* offsetX */newState.offsetX];
+  }
+};
+const renderColorPickerDom = {
+  isEqual(oldState, newState) {
+    return oldState.min === newState.min && oldState.max === newState.max;
+  },
+  apply(oldState, newState) {
+    const dom = getColorPickerVirtualDom();
+    return ['Viewlet.setDom2', dom];
+  }
+};
+const render$3 = [renderColorPickerDom, renderColor, renderOffsetX];
+const renderColorPicker = async (oldState, newState) => {
+  const commands = [];
+  for (const item of render$3) {
+    if (!item.isEqual(oldState, newState)) {
+      commands.push(item.apply(oldState, newState));
+    }
+  }
+  return commands;
+};
+
 // TODO use numeric enum
 const CompositionUpdate = 'compositionUpdate';
 const ContentEditableInput = 'contentEditableInput';
@@ -1816,7 +1930,8 @@ const createEditor = async ({
     letterSpacing,
     charWidth,
     uid: id,
-    id
+    id,
+    widgets: []
   };
   // TODO avoid creating intermediate editors here
   const newEditor1 = setBounds(editor, x, y, width, height, 9);
@@ -2240,9 +2355,6 @@ const braceCompletion = async (editor, text) => {
   }
 };
 
-// @ts-ignore
-
-// @ts-ignore
 const cancelSelection = editor => {
   const selections = editor.selections;
   if (selections.length === 4 && selections[0] === selections[2] && selections[1] === selections[3]) {
@@ -2253,12 +2365,22 @@ const cancelSelection = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
-const closeCompletion = async editor => {
-  // TODO
-  const completionUid = editor.completionUid;
-  await invoke$3('Viewlet.dispose', completionUid);
-  editor.completionUid = 0;
-  return 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 = [...widgets.slice(0, completionWidgetIndex), ...widgets.slice(completionWidgetIndex + 1)];
+  return {
+    ...editor,
+    widgets: newWidgets
+  };
 };
 
 // @ts-ignore
@@ -3274,7 +3396,8 @@ const UiStrings = {
   EditorCloseColorPicker: 'Editor: Close Color Picker',
   EditorCopyLineDown: 'Editor: Copy Line Down',
   EditorCopyLineUp: 'Editor: Copy Line Up',
-  Replace: 'replace'
+  Replace: 'replace',
+  NoResults: 'No Results'
 };
 const noDefinitionFound = () => {
   return i18nString(UiStrings.NoDefinitionFound);
@@ -3296,6 +3419,9 @@ const noTypeDefinitionFoundFor = word => {
 const noTypeDefinitionFound = () => {
   return i18nString(UiStrings.NoTypeDefinitionFound);
 };
+const noResults = () => {
+  return i18nString(UiStrings.NoResults);
+};
 
 // @ts-ignore
 const goTo = async ({
@@ -4451,71 +4577,544 @@ const moveSelectionPx = (editor, x, y) => {
   return editorMoveSelection(editor, position);
 };
 
-const FindWidget = 'FindWidget';
-const openFind = async state => {
-  await invoke$3('Viewlet.openWidget', FindWidget);
-  return state;
+const OnCompletion = 'onCompletion';
+const OnHover = 'onHover';
+
+// TODO add tests for this
+const activateByEvent = async event => {
+  await invoke$3('ExtensionHostManagement.activateByEvent', event);
 };
 
-const getEditor = editorUid => {
-  const instance = get$6(editorUid);
-  if (!instance) {
-    throw new Error(`editor ${editorUid} not found`);
-  }
-  const {
-    newState
-  } = instance;
-  return newState;
+const execute = async ({
+  editor,
+  args,
+  event,
+  method,
+  noProviderFoundMessage,
+  noProviderFoundResult = undefined
+}) => {
+  const fullEvent = `${event}:${editor.languageId}`;
+  await activateByEvent(fullEvent);
+  const result = await invoke$2(method, editor.uid, ...args);
+  return result;
 };
 
-const getText = editorUid => {
-  const editor = getEditor(editorUid);
+const combineResults = results => {
+  return results[0] ?? [];
+};
+const executeCompletionProvider = (editor, offset) => {
+  return execute({
+    editor,
+    event: OnCompletion,
+    method: CompletionExecute,
+    args: [offset],
+    noProviderFoundMessage: 'no completion provider found',
+    noProviderFoundResult: [],
+    combineResults
+  });
+};
+const combineResultsResolve = items => {
+  return items[0] ?? undefined;
+};
+const executeResolveCompletionItem = (editor, offset, name, completionItem) => {
+  return execute({
+    editor,
+    event: OnCompletion,
+    method: CompletionResolveExecute,
+    args: [offset, name, completionItem],
+    noProviderFoundMessage: 'no completion provider found',
+    noProviderFoundResult: [],
+    combineResults: combineResultsResolve
+  });
+};
+
+// TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
+const getCompletions = async editor => {
   const {
-    lines
+    selections
   } = editor;
-  return lines.join('\n');
+  const rowIndex = selections[0];
+  const columnIndex = selections[1];
+  // Editor.sync(editor)
+  const offset = await offsetAt(editor, rowIndex, columnIndex);
+  const completions = await executeCompletionProvider(editor, offset);
+  return completions;
 };
 
-const organizeImports = async editor => {
-  // TODO ask extension host worker directly
-  const edits = await invoke$3('ExtensionHostOrganizeImports.organizeImports', editor);
-  console.log({
-    edits
-  });
-  return applyDocumentEdits(editor, edits);
+// TODO don't send unnecessary parts of completion item like matches
+const resolveCompletion = async (editor, name, completionItem) => {
+  try {
+    object(editor);
+    string(name);
+    object(completionItem);
+    const rowIndex = editor.selections[0];
+    const columnIndex = editor.selections[1];
+    const offset = await offsetAt(editor, rowIndex, columnIndex);
+    // @ts-ignore
+    const resolvedCompletionItem = await executeResolveCompletionItem(editor, offset, name, completionItem);
+    return resolvedCompletionItem;
+  } catch {
+    return undefined;
+  }
 };
 
-// @ts-ignore
+const None$1 = 1;
 
-// @ts-ignore
-const pasteText = (editor, text) => {
-  const insertedLines = splitLines$2(text);
-  const changes = editorReplaceSelections(editor, insertedLines, EditorPasteText);
-  return scheduleDocumentAndCursorsSelections(editor, changes);
+const EmptyMatches = [];
+
+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 paste = async editor => {
-  const text = await invoke$3('ClipBoard.readText');
-  string(text);
-  return pasteText(editor, text);
+const isLowerCase = char => {
+  return char === char.toLowerCase();
 };
 
-const getErrorMessage$1 = error => {
-  if (!error) {
-    return `Error: ${error}`;
-  }
-  let message = error.message;
-  while (error.cause) {
-    error = error.cause;
-    message += `: ${error}`;
-  }
-  return message;
+const isUpperCase = char => {
+  return char === char.toUpperCase();
 };
-const prepareErrorMessageWithCodeFrame = error => {
-  if (!error) {
-    return {
-      message: error,
-      stack: undefined,
+
+// 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:
+    case Dot:
+      return true;
+  }
+  if (isLowerCase(columnCharBefore) && isUpperCase(columnChar)) {
+    return true;
+  }
+  return false;
+};
+
+// 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, column, wordLength, 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;
+  }
+  return 5;
+};
+
+// 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;
+  }
+  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);
+// @ts-ignore
+createTable(gridSize);
+const filterCompletionItem = (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;
+  }
+  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, column, wordLength, 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;
+  }
+  // printTables(pattern, 0, word, 0)
+  const highlights = traceHighlights(table, arrows, patternLength, wordLength);
+  return highlights;
+};
+
+const Deprecated = 1 << 0;
+
+const addEmptyMatch = item => {
+  return {
+    ...item,
+    matches: EmptyMatches
+  };
+};
+const filterCompletionItems = (completionItems, word) => {
+  if (word === EmptyString) {
+    return completionItems.map(addEmptyMatch);
+  }
+  const filteredCompletions = [];
+  const deprecated = [];
+  for (const completionItem of completionItems) {
+    const {
+      label,
+      flags
+    } = completionItem;
+    const result = filterCompletionItem(word, label);
+    if (result !== EmptyMatches) {
+      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 getFinalDeltaY = (height, itemHeight, itemsLength) => {
+  const contentHeight = itemsLength * itemHeight;
+  const finalDeltaY = Math.max(contentHeight - height, 0);
+  return finalDeltaY;
+};
+
+const getListHeight = (itemsLength, itemHeight, maxHeight) => {
+  number$1(itemsLength);
+  number$1(itemHeight);
+  number$1(maxHeight);
+  if (itemsLength === 0) {
+    return itemHeight;
+  }
+  const totalHeight = itemsLength * itemHeight;
+  return Math.min(totalHeight, maxHeight);
+};
+
+const getEditor = editorUid => {
+  const instance = get$6(editorUid);
+  if (!instance) {
+    throw new Error(`editor ${editorUid} not found`);
+  }
+  const {
+    newState
+  } = instance;
+  return newState;
+};
+
+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 = (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 = (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 = editor.selections[0];
+  const columnIndex = editor.selections[1];
+  const x$1 = x(editor, rowIndex, columnIndex);
+  // @ts-ignore
+  const y$1 = y(editor, rowIndex);
+  const newMaxLineY = Math.min(items.length, 8);
+  editor.widgets = editor.widgets || [];
+  // editor.widgets.push(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: x$1,
+    y: y$1,
+    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;
+  const completionUid = Math.random();
+  const completionWidget = {
+    id: 'completion',
+    oldState: {
+      items: [],
+      itemHeight: 20,
+      maxHeight: 150,
+      minLineY: 0,
+      maxLineY: 0,
+      uid: completionUid
+    },
+    newState: {
+      items: [],
+      itemHeight: 20,
+      maxHeight: 150,
+      minLineY: 0,
+      maxLineY: 10,
+      uid: completionUid
+    }
+  };
+  const newWidgets = [...widgets, completionWidget];
+  const newEditor = {
+    ...editor,
+    widgets: newWidgets
+  };
+  set$6(uid, editor, newEditor);
+  const newCompletionWidget = await loadContent$2(uid, completionWidget.newState);
+  const FocusEditorCompletions = 9;
+  await invoke$3('Focus.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 FindWidget = 'FindWidget';
+const openFind = async state => {
+  await invoke$3('Viewlet.openWidget', FindWidget);
+  return state;
+};
+
+const organizeImports = async editor => {
+  // TODO ask extension host worker directly
+  const edits = await invoke$3('ExtensionHostOrganizeImports.organizeImports', editor);
+  console.log({
+    edits
+  });
+  return applyDocumentEdits(editor, edits);
+};
+
+// @ts-ignore
+
+// @ts-ignore
+const pasteText = (editor, text) => {
+  const insertedLines = splitLines$2(text);
+  const changes = editorReplaceSelections(editor, insertedLines, EditorPasteText);
+  return scheduleDocumentAndCursorsSelections(editor, changes);
+};
+
+const paste = async editor => {
+  const text = await invoke$3('ClipBoard.readText');
+  string(text);
+  return pasteText(editor, text);
+};
+
+const getErrorMessage$1 = error => {
+  if (!error) {
+    return `Error: ${error}`;
+  }
+  let message = error.message;
+  while (error.cause) {
+    error = error.cause;
+    message += `: ${error}`;
+  }
+  return message;
+};
+const prepareErrorMessageWithCodeFrame = error => {
+  if (!error) {
+    return {
+      message: error,
+      stack: undefined,
       codeFrame: undefined,
       type: 'Error'
     };
@@ -6183,491 +6782,504 @@ const editorUnindent = editor => {
 
 // editor.lines //?
 
-const OnCompletion = 'onCompletion';
-const OnHover = 'onHover';
-
-// TODO add tests for this
-const activateByEvent = async event => {
-  await invoke$3('ExtensionHostManagement.activateByEvent', event);
+const isCompletion$2 = widget => {
+  return widget.id === 'completion';
 };
-
-const execute = async ({
-  editor,
-  args,
-  event,
-  method,
-  noProviderFoundMessage,
-  noProviderFoundResult = undefined
-}) => {
-  const fullEvent = `${event}:${editor.languageId}`;
-  await activateByEvent(fullEvent);
-  const result = await invoke$2(method, editor.uid, ...args);
-  return result;
+const getCompletionState = editor => {
+  const {
+    widgets
+  } = editor;
+  const child = widgets.find(isCompletion$2);
+  return child.newState;
 };
 
-const combineResults = results => {
-  return results[0] ?? [];
+const isCompletion$1 = widget => {
+  return widget.id === 'completion';
 };
-const executeCompletionProvider = (editor, offset) => {
-  return execute({
-    editor,
-    event: OnCompletion,
-    method: CompletionExecute,
-    args: [offset],
-    noProviderFoundMessage: 'no completion provider found',
-    noProviderFoundResult: [],
-    combineResults
-  });
+const focusIndex$1 = (editor, index) => {
+  const child = getCompletionState(editor);
+  if (index === -1) {
+    return editor;
+  }
+  const childIndex = editor.widgets.findIndex(isCompletion$1);
+  // TODO scroll up/down if necessary
+  const childWidget = editor.widgets[childIndex];
+  const newWidget = {
+    ...childWidget,
+    newState: {
+      ...child,
+      focusedIndex: index,
+      focused: true
+    }
+  };
+  const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
+  return {
+    ...editor,
+    widgets: newWidgets
+  };
 };
-const combineResultsResolve = items => {
-  return items[0] ?? undefined;
+
+const focusFirst$1 = editor => {
+  const firstIndex = 0;
+  return focusIndex$1(editor, firstIndex);
 };
-const executeResolveCompletionItem = (editor, offset, name, completionItem) => {
-  return execute({
-    editor,
-    event: OnCompletion,
-    method: CompletionResolveExecute,
-    args: [offset, name, completionItem],
-    noProviderFoundMessage: 'no completion provider found',
-    noProviderFoundResult: [],
-    combineResults: combineResultsResolve
-  });
+
+const focusNext$1 = editor => {
+  const child = getCompletionState(editor);
+  const nextIndex = child.focusedIndex + 1;
+  return focusIndex$1(editor, nextIndex);
 };
 
-// TODO possible to do this with events/state machine instead of promises -> enables canceling operations / concurrent calls
-const getCompletions = async editor => {
+const focusPrevious$1 = editor => {
+  const child = getCompletionState(editor);
+  const previousIndex = child.focusedIndex - 1;
+  return focusIndex$1(editor, previousIndex);
+};
+
+const getEdits = async (editor, completionItem) => {
+  const child = getCompletionState(editor);
+  // @ts-ignore
+  const {
+    leadingWord,
+    uid
+  } = 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 rowIndex = selections[0];
-  const columnIndex = selections[1];
-  // Editor.sync(editor)
-  const offset = await offsetAt(editor, rowIndex, columnIndex);
-  const completions = await executeCompletionProvider(editor, offset);
-  return completions;
+  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;
 };
-
-// TODO don't send unnecessary parts of completion item like matches
-const resolveCompletion = async (editor, name, completionItem) => {
-  try {
-    object(editor);
-    string(name);
-    object(completionItem);
-    const rowIndex = editor.selections[0];
-    const columnIndex = editor.selections[1];
-    const offset = await offsetAt(editor, rowIndex, columnIndex);
-    // @ts-ignore
-    const resolvedCompletionItem = await executeResolveCompletionItem(editor, offset, name, completionItem);
-    return resolvedCompletionItem;
-  } catch {
-    return undefined;
+const isCompletion = widget => {
+  return widget.id === 'completion';
+};
+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 completionWidgetIndex = editor.widgets.findIndex(isCompletion);
+  const newWidgets = [...widgets.slice(0, completionWidgetIndex), ...widgets.slice(completionWidgetIndex + 1)];
+  const intermediateEditor = await applyEdit(editor, changes);
+  return {
+    ...intermediateEditor,
+    widgets: newWidgets
+  };
 };
-
-const None = 1;
-
-const EmptyMatches = [];
-
-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);
+const selectIndex = (editor, index) => {
+  const child = getCompletionState(editor);
+  const {
+    items
+  } = child;
+  if (index === -1) {
+    return editor;
   }
-  return table;
+  if (index > items.length) {
+    throw new Error('index too large');
+  }
+  const actualIndex = index;
+  const completionItem = items[actualIndex];
+  return select(editor, completionItem);
 };
 
-const isLowerCase = char => {
-  return char === char.toLowerCase();
+const selectCurrent = editor => {
+  const child = getCompletionState(editor);
+  const {
+    focusedIndex
+  } = child;
+  return selectIndex(editor, focusedIndex);
 };
 
-const isUpperCase = char => {
-  return char === char.toUpperCase();
+const executeHoverProvider = (editor, offset) => {
+  object(editor);
+  number$1(offset);
+  return execute({
+    event: OnHover,
+    editor,
+    method: HoverExecute,
+    args: [offset],
+    noProviderFoundMessage: 'No hover provider found'
+  });
 };
 
-// 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:
-    case Dot:
-      return true;
-  }
-  if (isLowerCase(columnCharBefore) && isUpperCase(columnChar)) {
-    return true;
-  }
-  return false;
+const getHover = async (editor, offset) => {
+  object(editor);
+  number$1(offset);
+  // TODO invoke extension host worker directly
+  const hover = await executeHoverProvider(editor, offset);
+  return hover;
+};
+
+let _ipc;
+const listen$5 = async () => {
+  const ipc = await create$1({
+    method: RendererProcess
+  });
+  handleIpc(ipc);
+  _ipc = ipc;
+};
+const invoke = async (method, ...args) => {
+  return invoke$5(_ipc, method, ...args);
 };
 
-// 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, column, wordLength, 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;
-  }
-  return 5;
+const measureTextBlockHeight = (text, fontFamily, fontSize, lineHeight, width) => {
+  return invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
 };
 
-// based on https://github.com/microsoft/vscode/blob/3059063b805ed0ac10a6d9539e213386bfcfb852/src/vs/base/common/filters.ts by Microsoft (License MIT)
+const deepCopy = value => {
+  return structuredClone(value);
+};
 
-const isPatternInWord = (patternLow, patternPos, patternLen, wordLow, wordPos, wordLen) => {
-  while (patternPos < patternLen && wordPos < wordLen) {
-    if (patternLow[patternPos] === wordLow[wordPos]) {
-      patternPos += 1;
-    }
-    wordPos += 1;
-  }
-  return patternPos === patternLen; // pattern must be exhausted
+const getInitialLineState = initialLineState => {
+  return deepCopy(initialLineState);
 };
 
-// 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);
-    }
+const getLineInfo$1 = (line, tokens, TokenMap) => {
+  const tokensLength = tokens.length;
+  let end = 0;
+  let start = 0;
+  const lineInfo = [];
+  for (let i = 0; i < tokensLength; i += 2) {
+    const tokenType = tokens[i];
+    const tokenLength = tokens[i + 1];
+    end += tokenLength;
+    const text = line.slice(start, end);
+    const className = `Token ${TokenMap[tokenType] || 'Unknown'}`;
+    const normalizedText = text;
+    lineInfo.push(normalizedText, className);
+    start = end;
   }
-  matches.unshift(table[patternLength][wordLength - 1]);
-  return matches;
+  return lineInfo;
 };
 
-// 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);
-// @ts-ignore
-createTable(gridSize);
-const filterCompletionItem = (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;
+const state = {
+  warned: []
+};
+const flattenTokensArray = tokens => {
+  const flattened = [];
+  for (const token of tokens) {
+    object(token);
+    flattened.push(token.type, token.length);
   }
-  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, column, wordLength, 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;
-      }
-    }
+  return flattened;
+};
+const warnDeprecatedArrayReturn = (languageId, fn) => {
+  if (state.warned.includes(fn)) {
+    return;
   }
-  if (!strongMatch) {
-    return EmptyMatches;
+  state.warned.push(fn);
+  console.warn(`tokenizers without hasArrayReturn=false are deprecated (language ${languageId})`);
+};
+const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasArrayReturn) => {
+  try {
+    const lineState = tokenizeLine(line, lineStateAtStart);
+    if (!lineState || !lineState.tokens || !lineState.state) {
+      throw new Error('invalid tokenization result');
+    }
+    if (!hasArrayReturn) {
+      warnDeprecatedArrayReturn(languageId, tokenizeLine);
+      // workaround for old tokenizers
+      lineState.tokens = flattenTokensArray(lineState.tokens);
+    }
+    return lineState;
+  } catch (error) {
+    console.error(error);
+    return {
+      tokens: [/* type */0, /* length */line.length],
+      lineState: lineStateAtStart
+    };
   }
-  // printTables(pattern, 0, word, 0)
-  const highlights = traceHighlights(table, arrows, patternLength, wordLength);
-  return highlights;
 };
 
-const Deprecated = 1 << 0;
-
-const addEmptyMatch = item => {
-  return {
-    ...item,
-    matches: EmptyMatches
-  };
-};
-const filterCompletionItems = (completionItems, word) => {
-  if (word === EmptyString) {
-    return completionItems.map(addEmptyMatch);
-  }
-  const filteredCompletions = [];
-  const deprecated = [];
-  for (const completionItem of completionItems) {
+const getLineInfos = (lines, tokenizer, languageId) => {
+  const lineInfos = [];
+  const {
+    tokenizeLine,
+    initialLineState,
+    hasArrayReturn,
+    TokenMap
+  } = tokenizer;
+  let currentLineState = getInitialLineState(initialLineState);
+  for (const line of lines) {
+    const result = safeTokenizeLine(languageId, tokenizeLine, line, currentLineState, hasArrayReturn);
     const {
-      label,
-      flags
-    } = completionItem;
-    const result = filterCompletionItem(word, label);
-    if (result !== EmptyMatches) {
-      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);
+      tokens
+    } = result;
+    const lineInfo = getLineInfo$1(line, tokens, TokenMap);
+    lineInfos.push(lineInfo);
+    currentLineState = result;
   }
-  return filteredCompletions;
+  return lineInfos;
 };
 
-const getFinalDeltaY = (height, itemHeight, itemsLength) => {
-  const contentHeight = itemsLength * itemHeight;
-  const finalDeltaY = Math.max(contentHeight - height, 0);
-  return finalDeltaY;
+const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
+  await loadTokenizer(languageId, tokenizerPath);
+  const tokenizer = getTokenizer(languageId);
+  const lines = splitLines$2(codeBlock);
+  const lineInfos = getLineInfos(lines, tokenizer, languageId);
+  return lineInfos;
 };
 
-const getListHeight = (itemsLength, itemHeight, maxHeight) => {
-  number$1(itemsLength);
-  number$1(itemHeight);
-  number$1(maxHeight);
-  if (itemsLength === 0) {
-    return itemHeight;
+const getHoverPosition = (position, selections) => {
+  if (position) {
+    return position;
   }
-  const totalHeight = itemsLength * itemHeight;
-  return Math.min(totalHeight, maxHeight);
-};
-
-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 {
+    rowIndex,
+    columnIndex
+  };
+};
+const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
+  const matching = [];
+  for (const diagnostic of diagnostics) {
+    if (diagnostic.rowIndex === rowIndex) {
+      matching.push(diagnostic);
+    }
   }
-  return '';
+  return matching;
 };
-const handleEditorType = (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;
+const fallbackDisplayStringLanguageId = 'typescript'; // TODO remove this
+
+const hoverDocumentationFontSize = 15;
+const hoverDocumentationFontFamily = 'Fira Code';
+const hoverDocumentationLineHeight = '1.33333';
+const hoverBorderLeft = 1;
+const hoverBorderRight = 1;
+const hoverPaddingLeft = 8;
+const hoverPaddingRight = 8;
+const hovverFullWidth = 400;
+const hoverDocumentationWidth = hovverFullWidth - hoverPaddingLeft - hoverPaddingRight - hoverBorderLeft - hoverBorderRight;
+const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) => {
+  const x$1 = x(editor, rowIndex, wordStart);
+  const y$1 = editor.height - y(editor, rowIndex) + editor.y + 40;
   return {
-    ...state,
-    items,
     x: x$1,
-    y: y$1,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    leadingWord: wordAtOffset,
-    height,
-    finalDeltaY
+    y: y$1
   };
 };
-const handleEditorDeleteLeft = (editorUid, state) => {
-  const editor = getEditor(editorUid);
+const getEditorHoverInfo = async (editorUid, position) => {
+  number$1(editorUid);
+  const instance = get$6(editorUid);
+  const editor = instance.newState;
   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;
-    return {
-      ...state,
-      disposed: true
-    };
+    selections
+  } = editor;
+  const {
+    rowIndex,
+    columnIndex
+  } = getHoverPosition(position, selections);
+  const offset = offsetAt(editor, rowIndex, columnIndex);
+  const hover = await getHover(editor, offset);
+  if (!hover) {
+    return undefined;
   }
-  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
-  const newMaxLineY = Math.min(items.length, 8);
-  const height = getListHeight(items.length, itemHeight, maxHeight);
+  const {
+    displayString,
+    documentation,
+    displayStringLanguageId
+  } = hover;
+  const tokenizerPath = '';
+  const lineInfos = await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath);
+  const wordPart = await getWordBefore(editor, rowIndex, columnIndex);
+  const wordStart = columnIndex - wordPart.length;
+  await measureTextBlockHeight(documentation, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, hoverDocumentationWidth);
+  const {
+    x,
+    y
+  } = getHoverPositionXy(editor, rowIndex, wordStart);
+  const diagnostics = editor.diagnostics || [];
+  const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex);
   return {
-    ...state,
-    items,
-    x: x$1,
-    y: y$1,
-    maxLineY: newMaxLineY,
-    leadingWord: wordAtOffset,
-    height
+    lineInfos,
+    documentation,
+    x,
+    y,
+    matchingDiagnostics
   };
 };
-const dispose = state => {
+
+const loadContent$1 = async (editorUid, state, position) => {
+  const hoverInfo = await getEditorHoverInfo(editorUid, position);
+  if (!hoverInfo) {
+    return state;
+  }
+  const {
+    lineInfos,
+    documentation,
+    x,
+    y,
+    matchingDiagnostics
+  } = hoverInfo;
   return {
     ...state,
-    disposed: true
+    lineInfos,
+    documentation,
+    x,
+    y,
+    diagnostics: matchingDiagnostics
   };
 };
-const disposeWithEditor = (state, editor) => {
-  editor.completionState = None;
-  editor.completionUid = 0;
-  // Focus.removeAdditionalFocus(FocusKey.EditorCompletion)
-  return dispose(state);
+const handleSashPointerDown = (state, eventX, eventY) => {
+  return state;
 };
-const handleEditorClick = disposeWithEditor;
-const handleEditorBlur = disposeWithEditor;
-const loadContent$2 = async (editorUid, state) => {
-  const editor = getEditor(editorUid);
+const handleSashPointerMove = (state, eventX, eventY) => {
+  // @ts-ignore
   const {
-    itemHeight,
-    maxHeight
+    x,
+    y
   } = state;
-  const unfilteredItems = await getCompletions(editor);
-  const wordAtOffset = getWordAtOffset(editor);
-  const items = filterCompletionItems(unfilteredItems, wordAtOffset);
-  const rowIndex = editor.selections[0];
-  const columnIndex = editor.selections[1];
-  const x$1 = x(editor, rowIndex, columnIndex);
-  // @ts-ignore
-  const y$1 = y(editor, rowIndex);
-  const newMaxLineY = Math.min(items.length, 8);
-  editor.widgets = editor.widgets || [];
-  // editor.widgets.push(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);
+  const minWidth = 100;
+  const newWidth = Math.max(eventX - x, minWidth);
   return {
     ...state,
-    unfilteredItems,
-    items,
-    x: x$1,
-    y: y$1,
-    maxLineY: newMaxLineY,
-    focusedIndex: newFocusedIndex,
-    finalDeltaY,
-    leadingWord: wordAtOffset,
-    height,
-    rowIndex,
-    columnIndex,
-    editorUid
+    resizedWidth: newWidth
   };
 };
-const advance = (state, word) => {
-  const filteredItems = filterCompletionItems(state.items, word);
+const handleSashPointerUp = (state, eventX, eventY) => {
+  return state;
+};
+
+const text = data => {
   return {
-    ...state,
-    filteredItems
+    type: Text,
+    text: data,
+    childCount: 0
   };
 };
 
-const getEdits = async (state, editor, completionItem) => {
-  // @ts-ignore
-  const {
-    leadingWord,
-    uid
-  } = state;
-  const word = completionItem.label;
-  const resolvedItem = await resolveCompletion(editor, word, completionItem);
-  const inserted = resolvedItem ? resolvedItem.snippet : word;
-  // TODO type and dispose commands should be sent to renderer process at the same time
-  const {
-    selections
-  } = editor;
-  const [startRowIndex, startColumnIndex] = selections;
-  const leadingWordLength = leadingWord.length;
-  const replaceRange$1 = new Uint32Array([startRowIndex, startColumnIndex - leadingWordLength, startRowIndex, startColumnIndex]);
-  const changes = replaceRange(editor, replaceRange$1, [inserted], '');
-  return changes;
-};
-const select = async (state, editor, completionItem) => {
-  const changes = await getEdits(state, editor, completionItem);
-  const index = editor.widgets.indexOf
-  // ViewletModuleId.EditorCompletion
-  ();
-  if (index !== -1) {
-    editor.widgets.splice(index, 1);
-    editor.completionState = None;
-    editor.completionUid = 0;
+const getLineInfoVirtualDom = lineInfo => {
+  const dom = [{
+    type: Div,
+    className: HoverEditorRow,
+    childCount: lineInfo.length / 2
+  }];
+  for (let i = 0; i < lineInfo.length; i += 2) {
+    const tokenText = lineInfo[i];
+    const tokenClass = lineInfo[i + 1];
+    dom.push({
+      type: Span,
+      className: tokenClass,
+      childCount: 1
+    },
+    // @ts-ignore
+    text(tokenText));
+  }
+  return dom;
+};
+const getLineInfosVirtualDom = lineInfos => {
+  const dom = lineInfos.flatMap(getLineInfoVirtualDom);
+  return dom;
+};
+
+const hoverProblemMessage = {
+  type: Span,
+  className: HoverProblemMessage,
+  childCount: 1
+};
+const hoverProblemDetail = {
+  type: Span,
+  className: HoverProblemDetail,
+  childCount: 1
+};
+const getChildCount = (lineInfos, documentation, diagnostics) => {
+  return lineInfos.length + documentation ? 1 : 0 + (diagnostics && diagnostics.length > 0) ? 1 : 0;
+};
+const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
+  const dom = [];
+  dom.push({
+    type: Div,
+    className: 'Viewlet EditorHover',
+    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1
+  });
+  if (diagnostics && diagnostics.length > 0) {
+    dom.push({
+      type: Div,
+      className: `${HoverDisplayString} ${HoverProblem}`,
+      childCount: diagnostics.length * 2
+    });
+    for (const diagnostic of diagnostics) {
+      dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(`${diagnostic.source} (${diagnostic.code})`));
+    }
+  }
+  if (lineInfos.length > 0) {
+    const lineInfosDom = getLineInfosVirtualDom(lineInfos);
+    dom.push({
+      type: Div,
+      className: HoverDisplayString,
+      childCount: lineInfos.length
+    }, ...lineInfosDom);
+  }
+  if (documentation) {
+    dom.push({
+      type: Div,
+      className: HoverDocumentation,
+      childCount: 1
+    }, text(documentation));
+  }
+  dom.push({
+    type: Div,
+    className: 'Sash SashVertical SashResize',
+    childCount: 0,
+    onPointerDown: HandleSashPointerDown
+  });
+  return dom;
+};
+
+const renderHoverDom = {
+  isEqual(oldState, newState) {
+    return oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.diagnostics === newState.diagnostics;
+  },
+  apply(oldState, newState) {
+    const dom = getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics);
+    return [/* method */'Viewlet.setDom2', dom];
   }
-  await invoke$3('Editor.applyEdit', changes);
-  await invoke$3('Viewlet.dispose', state.uid);
-  return state;
 };
-const selectIndex = (editorUid, state, index) => {
-  const editor = getEditor(editorUid);
-  const {
-    items
-  } = state;
-  if (index === -1) {
-    return state;
-  }
-  if (index > items.length) {
-    throw new Error('index too large');
+const renderBounds$1 = {
+  isEqual(oldState, newState) {
+    return oldState.x === newState.x && oldState.y === newState.y && oldState.resizedWidth === newState.resizedWidth;
+  },
+  apply(oldState, newState) {
+    // @ts-ignore
+    const {
+      x,
+      y,
+      width,
+      height,
+      resizedWidth,
+      uid
+    } = newState;
+    console.log('apply');
+    return [SetBounds, x, y, resizedWidth, height];
   }
-  const actualIndex = index;
-  const completionItem = items[actualIndex];
-  return select(state, editor, completionItem);
 };
-
-const selectCurrent = (editorUid, state) => {
-  const {
-    focusedIndex
-  } = state;
-  return selectIndex(editorUid, state, focusedIndex);
+const render$2 = [renderHoverDom, renderBounds$1];
+const renderHover = async (oldState, newState) => {
+  const commands = [];
+  for (const item of render$2) {
+    if (!item.isEqual(oldState, newState)) {
+      commands.push(item.apply(oldState, newState));
+    }
+  }
+  return commands;
 };
 
 // copied from https://github.com/microsoft/vscode/tree/main/src/vs/base/common/strings.ts by Microsoft (License MIT)
@@ -6714,7 +7326,7 @@ const getMatchCount = matches => {
   return matches.length / 2;
 };
 
-const loadContent$1 = editorId => {
+const loadContent = editorId => {
   const editor = getEditor(editorId);
   const {
     selections,
@@ -6842,251 +7454,49 @@ const loadFont = async (fontName, fontUrl) => {
     string(fontName);
     string(fontUrl);
     if (fontName.startsWith("'")) {
-      throw new Error('font name is not allowed start with quotes');
-    }
-    const fontFace = new FontFace(fontName, fontUrl, {});
-    await fontFace.load();
-    const fonts = getFonts();
-    // @ts-ignore
-    fonts.add(fontFace);
-  } catch (error) {
-    throw new VError$1(error, `Failed to load font ${fontName}`);
-  }
-};
-
-const load = async (fontName, fontUrl) => {
-  return loadFont(fontName, fontUrl);
-};
-const ensure = async (fontName, fontUrl) => {
-  if (isLoaded(fontName)) {
-    return;
-  }
-  if (hasPending(fontName)) {
-    return getPending(fontName);
-  }
-  const promise = load(fontName, fontUrl);
-  setPending(fontName, promise);
-  await promise;
-  removePending(fontName);
-  setLoaded(fontName);
-};
-
-const getSelections = editorUid => {
-  const editor = getEditor(editorUid);
-  const {
-    selections
-  } = editor;
-  return selections;
-};
-
-const executeHoverProvider = (editor, offset) => {
-  object(editor);
-  number$1(offset);
-  return execute({
-    event: OnHover,
-    editor,
-    method: HoverExecute,
-    args: [offset],
-    noProviderFoundMessage: 'No hover provider found'
-  });
-};
-
-const getHover = async (editor, offset) => {
-  object(editor);
-  number$1(offset);
-  // TODO invoke extension host worker directly
-  const hover = await executeHoverProvider(editor, offset);
-  return hover;
-};
-
-let _ipc;
-const listen$5 = async () => {
-  const ipc = await create$1({
-    method: RendererProcess
-  });
-  handleIpc(ipc);
-  _ipc = ipc;
-};
-const invoke = async (method, ...args) => {
-  return invoke$5(_ipc, method, ...args);
-};
-
-const measureTextBlockHeight = (text, fontFamily, fontSize, lineHeight, width) => {
-  return invoke('MeasureTextBlockHeight.measureTextBlockHeight', text, fontSize, fontFamily, lineHeight, width);
-};
-
-const deepCopy = value => {
-  return structuredClone(value);
-};
-
-const getInitialLineState = initialLineState => {
-  return deepCopy(initialLineState);
-};
-
-const getLineInfo$1 = (line, tokens, TokenMap) => {
-  const tokensLength = tokens.length;
-  let end = 0;
-  let start = 0;
-  const lineInfo = [];
-  for (let i = 0; i < tokensLength; i += 2) {
-    const tokenType = tokens[i];
-    const tokenLength = tokens[i + 1];
-    end += tokenLength;
-    const text = line.slice(start, end);
-    const className = `Token ${TokenMap[tokenType] || 'Unknown'}`;
-    const normalizedText = text;
-    lineInfo.push(normalizedText, className);
-    start = end;
-  }
-  return lineInfo;
-};
-
-const state = {
-  warned: []
-};
-const flattenTokensArray = tokens => {
-  const flattened = [];
-  for (const token of tokens) {
-    object(token);
-    flattened.push(token.type, token.length);
-  }
-  return flattened;
-};
-const warnDeprecatedArrayReturn = (languageId, fn) => {
-  if (state.warned.includes(fn)) {
-    return;
-  }
-  state.warned.push(fn);
-  console.warn(`tokenizers without hasArrayReturn=false are deprecated (language ${languageId})`);
-};
-const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasArrayReturn) => {
-  try {
-    const lineState = tokenizeLine(line, lineStateAtStart);
-    if (!lineState || !lineState.tokens || !lineState.state) {
-      throw new Error('invalid tokenization result');
-    }
-    if (!hasArrayReturn) {
-      warnDeprecatedArrayReturn(languageId, tokenizeLine);
-      // workaround for old tokenizers
-      lineState.tokens = flattenTokensArray(lineState.tokens);
-    }
-    return lineState;
-  } catch (error) {
-    console.error(error);
-    return {
-      tokens: [/* type */0, /* length */line.length],
-      lineState: lineStateAtStart
-    };
-  }
-};
-
-const getLineInfos = (lines, tokenizer, languageId) => {
-  const lineInfos = [];
-  const {
-    tokenizeLine,
-    initialLineState,
-    hasArrayReturn,
-    TokenMap
-  } = tokenizer;
-  let currentLineState = getInitialLineState(initialLineState);
-  for (const line of lines) {
-    const result = safeTokenizeLine(languageId, tokenizeLine, line, currentLineState, hasArrayReturn);
-    const {
-      tokens
-    } = result;
-    const lineInfo = getLineInfo$1(line, tokens, TokenMap);
-    lineInfos.push(lineInfo);
-    currentLineState = result;
-  }
-  return lineInfos;
-};
-
-const tokenizeCodeBlock = async (codeBlock, languageId, tokenizerPath) => {
-  await loadTokenizer(languageId, tokenizerPath);
-  const tokenizer = getTokenizer(languageId);
-  const lines = splitLines$2(codeBlock);
-  const lineInfos = getLineInfos(lines, tokenizer, languageId);
-  return lineInfos;
-};
-
-const getHoverPosition = (position, selections) => {
-  if (position) {
-    return position;
-  }
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  return {
-    rowIndex,
-    columnIndex
-  };
-};
-const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
-  const matching = [];
-  for (const diagnostic of diagnostics) {
-    if (diagnostic.rowIndex === rowIndex) {
-      matching.push(diagnostic);
+      throw new Error('font name is not allowed start with quotes');
     }
+    const fontFace = new FontFace(fontName, fontUrl, {});
+    await fontFace.load();
+    const fonts = getFonts();
+    // @ts-ignore
+    fonts.add(fontFace);
+  } catch (error) {
+    throw new VError$1(error, `Failed to load font ${fontName}`);
   }
-  return matching;
 };
-const fallbackDisplayStringLanguageId = 'typescript'; // TODO remove this
 
-const hoverDocumentationFontSize = 15;
-const hoverDocumentationFontFamily = 'Fira Code';
-const hoverDocumentationLineHeight = '1.33333';
-const hoverBorderLeft = 1;
-const hoverBorderRight = 1;
-const hoverPaddingLeft = 8;
-const hoverPaddingRight = 8;
-const hovverFullWidth = 400;
-const hoverDocumentationWidth = hovverFullWidth - hoverPaddingLeft - hoverPaddingRight - hoverBorderLeft - hoverBorderRight;
-const getHoverPositionXy = (editor, rowIndex, wordStart, documentationHeight) => {
-  const x$1 = x(editor, rowIndex, wordStart);
-  const y$1 = editor.height - y(editor, rowIndex) + editor.y + 40;
-  return {
-    x: x$1,
-    y: y$1
-  };
+const load = async (fontName, fontUrl) => {
+  return loadFont(fontName, fontUrl);
 };
-const getEditorHoverInfo = async (editorUid, position) => {
-  number$1(editorUid);
-  const instance = get$6(editorUid);
-  const editor = instance.newState;
+const ensure = async (fontName, fontUrl) => {
+  if (isLoaded(fontName)) {
+    return;
+  }
+  if (hasPending(fontName)) {
+    return getPending(fontName);
+  }
+  const promise = load(fontName, fontUrl);
+  setPending(fontName, promise);
+  await promise;
+  removePending(fontName);
+  setLoaded(fontName);
+};
+
+const getSelections = editorUid => {
+  const editor = getEditor(editorUid);
   const {
     selections
   } = editor;
+  return selections;
+};
+
+const getText = editorUid => {
+  const editor = getEditor(editorUid);
   const {
-    rowIndex,
-    columnIndex
-  } = getHoverPosition(position, selections);
-  const offset = offsetAt(editor, rowIndex, columnIndex);
-  const hover = await getHover(editor, offset);
-  if (!hover) {
-    return undefined;
-  }
-  const {
-    displayString,
-    documentation,
-    displayStringLanguageId
-  } = hover;
-  const tokenizerPath = '';
-  const lineInfos = await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath);
-  const wordPart = await getWordBefore(editor, rowIndex, columnIndex);
-  const wordStart = columnIndex - wordPart.length;
-  await measureTextBlockHeight(documentation, hoverDocumentationFontFamily, hoverDocumentationFontSize, hoverDocumentationLineHeight, hoverDocumentationWidth);
-  const {
-    x,
-    y
-  } = getHoverPositionXy(editor, rowIndex, wordStart);
-  const diagnostics = editor.diagnostics || [];
-  const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex);
-  return {
-    lineInfos,
-    documentation,
-    x,
-    y,
-    matchingDiagnostics
-  };
+    lines
+  } = editor;
+  return lines.join('\n');
 };
 
 const InsertText = 'insertText';
@@ -7170,7 +7580,7 @@ const moveLineUp = editor => {
 };
 
 const Link$1 = 'Link';
-const Function = 'Function';
+const Function$1 = 'Function';
 const Parameter = 'Parameter';
 const Type = 'Type';
 const VariableName = 'VariableName';
@@ -7229,7 +7639,7 @@ const getDecorationClassName = type => {
     case Ts3073:
     case Ts3077:
     case Ts3088:
-      return Function;
+      return Function$1;
     case Ts1792:
     case Ts1793:
       return Parameter;
@@ -7655,29 +8065,6 @@ const getVisible = async (editor, syncIncremental) => {
   };
 };
 
-const Div = 4;
-const Span = 8;
-const Text = 12;
-
-const ColorPicker = 'ColorPicker';
-const ColorPickerBackgroundColor = 'ColorPickerBackgroundColor';
-const ColorPickerDark = 'ColorPickerDark';
-const ColorPickerLight = 'ColorPickerLight';
-const ColorPickerRectangle = 'ColorPickerRectangle';
-const ColorPickerSlider = 'ColorPickerSlider';
-const ColorPickerSliderThumb = 'ColorPickerSliderThumb';
-const Diagnostic = 'Diagnostic';
-const EditorCursor = 'EditorCursor';
-const EditorRow = 'EditorRow';
-const EditorSelection = 'EditorSelection';
-const HoverDisplayString = 'HoverDisplayString';
-const HoverDocumentation = 'HoverDocumentation';
-const HoverEditorRow = 'HoverEditorRow';
-const HoverProblem = 'HoverProblem';
-const HoverProblemDetail = 'HoverProblemDetail';
-const HoverProblemMessage = 'HoverProblemMessage';
-const Viewlet = 'Viewlet';
-
 const getCursorsVirtualDom = cursors => {
   const dom = [];
   for (const translate of cursors) {
@@ -7729,14 +8116,6 @@ const getDiagnosticsVirtualDom = diagnostics => {
   return dom;
 };
 
-const text = data => {
-  return {
-    type: Text,
-    text: data,
-    childCount: 0
-  };
-};
-
 const getGutterInfoVirtualDom = gutterInfo => {
   return [{
     type: Span,
@@ -7813,6 +8192,322 @@ const getSelectionsVirtualDom = selections => {
   return dom;
 };
 
+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 = item => {
+  switch (item.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;
+  }
+};
+
+const getHighlights = (item, leadingWord) => {
+  const {
+    matches
+  } = item;
+  return matches.slice(1);
+};
+
+// import * as IconTheme from '../IconTheme/IconTheme.ts'
+
+const getLabel = item => {
+  return item.label;
+};
+const getFileIcon = item => {
+  switch (item.kind) {
+    case File:
+      // TODO IconTheme.getFileNameIcon(item.label)
+      return '';
+    case Folder:
+      // TODO IconTheme.getFolderNameIcon(item.label)
+      return '';
+    default:
+      return '';
+  }
+};
+const getVisibleIem = (item, itemHeight, leadingWord, i, focusedIndex) => {
+  return {
+    label: getLabel(item),
+    symbolName: getSymbolName(item),
+    top: i * itemHeight,
+    highlights: getHighlights(item),
+    focused: i === focusedIndex,
+    deprecated: item.flags & Deprecated,
+    fileIcon: getFileIcon(item)
+  };
+};
+
+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 = {
+  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$1 = [renderItems, renderBounds, renderHeight, renderNegativeMargin, renderScrollBar];
+const renderCompletion$1 = (oldState, newState) => {
+  const commands = [];
+  for (const item of render$1) {
+    if (!item.isEqual(oldState, newState)) {
+      commands.push(item.apply(oldState, newState));
+    }
+  }
+  return commands;
+};
+
+const renderCompletion = (oldState, newState) => {
+  const commands = renderCompletion$1(oldState, newState);
+  const wrappedCommands = [];
+  const uid = newState.uid;
+  for (const command of commands) {
+    wrappedCommands.push(['Viewlet.send', uid, ...command]);
+  }
+  return wrappedCommands;
+};
+const addWidgetCompletion = widget => {
+  const commands = renderCompletion(widget.oldState, widget.newState);
+  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.uid;
+  const allCommands = [];
+  allCommands.push(['Viewlet.create', id, uid]);
+  allCommands.push(...commands);
+  return allCommands;
+};
+const addWidget = widget => {
+  const {
+    id
+  } = widget;
+  switch (id) {
+    case 'completion':
+      return addWidgetCompletion(widget);
+    default:
+      throw new Error('unsupported widget');
+  }
+};
+const renderWidget = widget => {
+  const {
+    id
+  } = widget;
+  switch (id) {
+    case 'completion':
+      return renderCompletion(widget.oldState, widget.newState);
+    default:
+      throw new Error(`unsupported widget`);
+  }
+};
+const removeCompletion = widget => {
+  return [['Viewlet.send', widget.newState.uid, 'dispose']];
+};
+const removeWidget = widget => {
+  const {
+    id
+  } = widget;
+  switch (id) {
+    case 'completion':
+      return removeCompletion(widget);
+    default:
+      throw new Error('unsupported widget');
+  }
+};
+
 const renderLines = {
   isEqual(oldState, newState) {
     return oldState.lines === newState.lines && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.deltaX === newState.deltaX && oldState.width === newState.width;
@@ -7905,11 +8600,67 @@ const renderGutterInfo = {
         gutterInfos.push(i + 1);
       }
     }
-    const dom = getEditorGutterVirtualDom(gutterInfos);
-    return ['renderGutter', dom];
-  }
+    const dom = getEditorGutterVirtualDom(gutterInfos);
+    return ['renderGutter', dom];
+  }
+};
+const renderWidgets = {
+  isEqual(oldState, newState) {
+    return oldState.widgets === newState.widgets;
+  },
+  apply(oldState, newState) {
+    const addedWidgets = [];
+    const changedWidgets = [];
+    const removedWidgets = [];
+    const oldWidgets = oldState.widgets || [];
+    const newWidgets = newState.widgets || [];
+    const oldWidgetMap = Object.create(null);
+    const newWidgetMap = Object.create(null);
+    for (const oldWidget of oldWidgets) {
+      oldWidgetMap[oldWidget.id] = oldWidget;
+    }
+    for (const newWidget of newWidgets) {
+      newWidgetMap[newWidget.id] = newWidget;
+    }
+    for (const oldWidget of oldWidgets) {
+      if (oldWidget.id in newWidgetMap) {
+        changedWidgets.push(newWidgetMap[oldWidget.id]);
+      } else {
+        removedWidgets.push(oldWidget);
+      }
+    }
+    for (const newWidget of newWidgets) {
+      if (newWidget.id in oldWidgetMap) ; else {
+        addedWidgets.push(newWidget);
+      }
+    }
+    const addCommands = [];
+    for (const addedWidget of addedWidgets) {
+      const childCommands = addWidget(addedWidget);
+      if (childCommands.length > 0) {
+        addCommands.push(...childCommands);
+      }
+    }
+    const changeCommands = [];
+    for (const changedWidget of changedWidgets) {
+      const childCommands = renderWidget(changedWidget);
+      if (childCommands.length > 0) {
+        changeCommands.push(...childCommands);
+      }
+    }
+    const removeCommands = [];
+    for (const removedWidget of removedWidgets) {
+      const childCommands = removeWidget(removedWidget);
+      if (childCommands.length > 0) {
+        removeCommands.push(...childCommands);
+      }
+    }
+    const allCommands = [...addCommands, ...changeCommands, ...removeCommands];
+    return allCommands;
+  },
+  multiple: true
 };
-const render$2 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus, renderDecorations, renderGutterInfo];
+const render = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus, renderDecorations, renderGutterInfo, renderWidgets];
 const renderEditor = async id => {
   const instance = get$6(id);
   if (!instance) {
@@ -7921,15 +8672,30 @@ const renderEditor = async id => {
   } = instance;
   const commands = [];
   set$6(id, newState, newState);
-  for (const item of render$2) {
+  for (const item of render) {
     if (!item.isEqual(oldState, newState)) {
-      commands.push(await item.apply(oldState, newState));
+      const result = await item.apply(oldState, newState);
+      // @ts-ignore
+      if (item.multiple) {
+        commands.push(...result);
+      } else if (result.length > 0) {
+        commands.push(result);
+      }
     }
   }
   return commands;
 };
 
-const keep = ['ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPointerMove', 'ColorPicker.loadContent', 'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'ColorPicker.render', 'Editor.getText', 'Editor.getSelections', 'EditorCompletion.advance', 'EditorCompletion.handleEditorBlur', 'EditorCompletion.handleEditorClick', 'EditorCompletion.handleEditorDeleteLeft', 'EditorCompletion.handleEditorType', 'EditorCompletion.loadContent', 'EditorCompletion.selectCurrent', 'EditorCompletion.selectIndex', 'FindWidget.focusFirst', 'FindWidget.focusIndex', 'FindWidget.focusLast', 'FindWidget.focusNext', 'FindWidget.focusPrevious', 'FindWidget.handleInput', 'FindWidget.loadContent', 'Font.ensure', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize'];
+const keep = ['ColorPicker.handleSliderPointerDown', 'ColorPicker.handleSliderPointerMove', 'ColorPicker.loadContent', 'Editor.create', 'Editor.getWordAt', 'Editor.getWordBefore', 'Editor.offsetAt', 'Editor.render', 'ColorPicker.render', 'Editor.getText', 'Editor.getSelections',
+// 'EditorCompletion.advance',
+// 'EditorCompletion.handleEditorBlur',
+// 'EditorCompletion.handleEditorClick',
+// 'EditorCompletion.handleEditorDeleteLeft',
+// 'EditorCompletion.handleEditorType',
+// 'EditorCompletion.loadContent',
+// 'EditorCompletion.selectCurrent',
+// 'EditorCompletion.selectIndex',
+'FindWidget.focusFirst', 'FindWidget.focusIndex', 'FindWidget.focusLast', 'FindWidget.focusNext', 'FindWidget.focusPrevious', 'FindWidget.handleInput', 'FindWidget.loadContent', 'Font.ensure', 'Hover.getHoverInfo', 'Hover.handleSashPointerDown', 'Hover.handleSashPointerMove', 'Hover.handleSashPointerUp', 'Hover.loadContent', 'Hover.render', 'Initialize.initialize'];
 
 // TODO wrap commands globally, not per editor
 // TODO only store editor state in editor worker, not in renderer worker also
@@ -7951,243 +8717,6 @@ const wrapCommands = commands => {
   }
 };
 
-const HandlePointerDown = 'handlePointerDown';
-const HandleSashPointerDown = 'handleSashPointerDown';
-
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
-const getColorPickerVirtualDom = () => {
-  return [{
-    type: Div,
-    className: mergeClassNames(Viewlet, ColorPicker),
-    onPointerDown: HandlePointerDown,
-    childCount: 3
-  }, {
-    type: Div,
-    className: ColorPickerRectangle,
-    childCount: 3
-  }, {
-    type: Div,
-    className: ColorPickerBackgroundColor,
-    childCount: 0
-  }, {
-    type: Div,
-    className: ColorPickerLight,
-    childCount: 0
-  }, {
-    type: Div,
-    className: ColorPickerDark,
-    childCount: 0
-  }, {
-    type: Div,
-    className: ColorPickerSlider,
-    childCount: 0
-  }, {
-    type: Div,
-    className: ColorPickerSliderThumb,
-    childCount: 0
-  }];
-};
-
-const SetBounds = 'setBounds';
-const SetColor = 'setColor';
-const SetOffsetX = 'setOffsetX';
-
-const renderColor = {
-  isEqual(oldState, newState) {
-    return oldState.color === newState.color;
-  },
-  apply(oldState, newState) {
-    return [/* method */SetColor, /* color */newState.color];
-  }
-};
-const renderOffsetX = {
-  isEqual(oldState, newState) {
-    return oldState.offsetX === newState.offsetX;
-  },
-  apply(oldState, newState) {
-    return [/* method */SetOffsetX, /* offsetX */newState.offsetX];
-  }
-};
-const renderColorPickerDom = {
-  isEqual(oldState, newState) {
-    return oldState.min === newState.min && oldState.max === newState.max;
-  },
-  apply(oldState, newState) {
-    const dom = getColorPickerVirtualDom();
-    return ['Viewlet.setDom2', dom];
-  }
-};
-const render$1 = [renderColorPickerDom, renderColor, renderOffsetX];
-const renderColorPicker = async (oldState, newState) => {
-  const commands = [];
-  for (const item of render$1) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
-  }
-  return commands;
-};
-
-const loadContent = async (editorUid, state, position) => {
-  const hoverInfo = await getEditorHoverInfo(editorUid, position);
-  if (!hoverInfo) {
-    return state;
-  }
-  const {
-    lineInfos,
-    documentation,
-    x,
-    y,
-    matchingDiagnostics
-  } = hoverInfo;
-  return {
-    ...state,
-    lineInfos,
-    documentation,
-    x,
-    y,
-    diagnostics: matchingDiagnostics
-  };
-};
-const handleSashPointerDown = (state, eventX, eventY) => {
-  return state;
-};
-const handleSashPointerMove = (state, eventX, eventY) => {
-  // @ts-ignore
-  const {
-    x,
-    y
-  } = state;
-  const minWidth = 100;
-  const newWidth = Math.max(eventX - x, minWidth);
-  return {
-    ...state,
-    resizedWidth: newWidth
-  };
-};
-const handleSashPointerUp = (state, eventX, eventY) => {
-  return state;
-};
-
-const getLineInfoVirtualDom = lineInfo => {
-  const dom = [{
-    type: Div,
-    className: HoverEditorRow,
-    childCount: lineInfo.length / 2
-  }];
-  for (let i = 0; i < lineInfo.length; i += 2) {
-    const tokenText = lineInfo[i];
-    const tokenClass = lineInfo[i + 1];
-    dom.push({
-      type: Span,
-      className: tokenClass,
-      childCount: 1
-    },
-    // @ts-ignore
-    text(tokenText));
-  }
-  return dom;
-};
-const getLineInfosVirtualDom = lineInfos => {
-  const dom = lineInfos.flatMap(getLineInfoVirtualDom);
-  return dom;
-};
-
-const hoverProblemMessage = {
-  type: Span,
-  className: HoverProblemMessage,
-  childCount: 1
-};
-const hoverProblemDetail = {
-  type: Span,
-  className: HoverProblemDetail,
-  childCount: 1
-};
-const getChildCount = (lineInfos, documentation, diagnostics) => {
-  return lineInfos.length + documentation ? 1 : 0 + (diagnostics && diagnostics.length > 0) ? 1 : 0;
-};
-const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
-  const dom = [];
-  dom.push({
-    type: Div,
-    className: 'Viewlet EditorHover',
-    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1
-  });
-  if (diagnostics && diagnostics.length > 0) {
-    dom.push({
-      type: Div,
-      className: `${HoverDisplayString} ${HoverProblem}`,
-      childCount: diagnostics.length * 2
-    });
-    for (const diagnostic of diagnostics) {
-      dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(`${diagnostic.source} (${diagnostic.code})`));
-    }
-  }
-  if (lineInfos.length > 0) {
-    const lineInfosDom = getLineInfosVirtualDom(lineInfos);
-    dom.push({
-      type: Div,
-      className: HoverDisplayString,
-      childCount: lineInfos.length
-    }, ...lineInfosDom);
-  }
-  if (documentation) {
-    dom.push({
-      type: Div,
-      className: HoverDocumentation,
-      childCount: 1
-    }, text(documentation));
-  }
-  dom.push({
-    type: Div,
-    className: 'Sash SashVertical SashResize',
-    childCount: 0,
-    onPointerDown: HandleSashPointerDown
-  });
-  return dom;
-};
-
-const renderHoverDom = {
-  isEqual(oldState, newState) {
-    return oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.diagnostics === newState.diagnostics;
-  },
-  apply(oldState, newState) {
-    const dom = getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics);
-    return [/* method */'Viewlet.setDom2', dom];
-  }
-};
-const renderBounds = {
-  isEqual(oldState, newState) {
-    return oldState.x === newState.x && oldState.y === newState.y && oldState.resizedWidth === newState.resizedWidth;
-  },
-  apply(oldState, newState) {
-    // @ts-ignore
-    const {
-      x,
-      y,
-      width,
-      height,
-      resizedWidth,
-      uid
-    } = newState;
-    console.log('apply');
-    return [SetBounds, x, y, resizedWidth, height];
-  }
-};
-const render = [renderHoverDom, renderBounds];
-const renderHover = async (oldState, newState) => {
-  const commands = [];
-  for (const item of render) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
-  }
-  return commands;
-};
-
 const commandMap = {
   'ColorPicker.handleSliderPointerDown': handleSliderPointerDown,
   'ColorPicker.handleSliderPointerMove': handleSliderPointerMove,
@@ -8234,8 +8763,9 @@ const commandMap = {
   'Editor.deleteWordRight': deleteWordRight,
   'Editor.findAllReferences': findAllReferences,
   'Editor.format': format,
-  'Editor.getWordAt': getWordAt,
+  'Editor.getSelections': getSelections,
   'Editor.getText': getText,
+  'Editor.getWordAt': getWordAt,
   'Editor.getWordBefore': getWordBefore,
   'Editor.goToDefinition': goToDefinition,
   'Editor.goToTypeDefinition': goToTypeDefinition,
@@ -8273,6 +8803,7 @@ const commandMap = {
   'Editor.moveSelection': editorMoveSelection,
   'Editor.moveSelectionPx': moveSelectionPx,
   'Editor.offsetAt': offsetAt,
+  'Editor.openCompletion': openCompletion,
   'Editor.openFind': openFind,
   'Editor.organizeImports': organizeImports,
   'Editor.paste': paste,
@@ -8312,8 +8843,11 @@ const commandMap = {
   'Editor.typeWithAutoClosing': typeWithAutoClosing,
   'Editor.undo': undo,
   'Editor.unIndent': editorUnindent,
-  'Editor.getSelections': getSelections,
   'EditorCompletion.advance': advance,
+  'EditorCompletion.focusFirst': focusFirst$1,
+  'EditorCompletion.focusIndex': focusIndex$1,
+  'EditorCompletion.focusNext': focusNext$1,
+  'EditorCompletion.focusPrevious': focusPrevious$1,
   'EditorCompletion.handleEditorBlur': handleEditorBlur,
   'EditorCompletion.handleEditorClick': handleEditorClick,
   'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft,
@@ -8327,14 +8861,14 @@ const commandMap = {
   'FindWidget.focusNext': focusNext,
   'FindWidget.focusPrevious': focusPrevious,
   'FindWidget.handleInput': handleInput,
-  'FindWidget.loadContent': loadContent$1,
+  'FindWidget.loadContent': loadContent,
   'Font.ensure': ensure,
   'Hover.getHoverInfo': getEditorHoverInfo,
   'Hover.handleSashPointerDown': handleSashPointerDown,
   'Hover.handleSashPointerMove': handleSashPointerMove,
   'Hover.handleSashPointerUp': handleSashPointerUp,
+  'Hover.loadContent': loadContent$1,
   'Hover.render': renderHover,
-  'Hover.loadContent': loadContent,
   'Initialize.initialize': intialize
 };
 wrapCommands(commandMap);