@pierre/diffs 1.3.0-beta.4 → 1.3.0-beta.6
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 +14 -14
- package/dist/components/CodeView.js.map +1 -1
- package/dist/components/File.d.ts +4 -4
- package/dist/components/File.d.ts.map +1 -1
- package/dist/components/File.js +53 -24
- package/dist/components/File.js.map +1 -1
- package/dist/components/FileDiff.d.ts +19 -18
- package/dist/components/FileDiff.d.ts.map +1 -1
- package/dist/components/FileDiff.js +89 -58
- 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 +1 -2
- package/dist/components/UnresolvedFile.d.ts.map +1 -1
- package/dist/components/UnresolvedFile.js +3 -3
- package/dist/components/UnresolvedFile.js.map +1 -1
- package/dist/components/VirtualizedFile.d.ts +5 -2
- 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 +8 -4
- 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 +3 -2
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +3 -2
- package/dist/constants.js.map +1 -1
- package/dist/editor/command.d.ts +3 -2
- package/dist/editor/command.d.ts.map +1 -1
- package/dist/editor/command.js +10 -6
- package/dist/editor/command.js.map +1 -1
- package/dist/editor/editStack.d.ts +7 -1
- package/dist/editor/editStack.d.ts.map +1 -1
- package/dist/editor/editStack.js +3 -3
- package/dist/editor/editStack.js.map +1 -1
- package/dist/editor/editor.d.ts +56 -6
- package/dist/editor/editor.d.ts.map +1 -1
- package/dist/editor/editor.js +758 -397
- package/dist/editor/editor.js.map +1 -1
- package/dist/editor/editor2.js +3 -3
- package/dist/editor/editor2.js.map +1 -1
- package/dist/editor/index.d.ts +2 -2
- package/dist/editor/index.js +1 -2
- package/dist/editor/lineAnnotations.d.ts.map +1 -1
- package/dist/editor/lineAnnotations.js +2 -3
- package/dist/editor/lineAnnotations.js.map +1 -1
- package/dist/editor/marker.d.ts +4 -3
- package/dist/editor/marker.d.ts.map +1 -1
- package/dist/editor/marker.js +30 -13
- package/dist/editor/marker.js.map +1 -1
- package/dist/editor/pieceTable.d.ts +10 -3
- package/dist/editor/pieceTable.d.ts.map +1 -1
- package/dist/editor/pieceTable.js +170 -129
- package/dist/editor/pieceTable.js.map +1 -1
- package/dist/editor/platform.d.ts +8 -1
- package/dist/editor/platform.d.ts.map +1 -1
- package/dist/editor/platform.js +16 -5
- package/dist/editor/platform.js.map +1 -1
- package/dist/editor/searchPanel.d.ts +13 -3
- package/dist/editor/searchPanel.d.ts.map +1 -1
- package/dist/editor/searchPanel.js +194 -67
- package/dist/editor/searchPanel.js.map +1 -1
- package/dist/editor/selection.d.ts +41 -4
- package/dist/editor/selection.d.ts.map +1 -1
- package/dist/editor/selection.js +423 -83
- package/dist/editor/selection.js.map +1 -1
- package/dist/editor/selectionAction.d.ts +4 -5
- package/dist/editor/selectionAction.d.ts.map +1 -1
- package/dist/editor/selectionAction.js +14 -64
- package/dist/editor/selectionAction.js.map +1 -1
- package/dist/editor/sprite.d.ts +2 -2
- package/dist/editor/sprite.d.ts.map +1 -1
- package/dist/editor/sprite.js +8 -8
- package/dist/editor/sprite.js.map +1 -1
- package/dist/editor/textDocument.d.ts +5 -4
- package/dist/editor/textDocument.d.ts.map +1 -1
- package/dist/editor/textDocument.js +26 -15
- package/dist/editor/textDocument.js.map +1 -1
- package/dist/editor/textMeasure.d.ts +37 -3
- package/dist/editor/textMeasure.d.ts.map +1 -1
- package/dist/editor/textMeasure.js +85 -10
- package/dist/editor/textMeasure.js.map +1 -1
- package/dist/editor/tokenzier.d.ts +1 -0
- package/dist/editor/tokenzier.d.ts.map +1 -1
- package/dist/editor/tokenzier.js +25 -19
- package/dist/editor/tokenzier.js.map +1 -1
- package/dist/editor/utils.d.ts +2 -1
- package/dist/editor/utils.d.ts.map +1 -1
- package/dist/editor/utils.js +6 -3
- package/dist/editor/utils.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 +10 -10
- package/dist/index.js +2 -3
- package/dist/managers/InteractionManager.d.ts +7 -0
- package/dist/managers/InteractionManager.d.ts.map +1 -1
- package/dist/managers/InteractionManager.js +26 -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 +1 -1
- package/dist/react/CodeView.d.ts.map +1 -1
- package/dist/react/CodeView.js +16 -15
- package/dist/react/CodeView.js.map +1 -1
- package/dist/react/EditorContext.d.ts +0 -1
- package/dist/react/EditorContext.d.ts.map +1 -1
- package/dist/react/EditorContext.js +2 -5
- package/dist/react/EditorContext.js.map +1 -1
- package/dist/react/File.d.ts +1 -0
- package/dist/react/File.d.ts.map +1 -1
- package/dist/react/File.js +4 -6
- package/dist/react/File.js.map +1 -1
- package/dist/react/FileDiff.d.ts +1 -0
- package/dist/react/FileDiff.d.ts.map +1 -1
- package/dist/react/FileDiff.js +4 -6
- package/dist/react/FileDiff.js.map +1 -1
- package/dist/react/MultiFileDiff.d.ts +1 -0
- package/dist/react/MultiFileDiff.d.ts.map +1 -1
- package/dist/react/MultiFileDiff.js +4 -6
- package/dist/react/MultiFileDiff.js.map +1 -1
- package/dist/react/PatchDiff.d.ts +1 -0
- package/dist/react/PatchDiff.d.ts.map +1 -1
- package/dist/react/PatchDiff.js +4 -6
- package/dist/react/PatchDiff.js.map +1 -1
- package/dist/react/UnresolvedFile.d.ts +2 -1
- package/dist/react/UnresolvedFile.d.ts.map +1 -1
- package/dist/react/UnresolvedFile.js +4 -6
- 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 +2 -2
- 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 +2 -0
- package/dist/react/types.d.ts.map +1 -1
- package/dist/react/utils/renderDiffChildren.d.ts +2 -0
- package/dist/react/utils/renderDiffChildren.d.ts.map +1 -1
- package/dist/react/utils/renderDiffChildren.js +18 -11
- package/dist/react/utils/renderDiffChildren.js.map +1 -1
- package/dist/react/utils/renderFileChildren.d.ts +2 -0
- package/dist/react/utils/renderFileChildren.d.ts.map +1 -1
- package/dist/react/utils/renderFileChildren.js +18 -11
- 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 -3
- 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 +5 -5
- package/dist/renderers/DiffHunksRenderer.d.ts.map +1 -1
- package/dist/renderers/DiffHunksRenderer.js +73 -20
- 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 +23 -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 +2 -2
- 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 +27 -6
- 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/computeFileOffsets.d.ts +9 -1
- package/dist/utils/computeFileOffsets.d.ts.map +1 -1
- package/dist/utils/computeFileOffsets.js +20 -2
- package/dist/utils/computeFileOffsets.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 +6 -3
- 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 -2
- 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/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 -1
- 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/updateDiffHunks.d.ts +2 -1
- package/dist/utils/updateDiffHunks.d.ts.map +1 -1
- package/dist/utils/updateDiffHunks.js +22 -3
- package/dist/utils/updateDiffHunks.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 +2989 -6577
- package/dist/worker/worker-portable.js.map +1 -1
- package/dist/worker/worker.js +97 -127
- package/dist/worker/worker.js.map +1 -1
- package/package.json +14 -21
- package/dist/worker/wasm-BaDzIkIn.js +0 -10
- package/dist/worker/wasm-BaDzIkIn.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 {
|
|
@@ -18,30 +16,17 @@ const DEFAULT_THEMES = {
|
|
|
18
16
|
dark: "pierre-dark",
|
|
19
17
|
light: "pierre-light"
|
|
20
18
|
};
|
|
21
|
-
|
|
22
|
-
const DEFAULT_VIRTUAL_FILE_METRICS = {
|
|
23
|
-
hunkLineCount: 50,
|
|
24
|
-
lineHeight: 20,
|
|
25
|
-
diffHeaderHeight: 44,
|
|
26
|
-
spacing: 8
|
|
27
|
-
};
|
|
28
|
-
const DEFAULT_CODE_VIEW_FILE_METRICS = {
|
|
29
|
-
...DEFAULT_VIRTUAL_FILE_METRICS,
|
|
30
|
-
hunkLineCount: 1
|
|
31
|
-
};
|
|
32
|
-
const DEFAULT_EXPANDED_REGION = Object.freeze({
|
|
19
|
+
Object.freeze({
|
|
33
20
|
fromStart: 0,
|
|
34
21
|
fromEnd: 0
|
|
35
22
|
});
|
|
36
|
-
|
|
37
23
|
//#endregion
|
|
38
24
|
//#region src/highlighter/languages/constants.ts
|
|
39
25
|
const ResolvedLanguages = /* @__PURE__ */ new Map();
|
|
40
26
|
const AttachedLanguages = /* @__PURE__ */ new Set();
|
|
41
|
-
|
|
42
27
|
//#endregion
|
|
43
28
|
//#region src/highlighter/languages/attachResolvedLanguages.ts
|
|
44
|
-
function attachResolvedLanguages(resolvedLanguages, highlighter
|
|
29
|
+
function attachResolvedLanguages(resolvedLanguages, highlighter) {
|
|
45
30
|
resolvedLanguages = Array.isArray(resolvedLanguages) ? resolvedLanguages : [resolvedLanguages];
|
|
46
31
|
for (const resolvedLang of resolvedLanguages) {
|
|
47
32
|
if (AttachedLanguages.has(resolvedLang.name)) continue;
|
|
@@ -51,21 +36,18 @@ function attachResolvedLanguages(resolvedLanguages, highlighter$1) {
|
|
|
51
36
|
ResolvedLanguages.set(resolvedLang.name, lang);
|
|
52
37
|
}
|
|
53
38
|
AttachedLanguages.add(lang.name);
|
|
54
|
-
highlighter
|
|
39
|
+
highlighter.loadLanguageSync(lang.data);
|
|
55
40
|
}
|
|
56
41
|
}
|
|
57
|
-
|
|
58
42
|
//#endregion
|
|
59
43
|
//#region src/highlighter/themes/constants.ts
|
|
60
44
|
const AttachedThemes = /* @__PURE__ */ new Set();
|
|
61
|
-
|
|
62
45
|
//#endregion
|
|
63
46
|
//#region src/highlighter/themes/themeResolver.ts
|
|
64
47
|
const themeResolver = createThemeResolver();
|
|
65
|
-
|
|
66
48
|
//#endregion
|
|
67
49
|
//#region src/highlighter/themes/attachResolvedThemes.ts
|
|
68
|
-
function attachResolvedThemes(themes, highlighter
|
|
50
|
+
function attachResolvedThemes(themes, highlighter) {
|
|
69
51
|
themes = Array.isArray(themes) ? themes : [themes];
|
|
70
52
|
for (let themeRef of themes) {
|
|
71
53
|
let resolvedTheme;
|
|
@@ -79,10 +61,9 @@ function attachResolvedThemes(themes, highlighter$1) {
|
|
|
79
61
|
}
|
|
80
62
|
if (AttachedThemes.has(themeRef)) continue;
|
|
81
63
|
AttachedThemes.add(themeRef);
|
|
82
|
-
highlighter
|
|
64
|
+
highlighter.loadThemeSync(resolvedTheme);
|
|
83
65
|
}
|
|
84
66
|
}
|
|
85
|
-
|
|
86
67
|
//#endregion
|
|
87
68
|
//#region src/utils/getFiletypeFromFileName.ts
|
|
88
69
|
const CUSTOM_EXTENSION_TO_FILE_FORMAT = /* @__PURE__ */ new Map();
|
|
@@ -454,7 +435,6 @@ function replaceCustomExtensions(version, map) {
|
|
|
454
435
|
customExtensionsVersion = version;
|
|
455
436
|
return true;
|
|
456
437
|
}
|
|
457
|
-
|
|
458
438
|
//#endregion
|
|
459
439
|
//#region src/utils/cleanLastNewline.ts
|
|
460
440
|
function cleanLastNewline(contents) {
|
|
@@ -465,7 +445,6 @@ function cleanLastNewline(contents) {
|
|
|
465
445
|
}
|
|
466
446
|
return contents.slice(0, end);
|
|
467
447
|
}
|
|
468
|
-
|
|
469
448
|
//#endregion
|
|
470
449
|
//#region src/utils/hast_utils.ts
|
|
471
450
|
function createTextNodeElement(value) {
|
|
@@ -490,7 +469,6 @@ function findCodeElement(nodes) {
|
|
|
490
469
|
else firstChild = null;
|
|
491
470
|
}
|
|
492
471
|
}
|
|
493
|
-
|
|
494
472
|
//#endregion
|
|
495
473
|
//#region src/utils/processLine.ts
|
|
496
474
|
function processLine(node, line, state) {
|
|
@@ -512,7 +490,6 @@ function processLine(node, line, state) {
|
|
|
512
490
|
if (node.children.length === 0) node.children.push(createTextNodeElement("\n"));
|
|
513
491
|
return node;
|
|
514
492
|
}
|
|
515
|
-
|
|
516
493
|
//#endregion
|
|
517
494
|
//#region src/utils/wrapTokenFragments.ts
|
|
518
495
|
const NO_TOKEN = Symbol("no-token");
|
|
@@ -590,7 +567,6 @@ function stripTokenChar(node) {
|
|
|
590
567
|
function setTokenChar(node, char) {
|
|
591
568
|
node.properties["data-char"] = char;
|
|
592
569
|
}
|
|
593
|
-
|
|
594
570
|
//#endregion
|
|
595
571
|
//#region src/utils/createTransformerWithState.ts
|
|
596
572
|
function createTransformerWithState(useTokenTransformer = false, useCSSClasses = false) {
|
|
@@ -673,19 +649,17 @@ const tokenStyleNormalizer = {
|
|
|
673
649
|
}
|
|
674
650
|
}
|
|
675
651
|
};
|
|
676
|
-
|
|
677
652
|
//#endregion
|
|
678
653
|
//#region src/utils/formatCSSVariablePrefix.ts
|
|
679
654
|
function formatCSSVariablePrefix(type) {
|
|
680
655
|
return `--${type === "token" ? "diffs-token" : "diffs"}-`;
|
|
681
656
|
}
|
|
682
|
-
|
|
683
657
|
//#endregion
|
|
684
658
|
//#region src/utils/getHighlighterThemeStyles.ts
|
|
685
|
-
function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter
|
|
659
|
+
function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter, prefix }) {
|
|
686
660
|
let styles = "";
|
|
687
661
|
if (typeof theme === "string") {
|
|
688
|
-
const themeData = highlighter
|
|
662
|
+
const themeData = highlighter.getTheme(theme);
|
|
689
663
|
const normalized = normalizeThemeColors(themeData);
|
|
690
664
|
styles += `color:${normalized.fg};`;
|
|
691
665
|
styles += `background-color:${normalized.bg};`;
|
|
@@ -693,12 +667,12 @@ function getHighlighterThemeStyles({ theme = DEFAULT_THEMES, highlighter: highli
|
|
|
693
667
|
styles += `${formatCSSVariablePrefix("global")}bg:${normalized.bg};`;
|
|
694
668
|
styles += getGitVariables(themeData, prefix);
|
|
695
669
|
} else {
|
|
696
|
-
let themeData = highlighter
|
|
670
|
+
let themeData = highlighter.getTheme(theme.dark);
|
|
697
671
|
let normalized = normalizeThemeColors(themeData);
|
|
698
672
|
styles += `${formatCSSVariablePrefix("global")}dark:${normalized.fg};`;
|
|
699
673
|
styles += `${formatCSSVariablePrefix("global")}dark-bg:${normalized.bg};`;
|
|
700
674
|
styles += getGitVariables(themeData, "dark");
|
|
701
|
-
themeData = highlighter
|
|
675
|
+
themeData = highlighter.getTheme(theme.light);
|
|
702
676
|
normalized = normalizeThemeColors(themeData);
|
|
703
677
|
styles += `${formatCSSVariablePrefix("global")}light:${normalized.fg};`;
|
|
704
678
|
styles += `${formatCSSVariablePrefix("global")}light-bg:${normalized.bg};`;
|
|
@@ -717,7 +691,6 @@ function getGitVariables(themeData, modePrefix) {
|
|
|
717
691
|
if (modifiedBlue != null) styles += `${formatCSSVariablePrefix("global")}${modePrefix}modified-color:${modifiedBlue};`;
|
|
718
692
|
return styles;
|
|
719
693
|
}
|
|
720
|
-
|
|
721
694
|
//#endregion
|
|
722
695
|
//#region src/utils/getLineNodes.ts
|
|
723
696
|
function getLineNodes(nodes) {
|
|
@@ -730,7 +703,6 @@ function getLineNodes(nodes) {
|
|
|
730
703
|
console.error(nodes);
|
|
731
704
|
throw new Error("getLineNodes: Unable to find children");
|
|
732
705
|
}
|
|
733
|
-
|
|
734
706
|
//#endregion
|
|
735
707
|
//#region src/utils/virtualDiffLayout.ts
|
|
736
708
|
function getExpandedRegion({ isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold }) {
|
|
@@ -795,10 +767,9 @@ function getTrailingExpandedRegion({ fileDiff, hunkIndex, expandedHunks, collaps
|
|
|
795
767
|
renderAll: fromStart >= trailingRangeSize
|
|
796
768
|
};
|
|
797
769
|
}
|
|
798
|
-
|
|
799
770
|
//#endregion
|
|
800
771
|
//#region src/utils/iterateOverDiff.ts
|
|
801
|
-
function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold =
|
|
772
|
+
function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = 1, callback }) {
|
|
802
773
|
const iterationStart = getIterationStartState({
|
|
803
774
|
diff,
|
|
804
775
|
diffStyle,
|
|
@@ -873,10 +844,10 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
873
844
|
errorPrefix: "iterateOverDiff"
|
|
874
845
|
}) : void 0;
|
|
875
846
|
const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
|
|
876
|
-
function getTrailingCollapsedAfter(unifiedLineIndex
|
|
847
|
+
function getTrailingCollapsedAfter(unifiedLineIndex, splitLineIndex) {
|
|
877
848
|
if (trailingRegion == null || trailingRegion.collapsedLines <= 0 || trailingRegion.fromStart + trailingRegion.fromEnd > 0) return 0;
|
|
878
|
-
if (diffStyle === "unified") return unifiedLineIndex
|
|
879
|
-
return splitLineIndex
|
|
849
|
+
if (diffStyle === "unified") return unifiedLineIndex === hunk.unifiedLineStart + hunk.unifiedLineCount - 1 ? trailingRegion.collapsedLines : 0;
|
|
850
|
+
return splitLineIndex === hunk.splitLineStart + hunk.splitLineCount - 1 ? trailingRegion.collapsedLines : 0;
|
|
880
851
|
}
|
|
881
852
|
let consumedCollapsed = leadingRegion.collapsedLines === 0;
|
|
882
853
|
function consumePendingCollapsed() {
|
|
@@ -885,12 +856,12 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
885
856
|
return leadingRegion.collapsedLines;
|
|
886
857
|
}
|
|
887
858
|
if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {
|
|
888
|
-
let unifiedLineIndex
|
|
889
|
-
let splitLineIndex
|
|
890
|
-
let deletionLineIndex
|
|
891
|
-
let additionLineIndex
|
|
892
|
-
let deletionLineNumber
|
|
893
|
-
let additionLineNumber
|
|
859
|
+
let unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.rangeSize;
|
|
860
|
+
let splitLineIndex = hunk.splitLineStart - leadingRegion.rangeSize;
|
|
861
|
+
let deletionLineIndex = hunk.deletionLineIndex - leadingRegion.rangeSize;
|
|
862
|
+
let additionLineIndex = hunk.additionLineIndex - leadingRegion.rangeSize;
|
|
863
|
+
let deletionLineNumber = hunk.deletionStart - leadingRegion.rangeSize;
|
|
864
|
+
let additionLineNumber = hunk.additionStart - leadingRegion.rangeSize;
|
|
894
865
|
if (walkContextLines(state, leadingRegion.fromStart, diffStyle, (index) => {
|
|
895
866
|
return state.emit({
|
|
896
867
|
hunkIndex,
|
|
@@ -899,27 +870,27 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
899
870
|
collapsedAfter: 0,
|
|
900
871
|
type: "context-expanded",
|
|
901
872
|
deletionLine: {
|
|
902
|
-
lineNumber: deletionLineNumber
|
|
903
|
-
lineIndex: deletionLineIndex
|
|
873
|
+
lineNumber: deletionLineNumber + index,
|
|
874
|
+
lineIndex: deletionLineIndex + index,
|
|
904
875
|
noEOFCR: false,
|
|
905
|
-
unifiedLineIndex: unifiedLineIndex
|
|
906
|
-
splitLineIndex: splitLineIndex
|
|
876
|
+
unifiedLineIndex: unifiedLineIndex + index,
|
|
877
|
+
splitLineIndex: splitLineIndex + index
|
|
907
878
|
},
|
|
908
879
|
additionLine: {
|
|
909
|
-
unifiedLineIndex: unifiedLineIndex
|
|
910
|
-
splitLineIndex: splitLineIndex
|
|
911
|
-
lineIndex: additionLineIndex
|
|
912
|
-
lineNumber: additionLineNumber
|
|
880
|
+
unifiedLineIndex: unifiedLineIndex + index,
|
|
881
|
+
splitLineIndex: splitLineIndex + index,
|
|
882
|
+
lineIndex: additionLineIndex + index,
|
|
883
|
+
lineNumber: additionLineNumber + index,
|
|
913
884
|
noEOFCR: false
|
|
914
885
|
}
|
|
915
886
|
});
|
|
916
887
|
})) break hunkIterator;
|
|
917
|
-
unifiedLineIndex
|
|
918
|
-
splitLineIndex
|
|
919
|
-
deletionLineIndex
|
|
920
|
-
additionLineIndex
|
|
921
|
-
deletionLineNumber
|
|
922
|
-
additionLineNumber
|
|
888
|
+
unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.fromEnd;
|
|
889
|
+
splitLineIndex = hunk.splitLineStart - leadingRegion.fromEnd;
|
|
890
|
+
deletionLineIndex = hunk.deletionLineIndex - leadingRegion.fromEnd;
|
|
891
|
+
additionLineIndex = hunk.additionLineIndex - leadingRegion.fromEnd;
|
|
892
|
+
deletionLineNumber = hunk.deletionStart - leadingRegion.fromEnd;
|
|
893
|
+
additionLineNumber = hunk.additionStart - leadingRegion.fromEnd;
|
|
923
894
|
if (walkContextLines(state, leadingRegion.fromEnd, diffStyle, (index) => {
|
|
924
895
|
return state.emit({
|
|
925
896
|
hunkIndex,
|
|
@@ -928,17 +899,17 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
928
899
|
collapsedAfter: 0,
|
|
929
900
|
type: "context-expanded",
|
|
930
901
|
deletionLine: {
|
|
931
|
-
lineNumber: deletionLineNumber
|
|
932
|
-
lineIndex: deletionLineIndex
|
|
902
|
+
lineNumber: deletionLineNumber + index,
|
|
903
|
+
lineIndex: deletionLineIndex + index,
|
|
933
904
|
noEOFCR: false,
|
|
934
|
-
unifiedLineIndex: unifiedLineIndex
|
|
935
|
-
splitLineIndex: splitLineIndex
|
|
905
|
+
unifiedLineIndex: unifiedLineIndex + index,
|
|
906
|
+
splitLineIndex: splitLineIndex + index
|
|
936
907
|
},
|
|
937
908
|
additionLine: {
|
|
938
|
-
unifiedLineIndex: unifiedLineIndex
|
|
939
|
-
splitLineIndex: splitLineIndex
|
|
940
|
-
lineIndex: additionLineIndex
|
|
941
|
-
lineNumber: additionLineNumber
|
|
909
|
+
unifiedLineIndex: unifiedLineIndex + index,
|
|
910
|
+
splitLineIndex: splitLineIndex + index,
|
|
911
|
+
lineIndex: additionLineIndex + index,
|
|
912
|
+
lineNumber: additionLineNumber + index,
|
|
942
913
|
noEOFCR: false
|
|
943
914
|
}
|
|
944
915
|
});
|
|
@@ -1083,20 +1054,20 @@ function getIterationStartState({ diff, diffStyle, startingLine, expandedHunks,
|
|
|
1083
1054
|
let result = diff.hunks.length;
|
|
1084
1055
|
while (low <= high) {
|
|
1085
1056
|
const mid = low + high >> 1;
|
|
1086
|
-
const counts
|
|
1087
|
-
if (counts
|
|
1088
|
-
if ((diffStyle === "unified" ? counts
|
|
1057
|
+
const counts = prefixCounts[mid + 1];
|
|
1058
|
+
if (counts == null) throw new Error("iterateOverDiff: invalid hunk prefix index");
|
|
1059
|
+
if ((diffStyle === "unified" ? counts.unifiedCount : counts.splitCount) > startingLine) {
|
|
1089
1060
|
result = mid;
|
|
1090
1061
|
high = mid - 1;
|
|
1091
1062
|
} else low = mid + 1;
|
|
1092
1063
|
}
|
|
1093
1064
|
if (result >= diff.hunks.length) {
|
|
1094
|
-
const counts
|
|
1095
|
-
if (counts
|
|
1065
|
+
const counts = prefixCounts[diff.hunks.length];
|
|
1066
|
+
if (counts == null) throw new Error("iterateOverDiff: invalid terminal hunk prefix index");
|
|
1096
1067
|
return {
|
|
1097
1068
|
hunkIndex: diff.hunks.length,
|
|
1098
|
-
splitCount: counts
|
|
1099
|
-
unifiedCount: counts
|
|
1069
|
+
splitCount: counts.splitCount,
|
|
1070
|
+
unifiedCount: counts.unifiedCount
|
|
1100
1071
|
};
|
|
1101
1072
|
}
|
|
1102
1073
|
const counts = prefixCounts[result];
|
|
@@ -1151,9 +1122,9 @@ function getContextLineIterationBounds(state, count, diffStyle) {
|
|
|
1151
1122
|
if (!state.isWindowedHighlight || count <= 0) return [0, count];
|
|
1152
1123
|
const ranges = [];
|
|
1153
1124
|
function pushRange(currentCount) {
|
|
1154
|
-
const start
|
|
1155
|
-
const end
|
|
1156
|
-
if (end
|
|
1125
|
+
const start = Math.max(0, state.viewportStart - currentCount);
|
|
1126
|
+
const end = Math.min(count, state.viewportEnd - currentCount);
|
|
1127
|
+
if (end > start) ranges.push([start, end]);
|
|
1157
1128
|
}
|
|
1158
1129
|
if (diffStyle !== "split") pushRange(state.unifiedCount);
|
|
1159
1130
|
if (diffStyle !== "unified") pushRange(state.splitCount);
|
|
@@ -1279,7 +1250,6 @@ function getChangeLineData({ hunkIndex, hunk, collapsedAfter, collapsedBefore, d
|
|
|
1279
1250
|
additionLine
|
|
1280
1251
|
};
|
|
1281
1252
|
}
|
|
1282
|
-
|
|
1283
1253
|
//#endregion
|
|
1284
1254
|
//#region src/utils/parseDiffDecorations.ts
|
|
1285
1255
|
function createDiffSpanDecoration({ line, spanStart, spanLength }) {
|
|
@@ -1309,11 +1279,10 @@ function pushOrJoinSpan({ item, arr, enableJoin, isNeutral = false, isLastItem =
|
|
|
1309
1279
|
}
|
|
1310
1280
|
arr.push([isNeutral ? 0 : 1, item.value]);
|
|
1311
1281
|
}
|
|
1312
|
-
|
|
1313
1282
|
//#endregion
|
|
1314
1283
|
//#region src/utils/renderDiffWithHighlighter.ts
|
|
1315
1284
|
const DEFAULT_PLAIN_TEXT_OPTIONS$1 = { forcePlainText: false };
|
|
1316
|
-
function renderDiffWithHighlighter(diff, highlighter
|
|
1285
|
+
function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText, startingLine, totalLines, expandedHunks, collapsedContextThreshold = 1 } = DEFAULT_PLAIN_TEXT_OPTIONS$1) {
|
|
1317
1286
|
if (forcePlainText) {
|
|
1318
1287
|
startingLine ??= 0;
|
|
1319
1288
|
totalLines ??= Infinity;
|
|
@@ -1322,10 +1291,10 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
|
|
|
1322
1291
|
totalLines = Infinity;
|
|
1323
1292
|
}
|
|
1324
1293
|
const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
|
|
1325
|
-
const baseThemeType = typeof options.theme === "string" ? highlighter
|
|
1294
|
+
const baseThemeType = typeof options.theme === "string" ? highlighter.getTheme(options.theme).type : void 0;
|
|
1326
1295
|
const themeStyles = getHighlighterThemeStyles({
|
|
1327
1296
|
theme: options.theme,
|
|
1328
|
-
highlighter
|
|
1297
|
+
highlighter
|
|
1329
1298
|
});
|
|
1330
1299
|
const lineDiffType = forcePlainText && !isWindowedHighlight && (diff.unifiedLineCount > 1e3 || diff.splitLineCount > 1e3) ? "none" : options.lineDiffType;
|
|
1331
1300
|
const code = {
|
|
@@ -1414,7 +1383,7 @@ function renderDiffWithHighlighter(diff, highlighter$1, options, { forcePlainTex
|
|
|
1414
1383
|
additionFile,
|
|
1415
1384
|
additionInfo: bucket.additionInfo,
|
|
1416
1385
|
additionDecorations: bucket.additionDecorations,
|
|
1417
|
-
highlighter
|
|
1386
|
+
highlighter,
|
|
1418
1387
|
options,
|
|
1419
1388
|
languageOverride: forcePlainText ? "text" : diff.lang
|
|
1420
1389
|
});
|
|
@@ -1519,7 +1488,7 @@ function createBucket() {
|
|
|
1519
1488
|
additionSegments: []
|
|
1520
1489
|
};
|
|
1521
1490
|
}
|
|
1522
|
-
function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter
|
|
1491
|
+
function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo, highlighter, deletionDecorations, additionDecorations, languageOverride, options: { theme: themeOrThemes = DEFAULT_THEMES, ...options } }) {
|
|
1523
1492
|
const deletionLang = languageOverride ?? getFiletypeFromFileName(deletionFile.name);
|
|
1524
1493
|
const additionLang = languageOverride ?? getFiletypeFromFileName(additionFile.name);
|
|
1525
1494
|
const { state, transformers } = createTransformerWithState(options.useTokenTransformer);
|
|
@@ -1531,7 +1500,8 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
|
|
|
1531
1500
|
transformers,
|
|
1532
1501
|
decorations: void 0,
|
|
1533
1502
|
defaultColor: false,
|
|
1534
|
-
cssVariablePrefix: formatCSSVariablePrefix("token")
|
|
1503
|
+
cssVariablePrefix: formatCSSVariablePrefix("token"),
|
|
1504
|
+
tokenizeTimeLimit: 0
|
|
1535
1505
|
} : {
|
|
1536
1506
|
...options,
|
|
1537
1507
|
lang: "text",
|
|
@@ -1539,7 +1509,8 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
|
|
|
1539
1509
|
transformers,
|
|
1540
1510
|
decorations: void 0,
|
|
1541
1511
|
defaultColor: false,
|
|
1542
|
-
cssVariablePrefix: formatCSSVariablePrefix("token")
|
|
1512
|
+
cssVariablePrefix: formatCSSVariablePrefix("token"),
|
|
1513
|
+
tokenizeTimeLimit: 0
|
|
1543
1514
|
};
|
|
1544
1515
|
})();
|
|
1545
1516
|
return {
|
|
@@ -1548,18 +1519,17 @@ function renderTwoFiles({ deletionFile, additionFile, deletionInfo, additionInfo
|
|
|
1548
1519
|
hastConfig.lang = deletionLang;
|
|
1549
1520
|
state.lineInfo = deletionInfo;
|
|
1550
1521
|
hastConfig.decorations = deletionDecorations;
|
|
1551
|
-
return getLineNodes(highlighter
|
|
1522
|
+
return getLineNodes(highlighter.codeToHast(cleanLastNewline(deletionFile.contents), hastConfig));
|
|
1552
1523
|
})(),
|
|
1553
1524
|
additionLines: (() => {
|
|
1554
1525
|
if (additionFile.contents === "") return [];
|
|
1555
1526
|
hastConfig.lang = additionLang;
|
|
1556
1527
|
hastConfig.decorations = additionDecorations;
|
|
1557
1528
|
state.lineInfo = additionInfo;
|
|
1558
|
-
return getLineNodes(highlighter
|
|
1529
|
+
return getLineNodes(highlighter.codeToHast(cleanLastNewline(additionFile.contents), hastConfig));
|
|
1559
1530
|
})()
|
|
1560
1531
|
};
|
|
1561
1532
|
}
|
|
1562
|
-
|
|
1563
1533
|
//#endregion
|
|
1564
1534
|
//#region src/utils/computeFileOffsets.ts
|
|
1565
1535
|
const LINE_FEED = 10;
|
|
@@ -1590,11 +1560,10 @@ function linesFromFileContents(contents) {
|
|
|
1590
1560
|
return contents.slice(start, end);
|
|
1591
1561
|
});
|
|
1592
1562
|
}
|
|
1593
|
-
|
|
1594
1563
|
//#endregion
|
|
1595
1564
|
//#region src/utils/renderFileWithHighlighter.ts
|
|
1596
1565
|
const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
|
|
1597
|
-
function renderFileWithHighlighter(file, highlighter
|
|
1566
|
+
function renderFileWithHighlighter(file, highlighter, { theme = DEFAULT_THEMES, tokenizeMaxLineLength, useTokenTransformer }, { forcePlainText, startingLine, totalLines, lines } = DEFAULT_PLAIN_TEXT_OPTIONS) {
|
|
1598
1567
|
if (forcePlainText) {
|
|
1599
1568
|
startingLine ??= 0;
|
|
1600
1569
|
totalLines ??= Infinity;
|
|
@@ -1605,10 +1574,10 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
|
|
|
1605
1574
|
const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;
|
|
1606
1575
|
const { state, transformers } = createTransformerWithState(useTokenTransformer);
|
|
1607
1576
|
const lang = forcePlainText ? "text" : file.lang ?? getFiletypeFromFileName(file.name);
|
|
1608
|
-
const baseThemeType = typeof theme === "string" ? highlighter
|
|
1577
|
+
const baseThemeType = typeof theme === "string" ? highlighter.getTheme(theme).type : void 0;
|
|
1609
1578
|
const themeStyles = getHighlighterThemeStyles({
|
|
1610
1579
|
theme,
|
|
1611
|
-
highlighter
|
|
1580
|
+
highlighter
|
|
1612
1581
|
});
|
|
1613
1582
|
state.lineInfo = (shikiLineNumber) => ({
|
|
1614
1583
|
type: "context",
|
|
@@ -1622,7 +1591,8 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
|
|
|
1622
1591
|
transformers,
|
|
1623
1592
|
defaultColor: false,
|
|
1624
1593
|
cssVariablePrefix: formatCSSVariablePrefix("token"),
|
|
1625
|
-
tokenizeMaxLineLength
|
|
1594
|
+
tokenizeMaxLineLength,
|
|
1595
|
+
tokenizeTimeLimit: 0
|
|
1626
1596
|
};
|
|
1627
1597
|
return {
|
|
1628
1598
|
lang,
|
|
@@ -1630,10 +1600,11 @@ function renderFileWithHighlighter(file, highlighter$1, { theme = DEFAULT_THEMES
|
|
|
1630
1600
|
transformers,
|
|
1631
1601
|
defaultColor: false,
|
|
1632
1602
|
cssVariablePrefix: formatCSSVariablePrefix("token"),
|
|
1633
|
-
tokenizeMaxLineLength
|
|
1603
|
+
tokenizeMaxLineLength,
|
|
1604
|
+
tokenizeTimeLimit: 0
|
|
1634
1605
|
};
|
|
1635
1606
|
})();
|
|
1636
|
-
const highlightedLines = getLineNodes(highlighter
|
|
1607
|
+
const highlightedLines = getLineNodes(highlighter.codeToHast(isWindowedHighlight ? extractWindowedFileContent(lines ?? linesFromFileContents(file.contents), startingLine, totalLines) : file.contents, hastConfig));
|
|
1637
1608
|
const code = isWindowedHighlight ? new Array(startingLine) : highlightedLines;
|
|
1638
1609
|
if (isWindowedHighlight) code.push(...highlightedLines);
|
|
1639
1610
|
return {
|
|
@@ -1647,7 +1618,6 @@ function extractWindowedFileContent(lines, startingLine, totalLines) {
|
|
|
1647
1618
|
const endLine = Math.min(startingLine + totalLines, lines.length);
|
|
1648
1619
|
return lines.slice(startingLine, endLine).join("");
|
|
1649
1620
|
}
|
|
1650
|
-
|
|
1651
1621
|
//#endregion
|
|
1652
1622
|
//#region src/worker/worker.ts
|
|
1653
1623
|
let highlighter;
|
|
@@ -1689,15 +1659,15 @@ async function handleMessage(request) {
|
|
|
1689
1659
|
EMPTY_REGEXP.exec("");
|
|
1690
1660
|
}
|
|
1691
1661
|
}
|
|
1692
|
-
async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages, customExtensionsVersion
|
|
1693
|
-
let highlighter
|
|
1694
|
-
if ("then" in highlighter
|
|
1662
|
+
async function handleInitialize({ id, renderOptions: options, preferredHighlighter, resolvedThemes, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
|
|
1663
|
+
let highlighter = getHighlighter(preferredHighlighter);
|
|
1664
|
+
if ("then" in highlighter) highlighter = await highlighter;
|
|
1695
1665
|
syncCustomExtensionsFromRequest({
|
|
1696
|
-
customExtensionsVersion
|
|
1666
|
+
customExtensionsVersion,
|
|
1697
1667
|
customExtensionMap
|
|
1698
1668
|
});
|
|
1699
|
-
attachResolvedThemes(resolvedThemes, highlighter
|
|
1700
|
-
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter
|
|
1669
|
+
attachResolvedThemes(resolvedThemes, highlighter);
|
|
1670
|
+
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
|
|
1701
1671
|
renderOptions = options;
|
|
1702
1672
|
postMessage({
|
|
1703
1673
|
type: "success",
|
|
@@ -1707,9 +1677,9 @@ async function handleInitialize({ id, renderOptions: options, preferredHighlight
|
|
|
1707
1677
|
});
|
|
1708
1678
|
}
|
|
1709
1679
|
async function handleSetRenderOptions({ id, renderOptions: options, resolvedThemes }) {
|
|
1710
|
-
let highlighter
|
|
1711
|
-
if ("then" in highlighter
|
|
1712
|
-
attachResolvedThemes(resolvedThemes, highlighter
|
|
1680
|
+
let highlighter = getHighlighter();
|
|
1681
|
+
if ("then" in highlighter) highlighter = await highlighter;
|
|
1682
|
+
attachResolvedThemes(resolvedThemes, highlighter);
|
|
1713
1683
|
renderOptions = options;
|
|
1714
1684
|
postMessage({
|
|
1715
1685
|
type: "success",
|
|
@@ -1718,30 +1688,30 @@ async function handleSetRenderOptions({ id, renderOptions: options, resolvedThem
|
|
|
1718
1688
|
sentAt: Date.now()
|
|
1719
1689
|
});
|
|
1720
1690
|
}
|
|
1721
|
-
async function handleRenderFile({ id, file, resolvedLanguages, customExtensionsVersion
|
|
1722
|
-
let highlighter
|
|
1723
|
-
if ("then" in highlighter
|
|
1691
|
+
async function handleRenderFile({ id, file, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
|
|
1692
|
+
let highlighter = getHighlighter();
|
|
1693
|
+
if ("then" in highlighter) highlighter = await highlighter;
|
|
1724
1694
|
syncCustomExtensionsFromRequest({
|
|
1725
|
-
customExtensionsVersion
|
|
1695
|
+
customExtensionsVersion,
|
|
1726
1696
|
customExtensionMap
|
|
1727
1697
|
});
|
|
1728
|
-
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter
|
|
1698
|
+
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
|
|
1729
1699
|
const fileOptions = {
|
|
1730
1700
|
theme: renderOptions.theme,
|
|
1731
1701
|
useTokenTransformer: renderOptions.useTokenTransformer,
|
|
1732
1702
|
tokenizeMaxLineLength: renderOptions.tokenizeMaxLineLength
|
|
1733
1703
|
};
|
|
1734
|
-
sendFileSuccess(id, renderFileWithHighlighter(file, highlighter
|
|
1704
|
+
sendFileSuccess(id, renderFileWithHighlighter(file, highlighter, fileOptions), fileOptions);
|
|
1735
1705
|
}
|
|
1736
|
-
async function handleRenderDiff({ id, diff, resolvedLanguages, customExtensionsVersion
|
|
1737
|
-
let highlighter
|
|
1738
|
-
if ("then" in highlighter
|
|
1706
|
+
async function handleRenderDiff({ id, diff, resolvedLanguages, customExtensionsVersion, customExtensionMap }) {
|
|
1707
|
+
let highlighter = getHighlighter();
|
|
1708
|
+
if ("then" in highlighter) highlighter = await highlighter;
|
|
1739
1709
|
syncCustomExtensionsFromRequest({
|
|
1740
|
-
customExtensionsVersion
|
|
1710
|
+
customExtensionsVersion,
|
|
1741
1711
|
customExtensionMap
|
|
1742
1712
|
});
|
|
1743
|
-
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter
|
|
1744
|
-
sendDiffSuccess(id, renderDiffWithHighlighter(diff, highlighter
|
|
1713
|
+
if (resolvedLanguages != null) attachResolvedLanguages(resolvedLanguages, highlighter);
|
|
1714
|
+
sendDiffSuccess(id, renderDiffWithHighlighter(diff, highlighter, renderOptions), renderOptions);
|
|
1745
1715
|
}
|
|
1746
1716
|
function getHighlighter(preferredHighlighter = "shiki-js") {
|
|
1747
1717
|
highlighter ??= createHighlighterCore({
|
|
@@ -1751,10 +1721,10 @@ function getHighlighter(preferredHighlighter = "shiki-js") {
|
|
|
1751
1721
|
});
|
|
1752
1722
|
return highlighter;
|
|
1753
1723
|
}
|
|
1754
|
-
function syncCustomExtensionsFromRequest({ customExtensionsVersion
|
|
1755
|
-
if (customExtensionsVersion
|
|
1756
|
-
if (customExtensionsVersion
|
|
1757
|
-
replaceCustomExtensions(customExtensionsVersion
|
|
1724
|
+
function syncCustomExtensionsFromRequest({ customExtensionsVersion, customExtensionMap }) {
|
|
1725
|
+
if (customExtensionsVersion == null && customExtensionMap == null) return;
|
|
1726
|
+
if (customExtensionsVersion == null || customExtensionMap == null) throw new Error("Worker request must include both customExtensionsVersion and customExtensionMap");
|
|
1727
|
+
replaceCustomExtensions(customExtensionsVersion, customExtensionMap);
|
|
1758
1728
|
}
|
|
1759
1729
|
function sendFileSuccess(id, result, options) {
|
|
1760
1730
|
postMessage({
|
|
@@ -1785,6 +1755,6 @@ function sendError(id, error) {
|
|
|
1785
1755
|
};
|
|
1786
1756
|
postMessage(response);
|
|
1787
1757
|
}
|
|
1788
|
-
|
|
1789
1758
|
//#endregion
|
|
1759
|
+
|
|
1790
1760
|
//# sourceMappingURL=worker.js.map
|