@lvce-editor/editor-worker 2.3.0 → 2.4.0

package/dist/editorWorkerMain.js

@@ -238,1097 +238,131 @@ const IndentMore = 'indentMore';
 const InsertLineBreak = 'insertLineBreak';
 const ToggleBlockComment = 'toggleBlockComment';
 
-const Dash = '-';
-const Dot = '.';
-const EmptyString = '';
-const Space = ' ';
-const Tab = '\t';
-const Underline = '_';
-const T = 't';
-
-const getFontString = (fontWeight, fontSize, fontFamily) => {
-  return `${fontWeight} ${fontSize}px ${fontFamily}`;
+const modules = Object.create(null);
+const register = (id, value) => {
+  modules[id] = value;
+};
+const get$7 = id => {
+  return modules[id];
 };
 
-const getLetterSpacingString = letterSpacing => {
-  return `${letterSpacing}px`;
+const getModule$2 = id => {
+  return get$7(id);
 };
 
-const createMeasureContext = () => {
-  const canvas = new OffscreenCanvas(0, 0);
-  const ctx = /** @type {OffscreenCanvasRenderingContext2D} */canvas.getContext('2d');
-  if (!ctx) {
-    throw new Error('Failed to get canvas context 2d');
+const applyWidgetChange = (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);
+    return {
+      ...widget,
+      newState
+    };
   }
-  return ctx;
+  if (changes.length === 1 && changes[0].origin === DeleteLeft && module.handleEditorDeleteLeft) {
+    const newState = module.handleEditorDeleteLeft(editor, widget.newState);
+    return {
+      ...widget,
+      newState
+    };
+  }
+  return widget;
 };
 
-const state$b = {
-  ctx: undefined
-};
-const getOrCreate = createCtx => {
-  if (state$b.ctx) {
-    return state$b.ctx;
+const applyWidgetChanges = (editor, changes) => {
+  const widgets = editor.widgets || [];
+  if (widgets.length === 0) {
+    return widgets;
   }
-  state$b.ctx = createCtx();
-  return state$b.ctx;
+  const newWidgets = [];
+  for (const widget of widgets) {
+    const newWidget = applyWidgetChange(editor, widget, changes);
+    if (newWidget.newState) {
+      newWidgets.push(newWidget);
+    }
+  }
+  return newWidgets;
 };
 
-const getContext = () => {
-  const ctx = getOrCreate(createMeasureContext);
-  return ctx;
+const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
+  const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
+  return scrollBarOffset;
 };
+const getScrollBarY = getScrollBarOffset;
 
-const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
-  string(text);
-  number$1(fontWeight);
-  number$1(fontSize);
-  string(fontFamily);
-  boolean(isMonoSpaceFont);
-  number$1(charWidth);
-  if (isMonoSpaceFont) {
-    return text.length * charWidth;
-  }
-  if (typeof letterSpacing !== 'number') {
-    throw new TypeError('letterSpacing must be of type number');
+const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
+  if (size >= contentSize) {
+    return 0;
   }
-  const letterSpacingString = getLetterSpacingString(letterSpacing);
-  const fontString = getFontString(fontWeight, fontSize, fontFamily);
-  const ctx = getContext();
-  // @ts-ignore
-  ctx.letterSpacing = letterSpacingString;
-  // @ts-ignore
-  ctx.font = fontString;
-  // @ts-ignore
-  const metrics = ctx.measureText(text);
-  const width = metrics.width;
-  return width;
+  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
 };
 
-const getAccurateColumnIndexAscii = (
-// @ts-ignore
-line,
-// @ts-ignore
-guess,
-// @ts-ignore
-averageCharWidth,
-// @ts-ignore
-eventX,
-// @ts-ignore
-fontWeight,
-// @ts-ignore
-fontSize,
-// @ts-ignore
-fontFamily,
-// @ts-ignore
-letterSpacing,
-// @ts-ignore
-isMonospaceFont,
-// @ts-ignore
-charWidth) => {
-  for (let i = guess; i < line.length; i++) {
-    const width = measureTextWidth(line.slice(0, i), fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
-    if (eventX - width < averageCharWidth / 2) {
-      return i;
-    }
+const getScrollBarWidth = (width, longestLineWidth) => {
+  if (width > longestLineWidth) {
+    return 0;
   }
-  return line.length;
+  return width ** 2 / longestLineWidth;
 };
 
-const supported = () => {
-  return 'Segmenter' in Intl;
-};
-const create$5 = () => {
-  // @ts-ignore
-  const segmenter = new Intl.Segmenter();
+const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
+  const halfScrollBarHeight = scrollBarHeight / 2;
+  if (relativeY <= halfScrollBarHeight) {
+    // clicked at top
+    return {
+      percent: 0,
+      handleOffset: relativeY
+    };
+  }
+  if (relativeY <= height - halfScrollBarHeight) {
+    // clicked in middle
+    return {
+      percent: (relativeY - halfScrollBarHeight) / (height - scrollBarHeight),
+      handleOffset: halfScrollBarHeight
+    };
+  }
+  // clicked at bottom
   return {
-    at(line, index) {
-      const segments = segmenter.segment(line);
-      return segments.containing(index);
-    },
-    visualIndex(line, index) {
-      const segments = segmenter.segment(line);
-      let currentVisualIndex = 0;
-      for (const segment of segments) {
-        if (segment.index >= index) {
-          return currentVisualIndex;
-        }
-        currentVisualIndex++;
-      }
-      return currentVisualIndex;
-    },
-    modelIndex(line, visualIndex) {
-      const segments = segmenter.segment(line);
-      let currentVisualIndex = 0;
-      for (const segment of segments) {
-        if (currentVisualIndex >= visualIndex) {
-          return segment.index;
-        }
-        currentVisualIndex++;
-      }
-      return line.length;
-    },
-    getSegments(line) {
-      return segmenter.segment(line);
-    }
+    percent: 1,
+    handleOffset: scrollBarHeight - height + relativeY
   };
 };
 
-// @ts-ignore
-const getAccurateColumnIndexUnicode = (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing) => {
-  const segmenter = create$5();
-  const segments = segmenter.getSegments(line);
-  const isMonospaceFont = false;
-  const charWidth = 0;
-  for (const segment of segments) {
-    const width = measureTextWidth(line.slice(0, segment.index), fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
-    if (eventX - width < averageCharWidth) {
-      return segment.index;
-    }
+const splitLines$2 = lines => {
+  if (!lines) {
+    return [];
   }
-  return line.length;
+  return lines.split('\n');
 };
 
-const RE_ASCII = /^[\p{ASCII}]*$/u;
-const isAscii = line => {
-  return RE_ASCII.test(line);
-};
+// based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/common/arrays.ts#L625 (License MIT)
 
-const normalizeText = (text, normalize, tabSize) => {
-  if (normalize) {
-    return text.replaceAll(Tab, Space.repeat(tabSize));
+// @ts-ignore
+const insertInto = (array, start, newItems) => {
+  const originalLength = array.length;
+  const newItemsLength = newItems.length;
+  array.length = originalLength + newItemsLength;
+  // Move the items after the start index, start from the end so that we don't overwrite any value.
+  for (let i = originalLength - 1; i >= start; i--) {
+    array[i + newItemsLength] = array[i];
+  }
+  for (let i = 0; i < newItemsLength; i++) {
+    array[i + start] = newItems[i];
   }
-  return text;
-};
-const shouldNormalizeText = text => {
-  return text.includes(Tab);
 };
 
+/**
+ * Alternative to the native Array.splice method, it
+ * can only support limited number of items due to the maximum call stack size limit.
+ */
 // @ts-ignore
-const guessOffset = (eventX, averageCharWidth) => {
-  const guess = Math.round(eventX / averageCharWidth);
-  return guess;
+const spliceLargeArray = (array, start, deleteCount, newItems) => {
+  const result = array.splice(start, deleteCount);
+  insertInto(array, start, newItems);
+  return result;
 };
 
-// @ts-ignore
-const normalizeGuess = (line, guess, tabSize) => {
-  let normalizedGuess = guess;
-  for (let i = 0; i < guess; i++) {
-    if (line[i] === Tab) {
-      normalizedGuess -= tabSize - 1;
-    }
-  }
-  return normalizedGuess;
-};
-
-// @ts-ignore
-const getAccurateColumnIndex = (line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX) => {
-  string(line);
-  number$1(fontWeight);
-  number$1(fontSize);
-  string(fontFamily);
-  number$1(letterSpacing);
-  boolean(isMonospaceFont);
-  number$1(charWidth);
-  number$1(tabSize);
-  number$1(eventX);
-  // Assert.greaterZero(charWidth)
-  const guess = guessOffset(eventX, charWidth);
-  const normalize = shouldNormalizeText(line);
-  const normalizedGuess = normalizeGuess(line, guess, tabSize);
-  const text = line.slice(0, normalizedGuess);
-  const normalizedText = normalizeText(text, normalize, tabSize);
-  const actual = measureTextWidth(normalizedText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
-  const isAscii$1 = isAscii(line);
-  if (isAscii$1) {
-    if (Math.abs(eventX - actual) < charWidth / 2) {
-      return normalizedGuess;
-    }
-    return getAccurateColumnIndexAscii(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
-  }
-  return getAccurateColumnIndexUnicode(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing);
-};
-
-const at = (editor, eventX, eventY) => {
-  object(editor);
-  number$1(eventX);
-  number$1(eventY);
-  const {
-    y,
-    deltaY,
-    rowHeight,
-    fontSize,
-    fontWeight,
-    fontFamily,
-    letterSpacing,
-    lines,
-    tabSize,
-    differences,
-    isMonospaceFont,
-    charWidth
-  } = editor;
-  const rowIndex = Math.floor((eventY - y + deltaY) / rowHeight);
-  if (rowIndex < 0) {
-    return {
-      rowIndex: 0,
-      columnIndex: 0
-    };
-  }
-  const clampedRowIndex = clamp(rowIndex, 0, lines.length - 1);
-  const line = lines[clampedRowIndex];
-  const columnIndex = getAccurateColumnIndex(line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX);
-  return {
-    rowIndex: clampedRowIndex,
-    columnIndex
-  };
-};
-
-/**
- * @deprecated this doesn't work for variable width characters (unicode/emoji).
- * Use position computation in renderer process instead
- *
- * @param {object} editor
- * @param {number} rowIndex
- * @param {number} columnIndex
- * @returns
- */
-const x = (editor, rowIndex, columnIndex) => {
-  const {
-    columnWidth,
-    x
-  } = editor;
-  const offsetX = columnIndex * columnWidth + x;
-  return offsetX;
-};
-const y = (editor, rowIndex) => {
-  const {
-    rowHeight,
-    y
-  } = editor;
-  const offsetY = (rowIndex + 1) * rowHeight + y;
-  return offsetY;
-};
-
-const emptyObject = {};
-const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
-const i18nString = (key, placeholders = emptyObject) => {
-  if (placeholders === emptyObject) {
-    return key;
-  }
-  const replacer = (match, rest) => {
-    return placeholders[rest];
-  };
-  return key.replaceAll(RE_PLACEHOLDER, replacer);
-};
-
-/**
- * @enum {string}
- */
-const UiStrings = {
-  OrganizeImports: 'Organize Imports',
-  Copy: 'Copy',
-  CopyLineDown: 'Copy Line Down',
-  CopyLineUp: 'Copy Line Up',
-  Cut: 'Cut',
-  DuplicateSelection: 'Duplicate Selection',
-  FindAllImplementations: 'Find All Implementations',
-  FindAllReferences: 'Find All References',
-  GoToDefinition: 'Go to Definition',
-  GoToTypeDefinition: 'Go to Type Definition',
-  MoveLineDown: 'Move Line Down',
-  MoveLineUp: 'Move Line Up',
-  NoDefinitionFound: 'No definition found',
-  NoDefinitionFoundFor: "No definition found for '{PH1}'",
-  NoTypeDefinitionFound: 'No type definition found',
-  NoTypeDefinitionFoundFor: "No type definition found for '{PH1}'",
-  Paste: 'Paste',
-  Redo: 'Redo',
-  SelectAll: 'Select All',
-  Separator: 'Separator',
-  ToggleBlockComment: 'Toggle Block Comment',
-  ToggleLineComment: 'Toggle Line Comment',
-  Undo: 'Undo',
-  FormatDocument: 'Format Document',
-  SourceActions: 'Source Actions',
-  EditorShowHover: 'Show Hover',
-  EditorFormatDocumentForced: 'Editor: Format Document (forced)',
-  EditorSelectNextOccurrence: 'Editor: Select Next Occurrence',
-  EditorSelectAllOccurrences: 'Editor: Select All Occurrences',
-  EditorGoToDefinition: 'Editor: Go To Definition',
-  EditorGoToTypeDefinition: 'Editor: Go To Type Definition',
-  EditorSelectInsideString: 'Editor: Select Inside String',
-  EditorIndent: 'Editor: Indent',
-  EditorUnindent: 'Editor: Unindent',
-  EditorSortLinesAscending: 'Editor: Sort Lines Ascending',
-  EditorToggleComment: 'Editor: Toggle Comment',
-  EditorSelectUp: 'Editor: Select Up',
-  EditorSelectDown: 'Editor: Select Down',
-  EditorToggleBlockComment: 'Editor: Toggle Block Comment',
-  EditorOpenColorPicker: 'Editor: Open Color Picker',
-  EditorCloseColorPicker: 'Editor: Close Color Picker',
-  EditorCopyLineDown: 'Editor: Copy Line Down',
-  EditorCopyLineUp: 'Editor: Copy Line Up',
-  Replace: 'replace',
-  NoResults: 'No Results'
-};
-const noDefinitionFound = () => {
-  return i18nString(UiStrings.NoDefinitionFound);
-};
-
-// @ts-ignore
-const noDefinitionFoundFor = word => {
-  return i18nString(UiStrings.NoDefinitionFoundFor, {
-    PH1: word
-  });
-};
-
-// @ts-ignore
-const noTypeDefinitionFoundFor = word => {
-  return i18nString(UiStrings.NoTypeDefinitionFoundFor, {
-    PH1: word
-  });
-};
-const noTypeDefinitionFound = () => {
-  return i18nString(UiStrings.NoTypeDefinitionFound);
-};
-const noResults = () => {
-  return i18nString(UiStrings.NoResults);
-};
-
-const None$1 = 'none';
-const Option = 'option';
-
-const getFileIconVirtualDom = icon => {
-  return {
-    type: Img,
-    className: FileIcon,
-    src: icon,
-    role: None$1,
-    childCount: 0
-  };
-};
-
-const getIconDom = (fileIcon, symbolName) => {
-  if (fileIcon) {
-    return getFileIconVirtualDom(fileIcon);
-  }
-  return {
-    type: Div,
-    className: `${ColoredMaskIcon} ${symbolName}`,
-    childCount: 0
-  };
-};
-
-const text = data => {
-  return {
-    type: Text,
-    text: data,
-    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 Deprecated = 1 << 0;
-
-const Property = 1;
-const Value = 2;
-const Function$1 = 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$1:
-      return SymbolFunction;
-    case Variable:
-      return SymbolVariable;
-    case Keyword:
-      return SymbolKeyword;
-    case Field:
-      return SymbolField;
-    case File:
-      return SymbolNone;
-    default:
-      return SymbolDefault;
-  }
-};
-
-const getHighlights = item => {
-  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.kind),
-    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;
-};
-
-/**
- *
- * @param {number} size
- * @param {number} contentSize
- * @param {number} minimumSliderSize
- * @returns
- */
-const getScrollBarSize = (size, contentSize, minimumSliderSize) => {
-  if (size >= contentSize) {
-    return 0;
-  }
-  return Math.max(Math.round(size ** 2 / contentSize), minimumSliderSize);
-};
-const getScrollBarOffset = (delta, finalDelta, size, scrollBarSize) => {
-  const scrollBarOffset = delta / finalDelta * (size - scrollBarSize);
-  return scrollBarOffset;
-};
-const getScrollBarY = getScrollBarOffset;
-const getScrollBarWidth = (width, longestLineWidth) => {
-  if (width > longestLineWidth) {
-    return 0;
-  }
-  return width ** 2 / longestLineWidth;
-};
-const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
-  const halfScrollBarHeight = scrollBarHeight / 2;
-  if (relativeY <= halfScrollBarHeight) {
-    // clicked at top
-    return {
-      percent: 0,
-      handleOffset: relativeY
-    };
-  }
-  if (relativeY <= height - halfScrollBarHeight) {
-    // clicked in middle
-    return {
-      percent: (relativeY - halfScrollBarHeight) / (height - scrollBarHeight),
-      handleOffset: halfScrollBarHeight
-    };
-  }
-  // clicked at bottom
-  return {
-    percent: 1,
-    handleOffset: scrollBarHeight - height + relativeY
-  };
-};
-
-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$3 = [renderItems, renderBounds$1, renderHeight, renderNegativeMargin, renderScrollBar];
-const renderCompletion = (oldState, newState) => {
-  const commands = [];
-  for (const item of render$3) {
-    if (!item.isEqual(oldState, newState)) {
-      commands.push(item.apply(oldState, newState));
-    }
-  }
-  return commands;
-};
-
-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 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:
-    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);
-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;
-  }
-  const highlights = traceHighlights(table, arrows, patternLength, wordLength);
-  return highlights;
-};
-
-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 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 RE_WORD_START$1 = /^[\w\-]+/;
-const RE_WORD_END$1 = /[\w\-]+$/;
-const getWordAt$1 = (line, columnIndex) => {
-  const before = line.slice(0, 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;
-  if (matchBefore) {
-    word += matchBefore[0];
-  }
-  if (matchAfter) {
-    word += matchAfter[0];
-  }
-  return {
-    word
-  };
-};
-const getWordBefore$1 = (line, columnIndex) => {
-  const before = line.slice(0, columnIndex);
-  const matchBefore = before.match(RE_WORD_END$1);
-  if (matchBefore) {
-    return matchBefore[0];
-  }
-  return EmptyString;
-};
-
-const getWordAt = (editor, rowIndex, columnIndex) => {
-  const {
-    lines
-  } = editor;
-  const line = lines[rowIndex];
-  return getWordAt$1(line, columnIndex);
-};
-const getWordBefore = (editor, rowIndex, columnIndex) => {
-  const {
-    lines
-  } = editor;
-  const line = lines[rowIndex];
-  return getWordBefore$1(line, columnIndex);
-};
-
-const render$2 = (oldState, newState) => {
-  const commands = renderCompletion(oldState, newState);
-  const wrappedCommands = [];
-  const uid = newState.uid;
-  for (const command of commands) {
-    wrappedCommands.push(['Viewlet.send', uid, ...command]);
-  }
-  return wrappedCommands;
-};
-const add = widget => {
-  const commands = render$2(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 remove$1 = widget => {
-  return [['Viewlet.send', widget.newState.uid, 'dispose']];
-};
-const handleEditorType$1 = (editor, state) => {
-  const {
-    unfilteredItems,
-    itemHeight,
-    maxHeight
-  } = state;
-  const {
-    selections
-  } = editor;
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  const x$1 = x(editor, rowIndex, columnIndex);
-  const y$1 = y(editor, rowIndex);
-  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: x$1,
-    y: y$1,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
-    leadingWord: wordAtOffset,
-    height,
-    finalDeltaY
-  };
-};
-const handleEditorDeleteLeft$1 = (editor, state) => {
-  const {
-    unfilteredItems,
-    itemHeight,
-    maxHeight
-  } = state;
-  const {
-    selections
-  } = editor;
-  const rowIndex = selections[0];
-  const columnIndex = selections[1];
-  const x$1 = x(editor, rowIndex, columnIndex);
-  const y$1 = y(editor, rowIndex);
-  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: x$1,
-    y: y$1,
-    maxLineY: newMaxLineY,
-    leadingWord: wordAtOffset,
-    height
-  };
-};
-
-const EditorCompletionWidget = {
-  __proto__: null,
-  add,
-  handleEditorDeleteLeft: handleEditorDeleteLeft$1,
-  handleEditorType: handleEditorType$1,
-  remove: remove$1,
-  render: render$2
-};
-
-const Completion = 'completion';
-
-const modules = Object.create(null);
-const register = (id, value) => {
-  modules[id] = value;
-};
-const get$7 = id => {
-  return modules[id];
-};
-
-const getModule$2 = id => {
-  return get$7(id);
-};
-
-const applyWidgetChange = (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);
-    return {
-      ...widget,
-      newState
-    };
-  }
-  if (changes.length === 1 && changes[0].origin === DeleteLeft && module.handleEditorDeleteLeft) {
-    const newState = module.handleEditorDeleteLeft(editor, widget.newState);
-    return {
-      ...widget,
-      newState
-    };
-  }
-  return widget;
-};
-
-const applyWidgetChanges = (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);
-    if (newWidget.newState) {
-      newWidgets.push(newWidget);
-    }
-  }
-  return newWidgets;
-};
-
-const splitLines$2 = lines => {
-  if (!lines) {
-    return [];
-  }
-  return lines.split('\n');
-};
-
-// based on https://github.com/microsoft/vscode/blob/c0769274fa136b45799edeccc0d0a2f645b75caf/src/vs/base/common/arrays.ts#L625 (License MIT)
-
-// @ts-ignore
-const insertInto = (array, start, newItems) => {
-  const originalLength = array.length;
-  const newItemsLength = newItems.length;
-  array.length = originalLength + newItemsLength;
-  // Move the items after the start index, start from the end so that we don't overwrite any value.
-  for (let i = originalLength - 1; i >= start; i--) {
-    array[i + newItemsLength] = array[i];
-  }
-  for (let i = 0; i < newItemsLength; i++) {
-    array[i + start] = newItems[i];
-  }
-};
-
-/**
- * Alternative to the native Array.splice method, it
- * can only support limited number of items due to the maximum call stack size limit.
- */
-// @ts-ignore
-const spliceLargeArray = (array, start, deleteCount, newItems) => {
-  const result = array.splice(start, deleteCount);
-  insertInto(array, start, newItems);
-  return result;
-};
-
-const joinLines$2 = lines => {
-  return lines.join('\n');
+const joinLines$2 = lines => {
+  return lines.join('\n');
 };
 
 // TODO have function for single edit (most common, avoid one array)
@@ -1521,6 +555,14 @@ const getSelectionPairs = (selections, i) => {
   return [first, second, third, fourth, 0];
 };
 
+const Dash = '-';
+const Dot = '.';
+const EmptyString = '';
+const Space = ' ';
+const Tab = '\t';
+const Underline = '_';
+const T = 't';
+
 const getTabCount = string => {
   let count = 0;
   for (const element of string) {
@@ -1531,6 +573,75 @@ const getTabCount = string => {
   return count;
 };
 
+const getFontString = (fontWeight, fontSize, fontFamily) => {
+  return `${fontWeight} ${fontSize}px ${fontFamily}`;
+};
+
+const getLetterSpacingString = letterSpacing => {
+  return `${letterSpacing}px`;
+};
+
+const createMeasureContext = () => {
+  const canvas = new OffscreenCanvas(0, 0);
+  const ctx = /** @type {OffscreenCanvasRenderingContext2D} */canvas.getContext('2d');
+  if (!ctx) {
+    throw new Error('Failed to get canvas context 2d');
+  }
+  return ctx;
+};
+
+const state$b = {
+  ctx: undefined
+};
+const getOrCreate = createCtx => {
+  if (state$b.ctx) {
+    return state$b.ctx;
+  }
+  state$b.ctx = createCtx();
+  return state$b.ctx;
+};
+
+const getContext = () => {
+  const ctx = getOrCreate(createMeasureContext);
+  return ctx;
+};
+
+const measureTextWidth = (text, fontWeight, fontSize, fontFamily, letterSpacing, isMonoSpaceFont, charWidth) => {
+  string(text);
+  number$1(fontWeight);
+  number$1(fontSize);
+  string(fontFamily);
+  boolean(isMonoSpaceFont);
+  number$1(charWidth);
+  if (isMonoSpaceFont) {
+    return text.length * charWidth;
+  }
+  if (typeof letterSpacing !== 'number') {
+    throw new TypeError('letterSpacing must be of type number');
+  }
+  const letterSpacingString = getLetterSpacingString(letterSpacing);
+  const fontString = getFontString(fontWeight, fontSize, fontFamily);
+  const ctx = getContext();
+  // @ts-ignore
+  ctx.letterSpacing = letterSpacingString;
+  // @ts-ignore
+  ctx.font = fontString;
+  // @ts-ignore
+  const metrics = ctx.measureText(text);
+  const width = metrics.width;
+  return width;
+};
+
+const normalizeText = (text, normalize, tabSize) => {
+  if (normalize) {
+    return text.replaceAll(Tab, Space.repeat(tabSize));
+  }
+  return text;
+};
+const shouldNormalizeText = text => {
+  return text.includes(Tab);
+};
+
 // TODO visible selections could also be uint16array
 // [top1, left1, width1, height1, top2, left2, width2, height2...]
 
@@ -1558,6 +669,7 @@ const getX = (line, column, fontWeight, fontSize, fontFamily, isMonospaceFont, l
   const partialText = normalizedLine.slice(0, column + tabCount);
   return measureTextWidth(partialText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, averageCharWidth) - halfCursorWidth + difference;
 };
+
 const getY = (row, minLineY, rowHeight) => {
   return (row - minLineY) * rowHeight;
 };
@@ -2067,7 +1179,7 @@ const set$5 = (id, fn) => {
 const get$5 = id => {
   return state$1$1.callbacks[id];
 };
-const remove = id => {
+const remove$1 = id => {
   delete state$1$1.callbacks[id];
 };
 const state$a = {
@@ -2113,7 +1225,7 @@ const resolve = (id, args) => {
     return;
   }
   fn(args);
-  remove(id);
+  remove$1(id);
 };
 const create$2$1 = (method, params) => {
   const {
@@ -2298,7 +1410,7 @@ const getErrorResponse = (message, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(message, errorProperty);
 };
-const create$4 = (message, result) => {
+const create$5 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -2307,7 +1419,7 @@ const create$4 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$4(message, resultProperty);
+  return create$5(message, resultProperty);
 };
 const getResponse = async (message, ipc, execute, preparePrettyError, logError, requiresSocket) => {
   try {
@@ -2504,7 +1616,7 @@ const waitForFirstMessage$1 = async port => {
   return event;
 };
 
-const create$3 = async () => {
+const create$4 = async () => {
   const {
     port1,
     port2
@@ -2549,7 +1661,7 @@ const wrap$3 = port => {
 
 const IpcParentWithExtensionHostWorker = {
   __proto__: null,
-  create: create$3,
+  create: create$4,
   wrap: wrap$3
 };
 
@@ -2557,7 +1669,7 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
   await invokeAndTransfer([port], 'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort');
 };
 
-const create$2 = async () => {
+const create$3 = async () => {
   const {
     port1,
     port2
@@ -2602,7 +1714,7 @@ const wrap$1 = port => {
 
 const IpcParentWithSyntaxHighlightingWorker = {
   __proto__: null,
-  create: create$2,
+  create: create$3,
   wrap: wrap$1
 };
 
@@ -2610,7 +1722,7 @@ const sendMessagePortToRendererProcess = async port => {
   await invokeAndTransfer([port], 'SendMessagePortToRendererProcess.sendMessagePortToRendererProcess', port, 'HandleMessagePort.handleMessagePort');
 };
 
-const create$1 = async () => {
+const create$2 = async () => {
   const {
     port1,
     port2
@@ -2655,7 +1767,7 @@ const wrap = port => {
 
 const IpcParentWithRendererProcess = {
   __proto__: null,
-  create: create$1,
+  create: create$2,
   wrap
 };
 
@@ -2672,7 +1784,7 @@ const getModule$1 = method => {
   }
 };
 
-const create = async ({
+const create$1 = async ({
   method,
   ...options
 }) => {
@@ -2690,7 +1802,7 @@ const create = async ({
 const createRpc = method => {
   let _ipc;
   const listen = async () => {
-    const ipc = await create({
+    const ipc = await create$1({
       method
     });
     handleIpc(ipc);
@@ -2954,6 +2066,180 @@ const editorReplaceSelections = (editor, replacement, origin) => {
   return replaceRange(editor, selections, replacement, origin);
 };
 
+const getAccurateColumnIndexAscii = (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth) => {
+  for (let i = guess; i < line.length; i++) {
+    const width = measureTextWidth(line.slice(0, i), fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+    if (eventX - width < averageCharWidth / 2) {
+      return i;
+    }
+  }
+  return line.length;
+};
+
+const supported = () => {
+  return 'Segmenter' in Intl;
+};
+const create = () => {
+  // @ts-ignore
+  const segmenter = new Intl.Segmenter();
+  return {
+    at(line, index) {
+      const segments = segmenter.segment(line);
+      return segments.containing(index);
+    },
+    visualIndex(line, index) {
+      const segments = segmenter.segment(line);
+      let currentVisualIndex = 0;
+      for (const segment of segments) {
+        if (segment.index >= index) {
+          return currentVisualIndex;
+        }
+        currentVisualIndex++;
+      }
+      return currentVisualIndex;
+    },
+    modelIndex(line, visualIndex) {
+      const segments = segmenter.segment(line);
+      let currentVisualIndex = 0;
+      for (const segment of segments) {
+        if (currentVisualIndex >= visualIndex) {
+          return segment.index;
+        }
+        currentVisualIndex++;
+      }
+      return line.length;
+    },
+    getSegments(line) {
+      return segmenter.segment(line);
+    }
+  };
+};
+
+// @ts-ignore
+const getAccurateColumnIndexUnicode = (line, guess, averageCharWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing) => {
+  const segmenter = create();
+  const segments = segmenter.getSegments(line);
+  const isMonospaceFont = false;
+  const charWidth = 0;
+  for (const segment of segments) {
+    const width = measureTextWidth(line.slice(0, segment.index), fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+    if (eventX - width < averageCharWidth) {
+      return segment.index;
+    }
+  }
+  return line.length;
+};
+
+const RE_ASCII = /^[\p{ASCII}]*$/u;
+const isAscii = line => {
+  return RE_ASCII.test(line);
+};
+
+// @ts-ignore
+const guessOffset = (eventX, averageCharWidth) => {
+  const guess = Math.round(eventX / averageCharWidth);
+  return guess;
+};
+
+// @ts-ignore
+const normalizeGuess = (line, guess, tabSize) => {
+  let normalizedGuess = guess;
+  for (let i = 0; i < guess; i++) {
+    if (line[i] === Tab) {
+      normalizedGuess -= tabSize - 1;
+    }
+  }
+  return normalizedGuess;
+};
+
+// @ts-ignore
+const getAccurateColumnIndex = (line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX) => {
+  string(line);
+  number$1(fontWeight);
+  number$1(fontSize);
+  string(fontFamily);
+  number$1(letterSpacing);
+  boolean(isMonospaceFont);
+  number$1(charWidth);
+  number$1(tabSize);
+  number$1(eventX);
+  // Assert.greaterZero(charWidth)
+  const guess = guessOffset(eventX, charWidth);
+  const normalize = shouldNormalizeText(line);
+  const normalizedGuess = normalizeGuess(line, guess, tabSize);
+  const text = line.slice(0, normalizedGuess);
+  const normalizedText = normalizeText(text, normalize, tabSize);
+  const actual = measureTextWidth(normalizedText, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+  const isAscii$1 = isAscii(line);
+  if (isAscii$1) {
+    if (Math.abs(eventX - actual) < charWidth / 2) {
+      return normalizedGuess;
+    }
+    return getAccurateColumnIndexAscii(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+  }
+  return getAccurateColumnIndexUnicode(line, normalizedGuess, charWidth, eventX, fontWeight, fontSize, fontFamily, letterSpacing);
+};
+
+const at = (editor, eventX, eventY) => {
+  object(editor);
+  number$1(eventX);
+  number$1(eventY);
+  const {
+    y,
+    deltaY,
+    rowHeight,
+    fontSize,
+    fontWeight,
+    fontFamily,
+    letterSpacing,
+    lines,
+    tabSize,
+    differences,
+    isMonospaceFont,
+    charWidth
+  } = editor;
+  const rowIndex = Math.floor((eventY - y + deltaY) / rowHeight);
+  if (rowIndex < 0) {
+    return {
+      rowIndex: 0,
+      columnIndex: 0
+    };
+  }
+  const clampedRowIndex = clamp(rowIndex, 0, lines.length - 1);
+  const line = lines[clampedRowIndex];
+  const columnIndex = getAccurateColumnIndex(line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX);
+  return {
+    rowIndex: clampedRowIndex,
+    columnIndex
+  };
+};
+
+/**
+ * @deprecated this doesn't work for variable width characters (unicode/emoji).
+ * Use position computation in renderer process instead
+ *
+ * @param {object} editor
+ * @param {number} rowIndex
+ * @param {number} columnIndex
+ * @returns
+ */
+const x = (editor, rowIndex, columnIndex) => {
+  const {
+    columnWidth,
+    x
+  } = editor;
+  const offsetX = columnIndex * columnWidth + x;
+  return offsetX;
+};
+const y = (editor, rowIndex) => {
+  const {
+    rowHeight,
+    y
+  } = editor;
+  const offsetY = (rowIndex + 1) * rowHeight + y;
+  return offsetY;
+};
+
 const state$7 = {
   timeout: -1
 };
@@ -3060,6 +2346,8 @@ const cancelSelection = editor => {
   return scheduleSelections(editor, newSelections);
 };
 
+const Completion = 'completion';
+
 const isCompletionWidget = widget => {
   return widget.id === Completion;
 };
@@ -3388,7 +2676,7 @@ const characterLeft = (line, columnIndex) => {
   if (!supported()) {
     return 1;
   }
-  const segmenter = create$5();
+  const segmenter = create();
   const last = segmenter.at(line, columnIndex - 1);
   return columnIndex - last.index;
 };
@@ -3401,7 +2689,7 @@ const characterRight = (line, columnIndex) => {
   if (!supported()) {
     return 1;
   }
-  const segmenter = create$5();
+  const segmenter = create();
   const next = segmenter.at(line, columnIndex);
   return next.segment.length;
 };
@@ -3946,12 +3234,94 @@ const format = async editor => {
   }
 };
 
+const RE_WORD_START$1 = /^[\w\-]+/;
+const RE_WORD_END$1 = /[\w\-]+$/;
+const getWordAt$1 = (line, columnIndex) => {
+  const before = line.slice(0, 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;
+  if (matchBefore) {
+    word += matchBefore[0];
+  }
+  if (matchAfter) {
+    word += matchAfter[0];
+  }
+  return {
+    word
+  };
+};
+const getWordBefore$1 = (line, columnIndex) => {
+  const before = line.slice(0, columnIndex);
+  const matchBefore = before.match(RE_WORD_END$1);
+  if (matchBefore) {
+    return matchBefore[0];
+  }
+  return EmptyString;
+};
+
+const getWordAt = (editor, rowIndex, columnIndex) => {
+  const {
+    lines
+  } = editor;
+  const line = lines[rowIndex];
+  return getWordAt$1(line, columnIndex);
+};
+const getWordBefore = (editor, rowIndex, columnIndex) => {
+  const {
+    lines
+  } = editor;
+  const line = lines[rowIndex];
+  return getWordBefore$1(line, columnIndex);
+};
+
 // @ts-ignore
 const getDefinition = async (editor, offset) => {
   const definition = await invoke$3('ExtensionHostDefinition.executeDefinitionProvider', editor, offset);
   return definition;
 };
 
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
+
+const UiStrings = {
+  GoToDefinition: 'Go to Definition',
+  NoDefinitionFound: 'No definition found',
+  NoDefinitionFoundFor: "No definition found for '{PH1}'",
+  NoTypeDefinitionFound: 'No type definition found',
+  NoTypeDefinitionFoundFor: "No type definition found for '{PH1}'",
+  NoResults: 'No Results'
+};
+const noDefinitionFound = () => {
+  return i18nString(UiStrings.NoDefinitionFound);
+};
+const noDefinitionFoundFor = word => {
+  return i18nString(UiStrings.NoDefinitionFoundFor, {
+    PH1: word
+  });
+};
+const noTypeDefinitionFoundFor = word => {
+  return i18nString(UiStrings.NoTypeDefinitionFoundFor, {
+    PH1: word
+  });
+};
+const noTypeDefinitionFound = () => {
+  return i18nString(UiStrings.NoTypeDefinitionFound);
+};
+const noResults = () => {
+  return i18nString(UiStrings.NoResults);
+};
+
 // @ts-ignore
 const goTo = async ({
   editor,
@@ -5187,8 +4557,197 @@ const resolveCompletion = async (editor, name, completionItem) => {
   }
 };
 
-const None = 1;
-
+const None$1 = 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);
+  }
+  return table;
+};
+
+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:
+    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);
+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;
+  }
+  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 getEditor = editorUid => {
   const instance = get$6(editorUid);
   if (!instance) {
@@ -5206,6 +4765,17 @@ const getFinalDeltaY = (height, itemHeight, itemsLength) => {
   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 RE_WORD = /[\w\-]+$/;
 const getWordAtOffset = editor => {
   const {
@@ -5222,7 +4792,7 @@ const getWordAtOffset = editor => {
   }
   return '';
 };
-const handleEditorType = (editorUid, state, text) => {
+const handleEditorType$1 = (editorUid, state, text) => {
   const editor = getEditor(editorUid);
   const {
     unfilteredItems,
@@ -5252,7 +4822,7 @@ const handleEditorType = (editorUid, state, text) => {
     finalDeltaY
   };
 };
-const handleEditorDeleteLeft = (editorUid, state) => {
+const handleEditorDeleteLeft$1 = (editorUid, state) => {
   const editor = getEditor(editorUid);
   const {
     unfilteredItems,
@@ -5266,7 +4836,7 @@ const handleEditorDeleteLeft = (editorUid, state) => {
   const y$1 = y(editor, rowIndex);
   const wordAtOffset = getWordAtOffset(editor);
   if (!wordAtOffset) {
-    editor.completionState = None;
+    editor.completionState = None$1;
     return {
       ...state,
       disposed: true
@@ -5292,7 +4862,7 @@ const dispose = state => {
   };
 };
 const disposeWithEditor = (state, editor) => {
-  editor.completionState = None;
+  editor.completionState = None$1;
   editor.completionUid = 0;
   // Focus.removeAdditionalFocus(FocusKey.EditorCompletion)
   return dispose(state);
@@ -5634,11 +5204,8 @@ const editorSelectAllLeft = editor => {
   editorSelectHorizontalLeft(editor, lineCharacterStart);
 };
 
-// @ts-ignore
-
 // TODO handle virtual space
 
-// @ts-ignore
 const getNewSelectionsSingleLineWord = (lines, word) => {
   if (word.length === 0) {
     throw new Error('word length must be greater than zero');
@@ -5653,8 +5220,6 @@ const getNewSelectionsSingleLineWord = (lines, word) => {
   }
   return new Uint32Array(newSelections);
 };
-
-// @ts-ignore
 const isMultiLineMatch = (lines, rowIndex, wordParts) => {
   let j = 0;
   if (!lines[rowIndex + j].endsWith(wordParts[j])) {
@@ -5675,11 +5240,11 @@ const isMultiLineMatch = (lines, rowIndex, wordParts) => {
 
 // TODO this is very expensive, there might be a better algorithm for this
 // TODO if this matches the given selections, don't schedule selections/rerender
-// @ts-ignore
 const getAllOccurrencesMultiLine = (lines, wordParts) => {
   const newSelections = [];
   for (let rowIndex = 0; rowIndex < lines.length - wordParts.length + 1; rowIndex) {
     if (isMultiLineMatch(lines, rowIndex, wordParts)) {
+      // @ts-ignore
       newSelections.push(rowIndex, lines[rowIndex].length - wordParts[0].length, rowIndex + wordParts.length - 1, wordParts.at(-1).length);
       rowIndex += wordParts.length - 1;
     } else {
@@ -5691,13 +5256,9 @@ const getAllOccurrencesMultiLine = (lines, wordParts) => {
 
 // TODO duplicate code with EditorSelectNextOccurrence
 const RE_ALPHA_NUMERIC$1 = /[a-zA-Z\d]/;
-
-// @ts-ignore
 const isAlphaNumeric$1 = char => {
   return RE_ALPHA_NUMERIC$1.test(char);
 };
-
-// @ts-ignore
 const getWordStartIndex$1 = (line, index) => {
   for (let i = index - 1; i >= 0; i--) {
     if (!isAlphaNumeric$1(line[i])) {
@@ -5706,8 +5267,6 @@ const getWordStartIndex$1 = (line, index) => {
   }
   return 0;
 };
-
-// @ts-ignore
 const getWordEndIndex$1 = (line, index) => {
   for (let i = index; i < line.length; i++) {
     if (!isAlphaNumeric$1(line[i])) {
@@ -5716,8 +5275,6 @@ const getWordEndIndex$1 = (line, index) => {
   }
   return line.length - 1;
 };
-
-// @ts-ignore
 const getWordMatchAtPosition$1 = (lines, rowIndex, columnIndex) => {
   const line = lines[rowIndex];
   const start = getWordStartIndex$1(line, columnIndex);
@@ -5729,8 +5286,6 @@ const getWordMatchAtPosition$1 = (lines, rowIndex, columnIndex) => {
     word
   };
 };
-
-// @ts-ignore
 const getNewSelections$3 = (lines, selections) => {
   if (selections.length < 4) {
     throw new Error('selections must have at least one entry');
@@ -5763,12 +5318,12 @@ const getNewSelections$3 = (lines, selections) => {
   const newSelections = getAllOccurrencesMultiLine(lines, wordParts);
   return newSelections;
 };
-
-// @ts-ignore
 const selectAllOccurrences = editor => {
   // when there are no selections -> first selection is word -> find all selection that include word
-  const lines = editor.lines;
-  const selections = editor.selections;
+  const {
+    lines,
+    selections
+  } = editor;
   const newSelections = getNewSelections$3(lines, selections);
   return scheduleSelections(editor, newSelections);
 };
@@ -7203,7 +6758,7 @@ const select = async (editor, completionItem) => {
   ();
   if (index !== -1) {
     editor.widgets.splice(index, 1);
-    editor.completionState = None;
+    editor.completionState = None$1;
     editor.completionUid = 0;
   }
   // TODO dispose completion widget
@@ -7266,7 +6821,7 @@ const getHover = async (editor, offset) => {
 
 let _ipc;
 const listen$5 = async () => {
-  const ipc = await create({
+  const ipc = await create$1({
     method: RendererProcess
   });
   handleIpc(ipc);
@@ -7495,6 +7050,14 @@ const handleSashPointerUp = (state, eventX, eventY) => {
   return state;
 };
 
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
+
 const getLineInfoVirtualDom = lineInfo => {
   const dom = [{
     type: Div,
@@ -7582,7 +7145,7 @@ const renderHoverDom = {
     return [/* method */'Viewlet.setDom2', dom];
   }
 };
-const renderBounds = {
+const renderBounds$1 = {
   isEqual(oldState, newState) {
     return oldState.x === newState.x && oldState.y === newState.y && oldState.resizedWidth === newState.resizedWidth;
   },
@@ -7600,10 +7163,10 @@ const renderBounds = {
     return [SetBounds, x, y, resizedWidth, height];
   }
 };
-const render$1 = [renderHoverDom, renderBounds];
+const render$3 = [renderHoverDom, renderBounds$1];
 const renderHover = async (oldState, newState) => {
   const commands = [];
-  for (const item of render$1) {
+  for (const item of render$3) {
     if (!item.isEqual(oldState, newState)) {
       commands.push(item.apply(oldState, newState));
     }
@@ -7909,7 +7472,7 @@ const moveLineUp = editor => {
 };
 
 const Link$1 = 'Link';
-const Function = 'Function';
+const Function$1 = 'Function';
 const Parameter = 'Parameter';
 const Type = 'Type';
 const VariableName = 'VariableName';
@@ -7968,7 +7531,7 @@ const getDecorationClassName = type => {
     case Ts3073:
     case Ts3077:
     case Ts3088:
-      return Function;
+      return Function$1;
     case Ts1792:
     case Ts1793:
       return Parameter;
@@ -8004,521 +7567,872 @@ const getDecorationClassName = type => {
       return `Unknown-${type}`;
   }
 };
-
-const getTokensViewportEmbedded = (langageId, lines, lineCache, linesWithEmbed) => {
-  const tokenizersToLoad = [];
-  const embeddedResults = [];
-  let topContext;
-  for (const index of linesWithEmbed) {
-    const result = lineCache[index + 1];
-    const line = lines[index];
-    if (result.embeddedLanguage) {
-      const {
-        embeddedLanguage,
-        embeddedLanguageStart,
-        embeddedLanguageEnd
-      } = result;
-      const embeddedTokenizer = getTokenizer(embeddedLanguage);
-      if (embeddedLanguageStart !== line.length && embeddedTokenizer && embeddedTokenizer !== TokenizePlainText) {
-        const isFull = embeddedLanguageStart === 0 && embeddedLanguageEnd === line.length;
-        const partialLine = line.slice(embeddedLanguageStart, embeddedLanguageEnd);
-        const embedResult = safeTokenizeLine(langageId, embeddedTokenizer.tokenizeLine, partialLine, topContext || getInitialLineState(embeddedTokenizer.initialLineState), embeddedTokenizer.hasArrayReturn);
-        topContext = embedResult;
-        result.embeddedResultIndex = embeddedResults.length;
-        embeddedResults.push({
-          result: embedResult,
-          TokenMap: embeddedTokenizer.TokenMap,
-          isFull
-        });
-      } else if (line.length === 0) {
-        const embedResult = {
-          tokens: []
-        };
-        result.embeddedResultIndex = embeddedResults.length;
-        embeddedResults.push({
-          result: embedResult,
-          isFull: true,
-          TokenMap: []
-        });
-      } else {
-        tokenizersToLoad.push(embeddedLanguage);
-        embeddedResults.push({
-          result: {},
-          isFull: false,
-          TokenMap: []
-        });
-        topContext = undefined;
-      }
-    } else {
-      topContext = undefined;
+
+const getTokensViewportEmbedded = (langageId, lines, lineCache, linesWithEmbed) => {
+  const tokenizersToLoad = [];
+  const embeddedResults = [];
+  let topContext;
+  for (const index of linesWithEmbed) {
+    const result = lineCache[index + 1];
+    const line = lines[index];
+    if (result.embeddedLanguage) {
+      const {
+        embeddedLanguage,
+        embeddedLanguageStart,
+        embeddedLanguageEnd
+      } = result;
+      const embeddedTokenizer = getTokenizer(embeddedLanguage);
+      if (embeddedLanguageStart !== line.length && embeddedTokenizer && embeddedTokenizer !== TokenizePlainText) {
+        const isFull = embeddedLanguageStart === 0 && embeddedLanguageEnd === line.length;
+        const partialLine = line.slice(embeddedLanguageStart, embeddedLanguageEnd);
+        const embedResult = safeTokenizeLine(langageId, embeddedTokenizer.tokenizeLine, partialLine, topContext || getInitialLineState(embeddedTokenizer.initialLineState), embeddedTokenizer.hasArrayReturn);
+        topContext = embedResult;
+        result.embeddedResultIndex = embeddedResults.length;
+        embeddedResults.push({
+          result: embedResult,
+          TokenMap: embeddedTokenizer.TokenMap,
+          isFull
+        });
+      } else if (line.length === 0) {
+        const embedResult = {
+          tokens: []
+        };
+        result.embeddedResultIndex = embeddedResults.length;
+        embeddedResults.push({
+          result: embedResult,
+          isFull: true,
+          TokenMap: []
+        });
+      } else {
+        tokenizersToLoad.push(embeddedLanguage);
+        embeddedResults.push({
+          result: {},
+          isFull: false,
+          TokenMap: []
+        });
+        topContext = undefined;
+      }
+    } else {
+      topContext = undefined;
+    }
+  }
+  return {
+    tokenizersToLoad,
+    embeddedResults
+  };
+};
+const getTokenizeEndIndex = (invalidStartIndex, endLineIndex, tokenizeStartIndex) => {
+  return invalidStartIndex < endLineIndex ? endLineIndex : tokenizeStartIndex;
+};
+
+// TODO only send changed lines to renderer process instead of all lines in viewport
+const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
+  const {
+    invalidStartIndex,
+    lineCache,
+    tokenizerId,
+    lines,
+    languageId
+  } = editor;
+  const tokenizer = get(tokenizerId);
+  const {
+    hasArrayReturn,
+    tokenizeLine,
+    initialLineState
+  } = tokenizer;
+  const tokenizeStartIndex = invalidStartIndex;
+  const tokenizeEndIndex = getTokenizeEndIndex(invalidStartIndex, endLineIndex, tokenizeStartIndex);
+  const tokenizersToLoad = [];
+  const embeddedResults = [];
+  const linesWithEmbed = [];
+  for (let i = tokenizeStartIndex; i < tokenizeEndIndex; i++) {
+    const lineState = i === 0 ? getInitialLineState(initialLineState) : lineCache[i];
+    const line = lines[i];
+    const result = safeTokenizeLine(languageId, tokenizeLine, line, lineState, hasArrayReturn);
+    // TODO if lineCacheEnd matches the one before, skip tokenizing lines after
+    lineCache[i + 1] = result;
+    if (result.embeddedLanguage) {
+      result.embeddedResultIndex = linesWithEmbed.length;
+      linesWithEmbed.push(i);
+    }
+  }
+  const visibleLines = lineCache.slice(startLineIndex + 1, endLineIndex + 1);
+  if (linesWithEmbed.length > 0) {
+    const {
+      tokenizersToLoad,
+      embeddedResults
+    } = getTokensViewportEmbedded(languageId, lines, lineCache, linesWithEmbed);
+    // TODO support lineCache with embedded content
+    editor.invalidStartIndex = 0;
+    return {
+      tokens: visibleLines,
+      tokenizersToLoad,
+      embeddedResults
+    };
+  }
+  editor.invalidStartIndex = Math.max(invalidStartIndex, tokenizeEndIndex);
+  return {
+    tokens: visibleLines,
+    tokenizersToLoad,
+    embeddedResults
+  };
+};
+
+const sentLines = Object.create(null);
+
+// TODO only send changed lines to renderer process instead of all lines in viewport
+const getTokensViewport2 = (editor, startLineIndex, endLineIndex, syncIncremental) => {
+  if (getEnabled$1()) {
+    if (syncIncremental) {
+      const {
+        invalidStartIndex,
+        lines,
+        languageId,
+        id
+      } = editor;
+      let hasLinesToSend = true;
+      let linesToSend = lines;
+      if (sentLines[id] === lines) {
+        hasLinesToSend = false;
+        linesToSend = [];
+      } else {
+        sentLines[id] = lines;
+      }
+      const slimEditor = {
+        languageId,
+        invalidStartIndex
+      };
+      return invoke$1('GetTokensViewport.getTokensViewport', slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
+    }
+    // TODO only send needed lines of text
+    return invoke$1('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
+  }
+  return getTokensViewport(editor, startLineIndex, endLineIndex);
+};
+
+const loadTokenizers = async languageIds => {
+  for (const languageId of languageIds) {
+    // @ts-ignore
+    await loadTokenizer(languageId);
+  }
+};
+
+// const getTokensIncremental = (editor, min, max) => {
+//   const currentLength = editor.lineStateCache.length
+//   const tokens = []
+//   const lines = editor.lines
+//   let lineState = editor.tokenizer.initialLineState
+//   for (let i = currentLength; i < max; i++) {
+//     const line = lines[i]
+//     try {
+//       lineState = editor.tokenizer.tokenizeLine(line, lineState)
+//       if (!lineState || !lineState.tokens || !lineState.state) {
+//         throw new Error('invalid tokenization result')
+//       }
+//     } catch (error) {
+//       tokens.push([{ length: line.length, type: 0 }])
+//       console.error(error)
+//       // renderWithoutSyntaxHighlighting(state, firstRow, lastRow)
+//       continue
+//     }
+//     const newTokens = lineState.tokens
+//     tokens.push(newTokens)
+//   }
+//   return tokens
+// }
+
+// const getLineInfosIncremental = (editor, tokens, minLineY, maxLineY) => {
+//   const result = []
+//   const lines = editor.lines
+//   const TokenMap = editor.tokenizer.TokenMap
+//   for (let i = minLineY; i < maxLineY; i++) {
+//     result.push(getLineInfo(lines[i], tokens[i], TokenMap))
+//   }
+//   return result
+// }
+
+const getStartDefaults = (tokens, minOffset) => {
+  let start = 0;
+  let end = 0;
+  let startIndex = 0;
+  const tokensLength = tokens.length;
+  for (let i = 0; i < tokensLength; i += 2) {
+    const tokenLength = tokens[i + 1];
+    end += tokenLength;
+    start = end;
+    if (start >= minOffset) {
+      start -= tokenLength;
+      end -= tokenLength;
+      startIndex = i;
+      break;
+    }
+  }
+  return {
+    start,
+    end,
+    startIndex
+  };
+};
+const getLineInfoEmbeddedFull = (embeddedResults, tokenResults, line, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset) => {
+  const lineInfo = [];
+  const embeddedResult = embeddedResults[tokenResults.embeddedResultIndex];
+  const embeddedTokens = embeddedResult.result.tokens;
+  const embeddedTokenMap = embeddedResult.TokenMap;
+  const tokensLength = embeddedTokens.length;
+  let {
+    startIndex,
+    start,
+    end
+  } = getStartDefaults(embeddedTokens, minOffset);
+  const difference = getDifference(start, averageCharWidth, deltaX);
+  for (let i = startIndex; i < tokensLength; i += 2) {
+    const tokenType = embeddedTokens[i];
+    const tokenLength = embeddedTokens[i + 1];
+    end += tokenLength;
+    const className = `Token ${embeddedTokenMap[tokenType] || 'Unknown'}`;
+    const text = line.slice(start, end);
+    const normalizedText = normalizeText(text, normalize, tabSize);
+    lineInfo.push(normalizedText, className);
+    start = end;
+    if (end >= maxOffset) {
+      break;
     }
   }
   return {
-    tokenizersToLoad,
-    embeddedResults
+    lineInfo,
+    difference
   };
 };
-const getTokenizeEndIndex = (invalidStartIndex, endLineIndex, tokenizeStartIndex) => {
-  return invalidStartIndex < endLineIndex ? endLineIndex : tokenizeStartIndex;
+const getOffsets = (deltaX, width, averageCharWidth) => {
+  // TODO accurately measure char widths using offscreen canvas
+  // and use fast measurements for monospace ascii text
+  if (deltaX === 0) {
+    return {
+      minOffset: 0,
+      maxOffset: Math.ceil(width / averageCharWidth)
+    };
+  }
+  const minOffset = Math.ceil(deltaX / averageCharWidth);
+  const maxOffset = minOffset + Math.ceil(width / averageCharWidth);
+  return {
+    minOffset,
+    maxOffset
+  };
+};
+const getDifference = (start, averageCharWidth, deltaX) => {
+  const beforeWidth = start * averageCharWidth;
+  const difference = beforeWidth - deltaX;
+  return difference;
+};
+const getLineInfoDefault = (line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset) => {
+  const lineInfo = [];
+  let decorationIndex = 0;
+  for (; decorationIndex < decorations.length; decorationIndex += 3) {
+    const decorationOffset = decorations[decorationIndex];
+    if (decorationOffset >= lineOffset) {
+      break;
+    }
+  }
+  const tokens = tokenResults.tokens;
+  let {
+    startIndex,
+    start,
+    end
+  } = getStartDefaults(tokens, minOffset);
+  const difference = getDifference(start, averageCharWidth, deltaX);
+  const tokensLength = tokens.length;
+  for (let i = startIndex; i < tokensLength; i += 2) {
+    const tokenType = tokens[i];
+    const tokenLength = tokens[i + 1];
+    const decorationOffset = decorations[decorationIndex];
+    let extraClassName = '';
+    if (decorationOffset !== undefined && decorationOffset - lineOffset === start) {
+      // @ts-ignore
+      decorations[++decorationIndex];
+      const decorationType = decorations[++decorationIndex];
+      // @ts-ignore
+      decorations[++decorationIndex];
+      // console.log('MATCHING DECORATION', {
+      //   decorationIndex,
+      //   decorationLength,
+      //   decorationType,
+      //   decorationModifiers,
+      // })
+      extraClassName = getDecorationClassName(decorationType);
+    }
+    end += tokenLength;
+    const text = line.slice(start, end);
+    const className = `Token ${extraClassName || TokenMap[tokenType] || 'Unknown'}`;
+    const normalizedText = normalizeText(text, normalize, tabSize);
+    lineInfo.push(normalizedText, className);
+    start = end;
+    if (end >= maxOffset) {
+      break;
+    }
+  }
+  return {
+    lineInfo,
+    difference
+  };
+};
+const getLineInfo = (line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth) => {
+  const {
+    minOffset,
+    maxOffset
+  } = getOffsets(deltaX, width, averageCharWidth);
+  if (embeddedResults.length > 0 && tokenResults.embeddedResultIndex !== undefined) {
+    const embeddedResult = embeddedResults[tokenResults.embeddedResultIndex];
+    if (embeddedResult && embeddedResult.isFull) {
+      return getLineInfoEmbeddedFull(embeddedResults, tokenResults, line, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset);
+    }
+  }
+  return getLineInfoDefault(line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset);
 };
 
-// TODO only send changed lines to renderer process instead of all lines in viewport
-const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
+// TODO need lots of tests for this
+const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLineY, minLineOffset, width, deltaX, averageCharWidth) => {
+  const result = [];
+  const differences = [];
   const {
-    invalidStartIndex,
-    lineCache,
-    tokenizerId,
     lines,
+    decorations,
     languageId
   } = editor;
-  const tokenizer = get(tokenizerId);
-  const {
-    hasArrayReturn,
-    tokenizeLine,
-    initialLineState
-  } = tokenizer;
-  const tokenizeStartIndex = invalidStartIndex;
-  const tokenizeEndIndex = getTokenizeEndIndex(invalidStartIndex, endLineIndex, tokenizeStartIndex);
-  const tokenizersToLoad = [];
-  const embeddedResults = [];
-  const linesWithEmbed = [];
-  for (let i = tokenizeStartIndex; i < tokenizeEndIndex; i++) {
-    const lineState = i === 0 ? getInitialLineState(initialLineState) : lineCache[i];
+  const tokenMap = get$1(languageId);
+  let offset = minLineOffset;
+  const tabSize = 2;
+  for (let i = minLineY; i < maxLineY; i++) {
     const line = lines[i];
-    const result = safeTokenizeLine(languageId, tokenizeLine, line, lineState, hasArrayReturn);
-    // TODO if lineCacheEnd matches the one before, skip tokenizing lines after
-    lineCache[i + 1] = result;
-    if (result.embeddedLanguage) {
-      result.embeddedResultIndex = linesWithEmbed.length;
-      linesWithEmbed.push(i);
-    }
-  }
-  const visibleLines = lineCache.slice(startLineIndex + 1, endLineIndex + 1);
-  if (linesWithEmbed.length > 0) {
+    const normalize = shouldNormalizeText(line);
     const {
-      tokenizersToLoad,
-      embeddedResults
-    } = getTokensViewportEmbedded(languageId, lines, lineCache, linesWithEmbed);
-    // TODO support lineCache with embedded content
-    editor.invalidStartIndex = 0;
-    return {
-      tokens: visibleLines,
-      tokenizersToLoad,
-      embeddedResults
-    };
+      lineInfo,
+      difference
+    } = getLineInfo(line, tokens[i - minLineY], embeddedResults, decorations, tokenMap, offset, normalize, tabSize, width, deltaX, averageCharWidth);
+    result.push(lineInfo);
+    differences.push(difference);
+    offset += line.length + 1;
   }
-  editor.invalidStartIndex = Math.max(invalidStartIndex, tokenizeEndIndex);
   return {
-    tokens: visibleLines,
+    result,
+    differences
+  };
+};
+const getVisible = async (editor, syncIncremental) => {
+  // console.log({ editor })
+  // TODO should separate rendering from business logic somehow
+  // currently hard to test because need to mock editor height, top, left,
+  // invalidStartIndex, lineCache, etc. just for testing editorType
+  // editor.invalidStartIndex = changes[0].start.rowIndex
+  // @ts-ignore
+  const {
+    minLineY,
+    numberOfVisibleLines,
+    lines,
+    width,
+    deltaX,
+    fontWeight,
+    fontSize,
+    fontFamily,
+    letterSpacing,
+    charWidth
+  } = editor;
+  const maxLineY = Math.min(minLineY + numberOfVisibleLines, lines.length);
+  const {
+    tokens,
     tokenizersToLoad,
     embeddedResults
+  } = await getTokensViewport2(editor, minLineY, maxLineY, syncIncremental);
+  const minLineOffset = offsetAtSync(editor, minLineY, 0);
+  const averageCharWidth = charWidth;
+  const {
+    result,
+    differences
+  } = getLineInfosViewport(editor, tokens, embeddedResults, minLineY, maxLineY, minLineOffset, width, deltaX, averageCharWidth);
+  if (tokenizersToLoad.length > 0) {
+    loadTokenizers(tokenizersToLoad);
+  }
+  return {
+    textInfos: result,
+    differences
   };
 };
 
-const sentLines = Object.create(null);
-
-// TODO only send changed lines to renderer process instead of all lines in viewport
-const getTokensViewport2 = (editor, startLineIndex, endLineIndex, syncIncremental) => {
-  if (getEnabled$1()) {
-    if (syncIncremental) {
-      const {
-        invalidStartIndex,
-        lines,
-        languageId,
-        id
-      } = editor;
-      let hasLinesToSend = true;
-      let linesToSend = lines;
-      if (sentLines[id] === lines) {
-        hasLinesToSend = false;
-        linesToSend = [];
-      } else {
-        sentLines[id] = lines;
-      }
-      const slimEditor = {
-        languageId,
-        invalidStartIndex
-      };
-      return invoke$1('GetTokensViewport.getTokensViewport', slimEditor, startLineIndex, endLineIndex, hasLinesToSend, id, linesToSend);
-    }
-    // TODO only send needed lines of text
-    return invoke$1('GetTokensViewport.getTokensViewport', editor, startLineIndex, endLineIndex, true, editor.id, editor.lines);
+const getCursorsVirtualDom = cursors => {
+  const dom = [];
+  for (const translate of cursors) {
+    dom.push({
+      type: Div,
+      className: EditorCursor,
+      translate
+    });
   }
-  return getTokensViewport(editor, startLineIndex, endLineIndex);
+  return dom;
 };
 
-const loadTokenizers = async languageIds => {
-  for (const languageId of languageIds) {
-    // @ts-ignore
-    await loadTokenizer(languageId);
+const Error$1 = 'error';
+const Warning = 'warning';
+
+const getDiagnosticClassName = type => {
+  // TODO use classnames enum
+  switch (type) {
+    case Error$1:
+      return 'DiagnosticError';
+    case Warning:
+      return 'DiagnosticWarning';
+    default:
+      return 'DiagnosticError';
   }
 };
+const getDiagnosticVirtualDom = diagnostic => {
+  const {
+    x,
+    y,
+    width,
+    height,
+    type
+  } = diagnostic;
+  const extraClassName = getDiagnosticClassName(type);
+  return [{
+    type: Div,
+    className: `${Diagnostic} ${extraClassName}`,
+    width,
+    height,
+    top: y,
+    left: x,
+    childCount: 0
+  }];
+};
 
-// const getTokensIncremental = (editor, min, max) => {
-//   const currentLength = editor.lineStateCache.length
-//   const tokens = []
-//   const lines = editor.lines
-//   let lineState = editor.tokenizer.initialLineState
-//   for (let i = currentLength; i < max; i++) {
-//     const line = lines[i]
-//     try {
-//       lineState = editor.tokenizer.tokenizeLine(line, lineState)
-//       if (!lineState || !lineState.tokens || !lineState.state) {
-//         throw new Error('invalid tokenization result')
-//       }
-//     } catch (error) {
-//       tokens.push([{ length: line.length, type: 0 }])
-//       console.error(error)
-//       // renderWithoutSyntaxHighlighting(state, firstRow, lastRow)
-//       continue
-//     }
-//     const newTokens = lineState.tokens
-//     tokens.push(newTokens)
-//   }
-//   return tokens
-// }
+const getDiagnosticsVirtualDom = diagnostics => {
+  const dom = diagnostics.flatMap(getDiagnosticVirtualDom);
+  return dom;
+};
 
-// const getLineInfosIncremental = (editor, tokens, minLineY, maxLineY) => {
-//   const result = []
-//   const lines = editor.lines
-//   const TokenMap = editor.tokenizer.TokenMap
-//   for (let i = minLineY; i < maxLineY; i++) {
-//     result.push(getLineInfo(lines[i], tokens[i], TokenMap))
-//   }
-//   return result
-// }
+const getGutterInfoVirtualDom = gutterInfo => {
+  return [{
+    type: Span,
+    className: 'LineNumber',
+    childCount: 1
+  }, text(gutterInfo)];
+};
+const getEditorGutterVirtualDom = gutterInfos => {
+  const dom = gutterInfos.flatMap(getGutterInfoVirtualDom);
+  return dom;
+};
 
-const getStartDefaults = (tokens, minOffset) => {
-  let start = 0;
-  let end = 0;
-  let startIndex = 0;
-  const tokensLength = tokens.length;
-  for (let i = 0; i < tokensLength; i += 2) {
-    const tokenLength = tokens[i + 1];
-    end += tokenLength;
-    start = end;
-    if (start >= minOffset) {
-      start -= tokenLength;
-      end -= tokenLength;
-      startIndex = i;
-      break;
+const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true) => {
+  const dom = [];
+  for (let i = 0; i < textInfos.length; i++) {
+    const textInfo = textInfos[i];
+    const difference = differences[i];
+    dom.push({
+      type: Div,
+      className: EditorRow,
+      translate: px(difference),
+      childCount: textInfo.length / 2
+    });
+    for (let j = 0; j < textInfo.length; j += 2) {
+      const tokenText = textInfo[j];
+      const className = textInfo[j + 1];
+      dom.push({
+        type: Span,
+        className,
+        childCount: 1
+      }, text(tokenText));
     }
   }
-  return {
-    start,
-    end,
-    startIndex
-  };
+  return dom;
 };
-const getLineInfoEmbeddedFull = (embeddedResults, tokenResults, line, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset) => {
-  const lineInfo = [];
-  const embeddedResult = embeddedResults[tokenResults.embeddedResultIndex];
-  const embeddedTokens = embeddedResult.result.tokens;
-  const embeddedTokenMap = embeddedResult.TokenMap;
-  const tokensLength = embeddedTokens.length;
-  let {
-    startIndex,
-    start,
-    end
-  } = getStartDefaults(embeddedTokens, minOffset);
-  const difference = getDifference(start, averageCharWidth, deltaX);
-  for (let i = startIndex; i < tokensLength; i += 2) {
-    const tokenType = embeddedTokens[i];
-    const tokenLength = embeddedTokens[i + 1];
-    end += tokenLength;
-    const className = `Token ${embeddedTokenMap[tokenType] || 'Unknown'}`;
-    const text = line.slice(start, end);
-    const normalizedText = normalizeText(text, normalize, tabSize);
-    lineInfo.push(normalizedText, className);
-    start = end;
-    if (end >= maxOffset) {
-      break;
+
+const getIncrementalEdits = async (oldState, newState) => {
+  if (!newState.undoStack) {
+    return undefined;
+  }
+  const lastChanges = newState.undoStack.at(-1);
+  if (lastChanges && lastChanges.length === 1) {
+    const lastChange = lastChanges[0];
+    if (lastChange.origin === EditorType) {
+      const rowIndex = lastChange.start.rowIndex;
+      const lines = newState.lines;
+      const oldLine = oldState.lines[rowIndex];
+      const newLine = lines[rowIndex];
+      const incrementalEdits = await invoke$1('TokenizeIncremental.tokenizeIncremental', newState.uid, newState.languageId, oldLine, newLine, rowIndex, newState.minLineY);
+      if (incrementalEdits && incrementalEdits.length === 1) {
+        return incrementalEdits;
+      }
     }
   }
+  return undefined;
+};
+
+const getSelectionsVirtualDom = selections => {
+  const dom = [];
+  for (let i = 0; i < selections.length; i += 4) {
+    const x = selections[i];
+    const y = selections[i + 1];
+    const width = selections[i + 2];
+    const height = selections[i + 3];
+    dom.push({
+      type: Div,
+      className: EditorSelection,
+      left: x,
+      top: y,
+      width,
+      height
+    });
+  }
+  return dom;
+};
+
+const None = 'none';
+const Option = 'option';
+
+const getFileIconVirtualDom = icon => {
   return {
-    lineInfo,
-    difference
+    type: Img,
+    className: FileIcon,
+    src: icon,
+    role: None,
+    childCount: 0
   };
 };
-const getOffsets = (deltaX, width, averageCharWidth) => {
-  // TODO accurately measure char widths using offscreen canvas
-  // and use fast measurements for monospace ascii text
-  if (deltaX === 0) {
-    return {
-      minOffset: 0,
-      maxOffset: Math.ceil(width / averageCharWidth)
-    };
+
+const getIconDom = (fileIcon, symbolName) => {
+  if (fileIcon) {
+    return getFileIconVirtualDom(fileIcon);
   }
-  const minOffset = Math.ceil(deltaX / averageCharWidth);
-  const maxOffset = minOffset + Math.ceil(width / averageCharWidth);
   return {
-    minOffset,
-    maxOffset
+    type: Div,
+    className: `${ColoredMaskIcon} ${symbolName}`,
+    childCount: 0
   };
 };
-const getDifference = (start, averageCharWidth, deltaX) => {
-  const beforeWidth = start * averageCharWidth;
-  const difference = beforeWidth - deltaX;
-  return difference;
+
+const label1 = {
+  type: Div,
+  className: Label,
+  childCount: 1
 };
-const getLineInfoDefault = (line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset) => {
-  const lineInfo = [];
-  let decorationIndex = 0;
-  for (; decorationIndex < decorations.length; decorationIndex += 3) {
-    const decorationOffset = decorations[decorationIndex];
-    if (decorationOffset >= lineOffset) {
-      break;
-    }
+const completionHighlight = {
+  type: Span,
+  className: EditorCompletionItemHighlight,
+  childCount: 1
+};
+const getHighlightedLabelDom = (label, highlights) => {
+  if (highlights.length === 0) {
+    return [label1, text(label)];
   }
-  const tokens = tokenResults.tokens;
-  let {
-    startIndex,
-    start,
-    end
-  } = getStartDefaults(tokens, minOffset);
-  const difference = getDifference(start, averageCharWidth, deltaX);
-  const tokensLength = tokens.length;
-  for (let i = startIndex; i < tokensLength; i += 2) {
-    const tokenType = tokens[i];
-    const tokenLength = tokens[i + 1];
-    const decorationOffset = decorations[decorationIndex];
-    let extraClassName = '';
-    if (decorationOffset !== undefined && decorationOffset - lineOffset === start) {
-      // @ts-ignore
-      decorations[++decorationIndex];
-      const decorationType = decorations[++decorationIndex];
-      // @ts-ignore
-      decorations[++decorationIndex];
-      // console.log('MATCHING DECORATION', {
-      //   decorationIndex,
-      //   decorationLength,
-      //   decorationType,
-      //   decorationModifiers,
-      // })
-      extraClassName = getDecorationClassName(decorationType);
-    }
-    end += tokenLength;
-    const text = line.slice(start, end);
-    const className = `Token ${extraClassName || TokenMap[tokenType] || 'Unknown'}`;
-    const normalizedText = normalizeText(text, normalize, tabSize);
-    lineInfo.push(normalizedText, className);
-    start = end;
-    if (end >= maxOffset) {
-      break;
+  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;
   }
-  return {
-    lineInfo,
-    difference
-  };
+  if (position < label.length) {
+    const afterText = label.slice(position);
+    labelDom.childCount++;
+    dom.push(text(afterText));
+  }
+  return dom;
 };
-const getLineInfo = (line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth) => {
+
+const getCompletionItemVirtualDom = visibleItem => {
   const {
-    minOffset,
-    maxOffset
-  } = getOffsets(deltaX, width, averageCharWidth);
-  if (embeddedResults.length > 0 && tokenResults.embeddedResultIndex !== undefined) {
-    const embeddedResult = embeddedResults[tokenResults.embeddedResultIndex];
-    if (embeddedResult && embeddedResult.isFull) {
-      return getLineInfoEmbeddedFull(embeddedResults, tokenResults, line, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset);
-    }
+    top,
+    label,
+    symbolName,
+    highlights,
+    focused,
+    deprecated,
+    fileIcon
+  } = visibleItem;
+  let className = EditorCompletionItem;
+  if (focused) {
+    className += ' ' + EditorCompletionItemFocused;
   }
-  return getLineInfoDefault(line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth, minOffset, maxOffset);
+  if (deprecated) {
+    className += ' ' + EditorCompletionItemDeprecated;
+  }
+  return [{
+    type: Div,
+    role: Option,
+    className,
+    top,
+    childCount: 2
+  }, getIconDom(fileIcon, symbolName), ...getHighlightedLabelDom(label, highlights)];
 };
 
-// TODO need lots of tests for this
-const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLineY, minLineOffset, width, deltaX, averageCharWidth) => {
-  const result = [];
-  const differences = [];
-  const {
-    lines,
-    decorations,
-    languageId
-  } = editor;
-  const tokenMap = get$1(languageId);
-  let offset = minLineOffset;
-  const tabSize = 2;
-  for (let i = minLineY; i < maxLineY; i++) {
-    const line = lines[i];
-    const normalize = shouldNormalizeText(line);
-    const {
-      lineInfo,
-      difference
-    } = getLineInfo(line, tokens[i - minLineY], embeddedResults, decorations, tokenMap, offset, normalize, tabSize, width, deltaX, averageCharWidth);
-    result.push(lineInfo);
-    differences.push(difference);
-    offset += line.length + 1;
+const getCompletionItemsVirtualDom = visibleItems => {
+  if (visibleItems.length === 0) {
+    return [{
+      type: Div,
+      childCount: 1
+    }, text(noResults())];
   }
-  return {
-    result,
-    differences
+  const root = {
+    type: Div,
+    childCount: visibleItems.length
   };
+  const dom = [root, ...visibleItems.flatMap(getCompletionItemVirtualDom)];
+  return dom;
 };
-const getVisible = async (editor, syncIncremental) => {
-  // console.log({ editor })
-  // TODO should separate rendering from business logic somehow
-  // currently hard to test because need to mock editor height, top, left,
-  // invalidStartIndex, lineCache, etc. just for testing editorType
-  // editor.invalidStartIndex = changes[0].start.rowIndex
-  // @ts-ignore
-  const {
-    minLineY,
-    numberOfVisibleLines,
-    lines,
-    width,
-    deltaX,
-    fontWeight,
-    fontSize,
-    fontFamily,
-    letterSpacing,
-    charWidth
-  } = editor;
-  const maxLineY = Math.min(minLineY + numberOfVisibleLines, lines.length);
-  const {
-    tokens,
-    tokenizersToLoad,
-    embeddedResults
-  } = await getTokensViewport2(editor, minLineY, maxLineY, syncIncremental);
-  const minLineOffset = offsetAtSync(editor, minLineY, 0);
-  const averageCharWidth = charWidth;
-  const {
-    result,
-    differences
-  } = getLineInfosViewport(editor, tokens, embeddedResults, minLineY, maxLineY, minLineOffset, width, deltaX, averageCharWidth);
-  if (tokenizersToLoad.length > 0) {
-    loadTokenizers(tokenizersToLoad);
+
+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;
+    case Folder:
+      return EmptyString;
+    default:
+      return EmptyString;
   }
+};
+
+const getHighlights = item => {
+  const {
+    matches
+  } = item;
+  return matches.slice(1);
+};
+
+const getLabel = item => {
+  return item.label;
+};
+const getVisibleIem = (item, itemHeight, leadingWord, i, focusedIndex) => {
   return {
-    textInfos: result,
-    differences
+    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 getCursorsVirtualDom = cursors => {
-  const dom = [];
-  for (const translate of cursors) {
-    dom.push({
-      type: Div,
-      className: EditorCursor,
-      translate
-    });
+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 dom;
+  return visibleItems;
 };
 
-const Error$1 = 'error';
-const Warning = 'warning';
-
-const getDiagnosticClassName = type => {
-  // TODO use classnames enum
-  switch (type) {
-    case Error$1:
-      return 'DiagnosticError';
-    case Warning:
-      return 'DiagnosticWarning';
-    default:
-      return 'DiagnosticError';
+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 getDiagnosticVirtualDom = diagnostic => {
-  const {
-    x,
-    y,
-    width,
-    height,
-    type
-  } = diagnostic;
-  const extraClassName = getDiagnosticClassName(type);
-  return [{
-    type: Div,
-    className: `${Diagnostic} ${extraClassName}`,
-    width,
-    height,
-    top: y,
-    left: x,
-    childCount: 0
-  }];
+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 getDiagnosticsVirtualDom = diagnostics => {
-  const dom = diagnostics.flatMap(getDiagnosticVirtualDom);
-  return dom;
+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 getGutterInfoVirtualDom = gutterInfo => {
-  return [{
-    type: Span,
-    className: 'LineNumber',
-    childCount: 1
-  }, text(gutterInfo)];
+const renderNegativeMargin = {
+  isEqual(oldState, newState) {
+    return oldState.deltaY === newState.deltaY;
+  },
+  apply(oldState, newState) {
+    return [/* method */SetNegativeMargin, /* negativeMargin */-newState.deltaY];
+  }
 };
-const getEditorGutterVirtualDom = gutterInfos => {
-  const dom = gutterInfos.flatMap(getGutterInfoVirtualDom);
-  return dom;
+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 getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true) => {
-  const dom = [];
-  for (let i = 0; i < textInfos.length; i++) {
-    const textInfo = textInfos[i];
-    const difference = differences[i];
-    dom.push({
-      type: Div,
-      className: EditorRow,
-      translate: px(difference),
-      childCount: textInfo.length / 2
-    });
-    for (let j = 0; j < textInfo.length; j += 2) {
-      const tokenText = textInfo[j];
-      const className = textInfo[j + 1];
-      dom.push({
-        type: Span,
-        className,
-        childCount: 1
-      }, text(tokenText));
+const render$2 = [renderItems, renderBounds, renderHeight, renderNegativeMargin, renderScrollBar];
+const renderCompletion = (oldState, newState) => {
+  const commands = [];
+  for (const item of render$2) {
+    if (!item.isEqual(oldState, newState)) {
+      commands.push(item.apply(oldState, newState));
     }
   }
-  return dom;
+  return commands;
 };
 
-const getIncrementalEdits = async (oldState, newState) => {
-  if (!newState.undoStack) {
-    return undefined;
+const render$1 = (oldState, newState) => {
+  const commands = renderCompletion(oldState, newState);
+  const wrappedCommands = [];
+  const uid = newState.uid;
+  for (const command of commands) {
+    wrappedCommands.push(['Viewlet.send', uid, ...command]);
   }
-  const lastChanges = newState.undoStack.at(-1);
-  if (lastChanges && lastChanges.length === 1) {
-    const lastChange = lastChanges[0];
-    if (lastChange.origin === EditorType) {
-      const rowIndex = lastChange.start.rowIndex;
-      const lines = newState.lines;
-      const oldLine = oldState.lines[rowIndex];
-      const newLine = lines[rowIndex];
-      const incrementalEdits = await invoke$1('TokenizeIncremental.tokenizeIncremental', newState.uid, newState.languageId, oldLine, newLine, rowIndex, newState.minLineY);
-      if (incrementalEdits && incrementalEdits.length === 1) {
-        return incrementalEdits;
-      }
-    }
+  return wrappedCommands;
+};
+const add = widget => {
+  const commands = render$1(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 remove = widget => {
+  return [['Viewlet.send', widget.newState.uid, 'dispose']];
+};
+const handleEditorType = (editor, state) => {
+  const {
+    unfilteredItems,
+    itemHeight,
+    maxHeight
+  } = state;
+  const {
+    selections
+  } = editor;
+  const rowIndex = selections[0];
+  const columnIndex = selections[1];
+  const x$1 = x(editor, rowIndex, columnIndex);
+  const y$1 = y(editor, rowIndex);
+  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: x$1,
+    y: y$1,
+    minLineY: newMinLineY,
+    maxLineY: newMaxLineY,
+    leadingWord: wordAtOffset,
+    height,
+    finalDeltaY
+  };
+};
+const handleEditorDeleteLeft = (editor, state) => {
+  const {
+    unfilteredItems,
+    itemHeight,
+    maxHeight
+  } = state;
+  const {
+    selections
+  } = editor;
+  const rowIndex = selections[0];
+  const columnIndex = selections[1];
+  const x$1 = x(editor, rowIndex, columnIndex);
+  const y$1 = y(editor, rowIndex);
+  const wordAtOffset = getWordBefore(editor, rowIndex, columnIndex);
+  if (!wordAtOffset) {
+    return undefined;
   }
-  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: x$1,
+    y: y$1,
+    maxLineY: newMaxLineY,
+    leadingWord: wordAtOffset,
+    height
+  };
 };
 
-const getSelectionsVirtualDom = selections => {
-  const dom = [];
-  for (let i = 0; i < selections.length; i += 4) {
-    const x = selections[i];
-    const y = selections[i + 1];
-    const width = selections[i + 2];
-    const height = selections[i + 3];
-    dom.push({
-      type: Div,
-      className: EditorSelection,
-      left: x,
-      top: y,
-      width,
-      height
-    });
-  }
-  return dom;
+const EditorCompletionWidget = {
+  __proto__: null,
+  add,
+  handleEditorDeleteLeft,
+  handleEditorType,
+  remove,
+  render: render$1
 };
 
 const addWidget = widget => {
@@ -8538,7 +8452,7 @@ const renderWidget = widget => {
   } = widget;
   switch (id) {
     case Completion:
-      return render$2(widget.oldState, widget.newState);
+      return render$1(widget.oldState, widget.newState);
     default:
       throw new Error(`unsupported widget`);
   }
@@ -8549,7 +8463,7 @@ const removeWidget = widget => {
   } = widget;
   switch (id) {
     case Completion:
-      return remove$1(widget);
+      return remove(widget);
     default:
       throw new Error('unsupported widget');
   }
@@ -8897,8 +8811,8 @@ const commandMap = {
   'EditorCompletion.focusPrevious': focusPrevious$1,
   'EditorCompletion.handleEditorBlur': handleEditorBlur,
   'EditorCompletion.handleEditorClick': handleEditorClick,
-  'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft,
-  'EditorCompletion.handleEditorType': handleEditorType,
+  'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft$1,
+  'EditorCompletion.handleEditorType': handleEditorType$1,
   'EditorCompletion.loadContent': loadContent$2,
   'EditorCompletion.selectCurrent': selectCurrent,
   'EditorCompletion.selectIndex': selectIndex,