@lvce-editor/static-server 0.92.0 → 0.93.0

package/static/{b2786da → db6c58f}/packages/diff-view/dist/diffViewWorkerMain.js

@@ -2106,6 +2106,281 @@ const getVisibleRows = (content, totalLineCount, minLineY, maxLineY) => {
   return paddedLines;
 };
 
+const mergeClassNames = (...classNames) => {
+  return classNames.filter(Boolean).join(' ');
+};
+
+const text = data => {
+  return {
+    childCount: 0,
+    text: data,
+    type: Text
+  };
+};
+
+new Set(Object.values(VirtualDomElements));
+
+const SetText = 1;
+const Replace = 2;
+const SetAttribute = 3;
+const RemoveAttribute = 4;
+const Add = 6;
+const NavigateChild = 7;
+const NavigateParent = 8;
+const RemoveChild = 9;
+const NavigateSibling = 10;
+const SetReferenceNodeUid = 11;
+
+const isKey = key => {
+  return key !== 'type' && key !== 'childCount';
+};
+
+const getKeys = node => {
+  const keys = Object.keys(node).filter(isKey);
+  return keys;
+};
+
+const arrayToTree = nodes => {
+  const result = [];
+  let i = 0;
+  while (i < nodes.length) {
+    const node = nodes[i];
+    const {
+      children,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
+    result.push({
+      node,
+      children
+    });
+    i += 1 + nodesConsumed;
+  }
+  return result;
+};
+const getChildrenWithCount = (nodes, startIndex, childCount) => {
+  if (childCount === 0) {
+    return {
+      children: [],
+      nodesConsumed: 0
+    };
+  }
+  const children = [];
+  let i = startIndex;
+  let remaining = childCount;
+  let totalConsumed = 0;
+  while (remaining > 0 && i < nodes.length) {
+    const node = nodes[i];
+    const nodeChildCount = node.childCount || 0;
+    const {
+      children: nodeChildren,
+      nodesConsumed
+    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
+    children.push({
+      node,
+      children: nodeChildren
+    });
+    const nodeSize = 1 + nodesConsumed;
+    i += nodeSize;
+    totalConsumed += nodeSize;
+    remaining--;
+  }
+  return {
+    children,
+    nodesConsumed: totalConsumed
+  };
+};
+
+const compareNodes = (oldNode, newNode) => {
+  // Check if node type changed - return null to signal incompatible nodes
+  // (caller should handle this with a Replace operation)
+  if (oldNode.type !== newNode.type) {
+    return null;
+  }
+  const patches = [];
+  // Handle reference nodes - special handling for uid changes
+  if (oldNode.type === Reference) {
+    if (oldNode.uid !== newNode.uid) {
+      patches.push({
+        type: SetReferenceNodeUid,
+        uid: newNode.uid
+      });
+    }
+    return patches;
+  }
+  // Handle text nodes
+  if (oldNode.type === Text && newNode.type === Text) {
+    if (oldNode.text !== newNode.text) {
+      patches.push({
+        type: SetText,
+        value: newNode.text
+      });
+    }
+    return patches;
+  }
+  // Compare attributes
+  const oldKeys = getKeys(oldNode);
+  const newKeys = getKeys(newNode);
+  // Check for attribute changes
+  for (const key of newKeys) {
+    if (oldNode[key] !== newNode[key]) {
+      patches.push({
+        type: SetAttribute,
+        key,
+        value: newNode[key]
+      });
+    }
+  }
+  // Check for removed attributes
+  for (const key of oldKeys) {
+    if (!Object.hasOwn(newNode, key)) {
+      patches.push({
+        type: RemoveAttribute,
+        key
+      });
+    }
+  }
+  return patches;
+};
+
+const treeToArray = node => {
+  const result = [node.node];
+  for (const child of node.children) {
+    result.push(...treeToArray(child));
+  }
+  return result;
+};
+
+const navigateToChild = (patches, currentChildIndex, index) => {
+  if (currentChildIndex === -1) {
+    patches.push({
+      type: NavigateChild,
+      index
+    });
+    return index;
+  }
+  if (currentChildIndex !== index) {
+    patches.push({
+      type: NavigateSibling,
+      index
+    });
+  }
+  return index;
+};
+const navigateToParent = (patches, currentChildIndex) => {
+  if (currentChildIndex >= 0) {
+    patches.push({
+      type: NavigateParent
+    });
+  }
+  return -1;
+};
+const addTree = (newNode, patches) => {
+  patches.push({
+    type: Add,
+    nodes: treeToArray(newNode)
+  });
+};
+const replaceTree = (newNode, patches) => {
+  patches.push({
+    type: Replace,
+    nodes: treeToArray(newNode)
+  });
+};
+const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+    replaceTree(newNode, patches);
+    return nextChildIndex;
+  }
+  const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
+  if (nodePatches.length === 0 && !hasChildrenToCompare) {
+    return currentChildIndex;
+  }
+  const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (hasChildrenToCompare) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+  return nextChildIndex;
+};
+const diffRootNode = (oldNode, newNode, patches) => {
+  const nodePatches = compareNodes(oldNode.node, newNode.node);
+  if (nodePatches === null) {
+    replaceTree(newNode, patches);
+    return;
+  }
+  if (nodePatches.length > 0) {
+    patches.push(...nodePatches);
+  }
+  if (oldNode.children.length > 0 || newNode.children.length > 0) {
+    diffChildren(oldNode.children, newNode.children, patches);
+  }
+};
+const diffChildren = (oldChildren, newChildren, patches) => {
+  const maxLength = Math.max(oldChildren.length, newChildren.length);
+  let currentChildIndex = -1;
+  const indicesToRemove = [];
+  for (let i = 0; i < maxLength; i++) {
+    const oldNode = oldChildren[i];
+    const newNode = newChildren[i];
+    if (!oldNode && !newNode) {
+      continue;
+    }
+    if (!oldNode) {
+      currentChildIndex = navigateToParent(patches, currentChildIndex);
+      addTree(newNode, patches);
+      continue;
+    }
+    if (!newNode) {
+      indicesToRemove.push(i);
+      continue;
+    }
+    currentChildIndex = diffExistingChild(oldNode, newNode, patches, currentChildIndex, i);
+  }
+  navigateToParent(patches, currentChildIndex);
+  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
+    patches.push({
+      type: RemoveChild,
+      index: indicesToRemove[j]
+    });
+  }
+};
+const diffTrees = (oldTree, newTree, patches, path) => {
+  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
+    diffRootNode(oldTree[0], newTree[0], patches);
+    return;
+  }
+  diffChildren(oldTree, newTree, patches);
+};
+
+const removeTrailingNavigationPatches = patches => {
+  // Find the last non-navigation patch
+  let lastNonNavigationIndex = -1;
+  for (let i = patches.length - 1; i >= 0; i--) {
+    const patch = patches[i];
+    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
+      lastNonNavigationIndex = i;
+      break;
+    }
+  }
+  // Return patches up to and including the last non-navigation patch
+  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+};
+
+const diffTree = (oldNodes, newNodes) => {
+  // Step 1: Convert flat arrays to tree structures
+  const oldTree = arrayToTree(oldNodes);
+  const newTree = arrayToTree(newNodes);
+  // Step 3: Compare the trees
+  const patches = [];
+  diffTrees(oldTree, newTree, patches, []);
+  // Remove trailing navigation patches since they serve no purpose
+  return removeTrailingNavigationPatches(patches);
+};
+
 const VisibleLineType = {
   Added: 3,
   Normal: 1,
@@ -2292,7 +2567,7 @@ const mergeChangedClassName = className => {
   if (!className) {
     return DiffTokenChanged;
   }
-  return `${className} ${DiffTokenChanged}`;
+  return mergeClassNames(className, DiffTokenChanged);
 };
 const getTokenSlice = (token, tokenStart, sliceStart, sliceEnd, type) => {
   return {
@@ -2621,79 +2896,10 @@ const applyEditInput = async (state, inputValue) => {
     inputValue,
     languageIdLeft: syntaxHighlightingState?.languageIdLeft || state.languageIdLeft,
     languageIdRight: syntaxHighlightingState?.languageIdRight || state.languageIdRight,
-    rightEditor,
-    scrollBarBackgroundImage: getScrollBarBackgroundImage(inlineChanges, totalLineCount),
-    tokenizedLinesLeft: syntaxHighlightingState?.tokenizedLinesLeft || state.tokenizedLinesLeft,
-    tokenizedLinesRight: syntaxHighlightingState?.tokenizedLinesRight || [],
-    totalLineCount,
-    totalLineCountLeft,
-    totalLineCountRight,
-    ...scrollState
-  };
-  return {
-    ...nextState,
-    ...getVisibleLinesState({
-      contentLeft: nextState.contentLeft,
-      contentRight: nextState.contentRight,
-      inlineChanges: nextState.inlineChanges,
-      maxLineY: nextState.maxLineY,
-      minLineY: nextState.minLineY,
-      tokenizedLinesLeft: nextState.tokenizedLinesLeft,
-      tokenizedLinesRight: nextState.tokenizedLinesRight,
-      totalLineCountLeft: nextState.totalLineCountLeft,
-      totalLineCountRight: nextState.totalLineCountRight
-    })
-  };
-};
-
-const getBaseContentRight$1 = state => {
-  if (state.inputValue && state.contentRight.startsWith(state.inputValue)) {
-    return state.contentRight.slice(state.inputValue.length);
-  }
-  return state.contentRight;
-};
-const deleteLeft = async state => {
-  if (state.inputValue) {
-    return applyEditInput(state, state.inputValue.slice(0, -1));
-  }
-  const baseContent = getBaseContentRight$1(state);
-  const cursorRow = Math.max(0, Math.min(state.rightEditor.cursorRowIndex, getLineCount(baseContent) - 1));
-  const lines = baseContent.split('\n');
-  const currentLine = lines[cursorRow] ?? '';
-  const cursorCol = Math.max(0, Math.min(state.rightEditor.cursorColumnIndex, currentLine.length));
-
-  // compute absolute index
-  let index = 0;
-  for (let i = 0; i < cursorRow; i++) {
-    index += (lines[i] ?? '').length + 1;
-  }
-  index += cursorCol;
-  if (index <= 0) {
-    return state;
-  }
-  const contentRight = baseContent.slice(0, index - 1) + baseContent.slice(index);
-  const {
-    totalLineCountLeft
-  } = state;
-  const totalLineCountRight = getLineCount(contentRight);
-  const canComputeInlineDiff = state.renderModeLeft === 'text' && !state.errorLeftMessage;
-  const {
-    inlineChanges,
-    totalLineCount
-  } = canComputeInlineDiff ? await getInlineDiffState(state.contentLeft, contentRight) : {
-    inlineChanges: [],
-    totalLineCount: Math.max(totalLineCountLeft, totalLineCountRight)
-  };
-  const scrollState = getScrollState(state.height, state.itemHeight, totalLineCount, state.minimumSliderSize, state.deltaY);
-  const nextState = {
-    ...state,
-    contentRight,
-    gutterWidthVariable: getGutterWidthVariable(Math.max(totalLineCountLeft, totalLineCountRight)),
-    inlineChanges,
-    inputSource: User,
-    inputValue: '',
+    rightEditor,
     scrollBarBackgroundImage: getScrollBarBackgroundImage(inlineChanges, totalLineCount),
-    tokenizedLinesRight: [],
+    tokenizedLinesLeft: syntaxHighlightingState?.tokenizedLinesLeft || state.tokenizedLinesLeft,
+    tokenizedLinesRight: syntaxHighlightingState?.tokenizedLinesRight || [],
     totalLineCount,
     totalLineCountLeft,
     totalLineCountRight,
@@ -2715,18 +2921,17 @@ const deleteLeft = async state => {
   };
 };
 
-const getBaseContentRight = state => {
+const getBaseContentRight$1 = state => {
   if (state.inputValue && state.contentRight.startsWith(state.inputValue)) {
     return state.contentRight.slice(state.inputValue.length);
   }
   return state.contentRight;
 };
-const deleteRight = async state => {
-  // If there is an active input buffer, let applyEditInput handle changes via HandleInput
+const deleteLeft = async state => {
   if (state.inputValue) {
-    return state;
+    return applyEditInput(state, state.inputValue.slice(0, -1));
   }
-  const baseContent = getBaseContentRight(state);
+  const baseContent = getBaseContentRight$1(state);
   const cursorRow = Math.max(0, Math.min(state.rightEditor.cursorRowIndex, getLineCount(baseContent) - 1));
   const lines = baseContent.split('\n');
   const currentLine = lines[cursorRow] ?? '';
@@ -2738,10 +2943,10 @@ const deleteRight = async state => {
     index += (lines[i] ?? '').length + 1;
   }
   index += cursorCol;
-  if (index >= baseContent.length) {
+  if (index <= 0) {
     return state;
   }
-  const contentRight = baseContent.slice(0, index) + baseContent.slice(index + 1);
+  const contentRight = baseContent.slice(0, index - 1) + baseContent.slice(index);
   const {
     totalLineCountLeft
   } = state;
@@ -2771,339 +2976,134 @@ const deleteRight = async state => {
   };
   return {
     ...nextState,
-    ...getVisibleLinesState({
-      contentLeft: nextState.contentLeft,
-      contentRight: nextState.contentRight,
-      inlineChanges: nextState.inlineChanges,
-      maxLineY: nextState.maxLineY,
-      minLineY: nextState.minLineY,
-      tokenizedLinesLeft: nextState.tokenizedLinesLeft,
-      tokenizedLinesRight: nextState.tokenizedLinesRight,
-      totalLineCountLeft: nextState.totalLineCountLeft,
-      totalLineCountRight: nextState.totalLineCountRight
-    })
-  };
-};
-
-const isEqual$3 = (oldState, newState) => {
-  return oldState.deltaY === newState.deltaY && oldState.diffMode === newState.diffMode && oldState.finalDeltaY === newState.finalDeltaY && oldState.gutterWidthVariable === newState.gutterWidthVariable && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.layout === newState.layout && oldState.leftWidth === newState.leftWidth && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.rightEditor.cursorColumnIndex === newState.rightEditor.cursorColumnIndex && oldState.rightEditor.cursorRowIndex === newState.rightEditor.cursorRowIndex && oldState.rightWidth === newState.rightWidth && oldState.scrollBarBackgroundImage === newState.scrollBarBackgroundImage && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.totalLineCount === newState.totalLineCount;
-};
-
-const isEqual$2 = (oldState, newState) => {
-  return oldState.focus === newState.focus && oldState.focusVersion === newState.focusVersion;
-};
-
-const isEqual$1 = (oldState, newState) => {
-  return oldState.contentLeft === newState.contentLeft && oldState.contentRight === newState.contentRight && oldState.deltaY === newState.deltaY && oldState.diffMode === newState.diffMode && oldState.lineNumbers === newState.lineNumbers && oldState.layout === newState.layout && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.searchVisible === newState.searchVisible && oldState.showWhitespace === newState.showWhitespace;
-};
-
-const RenderItems = 4;
-const RenderFocus = 6;
-const RenderFocusContext = 7;
-const RenderValue = 8;
-const RenderCss = 10;
-const RenderIncremental = 11;
-
-const isEqual = (oldState, newState) => {
-  return newState.inputSource === User$1 || oldState.inputValue === newState.inputValue;
-};
-
-const modules = [isEqual$1, isEqual, isEqual$3, isEqual$2, isEqual$2];
-const numbers = [RenderIncremental, RenderValue, RenderCss, RenderFocus, RenderFocusContext];
-
-const diff = (oldState, newState) => {
-  const diffResult = [];
-  for (let i = 0; i < modules.length; i++) {
-    const fn = modules[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers[i]);
-    }
-  }
-  return diffResult;
-};
-
-const diff2 = uid => {
-  const {
-    newState,
-    oldState
-  } = get(uid);
-  const result = diff(oldState, newState);
-  return result;
-};
-
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
-const text = data => {
-  return {
-    childCount: 0,
-    text: data,
-    type: Text
-  };
-};
-
-new Set(Object.values(VirtualDomElements));
-
-const SetText = 1;
-const Replace = 2;
-const SetAttribute = 3;
-const RemoveAttribute = 4;
-const Add = 6;
-const NavigateChild = 7;
-const NavigateParent = 8;
-const RemoveChild = 9;
-const NavigateSibling = 10;
-const SetReferenceNodeUid = 11;
-
-const isKey = key => {
-  return key !== 'type' && key !== 'childCount';
-};
-
-const getKeys = node => {
-  const keys = Object.keys(node).filter(isKey);
-  return keys;
-};
-
-const arrayToTree = nodes => {
-  const result = [];
-  let i = 0;
-  while (i < nodes.length) {
-    const node = nodes[i];
-    const {
-      children,
-      nodesConsumed
-    } = getChildrenWithCount(nodes, i + 1, node.childCount || 0);
-    result.push({
-      node,
-      children
-    });
-    i += 1 + nodesConsumed;
-  }
-  return result;
-};
-const getChildrenWithCount = (nodes, startIndex, childCount) => {
-  if (childCount === 0) {
-    return {
-      children: [],
-      nodesConsumed: 0
-    };
-  }
-  const children = [];
-  let i = startIndex;
-  let remaining = childCount;
-  let totalConsumed = 0;
-  while (remaining > 0 && i < nodes.length) {
-    const node = nodes[i];
-    const nodeChildCount = node.childCount || 0;
-    const {
-      children: nodeChildren,
-      nodesConsumed
-    } = getChildrenWithCount(nodes, i + 1, nodeChildCount);
-    children.push({
-      node,
-      children: nodeChildren
-    });
-    const nodeSize = 1 + nodesConsumed;
-    i += nodeSize;
-    totalConsumed += nodeSize;
-    remaining--;
-  }
-  return {
-    children,
-    nodesConsumed: totalConsumed
-  };
-};
-
-const compareNodes = (oldNode, newNode) => {
-  // Check if node type changed - return null to signal incompatible nodes
-  // (caller should handle this with a Replace operation)
-  if (oldNode.type !== newNode.type) {
-    return null;
-  }
-  const patches = [];
-  // Handle reference nodes - special handling for uid changes
-  if (oldNode.type === Reference) {
-    if (oldNode.uid !== newNode.uid) {
-      patches.push({
-        type: SetReferenceNodeUid,
-        uid: newNode.uid
-      });
-    }
-    return patches;
-  }
-  // Handle text nodes
-  if (oldNode.type === Text && newNode.type === Text) {
-    if (oldNode.text !== newNode.text) {
-      patches.push({
-        type: SetText,
-        value: newNode.text
-      });
-    }
-    return patches;
-  }
-  // Compare attributes
-  const oldKeys = getKeys(oldNode);
-  const newKeys = getKeys(newNode);
-  // Check for attribute changes
-  for (const key of newKeys) {
-    if (oldNode[key] !== newNode[key]) {
-      patches.push({
-        type: SetAttribute,
-        key,
-        value: newNode[key]
-      });
-    }
-  }
-  // Check for removed attributes
-  for (const key of oldKeys) {
-    if (!Object.hasOwn(newNode, key)) {
-      patches.push({
-        type: RemoveAttribute,
-        key
-      });
-    }
-  }
-  return patches;
-};
-
-const treeToArray = node => {
-  const result = [node.node];
-  for (const child of node.children) {
-    result.push(...treeToArray(child));
-  }
-  return result;
-};
-
-const navigateToChild = (patches, currentChildIndex, index) => {
-  if (currentChildIndex === -1) {
-    patches.push({
-      type: NavigateChild,
-      index
-    });
-    return index;
-  }
-  if (currentChildIndex !== index) {
-    patches.push({
-      type: NavigateSibling,
-      index
-    });
-  }
-  return index;
-};
-const navigateToParent = (patches, currentChildIndex) => {
-  if (currentChildIndex >= 0) {
-    patches.push({
-      type: NavigateParent
-    });
-  }
-  return -1;
-};
-const addTree = (newNode, patches) => {
-  patches.push({
-    type: Add,
-    nodes: treeToArray(newNode)
-  });
-};
-const replaceTree = (newNode, patches) => {
-  patches.push({
-    type: Replace,
-    nodes: treeToArray(newNode)
-  });
+    ...getVisibleLinesState({
+      contentLeft: nextState.contentLeft,
+      contentRight: nextState.contentRight,
+      inlineChanges: nextState.inlineChanges,
+      maxLineY: nextState.maxLineY,
+      minLineY: nextState.minLineY,
+      tokenizedLinesLeft: nextState.tokenizedLinesLeft,
+      tokenizedLinesRight: nextState.tokenizedLinesRight,
+      totalLineCountLeft: nextState.totalLineCountLeft,
+      totalLineCountRight: nextState.totalLineCountRight
+    })
+  };
 };
-const diffExistingChild = (oldNode, newNode, patches, currentChildIndex, index) => {
-  const nodePatches = compareNodes(oldNode.node, newNode.node);
-  if (nodePatches === null) {
-    const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
-    replaceTree(newNode, patches);
-    return nextChildIndex;
-  }
-  const hasChildrenToCompare = oldNode.children.length > 0 || newNode.children.length > 0;
-  if (nodePatches.length === 0 && !hasChildrenToCompare) {
-    return currentChildIndex;
-  }
-  const nextChildIndex = navigateToChild(patches, currentChildIndex, index);
-  if (nodePatches.length > 0) {
-    patches.push(...nodePatches);
-  }
-  if (hasChildrenToCompare) {
-    diffChildren(oldNode.children, newNode.children, patches);
+
+const getBaseContentRight = state => {
+  if (state.inputValue && state.contentRight.startsWith(state.inputValue)) {
+    return state.contentRight.slice(state.inputValue.length);
   }
-  return nextChildIndex;
+  return state.contentRight;
 };
-const diffRootNode = (oldNode, newNode, patches) => {
-  const nodePatches = compareNodes(oldNode.node, newNode.node);
-  if (nodePatches === null) {
-    replaceTree(newNode, patches);
-    return;
+const deleteRight = async state => {
+  // If there is an active input buffer, let applyEditInput handle changes via HandleInput
+  if (state.inputValue) {
+    return state;
   }
-  if (nodePatches.length > 0) {
-    patches.push(...nodePatches);
+  const baseContent = getBaseContentRight(state);
+  const cursorRow = Math.max(0, Math.min(state.rightEditor.cursorRowIndex, getLineCount(baseContent) - 1));
+  const lines = baseContent.split('\n');
+  const currentLine = lines[cursorRow] ?? '';
+  const cursorCol = Math.max(0, Math.min(state.rightEditor.cursorColumnIndex, currentLine.length));
+
+  // compute absolute index
+  let index = 0;
+  for (let i = 0; i < cursorRow; i++) {
+    index += (lines[i] ?? '').length + 1;
   }
-  if (oldNode.children.length > 0 || newNode.children.length > 0) {
-    diffChildren(oldNode.children, newNode.children, patches);
+  index += cursorCol;
+  if (index >= baseContent.length) {
+    return state;
   }
+  const contentRight = baseContent.slice(0, index) + baseContent.slice(index + 1);
+  const {
+    totalLineCountLeft
+  } = state;
+  const totalLineCountRight = getLineCount(contentRight);
+  const canComputeInlineDiff = state.renderModeLeft === 'text' && !state.errorLeftMessage;
+  const {
+    inlineChanges,
+    totalLineCount
+  } = canComputeInlineDiff ? await getInlineDiffState(state.contentLeft, contentRight) : {
+    inlineChanges: [],
+    totalLineCount: Math.max(totalLineCountLeft, totalLineCountRight)
+  };
+  const scrollState = getScrollState(state.height, state.itemHeight, totalLineCount, state.minimumSliderSize, state.deltaY);
+  const nextState = {
+    ...state,
+    contentRight,
+    gutterWidthVariable: getGutterWidthVariable(Math.max(totalLineCountLeft, totalLineCountRight)),
+    inlineChanges,
+    inputSource: User,
+    inputValue: '',
+    scrollBarBackgroundImage: getScrollBarBackgroundImage(inlineChanges, totalLineCount),
+    tokenizedLinesRight: [],
+    totalLineCount,
+    totalLineCountLeft,
+    totalLineCountRight,
+    ...scrollState
+  };
+  return {
+    ...nextState,
+    ...getVisibleLinesState({
+      contentLeft: nextState.contentLeft,
+      contentRight: nextState.contentRight,
+      inlineChanges: nextState.inlineChanges,
+      maxLineY: nextState.maxLineY,
+      minLineY: nextState.minLineY,
+      tokenizedLinesLeft: nextState.tokenizedLinesLeft,
+      tokenizedLinesRight: nextState.tokenizedLinesRight,
+      totalLineCountLeft: nextState.totalLineCountLeft,
+      totalLineCountRight: nextState.totalLineCountRight
+    })
+  };
 };
-const diffChildren = (oldChildren, newChildren, patches) => {
-  const maxLength = Math.max(oldChildren.length, newChildren.length);
-  let currentChildIndex = -1;
-  const indicesToRemove = [];
-  for (let i = 0; i < maxLength; i++) {
-    const oldNode = oldChildren[i];
-    const newNode = newChildren[i];
-    if (!oldNode && !newNode) {
-      continue;
-    }
-    if (!oldNode) {
-      currentChildIndex = navigateToParent(patches, currentChildIndex);
-      addTree(newNode, patches);
-      continue;
-    }
-    if (!newNode) {
-      indicesToRemove.push(i);
-      continue;
-    }
-    currentChildIndex = diffExistingChild(oldNode, newNode, patches, currentChildIndex, i);
-  }
-  navigateToParent(patches, currentChildIndex);
-  for (let j = indicesToRemove.length - 1; j >= 0; j--) {
-    patches.push({
-      type: RemoveChild,
-      index: indicesToRemove[j]
-    });
-  }
+
+const isEqual$3 = (oldState, newState) => {
+  return oldState.deltaY === newState.deltaY && oldState.diffMode === newState.diffMode && oldState.finalDeltaY === newState.finalDeltaY && oldState.gutterWidthVariable === newState.gutterWidthVariable && oldState.height === newState.height && oldState.itemHeight === newState.itemHeight && oldState.layout === newState.layout && oldState.leftWidth === newState.leftWidth && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.rightEditor.cursorColumnIndex === newState.rightEditor.cursorColumnIndex && oldState.rightEditor.cursorRowIndex === newState.rightEditor.cursorRowIndex && oldState.rightWidth === newState.rightWidth && oldState.scrollBarBackgroundImage === newState.scrollBarBackgroundImage && oldState.scrollBarHeight === newState.scrollBarHeight && oldState.totalLineCount === newState.totalLineCount;
 };
-const diffTrees = (oldTree, newTree, patches, path) => {
-  if (path.length === 0 && oldTree.length === 1 && newTree.length === 1) {
-    diffRootNode(oldTree[0], newTree[0], patches);
-    return;
-  }
-  diffChildren(oldTree, newTree, patches);
+
+const isEqual$2 = (oldState, newState) => {
+  return oldState.focus === newState.focus && oldState.focusVersion === newState.focusVersion;
 };
 
-const removeTrailingNavigationPatches = patches => {
-  // Find the last non-navigation patch
-  let lastNonNavigationIndex = -1;
-  for (let i = patches.length - 1; i >= 0; i--) {
-    const patch = patches[i];
-    if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
-      lastNonNavigationIndex = i;
-      break;
+const isEqual$1 = (oldState, newState) => {
+  return oldState.contentLeft === newState.contentLeft && oldState.contentRight === newState.contentRight && oldState.deltaY === newState.deltaY && oldState.diffMode === newState.diffMode && oldState.lineNumbers === newState.lineNumbers && oldState.layout === newState.layout && oldState.maxLineY === newState.maxLineY && oldState.minLineY === newState.minLineY && oldState.searchVisible === newState.searchVisible && oldState.showWhitespace === newState.showWhitespace;
+};
+
+const RenderItems = 4;
+const RenderFocus = 6;
+const RenderFocusContext = 7;
+const RenderValue = 8;
+const RenderCss = 10;
+const RenderIncremental = 11;
+
+const isEqual = (oldState, newState) => {
+  return newState.inputSource === User$1 || oldState.inputValue === newState.inputValue;
+};
+
+const modules = [isEqual$1, isEqual, isEqual$3, isEqual$2, isEqual$2];
+const numbers = [RenderIncremental, RenderValue, RenderCss, RenderFocus, RenderFocusContext];
+
+const diff = (oldState, newState) => {
+  const diffResult = [];
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
     }
   }
-  // Return patches up to and including the last non-navigation patch
-  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+  return diffResult;
 };
 
-const diffTree = (oldNodes, newNodes) => {
-  // Step 1: Convert flat arrays to tree structures
-  const oldTree = arrayToTree(oldNodes);
-  const newTree = arrayToTree(newNodes);
-  // Step 3: Compare the trees
-  const patches = [];
-  diffTrees(oldTree, newTree, patches, []);
-  // Remove trailing navigation patches since they serve no purpose
-  return removeTrailingNavigationPatches(patches);
+const diff2 = uid => {
+  const {
+    newState,
+    oldState
+  } = get(uid);
+  const result = diff(oldState, newState);
+  return result;
 };
 
 const FocusDiffEditorText = 812_221;
@@ -4905,13 +4905,13 @@ const getEmptyLineNumberDom = (emptyLineCount, itemHeight) => {
 
 const getLineNumberClassName = (type = VisibleLineType.Normal) => {
   if (type === VisibleLineType.Removed || type === InlineDiffRowType.Deletion) {
-    return `${DiffEditorLineNumber} ${DiffEditorLineNumberDeletion}`;
+    return mergeClassNames(DiffEditorLineNumber, DiffEditorLineNumberDeletion);
   }
   if (type === VisibleLineType.Added || type === InlineDiffRowType.Insertion) {
-    return `${DiffEditorLineNumber} ${DiffEditorLineNumberInsertion}`;
+    return mergeClassNames(DiffEditorLineNumber, DiffEditorLineNumberInsertion);
   }
   if (type === InlineDiffRowType.GitButtons || type === InlineDiffRowType.IncomingChange) {
-    return `${DiffEditorLineNumber} ${DiffEditorLineNumberMeta}`;
+    return mergeClassNames(DiffEditorLineNumber, DiffEditorLineNumberMeta);
   }
   return DiffEditorLineNumber;
 };
@@ -4976,6 +4976,10 @@ const getContentDomWithoutLineNumbers = (contentClassName, rowsChildCount, rows)
   }, ...rows];
 };
 
+const errorCodeFrameLineNode = {
+  childCount: 1,
+  type: Div
+};
 const getErrorCodeFrameDom = codeFrame => {
   if (!codeFrame) {
     return [];
@@ -4985,10 +4989,7 @@ const getErrorCodeFrameDom = codeFrame => {
     childCount: lines.length,
     className: DiffEditorErrorCodeFrame,
     type: Div
-  }, ...lines.flatMap(line => [{
-    childCount: 1,
-    type: Div
-  }, text(line)])];
+  }, ...lines.flatMap(line => [errorCodeFrameLineNode, text(line)])];
 };
 
 const getStackLineHref = (location, allowedLinkSchemes) => {
@@ -5102,13 +5103,14 @@ const getStackLinePrefix = stackLine => {
   return stackLine.slice(0, stackLine.length - match.text.length).replace(trailingOpenParenthesisRegex, '');
 };
 
+const errorStackLineNode = {
+  childCount: 1,
+  type: Div
+};
 const getErrorStackLineDom = (stackLine, allowedLinkSchemes) => {
   const location = getStackLineLocation(stackLine);
   if (!location) {
-    return [{
-      childCount: 1,
-      type: Div
-    }, text(stackLine)];
+    return [errorStackLineNode, text(stackLine)];
   }
   const prefix = getStackLinePrefix(stackLine);
   const href = getStackLineHref(location, allowedLinkSchemes);
@@ -5138,17 +5140,18 @@ const getErrorStackDom = (errorStack, allowedLinkSchemes = defaultAllowedLinkSch
   }, ...stackLines.flatMap(stackLine => getErrorStackLineDom(stackLine, allowedLinkSchemes))];
 };
 
+const diffEditorErrorMessageNode = {
+  childCount: 1,
+  className: DiffEditorErrorMessage,
+  type: Div
+};
 const getErrorDom = (contentClassName, errorMessage, errorCodeFrame, errorStack, allowedLinkSchemes = defaultAllowedLinkSchemes) => {
   const childCount = 1 + Number(Boolean(errorCodeFrame)) + Number(Boolean(errorStack));
   return [{
     childCount,
     className: mergeClassNames(DiffEditorContent, contentClassName, DiffEditorError),
     type: Div
-  }, {
-    childCount: 1,
-    className: DiffEditorErrorMessage,
-    type: Div
-  }, text(errorMessage), ...getErrorCodeFrameDom(errorCodeFrame), ...getErrorStackDom(errorStack, allowedLinkSchemes)];
+  }, diffEditorErrorMessageNode, text(errorMessage), ...getErrorCodeFrameDom(errorCodeFrame), ...getErrorStackDom(errorStack, allowedLinkSchemes)];
 };
 
 const getRowClassName = type => {
@@ -5175,7 +5178,7 @@ const getTokenDom = token => {
 const getLineDom = line => {
   const children = line.tokens.length === 0 ? [text('')] : line.tokens.flatMap(getTokenDom);
   const childCount = line.tokens.length === 0 ? 1 : line.tokens.length;
-  const className = line.lineNumber === -1 ? `${EditorRow} ${DiffEditorLineMissing}` : getRowClassName(line.type);
+  const className = line.lineNumber === -1 ? mergeClassNames(EditorRow, DiffEditorLineMissing) : getRowClassName(line.type);
   return [{
     childCount,
     className,
@@ -5224,12 +5227,13 @@ const getContentLeftDom = ({
   }, ...rest];
 };
 
+const diffEditorSelectionsNode = {
+  childCount: 1,
+  className: DiffEditorSelections,
+  type: Div
+};
 const getCursorDom = () => {
-  return [{
-    childCount: 1,
-    className: DiffEditorSelections,
-    type: Div
-  }, {
+  return [diffEditorSelectionsNode, {
     childCount: 0,
     className: mergeClassNames(EditorCursor, EditorCursorRight),
     type: Div
@@ -5238,11 +5242,12 @@ const getCursorDom = () => {
 
 const DiffEditorInput = 'DiffEditorInput';
 
-const getInputWrapperDom = (inputValue, caretPosition = inputValue.length) => [{
+const diffEditorInputWrapperNode = {
   childCount: 1,
   className: DiffEditorInputWrapper,
   type: Div
-}, {
+};
+const getInputWrapperDom = (inputValue, caretPosition = inputValue.length) => [diffEditorInputWrapperNode, {
   childCount: 0,
   className: DiffEditorInput$1,
   name: DiffEditorInput,
@@ -5313,7 +5318,7 @@ const getLabel = showWhitespace$1 => {
 };
 const getWhitespaceToggleDom = showWhitespace => {
   const label = getLabel(showWhitespace);
-  const className = showWhitespace ? `${DiffEditorWhitespaceToggle} ${DiffEditorWhitespaceToggleActive}` : DiffEditorWhitespaceToggle;
+  const className = showWhitespace ? mergeClassNames(DiffEditorWhitespaceToggle, DiffEditorWhitespaceToggleActive) : DiffEditorWhitespaceToggle;
   return [{
     childCount: 1,
     className,
@@ -5324,14 +5329,20 @@ const getWhitespaceToggleDom = showWhitespace => {
   }, text(label)];
 };
 
+const diffEditorButtonsNode = {
+  childCount: 2,
+  className: DiffEditorButtons,
+  type: Div
+};
 const getDiffEditorButtonsDom = (diffMode, showWhitespace) => {
-  return [{
-    childCount: 2,
-    className: DiffEditorButtons,
-    type: Div
-  }, ...getWhitespaceToggleDom(showWhitespace), ...getDiffModeToggleDom(diffMode)];
+  return [diffEditorButtonsNode, ...getWhitespaceToggleDom(showWhitespace), ...getDiffModeToggleDom(diffMode)];
 };
 
+const diffSearchHeaderNode = {
+  childCount: 1,
+  className: DiffSearchHeader,
+  type: Div
+};
 const countOccurrences = (text, query) => {
   if (!query) return 0;
   let count = 0;
@@ -5350,11 +5361,7 @@ const getDiffSearchHeaderDom = (contentLeft, contentRight, query) => {
   const rightCount = countOccurrences(contentRight || '', q);
   const total = leftCount + rightCount;
   const widgetClass = total === 0 && query ? 'DiffSearchWidget DiffSearchWidgetNoResults' : 'DiffSearchWidget';
-  return [{
-    childCount: 1,
-    className: DiffSearchHeader,
-    type: Div
-  }, {
+  return [diffSearchHeaderNode, {
     childCount: 2,
     className: widgetClass,
     type: Div
@@ -5373,17 +5380,18 @@ const getDiffSearchHeaderDom = (contentLeft, contentRight, query) => {
   }];
 };
 
+const imageContentNode$1 = {
+  childCount: 1,
+  className: ImageContent,
+  type: Div
+};
 const getImageLeftDom = (uriLeft, imageSrc) => {
   return [{
     childCount: 1,
     className: mergeClassNames(DiffEditorContent, DiffEditorContentLeft),
     onClick: HandleClickLeftSide,
     type: Div
-  }, {
-    childCount: 1,
-    className: ImageContent,
-    type: Div
-  }, {
+  }, imageContentNode$1, {
     alt: uriLeft,
     childCount: 0,
     className: ImageElement,
@@ -5392,17 +5400,18 @@ const getImageLeftDom = (uriLeft, imageSrc) => {
   }];
 };
 
+const imageContentNode = {
+  childCount: 1,
+  className: ImageContent,
+  type: Div
+};
 const getImageRightDom = (uriRight, imageSrc) => {
   return [{
     childCount: 1,
     className: mergeClassNames(DiffEditorContent, DiffEditorContentRight),
     onClick: HandleClickRightSide,
     type: Div
-  }, {
-    childCount: 1,
-    className: ImageContent,
-    type: Div
-  }, {
+  }, imageContentNode, {
     alt: uriRight,
     childCount: 0,
     className: ImageElement,
@@ -5466,18 +5475,20 @@ const getInlineDiffRowDom = (row, tokenizedLine) => {
   }, text(prefix), ...tokens.flatMap(getTokenDom)];
 };
 
+const diffScrollBarNode = {
+  childCount: 1,
+  className: DiffScrollBar,
+  type: Div
+};
+const diffScrollBarThumbNode = {
+  childCount: 0,
+  className: DiffScrollBarThumb,
+  name: 'scrollBarThumb',
+  onPointerDown: HandleScrollBarPointerDown,
+  type: Div
+};
 const getScrollBarDom = () => {
-  return [{
-    childCount: 1,
-    className: DiffScrollBar,
-    type: Div
-  }, {
-    childCount: 0,
-    className: DiffScrollBarThumb,
-    name: 'scrollBarThumb',
-    onPointerDown: HandleScrollBarPointerDown,
-    type: Div
-  }];
+  return [diffScrollBarNode, diffScrollBarThumbNode];
 };
 
 const getInlineDiffEditorVirtualDom = (contentLeft, contentRight, lineNumbers, minLineY, maxLineY, searchVisible, searchQuery, showWhitespace, tokenizedLinesLeft, tokenizedLinesRight) => {
@@ -5534,10 +5545,10 @@ const getEditorBodyDom = diffEditorLayoutClass => {
   };
 };
 const getDiffEditorWithSearchDom = (diffEditorLayoutClass, sashLayoutClass, leftDom, rightDom, buttonsDom, scrollBarDom, scrollBarActive, contentLeft, contentRight, searchQuery) => {
-  return [getRootDom(scrollBarActive ? 4 : 3, `${Viewlet} ${DiffEditor} ${diffEditorLayoutClass} ${DiffEditorWithSearch}`), ...getDiffSearchHeaderDom(contentLeft, contentRight, searchQuery), getEditorBodyDom(diffEditorLayoutClass), ...leftDom, getSashDom(sashLayoutClass), ...rightDom, ...buttonsDom, ...scrollBarDom];
+  return [getRootDom(scrollBarActive ? 4 : 3, mergeClassNames(Viewlet, DiffEditor, diffEditorLayoutClass, DiffEditorWithSearch)), ...getDiffSearchHeaderDom(contentLeft, contentRight, searchQuery), getEditorBodyDom(diffEditorLayoutClass), ...leftDom, getSashDom(sashLayoutClass), ...rightDom, ...buttonsDom, ...scrollBarDom];
 };
 const getDiffEditorWithoutSearchDom = (diffEditorLayoutClass, sashLayoutClass, leftDom, rightDom, buttonsDom, scrollBarDom, scrollBarActive) => {
-  return [getRootDom(scrollBarActive ? 5 : 4, `${Viewlet} ${DiffEditor} ${diffEditorLayoutClass}`), ...leftDom, getSashDom(sashLayoutClass), ...rightDom, ...buttonsDom, ...scrollBarDom];
+  return [getRootDom(scrollBarActive ? 5 : 4, mergeClassNames(Viewlet, DiffEditor, diffEditorLayoutClass)), ...leftDom, getSashDom(sashLayoutClass), ...rightDom, ...buttonsDom, ...scrollBarDom];
 };
 const getDiffEditorVirtualDom = state => {
   const {