@lvce-editor/static-server 0.80.4 → 0.80.6

package/static/{6ec4aee → 3af54c5}/packages/diff-view/dist/diffViewWorkerMain.js

@@ -1070,7 +1070,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$8 = (id, rpc) => {
+const set$9 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1103,7 +1103,7 @@ const create$1 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$8(rpcId, mockRpc);
+      set$9(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1112,16 +1112,25 @@ const create$1 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$8(rpcId, rpc);
+      set$9(rpcId, rpc);
     }
   };
 };
 
 const Div = 4;
+const Span = 8;
 const Text = 12;
-const Img = 17;
+const A = 53;
 const Reference = 100;
 
+const Button = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+const DeltaMode = 'event.deltaMode';
+const DeltaY = 'event.deltaY';
+const TargetName = 'event.target.name';
+const TargetValue = 'event.target.value';
+
 const User = 1;
 
 const ErrorWorker = 3308;
@@ -1129,6 +1138,7 @@ const ExtensionHostWorker = 44;
 const ExtensionManagementWorker = 9006;
 const FileSystemWorker = 209;
 const IconThemeWorker = 7009;
+const MarkdownWorker = 300;
 const RendererWorker = 1;
 
 const SetCss = 'Viewlet.setCss';
@@ -1137,34 +1147,38 @@ const SetFocusContext = 'Viewlet.setFocusContext';
 const SetValueByName = 'Viewlet.setValueByName';
 
 const {
-  invoke: invoke$2,
-  set: set$7
+  invoke: invoke$4,
+  set: set$8
 } = create$1(218_933);
 
 const {
-  set: set$6
+  set: set$7
 } = create$1(ErrorWorker);
 
 const {
-  invoke: invoke$1,
-  set: set$5
+  invoke: invoke$3,
+  set: set$6
 } = create$1(ExtensionHostWorker);
 
 const {
-  set: set$4
+  invoke: invoke$2,
+  set: set$5
 } = create$1(ExtensionManagementWorker);
 
 const {
-  invoke,
-  set: set$3
+  invoke: invoke$1,
+  set: set$4
 } = create$1(FileSystemWorker);
 const readFile$1 = async uri => {
-  return invoke('FileSystem.readFile', uri);
+  return invoke$1('FileSystem.readFile', uri);
+};
+const readFileAsBlob = async uri => {
+  return invoke$1('FileSystem.readFileAsBlob', uri);
 };
 
 const {
   invokeAndTransfer,
-  set: set$2
+  set: set$3
 } = create$1(RendererWorker);
 const sendMessagePortToErrorWorker = async (port, rpcId) => {
   const command = 'Errors.handleMessagePort';
@@ -1186,15 +1200,26 @@ const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   const command = 'Extensions.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
 };
+const sendMessagePortToSyntaxHighlightingWorker = async port => {
+  await invokeAndTransfer('SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort2');
+};
 const sendMessagePortToDiffWorker = async (port, rpcId = 0) => {
   const command = 'Diff.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDiffWorker', port, command, rpcId);
 };
 
 const {
-  set: set$1
+  set: set$2
 } = create$1(IconThemeWorker);
 
+const {
+  invoke,
+  set: set$1
+} = create$1(MarkdownWorker);
+const loadTokenizer$1 = (languageId, tokenizerPath) => {
+  return invoke('Tokenizer.load', languageId, tokenizerPath);
+};
+
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
   return key.slice(dotIndex + 1);
@@ -1332,6 +1357,8 @@ const createDefaultState = () => ({
   headerHeight: 40,
   height: 100,
   id: 1,
+  imageSrcLeft: '',
+  imageSrcRight: '',
   initial: false,
   inlineChanges: [],
   inputSource: 0,
@@ -1341,6 +1368,8 @@ const createDefaultState = () => ({
   isVisible: true,
   itemHeight: 20,
   knownImageExtensions: ['.png', '.jpg', '.jpeg', '.gif', '.webp', '.avif', '.svg', '.bmp', '.ico'],
+  languageIdLeft: 'unknown',
+  languageIdRight: 'unknown',
   layout: 'horizontal',
   leftWidth: 48,
   lineNumbers: true,
@@ -1360,6 +1389,8 @@ const createDefaultState = () => ({
   scrollBarDragOffsetY: 0,
   scrollBarHeight: 0,
   splitButtonEnabled: false,
+  tokenizedLinesLeft: [],
+  tokenizedLinesRight: [],
   totalLineCount: 1,
   totalLineCountLeft: 1,
   totalLineCountRight: 1,
@@ -1367,6 +1398,8 @@ const createDefaultState = () => ({
   uriLeft: '',
   uriRight: '',
   viewMode: 1,
+  visibleLinesLeft: [],
+  visibleLinesRight: [],
   width: 100,
   workspacePath: '',
   x: 0,
@@ -1375,6 +1408,7 @@ const createDefaultState = () => ({
 
 const {
   get,
+  getCommandIds,
   registerCommands,
   set,
   wrapCommand} = create();
@@ -1498,6 +1532,10 @@ const diff2 = uid => {
   return result;
 };
 
+const handleContextMenu = (state, button, clientX, clientY) => {
+  return state;
+};
+
 const handleSashPointerDown = (state, clientX, clientY) => {
   const isVertical = state.layout === 'vertical';
   return {
@@ -1631,15 +1669,156 @@ const getScrollState = (height, itemHeight, totalLineCount, minimumSliderSize, d
   };
 };
 
+const None = 0;
+const Insertion = 1;
+const Deletion = 2;
+
+const getVisibleInlineDiffRows = inlineChanges => {
+  const visibleRows = [];
+  for (let index = 0; index < inlineChanges.length; index++) {
+    const inlineChange = inlineChanges[index];
+    const nextInlineChange = inlineChanges[index + 1];
+    if (inlineChange.type === Deletion && nextInlineChange?.type === Insertion) {
+      visibleRows.push({
+        leftChange: inlineChange,
+        rightChange: nextInlineChange
+      });
+      index++;
+      continue;
+    }
+    if (inlineChange.type === Deletion) {
+      visibleRows.push({
+        leftChange: inlineChange
+      });
+      continue;
+    }
+    if (inlineChange.type === Insertion) {
+      visibleRows.push({
+        rightChange: inlineChange
+      });
+      continue;
+    }
+    visibleRows.push({
+      leftChange: inlineChange,
+      rightChange: inlineChange
+    });
+  }
+  return visibleRows;
+};
+
+const getVisibleRows = (content, totalLineCount, minLineY, maxLineY) => {
+  const lines = content ? content.split('\n') : [''];
+  const visibleCount = Math.max(maxLineY - minLineY, 0);
+  const visibleLines = lines.slice(minLineY, maxLineY);
+  if (visibleLines.length === visibleCount) {
+    return visibleLines;
+  }
+  const paddedLines = [...visibleLines];
+  while (paddedLines.length < visibleCount && paddedLines.length < totalLineCount) {
+    paddedLines.push('');
+  }
+  return paddedLines;
+};
+
+const VisibleLineType = {
+  Added: 3,
+  Normal: 1,
+  Removed: 2
+};
+
+const getLine = (lines, index) => {
+  if (index < 0 || index >= lines.length) {
+    return '';
+  }
+  return lines[index];
+};
+
+const getTokens = (tokenizedLines, index, text) => {
+  const tokenizedLine = tokenizedLines[index];
+  if (!tokenizedLine || tokenizedLine.length === 0) {
+    return text ? [{
+      text,
+      type: ''
+    }] : [];
+  }
+  const tokens = [];
+  for (let i = 0; i < tokenizedLine.length; i += 2) {
+    tokens.push({
+      text: tokenizedLine[i] || '',
+      type: tokenizedLine[i + 1] || ''
+    });
+  }
+  return tokens;
+};
+
+const getVisibleLineType = (inlineChange, side) => {
+  switch (inlineChange.type) {
+    case Deletion:
+      return side === 'left' ? VisibleLineType.Removed : VisibleLineType.Normal;
+    case Insertion:
+      return side === 'right' ? VisibleLineType.Added : VisibleLineType.Normal;
+    case None:
+      return VisibleLineType.Normal;
+    default:
+      return VisibleLineType.Normal;
+  }
+};
+
+const getVisibleLines = (content, totalLineCount, inlineChanges, minLineY, maxLineY, side, tokenizedLines = []) => {
+  if (inlineChanges.length === 0) {
+    return getVisibleRows(content, totalLineCount, minLineY, maxLineY).map((line, index) => ({
+      lineNumber: minLineY + index + 1,
+      tokens: getTokens(tokenizedLines, minLineY + index, line),
+      type: VisibleLineType.Normal
+    }));
+  }
+  const lines = content ? content.split('\n') : [''];
+  return getVisibleInlineDiffRows(inlineChanges).slice(minLineY, maxLineY).map((visibleRow, index) => {
+    const lineNumber = minLineY + index + 1;
+    const inlineChange = side === 'left' ? visibleRow.leftChange : visibleRow.rightChange;
+    const type = inlineChange ? getVisibleLineType(inlineChange, side) : VisibleLineType.Normal;
+    const lineIndex = inlineChange ? side === 'left' ? inlineChange.leftIndex : inlineChange.rightIndex : -1;
+    const tokens = inlineChange && lineIndex >= 0 ? getTokens(tokenizedLines, lineIndex, getLine(lines, lineIndex)) : [];
+    return {
+      lineNumber,
+      tokens,
+      type
+    };
+  });
+};
+
+const getVisibleLinesState = state => {
+  const {
+    contentLeft,
+    contentRight,
+    inlineChanges,
+    maxLineY,
+    minLineY,
+    tokenizedLinesLeft,
+    tokenizedLinesRight,
+    totalLineCountLeft,
+    totalLineCountRight
+  } = state;
+  return {
+    visibleLinesLeft: getVisibleLines(contentLeft, totalLineCountLeft, inlineChanges, minLineY, maxLineY, 'left', tokenizedLinesLeft),
+    visibleLinesRight: getVisibleLines(contentRight, totalLineCountRight, inlineChanges, minLineY, maxLineY, 'right', tokenizedLinesRight)
+  };
+};
+
 const handleScrollBarPointerMove = (state, clientY) => {
   if (!state.isScrollBarDragging) {
     return state;
   }
   const thumbTop = clientY - state.y - state.scrollBarDragOffsetY;
   const deltaY = getDeltaYFromScrollBarThumbTop(state.height, state.scrollBarHeight, thumbTop, state.finalDeltaY);
+  const scrollState = getScrollState(state.height, state.itemHeight, state.totalLineCount, state.minimumSliderSize, deltaY);
   return {
     ...state,
-    ...getScrollState(state.height, state.itemHeight, state.totalLineCount, state.minimumSliderSize, deltaY)
+    ...scrollState,
+    ...getVisibleLinesState({
+      ...state,
+      ...scrollState
+    })
   };
 };
 
@@ -1664,9 +1843,14 @@ const getWheelDeltaY = (deltaMode, deltaY, itemHeight, height) => {
 };
 const handleWheel = (state, deltaMode, deltaY) => {
   const nextDeltaY = state.deltaY + getWheelDeltaY(deltaMode, deltaY, state.itemHeight, state.height);
+  const scrollState = getScrollState(state.height, state.itemHeight, state.totalLineCount, state.minimumSliderSize, nextDeltaY);
   return {
     ...state,
-    ...getScrollState(state.height, state.itemHeight, state.totalLineCount, state.minimumSliderSize, nextDeltaY)
+    ...scrollState,
+    ...getVisibleLinesState({
+      ...state,
+      ...scrollState
+    })
   };
 };
 
@@ -1680,7 +1864,7 @@ const createExtensionHostRpc = async () => {
       commandMap: {},
       send: sendMessagePortToExtensionHostWorker
     });
-    set$5(rpc);
+    set$6(rpc);
   } catch (error) {
     throw new VError(error, `Failed to create extension host rpc`);
   }
@@ -1696,7 +1880,7 @@ const createTextMeasurementWorkerRpc = async () => {
       commandMap: {},
       send: sendMessagePortToTextMeasurementWorker
     });
-    set$1(rpc);
+    set$2(rpc);
   } catch (error) {
     throw new VError(error, `Failed to create text measurement rpc`);
   }
@@ -1709,7 +1893,7 @@ const initializeDiffWorker = async () => {
       return sendMessagePortToDiffWorker(port, 0);
     }
   });
-  set$7(rpc);
+  set$8(rpc);
 };
 
 const initializeErrorWorker = async () => {
@@ -1719,7 +1903,7 @@ const initializeErrorWorker = async () => {
       return sendMessagePortToErrorWorker(port, 0);
     }
   });
-  set$6(rpc);
+  set$7(rpc);
 };
 
 const createExtensionManagementWorkerRpc = async () => {
@@ -1737,7 +1921,7 @@ const createExtensionManagementWorkerRpc = async () => {
 const initializeExtensionManagementWorker = async () => {
   try {
     const rpc = await createExtensionManagementWorkerRpc();
-    set$4(rpc);
+    set$5(rpc);
   } catch {
     // ignore
   }
@@ -1750,25 +1934,21 @@ const initializeFileSystemWorker = async () => {
       return sendMessagePortToFileSystemWorker(port, 0);
     }
   });
-  set$3(rpc);
-};
-
-const initialize = async () => {
-  await Promise.all([createExtensionHostRpc(), createTextMeasurementWorkerRpc(), initializeDiffWorker(), initializeExtensionManagementWorker(), initializeFileSystemWorker(), initializeErrorWorker()]);
+  set$4(rpc);
 };
 
-const getInlineDiffChanges = (linesLeft, linesRight) => {
-  return invoke$2('Diff.diffInline', linesLeft, linesRight);
+const initializeSyntaxHighlightingWorker = async () => {
+  const rpc = await create$3({
+    commandMap: {},
+    send(port) {
+      return sendMessagePortToSyntaxHighlightingWorker(port);
+    }
+  });
+  set$1(rpc);
 };
 
-const getInlineDiffState = async (contentLeft, contentRight) => {
-  const linesLeft = contentLeft ? contentLeft.split('\n') : [''];
-  const linesRight = contentRight ? contentRight.split('\n') : [''];
-  const inlineChanges = await getInlineDiffChanges(linesLeft, linesRight);
-  return {
-    inlineChanges,
-    totalLineCount: Math.max(inlineChanges.length, 1)
-  };
+const initialize = async () => {
+  await Promise.all([createExtensionHostRpc(), createTextMeasurementWorkerRpc(), initializeDiffWorker(), initializeExtensionManagementWorker(), initializeFileSystemWorker(), initializeErrorWorker(), initializeSyntaxHighlightingWorker()]);
 };
 
 const inlineDiffPrefix = 'inline-diff://';
@@ -1794,13 +1974,6 @@ const getInlineDiffUris = uri => {
   }
 };
 
-const getLineCount = content => {
-  if (!content) {
-    return 1;
-  }
-  return content.split('\n').length;
-};
-
 const getMinLineY = savedState => {
   if (!savedState || typeof savedState !== 'object') {
     return 0;
@@ -1814,6 +1987,20 @@ const getMinLineY = savedState => {
   return 0;
 };
 
+const getErrorMessage = error => {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  return String(error);
+};
+
+const getErrorStack = error => {
+  if (error instanceof Error && error.stack) {
+    return error.stack;
+  }
+  return '';
+};
+
 const getPath = (protocol, uri) => {
   if (!uri) {
     return '';
@@ -1836,6 +2023,89 @@ const getProtocol = uri => {
   return 'file';
 };
 
+const windowsDriveLetterRegex = /^[a-zA-Z]:\\/;
+const encodeFilePath = path => {
+  return encodeURI(path).replaceAll('#', '%23').replaceAll('?', '%3F');
+};
+const toFileUri = path => {
+  if (path.startsWith('file://')) {
+    return path;
+  }
+  if (windowsDriveLetterRegex.test(path)) {
+    const normalizedPath = path.replaceAll('\\', '/');
+    return `file:///${encodeFilePath(normalizedPath)}`;
+  }
+  return `file://${encodeFilePath(path)}`;
+};
+
+const readFile = async uri => {
+  if (!uri || uri.startsWith('untitled://')) {
+    return '';
+  }
+  const protocol = getProtocol(uri);
+  if (protocol === 'data') {
+    return uri.slice('data://'.length);
+  }
+  if (protocol === 'file') {
+    return readFile$1(toFileUri(uri));
+  }
+  const path = getPath(protocol, uri);
+  if (protocol === 'memfs') {
+    return invoke$3('FileSystemMemory.readFile', path);
+  }
+  return invoke$3('ExtensionHostFileSystem.readFile', protocol, path);
+};
+
+const loadFileContent = async uri => {
+  try {
+    const content = await readFile(uri);
+    return {
+      content,
+      errorMessage: '',
+      errorStack: ''
+    };
+  } catch (error) {
+    return {
+      content: '',
+      errorMessage: getErrorMessage(error),
+      errorStack: getErrorStack(error)
+    };
+  }
+};
+
+const loadFileContents = async (uriLeft, uriRight) => {
+  const [leftResult, rightResult] = await Promise.all([loadFileContent(uriLeft), loadFileContent(uriRight)]);
+  return {
+    contentLeft: leftResult.content,
+    contentRight: rightResult.content,
+    errorLeftMessage: leftResult.errorMessage,
+    errorLeftStack: leftResult.errorStack,
+    errorRightMessage: rightResult.errorMessage,
+    errorRightStack: rightResult.errorStack
+  };
+};
+
+const getInlineDiffChanges = (linesLeft, linesRight) => {
+  return invoke$4('Diff.diffInline', linesLeft, linesRight);
+};
+
+const getInlineDiffState = async (contentLeft, contentRight) => {
+  const linesLeft = contentLeft ? contentLeft.split('\n') : [''];
+  const linesRight = contentRight ? contentRight.split('\n') : [''];
+  const inlineChanges = await getInlineDiffChanges(linesLeft, linesRight);
+  return {
+    inlineChanges,
+    totalLineCount: Math.max(getVisibleInlineDiffRows(inlineChanges).length, 1)
+  };
+};
+
+const getLineCount = content => {
+  if (!content) {
+    return 1;
+  }
+  return content.split('\n').length;
+};
+
 const getFileExtension = uri => {
   const protocol = getProtocol(uri);
   const path = getPath(protocol, uri);
@@ -1963,94 +2233,158 @@ const getTotalLineCount = (diffMode, contentLeft, contentRight, errorLeftMessage
   return Math.max(renderModeLeft === 'image' ? 1 : getLineCount(getDisplayedContent(contentLeft, errorLeftMessage, errorLeftStack)), renderModeRight === 'image' ? 1 : getLineCount(getDisplayedContent(contentRight, errorRightMessage, errorRightStack)));
 };
 
-const windowsDriveLetterRegex = /^[a-zA-Z]:\\/;
-const encodeFilePath = path => {
-  return encodeURI(path).replaceAll('#', '%23').replaceAll('?', '%3F');
+const loadImageSrc = async uri => {
+  const protocol = getProtocol(uri);
+  const fileUri = protocol === 'file' ? toFileUri(uri) : uri;
+  const blob = await readFileAsBlob(fileUri);
+  return globalThis.URL.createObjectURL(blob);
 };
-const toFileUri = path => {
-  if (path.startsWith('file://')) {
-    return path;
+
+let cachedAssetDir = '';
+let cachedPlatform = -1;
+let cachedLanguages = [];
+const getLanguages = async (platform, assetDir) => {
+  if (cachedPlatform === platform && cachedAssetDir === assetDir) {
+    return cachedLanguages;
   }
-  if (windowsDriveLetterRegex.test(path)) {
-    const normalizedPath = path.replaceAll('\\', '/');
-    return `file:///${encodeFilePath(normalizedPath)}`;
+  try {
+    const languages = await invoke$2('Extensions.getLanguages', platform, assetDir);
+    if (!Array.isArray(languages)) {
+      return [];
+    }
+    cachedPlatform = platform;
+    cachedAssetDir = assetDir;
+    cachedLanguages = languages;
+    return cachedLanguages;
+  } catch {
+    return [];
   }
-  return `file://${encodeFilePath(path)}`;
 };
 
-const readFile = async uri => {
-  if (!uri || uri.startsWith('untitled://')) {
-    return '';
-  }
+const getFileName = uri => {
   const protocol = getProtocol(uri);
-  if (protocol === 'data') {
-    return uri.slice('data://'.length);
+  const path = getPath(protocol, uri).split(/[?#]/, 1)[0];
+  const lastSlashIndex = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\'));
+  if (lastSlashIndex === -1) {
+    return path;
   }
-  if (protocol === 'file') {
-    return readFile$1(toFileUri(uri));
+  return path.slice(lastSlashIndex + 1);
+};
+const getExtensionIndexes = fileName => {
+  const lastIndex = fileName.lastIndexOf('.');
+  if (lastIndex === -1) {
+    return [-1, -1];
   }
-  const path = getPath(protocol, uri);
-  if (protocol === 'memfs') {
-    return invoke$1('FileSystemMemory.readFile', path);
+  return [lastIndex, fileName.lastIndexOf('.', lastIndex - 1)];
+};
+const hasMatchingExtension = (language, extension) => {
+  if (!extension || !language.extensions) {
+    return false;
   }
-  return invoke$1('ExtensionHostFileSystem.readFile', protocol, path);
+  const extensionLower = extension.toLowerCase();
+  return language.extensions.some(value => value.toLowerCase() === extensionLower);
+};
+const hasMatchingFileName = (language, fileName) => {
+  if (!fileName || !language.fileNames) {
+    return false;
+  }
+  const fileNameLower = fileName.toLowerCase();
+  return language.fileNames.some(value => value.toLowerCase() === fileNameLower);
+};
+const getSyntaxLanguage = (uri, languages) => {
+  const fileName = getFileName(uri);
+  if (!fileName) {
+    return {
+      languageId: 'unknown',
+      tokenizerPath: ''
+    };
+  }
+  const [lastExtensionIndex, secondExtensionIndex] = getExtensionIndexes(fileName);
+  const extension = lastExtensionIndex === -1 ? '' : fileName.slice(lastExtensionIndex);
+  const secondExtension = secondExtensionIndex === -1 ? '' : fileName.slice(secondExtensionIndex);
+  for (const language of languages) {
+    if (hasMatchingExtension(language, extension) || hasMatchingExtension(language, secondExtension) || hasMatchingFileName(language, fileName)) {
+      return {
+        languageId: language.id,
+        tokenizerPath: language.tokenize || ''
+      };
+    }
+  }
+  return {
+    languageId: 'unknown',
+    tokenizerPath: ''
+  };
 };
 
-const getErrorMessage = error => {
-  if (error instanceof Error) {
-    return error.message;
+const getUniqueLanguages = (languageLeft, languageRight) => {
+  return [...new Map([languageLeft, languageRight].map(language => [`${language.languageId}:${language.tokenizerPath}`, language])).values()];
+};
+
+const canTokenize = language => {
+  return language.languageId !== 'unknown' && !!language.tokenizerPath;
+};
+
+const loadTokenizer = async language => {
+  if (!canTokenize(language)) {
+    return;
   }
-  return String(error);
+  await loadTokenizer$1(language.languageId, language.tokenizerPath);
 };
-const getErrorStack = error => {
-  if (error instanceof Error && error.stack) {
-    return error.stack;
+
+const tokenizeCodeBlock = async (content, language) => {
+  if (!canTokenize(language)) {
+    return [];
+  }
+  try {
+    const result = await invoke('Tokenizer.tokenizeCodeBlock', content, language.languageId, language.tokenizerPath);
+    if (!Array.isArray(result)) {
+      return [];
+    }
+    return result;
+  } catch {
+    return [];
   }
-  return '';
 };
-const loadFileContent = async uri => {
+
+const emptySyntaxHighlightingState = {
+  languageIdLeft: 'unknown',
+  languageIdRight: 'unknown',
+  tokenizedLinesLeft: [],
+  tokenizedLinesRight: []
+};
+const loadSyntaxHighlighting = async (contentLeft, contentRight, uriLeft, uriRight, platform, assetDir) => {
   try {
-    const content = await readFile(uri);
-    return {
-      content,
-      errorMessage: '',
-      errorStack: ''
-    };
-  } catch (error) {
+    const languages = await getLanguages(platform, assetDir);
+    const languageLeft = getSyntaxLanguage(uriLeft, languages);
+    const languageRight = getSyntaxLanguage(uriRight, languages);
+    const uniqueLanguages = getUniqueLanguages(languageLeft, languageRight);
+    await Promise.all(uniqueLanguages.map(loadTokenizer));
+    const [tokenizedLinesLeft, tokenizedLinesRight] = await Promise.all([tokenizeCodeBlock(contentLeft, languageLeft), tokenizeCodeBlock(contentRight, languageRight)]);
     return {
-      content: '',
-      errorMessage: getErrorMessage(error),
-      errorStack: getErrorStack(error)
+      languageIdLeft: languageLeft.languageId,
+      languageIdRight: languageRight.languageId,
+      tokenizedLinesLeft,
+      tokenizedLinesRight
     };
+  } catch {
+    return emptySyntaxHighlightingState;
   }
 };
-const loadFileContents = async (uriLeft, uriRight) => {
-  return Promise.all([loadFileContent(uriLeft), loadFileContent(uriRight)]);
-};
 
-const loadContent = async (state, savedState) => {
+const reloadContent = async (state, contentLeft, contentRight, errorLeftMessage, errorLeftStack, errorRightMessage, errorRightStack) => {
   const {
+    assetDir,
     height,
     itemHeight,
     knownImageExtensions,
     minimumSliderSize,
-    uri
-  } = state;
-  const [uriLeft, uriRight] = getInlineDiffUris(uri);
-  const [leftResult, rightResult] = await loadFileContents(uriLeft, uriRight);
-  const {
-    content: contentLeft,
-    errorMessage: errorLeftMessage,
-    errorStack: errorLeftStack
-  } = leftResult;
-  const {
-    content: contentRight,
-    errorMessage: errorRightMessage,
-    errorStack: errorRightStack
-  } = rightResult;
+    minLineY,
+    platform,
+    uriLeft,
+    uriRight
+  } = state;
   const renderModeLeft = getRenderMode(uriLeft, knownImageExtensions);
   const renderModeRight = getRenderMode(uriRight, knownImageExtensions);
-  const minLineY = getMinLineY(savedState);
   const displayedContentLeft = getDisplayedContent(contentLeft, errorLeftMessage, errorLeftStack);
   const displayedContentRight = getDisplayedContent(contentRight, errorRightMessage, errorRightStack);
   const totalLineCountLeft = renderModeLeft === 'image' ? 1 : getLineCount(displayedContentLeft);
@@ -2063,7 +2397,11 @@ const loadContent = async (state, savedState) => {
     inlineChanges: [],
     totalLineCount: Math.max(totalLineCountLeft, totalLineCountRight)
   };
-  return {
+  const canHighlightLeft = renderModeLeft === 'text' && !errorLeftMessage;
+  const canHighlightRight = renderModeRight === 'text' && !errorRightMessage;
+  const syntaxHighlightingState = canHighlightLeft || canHighlightRight ? await loadSyntaxHighlighting(contentLeft, contentRight, uriLeft, uriRight, platform, assetDir) : undefined;
+  const [imageSrcLeft, imageSrcRight] = await Promise.all([renderModeLeft === 'image' && !errorLeftMessage ? loadImageSrc(uriLeft) : Promise.resolve(''), renderModeRight === 'image' && !errorRightMessage ? loadImageSrc(uriRight) : Promise.resolve('')]);
+  const nextState = {
     ...state,
     contentLeft,
     contentRight,
@@ -2071,17 +2409,47 @@ const loadContent = async (state, savedState) => {
     errorLeftStack,
     errorRightMessage,
     errorRightStack,
+    imageSrcLeft,
+    imageSrcRight,
     initial: false,
     inlineChanges,
+    languageIdLeft: syntaxHighlightingState?.languageIdLeft || 'unknown',
+    languageIdRight: syntaxHighlightingState?.languageIdRight || 'unknown',
     renderModeLeft,
     renderModeRight,
+    tokenizedLinesLeft: syntaxHighlightingState?.tokenizedLinesLeft || [],
+    tokenizedLinesRight: syntaxHighlightingState?.tokenizedLinesRight || [],
     totalLineCount,
     totalLineCountLeft,
     totalLineCountRight,
-    uriLeft,
-    uriRight,
     ...getScrollState(height, itemHeight, totalLineCount, minimumSliderSize, minLineY * itemHeight)
   };
+  return {
+    ...nextState,
+    ...getVisibleLinesState(nextState)
+  };
+};
+
+const loadContent = async (state, savedState) => {
+  const {
+    uri
+  } = state;
+  const [uriLeft, uriRight] = getInlineDiffUris(uri);
+  const {
+    contentLeft,
+    contentRight,
+    errorLeftMessage,
+    errorLeftStack,
+    errorRightMessage,
+    errorRightStack
+  } = await loadFileContents(uriLeft, uriRight);
+  const minLineY = getMinLineY(savedState);
+  return reloadContent({
+    ...state,
+    minLineY,
+    uriLeft,
+    uriRight
+  }, contentLeft, contentRight, errorLeftMessage, errorLeftStack, errorRightMessage, errorRightStack);
 };
 
 const getCss = () => {
@@ -2105,6 +2473,13 @@ const getCss = () => {
   word-break: break-word;
 }
 
+.DiffEditorErrorStackLink {
+  color: inherit;
+  text-decoration: underline;
+  text-underline-offset: 2px;
+  white-space: nowrap;
+}
+
   `;
 };
 
@@ -2165,6 +2540,7 @@ const renderCss = (oldState, newState) => {
   contain: strict;
   height: 100%;
   overflow: hidden;
+  user-select: text;
 }
 
 .InlineDiffEditorContent {
@@ -2633,6 +3009,7 @@ const DiffEditorContentRight = 'DiffEditorContentRight';
 const DiffEditorError = 'DiffEditorError';
 const DiffEditorErrorMessage = 'DiffEditorErrorMessage';
 const DiffEditorErrorStack = 'DiffEditorErrorStack';
+const DiffEditorErrorStackLink = 'DiffEditorErrorStackLink';
 const DiffEditorSpacerBottom = 'DiffEditorSpacerBottom';
 const DiffEditorSpacerTop = 'DiffEditorSpacerTop';
 const DiffEditorGutter = 'DiffEditorGutter';
@@ -2643,8 +3020,6 @@ const DiffEditorVertical = 'DiffEditorVertical';
 const EditorRow = 'EditorRow';
 const EditorRowDeletion = 'EditorRow Deletion';
 const EditorRowInsertion = 'EditorRow Insertion';
-const ImageContent = 'ImageContent';
-const ImageElement = 'ImageElement';
 const InlineDiffEditor = 'InlineDiffEditor';
 const InlineDiffEditorContent = 'InlineDiffEditorContent';
 const Sash = 'Sash';
@@ -2654,137 +3029,41 @@ const ScrollBar = 'ScrollBar';
 const ScrollBarThumb = 'ScrollBarThumb';
 const Viewlet = 'Viewlet';
 
+const HandleClickAt = 1;
+const HandleContextMenu = 2;
+const HandleFocus = 3;
+const HandleInput = 4;
+const HandleMouseOutAt = 6;
+const HandleMouseOver = 7;
+const HandleMouseOverAt = 8;
 const HandleWheel = 9;
+const HandleClickAction = 10;
 const HandleSashPointerDown = 11;
+const HandleSashPointerMove = 12;
+const HandleSashPointerUp = 13;
 const HandleScrollBarPointerDown = 14;
+const HandleScrollBarPointerMove = 15;
+const HandleScrollBarPointerUp = 16;
 
-const getErrorStackDom = errorStack => {
-  if (!errorStack) {
-    return [];
-  }
-  return [{
-    childCount: 1,
-    className: DiffEditorErrorStack,
-    type: Div
-  }, text(errorStack)];
-};
-
-const getErrorDom = (contentClassName, errorMessage, errorStack) => {
-  const childCount = errorStack ? 2 : 1;
-  return [{
-    childCount: 1,
-    className: DiffEditorContent,
-    type: Div
-  }, {
-    childCount,
-    className: `${contentClassName} ${DiffEditorError}`,
-    type: Div
-  }, {
-    childCount: 1,
-    className: DiffEditorErrorMessage,
-    type: Div
-  }, text(errorMessage), ...getErrorStackDom(errorStack)];
+const parentNode = {
+  childCount: 1,
+  className: DiffEditorLineNumber,
+  type: Div
 };
-
 const getLineNumberDom = lineNumber => {
-  return [{
-    childCount: 1,
-    className: DiffEditorLineNumber,
-    type: Div
-  }, text(String(lineNumber))];
+  return [parentNode, text(String(lineNumber))];
 };
 
-const getLineNumbersDom = (startLineNumber, lineCount) => {
+const getGutterDom = visibleLines => {
   return [{
-    childCount: lineCount,
+    childCount: visibleLines.length,
     className: DiffEditorGutter,
     type: Div
-  }, ...Array.from({
-    length: lineCount
-  }, (_, index) => getLineNumberDom(startLineNumber + index)).flat()];
-};
-
-const getRowDom = (line, className = EditorRow) => {
-  return [{
-    childCount: 1,
-    className,
-    type: Div
-  }, text(line)];
-};
-
-const getRowsDom = (lines, classNames = []) => {
-  return lines.flatMap((line, index) => getRowDom(line, classNames[index] || EditorRow));
-};
-
-const getVisibleRows = (content, totalLineCount, minLineY, maxLineY) => {
-  const lines = content ? content.split('\n') : [''];
-  const visibleCount = Math.max(maxLineY - minLineY, 0);
-  const visibleLines = lines.slice(minLineY, maxLineY);
-  if (visibleLines.length === visibleCount) {
-    return visibleLines;
-  }
-  const paddedLines = [...visibleLines];
-  while (paddedLines.length < visibleCount && paddedLines.length < totalLineCount) {
-    paddedLines.push('');
-  }
-  return paddedLines;
-};
-
-const None = 0;
-const Insertion = 1;
-const Deletion = 2;
-
-const getLine = (lines, index) => {
-  if (index < 0 || index >= lines.length) {
-    return '';
-  }
-  return lines[index];
-};
-const getRowClassName$1 = (type, side) => {
-  if (side === 'left' && type === Deletion) {
-    return EditorRowDeletion;
-  }
-  if (side === 'right' && type === Insertion) {
-    return EditorRowInsertion;
-  }
-  return EditorRow;
-};
-const getRowText$1 = (lines, inlineChange, side) => {
-  switch (inlineChange.type) {
-    case Deletion:
-      return side === 'left' ? getLine(lines, inlineChange.leftIndex) : '';
-    case Insertion:
-      return side === 'right' ? getLine(lines, inlineChange.rightIndex) : '';
-    case None:
-      return getLine(lines, side === 'left' ? inlineChange.leftIndex : inlineChange.rightIndex);
-    default:
-      return '';
-  }
-};
-const getVisibleInlineDiffRows = (content, totalLineCount, inlineChanges, minLineY, maxLineY, side) => {
-  if (inlineChanges.length === 0) {
-    return getVisibleRows(content, totalLineCount, minLineY, maxLineY).map(line => ({
-      className: EditorRow,
-      text: line
-    }));
-  }
-  const lines = content ? content.split('\n') : [''];
-  return inlineChanges.slice(minLineY, maxLineY).map(inlineChange => ({
-    className: getRowClassName$1(inlineChange.type, side),
-    text: getRowText$1(lines, inlineChange, side)
-  }));
+  }, ...visibleLines.flatMap(line => getLineNumberDom(line.lineNumber))];
 };
 
-const getContentDomWithLineNumbers = (contentClassName, startLineNumber, lineCount, rowsChildCount, rows) => {
+const getRowsDom = (rowsChildCount, rows) => {
   return [{
-    childCount: 1,
-    className: DiffEditorContent,
-    type: Div
-  }, {
-    childCount: 2,
-    className: contentClassName,
-    type: Div
-  }, ...getLineNumbersDom(startLineNumber, lineCount), {
     childCount: rowsChildCount,
     className: DiffEditorRows,
     type: Div
@@ -2798,6 +3077,19 @@ const getContentDomWithLineNumbers = (contentClassName, startLineNumber, lineCou
     type: Div
   }];
 };
+
+const getContentDomWithLineNumbers = (contentClassName, visibleLines, rowsChildCount, rows) => {
+  return [{
+    childCount: 1,
+    className: DiffEditorContent,
+    type: Div
+  }, {
+    childCount: 2,
+    className: contentClassName,
+    type: Div
+  }, ...getGutterDom(visibleLines), ...getRowsDom(rowsChildCount, rows)];
+};
+
 const getContentDomWithoutLineNumbers = (contentClassName, rowsChildCount, rows) => {
   return [{
     childCount: 1,
@@ -2817,81 +3109,139 @@ const getContentDomWithoutLineNumbers = (contentClassName, rowsChildCount, rows)
     type: Div
   }];
 };
-const getContentDom = (contentClassName, content, errorMessage, errorStack, lineNumbers, totalLineCount, minLineY, maxLineY, inlineChanges, side) => {
-  if (errorMessage) {
-    return getErrorDom(contentClassName, errorMessage, errorStack);
+
+const stackLocationRegex = /((?:https?:\/\/|file:\/\/\/?|\/)[^\s)]+):(\d+):(\d+)\)?$/;
+const getStackLineLink = stackLine => {
+  const match = stackLine.match(stackLocationRegex);
+  if (!match) {
+    return '';
   }
-  const lines = getVisibleInlineDiffRows(content, totalLineCount, inlineChanges, minLineY, maxLineY, side);
-  const rows = getRowsDom(lines.map(line => line.text), lines.map(line => line.className));
-  const startLineNumber = minLineY + 1;
-  const rowsChildCount = lines.length + 2;
-  if (lineNumbers) {
-    return getContentDomWithLineNumbers(contentClassName, startLineNumber, lines.length, rowsChildCount, rows);
+  const [, location] = match;
+  if (location.startsWith('/')) {
+    return `file://${location}`;
   }
-  return getContentDomWithoutLineNumbers(contentClassName, rowsChildCount, rows);
+  return location;
 };
-
-const getContentLeftDom = (contentLeft, errorMessage = '', errorStack = '', lineNumbers = true, totalLineCount = contentLeft ? contentLeft.split('\n').length : 1, minLineY = 0, maxLineY = totalLineCount, inlineChanges = []) => {
-  return getContentDom(DiffEditorContentLeft, contentLeft, errorMessage, errorStack, lineNumbers, totalLineCount, minLineY, maxLineY, inlineChanges, 'left');
+const getStackLineLabel = href => {
+  if (!href) {
+    return '';
+  }
+  const pathname = href.startsWith('file://') ? href.slice('file://'.length) : href;
+  const fileName = pathname.slice(pathname.lastIndexOf('/') + 1);
+  return `(${fileName})`;
 };
-
-const getContentRightDom = (contentRight, errorMessage = '', errorStack = '', lineNumbers = true, totalLineCount = contentRight ? contentRight.split('\n').length : 1, minLineY = 0, maxLineY = totalLineCount, inlineChanges = []) => {
-  return getContentDom(DiffEditorContentRight, contentRight, errorMessage, errorStack, lineNumbers, totalLineCount, minLineY, maxLineY, inlineChanges, 'right');
+const getStackLinePrefix = stackLine => {
+  const match = stackLine.match(stackLocationRegex);
+  if (!match) {
+    return stackLine;
+  }
+  return stackLine.slice(0, stackLine.length - match[0].length).replace(/\($/, '');
 };
-
-const getImageSrc = uri => {
-  const protocol = getProtocol(uri);
-  if (protocol === 'data') {
-    return `data:${getPath(protocol, uri)}`;
+const getErrorStackLineDom = stackLine => {
+  const href = getStackLineLink(stackLine);
+  if (!href) {
+    return [{
+      childCount: 1,
+      type: Div
+    }, text(stackLine)];
   }
-  if (protocol === 'file') {
-    return toFileUri(uri);
+  const prefix = getStackLinePrefix(stackLine);
+  const label = getStackLineLabel(href);
+  return [{
+    childCount: 1,
+    type: Div
+  }, ...(prefix ? [text(prefix)] : []), {
+    childCount: 1,
+    className: DiffEditorErrorStackLink,
+    href,
+    rel: 'noreferrer',
+    target: '_blank',
+    type: A
+  }, text(label)];
+};
+const getErrorStackDom = errorStack => {
+  if (!errorStack) {
+    return [];
   }
-  return uri;
+  const stackLines = errorStack.split('\n');
+  return [{
+    childCount: stackLines.length,
+    className: DiffEditorErrorStack,
+    type: Div
+  }, ...stackLines.flatMap(getErrorStackLineDom)];
 };
 
-const getImageLeftDom = uriLeft => {
+const getErrorDom = (contentClassName, errorMessage, errorStack) => {
+  const childCount = errorStack ? 2 : 1;
   return [{
     childCount: 1,
     className: DiffEditorContent,
     type: Div
   }, {
-    childCount: 1,
-    className: DiffEditorContentLeft,
+    childCount,
+    className: `${contentClassName} ${DiffEditorError}`,
     type: Div
   }, {
     childCount: 1,
-    className: ImageContent,
+    className: DiffEditorErrorMessage,
     type: Div
-  }, {
-    alt: uriLeft,
-    childCount: 0,
-    className: ImageElement,
-    src: getImageSrc(uriLeft),
-    type: Img
-  }];
+  }, text(errorMessage), ...getErrorStackDom(errorStack)];
+};
+
+const getRowClassName$1 = (type, side) => {
+  if (type === VisibleLineType.Removed) {
+    return EditorRowDeletion;
+  }
+  if (type === VisibleLineType.Added) {
+    return EditorRowInsertion;
+  }
+  return EditorRow;
 };
 
-const getImageRightDom = uriRight => {
+const getTokenDom = token => {
+  if (!token.type) {
+    return [text(token.text)];
+  }
   return [{
     childCount: 1,
-    className: DiffEditorContent,
-    type: Div
-  }, {
-    childCount: 1,
-    className: DiffEditorContentRight,
-    type: Div
-  }, {
-    childCount: 1,
-    className: ImageContent,
+    className: token.type,
+    type: Span
+  }, text(token.text)];
+};
+
+const getLineDom = (line, side) => {
+  const children = line.tokens.length === 0 ? [text('')] : line.tokens.flatMap(getTokenDom);
+  const childCount = line.tokens.length === 0 ? 1 : line.tokens.length;
+  return [{
+    childCount,
+    className: getRowClassName$1(line.type),
     type: Div
-  }, {
-    alt: uriRight,
-    childCount: 0,
-    className: ImageElement,
-    src: getImageSrc(uriRight),
-    type: Img
-  }];
+  }, ...children];
+};
+
+const getVisibleLinesDom = (visibleLines, side) => {
+  return visibleLines.flatMap(line => getLineDom(line));
+};
+
+const getContentDom = (contentClassName, content, errorMessage, errorStack, lineNumbers, totalLineCount, minLineY, maxLineY, inlineChanges, side, tokenizedLines = [], visibleLines = []) => {
+  if (errorMessage) {
+    return getErrorDom(contentClassName, errorMessage, errorStack);
+  }
+  const lines = visibleLines.length > 0 ? visibleLines : getVisibleLines(content, totalLineCount, inlineChanges, minLineY, maxLineY, side, tokenizedLines);
+  const rows = getVisibleLinesDom(lines);
+  const rowsChildCount = lines.length + 2;
+  if (lineNumbers) {
+    return getContentDomWithLineNumbers(contentClassName, lines, rowsChildCount, rows);
+  }
+  return getContentDomWithoutLineNumbers(contentClassName, rowsChildCount, rows);
+};
+
+const getContentLeftDom = (contentLeft, errorMessage = '', errorStack = '', lineNumbers = true, totalLineCount = contentLeft ? contentLeft.split('\n').length : 1, minLineY = 0, maxLineY = totalLineCount, inlineChanges = [], tokenizedLines = [], visibleLines = []) => {
+  return getContentDom(DiffEditorContentLeft, contentLeft, errorMessage, errorStack, lineNumbers, totalLineCount, minLineY, maxLineY, inlineChanges, 'left', tokenizedLines, visibleLines);
+};
+
+const getContentRightDom = (contentRight, errorMessage = '', errorStack = '', lineNumbers = true, totalLineCount = contentRight ? contentRight.split('\n').length : 1, minLineY = 0, maxLineY = totalLineCount, inlineChanges = [], tokenizedLines = [], visibleLines = []) => {
+  return getContentDom(DiffEditorContentRight, contentRight, errorMessage, errorStack, lineNumbers, totalLineCount, minLineY, maxLineY, inlineChanges, 'right', tokenizedLines, visibleLines);
 };
 
 const getScrollBarDom = () => {
@@ -2951,20 +3301,23 @@ const getInlineDiffEditorVirtualDom = (contentLeft, contentRight, lineNumbers, m
   const rows = getInlineDiffRows(contentLeft, contentRight);
   const visibleRows = rows.slice(minLineY, maxLineY);
   const contentChildCount = lineNumbers ? 2 : 1;
+  const scrollBarActive = visibleRows.length < rows.length;
   const rowsChildCount = visibleRows.length + 2;
+  const lineNumberDom = lineNumbers ? [{
+    childCount: visibleRows.length,
+    className: DiffEditorGutter,
+    type: Div
+  }, ...visibleRows.flatMap(getInlineDiffLineNumberDom)] : [];
+  const scrollBarDom = scrollBarActive ? getScrollBarDom() : [];
   return [{
-    childCount: 2,
+    childCount: scrollBarActive ? 2 : 1,
     className: `${Viewlet} ${DiffEditor} ${InlineDiffEditor}`,
     type: Div
   }, {
     childCount: contentChildCount,
     className: `${DiffEditorContent} ${InlineDiffEditorContent}`,
     type: Div
-  }, ...(lineNumbers ? [{
-    childCount: visibleRows.length,
-    className: DiffEditorGutter,
-    type: Div
-  }, ...visibleRows.flatMap(getInlineDiffLineNumberDom)] : []), {
+  }, ...lineNumberDom, {
     childCount: rowsChildCount,
     className: DiffEditorRows,
     type: Div
@@ -2976,30 +3329,41 @@ const getInlineDiffEditorVirtualDom = (contentLeft, contentRight, lineNumbers, m
     childCount: 0,
     className: DiffEditorSpacerBottom,
     type: Div
-  }, ...getScrollBarDom()];
-};
-
-const getDiffEditorVirtualDom = ({
-  contentLeft,
-  contentRight,
-  diffMode,
-  errorLeftMessage,
-  errorLeftStack,
-  errorRightMessage,
-  errorRightStack,
-  inlineChanges,
-  layout,
-  lineNumbers,
-  maxLineY,
-  minLineY,
-  renderModeLeft,
-  renderModeRight,
-  totalLineCount,
-  totalLineCountLeft,
-  totalLineCountRight,
-  uriLeft,
-  uriRight
-}) => {
+  }, ...scrollBarDom];
+};
+
+const getSashDom = sashLayoutClass => ({
+  childCount: 0,
+  className: `${Sash} ${sashLayoutClass}`,
+  name: 'sash',
+  onPointerDown: HandleSashPointerDown,
+  type: Div
+});
+
+const getDiffEditorVirtualDom = state => {
+  const {
+    contentLeft,
+    contentRight,
+    diffMode,
+    errorLeftMessage,
+    errorLeftStack,
+    errorRightMessage,
+    errorRightStack,
+    inlineChanges,
+    layout,
+    lineNumbers,
+    maxLineY,
+    minLineY,
+    renderModeLeft,
+    renderModeRight,
+    scrollBarActive,
+    tokenizedLinesLeft,
+    tokenizedLinesRight,
+    totalLineCountLeft,
+    totalLineCountRight,
+    visibleLinesLeft,
+    visibleLinesRight
+  } = state;
   const canRenderInline = diffMode === 'inline' && renderModeLeft === 'text' && renderModeRight === 'text' && !errorLeftMessage && !errorRightMessage;
   if (canRenderInline) {
     return getInlineDiffEditorVirtualDom(contentLeft, contentRight, lineNumbers, minLineY, maxLineY);
@@ -3007,18 +3371,16 @@ const getDiffEditorVirtualDom = ({
   const showLineNumbers = lineNumbers && renderModeLeft === 'text' && renderModeRight === 'text';
   const diffEditorLayoutClass = layout === 'vertical' ? DiffEditorVertical : DiffEditorHorizontal;
   const sashLayoutClass = layout === 'vertical' ? SashHorizontal : SashVertical;
+  const leftDom = getContentLeftDom(contentLeft, errorLeftMessage, errorLeftStack, showLineNumbers, totalLineCountLeft, minLineY, maxLineY, inlineChanges, tokenizedLinesLeft, visibleLinesLeft);
+  const rightDom = getContentRightDom(contentRight, errorRightMessage, errorRightStack, showLineNumbers, totalLineCountRight, minLineY, maxLineY, inlineChanges, tokenizedLinesRight, visibleLinesRight);
+  const scrollBarDom = scrollBarActive ? getScrollBarDom() : [];
   const dom = [{
-    childCount: 4,
+    childCount: scrollBarActive ? 4 : 3,
     className: `${Viewlet} ${DiffEditor} ${diffEditorLayoutClass}`,
+    onContextMenu: HandleContextMenu,
     onWheel: HandleWheel,
     type: Div
-  }, ...(renderModeLeft === 'image' ? getImageLeftDom(uriLeft) : getContentLeftDom(contentLeft, errorLeftMessage, errorLeftStack, showLineNumbers, totalLineCountLeft, minLineY, maxLineY, inlineChanges)), {
-    childCount: 0,
-    className: `${Sash} ${sashLayoutClass}`,
-    name: 'sash',
-    onPointerDown: HandleSashPointerDown,
-    type: Div
-  }, ...(renderModeRight === 'image' ? getImageRightDom(uriRight) : getContentRightDom(contentRight, errorRightMessage, errorRightStack, showLineNumbers, totalLineCountRight, minLineY, maxLineY, inlineChanges)), ...getScrollBarDom()];
+  }, ...leftDom, getSashDom(sashLayoutClass), ...rightDom, ...scrollBarDom];
   return dom;
 };
 
@@ -3093,6 +3455,59 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
+const renderEventListeners = () => {
+  return [{
+    name: HandleWheel,
+    params: ['handleWheel', DeltaMode, DeltaY],
+    passive: true
+  }, {
+    name: HandleFocus,
+    params: ['handleFocus']
+  }, {
+    name: HandleClickAt,
+    params: ['handleClickAt', ClientX, ClientY, TargetName]
+  }, {
+    name: HandleMouseOverAt,
+    params: ['handleMouseOverAt', ClientX, ClientY]
+  }, {
+    name: HandleMouseOver,
+    params: ['handleMouseOver', ClientX, ClientY]
+  }, {
+    name: HandleMouseOutAt,
+    params: ['handleMouseOutAt', ClientX, ClientY]
+  }, {
+    name: HandleInput,
+    params: ['handleInput', TargetValue]
+  }, {
+    name: HandleContextMenu,
+    params: ['handleContextMenu', Button, ClientX, ClientY],
+    preventDefault: true
+  }, {
+    name: HandleClickAction,
+    params: ['handleActionClick', TargetName]
+  }, {
+    name: HandleSashPointerDown,
+    params: ['handleSashPointerDown', ClientX, ClientY],
+    trackPointerEvents: [HandleSashPointerMove, HandleSashPointerUp]
+  }, {
+    name: HandleSashPointerMove,
+    params: ['handleSashPointerMove', ClientX, ClientY]
+  }, {
+    name: HandleSashPointerUp,
+    params: ['handleSashPointerUp', ClientX, ClientY]
+  }, {
+    name: HandleScrollBarPointerDown,
+    params: ['handleScrollBarPointerDown', ClientY],
+    trackPointerEvents: [HandleScrollBarPointerMove, HandleScrollBarPointerUp]
+  }, {
+    name: HandleScrollBarPointerMove,
+    params: ['handleScrollBarPointerMove', ClientY]
+  }, {
+    name: HandleScrollBarPointerUp,
+    params: ['handleScrollBarPointerUp', ClientY]
+  }];
+};
+
 const saveState = uid => {
   number(uid);
   const value = get(uid);
@@ -3121,12 +3536,16 @@ const setDiffMode = (state, diffMode) => {
   }
   const totalLineCount = getTotalLineCount(diffMode, state.contentLeft, state.contentRight, state.errorLeftMessage, state.errorLeftStack, state.errorRightMessage, state.errorRightStack, state.renderModeLeft, state.renderModeRight);
   const scrollState = getScrollState(state.height, state.itemHeight, totalLineCount, state.minimumSliderSize, state.deltaY);
-  return {
+  const nextState = {
     ...state,
     diffMode,
     totalLineCount,
     ...scrollState
   };
+  return {
+    ...nextState,
+    ...getVisibleLinesState(nextState)
+  };
 };
 
 const getNextPaneSizes = (state, layout) => {
@@ -3154,8 +3573,11 @@ const setLayout = (state, layout) => {
 };
 
 const commandMap = {
+  'Diff.getCommandIds': getCommandIds,
   'DiffView.create': create2,
   'DiffView.diff2': diff2,
+  'DiffView.getCommandIds': getCommandIds,
+  'DiffView.handleContextMenu': wrapCommand(handleContextMenu),
   'DiffView.handleSashPointerDown': wrapCommand(handleSashPointerDown),
   'DiffView.handleSashPointerMove': wrapCommand(handleSashPointerMove),
   'DiffView.handleSashPointerUp': wrapCommand(handleSashPointerUp),
@@ -3166,6 +3588,7 @@ const commandMap = {
   'DiffView.initialize': initialize,
   'DiffView.loadContent': wrapCommand(loadContent),
   'DiffView.render2': render2,
+  'DiffView.renderEventListeners': renderEventListeners,
   'DiffView.saveState': saveState,
   'DiffView.setDiffMode': wrapCommand(setDiffMode),
   'DiffView.setLayout': wrapCommand(setLayout),
@@ -3178,7 +3601,7 @@ const listen = async () => {
   const rpc = await create$2({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const main = async () => {