@pierre/diffs 1.2.10 → 1.2.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +15 -15
- package/dist/components/CodeView.d.ts +10 -11
- package/dist/components/CodeView.d.ts.map +1 -1
- package/dist/components/CodeView.js +13 -14
- package/dist/components/CodeView.js.map +1 -1
- package/dist/components/File.d.ts +1 -4
- package/dist/components/File.d.ts.map +1 -1
- package/dist/components/File.js +19 -12
- package/dist/components/File.js.map +1 -1
- package/dist/components/FileDiff.d.ts +11 -14
- package/dist/components/FileDiff.d.ts.map +1 -1
- package/dist/components/FileDiff.js +16 -14
- package/dist/components/FileDiff.js.map +1 -1
- package/dist/components/FileStream.d.ts +0 -1
- package/dist/components/FileStream.d.ts.map +1 -1
- package/dist/components/FileStream.js +8 -6
- package/dist/components/FileStream.js.map +1 -1
- package/dist/components/UnresolvedFile.d.ts +2 -2
- package/dist/components/UnresolvedFile.d.ts.map +1 -1
- package/dist/components/UnresolvedFile.js +7 -5
- package/dist/components/UnresolvedFile.js.map +1 -1
- package/dist/components/VirtualizedFile.d.ts +6 -3
- package/dist/components/VirtualizedFile.d.ts.map +1 -1
- package/dist/components/VirtualizedFile.js +97 -35
- package/dist/components/VirtualizedFile.js.map +1 -1
- package/dist/components/VirtualizedFileDiff.d.ts +9 -5
- package/dist/components/VirtualizedFileDiff.d.ts.map +1 -1
- package/dist/components/VirtualizedFileDiff.js +91 -30
- package/dist/components/VirtualizedFileDiff.js.map +1 -1
- package/dist/components/Virtualizer.d.ts +1 -1
- package/dist/components/Virtualizer.d.ts.map +1 -1
- package/dist/components/Virtualizer.js +23 -24
- package/dist/components/Virtualizer.js.map +1 -1
- package/dist/components/VirtulizerDevelopment.d.ts.map +1 -1
- package/dist/components/web-components.d.ts.map +1 -1
- package/dist/components/web-components.js +2 -3
- package/dist/components/web-components.js.map +1 -1
- package/dist/constants.d.ts +1 -1
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +1 -1
- package/dist/constants.js.map +1 -1
- package/dist/highlighter/languages/areLanguagesAttached.d.ts.map +1 -1
- package/dist/highlighter/languages/areLanguagesAttached.js +1 -2
- package/dist/highlighter/languages/areLanguagesAttached.js.map +1 -1
- package/dist/highlighter/languages/attachResolvedLanguages.d.ts +0 -2
- package/dist/highlighter/languages/attachResolvedLanguages.d.ts.map +1 -1
- package/dist/highlighter/languages/attachResolvedLanguages.js +1 -2
- package/dist/highlighter/languages/attachResolvedLanguages.js.map +1 -1
- package/dist/highlighter/languages/cleanUpResolvedLanguages.d.ts.map +1 -1
- package/dist/highlighter/languages/cleanUpResolvedLanguages.js +1 -2
- package/dist/highlighter/languages/cleanUpResolvedLanguages.js.map +1 -1
- package/dist/highlighter/languages/constants.d.ts +0 -1
- package/dist/highlighter/languages/constants.d.ts.map +1 -1
- package/dist/highlighter/languages/constants.js +1 -1
- package/dist/highlighter/languages/constants.js.map +1 -1
- package/dist/highlighter/languages/getResolvedLanguages.d.ts +0 -2
- package/dist/highlighter/languages/getResolvedLanguages.d.ts.map +1 -1
- package/dist/highlighter/languages/getResolvedLanguages.js +1 -2
- package/dist/highlighter/languages/getResolvedLanguages.js.map +1 -1
- package/dist/highlighter/languages/getResolvedOrResolveLanguage.d.ts +0 -2
- package/dist/highlighter/languages/getResolvedOrResolveLanguage.d.ts.map +1 -1
- package/dist/highlighter/languages/getResolvedOrResolveLanguage.js +1 -2
- package/dist/highlighter/languages/getResolvedOrResolveLanguage.js.map +1 -1
- package/dist/highlighter/languages/hasResolvedLanguages.d.ts.map +1 -1
- package/dist/highlighter/languages/hasResolvedLanguages.js +1 -2
- package/dist/highlighter/languages/hasResolvedLanguages.js.map +1 -1
- package/dist/highlighter/languages/registerCustomLanguage.d.ts +0 -1
- package/dist/highlighter/languages/registerCustomLanguage.d.ts.map +1 -1
- package/dist/highlighter/languages/registerCustomLanguage.js +1 -2
- package/dist/highlighter/languages/registerCustomLanguage.js.map +1 -1
- package/dist/highlighter/languages/resolveLanguage.d.ts +0 -2
- package/dist/highlighter/languages/resolveLanguage.d.ts.map +1 -1
- package/dist/highlighter/languages/resolveLanguage.js +4 -5
- package/dist/highlighter/languages/resolveLanguage.js.map +1 -1
- package/dist/highlighter/languages/resolveLanguages.d.ts +0 -2
- package/dist/highlighter/languages/resolveLanguages.d.ts.map +1 -1
- package/dist/highlighter/languages/resolveLanguages.js +1 -2
- package/dist/highlighter/languages/resolveLanguages.js.map +1 -1
- package/dist/highlighter/shared_highlighter.d.ts.map +1 -1
- package/dist/highlighter/shared_highlighter.js +3 -4
- package/dist/highlighter/shared_highlighter.js.map +1 -1
- package/dist/highlighter/themes/areThemesAttached.d.ts.map +1 -1
- package/dist/highlighter/themes/areThemesAttached.js +1 -2
- package/dist/highlighter/themes/areThemesAttached.js.map +1 -1
- package/dist/highlighter/themes/attachResolvedThemes.d.ts.map +1 -1
- package/dist/highlighter/themes/attachResolvedThemes.js +1 -2
- package/dist/highlighter/themes/attachResolvedThemes.js.map +1 -1
- package/dist/highlighter/themes/cleanUpResolvedThemes.d.ts.map +1 -1
- package/dist/highlighter/themes/cleanUpResolvedThemes.js +1 -2
- package/dist/highlighter/themes/cleanUpResolvedThemes.js.map +1 -1
- package/dist/highlighter/themes/constants.d.ts.map +1 -1
- package/dist/highlighter/themes/constants.js +1 -1
- package/dist/highlighter/themes/constants.js.map +1 -1
- package/dist/highlighter/themes/getResolvedOrResolveTheme.d.ts.map +1 -1
- package/dist/highlighter/themes/getResolvedOrResolveTheme.js +1 -2
- package/dist/highlighter/themes/getResolvedOrResolveTheme.js.map +1 -1
- package/dist/highlighter/themes/getResolvedThemes.d.ts.map +1 -1
- package/dist/highlighter/themes/getResolvedThemes.js +1 -2
- package/dist/highlighter/themes/getResolvedThemes.js.map +1 -1
- package/dist/highlighter/themes/hasResolvedThemes.d.ts.map +1 -1
- package/dist/highlighter/themes/hasResolvedThemes.js +1 -2
- package/dist/highlighter/themes/hasResolvedThemes.js.map +1 -1
- package/dist/highlighter/themes/registerCustomCSSVariableTheme.d.ts.map +1 -1
- package/dist/highlighter/themes/registerCustomCSSVariableTheme.js +1 -2
- package/dist/highlighter/themes/registerCustomCSSVariableTheme.js.map +1 -1
- package/dist/highlighter/themes/registerCustomTheme.d.ts.map +1 -1
- package/dist/highlighter/themes/registerCustomTheme.js +1 -2
- package/dist/highlighter/themes/registerCustomTheme.js.map +1 -1
- package/dist/highlighter/themes/resolveTheme.d.ts.map +1 -1
- package/dist/highlighter/themes/resolveTheme.js +1 -2
- package/dist/highlighter/themes/resolveTheme.js.map +1 -1
- package/dist/highlighter/themes/resolveThemes.d.ts.map +1 -1
- package/dist/highlighter/themes/resolveThemes.js +1 -2
- package/dist/highlighter/themes/resolveThemes.js.map +1 -1
- package/dist/highlighter/themes/themeResolution.d.ts.map +1 -1
- package/dist/highlighter/themes/themeResolution.js +1 -2
- package/dist/highlighter/themes/themeResolution.js.map +1 -1
- package/dist/highlighter/themes/themeResolver.d.ts +2 -2
- package/dist/highlighter/themes/themeResolver.d.ts.map +1 -1
- package/dist/highlighter/themes/themeResolver.js +1 -2
- package/dist/highlighter/themes/themeResolver.js.map +1 -1
- package/dist/index.d.ts +9 -9
- package/dist/index.js +1 -2
- package/dist/managers/InteractionManager.d.ts.map +1 -1
- package/dist/managers/InteractionManager.js +4 -4
- package/dist/managers/InteractionManager.js.map +1 -1
- package/dist/managers/ResizeManager.d.ts.map +1 -1
- package/dist/managers/ResizeManager.js +2 -2
- package/dist/managers/ResizeManager.js.map +1 -1
- package/dist/managers/ScrollSyncManager.d.ts.map +1 -1
- package/dist/managers/ScrollSyncManager.js +1 -1
- package/dist/managers/ScrollSyncManager.js.map +1 -1
- package/dist/managers/UniversalRenderingManager.d.ts.map +1 -1
- package/dist/managers/UniversalRenderingManager.js +2 -2
- package/dist/managers/UniversalRenderingManager.js.map +1 -1
- package/dist/node_modules/.pnpm/@types_hast@3.0.4/node_modules/@types/hast/index.d.ts +228 -0
- package/dist/node_modules/.pnpm/@types_hast@3.0.4/node_modules/@types/hast/index.d.ts.map +1 -0
- package/dist/node_modules/.pnpm/@types_unist@3.0.3/node_modules/@types/unist/index.d.ts +84 -0
- package/dist/node_modules/.pnpm/@types_unist@3.0.3/node_modules/@types/unist/index.d.ts.map +1 -0
- package/dist/react/CodeView.d.ts +0 -1
- package/dist/react/CodeView.d.ts.map +1 -1
- package/dist/react/CodeView.js +9 -12
- package/dist/react/CodeView.js.map +1 -1
- package/dist/react/File.d.ts.map +1 -1
- package/dist/react/File.js +2 -5
- package/dist/react/File.js.map +1 -1
- package/dist/react/FileDiff.d.ts.map +1 -1
- package/dist/react/FileDiff.js +2 -5
- package/dist/react/FileDiff.js.map +1 -1
- package/dist/react/MultiFileDiff.d.ts.map +1 -1
- package/dist/react/MultiFileDiff.js +2 -5
- package/dist/react/MultiFileDiff.js.map +1 -1
- package/dist/react/PatchDiff.d.ts.map +1 -1
- package/dist/react/PatchDiff.js +2 -5
- package/dist/react/PatchDiff.js.map +1 -1
- package/dist/react/UnresolvedFile.d.ts +1 -1
- package/dist/react/UnresolvedFile.d.ts.map +1 -1
- package/dist/react/UnresolvedFile.js +2 -5
- package/dist/react/UnresolvedFile.js.map +1 -1
- package/dist/react/Virtualizer.d.ts.map +1 -1
- package/dist/react/Virtualizer.js +2 -5
- package/dist/react/Virtualizer.js.map +1 -1
- package/dist/react/WorkerPoolContext.d.ts +0 -1
- package/dist/react/WorkerPoolContext.d.ts.map +1 -1
- package/dist/react/WorkerPoolContext.js +2 -5
- package/dist/react/WorkerPoolContext.js.map +1 -1
- package/dist/react/constants.d.ts.map +1 -1
- package/dist/react/constants.js +1 -1
- package/dist/react/constants.js.map +1 -1
- package/dist/react/index.d.ts +1 -1
- package/dist/react/index.js +1 -2
- package/dist/react/jsx.d.ts +0 -2
- package/dist/react/jsx.d.ts.map +1 -1
- package/dist/react/types.d.ts.map +1 -1
- package/dist/react/utils/renderDiffChildren.d.ts.map +1 -1
- package/dist/react/utils/renderDiffChildren.js +4 -5
- package/dist/react/utils/renderDiffChildren.js.map +1 -1
- package/dist/react/utils/renderFileChildren.d.ts.map +1 -1
- package/dist/react/utils/renderFileChildren.js +4 -5
- package/dist/react/utils/renderFileChildren.js.map +1 -1
- package/dist/react/utils/templateRender.d.ts.map +1 -1
- package/dist/react/utils/templateRender.js +1 -2
- package/dist/react/utils/templateRender.js.map +1 -1
- package/dist/react/utils/useFileDiffInstance.d.ts.map +1 -1
- package/dist/react/utils/useFileDiffInstance.js +1 -2
- package/dist/react/utils/useFileDiffInstance.js.map +1 -1
- package/dist/react/utils/useFileInstance.d.ts.map +1 -1
- package/dist/react/utils/useFileInstance.js +1 -2
- package/dist/react/utils/useFileInstance.js.map +1 -1
- package/dist/react/utils/useStableCallback.d.ts.map +1 -1
- package/dist/react/utils/useStableCallback.js +1 -2
- package/dist/react/utils/useStableCallback.js.map +1 -1
- package/dist/react/utils/useUnresolvedFileInstance.d.ts.map +1 -1
- package/dist/react/utils/useUnresolvedFileInstance.js +10 -11
- package/dist/react/utils/useUnresolvedFileInstance.js.map +1 -1
- package/dist/renderers/DiffHunksRenderer.d.ts +4 -4
- package/dist/renderers/DiffHunksRenderer.d.ts.map +1 -1
- package/dist/renderers/DiffHunksRenderer.js +66 -16
- package/dist/renderers/DiffHunksRenderer.js.map +1 -1
- package/dist/renderers/FileRenderer.d.ts +1 -3
- package/dist/renderers/FileRenderer.d.ts.map +1 -1
- package/dist/renderers/FileRenderer.js +22 -8
- package/dist/renderers/FileRenderer.js.map +1 -1
- package/dist/renderers/UnresolvedFileHunksRenderer.d.ts +1 -2
- package/dist/renderers/UnresolvedFileHunksRenderer.d.ts.map +1 -1
- package/dist/renderers/UnresolvedFileHunksRenderer.js +1 -2
- package/dist/renderers/UnresolvedFileHunksRenderer.js.map +1 -1
- package/dist/shiki-stream/index.js +1 -2
- package/dist/shiki-stream/stream.d.ts +0 -1
- package/dist/shiki-stream/stream.d.ts.map +1 -1
- package/dist/shiki-stream/stream.js +1 -2
- package/dist/shiki-stream/stream.js.map +1 -1
- package/dist/shiki-stream/tokenizer.d.ts.map +1 -1
- package/dist/shiki-stream/tokenizer.js +1 -1
- package/dist/shiki-stream/tokenizer.js.map +1 -1
- package/dist/shiki-stream/types.d.ts +0 -1
- package/dist/shiki-stream/types.d.ts.map +1 -1
- package/dist/sprite.d.ts.map +1 -1
- package/dist/sprite.js +1 -1
- package/dist/ssr/FileDiffReact.d.ts.map +1 -1
- package/dist/ssr/FileDiffReact.js +4 -7
- package/dist/ssr/FileDiffReact.js.map +1 -1
- package/dist/ssr/index.d.ts +1 -1
- package/dist/ssr/index.js +1 -2
- package/dist/ssr/preloadDiffs.d.ts +1 -1
- package/dist/ssr/preloadDiffs.d.ts.map +1 -1
- package/dist/ssr/preloadDiffs.js +1 -2
- package/dist/ssr/preloadDiffs.js.map +1 -1
- package/dist/ssr/preloadFile.d.ts.map +1 -1
- package/dist/ssr/preloadFile.js +1 -2
- package/dist/ssr/preloadFile.js.map +1 -1
- package/dist/ssr/preloadPatchFile.d.ts.map +1 -1
- package/dist/ssr/preloadPatchFile.js +2 -3
- package/dist/ssr/preloadPatchFile.js.map +1 -1
- package/dist/ssr/renderHTML.d.ts +1 -1
- package/dist/ssr/renderHTML.d.ts.map +1 -1
- package/dist/ssr/renderHTML.js +1 -2
- package/dist/ssr/renderHTML.js.map +1 -1
- package/dist/string-import.d.ts +4 -0
- package/dist/string-import.d.ts.map +1 -1
- package/dist/style.js +3 -3
- package/dist/style.js.map +1 -1
- package/dist/types.d.ts +9 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/areDiffLineAnnotationsEqual.d.ts.map +1 -1
- package/dist/utils/areDiffLineAnnotationsEqual.js +1 -1
- package/dist/utils/areDiffLineAnnotationsEqual.js.map +1 -1
- package/dist/utils/areDiffRenderOptionsEqual.d.ts.map +1 -1
- package/dist/utils/areDiffRenderOptionsEqual.js +1 -2
- package/dist/utils/areDiffRenderOptionsEqual.js.map +1 -1
- package/dist/utils/areDiffTargetsEqual.d.ts.map +1 -1
- package/dist/utils/areDiffTargetsEqual.js +1 -1
- package/dist/utils/areDiffTargetsEqual.js.map +1 -1
- package/dist/utils/areFileRenderOptionsEqual.d.ts.map +1 -1
- package/dist/utils/areFileRenderOptionsEqual.js +1 -2
- package/dist/utils/areFileRenderOptionsEqual.js.map +1 -1
- package/dist/utils/areFilesEqual.d.ts.map +1 -1
- package/dist/utils/areFilesEqual.js +1 -1
- package/dist/utils/areFilesEqual.js.map +1 -1
- package/dist/utils/areHunkDataEqual.d.ts.map +1 -1
- package/dist/utils/areHunkDataEqual.js +1 -1
- package/dist/utils/areHunkDataEqual.js.map +1 -1
- package/dist/utils/areLineAnnotationsEqual.d.ts.map +1 -1
- package/dist/utils/areLineAnnotationsEqual.js +1 -1
- package/dist/utils/areLineAnnotationsEqual.js.map +1 -1
- package/dist/utils/areManagedSnapshotsEqual.d.ts.map +1 -1
- package/dist/utils/areManagedSnapshotsEqual.js +1 -1
- package/dist/utils/areManagedSnapshotsEqual.js.map +1 -1
- package/dist/utils/areMergeConflictActionsEqual.d.ts.map +1 -1
- package/dist/utils/areMergeConflictActionsEqual.js +1 -1
- package/dist/utils/areMergeConflictActionsEqual.js.map +1 -1
- package/dist/utils/areObjectsEqual.d.ts.map +1 -1
- package/dist/utils/areObjectsEqual.js +1 -1
- package/dist/utils/areObjectsEqual.js.map +1 -1
- package/dist/utils/areOptionsEqual.d.ts +0 -2
- package/dist/utils/areOptionsEqual.d.ts.map +1 -1
- package/dist/utils/areOptionsEqual.js +1 -2
- package/dist/utils/areOptionsEqual.js.map +1 -1
- package/dist/utils/arePrePropertiesEqual.d.ts.map +1 -1
- package/dist/utils/arePrePropertiesEqual.js +1 -1
- package/dist/utils/arePrePropertiesEqual.js.map +1 -1
- package/dist/utils/areRenderRangesEqual.d.ts.map +1 -1
- package/dist/utils/areRenderRangesEqual.js +1 -1
- package/dist/utils/areRenderRangesEqual.js.map +1 -1
- package/dist/utils/areSelectionPointsEqual.d.ts.map +1 -1
- package/dist/utils/areSelectionPointsEqual.js +1 -1
- package/dist/utils/areSelectionPointsEqual.js.map +1 -1
- package/dist/utils/areSelectionsEqual.d.ts.map +1 -1
- package/dist/utils/areSelectionsEqual.js +1 -1
- package/dist/utils/areSelectionsEqual.js.map +1 -1
- package/dist/utils/areThemesEqual.d.ts.map +1 -1
- package/dist/utils/areThemesEqual.js +1 -1
- package/dist/utils/areThemesEqual.js.map +1 -1
- package/dist/utils/areVirtualWindowSpecsEqual.d.ts.map +1 -1
- package/dist/utils/areVirtualWindowSpecsEqual.js +1 -1
- package/dist/utils/areVirtualWindowSpecsEqual.js.map +1 -1
- package/dist/utils/areWorkerStatsEqual.d.ts +0 -2
- package/dist/utils/areWorkerStatsEqual.d.ts.map +1 -1
- package/dist/utils/areWorkerStatsEqual.js +1 -1
- package/dist/utils/areWorkerStatsEqual.js.map +1 -1
- package/dist/utils/cleanLastNewline.d.ts.map +1 -1
- package/dist/utils/cleanLastNewline.js +1 -1
- package/dist/utils/cleanLastNewline.js.map +1 -1
- package/dist/utils/computeEstimatedDiffHeights.d.ts.map +1 -1
- package/dist/utils/computeEstimatedDiffHeights.js +1 -2
- package/dist/utils/computeEstimatedDiffHeights.js.map +1 -1
- package/dist/utils/computeVirtualFileMetrics.d.ts.map +1 -1
- package/dist/utils/computeVirtualFileMetrics.js +1 -2
- package/dist/utils/computeVirtualFileMetrics.js.map +1 -1
- package/dist/utils/createAnnotationElement.d.ts +1 -1
- package/dist/utils/createAnnotationElement.d.ts.map +1 -1
- package/dist/utils/createAnnotationElement.js +1 -2
- package/dist/utils/createAnnotationElement.js.map +1 -1
- package/dist/utils/createAnnotationWrapperNode.d.ts.map +1 -1
- package/dist/utils/createAnnotationWrapperNode.js +1 -1
- package/dist/utils/createAnnotationWrapperNode.js.map +1 -1
- package/dist/utils/createContentColumn.d.ts +1 -1
- package/dist/utils/createContentColumn.d.ts.map +1 -1
- package/dist/utils/createContentColumn.js +1 -2
- package/dist/utils/createContentColumn.js.map +1 -1
- package/dist/utils/createEmptyRowBuffer.d.ts +1 -1
- package/dist/utils/createEmptyRowBuffer.d.ts.map +1 -1
- package/dist/utils/createEmptyRowBuffer.js +1 -2
- package/dist/utils/createEmptyRowBuffer.js.map +1 -1
- package/dist/utils/createFileHeaderElement.d.ts +1 -1
- package/dist/utils/createFileHeaderElement.d.ts.map +1 -1
- package/dist/utils/createFileHeaderElement.js +1 -2
- package/dist/utils/createFileHeaderElement.js.map +1 -1
- package/dist/utils/createGutterUtilityContentNode.d.ts.map +1 -1
- package/dist/utils/createGutterUtilityContentNode.js +1 -1
- package/dist/utils/createGutterUtilityContentNode.js.map +1 -1
- package/dist/utils/createGutterUtilityElement.d.ts +1 -1
- package/dist/utils/createGutterUtilityElement.d.ts.map +1 -1
- package/dist/utils/createGutterUtilityElement.js +1 -2
- package/dist/utils/createGutterUtilityElement.js.map +1 -1
- package/dist/utils/createNoNewlineElement.d.ts +1 -1
- package/dist/utils/createNoNewlineElement.d.ts.map +1 -1
- package/dist/utils/createNoNewlineElement.js +1 -2
- package/dist/utils/createNoNewlineElement.js.map +1 -1
- package/dist/utils/createPreElement.d.ts +1 -1
- package/dist/utils/createPreElement.d.ts.map +1 -1
- package/dist/utils/createPreElement.js +1 -3
- package/dist/utils/createPreElement.js.map +1 -1
- package/dist/utils/createRowNodes.d.ts.map +1 -1
- package/dist/utils/createRowNodes.js +1 -1
- package/dist/utils/createRowNodes.js.map +1 -1
- package/dist/utils/createSeparator.d.ts +1 -1
- package/dist/utils/createSeparator.d.ts.map +1 -1
- package/dist/utils/createSeparator.js +1 -2
- package/dist/utils/createSeparator.js.map +1 -1
- package/dist/utils/createSpanNodeFromToken.d.ts.map +1 -1
- package/dist/utils/createSpanNodeFromToken.js +1 -2
- package/dist/utils/createSpanNodeFromToken.js.map +1 -1
- package/dist/utils/createStyleElement.d.ts +1 -1
- package/dist/utils/createStyleElement.d.ts.map +1 -1
- package/dist/utils/createStyleElement.js +1 -2
- package/dist/utils/createStyleElement.js.map +1 -1
- package/dist/utils/createTransformerWithState.d.ts.map +1 -1
- package/dist/utils/createTransformerWithState.js +1 -2
- package/dist/utils/createTransformerWithState.js.map +1 -1
- package/dist/utils/createUnsafeCSSStyleNode.d.ts.map +1 -1
- package/dist/utils/createUnsafeCSSStyleNode.js +1 -2
- package/dist/utils/createUnsafeCSSStyleNode.js.map +1 -1
- package/dist/utils/createWindowFromScrollPosition.d.ts.map +1 -1
- package/dist/utils/createWindowFromScrollPosition.js +5 -5
- package/dist/utils/createWindowFromScrollPosition.js.map +1 -1
- package/dist/utils/cssWrappers.d.ts.map +1 -1
- package/dist/utils/cssWrappers.js +2 -3
- package/dist/utils/cssWrappers.js.map +1 -1
- package/dist/utils/detachString.d.ts.map +1 -1
- package/dist/utils/detachString.js +1 -1
- package/dist/utils/detachString.js.map +1 -1
- package/dist/utils/diffAcceptRejectHunk.d.ts.map +1 -1
- package/dist/utils/diffAcceptRejectHunk.js +1 -2
- package/dist/utils/diffAcceptRejectHunk.js.map +1 -1
- package/dist/utils/formatCSSVariablePrefix.d.ts.map +1 -1
- package/dist/utils/formatCSSVariablePrefix.js +1 -1
- package/dist/utils/formatCSSVariablePrefix.js.map +1 -1
- package/dist/utils/getDiffHunksRendererOptions.d.ts.map +1 -1
- package/dist/utils/getDiffHunksRendererOptions.js +1 -1
- package/dist/utils/getDiffHunksRendererOptions.js.map +1 -1
- package/dist/utils/getFileRendererOptions.d.ts.map +1 -1
- package/dist/utils/getFileRendererOptions.js +1 -1
- package/dist/utils/getFileRendererOptions.js.map +1 -1
- package/dist/utils/getFiletypeFromFileName.d.ts.map +1 -1
- package/dist/utils/getFiletypeFromFileName.js +1 -1
- package/dist/utils/getFiletypeFromFileName.js.map +1 -1
- package/dist/utils/getHighlighterOptions.d.ts.map +1 -1
- package/dist/utils/getHighlighterOptions.js +1 -2
- package/dist/utils/getHighlighterOptions.js.map +1 -1
- package/dist/utils/getHighlighterThemeStyles.d.ts.map +1 -1
- package/dist/utils/getHighlighterThemeStyles.js +1 -2
- package/dist/utils/getHighlighterThemeStyles.js.map +1 -1
- package/dist/utils/getHunkSeparatorSlotName.d.ts.map +1 -1
- package/dist/utils/getHunkSeparatorSlotName.js +1 -1
- package/dist/utils/getHunkSeparatorSlotName.js.map +1 -1
- package/dist/utils/getIconForType.d.ts.map +1 -1
- package/dist/utils/getIconForType.js +1 -1
- package/dist/utils/getIconForType.js.map +1 -1
- package/dist/utils/getLineAnnotationName.d.ts.map +1 -1
- package/dist/utils/getLineAnnotationName.js +1 -1
- package/dist/utils/getLineAnnotationName.js.map +1 -1
- package/dist/utils/getLineEndingType.d.ts.map +1 -1
- package/dist/utils/getLineEndingType.js +1 -1
- package/dist/utils/getLineEndingType.js.map +1 -1
- package/dist/utils/getLineNodes.d.ts +1 -1
- package/dist/utils/getLineNodes.d.ts.map +1 -1
- package/dist/utils/getLineNodes.js +1 -1
- package/dist/utils/getLineNodes.js.map +1 -1
- package/dist/utils/getMergeConflictActionSlotName.d.ts.map +1 -1
- package/dist/utils/getMergeConflictActionSlotName.js +1 -1
- package/dist/utils/getMergeConflictActionSlotName.js.map +1 -1
- package/dist/utils/getMergeConflictLineTypes.d.ts.map +1 -1
- package/dist/utils/getMergeConflictLineTypes.js +1 -2
- package/dist/utils/getMergeConflictLineTypes.js.map +1 -1
- package/dist/utils/getOrCreateCodeNode.d.ts.map +1 -1
- package/dist/utils/getOrCreateCodeNode.js +1 -1
- package/dist/utils/getOrCreateCodeNode.js.map +1 -1
- package/dist/utils/getSingularPatch.d.ts.map +1 -1
- package/dist/utils/getSingularPatch.js +1 -2
- package/dist/utils/getSingularPatch.js.map +1 -1
- package/dist/utils/getThemes.d.ts.map +1 -1
- package/dist/utils/getThemes.js +1 -2
- package/dist/utils/getThemes.js.map +1 -1
- package/dist/utils/getTotalLineCountFromHunks.d.ts.map +1 -1
- package/dist/utils/getTotalLineCountFromHunks.js +1 -1
- package/dist/utils/getTotalLineCountFromHunks.js.map +1 -1
- package/dist/utils/hast_utils.d.ts +1 -1
- package/dist/utils/hast_utils.d.ts.map +1 -1
- package/dist/utils/hast_utils.js +1 -1
- package/dist/utils/hast_utils.js.map +1 -1
- package/dist/utils/hostTheme.d.ts.map +1 -1
- package/dist/utils/hostTheme.js +1 -2
- package/dist/utils/hostTheme.js.map +1 -1
- package/dist/utils/includesFileAnnotations.d.ts +17 -0
- package/dist/utils/includesFileAnnotations.d.ts.map +1 -0
- package/dist/utils/includesFileAnnotations.js +19 -0
- package/dist/utils/includesFileAnnotations.js.map +1 -0
- package/dist/utils/isDefaultRenderRange.d.ts.map +1 -1
- package/dist/utils/isDefaultRenderRange.js +1 -1
- package/dist/utils/isDefaultRenderRange.js.map +1 -1
- package/dist/utils/isDiffPlainText.d.ts.map +1 -1
- package/dist/utils/isDiffPlainText.js +1 -2
- package/dist/utils/isDiffPlainText.js.map +1 -1
- package/dist/utils/isFilePlainText.d.ts.map +1 -1
- package/dist/utils/isFilePlainText.js +1 -2
- package/dist/utils/isFilePlainText.js.map +1 -1
- package/dist/utils/isStyleNode.d.ts.map +1 -1
- package/dist/utils/isStyleNode.js +1 -1
- package/dist/utils/isStyleNode.js.map +1 -1
- package/dist/utils/isWorkerContext.d.ts.map +1 -1
- package/dist/utils/isWorkerContext.js +1 -1
- package/dist/utils/isWorkerContext.js.map +1 -1
- package/dist/utils/iterateOverDiff.d.ts.map +1 -1
- package/dist/utils/iterateOverDiff.js +44 -45
- package/dist/utils/iterateOverDiff.js.map +1 -1
- package/dist/utils/iterateOverFile.d.ts.map +1 -1
- package/dist/utils/iterateOverFile.js +1 -1
- package/dist/utils/iterateOverFile.js.map +1 -1
- package/dist/utils/normalizeDiffResolution.d.ts.map +1 -1
- package/dist/utils/normalizeDiffResolution.js +1 -1
- package/dist/utils/normalizeDiffResolution.js.map +1 -1
- package/dist/utils/parseDiffDecorations.d.ts.map +1 -1
- package/dist/utils/parseDiffDecorations.js +1 -2
- package/dist/utils/parseDiffDecorations.js.map +1 -1
- package/dist/utils/parseDiffFromFile.d.ts +0 -1
- package/dist/utils/parseDiffFromFile.d.ts.map +1 -1
- package/dist/utils/parseDiffFromFile.js +1 -2
- package/dist/utils/parseDiffFromFile.js.map +1 -1
- package/dist/utils/parseLineType.d.ts.map +1 -1
- package/dist/utils/parseLineType.js +1 -1
- package/dist/utils/parseLineType.js.map +1 -1
- package/dist/utils/parseMergeConflictDiffFromFile.d.ts.map +1 -1
- package/dist/utils/parseMergeConflictDiffFromFile.js +5 -5
- package/dist/utils/parseMergeConflictDiffFromFile.js.map +1 -1
- package/dist/utils/parsePatchFiles.d.ts.map +1 -1
- package/dist/utils/parsePatchFiles.js +6 -7
- package/dist/utils/parsePatchFiles.js.map +1 -1
- package/dist/utils/prefersReducedMotion.d.ts.map +1 -1
- package/dist/utils/prefersReducedMotion.js +1 -1
- package/dist/utils/prefersReducedMotion.js.map +1 -1
- package/dist/utils/prerenderHTMLIfNecessary.d.ts.map +1 -1
- package/dist/utils/prerenderHTMLIfNecessary.js +1 -1
- package/dist/utils/prerenderHTMLIfNecessary.js.map +1 -1
- package/dist/utils/processLine.d.ts +1 -1
- package/dist/utils/processLine.d.ts.map +1 -1
- package/dist/utils/processLine.js +1 -2
- package/dist/utils/processLine.js.map +1 -1
- package/dist/utils/renderDiffWithHighlighter.d.ts.map +1 -1
- package/dist/utils/renderDiffWithHighlighter.js +8 -7
- package/dist/utils/renderDiffWithHighlighter.js.map +1 -1
- package/dist/utils/renderFileWithHighlighter.d.ts.map +1 -1
- package/dist/utils/renderFileWithHighlighter.js +5 -4
- package/dist/utils/renderFileWithHighlighter.js.map +1 -1
- package/dist/utils/resolveConflict.d.ts.map +1 -1
- package/dist/utils/resolveConflict.js +1 -2
- package/dist/utils/resolveConflict.js.map +1 -1
- package/dist/utils/resolveRegion.d.ts.map +1 -1
- package/dist/utils/resolveRegion.js +1 -1
- package/dist/utils/resolveRegion.js.map +1 -1
- package/dist/utils/roundToDevicePixel.d.ts.map +1 -1
- package/dist/utils/roundToDevicePixel.js +1 -1
- package/dist/utils/roundToDevicePixel.js.map +1 -1
- package/dist/utils/scrollbarGutter.d.ts.map +1 -1
- package/dist/utils/scrollbarGutter.js +1 -2
- package/dist/utils/scrollbarGutter.js.map +1 -1
- package/dist/utils/setLanguageOverride.d.ts.map +1 -1
- package/dist/utils/setLanguageOverride.js +1 -1
- package/dist/utils/setLanguageOverride.js.map +1 -1
- package/dist/utils/setWrapperNodeProps.d.ts.map +1 -1
- package/dist/utils/setWrapperNodeProps.js +1 -2
- package/dist/utils/setWrapperNodeProps.js.map +1 -1
- package/dist/utils/shouldUseTokenTransformer.d.ts.map +1 -1
- package/dist/utils/shouldUseTokenTransformer.js +1 -1
- package/dist/utils/shouldUseTokenTransformer.js.map +1 -1
- package/dist/utils/splitFileContents.d.ts.map +1 -1
- package/dist/utils/splitFileContents.js +1 -2
- package/dist/utils/splitFileContents.js.map +1 -1
- package/dist/utils/trimPatchContext.d.ts.map +1 -1
- package/dist/utils/trimPatchContext.js +1 -2
- package/dist/utils/trimPatchContext.js.map +1 -1
- package/dist/utils/virtualDiffLayout.d.ts.map +1 -1
- package/dist/utils/virtualDiffLayout.js +1 -2
- package/dist/utils/virtualDiffLayout.js.map +1 -1
- package/dist/utils/wrapTokenFragments.d.ts +1 -1
- package/dist/utils/wrapTokenFragments.d.ts.map +1 -1
- package/dist/utils/wrapTokenFragments.js +1 -2
- package/dist/utils/wrapTokenFragments.js.map +1 -1
- package/dist/worker/WorkerPoolManager.d.ts.map +1 -1
- package/dist/worker/WorkerPoolManager.js +5 -5
- package/dist/worker/WorkerPoolManager.js.map +1 -1
- package/dist/worker/getOrCreateWorkerPoolSingleton.d.ts.map +1 -1
- package/dist/worker/getOrCreateWorkerPoolSingleton.js +1 -2
- package/dist/worker/getOrCreateWorkerPoolSingleton.js.map +1 -1
- package/dist/worker/index.js +1 -2
- package/dist/worker/types.d.ts.map +1 -1
- package/dist/worker/wasm-B9ZqxnKj.js +8 -0
- package/dist/worker/wasm-B9ZqxnKj.js.map +1 -0
- package/dist/worker/worker-portable.js +2769 -6370
- package/dist/worker/worker-portable.js.map +1 -1
- package/dist/worker/worker.js +97 -128
- package/dist/worker/worker.js.map +1 -1
- package/package.json +15 -19
- package/dist/worker/wasm-qE0LgnY3.js +0 -10
- package/dist/worker/wasm-qE0LgnY3.js.map +0 -1
package/dist/worker/worker.js
CHANGED
|
@@ -5,9 +5,7 @@ import { createThemeResolver } from "@pierre/theming";
|
|
|
5
5
|
import { diffChars, diffWordsWithSpace } from "diff";
|
|
6
6
|
import { transformerStyleToClass } from "@shikijs/transformers";
|
|
7
7
|
import { normalizeThemeColors } from "@pierre/theming/color";
|
|
8
|
-
|
|
9
|
-
//#region src/constants.ts
|
|
10
|
-
const DIFFS_DEVELOPMENT_BUILD = (() => {
|
|
8
|
+
(() => {
|
|
11
9
|
try {
|
|
12
10
|
return process.env.NODE_ENV === "development";
|
|
13
11
|
} catch {
|
|
@@ -19,30 +17,17 @@ const DEFAULT_THEMES = {
|
|
|
19
17
|
dark: "pierre-dark",
|
|
20
18
|
light: "pierre-light"
|
|
21
19
|
};
|
|
22
|
-
|
|
23
|
-
const DEFAULT_VIRTUAL_FILE_METRICS = {
|
|
24
|
-
hunkLineCount: 50,
|
|
25
|
-
lineHeight: 20,
|
|
26
|
-
diffHeaderHeight: 44,
|
|
27
|
-
spacing: 8
|
|
28
|
-
};
|
|
29
|
-
const DEFAULT_CODE_VIEW_FILE_METRICS = {
|
|
30
|
-
...DEFAULT_VIRTUAL_FILE_METRICS,
|
|
31
|
-
hunkLineCount: 1
|
|
32
|
-
};
|
|
33
|
-
const DEFAULT_EXPANDED_REGION = Object.freeze({
|
|
20
|
+
Object.freeze({
|
|
34
21
|
fromStart: 0,
|
|
35
22
|
fromEnd: 0
|
|
36
23
|
});
|
|
37
|
-
|
|
38
24
|
//#endregion
|
|
39
25
|
//#region src/highlighter/languages/constants.ts
|
|
40
26
|
const ResolvedLanguages = /* @__PURE__ */ new Map();
|
|
41
27
|
const AttachedLanguages = /* @__PURE__ */ new Set();
|
|
42
|
-
|
|
43
28
|
//#endregion
|
|
44
29
|
//#region src/highlighter/languages/attachResolvedLanguages.ts
|
|
45
|
-
function attachResolvedLanguages(resolvedLanguages, highlighter
|
|
30
|
+
function attachResolvedLanguages(resolvedLanguages, highlighter) {
|
|
46
31
|
resolvedLanguages = Array.isArray(resolvedLanguages) ? resolvedLanguages : [resolvedLanguages];
|
|
47
32
|
for (const resolvedLang of resolvedLanguages) {
|
|
48
33
|
if (AttachedLanguages.has(resolvedLang.name)) continue;
|
|
@@ -52,21 +37,18 @@ function attachResolvedLanguages(resolvedLanguages, highlighter$1) {
|
|
|
52
37
|
ResolvedLanguages.set(resolvedLang.name, lang);
|
|
53
38
|
}
|
|
54
39
|
AttachedLanguages.add(lang.name);
|
|
55
|
-
highlighter
|
|
40
|
+
highlighter.loadLanguageSync(lang.data);
|
|
56
41
|
}
|
|
57
42
|
}
|
|
58
|
-
|
|
59
43
|
//#endregion
|
|
60
44
|
//#region src/highlighter/themes/constants.ts
|
|
61
45
|
const AttachedThemes = /* @__PURE__ */ new Set();
|
|
62
|
-
|
|
63
46
|
//#endregion
|
|
64
47
|
//#region src/highlighter/themes/themeResolver.ts
|
|
65
48
|
const themeResolver = createThemeResolver();
|
|
66
|
-
|
|
67
49
|
//#endregion
|
|
68
50
|
//#region src/highlighter/themes/attachResolvedThemes.ts
|
|
69
|
-
function attachResolvedThemes(themes, highlighter
|
|
51
|
+
function attachResolvedThemes(themes, highlighter) {
|
|
70
52
|
themes = Array.isArray(themes) ? themes : [themes];
|
|
71
53
|
for (let themeRef of themes) {
|
|
72
54
|
let resolvedTheme;
|
|
@@ -80,10 +62,9 @@ function attachResolvedThemes(themes, highlighter$1) {
|
|
|
80
62
|
}
|
|
81
63
|
if (AttachedThemes.has(themeRef)) continue;
|
|
82
64
|
AttachedThemes.add(themeRef);
|
|
83
|
-
highlighter
|
|
65
|
+
highlighter.loadThemeSync(resolvedTheme);
|
|
84
66
|
}
|
|
85
67
|
}
|
|
86
|
-
|
|
87
68
|
//#endregion
|
|
88
69
|
//#region src/utils/getFiletypeFromFileName.ts
|
|
89
70
|
const CUSTOM_EXTENSION_TO_FILE_FORMAT = /* @__PURE__ */ new Map();
|
|
@@ -455,13 +436,11 @@ function replaceCustomExtensions(version, map) {
|
|
|
455
436
|
customExtensionsVersion = version;
|
|
456
437
|
return true;
|
|
457
438
|
}
|
|
458
|
-
|
|
459
439
|
//#endregion
|
|
460
440
|
//#region src/utils/cleanLastNewline.ts
|
|
461
441
|
function cleanLastNewline(contents) {
|
|
462
442
|
return contents.replace(/\n$|\r\n$/, "");
|
|
463
443
|
}
|
|
464
|
-
|
|
465
444
|
//#endregion
|
|
466
445
|
//#region src/utils/hast_utils.ts
|
|
467
446
|
function createTextNodeElement(value) {
|
|
@@ -486,7 +465,6 @@ function findCodeElement(nodes) {
|
|
|
486
465
|
else firstChild = null;
|
|
487
466
|
}
|
|
488
467
|
}
|
|
489
|
-
|
|
490
468
|
//#endregion
|
|
491
469
|
//#region src/utils/processLine.ts
|
|
492
470
|
function processLine(node, line, state) {
|
|
@@ -508,7 +486,6 @@ function processLine(node, line, state) {
|
|
|
508
486
|
if (node.children.length === 0) node.children.push(createTextNodeElement("\n"));
|
|
509
487
|
return node;
|
|
510
488
|
}
|
|
511
|
-
|
|
512
489
|
//#endregion
|
|
513
490
|
//#region src/utils/wrapTokenFragments.ts
|
|
514
491
|
const NO_TOKEN = Symbol("no-token");
|
|
@@ -586,7 +563,6 @@ function stripTokenChar(node) {
|
|
|
586
563
|
function setTokenChar(node, char) {
|
|
587
564
|
node.properties["data-char"] = char;
|
|
588
565
|
}
|
|
589
|
-
|
|
590
566
|
//#endregion
|
|
591
567
|
//#region src/utils/createTransformerWithState.ts
|
|
592
568
|
function createTransformerWithState(useTokenTransformer = false, useCSSClasses = false) {
|
|
@@ -660,19 +636,17 @@ const tokenStyleNormalizer = {
|
|
|
660
636
|
}
|
|
661
637
|
}
|
|
662
638
|
};
|
|
663
|
-
|
|
664
639
|
//#endregion
|
|
665
640
|
//#region src/utils/formatCSSVariablePrefix.ts
|
|
666
641
|
function formatCSSVariablePrefix(type) {
|
|
667
642
|
return `--${type === "token" ? "diffs-token" : "diffs"}-`;
|
|
668
643
|
}
|
|
669
|
-
|
|
670
644
|
//#endregion
|
|
671
645
|
//#region src/utils/getHighlighterThemeStyles.ts
|
|
672
|
-
function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter
|
|
646
|
+
function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter, prefix }) {
|
|
673
647
|
let styles = "";
|
|
674
648
|
if (typeof theme === "string") {
|
|
675
|
-
const themeData = highlighter
|
|
649
|
+
const themeData = highlighter.getTheme(theme);
|
|
676
650
|
const normalized = normalizeThemeColors(themeData);
|
|
677
651
|
styles += `color:${normalized.fg};`;
|
|
678
652
|
styles += `background-color:${normalized.bg};`;
|
|
@@ -680,12 +654,12 @@ function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter: highli
|
|
|
680
654
|
styles += `${formatCSSVariablePrefix("global")}bg:${normalized.bg};`;
|
|
681
655
|
styles += getGitVariables(themeData, prefix);
|
|
682
656
|
} else {
|
|
683
|
-
let themeData = highlighter
|
|
657
|
+
let themeData = highlighter.getTheme(theme.dark);
|
|
684
658
|
let normalized = normalizeThemeColors(themeData);
|
|
685
659
|
styles += `${formatCSSVariablePrefix("global")}dark:${normalized.fg};`;
|
|
686
660
|
styles += `${formatCSSVariablePrefix("global")}dark-bg:${normalized.bg};`;
|
|
687
661
|
styles += getGitVariables(themeData, "dark");
|
|
688
|
-
themeData = highlighter
|
|
662
|
+
themeData = highlighter.getTheme(theme.light);
|
|
689
663
|
normalized = normalizeThemeColors(themeData);
|
|
690
664
|
styles += `${formatCSSVariablePrefix("global")}light:${normalized.fg};`;
|
|
691
665
|
styles += `${formatCSSVariablePrefix("global")}light-bg:${normalized.bg};`;
|
|
@@ -704,7 +678,6 @@ function getGitVariables(themeData, modePrefix) {
|
|
|
704
678
|
if (modifiedBlue != null) styles += `${formatCSSVariablePrefix("global")}${modePrefix}modified-color:${modifiedBlue};`;
|
|
705
679
|
return styles;
|
|
706
680
|
}
|
|
707
|
-
|
|
708
681
|
//#endregion
|
|
709
682
|
//#region src/utils/getLineNodes.ts
|
|
710
683
|
function getLineNodes(nodes) {
|
|
@@ -717,7 +690,6 @@ function getLineNodes(nodes) {
|
|
|
717
690
|
console.error(nodes);
|
|
718
691
|
throw new Error("getLineNodes: Unable to find children");
|
|
719
692
|
}
|
|
720
|
-
|
|
721
693
|
//#endregion
|
|
722
694
|
//#region src/utils/virtualDiffLayout.ts
|
|
723
695
|
function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }) {
|
|
@@ -782,10 +754,9 @@ function getTrailingExpandedRegion({ fileDiff, hunkIndex, expandedHunks, collaps
|
|
|
782
754
|
renderAll: fromStart >= trailingRangeSize
|
|
783
755
|
};
|
|
784
756
|
}
|
|
785
|
-
|
|
786
757
|
//#endregion
|
|
787
758
|
//#region src/utils/iterateOverDiff.ts
|
|
788
|
-
function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold =
|
|
759
|
+
function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = 1, callback }) {
|
|
789
760
|
const iterationStart = getIterationStartState({
|
|
790
761
|
diff,
|
|
791
762
|
diffStyle,
|
|
@@ -860,10 +831,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
860
831
|
errorPrefix: "iterateOverDiff"
|
|
861
832
|
}) : void 0;
|
|
862
833
|
const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
|
|
863
|
-
function getTrailingCollapsedAfter(unifiedLineIndex
|
|
834
|
+
function getTrailingCollapsedAfter(unifiedLineIndex, splitLineIndex) {
|
|
864
835
|
if (trailingRegion == null || trailingRegion.collapsedLines <= 0 || trailingRegion.fromStart + trailingRegion.fromEnd > 0) return 0;
|
|
865
|
-
if (diffStyle === "unified") return unifiedLineIndex
|
|
866
|
-
return splitLineIndex
|
|
836
|
+
if (diffStyle === "unified") return unifiedLineIndex === hunk.unifiedLineStart + hunk.unifiedLineCount - 1 ? trailingRegion.collapsedLines : 0;
|
|
837
|
+
return splitLineIndex === hunk.splitLineStart + hunk.splitLineCount - 1 ? trailingRegion.collapsedLines : 0;
|
|
867
838
|
}
|
|
868
839
|
let consumedCollapsed = leadingRegion.collapsedLines === 0;
|
|
869
840
|
function consumePendingCollapsed() {
|
|
@@ -872,12 +843,12 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
872
843
|
return leadingRegion.collapsedLines;
|
|
873
844
|
}
|
|
874
845
|
if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
|
|
875
|
-
let unifiedLineIndex
|
|
876
|
-
let splitLineIndex
|
|
877
|
-
let deletionLineIndex
|
|
878
|
-
let additionLineIndex
|
|
879
|
-
let deletionLineNumber
|
|
880
|
-
let additionLineNumber
|
|
846
|
+
let unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.rangeSize;
|
|
847
|
+
let splitLineIndex = hunk.splitLineStart - leadingRegion.rangeSize;
|
|
848
|
+
let deletionLineIndex = hunk.deletionLineIndex - leadingRegion.rangeSize;
|
|
849
|
+
let additionLineIndex = hunk.additionLineIndex - leadingRegion.rangeSize;
|
|
850
|
+
let deletionLineNumber = hunk.deletionStart - leadingRegion.rangeSize;
|
|
851
|
+
let additionLineNumber = hunk.additionStart - leadingRegion.rangeSize;
|
|
881
852
|
if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
|
|
882
853
|
return state.emit({
|
|
883
854
|
hunkIndex,
|
|
@@ -886,27 +857,27 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
886
857
|
collapsedAfter: 0,
|
|
887
858
|
type: "context-expanded",
|
|
888
859
|
deletionLine: {
|
|
889
|
-
lineNumber: deletionLineNumber
|
|
890
|
-
lineIndex: deletionLineIndex
|
|
860
|
+
lineNumber: deletionLineNumber + index,
|
|
861
|
+
lineIndex: deletionLineIndex + index,
|
|
891
862
|
noEOFCR: false,
|
|
892
|
-
unifiedLineIndex: unifiedLineIndex
|
|
893
|
-
splitLineIndex: splitLineIndex
|
|
863
|
+
unifiedLineIndex: unifiedLineIndex + index,
|
|
864
|
+
splitLineIndex: splitLineIndex + index
|
|
894
865
|
},
|
|
895
866
|
additionLine: {
|
|
896
|
-
unifiedLineIndex: unifiedLineIndex
|
|
897
|
-
splitLineIndex: splitLineIndex
|
|
898
|
-
lineIndex: additionLineIndex
|
|
899
|
-
lineNumber: additionLineNumber
|
|
867
|
+
unifiedLineIndex: unifiedLineIndex + index,
|
|
868
|
+
splitLineIndex: splitLineIndex + index,
|
|
869
|
+
lineIndex: additionLineIndex + index,
|
|
870
|
+
lineNumber: additionLineNumber + index,
|
|
900
871
|
noEOFCR: false
|
|
901
872
|
}
|
|
902
873
|
});
|
|
903
874
|
})) break hunkIterator;
|
|
904
|
-
unifiedLineIndex
|
|
905
|
-
splitLineIndex
|
|
906
|
-
deletionLineIndex
|
|
907
|
-
additionLineIndex
|
|
908
|
-
deletionLineNumber
|
|
909
|
-
additionLineNumber
|
|
875
|
+
unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.fromEnd;
|
|
876
|
+
splitLineIndex = hunk.splitLineStart - leadingRegion.fromEnd;
|
|
877
|
+
deletionLineIndex = hunk.deletionLineIndex - leadingRegion.fromEnd;
|
|
878
|
+
additionLineIndex = hunk.additionLineIndex - leadingRegion.fromEnd;
|
|
879
|
+
deletionLineNumber = hunk.deletionStart - leadingRegion.fromEnd;
|
|
880
|
+
additionLineNumber = hunk.additionStart - leadingRegion.fromEnd;
|
|
910
881
|
if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
|
|
911
882
|
return state.emit({
|
|
912
883
|
hunkIndex,
|
|
@@ -915,17 +886,17 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
915
886
|
collapsedAfter: 0,
|
|
916
887
|
type: "context-expanded",
|
|
917
888
|
deletionLine: {
|
|
918
|
-
lineNumber: deletionLineNumber
|
|
919
|
-
lineIndex: deletionLineIndex
|
|
889
|
+
lineNumber: deletionLineNumber + index,
|
|
890
|
+
lineIndex: deletionLineIndex + index,
|
|
920
891
|
noEOFCR: false,
|
|
921
|
-
unifiedLineIndex: unifiedLineIndex
|
|
922
|
-
splitLineIndex: splitLineIndex
|
|
892
|
+
unifiedLineIndex: unifiedLineIndex + index,
|
|
893
|
+
splitLineIndex: splitLineIndex + index
|
|
923
894
|
},
|
|
924
895
|
additionLine: {
|
|
925
|
-
unifiedLineIndex: unifiedLineIndex
|
|
926
|
-
splitLineIndex: splitLineIndex
|
|
927
|
-
lineIndex: additionLineIndex
|
|
928
|
-
lineNumber: additionLineNumber
|
|
896
|
+
unifiedLineIndex: unifiedLineIndex + index,
|
|
897
|
+
splitLineIndex: splitLineIndex + index,
|
|
898
|
+
lineIndex: additionLineIndex + index,
|
|
899
|
+
lineNumber: additionLineNumber + index,
|
|
929
900
|
noEOFCR: false
|
|
930
901
|
}
|
|
931
902
|
});
|
|
@@ -1070,20 +1041,20 @@ function getIterationStartState({ diff, diffStyle, startingLine, expandedHunks,
|
|
|
1070
1041
|
let result = diff.hunks.length;
|
|
1071
1042
|
while (low <= high) {
|
|
1072
1043
|
const mid = low + high >> 1;
|
|
1073
|
-
const counts
|
|
1074
|
-
if (counts
|
|
1075
|
-
if ((diffStyle === "unified" ? counts
|
|
1044
|
+
const counts = prefixCounts[mid + 1];
|
|
1045
|
+
if (counts == null) throw new Error("iterateOverDiff: invalid hunk prefix index");
|
|
1046
|
+
if ((diffStyle === "unified" ? counts.unifiedCount : counts.splitCount) > startingLine) {
|
|
1076
1047
|
result = mid;
|
|
1077
1048
|
high = mid - 1;
|
|
1078
1049
|
} else low = mid + 1;
|
|
1079
1050
|
}
|
|
1080
1051
|
if (result >= diff.hunks.length) {
|
|
1081
|
-
const counts
|
|
1082
|
-
if (counts
|
|
1052
|
+
const counts = prefixCounts[diff.hunks.length];
|
|
1053
|
+
if (counts == null) throw new Error("iterateOverDiff: invalid terminal hunk prefix index");
|
|
1083
1054
|
return {
|
|
1084
1055
|
hunkIndex: diff.hunks.length,
|
|
1085
|
-
splitCount: counts
|
|
1086
|
-
unifiedCount: counts
|
|
1056
|
+
splitCount: counts.splitCount,
|
|
1057
|
+
unifiedCount: counts.unifiedCount
|
|
1087
1058
|
};
|
|
1088
1059
|
}
|
|
1089
1060
|
const counts = prefixCounts[result];
|
|
@@ -1138,9 +1109,9 @@ function getContextLineIterationBounds(state, count, diffStyle) {
|
|
|
1138
1109
|
if (!state.isWindowedHighlight || count <= 0) return [0, count];
|
|
1139
1110
|
const ranges = [];
|
|
1140
1111
|
function pushRange(currentCount) {
|
|
1141
|
-
const start
|
|
1142
|
-
const end
|
|
1143
|
-
if (end
|
|
1112
|
+
const start = Math.max(0, state.viewportStart - currentCount);
|
|
1113
|
+
const end = Math.min(count, state.viewportEnd - currentCount);
|
|
1114
|
+
if (end > start) ranges.push([start, end]);
|
|
1144
1115
|
}
|
|
1145
1116
|
if (diffStyle !== "split") pushRange(state.unifiedCount);
|
|
1146
1117
|
if (diffStyle !== "unified") pushRange(state.splitCount);
|
|
@@ -1266,7 +1237,6 @@ function getChangeLineData({ hunkIndex, hunk, collapsedAfter, collapsedBefore, d
|
|
|
1266
1237
|
additionLine
|
|
1267
1238
|
};
|
|
1268
1239
|
}
|
|
1269
|
-
|
|
1270
1240
|
//#endregion
|
|
1271
1241
|
//#region src/utils/parseDiffDecorations.ts
|
|
1272
1242
|
function createDiffSpanDecoration({ line, spanStart, spanLength }) {
|
|
@@ -1296,11 +1266,10 @@ function pushOrJoinSpan({ item, arr, enableJoin, isNeutral = false, isLastItem =
|
|
|
1296
1266
|
}
|
|
1297
1267
|
arr.push([isNeutral ? 0 : 1, item.value]);
|
|
1298
1268
|
}
|
|
1299
|
-
|
|
1300
1269
|
//#endregion
|
|
1301
1270
|
//#region src/utils/renderDiffWithHighlighter.ts
|
|
1302
1271
|
const DEFAULT_PLAIN_TEXT_OPTIONS$1 = { forcePlainText: false };
|
|
1303
|
-
function renderDiffWithHighlighter(diff, highlighter
|
|
1272
|
+
function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText, startingLine, totalLines, expandedHunks, collapsedContextThreshold = 1 } = DEFAULT_PLAIN_TEXT_OPTIONS$1) {
|
|
1304
1273
|
if (forcePlainText) {
|
|
1305
1274
|
startingLine ??= 0;
|
|
1306
1275
|
totalLines ??= Infinity;
|
|
@@ -1309,10 +1278,10 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
|
|
|
1309
1278
|
totalLines = Infinity;
|
|
1310
1279
|
}
|
|
1311
1280
|
const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
|
|
1312
|
-
const baseThemeType = typeof options.theme === "string" ? highlighter
|
|
1281
|
+
const baseThemeType = typeof options.theme === "string" ? highlighter.getTheme(options.theme).type : void 0;
|
|
1313
1282
|
const themeStyles = getHighlighterThemeStyles({
|
|
1314
1283
|
theme: options.theme,
|
|
1315
|
-
highlighter
|
|
1284
|
+
highlighter
|
|
1316
1285
|
});
|
|
1317
1286
|
const lineDiffType = forcePlainText && !isWindowedHighlight && (diff.unifiedLineCount > 1e3 || diff.splitLineCount > 1e3) ? "none" : options.lineDiffType;
|
|
1318
1287
|
const code = {
|
|
@@ -1401,7 +1370,7 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
|
|
|
1401
1370
|
additionFile,
|
|
1402
1371
|
additionInfo: bucket.additionInfo,
|
|
1403
1372
|
additionDecorations: bucket.additionDecorations,
|
|
1404
|
-
highlighter
|
|
1373
|
+
highlighter,
|
|
1405
1374
|
options,
|
|
1406
1375
|
languageOverride: forcePlainText ? "text" : diff.lang
|
|
1407
1376
|
});
|
|
@@ -1506,7 +1475,7 @@ function createBucket() {
|
|
|
1506
1475
|
additionSegments: []
|
|
1507
1476
|
};
|
|
1508
1477
|
}
|
|
1509
|
-
function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter
|
|
1478
|
+
function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter, deletionDecorations, additionDecorations, languageOverride, options: { theme: themeOrThemes = DEFAULT_THEMES, ...options } }) {
|
|
1510
1479
|
const deletionLang = languageOverride ?? getFiletypeFromFileName(deletionFile.name);
|
|
1511
1480
|
const additionLang = languageOverride ?? getFiletypeFromFileName(additionFile.name);
|
|
1512
1481
|
const { state, transformers } = createTransformerWithState(options.useTokenTransformer);
|
|
@@ -1518,7 +1487,8 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
|
|
|
1518
1487
|
transformers,
|
|
1519
1488
|
decorations: void 0,
|
|
1520
1489
|
defaultColor: false,
|
|
1521
|
-
cssVariablePrefix: formatCSSVariablePrefix("token")
|
|
1490
|
+
cssVariablePrefix: formatCSSVariablePrefix("token"),
|
|
1491
|
+
tokenizeTimeLimit: 0
|
|
1522
1492
|
} : {
|
|
1523
1493
|
...options,
|
|
1524
1494
|
lang: "text",
|
|
@@ -1526,7 +1496,8 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
|
|
|
1526
1496
|
transformers,
|
|
1527
1497
|
decorations: void 0,
|
|
1528
1498
|
defaultColor: false,
|
|
1529
|
-
cssVariablePrefix: formatCSSVariablePrefix("token")
|
|
1499
|
+
cssVariablePrefix: formatCSSVariablePrefix("token"),
|
|
1500
|
+
tokenizeTimeLimit: 0
|
|
1530
1501
|
};
|
|
1531
1502
|
})();
|
|
1532
1503
|
return {
|
|
@@ -1535,18 +1506,17 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
|
|
|
1535
1506
|
hastConfig.lang = deletionLang;
|
|
1536
1507
|
state.lineInfo = deletionInfo;
|
|
1537
1508
|
hastConfig.decorations = deletionDecorations;
|
|
1538
|
-
return getLineNodes(highlighter
|
|
1509
|
+
return getLineNodes(highlighter.codeToHast(cleanLastNewline(deletionFile.contents), hastConfig));
|
|
1539
1510
|
})(),
|
|
1540
1511
|
additionLines: (() => {
|
|
1541
1512
|
if (additionFile.contents === "") return [];
|
|
1542
1513
|
hastConfig.lang = additionLang;
|
|
1543
1514
|
hastConfig.decorations = additionDecorations;
|
|
1544
1515
|
state.lineInfo = additionInfo;
|
|
1545
|
-
return getLineNodes(highlighter
|
|
1516
|
+
return getLineNodes(highlighter.codeToHast(cleanLastNewline(additionFile.contents), hastConfig));
|
|
1546
1517
|
})()
|
|
1547
1518
|
};
|
|
1548
1519
|
}
|
|
1549
|
-
|
|
1550
1520
|
//#endregion
|
|
1551
1521
|
//#region src/utils/iterateOverFile.ts
|
|
1552
1522
|
/**
|
|
@@ -1593,7 +1563,6 @@ function iterateOverFile({ lines, startingLine = 0, totalLines = Infinity, callb
|
|
|
1593
1563
|
}) === true || isLastLine) break;
|
|
1594
1564
|
}
|
|
1595
1565
|
}
|
|
1596
|
-
|
|
1597
1566
|
//#endregion
|
|
1598
1567
|
//#region src/utils/splitFileContents.ts
|
|
1599
1568
|
/**
|
|
@@ -1606,11 +1575,10 @@ function iterateOverFile({ lines, startingLine = 0, totalLines = Infinity, callb
|
|
|
1606
1575
|
function splitFileContents(contents) {
|
|
1607
1576
|
return contents !== "" ? contents.split(SPLIT_WITH_NEWLINES) : [];
|
|
1608
1577
|
}
|
|
1609
|
-
|
|
1610
1578
|
//#endregion
|
|
1611
1579
|
//#region src/utils/renderFileWithHighlighter.ts
|
|
1612
1580
|
const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
|
|
1613
|
-
function renderFileWithHighlighter(file, highlighter
|
|
1581
|
+
function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES, tokenizeMaxLineLength, useTokenTransformer }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
|
|
1614
1582
|
if (forcePlainText) {
|
|
1615
1583
|
startingLine ??= 0;
|
|
1616
1584
|
totalLines ??= Infinity;
|
|
@@ -1621,10 +1589,10 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
|
|
|
1621
1589
|
const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
|
|
1622
1590
|
const { state, transformers } = createTransformerWithState(useTokenTransformer);
|
|
1623
1591
|
const lang = forcePlainText ? "text" : file.lang ?? getFiletypeFromFileName(file.name);
|
|
1624
|
-
const baseThemeType = typeof theme === "string" ? highlighter
|
|
1592
|
+
const baseThemeType = typeof theme === "string" ? highlighter.getTheme(theme).type : void 0;
|
|
1625
1593
|
const themeStyles = getHighlighterThemeStyles({
|
|
1626
1594
|
theme,
|
|
1627
|
-
highlighter
|
|
1595
|
+
highlighter
|
|
1628
1596
|
});
|
|
1629
1597
|
state.lineInfo = (shikiLineNumber) => ({
|
|
1630
1598
|
type: "context",
|
|
@@ -1638,7 +1606,8 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
|
|
|
1638
1606
|
transformers,
|
|
1639
1607
|
defaultColor: false,
|
|
1640
1608
|
cssVariablePrefix: formatCSSVariablePrefix("token"),
|
|
1641
|
-
tokenizeMaxLineLength
|
|
1609
|
+
tokenizeMaxLineLength,
|
|
1610
|
+
tokenizeTimeLimit: 0
|
|
1642
1611
|
};
|
|
1643
1612
|
return {
|
|
1644
1613
|
lang,
|
|
@@ -1646,10 +1615,11 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
|
|
|
1646
1615
|
transformers,
|
|
1647
1616
|
defaultColor: false,
|
|
1648
1617
|
cssVariablePrefix: formatCSSVariablePrefix("token"),
|
|
1649
|
-
tokenizeMaxLineLength
|
|
1618
|
+
tokenizeMaxLineLength,
|
|
1619
|
+
tokenizeTimeLimit: 0
|
|
1650
1620
|
};
|
|
1651
1621
|
})();
|
|
1652
|
-
const highlightedLines = getLineNodes(highlighter
|
|
1622
|
+
const highlightedLines = getLineNodes(highlighter.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? splitFileContents(file.contents), startingLine, totalLines) : cleanLastNewline(file.contents), hastConfig));
|
|
1653
1623
|
const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
|
|
1654
1624
|
if (isWindowedHighlight) code.push(...highlightedLines);
|
|
1655
1625
|
return {
|
|
@@ -1670,7 +1640,6 @@ function extractWindowedFileContent(lines, startingLine, totalLines) {
|
|
|
1670
1640
|
});
|
|
1671
1641
|
return windowContent;
|
|
1672
1642
|
}
|
|
1673
|
-
|
|
1674
1643
|
//#endregion
|
|
1675
1644
|
//#region src/worker/worker.ts
|
|
1676
1645
|
let highlighter;
|
|
@@ -1712,15 +1681,15 @@ async function handleMessage(request) {
|
|
|
1712
1681
|
EMPTY_REGEXP.exec("");
|
|
1713
1682
|
}
|
|
1714
1683
|
}
|
|
1715
|
-
async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages, customExtensionsVersion
|
|
1716
|
-
let highlighter
|
|
1717
|
-
if ("then" in highlighter
|
|
1684
|
+
async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
|
|
1685
|
+
let highlighter = getHighlighter(preferredHighlighter);
|
|
1686
|
+
if ("then" in highlighter) highlighter = await highlighter;
|
|
1718
1687
|
syncCustomExtensionsFromRequest({
|
|
1719
|
-
customExtensionsVersion
|
|
1688
|
+
customExtensionsVersion,
|
|
1720
1689
|
customExtensionMap
|
|
1721
1690
|
});
|
|
1722
|
-
attachResolvedThemes(resolvedThemes, highlighter
|
|
1723
|
-
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter
|
|
1691
|
+
attachResolvedThemes(resolvedThemes, highlighter);
|
|
1692
|
+
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
|
|
1724
1693
|
renderOptions = options;
|
|
1725
1694
|
postMessage({
|
|
1726
1695
|
type: "success",
|
|
@@ -1730,9 +1699,9 @@ async function handleInitialize({ id, renderOptions: options, preferredHighlight
|
|
|
1730
1699
|
});
|
|
1731
1700
|
}
|
|
1732
1701
|
async function handleSetRenderOptions({ id, renderOptions: options, resolvedThemes }) {
|
|
1733
|
-
let highlighter
|
|
1734
|
-
if ("then" in highlighter
|
|
1735
|
-
attachResolvedThemes(resolvedThemes, highlighter
|
|
1702
|
+
let highlighter = getHighlighter();
|
|
1703
|
+
if ("then" in highlighter) highlighter = await highlighter;
|
|
1704
|
+
attachResolvedThemes(resolvedThemes, highlighter);
|
|
1736
1705
|
renderOptions = options;
|
|
1737
1706
|
postMessage({
|
|
1738
1707
|
type: "success",
|
|
@@ -1741,30 +1710,30 @@ async function handleSetRenderOptions({ id, renderOptions: options, resolvedThem
|
|
|
1741
1710
|
sentAt: Date.now()
|
|
1742
1711
|
});
|
|
1743
1712
|
}
|
|
1744
|
-
async function handleRenderFile({ id, file, resolvedLanguages, customExtensionsVersion
|
|
1745
|
-
let highlighter
|
|
1746
|
-
if ("then" in highlighter
|
|
1713
|
+
async function handleRenderFile({ id, file, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
|
|
1714
|
+
let highlighter = getHighlighter();
|
|
1715
|
+
if ("then" in highlighter) highlighter = await highlighter;
|
|
1747
1716
|
syncCustomExtensionsFromRequest({
|
|
1748
|
-
customExtensionsVersion
|
|
1717
|
+
customExtensionsVersion,
|
|
1749
1718
|
customExtensionMap
|
|
1750
1719
|
});
|
|
1751
|
-
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter
|
|
1720
|
+
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
|
|
1752
1721
|
const fileOptions = {
|
|
1753
1722
|
theme: renderOptions.theme,
|
|
1754
1723
|
useTokenTransformer: renderOptions.useTokenTransformer,
|
|
1755
1724
|
tokenizeMaxLineLength: renderOptions.tokenizeMaxLineLength
|
|
1756
1725
|
};
|
|
1757
|
-
sendFileSuccess(id, renderFileWithHighlighter(file, highlighter
|
|
1726
|
+
sendFileSuccess(id, renderFileWithHighlighter(file, highlighter, fileOptions), fileOptions);
|
|
1758
1727
|
}
|
|
1759
|
-
async function handleRenderDiff({ id, diff, resolvedLanguages, customExtensionsVersion
|
|
1760
|
-
let highlighter
|
|
1761
|
-
if ("then" in highlighter
|
|
1728
|
+
async function handleRenderDiff({ id, diff, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
|
|
1729
|
+
let highlighter = getHighlighter();
|
|
1730
|
+
if ("then" in highlighter) highlighter = await highlighter;
|
|
1762
1731
|
syncCustomExtensionsFromRequest({
|
|
1763
|
-
customExtensionsVersion
|
|
1732
|
+
customExtensionsVersion,
|
|
1764
1733
|
customExtensionMap
|
|
1765
1734
|
});
|
|
1766
|
-
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter
|
|
1767
|
-
sendDiffSuccess(id, renderDiffWithHighlighter(diff, highlighter
|
|
1735
|
+
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
|
|
1736
|
+
sendDiffSuccess(id, renderDiffWithHighlighter(diff, highlighter, renderOptions), renderOptions);
|
|
1768
1737
|
}
|
|
1769
1738
|
function getHighlighter(preferredHighlighter = "shiki-js") {
|
|
1770
1739
|
highlighter ??= createHighlighterCore({
|
|
@@ -1774,10 +1743,10 @@ function getHighlighter(preferredHighlighter = "shiki-js") {
|
|
|
1774
1743
|
});
|
|
1775
1744
|
return highlighter;
|
|
1776
1745
|
}
|
|
1777
|
-
function syncCustomExtensionsFromRequest({ customExtensionsVersion
|
|
1778
|
-
if (customExtensionsVersion
|
|
1779
|
-
if (customExtensionsVersion
|
|
1780
|
-
replaceCustomExtensions(customExtensionsVersion
|
|
1746
|
+
function syncCustomExtensionsFromRequest({ customExtensionsVersion, customExtensionMap }) {
|
|
1747
|
+
if (customExtensionsVersion == null && customExtensionMap == null) return;
|
|
1748
|
+
if (customExtensionsVersion == null || customExtensionMap == null) throw new Error("Worker request must include both customExtensionsVersion and customExtensionMap");
|
|
1749
|
+
replaceCustomExtensions(customExtensionsVersion, customExtensionMap);
|
|
1781
1750
|
}
|
|
1782
1751
|
function sendFileSuccess(id, result, options) {
|
|
1783
1752
|
postMessage({
|
|
@@ -1808,6 +1777,6 @@ function sendError(id, error) {
|
|
|
1808
1777
|
};
|
|
1809
1778
|
postMessage(response);
|
|
1810
1779
|
}
|
|
1811
|
-
|
|
1812
1780
|
//#endregion
|
|
1781
|
+
|
|
1813
1782
|
//# sourceMappingURL=worker.js.map
|