@lvce-editor/editor-worker 19.2.0 → 19.4.0

package/dist/editorWorkerMain.js

@@ -1538,12 +1538,12 @@ const launchColorPickerWorker = async () => {
   return launchWorker(name, url);
 };
 
-const state$e = {};
+const state$d = {};
 const getOrCreate$3 = () => {
-  if (!state$e.workerPromise) {
-    state$e.workerPromise = launchColorPickerWorker();
+  if (!state$d.workerPromise) {
+    state$d.workerPromise = launchColorPickerWorker();
   }
-  return state$e.workerPromise;
+  return state$d.workerPromise;
 };
 const invoke$9 = async (method, ...params) => {
   const worker = await getOrCreate$3();
@@ -1659,6 +1659,10 @@ const createEditor2 = (id, uri, x, y, width, height, platform, assetDir) => {
     savedSelections: [],
     scrollBarHeight: 0,
     scrollBarWidth: 0,
+    selectionAnchorPosition: {
+      columnIndex: 0,
+      rowIndex: 0
+    },
     selectionAutoMovePosition: {
       columnIndex: 0,
       rowIndex: 0
@@ -1853,7 +1857,7 @@ const getInitialLineState = initialLineState => {
   return deepCopy(initialLineState);
 };
 
-const state$d = {
+const state$c = {
   warned: []
 };
 const flattenTokensArray = tokens => {
@@ -1865,10 +1869,10 @@ const flattenTokensArray = tokens => {
   return flattened;
 };
 const warnDeprecatedArrayReturn = (languageId, fn) => {
-  if (state$d.warned.includes(fn)) {
+  if (state$c.warned.includes(fn)) {
     return;
   }
-  state$d.warned.push(fn);
+  state$c.warned.push(fn);
   console.warn(`tokenizers without hasArrayReturn=false are deprecated (language ${languageId})`);
 };
 const safeTokenizeLine = (languageId, tokenizeLine, line, lineStateAtStart, hasArrayReturn) => {
@@ -1929,14 +1933,14 @@ const TokenizePlainText = {
   tokenizeLine
 };
 
-const state$c = {
+const state$b = {
   enabled: false
 };
 const setEnabled$1 = value => {
-  state$c.enabled = value;
+  state$b.enabled = value;
 };
 const getEnabled$1 = () => {
-  return state$c.enabled;
+  return state$b.enabled;
 };
 
 const {
@@ -1944,25 +1948,25 @@ const {
   set: set$6
 } = SyntaxHighlightingWorker;
 
-const state$b = {
+const state$a = {
   pending: Object.create(null),
   tokenizePaths: Object.create(null),
   tokenizers: Object.create(null)
 };
 const has = languageId => {
-  return Object.hasOwn(state$b.tokenizers, languageId);
+  return Object.hasOwn(state$a.tokenizers, languageId);
 };
 const set$5 = (languageId, tokenizer) => {
-  state$b.tokenizers[languageId] = tokenizer;
+  state$a.tokenizers[languageId] = tokenizer;
 };
 const get$5 = languageId => {
-  return state$b.tokenizers[languageId];
+  return state$a.tokenizers[languageId];
 };
 const setTokenizePath = (languageId, tokenizePath) => {
-  state$b.tokenizePaths[languageId] = tokenizePath;
+  state$a.tokenizePaths[languageId] = tokenizePath;
 };
 const getTokenizePath$1 = languageId => {
-  return state$b.tokenizePaths[languageId] || '';
+  return state$a.tokenizePaths[languageId] || '';
 };
 const setTokenizePaths = languages => {
   for (const language of languages) {
@@ -1972,7 +1976,7 @@ const setTokenizePaths = languages => {
   }
 };
 const isPending = languageId => {
-  return Object.hasOwn(state$b.pending, languageId);
+  return Object.hasOwn(state$a.pending, languageId);
 };
 
 const tokenMaps = Object.create(null);
@@ -2815,14 +2819,14 @@ const getNewDeltaPercent = (height, scrollBarHeight, relativeY) => {
   };
 };
 
-const state$a = {
+const state$9 = {
   enabled: false
 };
 const setEnabled = value => {
-  state$a.enabled = value;
+  state$9.enabled = value;
 };
 const getEnabled = () => {
-  return state$a.enabled;
+  return state$9.enabled;
 };
 
 // TODO this should be in a separate scrolling module
@@ -3002,7 +3006,7 @@ const getUrlAtOffset = (editor, offset) => {
 
 const EditorChange = 1;
 
-const state$9 = Object.create(null);
+const state$8 = Object.create(null);
 
 /**
  * Register a listener for a specific event type
@@ -3012,13 +3016,13 @@ const state$9 = Object.create(null);
 const registerListener$1 = (listenerType, rpcId) => {
   number(listenerType);
   number(rpcId);
-  if (!Object.hasOwn(state$9, listenerType)) {
-    state$9[listenerType] = [];
+  if (!Object.hasOwn(state$8, listenerType)) {
+    state$8[listenerType] = [];
   }
 
   // Avoid duplicate registrations
-  if (!state$9[listenerType].includes(rpcId)) {
-    state$9[listenerType].push(rpcId);
+  if (!state$8[listenerType].includes(rpcId)) {
+    state$8[listenerType].push(rpcId);
   }
 };
 
@@ -3030,10 +3034,10 @@ const registerListener$1 = (listenerType, rpcId) => {
 const unregisterListener$1 = (listenerType, rpcId) => {
   number(listenerType);
   number(rpcId);
-  if (Object.hasOwn(state$9, listenerType)) {
-    const index = state$9[listenerType].indexOf(rpcId);
+  if (Object.hasOwn(state$8, listenerType)) {
+    const index = state$8[listenerType].indexOf(rpcId);
     if (index !== -1) {
-      state$9[listenerType].splice(index, 1);
+      state$8[listenerType].splice(index, 1);
     }
   }
 };
@@ -3045,7 +3049,7 @@ const unregisterListener$1 = (listenerType, rpcId) => {
  */
 const getListeners = listenerType => {
   number(listenerType);
-  return state$9[listenerType] || [];
+  return state$8[listenerType] || [];
 };
 
 /**
@@ -3713,6 +3717,10 @@ const emptyEditor = {
   minLineY: 0,
   redoStack: [],
   scrollBarHeight: 0,
+  selectionAnchorPosition: {
+    columnIndex: 0,
+    rowIndex: 0
+  },
   selectionAutoMovePosition: {
     columnIndex: 0,
     rowIndex: 0
@@ -4070,6 +4078,10 @@ const createEditor = async ({
     savedSelections,
     scrollBarHeight: 0,
     scrollBarWidth: 0,
+    selectionAnchorPosition: {
+      columnIndex: 0,
+      rowIndex: 0
+    },
     selectionAutoMovePosition: {
       columnIndex: 0,
       rowIndex: 0
@@ -4139,28 +4151,33 @@ const createEditor = async ({
   });
 };
 
-const isEqual$2 = (oldState, newState) => {
-  return oldState.rowHeight === newState.rowHeight && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.scrollBarHeight === newState.scrollBarHeight;
+const isEqual$3 = (oldState, newState) => {
+  return oldState.rowHeight === newState.rowHeight && oldState.deltaY === newState.deltaY && oldState.finalDeltaY === newState.finalDeltaY && oldState.height === newState.height && oldState.deltaX === newState.deltaX && oldState.longestLineWidth === newState.longestLineWidth && oldState.minimumSliderSize === newState.minimumSliderSize && oldState.width === newState.width && oldState.scrollBarHeight === newState.scrollBarHeight;
 };
 
-const isEqual$1 = (oldState, newState) => {
+const isEqual$2 = (oldState, newState) => {
   if (!newState.focused) {
     return true;
   }
   return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
 
-const isEqual = (oldState, newState) => {
-  return oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.deltaY === newState.deltaY && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.scrollBarWidth === newState.scrollBarWidth && oldState.selectionInfos === newState.selectionInfos;
+const isEqual$1 = (oldState, newState) => {
+  return oldState.cursorInfos === newState.cursorInfos && oldState.diagnostics === newState.diagnostics && oldState.highlightedLine === newState.highlightedLine && oldState.lineNumbers === newState.lineNumbers && oldState.textInfos === newState.textInfos && oldState.differences === newState.differences && oldState.initial === newState.initial && oldState.selectionInfos === newState.selectionInfos;
 };
 
 const RenderFocus = 6;
 const RenderFocusContext = 7;
 const RenderCss = 11;
 const RenderIncremental = 12;
+const RenderWidgets = 13;
+
+const isEqual = (oldState, newState) => {
+  return oldState.widgets === newState.widgets;
+};
 
-const modules = [isEqual, isEqual$1, isEqual$1, isEqual$2];
-const numbers = [RenderIncremental, RenderFocus, RenderFocusContext, RenderCss];
+const modules = [isEqual$1, isEqual$2, isEqual$2, isEqual$3, isEqual];
+const numbers = [RenderIncremental, RenderFocus, RenderFocusContext, RenderCss, RenderWidgets];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -4539,7 +4556,7 @@ const y = (editor, rowIndex) => {
   return offsetY;
 };
 
-const state$8 = {
+const state$7 = {
   timeout: -1
 };
 
@@ -4570,7 +4587,7 @@ const editorShowMessage = async (editor, rowIndex, columnIndex, message, isError
 
     // TODO use wrapper timing module instead of this
     // @ts-ignore
-    state$8.timeout = setTimeout(handleTimeout, 3000);
+    state$7.timeout = setTimeout(handleTimeout, 3000);
   }
   return editor;
 };
@@ -4590,8 +4607,8 @@ const showErrorMessage = async (editor, rowIndex, columnIndex, message) => {
 
 // @ts-ignore
 const editorHideMessage = async editor => {
-  clearTimeout(state$8.timeout);
-  state$8.timeout = -1;
+  clearTimeout(state$7.timeout);
+  state$7.timeout = -1;
   // await RendererProcess.invoke(/* Viewlet.send */ 'Viewlet.send', /* id */ editor.uid, /* method */ 'hideOverlayMessage')
   return editor;
 };
@@ -4707,12 +4724,12 @@ const launchRenameWorker = async () => {
   return rpc;
 };
 
-const state$7 = {};
+const state$6 = {};
 const getOrCreate$2 = () => {
-  if (!state$7.workerPromise) {
-    state$7.workerPromise = launchRenameWorker();
+  if (!state$6.workerPromise) {
+    state$6.workerPromise = launchRenameWorker();
   }
-  return state$7.workerPromise;
+  return state$6.workerPromise;
 };
 const invoke$5 = async (method, ...params) => {
   const worker = await getOrCreate$2();
@@ -4832,12 +4849,12 @@ const openColorPicker = async editor => {
   return addWidgetToEditor(ColorPicker$1, ColorPicker, editor, create$6, newStateGenerator$6);
 };
 
-const state$6 = {
+const state$5 = {
   compositionText: '',
   isComposing: false
 };
 const compositionStart = (editor, event) => {
-  state$6.isComposing = true;
+  state$5.isComposing = true;
   return editor;
 };
 const getCompositionChanges = (selections, data) => {
@@ -4847,9 +4864,9 @@ const getCompositionChanges = (selections, data) => {
     const selectionStartColumn = selections[i + 1];
     const selectionEndRow = selections[i + 2];
     const selectionEndColumn = selections[i + 3];
-    const startColumnIndex = selectionStartColumn - state$6.compositionText.length;
+    const startColumnIndex = selectionStartColumn - state$5.compositionText.length;
     changes.push({
-      deleted: [state$6.compositionText],
+      deleted: [state$5.compositionText],
       end: {
         columnIndex: selectionEndColumn,
         rowIndex: selectionEndRow
@@ -4869,7 +4886,7 @@ const compositionUpdate = (editor, data) => {
     selections
   } = editor;
   const changes = getCompositionChanges(selections, data);
-  state$6.compositionText = data;
+  state$5.compositionText = data;
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 const compositionEnd = (editor, data) => {
@@ -4877,8 +4894,8 @@ const compositionEnd = (editor, data) => {
     selections
   } = editor;
   const changes = getCompositionChanges(selections, data);
-  state$6.isComposing = false;
-  state$6.compositionText = '';
+  state$5.isComposing = false;
+  state$5.compositionText = '';
   return scheduleDocumentAndCursorsSelections(editor, changes);
 };
 
@@ -5978,21 +5995,6 @@ const closeWidgetsMaybe = widgets => {
   return widgets.filter(isPersistentWidget);
 };
 
-const state$5 = {
-  position: {
-    columnIndex: 0,
-    rowIndex: 0
-  }
-};
-const getPosition = () => {
-  return state$5.position;
-};
-
-// @ts-ignore
-const setPosition = position => {
-  state$5.position = position;
-};
-
 const openExternal = async (url, platform) => {
   await openUrl(url, platform);
 };
@@ -6056,12 +6058,11 @@ const Ctrl = 1;
 const Alt = 2;
 
 const handleSingleClickDefault = (editor, position) => {
-  // TODO avoid global variables, add them to editor state
-  setPosition(position);
   const widgets = closeWidgetsMaybe(editor.widgets);
   return {
     ...editor,
     focused: true,
+    selectionAnchorPosition: position,
     selections: new Uint32Array([position.rowIndex, position.columnIndex, position.rowIndex, position.columnIndex]),
     widgets
   };
@@ -6150,6 +6151,16 @@ const Single = 1;
 const Double = 2;
 const Triple = 3;
 
+const getModifier = (altKey, ctrlKey) => {
+  if (altKey) {
+    return Alt;
+  }
+  if (ctrlKey) {
+    return Ctrl;
+  }
+  return 0;
+};
+
 const handleSingleClick = async (editor, modifier, x, y) => {
   object(editor);
   number(modifier);
@@ -6187,27 +6198,26 @@ const handleTripleClick = (editor, modifier, x, y) => {
   return selectLine(editor);
 };
 
-const getModifier = (altKey, ctrlKey) => {
-  if (altKey) {
-    return Alt;
-  }
-  if (ctrlKey) {
-    return Ctrl;
-  }
-  return 0;
-};
-const handleMouseDown = (state, button, altKey, ctrlKey, x, y, detail) => {
+const handleMouseDown = async (state, button, altKey, ctrlKey, x, y, detail) => {
   const modifier = getModifier(altKey, ctrlKey);
+  let newState;
   switch (detail) {
     case Double:
-      return handleDoubleClick(state, modifier, x, y);
+      newState = await handleDoubleClick(state, modifier, x, y);
+      break;
     case Single:
-      return handleSingleClick(state, modifier, x, y);
+      newState = await handleSingleClick(state, modifier, x, y);
+      break;
     case Triple:
-      return handleTripleClick(state, modifier, x, y);
+      newState = handleTripleClick(state, modifier, x, y);
+      break;
     default:
       return state;
   }
+  return {
+    ...newState,
+    isSelecting: true
+  };
 };
 
 const state$4 = {
@@ -6378,11 +6388,7 @@ const handlePointerCaptureLost = editor => {
 };
 
 const handlePointerDown$1 = async (state, button, altKey, ctrlKey, x, y, detail) => {
-  const newState = await handleMouseDown(state, button, altKey, ctrlKey, x, y, detail);
-  return {
-    ...newState,
-    isSelecting: true
-  };
+  return state;
 };
 
 const moveRectangleSelection = (editor, position) => {
@@ -6512,7 +6518,7 @@ const getNewSelections$5 = (anchor, position) => {
 
 // @ts-ignore
 const editorMoveSelection = (editor, position) => {
-  const anchor = getPosition();
+  const anchor = editor.selectionAnchorPosition;
   const newSelections = getNewSelections$5(anchor, position);
   // TODO if selection equals previous selection -> do nothing
   return scheduleSelections(editor, newSelections);
@@ -6530,7 +6536,7 @@ const getNewEditor$1 = (editor, position) => {
     const newMinLineY = position.rowIndex;
     const newMaxLineY = position.rowIndex + diff;
     const newDeltaY = position.rowIndex * rowHeight;
-    const anchor = getPosition();
+    const anchor = editor.selectionAnchorPosition;
     const newSelections = new Uint32Array([position.rowIndex - 1, position.columnIndex, anchor.rowIndex, anchor.columnIndex]);
     return {
       ...editor,
@@ -6545,7 +6551,7 @@ const getNewEditor$1 = (editor, position) => {
     const newMinLineY = position.rowIndex - diff;
     const newMaxLineY = position.rowIndex;
     const newDeltaY = newMinLineY * rowHeight;
-    const anchor = getPosition();
+    const anchor = editor.selectionAnchorPosition;
     const newSelections = new Uint32Array([anchor.rowIndex, anchor.columnIndex, position.rowIndex + 1, position.columnIndex]);
     return {
       ...editor,
@@ -7190,7 +7196,7 @@ const dispose = async () => {
   // await rpc.dispose()
 };
 
-const getEditor = editorUid => {
+const getEditor$1 = editorUid => {
   const instance = get$7(editorUid);
   if (!instance) {
     throw new Error(`editor ${editorUid} not found`);
@@ -7205,7 +7211,7 @@ const loadContent$2 = async (state, parentUid) => {
   const {
     uid
   } = state;
-  const editor = getEditor(parentUid);
+  const editor = getEditor$1(parentUid);
   const {
     height,
     width,
@@ -8109,7 +8115,7 @@ const setLanguageId = async (editor, languageId, tokenizePath) => {
   const tokenizer = getTokenizer(languageId);
   const newTokenizerId = tokenizerId + 1;
   set$3(newTokenizerId, tokenizer);
-  const latest = getEditor(editor.uid);
+  const latest = getEditor$1(editor.uid);
   if (!latest) {
     return editor;
   }
@@ -8118,7 +8124,7 @@ const setLanguageId = async (editor, languageId, tokenizePath) => {
     differences,
     textInfos
   } = await getVisible$1(editor, syncIncremental);
-  const latest2 = getEditor(editor.uid);
+  const latest2 = getEditor$1(editor.uid);
   if (!latest2) {
     return editor;
   }
@@ -9213,6 +9219,8 @@ const getWidgetInvoke = widgetId => {
   }
 };
 
+const Close = 'Close';
+
 const updateWidget = (editor, widgetId, newState) => {
   // TODO avoid closure
   const isWidget = widget => {
@@ -9236,11 +9244,40 @@ const updateWidget = (editor, widgetId, newState) => {
   };
 };
 
+const getEditorByWidgetUid = (widgetUid, widgetId) => {
+  for (const key of getKeys$2()) {
+    const editor = get$7(Number(key)).newState;
+    const widgets = editor.widgets || [];
+    for (const widget of widgets) {
+      if (widget.id === widgetId && widget.newState.uid === widgetUid) {
+        return editor;
+      }
+    }
+  }
+  return undefined;
+};
+const getEditor = (editorOrUid, widgetId) => {
+  if (editorOrUid && editorOrUid.widgets) {
+    return editorOrUid;
+  }
+  const instance = get$7(editorOrUid);
+  if (instance && instance.newState && instance.newState.widgets) {
+    return instance.newState;
+  }
+  return getEditorByWidgetUid(editorOrUid, widgetId);
+};
 const createFn = (key, name, widgetId) => {
   const isWidget = widget => {
     return widget.id === widgetId;
   };
-  const fn = async (editor, ...args) => {
+  const isClose = args => {
+    return key === 'close' || key === 'handleClickButton' && args.includes(Close);
+  };
+  const fn = async (editorOrUid, ...args) => {
+    const editor = getEditor(editorOrUid, widgetId);
+    if (!editor) {
+      return editorOrUid;
+    }
     const childIndex = editor.widgets.findIndex(isWidget);
     if (childIndex === -1) {
       return editor;
@@ -9255,12 +9292,22 @@ const createFn = (key, name, widgetId) => {
     await invoke(`${name}.${key}`, uid, ...args);
     const diff = await invoke(`${name}.diff2`, uid);
     const commands = await invoke(`${name}.render2`, uid, diff);
+    const latest = get$7(editor.uid).newState;
+    if (isClose(args)) {
+      const newEditor = {
+        ...latest,
+        focused: true,
+        widgets: removeEditorWidget(latest.widgets, widgetId)
+      };
+      set$8(editor.uid, latest, newEditor);
+      return newEditor;
+    }
     const newState = {
       ...state,
       commands
     };
-    const latest = get$7(editor.uid).newState;
     const newEditor = updateWidget(latest, widgetId, newState);
+    set$8(editor.uid, latest, newEditor);
     return newEditor;
   };
   return fn;
@@ -9952,7 +9999,7 @@ const executeWidgetCommand = async (editor, name, method, _uid, widgetId, ...par
   const isWidget = widget => {
     return widget.id === widgetId;
   };
-  const latestEditor = getEditor(editor.uid);
+  const latestEditor = getEditor$1(editor.uid);
   const childIndex1 = latestEditor.widgets.findIndex(isWidget);
   if (childIndex1 === -1) {
     return latestEditor;
@@ -10038,54 +10085,54 @@ const FocusFindWidgetPreviousMatchButton = 50;
 const FocusEditorCodeGenerator = 52;
 
 const getPositionAtCursor = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return getPositionAtCursor$1(editor);
 };
 const getUri = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return editor.uri;
 };
 const getLanguageId = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return editor.languageId;
 };
 const getOffsetAtCursor = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   return getOffsetAtCursor$1(editor);
 };
 const getWordAt = (editorUid, rowIndex, columnIndex) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     word
   } = getWordAt$1(editor, rowIndex, columnIndex);
   return word;
 };
 const getWordAtOffset2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const word = getWordAtOffset(editor);
   return word;
 };
 const getWordBefore2 = (editorUid, rowIndex, columnIndex) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const word = getWordBefore(editor, rowIndex, columnIndex);
   return word;
 };
 const getLines2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     lines
   } = editor;
   return lines;
 };
 const getSelections2 = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     selections
   } = editor;
   return selections;
 };
 const setSelections2 = async (editorUid, selections) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const newEditor = {
     ...editor,
     selections
@@ -10094,7 +10141,7 @@ const setSelections2 = async (editorUid, selections) => {
   set$8(editorUid, editor, newEditorWithDerivedState);
 };
 const closeWidget2 = async (editorUid, widgetId, widgetName, unsetAdditionalFocus$1) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const invoke = getWidgetInvoke(widgetId);
   const {
     widgets
@@ -10121,7 +10168,7 @@ const closeFind2 = async editorUid => {
   await closeWidget2(editorUid, Find, 'FindWidget', 0);
 };
 const applyEdits2 = async (editorUid, edits) => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const newEditor = await applyEdit(editor, edits);
   const newEditorWithDerivedState = await updateDerivedState(editor, newEditor);
   set$8(editorUid, editor, newEditorWithDerivedState);
@@ -10131,7 +10178,7 @@ const getSourceActions = async editorUid => {
   return actions;
 };
 const getDiagnostics$1 = async editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     diagnostics
   } = editor;
@@ -10669,7 +10716,7 @@ const getQuickPickMenuEntries = () => {
 };
 
 const getSelections = editorUid => {
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     selections
   } = editor;
@@ -10678,7 +10725,7 @@ const getSelections = editorUid => {
 
 const getText = editorUid => {
   number(editorUid);
-  const editor = getEditor(editorUid);
+  const editor = getEditor$1(editorUid);
   const {
     lines
   } = editor;
@@ -11106,11 +11153,13 @@ const registerListener = (listenerType, rpcId) => {
   registerListener$1(listenerType, rpcId);
 };
 
-const getCss = (rowHeight, scrollBarHeight, scrollBarTop) => {
+const getCss = (rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft) => {
   return `.Editor {
   --EditorRowHeight: ${rowHeight}px;
   --ScrollBarHeight: ${scrollBarHeight}px;
   --ScrollBarTop: ${scrollBarTop}px;
+  --ScrollBarWidth: ${scrollBarWidth}px;
+  --ScrollBarLeft: ${scrollBarLeft}px;
 }
 .Editor .EditorRow {
   height: var(--EditorRowHeight);
@@ -11120,20 +11169,37 @@ const getCss = (rowHeight, scrollBarHeight, scrollBarTop) => {
   height: var(--ScrollBarHeight);
   translate: 0px var(--ScrollBarTop);
 }
+.Editor .ScrollBarThumbHorizontal {
+  width: var(--ScrollBarWidth);
+  translate: var(--ScrollBarLeft) 0px;
+}
 `;
 };
 
-const renderCss = (oldState, newState) => {
+const getScrollBarLeft = (deltaX, longestLineWidth, width) => {
+  const scrollBarLeft = deltaX / longestLineWidth * width;
+  if (!Number.isFinite(scrollBarLeft)) {
+    return 0;
+  }
+  return scrollBarLeft;
+};
+const renderCss$1 = (oldState, newState) => {
   const {
+    deltaX,
     deltaY,
     finalDeltaY,
     height,
+    longestLineWidth,
+    minimumSliderSize,
     rowHeight,
     scrollBarHeight,
-    uid
+    uid,
+    width
   } = newState;
   const scrollBarTop = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
-  const css = getCss(rowHeight, scrollBarHeight, scrollBarTop);
+  const scrollBarWidth = getScrollBarSize(width, longestLineWidth, minimumSliderSize);
+  const scrollBarLeft = getScrollBarLeft(deltaX, longestLineWidth, width);
+  const css = getCss(rowHeight, scrollBarHeight, scrollBarTop, scrollBarWidth, scrollBarLeft);
   return [SetCss$1, uid, css];
 };
 
@@ -11593,8 +11659,7 @@ const getEditorScrollBarDiagnosticsVirtualDom = scrollBarDiagnostics => {
   }, ...getDiagnosticsVirtualDom([...scrollBarDiagnostics])];
 };
 
-const getScrollBarVirtualDom = (deltaY, finalDeltaY, height, scrollBarHeight) => {
-  const scrollBarY = getScrollBarY(deltaY, finalDeltaY, height, scrollBarHeight);
+const getScrollBarVirtualDom = () => {
   return [{
     childCount: 1,
     className: 'ScrollBar ScrollBarVertical',
@@ -11604,8 +11669,6 @@ const getScrollBarVirtualDom = (deltaY, finalDeltaY, height, scrollBarHeight) =>
   }, {
     childCount: 0,
     className: 'ScrollBarThumb ScrollBarThumbVertical',
-    style: `height:${scrollBarHeight}px;`,
-    translate: `0 ${scrollBarY}px`,
     type: Div
   }, {
     childCount: 1,
@@ -11621,15 +11684,11 @@ const getScrollBarVirtualDom = (deltaY, finalDeltaY, height, scrollBarHeight) =>
 
 const getEditorContentVirtualDom = ({
   cursorInfos = [],
-  deltaY = 0,
   diagnostics = [],
   differences,
-  finalDeltaY = 0,
-  height = 0,
   highlightedLine = -1,
   lineNumbers = true,
   scrollBarDiagnostics = [],
-  scrollBarHeight = 0,
   selectionInfos = [],
   textInfos
 }) => {
@@ -11638,7 +11697,7 @@ const getEditorContentVirtualDom = ({
     className: 'EditorContent',
     onMouseMove: HandleMouseMove,
     type: Div
-  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom(deltaY, finalDeltaY, height, scrollBarHeight)];
+  }, ...getEditorInputVirtualDom(), ...getEditorLayersVirtualDom(selectionInfos, textInfos, differences, lineNumbers, highlightedLine, cursorInfos, diagnostics), ...getEditorScrollBarDiagnosticsVirtualDom(scrollBarDiagnostics), ...getScrollBarVirtualDom()];
 };
 
 const getGutterInfoVirtualDom = gutterInfo => {
@@ -11664,16 +11723,12 @@ const getEditorGutterVirtualDom = gutterInfos => {
 
 const getEditorVirtualDom = ({
   cursorInfos = [],
-  deltaY = 0,
   diagnostics = [],
   differences,
-  finalDeltaY = 0,
   gutterInfos = [],
-  height = 0,
   highlightedLine = -1,
   lineNumbers = true,
   scrollBarDiagnostics = [],
-  scrollBarHeight = 0,
   selectionInfos = [],
   textInfos
 }) => {
@@ -11686,15 +11741,11 @@ const getEditorVirtualDom = ({
     type: Div
   }, ...gutterDom, ...getEditorContentVirtualDom({
     cursorInfos,
-    deltaY,
     diagnostics,
     differences,
-    finalDeltaY,
-    height,
     highlightedLine,
     lineNumbers,
     scrollBarDiagnostics,
-    scrollBarHeight,
     selectionInfos,
     textInfos
   })];
@@ -11739,16 +11790,91 @@ const renderIncremental = (oldState, newState) => {
   return [SetPatches, newState.uid, patches];
 };
 
+const addWidget = widget => {
+  const module = get$6(widget.id);
+  if (!module) {
+    throw new Error('unsupported widget');
+  }
+  return module.add(widget);
+};
+const renderWidget = widget => {
+  const module = get$6(widget.id);
+  if (!module) {
+    throw new Error('unsupported widget');
+  }
+  return module.render(widget);
+};
+const removeWidget = widget => {
+  const module = get$6(widget.id);
+  if (!module) {
+    throw new Error('unsupported widget');
+  }
+  return module.remove(widget);
+};
+
+const renderWidgets$1 = (oldState, newState) => {
+  const addedWidgets = [];
+  const changedWidgets = [];
+  const removedWidgets = [];
+  const oldWidgets = oldState.widgets || [];
+  const newWidgets = newState.widgets || [];
+  const oldWidgetMap = Object.create(null);
+  const newWidgetMap = Object.create(null);
+  for (const oldWidget of oldWidgets) {
+    oldWidgetMap[oldWidget.id] = oldWidget;
+  }
+  for (const newWidget of newWidgets) {
+    newWidgetMap[newWidget.id] = newWidget;
+  }
+  for (const oldWidget of oldWidgets) {
+    if (Object.hasOwn(newWidgetMap, oldWidget.id)) {
+      changedWidgets.push(newWidgetMap[oldWidget.id]);
+    } else {
+      removedWidgets.push(oldWidget);
+    }
+  }
+  for (const newWidget of newWidgets) {
+    if (Object.hasOwn(oldWidgetMap, newWidget.id)) ; else {
+      addedWidgets.push(newWidget);
+    }
+  }
+  const addCommands = [];
+  for (const addedWidget of addedWidgets) {
+    const childCommands = addWidget(addedWidget);
+    if (childCommands.length > 0) {
+      addCommands.push(...childCommands);
+    }
+  }
+  const changeCommands = [];
+  for (const changedWidget of changedWidgets) {
+    const childCommands = renderWidget(changedWidget);
+    if (childCommands.length > 0) {
+      changeCommands.push(...childCommands);
+    }
+  }
+  const removeCommands = [];
+  for (const removedWidget of removedWidgets) {
+    const childCommands = removeWidget(removedWidget);
+    if (childCommands.length > 0) {
+      removeCommands.push(...childCommands);
+    }
+  }
+  const allCommands = [...addCommands, ...changeCommands, ...removeCommands];
+  return allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext');
+};
+
 const getRenderer = diffType => {
   switch (diffType) {
     case RenderCss:
-      return renderCss;
+      return renderCss$1;
     case RenderFocus:
       return renderFocus$2;
     case RenderFocusContext:
       return renderFocusContext$1;
     case RenderIncremental:
       return renderIncremental;
+    case RenderWidgets:
+      return renderWidgets$1;
     default:
       throw new Error('unknown renderer');
   }
@@ -11760,7 +11886,11 @@ const applyRender = (oldState, newState, diffResult) => {
     const fn = getRenderer(item);
     const result = fn(oldState, newState);
     if (result.length > 0) {
-      commands.push(result);
+      if (item === RenderWidgets) {
+        commands.push(...result);
+      } else {
+        commands.push(result);
+      }
     }
   }
   return commands;
@@ -11776,28 +11906,6 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-const addWidget = widget => {
-  const module = get$6(widget.id);
-  if (!module) {
-    throw new Error('unsupported widget');
-  }
-  return module.add(widget);
-};
-const renderWidget = widget => {
-  const module = get$6(widget.id);
-  if (!module) {
-    throw new Error('unsupported widget');
-  }
-  return module.render(widget);
-};
-const removeWidget = widget => {
-  const module = get$6(widget.id);
-  if (!module) {
-    throw new Error('unsupported widget');
-  }
-  return module.remove(widget);
-};
-
 const renderLines = {
   apply(oldState, newState) {
     const {
@@ -11833,22 +11941,9 @@ const renderSelections = {
   },
   isEqual: (oldState, newState) => oldState.cursorInfos === newState.cursorInfos && oldState.selectionInfos === newState.selectionInfos
 };
-const renderScrollBarY = {
-  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) => oldState.deltaY === newState.deltaY && oldState.scrollBarHeight === newState.scrollBarHeight
-};
-const renderScrollBarX = {
-  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) => oldState.longestLineWidth === newState.longestLineWidth && oldState.deltaX === newState.deltaX
+const renderCss = {
+  apply: renderCss$1,
+  isEqual: isEqual$3
 };
 const renderFocus$1 = {
   apply: (oldState, newState) => [/* method */'setFocused', newState.focused],
@@ -11894,61 +11989,11 @@ const renderGutterInfo = {
   isEqual: (oldState, newState) => oldState.lineNumbers === newState.lineNumbers && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY
 };
 const renderWidgets = {
-  apply(oldState, newState) {
-    const addedWidgets = [];
-    const changedWidgets = [];
-    const removedWidgets = [];
-    const oldWidgets = oldState.widgets || [];
-    const newWidgets = newState.widgets || [];
-    const oldWidgetMap = Object.create(null);
-    const newWidgetMap = Object.create(null);
-    for (const oldWidget of oldWidgets) {
-      oldWidgetMap[oldWidget.id] = oldWidget;
-    }
-    for (const newWidget of newWidgets) {
-      newWidgetMap[newWidget.id] = newWidget;
-    }
-    for (const oldWidget of oldWidgets) {
-      if (Object.hasOwn(newWidgetMap, oldWidget.id)) {
-        changedWidgets.push(newWidgetMap[oldWidget.id]);
-      } else {
-        removedWidgets.push(oldWidget);
-      }
-    }
-    for (const newWidget of newWidgets) {
-      if (Object.hasOwn(oldWidgetMap, newWidget.id)) ; else {
-        addedWidgets.push(newWidget);
-      }
-    }
-    const addCommands = [];
-    for (const addedWidget of addedWidgets) {
-      const childCommands = addWidget(addedWidget);
-      if (childCommands.length > 0) {
-        addCommands.push(...childCommands);
-      }
-    }
-    const changeCommands = [];
-    for (const changedWidget of changedWidgets) {
-      const childCommands = renderWidget(changedWidget);
-      if (childCommands.length > 0) {
-        changeCommands.push(...childCommands);
-      }
-    }
-    const removeCommands = [];
-    for (const removedWidget of removedWidgets) {
-      const childCommands = removeWidget(removedWidget);
-      if (childCommands.length > 0) {
-        removeCommands.push(...childCommands);
-      }
-    }
-    const allCommands = [...addCommands, ...changeCommands, ...removeCommands];
-    const filteredCommands = allCommands.filter(item => item[0] !== 'Viewlet.setFocusContext');
-    return filteredCommands;
-  },
+  apply: renderWidgets$1,
   isEqual: (oldState, newState) => oldState.widgets === newState.widgets,
   multiple: true
 };
-const render$6 = [renderLines, renderSelections, renderScrollBarX, renderScrollBarY, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets, renderFocusContext, renderAdditionalFocusContext];
+const render$6 = [renderLines, renderSelections, renderCss, renderFocus$1, renderDecorations, renderGutterInfo, renderWidgets, renderFocusContext, renderAdditionalFocusContext];
 const renderEditor = async id => {
   const instance = get$7(id);
   if (!instance) {