@lvce-editor/static-server 0.69.2 → 0.69.3

package/static/{5f26f20 → 446ae80}/packages/editor-worker/dist/editorWorkerMain.js

@@ -1309,15 +1309,15 @@ const launchWorker = async (name, url, intializeCommand) => {
   // @ts-ignore
   await invokeAndTransfer$1('IpcParent.create', {
     method: ModuleWorkerAndWorkaroundForChromeDevtoolsBug,
-    url,
     name: name,
+    port: port1,
     raw: true,
-    port: port1
+    url
   });
   const rpc = await MessagePortRpcParent.create({
     commandMap: {},
-    messagePort: port2,
-    isMessagePortOpen: true
+    isMessagePortOpen: true,
+    messagePort: port2
   });
   port2.start();
   if (intializeCommand) {
@@ -1346,11 +1346,11 @@ const invoke$9 = async (method, ...params) => {
 
 const loadContent$2 = async (state, parentUid) => {
   const {
+    height,
     uid,
-    x,
-    y,
     width,
-    height
+    x,
+    y
   } = state;
   await invoke$9('ColorPicker.create', uid, x, y, width, height, parentUid);
   await invoke$9('ColorPicker.loadContent', uid);
@@ -1433,8 +1433,8 @@ const set$6 = (id, oldEditor, newEditor) => {
   object(oldEditor);
   object(newEditor);
   editors[id] = {
-    oldState: oldEditor,
-    newState: newEditor
+    newState: newEditor,
+    oldState: oldEditor
   };
 };
 
@@ -1495,29 +1495,18 @@ const getDecorationClassName = type => {
   switch (type) {
     case Link:
       return Link$1;
-    case Ts2816:
-    case Ts2817:
-    case Ts2824:
-    case Ts2825:
-    case Ts2856:
-    case Ts2857:
-    case Ts3072:
-    case Ts3073:
-    case Ts3077:
-    case Ts3088:
-      return Function;
-    case Ts1792:
-    case Ts1793:
-      return Parameter;
-    case Ts512:
-    case Ts513:
-    case Ts769:
     case Ts1024:
     case Ts1536:
     case Ts1537:
     case Ts1544:
     case Ts1545:
+    case Ts512:
+    case Ts513:
+    case Ts769:
       return Type;
+    case Ts1792:
+    case Ts1793:
+      return Parameter;
     case Ts2048:
     case Ts2049:
     case Ts2056:
@@ -1537,6 +1526,17 @@ const getDecorationClassName = type => {
     case Ts257:
     case Ts272:
       return Class;
+    case Ts2816:
+    case Ts2817:
+    case Ts2824:
+    case Ts2825:
+    case Ts2856:
+    case Ts2857:
+    case Ts3072:
+    case Ts3073:
+    case Ts3077:
+    case Ts3088:
+      return Function;
     default:
       return `Unknown-${type}`;
   }
@@ -1583,8 +1583,8 @@ const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasA
   } catch (error) {
     console.error(error);
     return {
-      tokens: [/* type */0, /* length */line.length],
-      lineState: lineStateAtStart
+      lineState: lineStateAtStart,
+      tokens: [/* type */0, /* length */line.length]
     };
   }
 };
@@ -1611,8 +1611,8 @@ const initialLineState = {
 const hasArrayReturn = true;
 const tokenizeLine = (line, lineState) => {
   return {
-    tokens: [TokenType.Text, line.length],
-    state: lineState.state
+    state: lineState.state,
+    tokens: [TokenType.Text, line.length]
   };
 };
 
@@ -1635,12 +1635,14 @@ const getEnabled$1 = () => {
 };
 
 const {
-  set: set$5,
-  invoke: invoke$8} = SyntaxHighlightingWorker;
+  invoke: invoke$8,
+  set: set$5
+} = SyntaxHighlightingWorker;
 
 const state$6 = {
-  tokenizers: Object.create(null),
-  pending: Object.create(null)};
+  pending: Object.create(null),
+  tokenizers: Object.create(null)
+};
 const has = languageId => {
   return languageId in state$6.tokenizers;
 };
@@ -1721,8 +1723,8 @@ const getTokensViewportEmbedded = (langageId, lines, lineCache, linesWithEmbed)
     if (result.embeddedLanguage) {
       const {
         embeddedLanguage,
-        embeddedLanguageStart,
-        embeddedLanguageEnd
+        embeddedLanguageEnd,
+        embeddedLanguageStart
       } = result;
       const embeddedTokenizer = getTokenizer(embeddedLanguage);
       if (embeddedLanguageStart !== line.length && embeddedTokenizer && embeddedTokenizer !== TokenizePlainText) {
@@ -1732,9 +1734,9 @@ const getTokensViewportEmbedded = (langageId, lines, lineCache, linesWithEmbed)
         topContext = embedResult;
         result.embeddedResultIndex = embeddedResults.length;
         embeddedResults.push({
+          isFull,
           result: embedResult,
-          TokenMap: embeddedTokenizer.TokenMap,
-          isFull
+          TokenMap: embeddedTokenizer.TokenMap
         });
       } else if (line.length === 0) {
         const embedResult = {
@@ -1742,15 +1744,15 @@ const getTokensViewportEmbedded = (langageId, lines, lineCache, linesWithEmbed)
         };
         result.embeddedResultIndex = embeddedResults.length;
         embeddedResults.push({
-          result: embedResult,
           isFull: true,
+          result: embedResult,
           TokenMap: []
         });
       } else {
         tokenizersToLoad.push(embeddedLanguage);
         embeddedResults.push({
-          result: {},
           isFull: false,
+          result: {},
           TokenMap: []
         });
         topContext = undefined;
@@ -1760,8 +1762,8 @@ const getTokensViewportEmbedded = (langageId, lines, lineCache, linesWithEmbed)
     }
   }
   return {
-    tokenizersToLoad,
-    embeddedResults
+    embeddedResults,
+    tokenizersToLoad
   };
 };
 const getTokenizeEndIndex = (invalidStartIndex, endLineIndex, tokenizeStartIndex) => {
@@ -1772,16 +1774,16 @@ const getTokenizeEndIndex = (invalidStartIndex, endLineIndex, tokenizeStartIndex
 const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   const {
     invalidStartIndex,
+    languageId,
     lineCache,
-    tokenizerId,
     lines,
-    languageId
+    tokenizerId
   } = editor;
   const tokenizer = get$2(tokenizerId);
   const {
     hasArrayReturn,
-    tokenizeLine,
-    initialLineState
+    initialLineState,
+    tokenizeLine
   } = tokenizer;
   const tokenizeStartIndex = invalidStartIndex;
   const tokenizeEndIndex = getTokenizeEndIndex(invalidStartIndex, endLineIndex, tokenizeStartIndex);
@@ -1802,22 +1804,22 @@ const getTokensViewport = (editor, startLineIndex, endLineIndex) => {
   const visibleLines = lineCache.slice(startLineIndex + 1, endLineIndex + 1);
   if (linesWithEmbed.length > 0) {
     const {
-      tokenizersToLoad,
-      embeddedResults
+      embeddedResults,
+      tokenizersToLoad
     } = getTokensViewportEmbedded(languageId, lines, lineCache, linesWithEmbed);
     // TODO support lineCache with embedded content
     editor.invalidStartIndex = 0;
     return {
-      tokens: visibleLines,
+      embeddedResults,
       tokenizersToLoad,
-      embeddedResults
+      tokens: visibleLines
     };
   }
   editor.invalidStartIndex = Math.max(invalidStartIndex, tokenizeEndIndex);
   return {
-    tokens: visibleLines,
+    embeddedResults,
     tokenizersToLoad,
-    embeddedResults
+    tokens: visibleLines
   };
 };
 
@@ -1828,10 +1830,10 @@ const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncr
   if (getEnabled$1()) {
     if (syncIncremental) {
       const {
+        id,
         invalidStartIndex,
-        lines,
         languageId,
-        id
+        lines
       } = editor;
       let hasLinesToSend = true;
       let linesToSend = lines;
@@ -1842,8 +1844,8 @@ const getTokensViewport2 = async (editor, startLineIndex, endLineIndex, syncIncr
         sentLines[id] = lines;
       }
       const slimEditor = {
-        languageId,
-        invalidStartIndex
+        invalidStartIndex,
+        languageId
       };
       return invoke$8('GetTokensViewport.getTokensViewport', slimEditor,
       // @ts-ignore
@@ -2060,8 +2062,8 @@ const positionAt = (textDocument, offset) => {
     columnIndex = currentOffset - offset;
   }
   return {
-    rowIndex,
-    columnIndex
+    columnIndex,
+    rowIndex
   };
 };
 
@@ -2116,8 +2118,8 @@ const getStartDefaults = (tokens, minOffset) => {
     }
   }
   return {
-    start,
     end,
+    start,
     startIndex
   };
 };
@@ -2128,9 +2130,9 @@ const getLineInfoEmbeddedFull = (embeddedResults, tokenResults, line, normalize,
   const embeddedTokenMap = embeddedResult.TokenMap;
   const tokensLength = embeddedTokens.length;
   let {
-    startIndex,
+    end,
     start,
-    end
+    startIndex
   } = getStartDefaults(embeddedTokens, minOffset);
   const difference = getDifference(start, averageCharWidth, deltaX);
   for (let i = startIndex; i < tokensLength; i += 2) {
@@ -2147,8 +2149,8 @@ const getLineInfoEmbeddedFull = (embeddedResults, tokenResults, line, normalize,
     }
   }
   return {
-    lineInfo,
-    difference
+    difference,
+    lineInfo
   };
 };
 const getOffsets = (deltaX, width, averageCharWidth) => {
@@ -2156,15 +2158,15 @@ const getOffsets = (deltaX, width, averageCharWidth) => {
   // and use fast measurements for monospace ascii text
   if (deltaX === 0) {
     return {
-      minOffset: 0,
-      maxOffset: Math.ceil(width / averageCharWidth)
+      maxOffset: Math.ceil(width / averageCharWidth),
+      minOffset: 0
     };
   }
   const minOffset = Math.ceil(deltaX / averageCharWidth);
   const maxOffset = minOffset + Math.ceil(width / averageCharWidth);
   return {
-    minOffset,
-    maxOffset
+    maxOffset,
+    minOffset
   };
 };
 const getDifference = (start, averageCharWidth, deltaX) => {
@@ -2185,9 +2187,9 @@ const getLineInfoDefault = (line, tokenResults, embeddedResults, decorations, To
     tokens
   } = tokenResults;
   let {
-    startIndex,
+    end,
     start,
-    end
+    startIndex
   } = getStartDefaults(tokens, minOffset);
   const difference = getDifference(start, averageCharWidth, deltaX);
   const tokensLength = tokens.length;
@@ -2220,14 +2222,14 @@ const getLineInfoDefault = (line, tokenResults, embeddedResults, decorations, To
     }
   }
   return {
-    lineInfo,
-    difference
+    difference,
+    lineInfo
   };
 };
 const getLineInfo$1 = (line, tokenResults, embeddedResults, decorations, TokenMap, lineOffset, normalize, tabSize, width, deltaX, averageCharWidth) => {
   const {
-    minOffset,
-    maxOffset
+    maxOffset,
+    minOffset
   } = getOffsets(deltaX, width, averageCharWidth);
   if (embeddedResults.length > 0 && tokenResults.embeddedResultIndex !== undefined) {
     const embeddedResult = embeddedResults[tokenResults.embeddedResultIndex];
@@ -2243,9 +2245,9 @@ const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLine
   const result = [];
   const differences = [];
   const {
-    lines,
     decorations,
-    languageId
+    languageId,
+    lines
   } = editor;
   const tokenMap = get$3(languageId);
   let offset = minLineOffset;
@@ -2254,16 +2256,16 @@ const getLineInfosViewport = (editor, tokens, embeddedResults, minLineY, maxLine
     const line = lines[i];
     const normalize = shouldNormalizeText(line);
     const {
-      lineInfo,
-      difference
+      difference,
+      lineInfo
     } = getLineInfo$1(line, tokens[i - minLineY], embeddedResults, decorations, tokenMap, offset, normalize, tabSize, width, deltaX, averageCharWidth);
     result.push(lineInfo);
     differences.push(difference);
     offset += line.length + 1;
   }
   return {
-    result,
-    differences
+    differences,
+    result
   };
 };
 const getVisible$1 = async (editor, syncIncremental) => {
@@ -2273,32 +2275,32 @@ const getVisible$1 = async (editor, syncIncremental) => {
   // editor.invalidStartIndex = changes[0].start.rowIndex
   // @ts-ignore
   const {
+    charWidth,
+    deltaX,
+    lines,
     minLineY,
     numberOfVisibleLines,
-    lines,
-    width,
-    deltaX,
-    charWidth
+    width
   } = editor;
   const maxLineY = Math.min(minLineY + numberOfVisibleLines, lines.length);
   // @ts-ignore
   const {
-    tokens,
+    embeddedResults,
     tokenizersToLoad,
-    embeddedResults
+    tokens
   } = await getTokensViewport2(editor, minLineY, maxLineY, syncIncremental);
   const minLineOffset = offsetAtSync(editor, minLineY, 0);
   const averageCharWidth = charWidth;
   const {
-    result,
-    differences
+    differences,
+    result
   } = getLineInfosViewport(editor, tokens, embeddedResults, minLineY, maxLineY, minLineOffset, width, deltaX, averageCharWidth);
   if (tokenizersToLoad.length > 0) {
     loadTokenizers(tokenizersToLoad);
   }
   return {
-    textInfos: result,
-    differences
+    differences,
+    textInfos: result
   };
 };
 
@@ -2327,21 +2329,21 @@ const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
   if (relativeY <= halfScrollBarHeight) {
     // clicked at top
     return {
-      percent: 0,
-      handleOffset: relativeY
+      handleOffset: relativeY,
+      percent: 0
     };
   }
   if (relativeY <= height - halfScrollBarHeight) {
     // clicked in middle
     return {
-      percent: (relativeY - halfScrollBarHeight) / (height - scrollBarHeight),
-      handleOffset: halfScrollBarHeight
+      handleOffset: halfScrollBarHeight,
+      percent: (relativeY - halfScrollBarHeight) / (height - scrollBarHeight)
     };
   }
   // clicked at bottom
   return {
-    percent: 1,
-    handleOffset: scrollBarHeight - height + relativeY
+    handleOffset: scrollBarHeight - height + relativeY,
+    percent: 1
   };
 };
 
@@ -2358,12 +2360,12 @@ const setDeltaY$2 = async (state, value) => {
   object(state);
   number(value);
   const {
-    finalDeltaY,
     deltaY,
-    numberOfVisibleLines,
+    finalDeltaY,
     height,
-    scrollBarHeight,
-    itemHeight
+    itemHeight,
+    numberOfVisibleLines,
+    scrollBarHeight
   } = state;
   const newDeltaY = clamp(value, 0, finalDeltaY);
   if (deltaY === newDeltaY) {
@@ -2374,20 +2376,20 @@ const setDeltaY$2 = async (state, value) => {
   const scrollBarY = getScrollBarY(newDeltaY, finalDeltaY, height, scrollBarHeight);
   const newEditor1 = {
     ...state,
-    minLineY: newMinLineY,
-    maxLineY: newMaxLineY,
     deltaY: newDeltaY,
+    maxLineY: newMaxLineY,
+    minLineY: newMinLineY,
     scrollBarY
   };
   const syncIncremental = getEnabled();
   const {
-    textInfos,
-    differences
+    differences,
+    textInfos
   } = await getVisible$1(newEditor1, syncIncremental);
   const newEditor2 = {
     ...newEditor1,
-    textInfos,
-    differences
+    differences,
+    textInfos
   };
   return newEditor2;
 };
@@ -2578,8 +2580,8 @@ const from = (array, getSelection) => {
   let i = 0;
   for (const item of array) {
     const {
-      start,
-      end
+      end,
+      start
     } = getSelection(item);
     newSelections[i++] = start.rowIndex;
     newSelections[i++] = start.columnIndex;
@@ -2631,22 +2633,22 @@ const getVisible = async editor => {
   // // TODO binary search
 
   const {
-    selections,
-    minLineY,
-    maxLineY,
-    rowHeight,
-    lines,
-    fontSize,
+    charWidth,
+    cursorWidth,
+    differences,
+    focused,
     fontFamily,
+    fontSize,
     fontWeight,
+    isMonospaceFont,
     letterSpacing,
-    cursorWidth,
+    lines,
+    maxLineY,
+    minLineY,
+    rowHeight,
+    selections,
     tabSize,
-    width,
-    differences,
-    focused,
-    charWidth,
-    isMonospaceFont
+    width
   } = editor;
   const averageCharWidth = charWidth;
   const halfCursorWidth = cursorWidth / 2;
@@ -2716,29 +2718,29 @@ const getVisible = async editor => {
 
 const getSelectionFromChange = change => {
   const {
-    start,
-    inserted
+    inserted,
+    start
   } = change;
   const startRowIndex = start.rowIndex;
   const startColumnIndex = start.columnIndex;
   const insertedLength = inserted.length;
   if (insertedLength === 1) {
     const newPosition = {
-      rowIndex: startRowIndex + insertedLength - 1,
-      columnIndex: inserted.at(-1).length + startColumnIndex
+      columnIndex: inserted.at(-1).length + startColumnIndex,
+      rowIndex: startRowIndex + insertedLength - 1
     };
     return {
-      start: newPosition,
-      end: newPosition
+      end: newPosition,
+      start: newPosition
     };
   }
   const newPosition = {
-    rowIndex: startRowIndex + insertedLength - 1,
-    columnIndex: startColumnIndex
+    columnIndex: startColumnIndex,
+    rowIndex: startRowIndex + insertedLength - 1
   };
   return {
-    start: newPosition,
-    end: newPosition
+    end: newPosition,
+    start: newPosition
   };
 };
 const setSelections$1 = (editor, selections) => {
@@ -2836,11 +2838,11 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
   const autoClosingRanges = applyAutoClosingRangesEdit(editor, changes);
   const newEditor = {
     ...partialNewEditor,
+    autoClosingRanges,
+    invalidStartIndex,
     lines: newLines,
     selections: newSelections,
-    undoStack: [...editor.undoStack, changes],
-    invalidStartIndex,
-    autoClosingRanges
+    undoStack: [...editor.undoStack, changes]
   };
   set$6(editor.uid, editor, newEditor);
   const incrementalEdits = await getIncrementalEdits(editor, newEditor);
@@ -2855,13 +2857,13 @@ const scheduleDocumentAndCursorsSelections = async (editor, changes, selectionCh
   }
   const syncIncremental = getEnabled();
   const {
-    textInfos,
-    differences
+    differences,
+    textInfos
   } = await getVisible$1(newEditor2, syncIncremental);
   return {
     ...newEditor2,
-    textInfos,
-    differences
+    differences,
+    textInfos
   };
 };
 // @ts-ignore
@@ -2880,10 +2882,10 @@ const scheduleDocumentAndCursorsSelectionIsUndo = async (editor, changes) => {
   const invalidStartIndex = Math.min(editor.invalidStartIndex, changes[0].start.rowIndex);
   const newEditor = {
     ...partialNewEditor,
-    lines: newLines,
-    selections: newSelections,
     // undoStack: [...editor.undoStack.slice(0, -2)],
-    invalidStartIndex
+    invalidStartIndex,
+    lines: newLines,
+    selections: newSelections
   };
   const incrementalEdits = await getIncrementalEdits(editor, newEditor);
 
@@ -2897,13 +2899,13 @@ const scheduleDocumentAndCursorsSelectionIsUndo = async (editor, changes) => {
   }
   const syncIncremental = getEnabled();
   const {
-    textInfos,
-    differences
+    differences,
+    textInfos
   } = await getVisible$1(finalEditor, syncIncremental);
   return {
     ...finalEditor,
-    textInfos,
-    differences
+    differences,
+    textInfos
   };
 };
 
@@ -2925,9 +2927,9 @@ const scheduleDocument = async (editor, changes) => {
 
   const newEditor = {
     ...editor,
-    undoStack: [...editor.undoStack, changes],
+    invalidStartIndex,
     lines: newLines,
-    invalidStartIndex
+    undoStack: [...editor.undoStack, changes]
   };
   const incrementalEdits = await getIncrementalEdits(editor, newEditor);
 
@@ -2941,13 +2943,13 @@ const scheduleDocument = async (editor, changes) => {
   }
   const syncIncremental = getEnabled();
   const {
-    textInfos,
-    differences
+    differences,
+    textInfos
   } = await getVisible$1(finalEditor, syncIncremental);
   return {
     ...finalEditor,
-    textInfos,
-    differences
+    differences,
+    textInfos
   };
   // RendererProcess.send([
   //   /* Viewlet.invoke */ 'Viewlet.send',
@@ -2975,23 +2977,23 @@ const setBounds = (editor, x, y, width, height, columnWidth) => {
   const finalDeltaY = finalY * itemHeight;
   return {
     ...editor,
-    x,
-    y,
-    width,
-    height,
     columnWidth,
-    numberOfVisibleLines,
-    maxLineY,
+    finalDeltaY,
     finalY,
-    finalDeltaY
+    height,
+    maxLineY,
+    numberOfVisibleLines,
+    width,
+    x,
+    y
   };
 };
 const setText = (editor, text) => {
   const lines = splitLines(text);
   const {
     itemHeight,
-    numberOfVisibleLines,
-    minimumSliderSize
+    minimumSliderSize,
+    numberOfVisibleLines
   } = editor;
   const total = lines.length;
   const maxLineY = Math.min(numberOfVisibleLines, total);
@@ -3001,42 +3003,42 @@ const setText = (editor, text) => {
   const scrollBarHeight = getScrollBarSize(editor.height, contentHeight, minimumSliderSize);
   return {
     ...editor,
+    finalDeltaY,
+    finalY,
     lines,
     maxLineY,
-    finalY,
-    finalDeltaY,
     scrollBarHeight
   };
 };
 
 const emptyEditor = {
-  textInfos: [],
+  debugEnabled: false,
+  decorations: [],
+  deltaX: 0,
+  deltaY: 0,
+  diagnostics: [],
   differences: [],
-  uri: '',
+  embeds: [],
+  focused: false,
+  height: 0,
+  highlightedLine: -1,
+  incrementalEdits: emptyIncrementalEdits,
   languageId: '',
   // TODO use numeric language id?
+  lineCache: [],
   lines: [],
-  x: 0,
-  y: 0,
-  width: 0,
-  height: 0,
-  tokenizerId: 0,
-  minLineY: 0,
-  decorations: [],
-  embeds: [],
-  deltaX: 0,
-  focused: false,
-  deltaY: 0,
-  scrollBarHeight: 0,
   longestLineWidth: 0,
   maxLineY: 0,
-  undoStack: [],
-  lineCache: [],
+  minLineY: 0,
+  scrollBarHeight: 0,
   selections: new Uint32Array(),
-  diagnostics: [],
-  highlightedLine: -1,
-  debugEnabled: false,
-  incrementalEdits: emptyIncrementalEdits
+  textInfos: [],
+  tokenizerId: 0,
+  undoStack: [],
+  uri: '',
+  width: 0,
+  x: 0,
+  y: 0
 };
 
 const HoverExecute = 'ExtensionHostHover.execute';
@@ -3044,8 +3046,9 @@ const TabCompletionExecuteTabCompletionProvider = 'ExtensionHost.executeTabCompl
 const TextDocumentSyncFull = 'ExtensionHostTextDocument.syncFull';
 
 const {
-  set: set$1,
-  invoke: invoke$6} = ExtensionHost;
+  invoke: invoke$6,
+  set: set$1
+} = ExtensionHost;
 
 const ColorPicker = 41;
 const EditorCompletion = 9;
@@ -3128,8 +3131,8 @@ const OnHover = 'onHover';
 const OnTabCompletion = 'onTabCompletion';
 
 const execute = async ({
-  editor,
   args,
+  editor,
   event,
   method,
   noProviderFoundMessage,
@@ -3143,10 +3146,10 @@ const execute = async ({
 
 const executeDiagnosticProvider = editor => {
   return execute({
+    args: [],
     editor,
     event: OnDiagnostic,
     method: 'ExtensionHost.executeDiagnosticProvider',
-    args: [],
     noProviderFoundMessage: 'no diagnostic provider found'});
 };
 
@@ -3157,23 +3160,23 @@ const getDiagnosticType = diagnostic => {
 const getVisibleDiagnostics = async (editor, diagnostics) => {
   const visibleDiagnostics = [];
   const {
-    width,
-    rowHeight,
-    minLineY,
     charWidth,
-    letterSpacing,
-    lines,
-    fontWeight,
-    fontSize,
     fontFamily,
+    fontSize,
+    fontWeight,
     isMonospaceFont,
-    tabSize
+    letterSpacing,
+    lines,
+    minLineY,
+    rowHeight,
+    tabSize,
+    width
   } = editor;
   for (const diagnostic of diagnostics) {
     const {
-      rowIndex,
       columnIndex,
-      endColumnIndex
+      endColumnIndex,
+      rowIndex
     } = diagnostic;
     const columnDelta = endColumnIndex - columnIndex;
     const diagnosticWidth = columnDelta * charWidth;
@@ -3182,11 +3185,11 @@ const getVisibleDiagnostics = async (editor, diagnostics) => {
     const x = await getX(lines[rowIndex], columnIndex, fontWeight, fontSize, fontFamily, isMonospaceFont, letterSpacing, tabSize, halfCursorWidth, width, charWidth, endLineDifference);
     const y = getY(rowIndex, minLineY, rowHeight) - rowHeight;
     visibleDiagnostics.push({
-      x,
-      y,
-      width: diagnosticWidth,
       height: rowHeight,
-      type: getDiagnosticType(diagnostic)
+      type: getDiagnosticType(diagnostic),
+      width: diagnosticWidth,
+      x,
+      y
     });
   }
   return visibleDiagnostics;
@@ -3214,8 +3217,8 @@ const updateDiagnostics = async newState => {
     const decorations = await getVisibleDiagnostics(latest.newState, diagnostics);
     const newEditor = {
       ...latest.newState,
-      diagnostics,
-      decorations
+      decorations,
+      diagnostics
     };
     set$6(newState.id, latest.oldState, newEditor);
     // @ts-ignore
@@ -3232,35 +3235,35 @@ const updateDiagnostics = async newState => {
 };
 
 const createEditor = async ({
-  id,
+  columnToReveal,
+  completionTriggerCharacters,
   content,
-  savedDeltaY,
-  rowHeight,
+  diagnosticsEnabled,
+  fontFamily,
   fontSize,
-  hoverEnabled,
-  letterSpacing,
-  tabSize,
-  links,
-  lineNumbers,
+  fontWeight,
   formatOnSave,
+  height,
+  hoverEnabled,
+  id,
   isAutoClosingBracketsEnabled,
-  isAutoClosingTagsEnabled,
   isAutoClosingQuotesEnabled,
+  isAutoClosingTagsEnabled,
+  isMonospaceFont,
   isQuickSuggestionsEnabled,
-  completionTriggerCharacters,
-  savedSelections,
   languageId,
-  x,
-  y,
-  width,
-  height,
-  fontWeight,
-  fontFamily,
-  isMonospaceFont,
-  uri,
-  diagnosticsEnabled,
+  letterSpacing,
+  lineNumbers,
   lineToReveal,
-  columnToReveal
+  links,
+  rowHeight,
+  savedDeltaY,
+  savedSelections,
+  tabSize,
+  uri,
+  width,
+  x,
+  y
 }) => {
   number(id);
   string(content);
@@ -3342,15 +3345,15 @@ const createEditor = async ({
   }
   const syncIncremental = getEnabled();
   const {
-    textInfos,
-    differences
+    differences,
+    textInfos
   } = await getVisible$1(newEditor3, syncIncremental);
   const newEditor4 = {
     ...newEditor3,
-    focused: true,
+    differences,
     focus: FocusEditorText$1,
-    textInfos,
-    differences
+    focused: true,
+    textInfos
   };
   set$6(id, emptyEditor, newEditor4);
 
@@ -3418,8 +3421,8 @@ const getNewSelections$b = (selections, linesLength) => {
 // @ts-ignore
 const addCursorBelow = editor => {
   const {
-    selections,
-    lines
+    lines,
+    selections
   } = editor;
   const newSelections = getNewSelections$b(selections, lines.length);
   return {
@@ -3434,15 +3437,15 @@ const getDocumentEdits = (editor, edits) => {
     const start = positionAt(editor, edit.startOffset);
     const end = positionAt(editor, edit.endOffset);
     const deleted = getSelectionText(editor, {
-      start,
-      end
+      end,
+      start
     });
     const documentEdit = {
-      start,
+      deleted,
       end,
       inserted: splitLines(edit.inserted),
-      deleted,
-      origin: Format
+      origin: Format,
+      start
     };
     if (documentEdit.inserted.length === 0) {
       documentEdit.inserted = [''];
@@ -3487,15 +3490,15 @@ const getTextChanges = (editor, changes) => {
         const startPosition = positionAt(editor, edit.offset);
         const endPosition = positionAt(editor, edit.offset + edit.deleted);
         const deleted = getSelectionText(editor, {
-          start: startPosition,
-          end: endPosition
+          end: endPosition,
+          start: startPosition
         });
         const textChange = {
-          start: startPosition,
+          deleted,
           end: endPosition,
           inserted: [edit.inserted],
-          deleted,
-          origin: Rename
+          origin: Rename,
+          start: startPosition
         };
         textChanges.push(textChange);
       }
@@ -3536,23 +3539,23 @@ const replaceRange = (editor, ranges, replacement, origin) => {
   for (let i = 0; i < rangesLength; i += 4) {
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(ranges, i);
     const start = {
-      rowIndex: selectionStartRow,
-      columnIndex: selectionStartColumn
+      columnIndex: selectionStartColumn,
+      rowIndex: selectionStartRow
     };
     const end = {
-      rowIndex: selectionEndRow,
-      columnIndex: selectionEndColumn
+      columnIndex: selectionEndColumn,
+      rowIndex: selectionEndRow
     };
     const selection = {
-      start,
-      end
+      end,
+      start
     };
     changes.push({
-      start: start,
+      deleted: getSelectionText(editor, selection),
       end: end,
       inserted: replacement,
-      deleted: getSelectionText(editor, selection),
-      origin
+      origin,
+      start: start
     });
   }
   return changes;
@@ -3586,30 +3589,30 @@ const create$8 = () => {
       const segments = segmenter.segment(line);
       return segments.containing(index);
     },
-    visualIndex(line, index) {
+    getSegments(line) {
+      return segmenter.segment(line);
+    },
+    modelIndex(line, visualIndex) {
       const segments = segmenter.segment(line);
       let currentVisualIndex = 0;
       for (const segment of segments) {
-        if (segment.index >= index) {
-          return currentVisualIndex;
+        if (currentVisualIndex >= visualIndex) {
+          return segment.index;
         }
         currentVisualIndex++;
       }
-      return currentVisualIndex;
+      return line.length;
     },
-    modelIndex(line, visualIndex) {
+    visualIndex(line, index) {
       const segments = segmenter.segment(line);
       let currentVisualIndex = 0;
       for (const segment of segments) {
-        if (currentVisualIndex >= visualIndex) {
-          return segment.index;
+        if (segment.index >= index) {
+          return currentVisualIndex;
         }
         currentVisualIndex++;
       }
-      return line.length;
-    },
-    getSegments(line) {
-      return segmenter.segment(line);
+      return currentVisualIndex;
     }
   };
 };
@@ -3673,31 +3676,31 @@ const at = async (editor, eventX, eventY) => {
   number(eventX);
   number(eventY);
   const {
-    y,
+    charWidth,
     deltaY,
-    rowHeight,
+    fontFamily,
     fontSize,
     fontWeight,
-    fontFamily,
+    isMonospaceFont,
     letterSpacing,
     lines,
+    rowHeight,
     tabSize,
-    isMonospaceFont,
-    charWidth
+    y
   } = editor;
   const rowIndex = Math.floor((eventY - y + deltaY) / rowHeight);
   if (rowIndex < 0) {
     return {
-      rowIndex: 0,
-      columnIndex: 0
+      columnIndex: 0,
+      rowIndex: 0
     };
   }
   const clampedRowIndex = clamp(rowIndex, 0, lines.length - 1);
   const line = lines[clampedRowIndex];
   const columnIndex = await getAccurateColumnIndex(line, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth, tabSize, eventX);
   return {
-    rowIndex: clampedRowIndex,
-    columnIndex
+    columnIndex,
+    rowIndex: clampedRowIndex
   };
 };
 
@@ -3792,12 +3795,12 @@ const getErrorMessage$4 = error => {
 // @ts-ignore
 const getMatchingClosingBrace$1 = brace => {
   switch (brace) {
-    case '{':
-      return '}';
     case '(':
       return ')';
     case '[':
       return ']';
+    case '{':
+      return '}';
     default:
       return '???';
   }
@@ -3865,8 +3868,8 @@ const closeCodeGenerator = editor => {
   const newWidgets = removeEditorWidget(widgets, CodeGenerator);
   return {
     ...editor,
-    widgets: newWidgets,
-    focused: true
+    focused: true,
+    widgets: newWidgets
   };
 };
 
@@ -3884,8 +3887,8 @@ const closeFind = editor => {
   const newWidgets = removeEditorWidget(widgets, Find);
   return {
     ...editor,
-    widgets: newWidgets,
-    focused: true
+    focused: true,
+    widgets: newWidgets
   };
 };
 
@@ -3915,8 +3918,8 @@ const isRenameWidget = widget => {
 };
 const closeRename = async editor => {
   const {
-    widgets,
-    uid
+    uid,
+    widgets
   } = editor;
   const renameWidgetIndex = widgets.findIndex(isRenameWidget);
   if (renameWidgetIndex === -1) {
@@ -3979,10 +3982,10 @@ const addWidgetToEditor = async (widgetId, focusKey, editor, factory, newStateGe
   const newFocus = !fullFocus;
   const newEditor = {
     ...editor,
-    widgets: newWidgets,
-    focused: newFocus,
+    additionalFocus: fullFocus ? 0 : focusKey,
     focus: fullFocus ? focusKey : FocusEditorText$1,
-    additionalFocus: fullFocus ? 0 : focusKey
+    focused: newFocus,
+    widgets: newWidgets
   };
   return newEditor;
 };
@@ -3995,21 +3998,21 @@ const create$6 = () => {
   const completionUid = create$7();
   const widget = {
     id: ColorPicker$1,
-    oldState: {
+    newState: {
+      commands: [],
+      height: 0,
       uid: completionUid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
-      commands: []
+      x: 0,
+      y: 0
     },
-    newState: {
+    oldState: {
+      commands: [],
+      height: 0,
       uid: completionUid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
-      commands: []
+      x: 0,
+      y: 0
     }
   };
   return widget;
@@ -4023,8 +4026,8 @@ const openColorPicker = async editor => {
 };
 
 const state$4 = {
-  isComposing: false,
-  compositionText: ''
+  compositionText: '',
+  isComposing: false
 };
 const compositionStart = (editor, event) => {
   state$4.isComposing = true;
@@ -4039,17 +4042,17 @@ const getCompositionChanges = (selections, data) => {
     const selectionEndColumn = selections[i + 3];
     const startColumnIndex = selectionStartColumn - state$4.compositionText.length;
     changes.push({
-      start: {
-        rowIndex: selectionStartRow,
-        columnIndex: startColumnIndex
-      },
+      deleted: [state$4.compositionText],
       end: {
-        rowIndex: selectionEndRow,
-        columnIndex: selectionEndColumn
+        columnIndex: selectionEndColumn,
+        rowIndex: selectionEndRow
       },
       inserted: [data],
-      deleted: [state$4.compositionText],
-      origin: CompositionUpdate
+      origin: CompositionUpdate,
+      start: {
+        columnIndex: startColumnIndex,
+        rowIndex: selectionStartRow
+      }
     });
   }
   return changes;
@@ -4086,24 +4089,24 @@ const getSelectionRange = (lines, copyFullLine, startRowIndex, startColumnIndex,
   if (copyFullLine) {
     const lineLength = lines[endRowIndex].length;
     return {
-      start: {
-        rowIndex: startRowIndex,
-        columnIndex: 0
-      },
       end: {
-        rowIndex: startRowIndex,
-        columnIndex: lineLength
+        columnIndex: lineLength,
+        rowIndex: startRowIndex
+      },
+      start: {
+        columnIndex: 0,
+        rowIndex: startRowIndex
       }
     };
   }
   return {
-    start: {
-      rowIndex: startRowIndex,
-      columnIndex: startColumnIndex
-    },
     end: {
-      rowIndex: endRowIndex,
-      columnIndex: endColumnIndex
+      columnIndex: endColumnIndex,
+      rowIndex: endRowIndex
+    },
+    start: {
+      columnIndex: startColumnIndex,
+      rowIndex: startRowIndex
     }
   };
 };
@@ -4146,14 +4149,14 @@ const copyLineDown = editor => {
   const rowIndex = selections[0];
   number(rowIndex);
   const position = {
-    rowIndex,
-    columnIndex: 0
+    columnIndex: 0,
+    rowIndex
   };
   const changes = [{
-    start: position,
+    deleted: [''],
     end: position,
     inserted: [getLine(editor, rowIndex), ''],
-    deleted: ['']
+    start: position
   }];
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
@@ -4164,14 +4167,14 @@ const copyLineUp = editor => {
   } = editor;
   const rowIndex = selections[0];
   const position = {
-    rowIndex: rowIndex,
-    columnIndex: 0
+    columnIndex: 0,
+    rowIndex: rowIndex
   };
   const changes = [{
-    start: position,
+    deleted: [''],
     end: position,
     inserted: [getLine(editor, rowIndex), ''],
-    deleted: ['']
+    start: position
   }];
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
@@ -4181,19 +4184,19 @@ const editorGetPositionLeft = (rowIndex, columnIndex, lines, getDelta) => {
   if (columnIndex === 0) {
     if (rowIndex === 0) {
       return {
-        rowIndex: 0,
-        columnIndex: 0
+        columnIndex: 0,
+        rowIndex: 0
       };
     }
     return {
-      rowIndex: rowIndex - 1,
-      columnIndex: lines[rowIndex - 1].length
+      columnIndex: lines[rowIndex - 1].length,
+      rowIndex: rowIndex - 1
     };
   }
   const delta = getDelta(lines[rowIndex], columnIndex);
   return {
-    rowIndex,
-    columnIndex: columnIndex - delta
+    columnIndex: columnIndex - delta,
+    rowIndex
   };
 };
 
@@ -4379,14 +4382,14 @@ const editorGetPositionRight = (position, lines, getDelta) => {
       return position;
     }
     return {
-      rowIndex: rowIndex + 1,
-      columnIndex: 0
+      columnIndex: 0,
+      rowIndex: rowIndex + 1
     };
   }
   const delta = getDelta(lines[rowIndex], columnIndex);
   return {
-    rowIndex,
-    columnIndex: columnIndex + delta
+    columnIndex: columnIndex + delta,
+    rowIndex
   };
 };
 const moveToPositionRight = (selections, i, rowIndex, columnIndex, lines, getDelta) => {
@@ -4555,20 +4558,20 @@ const getChanges$5 = (lines, selections, getDelta) => {
   const deleteSelection = (selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn) => {
     const positionLeft = editorGetPositionLeft(selectionStartRow, selectionStartColumn, lines, getDelta);
     const selectionEnd = {
-      rowIndex: selectionEndRow,
-      columnIndex: selectionEndColumn
+      columnIndex: selectionEndColumn,
+      rowIndex: selectionEndRow
     };
     changes.push({
-      start: positionLeft,
-      end: selectionEnd,
-      inserted: [''],
       deleted: getSelectionText({
         lines
       }, {
-        start: positionLeft,
-        end: selectionEnd
+        end: selectionEnd,
+        start: positionLeft
       }),
-      origin: DeleteLeft
+      end: selectionEnd,
+      inserted: [''],
+      origin: DeleteLeft,
+      start: positionLeft
     });
   };
   forEach(selections, deleteSelection);
@@ -4606,8 +4609,8 @@ const isAllAutoClosingPairDelete = (autoClosingRanges, selections) => {
 
 const deleteLeftWithAutoClose = editor => {
   const {
-    selections,
-    lines
+    lines,
+    selections
   } = editor;
   for (let i = 0; i < selections.length; i += 4) {
     selections[i + 1]++;
@@ -4619,8 +4622,8 @@ const deleteLeftWithAutoClose = editor => {
 const editorDeleteHorizontalLeft = (editor, getDelta) => {
   const {
     autoClosingRanges = [],
-    selections,
-    lines
+    lines,
+    selections
   } = editor;
   if (isAllAutoClosingPairDelete(autoClosingRanges, selections)) {
     return deleteLeftWithAutoClose(editor);
@@ -4654,19 +4657,19 @@ const getChanges$4 = (editor, getDelta) => {
       // @ts-ignore
       const [selectionStartRow, selectionStartColumn] = getSelectionPairs(selections, i);
       const start = {
-        rowIndex: selectionStartRow,
-        columnIndex: selectionStartColumn
+        columnIndex: selectionStartColumn,
+        rowIndex: selectionStartRow
       };
       const positionRight = editorGetPositionRight(start, lines, getDelta);
       changes.push({
-        start: start,
-        end: positionRight,
-        inserted: [''],
         deleted: getSelectionText(editor, {
-          start: start,
-          end: positionRight
+          end: positionRight,
+          start: start
         }),
-        origin: DeleteHorizontalRight
+        end: positionRight,
+        inserted: [''],
+        origin: DeleteHorizontalRight,
+        start: start
       });
     }
     return changes;
@@ -4719,10 +4722,10 @@ const findAllReferences$1 = async editor => {
 
 const getFormattingEdits = async editor => {
   const edits = await execute({
+    args: [],
     editor,
     event: 'onFormatting',
-    method: 'ExtensionHostFormatting.executeFormattingProvider',
-    args: []
+    method: 'ExtensionHostFormatting.executeFormattingProvider'
   });
   return edits;
 };
@@ -4966,9 +4969,9 @@ const editorCopyLineUp = () => {
 // @ts-ignore
 const goTo = async ({
   editor,
+  getErrorMessage,
   getLocation,
   getNoLocationFoundMessage,
-  getErrorMessage,
   isNoProviderFoundError
 }) => {
   const {
@@ -5003,10 +5006,10 @@ const goTo = async ({
     // TODO open file and scroll to that position and set cursor to that position
 
     const context = {
-      startRowIndex: definition.startRowIndex,
-      startColumnIndex: definition.startColumnIndex,
+      endColumnIndex: definition.endColumnIndex,
       endRowIndex: definition.endRowIndex,
-      endColumnIndex: definition.endColumnIndex
+      startColumnIndex: definition.startColumnIndex,
+      startRowIndex: definition.startRowIndex
     };
     await invoke$b(/* Main.openUri */'Main.openUri', /* uri */uri, /* focus */true, context);
     return editor;
@@ -5070,9 +5073,9 @@ const isNoProviderFoundError$1 = error => {
 const goToDefinition = async editor => {
   return goTo({
     editor,
+    getErrorMessage: getErrorMessage$3,
     getLocation: getLocation$1,
     getNoLocationFoundMessage: getNoLocationFoundMessage$1,
-    getErrorMessage: getErrorMessage$3,
     isNoProviderFoundError: isNoProviderFoundError$1
   });
 };
@@ -5116,10 +5119,10 @@ const isNoProviderFoundError = error => {
 const goToTypeDefinition = async (editor, explicit = true) => {
   return goTo({
     editor,
+    getErrorMessage: getErrorMessage$2,
     getLocation,
     getNoLocationFoundMessage: getNoLocationFoundMessage,
-    isNoProviderFoundError,
-    getErrorMessage: getErrorMessage$2
+    isNoProviderFoundError
   });
 };
 
@@ -5144,8 +5147,8 @@ const closeWidgetsMaybe = widgets => {
 
 const state$3 = {
   position: {
-    rowIndex: 0,
-    columnIndex: 0
+    columnIndex: 0,
+    rowIndex: 0
   }
 };
 const getPosition$1 = () => {
@@ -5161,8 +5164,8 @@ const setPosition$1 = position => {
 // cursor should appear at mousedown position immediately
 const handleSingleClickWithAlt = async (editor, position) => {
   const {
-    rowIndex,
-    columnIndex
+    columnIndex,
+    rowIndex
   } = position;
   const newEditor = {
     ...editor,
@@ -5209,8 +5212,8 @@ const handleSingleClickDefault = (editor, position) => {
   const widgets = closeWidgetsMaybe(editor.widgets);
   return {
     ...editor,
-    selections: new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]),
     focused: true,
+    selections: new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]),
     widgets
   };
 };
@@ -5232,8 +5235,8 @@ const handleClickAtPosition = async (editor, modifier, rowIndex, columnIndex) =>
   number(columnIndex);
   const fn = getClickHandler(modifier);
   const newEditor = await fn(editor, {
-    rowIndex,
-    columnIndex
+    columnIndex,
+    rowIndex
   });
   return newEditor;
 };
@@ -5286,9 +5289,9 @@ const handleFocus$1 = editor => {
   }
   return {
     ...editor,
-    focused: true,
+    additionalFocus: 0,
     focus: FocusEditorText$1,
-    additionalFocus: 0
+    focused: true
   };
 };
 
@@ -5335,10 +5338,10 @@ const handleTripleClick = (editor, modifier, x, y) => {
 
 const handleMouseDown = (state, modifier, x, y, detail) => {
   switch (detail) {
-    case Single:
-      return handleSingleClick(state, modifier, x, y);
     case Double:
       return handleDoubleClick(state, modifier, x, y);
+    case Single:
+      return handleSingleClick(state, modifier, x, y);
     case Triple:
       return handleTripleClick(state, modifier, x, y);
     default:
@@ -5347,10 +5350,10 @@ const handleMouseDown = (state, modifier, x, y, detail) => {
 };
 
 const state$2 = {
+  editor: undefined,
   timeout: -1,
   x: 0,
-  y: 0,
-  editor: undefined
+  y: 0
 };
 const get = () => {
   return state$2;
@@ -5378,9 +5381,9 @@ const showHover$1 = async (editor, position) => {
 
 const onHoverIdle = async () => {
   const {
+    editor,
     x,
-    y,
-    editor
+    y
   } = get();
   await at(editor, x, y);
   await showHover$1();
@@ -5473,21 +5476,21 @@ const getSelectionFromNativeRange = (editor, range) => {
 const getChanges$3 = (editor, data, range) => {
   const selection = getSelectionFromNativeRange(editor, range);
   const selectionRange = {
-    start: {
-      rowIndex: selection[0],
-      columnIndex: selection[1]
-    },
     end: {
-      rowIndex: selection[2],
-      columnIndex: selection[3]
+      columnIndex: selection[3],
+      rowIndex: selection[2]
+    },
+    start: {
+      columnIndex: selection[1],
+      rowIndex: selection[0]
     }
   };
   const changes = [{
-    start: selectionRange.start,
+    deleted: getSelectionText(editor, selectionRange),
     end: selectionRange.end,
     inserted: [data],
-    deleted: getSelectionText(editor, selectionRange),
-    origin: ContentEditableInput
+    origin: ContentEditableInput,
+    start: selectionRange.start
   }];
   return changes;
 };
@@ -5511,8 +5514,8 @@ const state$1 = {
   currentEditor: undefined,
   hasListener: false,
   position: {
-    rowIndex: 0,
-    columnIndex: 0
+    columnIndex: 0,
+    rowIndex: 0
   }
 };
 
@@ -5568,10 +5571,10 @@ const getNewPercent$1 = (size, scrollBarSize, relativeX) => {
 // @ts-ignore
 const handleScrollBarHorizontalMove = (state, eventX) => {
   const {
-    x,
-    width,
+    handleOffsetX,
     longestLineWidth,
-    handleOffsetX
+    width,
+    x
   } = state;
   const spaceRight = 20; // TODO make this configurable
   const normalizedEventX = clamp(eventX, x, x + width);
@@ -5602,10 +5605,10 @@ const handleScrollBarHorizontalMove = (state, eventX) => {
 const handleScrollBarHorizontalPointerDown = (state, eventX) => {
   // @ts-ignore
   const {
-    x,
     deltaX,
+    longestLineWidth,
     width,
-    longestLineWidth
+    x
   } = state;
   const relativeX = eventX - x;
   const scrollBarWidth = getScrollBarWidth(width, longestLineWidth);
@@ -5619,14 +5622,14 @@ const handleScrollBarHorizontalPointerDown = (state, eventX) => {
     };
   }
   const {
-    percent,
-    handleOffset
+    handleOffset,
+    percent
   } = getNewDeltaPercent(width, scrollBarWidth, relativeX);
   const newDeltaX = percent * finalDeltaX;
   return {
     ...state,
-    handleOffsetX: handleOffset,
-    deltaX: newDeltaX
+    deltaX: newDeltaX,
+    handleOffsetX: handleOffset
   };
 };
 
@@ -5653,9 +5656,9 @@ const getNewPercent = (state, relativeY) => {
 // @ts-ignore
 const handleScrollBarMove = (state, eventY) => {
   const {
-    y,
     finalDeltaY,
-    handleOffset
+    handleOffset,
+    y
   } = state;
   const relativeY = eventY - y - handleOffset;
   const newPercent = getNewPercent(state, relativeY);
@@ -5672,11 +5675,11 @@ const handleScrollBarVerticalPointerMove = handleScrollBarMove;
 
 const handleScrollBarPointerDown = (state, eventY) => {
   const {
-    y,
     deltaY,
     finalDeltaY,
     height,
-    scrollBarHeight
+    scrollBarHeight,
+    y
   } = state;
   const relativeY = eventY - y;
   const currentScrollBarY = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
@@ -5688,8 +5691,8 @@ const handleScrollBarPointerDown = (state, eventY) => {
     };
   }
   const {
-    percent,
-    handleOffset
+    handleOffset,
+    percent
   } = getNewDeltaPercent(height, scrollBarHeight, relativeY);
   const newDeltaY = percent * finalDeltaY;
   return {
@@ -5721,8 +5724,8 @@ const handleTouchEnd = (editor, touchEvent) => {
 };
 
 const state = {
-  touchOffsetY: 0,
-  deltaY: 0
+  deltaY: 0,
+  touchOffsetY: 0
 };
 
 // @ts-ignore
@@ -5789,17 +5792,17 @@ const getChanges$2 = selections => {
   }
   for (const rowToIndent of rowsToIndentLess) {
     changes.push({
-      start: {
-        rowIndex: rowToIndent,
-        columnIndex: 0
-      },
+      deleted: ['  '],
       end: {
-        rowIndex: rowToIndent,
-        columnIndex: 2
+        columnIndex: 2,
+        rowIndex: rowToIndent
       },
       inserted: [''],
-      deleted: ['  '],
-      origin: IndentLess
+      origin: IndentLess,
+      start: {
+        columnIndex: 0,
+        rowIndex: rowToIndent
+      }
     });
   }
   return changes;
@@ -5826,17 +5829,17 @@ const getChanges$1 = selections => {
   const changes = [];
   for (const rowToIndent of rowsToIndent) {
     changes.push({
-      start: {
-        rowIndex: rowToIndent,
-        columnIndex: 0
-      },
+      deleted: [''],
       end: {
-        rowIndex: rowToIndent,
-        columnIndex: 0
+        columnIndex: 0,
+        rowIndex: rowToIndent
       },
       inserted: ['  '],
-      deleted: [''],
-      origin: IndentMore
+      origin: IndentMore,
+      start: {
+        columnIndex: 0,
+        rowIndex: rowToIndent
+      }
     });
   }
   return changes;
@@ -5852,8 +5855,8 @@ const indentMore = editor => {
 const getLanguageConfiguration = async editor => {
   // @ts-ignore
   return invoke$b('Languages.getLanguageConfiguration', {
-    uri: editor.uri,
-    languageId: editor.languageId
+    languageId: editor.languageId,
+    uri: editor.uri
   });
 };
 
@@ -5877,16 +5880,16 @@ const getChanges = (lines, selections, languageConfiguration) => {
   for (let i = 0; i < selections.length; i += 4) {
     const [selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn] = getSelectionPairs(selections, i);
     const start = {
-      rowIndex: selectionStartRow,
-      columnIndex: selectionStartColumn
+      columnIndex: selectionStartColumn,
+      rowIndex: selectionStartRow
     };
     const end = {
-      rowIndex: selectionEndRow,
-      columnIndex: selectionEndColumn
+      columnIndex: selectionEndColumn,
+      rowIndex: selectionEndRow
     };
     const range = {
-      start,
-      end
+      end,
+      start
     };
     if (isEmpty(selectionStartRow, selectionStartColumn, selectionEndRow, selectionEndColumn)) {
       const line = lines[selectionStartRow];
@@ -5894,36 +5897,36 @@ const getChanges = (lines, selections, languageConfiguration) => {
       const indent = getIndent(before);
       if (shouldIncreaseIndent(before, increaseIndentRegex)) {
         changes.push({
-          start: start,
-          end: end,
-          inserted: ['', indent + '  ', indent],
           deleted: getSelectionText({
             lines
           }, range),
-          origin: InsertLineBreak
+          end: end,
+          inserted: ['', indent + '  ', indent],
+          origin: InsertLineBreak,
+          start: start
         });
         selectionChanges.push(selectionStartRow + 1, indent.length + 2, selectionStartRow + 1, indent.length + 2);
       } else {
         changes.push({
-          start: start,
-          end: end,
-          inserted: ['', indent],
           deleted: getSelectionText({
             lines
           }, range),
-          origin: InsertLineBreak
+          end: end,
+          inserted: ['', indent],
+          origin: InsertLineBreak,
+          start: start
         });
         selectionChanges.push(selectionStartRow + 1, indent.length, selectionStartRow + 1, indent.length);
       }
     } else {
       changes.push({
-        start: start,
-        end: end,
-        inserted: ['', ''],
         deleted: getSelectionText({
           lines
         }, range),
-        origin: InsertLineBreak
+        end: end,
+        inserted: ['', ''],
+        origin: InsertLineBreak,
+        start: start
       });
       selectionChanges.push(selectionStartRow + 1, 0, selectionStartRow + 1, 0);
     }
@@ -6019,12 +6022,12 @@ const editorMoveSelectionForwards = (anchor, position) => {
 // @ts-ignore
 const getNewSelections$5 = (anchor, position) => {
   switch (compare(position, anchor)) {
-    case LessThan:
-      return editorMoveSelectionBackwards(anchor, position);
     case Equal:
       return editorMoveSelectionEqual(anchor, position);
     case GreaterThan:
       return editorMoveSelectionForwards(anchor, position);
+    case LessThan:
+      return editorMoveSelectionBackwards(anchor, position);
     default:
       throw new Error('unexpected comparison result');
   }
@@ -6045,8 +6048,8 @@ const requestAnimationFrame = fn => {
 // @ts-ignore
 const getNewEditor$1 = (editor, position) => {
   const {
-    minLineY,
     maxLineY,
+    minLineY,
     rowHeight
   } = editor;
   const diff = maxLineY - minLineY;
@@ -6058,9 +6061,9 @@ const getNewEditor$1 = (editor, position) => {
     const newSelections = new Uint32Array([position.rowIndex - 1, position.columnIndex, anchor.rowIndex, anchor.columnIndex]);
     return {
       ...editor,
-      minLineY: newMinLineY,
-      maxLineY: newMaxLineY,
       deltaY: newDeltaY,
+      maxLineY: newMaxLineY,
+      minLineY: newMinLineY,
       selections: newSelections
     };
   }
@@ -6073,9 +6076,9 @@ const getNewEditor$1 = (editor, position) => {
     const newSelections = new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex + 1, position.columnIndex]);
     return {
       ...editor,
-      minLineY: newMinLineY,
-      maxLineY: newMaxLineY,
       deltaY: newDeltaY,
+      maxLineY: newMaxLineY,
+      minLineY: newMinLineY,
       selections: newSelections
     };
   }
@@ -6099,8 +6102,8 @@ const continueScrollingAndMovingSelection = async () => {
   // @ts-ignore
   const delta = position.rowIndex < editor.minLineY ? -1 : 1;
   setPosition({
-    rowIndex: position.rowIndex + delta,
-    columnIndex: position.columnIndex
+    columnIndex: position.columnIndex,
+    rowIndex: position.rowIndex + delta
   });
   requestAnimationFrame(continueScrollingAndMovingSelection);
   // TODO get editor state
@@ -6130,25 +6133,25 @@ const create$5 = () => {
   const completionUid = create$7();
   const widget = {
     id: CodeGenerator,
-    oldState: {
-      uid: completionUid,
+    newState: {
+      focused: true,
+      focusSource: Script,
+      height: 0,
       questions: [],
-      x: 0,
-      y: 0,
+      uid: completionUid,
       width: 0,
-      height: 0,
-      focused: false,
-      focusSource: Unknown$1
+      x: 0,
+      y: 0
     },
-    newState: {
-      uid: completionUid,
+    oldState: {
+      focused: false,
+      focusSource: Unknown$1,
+      height: 0,
       questions: [],
-      x: 0,
-      y: 0,
+      uid: completionUid,
       width: 0,
-      height: 0,
-      focused: true,
-      focusSource: Script
+      x: 0,
+      y: 0
     }
   };
   return widget;
@@ -6157,10 +6160,10 @@ const create$5 = () => {
 const newStateGenerator$5 = async state => {
   const latestState = {
     ...state,
-    x: 100,
-    y: 100,
+    height: 45,
     width: 150,
-    height: 45
+    x: 100,
+    y: 100
   };
   return latestState;
 };
@@ -6173,38 +6176,38 @@ const create$4 = () => {
   const completionUid = create$7();
   const completionWidget = {
     id: Completion,
-    oldState: {
+    newState: {
+      commands: [],
+      height: 0,
       uid: completionUid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
-      commands: []
+      x: 0,
+      y: 0
     },
-    newState: {
+    oldState: {
+      commands: [],
+      height: 0,
       uid: completionUid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
-      commands: []
+      x: 0,
+      y: 0
     }
   };
   return completionWidget;
 };
 
 const {
-  setFactory,
-  invoke: invoke$4
+  invoke: invoke$4,
+  setFactory
 } = createLazyRpc(CompletionWorker);
 
 const newStateGenerator$4 = async (state, parentUid) => {
   const {
+    height,
     uid,
-    x,
-    y,
     width,
-    height
+    x,
+    y
   } = state;
   const {
     newState
@@ -6230,23 +6233,23 @@ const create$3 = () => {
   const uid = create$7();
   const widget = {
     id: Find,
-    oldState: {
+    newState: {
+      commands: [],
+      editorUid: 0,
+      height: 0,
       uid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
-      commands: [],
-      editorUid: 0
+      x: 0,
+      y: 0
     },
-    newState: {
+    oldState: {
+      commands: [],
+      editorUid: 0,
+      height: 0,
       uid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
-      commands: [],
-      editorUid: 0
+      x: 0,
+      y: 0
     }
   };
   return widget;
@@ -6300,10 +6303,10 @@ const loadContent$1 = async (state, parentUid) => {
   } = state;
   const editor = getEditor(parentUid);
   const {
-    x,
-    y,
+    height,
     width,
-    height
+    x,
+    y
   } = editor;
   await launch();
   await invoke$3('FindWidget.create', uid, x, y, width, height, parentUid);
@@ -6337,10 +6340,10 @@ const getPositionAtCursor$1 = editor => {
   const x$1 = x(editor, rowIndex, columnIndex);
   const y$1 = y(editor, rowIndex);
   return {
-    x: x$1,
-    y: y$1,
+    columnIndex,
     rowIndex,
-    columnIndex
+    x: x$1,
+    y: y$1
   };
 };
 
@@ -6348,21 +6351,21 @@ const create$2 = () => {
   const completionUid = create$7();
   const renameWidget = {
     id: Rename$1,
-    oldState: {
+    newState: {
+      commands: [],
+      height: 0,
       uid: completionUid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
-      commands: []
+      x: 0,
+      y: 0
     },
-    newState: {
+    oldState: {
+      commands: [],
+      height: 0,
       uid: completionUid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
-      commands: []
+      x: 0,
+      y: 0
     }
   };
   return renameWidget;
@@ -6370,11 +6373,11 @@ const create$2 = () => {
 
 const newStateGenerator$2 = async (state, parentUid) => {
   const {
+    height,
     uid,
-    x,
-    y,
     width,
-    height
+    x,
+    y
   } = state;
   const {
     newState
@@ -6393,8 +6396,8 @@ const newStateGenerator$2 = async (state, parentUid) => {
 };
 const openRename = async editor => {
   const {
-    rowIndex,
-    columnIndex
+    columnIndex,
+    rowIndex
   } = getPositionAtCursor$1(editor);
   const {
     word
@@ -6408,10 +6411,10 @@ const openRename = async editor => {
 
 const getOrganizeImportEdits = async editor => {
   const edits = await execute({
+    args: [],
     editor,
     event: 'onLanguage',
-    method: 'ExtensionHostOrganizeImports.execute',
-    args: []
+    method: 'ExtensionHostOrganizeImports.execute'
   });
   return edits;
 };
@@ -6453,26 +6456,26 @@ const getErrorMessage$1 = error => {
 const prepareErrorMessageWithCodeFrame = error => {
   if (!error) {
     return {
+      codeFrame: undefined,
       message: error,
       stack: undefined,
-      codeFrame: undefined,
       type: 'Error'
     };
   }
   const message = getErrorMessage$1(error);
   if (error.codeFrame) {
     return {
+      codeFrame: error.codeFrame,
       message,
       stack: error.stack,
-      codeFrame: error.codeFrame,
       type: error.constructor.name
     };
   }
   return {
+    category: error.category,
+    codeFrame: error.originalCodeFrame,
     message,
     stack: error.originalStack,
-    codeFrame: error.originalCodeFrame,
-    category: error.category,
     stderr: error.stderr
   };
 };
@@ -6649,9 +6652,12 @@ const isAlphaNumeric = char => {
   return RE_ALPHA_NUMERIC.test(char);
 };
 
+const isWordChar = char => {
+  return isAlphaNumeric(char) || char === '_';
+};
 const getWordStartIndex = (line, index) => {
   for (let i = index - 1; i >= 0; i--) {
-    if (!isAlphaNumeric(line[i])) {
+    if (!isWordChar(line[i])) {
       return i + 1;
     }
   }
@@ -6659,11 +6665,11 @@ const getWordStartIndex = (line, index) => {
 };
 const getWordEndIndex = (line, index) => {
   for (let i = index; i < line.length; i++) {
-    if (!isAlphaNumeric(line[i])) {
+    if (!isWordChar(line[i])) {
       return i;
     }
   }
-  return line.length - 1;
+  return line.length;
 };
 const getWordMatchAtPosition = (lines, rowIndex, columnIndex) => {
   const line = lines[rowIndex];
@@ -6671,8 +6677,8 @@ const getWordMatchAtPosition = (lines, rowIndex, columnIndex) => {
   const end = getWordEndIndex(line, columnIndex);
   const word = line.slice(start, end);
   return {
-    start,
     end,
+    start,
     word
   };
 };
@@ -7022,8 +7028,9 @@ const getSelectNextOccurrenceResult = editor => {
       }
     }
     return {
-      selectionEdits: newSelections,
-      revealRange: newSelections.length - 4 // TODO should be primary selection
+      revealRange: newSelections.length - 4,
+      // TODO should be primary selection
+      selectionEdits: newSelections
     };
   }
   if (isEverySelectionSingleLine(editor.selections)) {
@@ -7149,8 +7156,8 @@ const setLanguageId = async (editor, languageId, tokenizePath) => {
   }
   const syncIncremental = getEnabled();
   const {
-    textInfos,
-    differences
+    differences,
+    textInfos
   } = await getVisible$1(editor, syncIncremental);
   const latest2 = getEditor(editor.uid);
   if (!latest2) {
@@ -7158,9 +7165,9 @@ const setLanguageId = async (editor, languageId, tokenizePath) => {
   }
   const newEditor4 = {
     ...latest2,
+    differences,
     focused: true,
-    textInfos,
-    differences
+    textInfos
   };
 
   // TODO don't update editor if tokenizer was already loaded
@@ -7169,16 +7176,16 @@ const setLanguageId = async (editor, languageId, tokenizePath) => {
 
   return {
     ...newEditor4,
-    languageId,
     invalidStartIndex: 0,
+    languageId,
     tokenizerId: newTokenizerId
   };
 };
 
 const setSelections = (editor, selections) => {
   const {
-    minLineY,
     maxLineY,
+    minLineY,
     rowHeight
   } = editor;
   const startRowIndex = selections[0];
@@ -7186,20 +7193,20 @@ const setSelections = (editor, selections) => {
     const deltaY = startRowIndex * rowHeight;
     return {
       ...editor,
-      minLineY: startRowIndex,
+      deltaY,
       maxLineY: startRowIndex + 1,
-      selections,
-      deltaY
+      minLineY: startRowIndex,
+      selections
     };
   }
   if (startRowIndex > maxLineY) {
     const deltaY = startRowIndex * rowHeight;
     return {
       ...editor,
-      minLineY: startRowIndex,
+      deltaY,
       maxLineY: startRowIndex + 1,
-      selections,
-      deltaY
+      minLineY: startRowIndex,
+      selections
     };
   }
   return {
@@ -7212,31 +7219,31 @@ const create$1 = () => {
   const uid = create$7();
   const widget = {
     id: Hover,
-    oldState: {
-      uid: uid,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
+    newState: {
+      commands: [],
       content: '',
       diagnostics: [],
       documentation: '',
       editorUid: 0,
+      height: 0,
       lineInfos: [],
-      commands: []
-    },
-    newState: {
       uid: uid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
+      x: 0,
+      y: 0
+    },
+    oldState: {
+      commands: [],
       content: '',
       diagnostics: [],
       documentation: '',
       editorUid: 0,
+      height: 0,
       lineInfos: [],
-      commands: []
+      uid: uid,
+      width: 0,
+      x: 0,
+      y: 0
     }
   };
   return widget;
@@ -7264,11 +7271,11 @@ const invoke$2 = async (method, ...params) => {
 
 const newStateGenerator$1 = async (state, parentUid) => {
   const {
+    height,
     uid,
-    x,
-    y,
     width,
-    height
+    x,
+    y
   } = state;
   const {
     newState
@@ -7300,27 +7307,27 @@ const create = () => {
   const completionUid = create$7();
   const widget = {
     id: SourceAction$1,
-    oldState: {
-      uid: completionUid,
-      x: 0,
-      y: 0,
-      width: 0,
-      height: 0,
+    newState: {
+      commands: [],
       focusedIndex: 0,
-      sourceActions: [],
+      height: 0,
       maxHeight: 0,
-      commands: []
-    },
-    newState: {
+      sourceActions: [],
       uid: completionUid,
-      x: 0,
-      y: 0,
       width: 0,
-      height: 0,
+      x: 0,
+      y: 0
+    },
+    oldState: {
+      commands: [],
       focusedIndex: 0,
-      sourceActions: [],
+      height: 0,
       maxHeight: 0,
-      commands: []
+      sourceActions: [],
+      uid: completionUid,
+      width: 0,
+      x: 0,
+      y: 0
     }
   };
   return widget;
@@ -7348,11 +7355,11 @@ const invoke$1 = async (method, ...params) => {
 
 const newStateGenerator = async (state, parentUid) => {
   const {
+    height,
     uid,
-    x,
-    y,
     width,
-    height
+    x,
+    y
   } = state;
   const {
     newState
@@ -7396,27 +7403,27 @@ const getSortLinesAscendingChanges = (lines, selections) => {
     const selectionEndRow = selections[i + 2];
     const selectionEndColumn = selections[i + 3];
     const start = {
-      rowIndex: selectionStartRow,
-      columnIndex: selectionStartColumn
+      columnIndex: selectionStartColumn,
+      rowIndex: selectionStartRow
     };
     const end = {
-      rowIndex: selectionEndRow,
-      columnIndex: selectionEndColumn
+      columnIndex: selectionEndColumn,
+      rowIndex: selectionEndRow
     };
     const selection = {
-      start,
-      end
+      end,
+      start
     };
     const selectionLines = lines.slice(startRowIndex, endRowIndex + 1);
     const sortedSelectionLines = getSortedLines(selectionLines);
     changes.push({
-      start: start,
-      end: end,
-      inserted: sortedSelectionLines,
       deleted: getSelectionText({
         lines
       }, selection),
-      origin
+      end: end,
+      inserted: sortedSelectionLines,
+      origin,
+      start: start
     });
   }
   return changes;
@@ -7434,10 +7441,10 @@ const sortLinesAscending = editor => {
 
 const executeTabCompletionProvider = async (editor, offset) => {
   return execute({
+    args: [offset],
     editor,
     event: OnTabCompletion,
     method: TabCompletionExecuteTabCompletionProvider,
-    args: [offset],
     noProviderFoundMessage: 'No tab completion provider found',
     noProviderFoundResult: undefined
   });
@@ -7474,17 +7481,17 @@ const getSnippetChanges = (lines, selections, snippet) => {
       const insertedLinesHere = [insertedLines[0], ...insertedLines.slice(1).map(line => indent + line)];
       const deleted = [''];
       changes.push({
-        start: {
-          rowIndex: selectionStartRow,
-          columnIndex: selectionStartColumn - snippet.deleted
-        },
+        deleted,
         end: {
-          rowIndex: selectionEndRow,
-          columnIndex: selectionEndColumn
+          columnIndex: selectionEndColumn,
+          rowIndex: selectionEndRow
         },
         inserted: insertedLinesHere,
-        deleted,
-        origin: EditorSnippet
+        origin: EditorSnippet,
+        start: {
+          columnIndex: selectionStartColumn - snippet.deleted,
+          rowIndex: selectionStartRow
+        }
       });
       const lastInsertedLine = insertedLines.at(-1);
       selectionChanges.push(selectionEndRow + insertedLines.length - deleted.length,
@@ -7501,34 +7508,34 @@ const getSnippetChanges = (lines, selections, snippet) => {
         selectionChanges.push(selectionStartRow, cursorColumnIndex, selectionStartRow, cursorColumnIndex);
         // @ts-ignore
         changes.push({
-          start: {
-            rowIndex: selectionStartRow,
-            columnIndex: selectionStartColumn - snippet.deleted
-          },
+          deleted: [''],
           end: {
-            rowIndex: selectionEndRow,
-            columnIndex: selectionEndColumn
+            columnIndex: selectionEndColumn,
+            rowIndex: selectionEndRow
           },
           inserted: insertedLines,
-          deleted: [''],
-          origin: EditorSnippet
+          origin: EditorSnippet,
+          start: {
+            columnIndex: selectionStartColumn - snippet.deleted,
+            rowIndex: selectionStartRow
+          }
         });
       } else {
         const inserted = line.replace('$0', '');
         const cursorColumnIndex = selectionEndColumn + 2;
         selectionChanges.push(selectionStartRow, cursorColumnIndex, selectionStartRow, cursorColumnIndex);
         changes.push({
-          start: {
-            rowIndex: selectionStartRow,
-            columnIndex: selectionStartColumn - snippet.deleted
-          },
+          deleted: [''],
           end: {
-            rowIndex: selectionEndRow,
-            columnIndex: selectionEndColumn
+            columnIndex: selectionEndColumn,
+            rowIndex: selectionEndRow
           },
           inserted: [inserted],
-          deleted: [''],
-          origin: EditorSnippet
+          origin: EditorSnippet,
+          start: {
+            columnIndex: selectionStartColumn - snippet.deleted,
+            rowIndex: selectionStartRow
+          }
         });
       }
     }
@@ -7633,58 +7640,58 @@ const getBlockCommentEdits = (editor, blockComment) => {
   if (startColumnIndex !== -1 && endColumnIndex !== -1) {
     if (startRowIndex === endRowIndex) {
       const change1 = {
-        start: {
-          rowIndex,
-          columnIndex: startColumnIndex
-        },
+        deleted: [blockCommentStart],
         end: {
-          rowIndex,
-          columnIndex: startColumnIndex + blockCommentStart.length
+          columnIndex: startColumnIndex + blockCommentStart.length,
+          rowIndex
         },
         inserted: [],
-        deleted: [blockCommentStart],
-        origin: ToggleBlockComment$1
+        origin: ToggleBlockComment$1,
+        start: {
+          columnIndex: startColumnIndex,
+          rowIndex
+        }
       };
       const change2 = {
-        start: {
-          rowIndex,
-          columnIndex: endColumnIndex - blockCommentStart.length
-        },
+        deleted: [blockCommentEnd],
         end: {
-          rowIndex,
-          columnIndex: endColumnIndex - blockCommentStart.length + blockCommentEnd.length
+          columnIndex: endColumnIndex - blockCommentStart.length + blockCommentEnd.length,
+          rowIndex
         },
         inserted: [],
-        deleted: [blockCommentEnd],
-        origin: ToggleBlockComment$1
+        origin: ToggleBlockComment$1,
+        start: {
+          columnIndex: endColumnIndex - blockCommentStart.length,
+          rowIndex
+        }
       };
       changes.push(change1, change2);
     } else {
       const change1 = {
-        start: {
-          rowIndex: startRowIndex,
-          columnIndex: startColumnIndex
-        },
+        deleted: [blockCommentStart],
         end: {
-          rowIndex: startRowIndex,
-          columnIndex: startColumnIndex + blockCommentStart.length
+          columnIndex: startColumnIndex + blockCommentStart.length,
+          rowIndex: startRowIndex
         },
         inserted: [],
-        deleted: [blockCommentStart],
-        origin: ToggleBlockComment$1
+        origin: ToggleBlockComment$1,
+        start: {
+          columnIndex: startColumnIndex,
+          rowIndex: startRowIndex
+        }
       };
       const change2 = {
-        start: {
-          rowIndex: endRowIndex,
-          columnIndex: endColumnIndex
-        },
+        deleted: [blockCommentEnd],
         end: {
-          rowIndex: endRowIndex,
-          columnIndex: endColumnIndex + blockCommentEnd.length
+          columnIndex: endColumnIndex + blockCommentEnd.length,
+          rowIndex: endRowIndex
         },
         inserted: [],
-        deleted: [blockCommentEnd],
-        origin: ToggleBlockComment$1
+        origin: ToggleBlockComment$1,
+        start: {
+          columnIndex: endColumnIndex,
+          rowIndex: endRowIndex
+        }
       };
       changes.push(change1, change2);
 
@@ -7713,30 +7720,30 @@ const getBlockCommentEdits = (editor, blockComment) => {
       endColumnIndex -= whitespaceAtEnd[0].length;
     }
     const change1 = {
-      start: {
-        rowIndex,
-        columnIndex: startColumnIndex
-      },
+      deleted: [],
       end: {
-        rowIndex,
-        columnIndex: startColumnIndex
+        columnIndex: startColumnIndex,
+        rowIndex
       },
       inserted: [blockCommentStart],
-      deleted: [],
-      origin: ToggleBlockComment$1
+      origin: ToggleBlockComment$1,
+      start: {
+        columnIndex: startColumnIndex,
+        rowIndex
+      }
     };
     const change2 = {
-      start: {
-        rowIndex,
-        columnIndex: endColumnIndex + blockCommentStart.length
-      },
+      deleted: [],
       end: {
-        rowIndex,
-        columnIndex: endColumnIndex + blockCommentStart.length
+        columnIndex: endColumnIndex + blockCommentStart.length,
+        rowIndex
       },
       inserted: [blockCommentEnd],
-      deleted: [],
-      origin: ToggleBlockComment$1
+      origin: ToggleBlockComment$1,
+      start: {
+        columnIndex: endColumnIndex + blockCommentStart.length,
+        rowIndex
+      }
     };
     changes.push(change1, change2);
     // TextDocument.setLine(
@@ -7810,45 +7817,45 @@ const getLineCommentEdit = (rowIndex, line, lineComment) => {
     // TODO also check tab character
     if (line[index + lineComment.length] === ' ') {
       return {
-        inserted: [''],
         deleted: [lineComment + ' '],
-        start: {
-          rowIndex,
-          columnIndex: index
-        },
         end: {
-          rowIndex,
-          columnIndex: index + lineComment.length + 1
+          columnIndex: index + lineComment.length + 1,
+          rowIndex
         },
-        origin: LineComment
+        inserted: [''],
+        origin: LineComment,
+        start: {
+          columnIndex: index,
+          rowIndex
+        }
       };
     }
     return {
-      inserted: [''],
       deleted: [lineComment],
-      start: {
-        rowIndex,
-        columnIndex: index
-      },
       end: {
-        rowIndex,
-        columnIndex: index + lineComment.length
+        columnIndex: index + lineComment.length,
+        rowIndex
       },
-      origin: LineComment
+      inserted: [''],
+      origin: LineComment,
+      start: {
+        columnIndex: index,
+        rowIndex
+      }
     };
   }
   return {
-    inserted: [`${lineComment} `],
     deleted: [],
-    start: {
-      rowIndex,
-      columnIndex: index
-    },
     end: {
-      rowIndex,
-      columnIndex: index
+      columnIndex: index,
+      rowIndex
     },
-    origin: LineComment
+    inserted: [`${lineComment} `],
+    origin: LineComment,
+    start: {
+      columnIndex: index,
+      rowIndex
+    }
   };
 };
 
@@ -7986,11 +7993,10 @@ const typeWithAutoClosing = async (editor, text) => {
     isAutoClosingTagsEnabled
   } = editor;
   switch (text) {
-    case CurlyOpen:
-    case RoundOpen:
-    case SquareOpen:
-      if (isAutoClosingBracketsEnabled) {
-        return typeWithAutoClosingBracket(editor, text);
+    // case AutoClosing.ClosingAngleBracket: // TODO support auto closing when typing closing angle bracket of start tag
+    case Slash:
+      if (isAutoClosingTagsEnabled) {
+        return typeWithAutoClosingTag(editor, text);
       }
       break;
     case CurlyClose:
@@ -8000,19 +8006,20 @@ const typeWithAutoClosing = async (editor, text) => {
         return typeWithAutoClosingEndBracket(editor, text);
       }
       break;
+    case CurlyOpen:
+    case RoundOpen:
+    case SquareOpen:
+      if (isAutoClosingBracketsEnabled) {
+        return typeWithAutoClosingBracket(editor, text);
+      }
+      break;
+    case BackTick:
     case DoubleQuote:
     case SingleQuote:
-    case BackTick:
       if (isAutoClosingQuotesEnabled) {
         return typeWithAutoClosingQuote(editor, text);
       }
       break;
-    // case AutoClosing.ClosingAngleBracket: // TODO support auto closing when typing closing angle bracket of start tag
-    case Slash:
-      if (isAutoClosingTagsEnabled) {
-        return typeWithAutoClosingTag(editor, text);
-      }
-      break;
   }
   const newEditor = type(editor, text);
   // const extraCommands: any[] = []
@@ -8042,13 +8049,13 @@ const typeWithAutoClosing = async (editor, text) => {
 const inverseChange = edit => {
   const endColumnIndex = edit.end.columnIndex - edit.deleted[0].length + edit.inserted[0].length;
   return {
-    start: edit.start,
+    deleted: edit.inserted,
     end: {
-      rowIndex: edit.end.rowIndex,
-      columnIndex: endColumnIndex
+      columnIndex: endColumnIndex,
+      rowIndex: edit.end.rowIndex
     },
     inserted: edit.deleted,
-    deleted: edit.inserted
+    start: edit.start
   };
 };
 
@@ -8188,11 +8195,11 @@ const editorUnindent = editor => {
 const isFunctional = widgetId => {
   switch (widgetId) {
     case ColorPicker$1:
-    case Rename$1:
     case Completion:
     case Find:
-    case SourceAction$1:
     case Hover:
+    case Rename$1:
+    case SourceAction$1:
       return true;
     default:
       return false;
@@ -8238,12 +8245,12 @@ const getWidgetInvoke = widgetId => {
       return invoke$4;
     case Find:
       return invoke$3;
+    case Hover:
+      return invoke$2;
     case Rename$1:
       return invoke$5;
     case SourceAction$1:
       return invoke$1;
-    case Hover:
-      return invoke$2;
     default:
       return undefined;
   }
@@ -8262,8 +8269,8 @@ const updateWidget = (editor, widgetId, newState) => {
   const childWidget = editor.widgets[childIndex];
   const newWidget = {
     ...childWidget,
-    oldState: childWidget.newState,
-    newState
+    newState,
+    oldState: childWidget.newState
   };
   const newWidgets = [...editor.widgets.slice(0, childIndex), newWidget, ...editor.widgets.slice(childIndex + 1)];
   return {
@@ -8350,6 +8357,8 @@ const remove$7 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
 };
 const {
+  close: close$4,
+  closeDetails: closeDetails$1,
   focusFirst: focusFirst$1,
   focusIndex: focusIndex$2,
   focusLast: focusLast$1,
@@ -8359,14 +8368,12 @@ const {
   handleEditorClick,
   handleEditorDeleteLeft: handleEditorDeleteLeft$1,
   handleEditorType: handleEditorType$1,
+  handlePointerDown,
+  handleWheel: handleWheel$1,
   openDetails,
   selectCurrent: selectCurrent$1,
   selectIndex: selectIndex$1,
-  toggleDetails: toggleDetails$1,
-  closeDetails: closeDetails$1,
-  handleWheel: handleWheel$1,
-  close: close$4,
-  handlePointerDown
+  toggleDetails: toggleDetails$1
 } = createFns(['handleEditorType', 'focusFirst', 'focusNext', 'focusPrevious', 'focusLast', 'handleEditorDeleteLeft', 'openDetails', 'focusIndex', 'handleEditorBlur', 'handleEditorClick', 'openDetails', 'selectCurrent', 'selectIndex', 'toggleDetails', 'closeDetails', 'handleWheel', 'close', 'handlePointerDown'], 'Completions', Completion);
 
 const EditorCompletionWidget = {
@@ -8426,8 +8433,10 @@ const {
   focusCloseButton,
   focusFind,
   focusNext: focusNext$2,
+  focusNextElement,
   focusNextMatchButton,
   focusPrevious: focusPrevious$1,
+  focusPreviousElement,
   focusPreviousMatchButton,
   focusReplace,
   focusReplaceAllButton,
@@ -8444,11 +8453,9 @@ const {
   replaceAll,
   toggleMatchCase,
   toggleMatchWholeWord,
+  togglePreserveCase,
   toggleReplace,
-  toggleUseRegularExpression,
-  focusNextElement,
-  focusPreviousElement,
-  togglePreserveCase
+  toggleUseRegularExpression
 } = createFns(['close', 'focusCloseButton', 'focusFind', 'focusNext', 'focusNextMatchButton', 'focusPrevious', 'focusPreviousMatchButton', 'focusReplace', 'focusReplaceAllButton', 'focusReplaceButton', 'focusToggleReplace', 'handleBlur', 'handleClickButton', 'handleFocus', 'handleInput', 'handleReplaceFocus', 'handleReplaceInput', 'handleToggleReplaceFocus', 'replace', 'replaceAll', 'toggleMatchCase', 'toggleMatchWholeWord', 'toggleReplace', 'toggleUseRegularExpression', 'focusNextElement', 'focusPreviousElement', 'togglePreserveCase'], 'FindWidget', Find);
 
 const EditorFindWidget = {
@@ -8489,10 +8496,10 @@ const executeHoverProvider = async (editor, offset) => {
   object(editor);
   number(offset);
   return execute({
-    event: OnHover,
+    args: [offset],
     editor,
+    event: OnHover,
     method: HoverExecute,
-    args: [offset],
     noProviderFoundMessage: 'No hover provider found'
   });
 };
@@ -8532,9 +8539,9 @@ const getLineInfo = (line, tokens, TokenMap) => {
 const getLineInfos = (lines, tokenizer, languageId) => {
   const lineInfos = [];
   const {
-    tokenizeLine,
-    initialLineState,
     hasArrayReturn,
+    initialLineState,
+    tokenizeLine,
     TokenMap
   } = tokenizer;
   let currentLineState = getInitialLineState(initialLineState);
@@ -8565,8 +8572,8 @@ const getHoverPosition = (position, selections) => {
   const rowIndex = selections[0];
   const columnIndex = selections[1];
   return {
-    rowIndex,
-    columnIndex
+    columnIndex,
+    rowIndex
   };
 };
 const getMatchingDiagnostics = (diagnostics, rowIndex, columnIndex) => {
@@ -8595,8 +8602,8 @@ const getEditorHoverInfo = async (editorUid, position) => {
     selections
   } = editor;
   const {
-    rowIndex,
-    columnIndex
+    columnIndex,
+    rowIndex
   } = getHoverPosition(position, selections);
   const offset = offsetAt(editor, rowIndex, columnIndex);
   const hover = await getHover(editor, offset);
@@ -8605,8 +8612,8 @@ const getEditorHoverInfo = async (editorUid, position) => {
   }
   const {
     displayString,
-    documentation,
-    displayStringLanguageId
+    displayStringLanguageId,
+    documentation
   } = hover;
   const tokenizerPath = '';
   const lineInfos = await tokenizeCodeBlock(displayString, displayStringLanguageId || fallbackDisplayStringLanguageId, tokenizerPath);
@@ -8620,11 +8627,11 @@ const getEditorHoverInfo = async (editorUid, position) => {
   const diagnostics = editor.diagnostics || [];
   const matchingDiagnostics = getMatchingDiagnostics(diagnostics, rowIndex);
   return {
-    lineInfos,
     documentation,
+    lineInfos,
+    matchingDiagnostics,
     x,
-    y,
-    matchingDiagnostics
+    y
   };
 };
 
@@ -8634,19 +8641,19 @@ const loadContent = async (editorUid, state, position) => {
     return state;
   }
   const {
-    lineInfos,
     documentation,
+    lineInfos,
+    matchingDiagnostics,
     x,
-    y,
-    matchingDiagnostics
+    y
   } = hoverInfo;
   return {
     ...state,
-    lineInfos,
+    diagnostics: matchingDiagnostics,
     documentation,
+    lineInfos,
     x,
-    y,
-    diagnostics: matchingDiagnostics
+    y
   };
 };
 const handleSashPointerDown = (state, eventX, eventY) => {
@@ -8710,25 +8717,25 @@ const Text = 12;
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 
 const getLineInfoVirtualDom = lineInfo => {
   const dom = [{
-    type: Div,
+    childCount: lineInfo.length / 2,
     className: HoverEditorRow,
-    childCount: lineInfo.length / 2
+    type: Div
   }];
   for (let i = 0; i < lineInfo.length; i += 2) {
     const tokenText = lineInfo[i];
     const tokenClass = lineInfo[i + 1];
     dom.push({
-      type: Span,
+      childCount: 1,
       className: tokenClass,
-      childCount: 1
+      type: Span
     }, text(tokenText));
   }
   return dom;
@@ -8739,14 +8746,14 @@ const getLineInfosVirtualDom = lineInfos => {
 };
 
 const hoverProblemMessage = {
-  type: Span,
+  childCount: 1,
   className: HoverProblemMessage,
-  childCount: 1
+  type: Span
 };
 const hoverProblemDetail = {
-  type: Span,
+  childCount: 1,
   className: HoverProblemDetail,
-  childCount: 1
+  type: Span
 };
 const getChildCount = (lineInfos, documentation, diagnostics) => {
   return lineInfos.length + documentation ? 1 : 0 + (diagnostics && diagnostics.length > 0) ? 1 : 0;
@@ -8754,15 +8761,15 @@ const getChildCount = (lineInfos, documentation, diagnostics) => {
 const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   const dom = [];
   dom.push({
-    type: Div,
+    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1,
     className: 'Viewlet EditorHover',
-    childCount: getChildCount(lineInfos, documentation, diagnostics) + 1
+    type: Div
   });
   if (diagnostics && diagnostics.length > 0) {
     dom.push({
-      type: Div,
+      childCount: diagnostics.length * 2,
       className: `${HoverDisplayString} ${HoverProblem}`,
-      childCount: diagnostics.length * 2
+      type: Div
     });
     for (const diagnostic of diagnostics) {
       dom.push(hoverProblemMessage, text(diagnostic.message), hoverProblemDetail, text(`${diagnostic.source} (${diagnostic.code})`));
@@ -8771,48 +8778,48 @@ const getHoverVirtualDom = (lineInfos, documentation, diagnostics) => {
   if (lineInfos.length > 0) {
     const lineInfosDom = getLineInfosVirtualDom(lineInfos);
     dom.push({
-      type: Div,
+      childCount: lineInfos.length,
       className: HoverDisplayString,
-      childCount: lineInfos.length
+      type: Div
     }, ...lineInfosDom);
   }
   if (documentation) {
     dom.push({
-      type: Div,
+      childCount: 1,
       className: HoverDocumentation,
-      childCount: 1
+      type: Div
     }, text(documentation));
   }
   dom.push({
-    type: Div,
-    className: 'Sash SashVertical SashResize',
     childCount: 0,
-    onPointerDown: HandleSashPointerDown
+    className: 'Sash SashVertical SashResize',
+    onPointerDown: HandleSashPointerDown,
+    type: Div
   });
   return dom;
 };
 
 const renderHoverDom = {
-  isEqual(oldState, newState) {
-    return oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.diagnostics === newState.diagnostics;
-  },
   apply(oldState, newState) {
     const dom = getHoverVirtualDom(newState.lineInfos, newState.documentation, newState.diagnostics);
     return [/* method */SetDom2, dom];
+  },
+  isEqual(oldState, newState) {
+    return oldState.lineInfos === newState.lineInfos && oldState.documentation === newState.documentation && oldState.diagnostics === newState.diagnostics;
   }
 };
 const renderBounds$2 = {
-  isEqual(oldState, newState) {
-    return oldState.x === newState.x && oldState.y === newState.y;
-  },
   apply(oldState, newState) {
     const {
-      x,
-      y,
+      height,
       width,
-      height
+      x,
+      y
     } = newState;
     return [SetBounds, x, y, width, height];
+  },
+  isEqual(oldState, newState) {
+    return oldState.x === newState.x && oldState.y === newState.y;
   }
 };
 const render$9 = [renderHoverDom, renderBounds$2];
@@ -8848,9 +8855,9 @@ const remove$5 = widget => {
   return [['Viewlet.dispose', widget.newState.uid]];
 };
 const {
-  handleInput,
+  accept,
   close: close$2,
-  accept
+  handleInput
 } = createFns(['handleInput', 'close', 'accept'], 'Rename', Rename$1);
 
 const EditorRenameWidget = {
@@ -8906,18 +8913,18 @@ const add$4 = widget => {
 };
 const remove$4 = removeWidget$1;
 const {
+  close: close$1,
+  closeDetails,
   focusFirst,
   focusIndex,
   focusLast,
   focusNext,
   focusPrevious,
+  handleWheel,
   selectCurrent,
   selectIndex,
   selectItem,
-  toggleDetails,
-  closeDetails,
-  handleWheel,
-  close: close$1
+  toggleDetails
 } = createFns(['focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusPrevious', 'selectCurrent', 'selectIndex', 'selectItem', 'toggleDetails', 'closeDetails', 'handleWheel', 'close'], 'SourceActions', SourceAction$1);
 
 const EditorSourceActionWidget = {
@@ -9106,8 +9113,8 @@ const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocu
   const newWidgets = [...widgets.slice(0, index), ...widgets.slice(index + 1)];
   const newEditor = {
     ...editor,
-    widgets: newWidgets,
-    focused: true
+    focused: true,
+    widgets: newWidgets
   };
   set$6(editorUid, editor, newEditor);
   await setFocus(FocusEditorText);
@@ -9194,356 +9201,356 @@ const ensure = async (fontName, fontUrl) => {
 
 const getKeyBindings = () => {
   return [{
-    key: Escape,
     command: 'Editor.closeSourceAction',
+    key: Escape,
     when: FocusSourceActions
   }, {
-    key: DownArrow,
     command: 'EditorSourceActions.focusNext',
+    key: DownArrow,
     when: FocusSourceActions
   }, {
-    key: UpArrow,
     command: 'EditorSourceActions.focusPrevious',
+    key: UpArrow,
     when: FocusSourceActions
   }, {
-    key: Home,
     command: 'EditorSourceActions.focusFirst',
+    key: Home,
     when: FocusSourceActions
   }, {
-    key: End,
     command: 'EditorSourceActions.focusLast',
+    key: End,
     when: FocusSourceActions
   }, {
-    key: Enter,
     command: 'EditorSourceActions.selectCurrent',
+    key: Enter,
     when: FocusSourceActions
   }, {
-    key: Enter,
     command: 'FindWidget.focusNext',
+    key: Enter,
     when: FocusFindWidget
   }, {
-    key: CtrlCmd | KeyF,
     command: 'FindWidget.preventDefaultBrowserFind',
+    key: CtrlCmd | KeyF,
     when: FocusFindWidget
   }, {
-    key: Shift | F4,
     command: 'FindWidget.focusPrevious',
+    key: Shift | F4,
     when: FocusFindWidget
   }, {
-    key: F4,
     command: 'FindWidget.focusNext',
+    key: F4,
     when: FocusFindWidget
   }, {
-    key: Shift | Tab$1,
     command: 'FindWidget.focusToggleReplace',
+    key: Shift | Tab$1,
     when: FocusFindWidget
   }, {
-    key: Tab$1,
     command: 'FindWidget.focusReplace',
+    key: Tab$1,
     when: FocusFindWidget
   }, {
-    key: Tab$1,
     command: 'FindWidget.focusPreviousMatchButton',
+    key: Tab$1,
     when: FocusFindWidgetReplace
   }, {
-    key: Alt$1 | CtrlCmd | Enter,
     command: 'FindWidget.replaceAll',
+    key: Alt$1 | CtrlCmd | Enter,
     when: FocusFindWidgetReplace
   }, {
-    key: Tab$1,
     command: 'FindWidget.focusNextMatchButton',
+    key: Tab$1,
     when: FocusFindWidgetPreviousMatchButton
   }, {
-    key: Shift | Tab$1,
     command: 'FindWidget.focusReplace',
+    key: Shift | Tab$1,
     when: FocusFindWidgetPreviousMatchButton
   }, {
-    key: Shift | Tab$1,
     command: 'FindWidget.focusPreviousMatchButton',
+    key: Shift | Tab$1,
     when: FocusFindWidgetNextMatchButton
   }, {
-    key: Tab$1,
     command: 'FindWidget.focusCloseButton',
+    key: Tab$1,
     when: FocusFindWidgetNextMatchButton
   }, {
-    key: Shift | Tab$1,
     command: 'FindWidget.focusNextMatchButton',
+    key: Shift | Tab$1,
     when: FocusFindWidgetCloseButton
   }, {
-    key: Tab$1,
     command: 'FindWidget.focusReplaceButton',
+    key: Tab$1,
     when: FocusFindWidgetCloseButton
   }, {
-    key: Shift | Tab$1,
     command: 'FindWidget.focusFind',
+    key: Shift | Tab$1,
     when: FocusFindWidgetReplace
   }, {
-    key: Tab$1,
     command: 'FindWidget.focusReplaceAllButton',
+    key: Tab$1,
     when: FocusFindWidgetReplaceButton
   }, {
-    key: Shift | Tab$1,
     command: 'FindWidget.focusCloseButton',
+    key: Shift | Tab$1,
     when: FocusFindWidgetReplaceButton
   }, {
-    key: Shift | Tab$1,
     command: 'FindWidget.focusReplaceButton',
+    key: Shift | Tab$1,
     when: FocusFindWidgetReplaceAllButton
   }, {
-    key: DownArrow,
     command: 'EditorCompletion.focusNext',
+    key: DownArrow,
     when: FocusEditorCompletions
   }, {
-    key: UpArrow,
     command: 'EditorCompletion.focusPrevious',
+    key: UpArrow,
     when: FocusEditorCompletions
   }, {
-    key: Enter,
     command: 'EditorCompletion.selectCurrent',
+    key: Enter,
     when: FocusEditorCompletions
   }, {
-    key: Escape,
     command: 'EditorCompletion.close',
+    key: Escape,
     when: FocusEditorCompletions
   }, {
-    key: End,
     command: 'EditorCompletion.focusLast',
+    key: End,
     when: FocusEditorCompletions
   }, {
-    key: Home,
     command: 'EditorCompletion.focusFirst',
+    key: Home,
     when: FocusEditorCompletions
   }, {
-    key: CtrlCmd | Space$1,
     command: 'EditorCompletion.toggleDetails',
+    key: CtrlCmd | Space$1,
     when: FocusEditorCompletions
   }, {
-    key: CtrlCmd | RightArrow,
     command: 'Editor.cursorWordRight',
+    key: CtrlCmd | RightArrow,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | LeftArrow,
     command: 'Editor.cursorWordLeft',
+    key: CtrlCmd | LeftArrow,
     when: FocusEditorText
   }, {
-    key: Alt$1 | Backspace,
     command: 'Editor.deleteWordPartLeft',
+    key: Alt$1 | Backspace,
     when: FocusEditorText
   }, {
-    key: Alt$1 | Delete,
     command: 'Editor.deleteWordPartRight',
+    key: Alt$1 | Delete,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Backspace,
     command: 'Editor.deleteWordLeft',
+    key: CtrlCmd | Backspace,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Delete,
     command: 'Editor.deleteWordRight',
+    key: CtrlCmd | Delete,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyD,
     command: 'Editor.selectNextOccurrence',
+    key: CtrlCmd | KeyD,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyJ,
     command: 'Editor.openColorPicker',
+    key: CtrlCmd | KeyJ,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Period,
     command: 'Editor.showSourceActions3',
+    key: CtrlCmd | Period,
     when: FocusEditorText
   }, {
-    key: Tab$1,
     command: 'Editor.handleTab',
+    key: Tab$1,
     when: FocusEditorText
   }, {
-    key: Shift | Tab$1,
     command: 'Editor.unindent',
+    key: Shift | Tab$1,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | BracketLeft,
     command: 'Editor.indentLess',
+    key: CtrlCmd | BracketLeft,
     when: FocusEditorText
   }, {
-    key: Escape,
     command: 'Editor.closeFind',
+    key: Escape,
     when: FocusFindWidget
   }, {
-    key: CtrlCmd | KeyF,
     command: 'Editor.openFind2',
+    key: CtrlCmd | KeyF,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyK,
     command: 'Editor.openCodeGenerator',
+    key: CtrlCmd | KeyK,
     when: FocusEditorText
   }, {
-    key: Escape,
     command: 'Editor.closeCodeGenerator',
+    key: Escape,
     when: FocusEditorCodeGenerator
   }, {
-    key: Enter,
     command: 'EditorCodeGenerator.accept',
+    key: Enter,
     when: FocusEditorCodeGenerator
   }, {
-    key: CtrlCmd | BracketRight,
     command: 'Editor.indentMore',
+    key: CtrlCmd | BracketRight,
     when: FocusEditorText
   }, {
-    key: Shift | LeftArrow,
     command: 'Editor.selectCharacterLeft',
+    key: Shift | LeftArrow,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | LeftArrow,
     command: 'Editor.selectWordLeft',
+    key: CtrlCmd | Shift | LeftArrow,
     when: FocusEditorText
   }, {
-    key: Shift | RightArrow,
     command: 'Editor.selectCharacterRight',
+    key: Shift | RightArrow,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | RightArrow,
     command: 'Editor.selectWordRight',
+    key: CtrlCmd | Shift | RightArrow,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyL,
     command: 'Editor.selectLine',
+    key: CtrlCmd | KeyL,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | Backspace,
     command: 'Editor.deleteAllLeft',
+    key: CtrlCmd | Shift | Backspace,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | Delete,
     command: 'Editor.deleteAllRight',
+    key: CtrlCmd | Shift | Delete,
     when: FocusEditorText
   }, {
-    key: Escape,
     command: 'Editor.cancelSelection',
+    key: Escape,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyZ,
     command: 'Editor.undo',
+    key: CtrlCmd | KeyZ,
     when: FocusEditorText
   }, {
-    key: LeftArrow,
     command: 'Editor.cursorLeft',
+    key: LeftArrow,
     when: FocusEditorText
   }, {
-    key: RightArrow,
     command: 'Editor.cursorRight',
+    key: RightArrow,
     when: FocusEditorText
   }, {
-    key: UpArrow,
     command: 'Editor.cursorUp',
+    key: UpArrow,
     when: FocusEditorText
   }, {
-    key: DownArrow,
     command: 'Editor.cursorDown',
+    key: DownArrow,
     when: FocusEditorText
   }, {
-    key: Backspace,
     command: 'Editor.deleteLeft',
+    key: Backspace,
     when: FocusEditorText
   }, {
-    key: Delete,
     command: 'Editor.deleteRight',
+    key: Delete,
     when: FocusEditorText
   }, {
-    key: Enter,
     command: 'Editor.insertLineBreak',
+    key: Enter,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | KeyD,
     command: 'Editor.copyLineDown',
+    key: CtrlCmd | Shift | KeyD,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | DownArrow,
     command: 'Editor.moveLineDown',
+    key: CtrlCmd | Shift | DownArrow,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | UpArrow,
     command: 'Editor.moveLineUp',
+    key: CtrlCmd | Shift | UpArrow,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Space$1,
     command: 'Editor.openCompletion',
+    key: CtrlCmd | Space$1,
     when: FocusEditorText
   }, {
-    key: F2,
     command: 'Editor.openRename',
+    key: F2,
     when: FocusEditorText
   }, {
-    key: Enter,
     command: 'EditorRename.accept',
+    key: Enter,
     when: FocusEditorRename
   }, {
-    key: Escape,
     command: 'Editor.closeRename',
+    key: Escape,
     when: FocusEditorRename
   }, {
-    key: Home,
     command: 'Editor.cursorHome',
+    key: Home,
     when: FocusEditorText
   }, {
-    key: End,
     command: 'Editor.cursorEnd',
+    key: End,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Slash$1,
     command: 'Editor.toggleComment',
+    key: CtrlCmd | Slash$1,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyC,
     command: 'Editor.copy',
+    key: CtrlCmd | KeyC,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyA,
     command: 'Editor.selectAll',
+    key: CtrlCmd | KeyA,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyH,
     command: 'Editor.showHover2',
+    key: CtrlCmd | KeyH,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyX,
     command: 'Editor.cut',
+    key: CtrlCmd | KeyX,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | KeyV,
     command: 'Editor.paste',
+    key: CtrlCmd | KeyV,
     when: FocusEditorText
   }, {
-    key: Alt$1 | LeftArrow,
     command: 'Editor.cursorWordPartLeft',
+    key: Alt$1 | LeftArrow,
     when: FocusEditorText
   }, {
-    key: Alt$1 | RightArrow,
     command: 'Editor.cursorWordPartRight',
+    key: Alt$1 | RightArrow,
     when: FocusEditorText
   }, {
-    key: Alt$1 | F3,
     command: 'Editor.selectAllOccurrences',
+    key: Alt$1 | F3,
     when: FocusEditorText
   }, {
-    key: Alt$1 | Shift | UpArrow,
     command: 'Editor.addCursorAbove',
+    key: Alt$1 | Shift | UpArrow,
     when: FocusEditorText
   }, {
-    key: Alt$1 | Shift | DownArrow,
     command: 'Editor.addCursorBelow',
+    key: Alt$1 | Shift | DownArrow,
     when: FocusEditorText
   }, {
-    key: Alt$1 | Shift | F12,
     command: 'Editor.findAllReferences',
+    key: Alt$1 | Shift | F12,
     when: FocusEditorText
   }, {
-    key: Alt$1 | Shift | KeyO,
     command: 'Editor.organizeImports',
+    key: Alt$1 | Shift | KeyO,
     when: FocusEditorText
   }, {
-    key: CtrlCmd | Shift | Space$1,
     command: 'Editor.selectionGrow',
+    key: CtrlCmd | Shift | Space$1,
     when: FocusEditor
   }];
 };
@@ -9562,65 +9569,65 @@ const commandPalette = () => {
 };
 
 const menuEntrySeparator = {
-  id: 'separator',
-  label: '',
+  command: '',
   flags: Separator,
-  command: ''
+  id: 'separator',
+  label: ''
 };
 
 const getMenuEntries = () => {
   return [{
-    id: 'go-to-definition',
-    label: goToDefinition$1(),
+    command: 'Editor.goToDefinition',
     flags: None,
-    command: 'Editor.goToDefinition'
+    id: 'go-to-definition',
+    label: goToDefinition$1()
   }, {
-    id: 'go-to-type-definition',
-    label: goToTypeDefinition$1(),
+    command: /* Editor.goToTypeDefinition */'Editor.goToTypeDefinition',
     flags: None,
-    command: /* Editor.goToTypeDefinition */'Editor.goToTypeDefinition'
+    id: 'go-to-type-definition',
+    label: goToTypeDefinition$1()
   }, menuEntrySeparator, {
-    id: 'find-all-references',
-    label: findAllReferences(),
-    flags: None,
+    args: [/* id */'References', /* focus */true],
     command: /* ViewletSideBar.show */'SideBar.show',
-    args: [/* id */'References', /* focus */true]
-  }, {
-    id: 'find-all-implementations',
-    label: findAllImplementations(),
     flags: None,
+    id: 'find-all-references',
+    label: findAllReferences()
+  }, {
+    args: [/* id */'Implementations', /* focus */true],
     command: /* ViewletSideBar.show */'SideBar.show',
-    args: [/* id */'Implementations', /* focus */true]
+    flags: None,
+    id: 'find-all-implementations',
+    label: findAllImplementations()
   }, menuEntrySeparator, {
-    id: 'format',
-    label: formatDocument(),
+    command: 'Editor.format',
     flags: None,
-    command: 'Editor.format'
+    id: 'format',
+    label: formatDocument()
   }, {
-    id: SourceControl,
-    label: sourceAction(),
+    command: 'Editor.showSourceActions2',
     flags: None,
-    command: 'Editor.showSourceActions2'
+    id: SourceControl,
+    label: sourceAction()
   }, menuEntrySeparator, {
-    id: 'cut',
-    label: cut(),
+    command: /* Editor.cut */'Editor.cut',
     flags: None,
-    command: /* Editor.cut */'Editor.cut'
+    id: 'cut',
+    label: cut()
   }, {
-    id: 'copy',
-    label: copy(),
+    command: /* Editor.copy */'Editor.copy',
     flags: None,
-    command: /* Editor.copy */'Editor.copy'
+    id: 'copy',
+    label: copy()
   }, {
-    id: 'paste',
-    label: paste$1(),
+    command: /* Editor.paste */'Editor.paste',
     flags: None,
-    command: /* Editor.paste */'Editor.paste'
+    id: 'paste',
+    label: paste$1()
   }, menuEntrySeparator, {
-    id: 'commandPalette',
-    label: commandPalette(),
+    command: 'QuickPick.showEverything',
     flags: None,
-    command: 'QuickPick.showEverything'
+    id: 'commandPalette',
+    label: commandPalette()
   }];
 };
 
@@ -9672,13 +9679,13 @@ const getQuickPickMenuEntries = () => {
     id: 'Editor.selectInsideString',
     label: editorSelectInsideString()
   }, {
+    aliases: ['Indent More', 'DeIndent'],
     id: 'Editor.indent',
-    label: editorIndent(),
-    aliases: ['Indent More', 'DeIndent']
+    label: editorIndent()
   }, {
+    aliases: ['Indent Less', 'DeIndent'],
     id: 'Editor.unindent',
-    label: editorUnindent$1(),
-    aliases: ['Indent Less', 'DeIndent']
+    label: editorUnindent$1()
   }, {
     id: 'Editor.sortLinesAscending',
     label: editorSortLinesAscending()
@@ -9748,8 +9755,8 @@ const handleBeforeInput = (editor, inputType, data) => {
 
 const handleMessagePort = async (port, rpcId) => {
   const rpc = await PlainMessagePortRpcParent.create({
-    messagePort: port,
-    commandMap: {}
+    commandMap: {},
+    messagePort: port
   });
   if (rpcId) {
     set$b(rpcId, rpc);
@@ -9991,9 +9998,9 @@ const getCursorsVirtualDom = cursors => {
   const dom = [];
   for (const translate of cursors) {
     dom.push({
-      type: Div,
       className: EditorCursor,
-      translate
+      translate,
+      type: Div
     });
   }
   return dom;
@@ -10020,21 +10027,21 @@ const mergeClassNames = (...classNames) => {
 
 const getDiagnosticVirtualDom = diagnostic => {
   const {
-    x,
-    y,
-    width,
     height,
-    type
+    type,
+    width,
+    x,
+    y
   } = diagnostic;
   const extraClassName = getDiagnosticClassName(type);
   return [{
-    type: Div,
+    childCount: 0,
     className: mergeClassNames(Diagnostic, extraClassName),
-    width,
     height,
-    top: y,
     left: x,
-    childCount: 0
+    top: y,
+    type: Div,
+    width
   }];
 };
 
@@ -10045,9 +10052,9 @@ const getDiagnosticsVirtualDom = diagnostics => {
 
 const getGutterInfoVirtualDom = gutterInfo => {
   return [{
-    type: Span,
+    childCount: 1,
     className: 'LineNumber',
-    childCount: 1
+    type: Span
   }, text(gutterInfo)];
 };
 const getEditorGutterVirtualDom = gutterInfos => {
@@ -10065,18 +10072,18 @@ const getEditorRowsVirtualDom = (textInfos, differences, lineNumbers = true, hig
       className += ' ' + EditorRowHighlighted;
     }
     dom.push({
-      type: Div,
+      childCount: textInfo.length / 2,
       className,
       translate: px(difference),
-      childCount: textInfo.length / 2
+      type: Div
     });
     for (let j = 0; j < textInfo.length; j += 2) {
       const tokenText = textInfo[j];
       const className = textInfo[j + 1];
       dom.push({
-        type: Span,
+        childCount: 1,
         className,
-        childCount: 1
+        type: Span
       }, text(tokenText));
     }
   }
@@ -10091,12 +10098,12 @@ const getSelectionsVirtualDom = selections => {
     const width = selections[i + 2];
     const height = selections[i + 3];
     dom.push({
-      type: Div,
       className: EditorSelection,
+      height,
       left: x,
       top: y,
-      width,
-      height
+      type: Div,
+      width
     });
   }
   return dom;
@@ -10125,9 +10132,6 @@ const removeWidget = widget => {
 };
 
 const renderLines = {
-  isEqual(oldState, newState) {
-    return oldState.lines === newState.lines && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.debugEnabled === newState.debugEnabled;
-  },
   apply(oldState, newState) {
     const {
       incrementalEdits
@@ -10136,8 +10140,8 @@ const renderLines = {
       return [/* method */'setIncrementalEdits', /* incrementalEdits */incrementalEdits];
     }
     const {
-      textInfos,
-      differences
+      differences,
+      textInfos
     } = newState;
     newState.differences = differences;
     const {
@@ -10147,12 +10151,12 @@ const renderLines = {
     const relativeLine = highlightedLine - minLineY;
     const dom = getEditorRowsVirtualDom(textInfos, differences, true, relativeLine);
     return [/* method */'setText', dom];
+  },
+  isEqual(oldState, newState) {
+    return oldState.lines === newState.lines && oldState.tokenizerId === newState.tokenizerId && oldState.minLineY === newState.minLineY && oldState.decorations === newState.decorations && oldState.embeds === newState.embeds && oldState.deltaX === newState.deltaX && oldState.width === newState.width && oldState.highlightedLine === newState.highlightedLine && oldState.debugEnabled === newState.debugEnabled;
   }
 };
 const renderSelections = {
-  isEqual(oldState, newState) {
-    return oldState.selections === newState.selections && oldState.focused === newState.focused && oldState.minLineY === newState.minLineY && oldState.deltaX === newState.deltaX;
-  },
   apply: async (oldState, newState) => {
     const {
       cursorInfos,
@@ -10161,74 +10165,74 @@ const renderSelections = {
     const cursorsDom = getCursorsVirtualDom(cursorInfos);
     const selectionsDom = getSelectionsVirtualDom(selectionInfos);
     return [/* method */'setSelections', cursorsDom, selectionsDom];
+  },
+  isEqual(oldState, newState) {
+    return oldState.selections === newState.selections && oldState.focused === newState.focused && oldState.minLineY === newState.minLineY && oldState.deltaX === newState.deltaX;
   }
 };
 const renderScrollBarY = {
-  isEqual(oldState, newState) {
-    return oldState.deltaY === newState.deltaY && oldState.scrollBarHeight === newState.scrollBarHeight;
-  },
   apply(oldState, newState) {
     const scrollBarY = getScrollBarY(newState.deltaY, newState.finalDeltaY, newState.height, newState.scrollBarHeight);
     const translate = `0 ${scrollBarY}px`;
     const heightPx = `${newState.scrollBarHeight}px`;
     return [/* method */'setScrollBar', translate, heightPx];
+  },
+  isEqual(oldState, newState) {
+    return oldState.deltaY === newState.deltaY && oldState.scrollBarHeight === newState.scrollBarHeight;
   }
 };
 const renderScrollBarX = {
-  isEqual(oldState, newState) {
-    return oldState.longestLineWidth === newState.longestLineWidth && oldState.deltaX === newState.deltaX;
-  },
   apply(oldState, newState) {
     const scrollBarWidth = getScrollBarSize(newState.width, newState.longestLineWidth, newState.minimumSliderSize);
     const scrollBarX = newState.deltaX / newState.longestLineWidth * newState.width;
     return [/* method */'setScrollBarHorizontal', /* scrollBarX */scrollBarX, /* scrollBarWidth */scrollBarWidth, /* deltaX */newState.deltaX];
+  },
+  isEqual(oldState, newState) {
+    return oldState.longestLineWidth === newState.longestLineWidth && oldState.deltaX === newState.deltaX;
   }
 };
 const renderFocus$1 = {
-  isEqual(oldState, newState) {
-    return oldState.focused === newState.focused;
-  },
   apply(oldState, newState) {
     return [/* method */'setFocused', newState.focused];
+  },
+  isEqual(oldState, newState) {
+    return oldState.focused === newState.focused;
   }
 };
 const renderFocusContext = {
-  isEqual(oldState, newState) {
-    return oldState.focus === newState.focus;
-  },
   apply(oldState, newState) {
     return ['Viewlet.setFocusContext', newState.uid, newState.focus];
+  },
+  isEqual(oldState, newState) {
+    return oldState.focus === newState.focus;
   }
 };
 const renderAdditionalFocusContext = {
-  isEqual(oldState, newState) {
-    return oldState.additionalFocus === newState.additionalFocus;
-  },
   apply(oldState, newState) {
     if (newState.additionalFocus) {
       return ['Viewlet.setAdditionalFocus', newState.uid, newState.additionalFocus];
     }
     return ['viewlet.unsetAdditionalFocus', newState.uid, newState.additionalFocus];
+  },
+  isEqual(oldState, newState) {
+    return oldState.additionalFocus === newState.additionalFocus;
   }
 };
 const renderDecorations = {
-  isEqual(oldState, newState) {
-    return oldState.decorations === newState.decorations;
-  },
   apply(oldState, newState) {
     const dom = getDiagnosticsVirtualDom(newState.decorations);
     return ['setDecorationsDom', dom];
+  },
+  isEqual(oldState, newState) {
+    return oldState.decorations === newState.decorations;
   }
 };
 const renderGutterInfo = {
-  isEqual(oldState, newState) {
-    return oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY;
-  },
   apply(oldState, newState) {
     const {
-      minLineY,
+      lineNumbers,
       maxLineY,
-      lineNumbers
+      minLineY
     } = newState;
     const gutterInfos = [];
     if (lineNumbers) {
@@ -10238,12 +10242,12 @@ const renderGutterInfo = {
     }
     const dom = getEditorGutterVirtualDom(gutterInfos);
     return ['renderGutter', dom];
+  },
+  isEqual(oldState, newState) {
+    return oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY;
   }
 };
 const renderWidgets = {
-  isEqual(oldState, newState) {
-    return oldState.widgets === newState.widgets;
-  },
   apply(oldState, newState) {
     const addedWidgets = [];
     const changedWidgets = [];
@@ -10295,6 +10299,9 @@ const renderWidgets = {
     const filteredCommands = allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext');
     return filteredCommands;
   },
+  isEqual(oldState, newState) {
+    return oldState.widgets === newState.widgets;
+  },
   multiple: true
 };
 const render$6 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets, renderFocusContext, renderAdditionalFocusContext];
@@ -10304,8 +10311,8 @@ const renderEditor = async id => {
     return [];
   }
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = instance;
   const commands = [];
   set$6(id, newState, newState);
@@ -10386,8 +10393,8 @@ const updateDebugInfo = async debugId => {
     return;
   }
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = instance;
   const newEditor = {
     ...newState,
@@ -10460,11 +10467,11 @@ const wrapCommands = commands => {
 
 const commandMap = {
   'ActivateByEvent.activateByEvent': activateByEvent,
-  'ExtensionHostManagement.activateByEvent': activateByEvent,
   'CodeGenerator.accept': codeGeneratorAccept,
   'ColorPicker.loadContent': loadContent$2,
   'Editor.addCursorAbove': addCursorAbove,
   'Editor.addCursorBelow': addCursorBelow,
+  'Editor.applyDocumentEdits': applyDocumentEdits,
   'Editor.applyEdit': applyEdit,
   'Editor.applyEdit2': applyEdits2,
   'Editor.applyWorkspaceEdit': applyWorkspaceEdit,
@@ -10479,13 +10486,10 @@ const commandMap = {
   'Editor.compositionEnd': compositionEnd,
   'Editor.compositionStart': compositionStart,
   'Editor.compositionUpdate': compositionUpdate,
-  'Editor.handleClickAtPosition': handleClickAtPosition,
-  'Editor.applyDocumentEdits': applyDocumentEdits,
   'Editor.contextMenu': handleContextMenu,
   'Editor.copy': copy$1,
   'Editor.copyLineDown': copyLineDown,
   'Editor.copyLineUp': copyLineUp,
-  'Editor.getMenuIds': getMenuIds,
   'Editor.create': createEditor,
   'Editor.cursorCharacterLeft': cursorCharacterLeft,
   'Editor.cursorCharacterRight': cursorCharacterRight,
@@ -10515,20 +10519,21 @@ const commandMap = {
   'Editor.executeWidgetCommand': executeWidgetCommand,
   'Editor.findAllReferences': findAllReferences$1,
   'Editor.format': format,
+  'Editor.getDiagnostics': getDiagnostics$1,
   'Editor.getKeyBindings': getKeyBindings,
   'Editor.getKeys': getKeys,
   'Editor.getLanguageId': getLanguageId,
   'Editor.getLines2': getLines2,
   'Editor.getMenuEntries': getMenuEntries,
   'Editor.getMenuEntries2': getMenuEntries,
+  'Editor.getMenuIds': getMenuIds,
   'Editor.getOffsetAtCursor': getOffsetAtCursor,
   'Editor.getPositionAtCursor': getPositionAtCursor,
-  'Editor.getSourceActions': getSourceActions,
   'Editor.getProblems': getProblems,
   'Editor.getQuickPickMenuEntries': getQuickPickMenuEntries,
   'Editor.getSelections': getSelections,
   'Editor.getSelections2': getSelections2,
-  'Editor.getDiagnostics': getDiagnostics$1,
+  'Editor.getSourceActions': getSourceActions,
   'Editor.getText': getText,
   'Editor.getUri': getUri,
   'Editor.getWordAt': getWordAt$1,
@@ -10541,6 +10546,7 @@ const commandMap = {
   'Editor.handleBeforeInput': handleBeforeInput,
   'Editor.handleBeforeInputFromContentEditable': handleBeforeInputFromContentEditable,
   'Editor.handleBlur': handleBlur$1,
+  'Editor.handleClickAtPosition': handleClickAtPosition,
   'Editor.handleContextMenu': handleContextMenu,
   'Editor.handleDoubleClick': handleDoubleClick,
   'Editor.handleFocus': handleFocus$1,
@@ -10563,6 +10569,7 @@ const commandMap = {
   'Editor.handleTouchMove': handleTouchMove,
   'Editor.handleTouchStart': handleTouchStart,
   'Editor.handleTripleClick': handleTripleClick,
+  'Editor.hotReload': hotReload,
   'Editor.indendLess': indentLess,
   'Editor.indentMore': indentMore,
   'Editor.insertLineBreak': insertLineBreak,
@@ -10621,7 +10628,6 @@ const commandMap = {
   'Editor.toggleComment': toggleComment,
   'Editor.toggleLineComment': editorToggleLineComment,
   'Editor.type': type,
-  'Editor.hotReload': hotReload,
   'Editor.typeWithAutoClosing': typeWithAutoClosing,
   'Editor.undo': undo,
   'Editor.unIndent': editorUnindent,
@@ -10637,12 +10643,15 @@ const commandMap = {
   'EditorCompletion.handleEditorClick': handleEditorClick,
   'EditorCompletion.handleEditorDeleteLeft': handleEditorDeleteLeft$1,
   'EditorCompletion.handleEditorType': handleEditorType$1,
+  'EditorCompletion.handlePointerDown': handlePointerDown,
   'EditorCompletion.handleWheel': handleWheel$1,
   'EditorCompletion.openDetails': openDetails,
   'EditorCompletion.selectCurrent': selectCurrent$1,
   'EditorCompletion.selectIndex': selectIndex$1,
   'EditorCompletion.toggleDetails': toggleDetails$1,
-  'EditorCompletion.handlePointerDown': handlePointerDown,
+  'EditorRename.accept': accept,
+  'EditorRename.close': close$2,
+  'EditorRename.handleInput': handleInput,
   'EditorSourceAction.close': close$1,
   'EditorSourceAction.closeDetails': closeDetails,
   'EditorSourceAction.focusFirst': focusFirst,
@@ -10654,38 +10663,36 @@ const commandMap = {
   'EditorSourceAction.selectIndex': selectIndex,
   'EditorSourceAction.selectItem': selectItem,
   'EditorSourceAction.toggleDetails': toggleDetails,
-  'EditorRename.accept': accept,
-  'EditorRename.close': close$2,
-  'EditorRename.handleInput': handleInput,
   'EditorSourceActions.focusNext': focusNext$1,
+  'ExtensionHostManagement.activateByEvent': activateByEvent,
   'FindWidget.close': close$3,
   'FindWidget.focusCloseButton': focusCloseButton,
   'FindWidget.focusFind': focusFind,
   'FindWidget.focusNext': focusNext$2,
+  'FindWidget.focusNextElement': focusNextElement,
   'FindWidget.focusNextMatchButton': focusNextMatchButton,
   'FindWidget.focusPrevious': focusPrevious$1,
+  'FindWidget.focusPreviousElement': focusPreviousElement,
   'FindWidget.focusPreviousMatchButton': focusPreviousMatchButton,
   'FindWidget.focusReplace': focusReplace,
   'FindWidget.focusReplaceAllButton': focusReplaceAllButton,
   'FindWidget.focusReplaceButton': focusReplaceButton,
   'FindWidget.focusToggleReplace': focusToggleReplace,
-  'FindWidget.replace': replace,
-  'FindWidget.replaceAll': replaceAll,
   'FindWidget.handleBlur': handleBlur,
-  'FindWidget.handleFocus': handleFocus,
   'FindWidget.handleClickButton': handleClickButton,
+  'FindWidget.handleFocus': handleFocus,
   'FindWidget.handleInput': handleInput$1,
   'FindWidget.handleReplaceFocus': handleReplaceFocus,
   'FindWidget.handleReplaceInput': handleReplaceInput,
   'FindWidget.handleToggleReplaceFocus': handleToggleReplaceFocus,
+  'FindWidget.loadContent': loadContent$1,
+  'FindWidget.replace': replace,
+  'FindWidget.replaceAll': replaceAll,
   'FindWidget.toggleMatchCase': toggleMatchCase,
   'FindWidget.toggleMatchWholeWord': toggleMatchWholeWord,
-  'FindWidget.loadContent': loadContent$1,
+  'FindWidget.togglePreserveCase': togglePreserveCase,
   'FindWidget.toggleReplace': toggleReplace,
   'FindWidget.toggleUseRegularExpression': toggleUseRegularExpression,
-  'FindWidget.focusNextElement': focusNextElement,
-  'FindWidget.focusPreviousElement': focusPreviousElement,
-  'FindWidget.togglePreserveCase': togglePreserveCase,
   'Font.ensure': ensure,
   'HandleMessagePort.handleMessagePort': handleMessagePort,
   'Hover.getHoverInfo': getEditorHoverInfo,
@@ -10729,51 +10736,51 @@ const getCodeGeneratorVirtualDom = state => {
   const escapeToClose$1 = escapeToClose();
   const enterCode$1 = enterCode();
   return [{
-    type: Div,
+    childCount: 2,
     className: mergeClassNames(Viewlet, CodeGeneratorWidget),
-    childCount: 2
+    type: Div
   }, {
-    type: Input,
-    className: mergeClassNames(CodeGeneratorInput$1, InputBox),
     childCount: 0,
+    className: mergeClassNames(CodeGeneratorInput$1, InputBox),
+    name: CodeGeneratorInput,
     placeholder: enterCode$1,
-    name: CodeGeneratorInput
+    type: Input
   }, {
-    type: Div,
+    childCount: 1,
     className: CodeGeneratorMessage,
-    childCount: 1
+    type: Div
   }, text(escapeToClose$1)];
 };
 
 const renderContent$1 = {
-  isEqual(oldState, newState) {
-    return oldState.questions === newState.questions;
-  },
   apply(oldState, newState) {
     const dom = getCodeGeneratorVirtualDom();
     return [SetDom2, newState.uid, dom];
+  },
+  isEqual(oldState, newState) {
+    return oldState.questions === newState.questions;
   }
 };
 const renderBounds$1 = {
-  isEqual(oldState, newState) {
-    return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
-  },
   apply(oldState, newState) {
     const {
-      x,
-      y,
+      height,
       width,
-      height
+      x,
+      y
     } = newState;
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
+  },
+  isEqual(oldState, newState) {
+    return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
   }
 };
 const renderFocus = {
-  isEqual(oldState, newState) {
-    return oldState.focused === newState.focused && oldState.focusSource === newState.focusSource;
-  },
   apply(oldState, newState) {
     return [Focus, '.CodeGeneratorInput', newState.focusSource];
+  },
+  isEqual(oldState, newState) {
+    return oldState.focused === newState.focused && oldState.focusSource === newState.focusSource;
   }
 };
 const render$5 = [renderContent$1, renderBounds$1, renderFocus];
@@ -10853,22 +10860,22 @@ const EditorColorPickerWidget = {
 
 const getCompletionDetailVirtualDom = content => {
   const dom = [{
-    type: Div,
+    childCount: 2,
     className: 'Viewlet EditorCompletionDetails',
-    childCount: 2
+    type: Div
   }, {
-    type: Div,
+    childCount: 1,
     className: CompletionDetailContent,
-    childCount: 1
+    type: Div
   }, text(content), {
-    type: Div,
+    childCount: 1,
     className: CompletionDetailCloseButton,
     onClick: HandleClose,
-    childCount: 1
+    type: Div
   }, {
-    type: Div,
+    childCount: 0,
     className: `${MaskIcon} ${IconClose}`,
-    childCount: 0
+    type: Div
   }];
   return dom;
 };
@@ -10884,26 +10891,26 @@ const renderParts = (render, oldState, newState) => {
 };
 
 const renderContent = {
-  isEqual(oldState, newState) {
-    return oldState.content === newState.content;
-  },
   apply(oldState, newState) {
     const dom = getCompletionDetailVirtualDom(newState.content);
     return [SetDom2, newState.uid, dom];
+  },
+  isEqual(oldState, newState) {
+    return oldState.content === newState.content;
   }
 };
 const renderBounds = {
-  isEqual(oldState, newState) {
-    return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
-  },
   apply(oldState, newState) {
     const {
-      x,
-      y,
+      height,
       width,
-      height
+      x,
+      y
     } = newState;
     return [/* method */SetBounds, /* x */x, /* y */y, /* width */width, /* height */height];
+  },
+  isEqual(oldState, newState) {
+    return oldState.x === newState.x && oldState.y === newState.y && oldState.width === newState.width && oldState.height === newState.height;
   }
 };
 const render$2 = [renderContent, renderBounds];