@pierre/diffs 1.2.9 → 1.2.11

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.
Files changed (52) hide show
  1. package/README.md +6 -6
  2. package/dist/components/CodeView.js +6 -6
  3. package/dist/components/CodeView.js.map +1 -1
  4. package/dist/components/File.d.ts.map +1 -1
  5. package/dist/components/File.js +6 -1
  6. package/dist/components/File.js.map +1 -1
  7. package/dist/components/FileDiff.js +1 -1
  8. package/dist/components/FileDiff.js.map +1 -1
  9. package/dist/components/FileStream.js +4 -2
  10. package/dist/components/FileStream.js.map +1 -1
  11. package/dist/components/UnresolvedFile.d.ts.map +1 -1
  12. package/dist/components/VirtualizedFile.d.ts +6 -2
  13. package/dist/components/VirtualizedFile.d.ts.map +1 -1
  14. package/dist/components/VirtualizedFile.js +82 -21
  15. package/dist/components/VirtualizedFile.js.map +1 -1
  16. package/dist/components/VirtualizedFileDiff.d.ts +7 -2
  17. package/dist/components/VirtualizedFileDiff.d.ts.map +1 -1
  18. package/dist/components/VirtualizedFileDiff.js +77 -15
  19. package/dist/components/VirtualizedFileDiff.js.map +1 -1
  20. package/dist/components/VirtulizerDevelopment.d.ts.map +1 -1
  21. package/dist/constants.d.ts.map +1 -1
  22. package/dist/highlighter/themes/themeResolver.d.ts +4 -1
  23. package/dist/highlighter/themes/themeResolver.d.ts.map +1 -1
  24. package/dist/managers/InteractionManager.js +1 -1
  25. package/dist/managers/InteractionManager.js.map +1 -1
  26. package/dist/managers/ResizeManager.js +1 -1
  27. package/dist/managers/ResizeManager.js.map +1 -1
  28. package/dist/react/jsx.d.ts.map +1 -1
  29. package/dist/renderers/DiffHunksRenderer.d.ts +3 -2
  30. package/dist/renderers/DiffHunksRenderer.d.ts.map +1 -1
  31. package/dist/renderers/DiffHunksRenderer.js +49 -2
  32. package/dist/renderers/DiffHunksRenderer.js.map +1 -1
  33. package/dist/renderers/FileRenderer.js +12 -0
  34. package/dist/renderers/FileRenderer.js.map +1 -1
  35. package/dist/types.d.ts +8 -0
  36. package/dist/types.d.ts.map +1 -1
  37. package/dist/utils/includesFileAnnotations.d.ts +17 -0
  38. package/dist/utils/includesFileAnnotations.d.ts.map +1 -0
  39. package/dist/utils/includesFileAnnotations.js +19 -0
  40. package/dist/utils/includesFileAnnotations.js.map +1 -0
  41. package/dist/utils/parseMergeConflictDiffFromFile.js.map +1 -1
  42. package/dist/utils/renderDiffWithHighlighter.js +4 -2
  43. package/dist/utils/renderDiffWithHighlighter.js.map +1 -1
  44. package/dist/utils/renderFileWithHighlighter.js +4 -2
  45. package/dist/utils/renderFileWithHighlighter.js.map +1 -1
  46. package/dist/worker/{wasm-BaDzIkIn.js → wasm-qE0LgnY3.js} +2 -2
  47. package/dist/worker/{wasm-BaDzIkIn.js.map → wasm-qE0LgnY3.js.map} +1 -1
  48. package/dist/worker/worker-portable.js +991 -266
  49. package/dist/worker/worker-portable.js.map +1 -1
  50. package/dist/worker/worker.js +8 -4
  51. package/dist/worker/worker.js.map +1 -1
  52. package/package.json +4 -10
@@ -1 +1 @@
1
- {"version":3,"file":"FileStream.js","names":["options: FileStreamOptions"],"sources":["../../src/components/FileStream.ts"],"sourcesContent":["import { DEFAULT_THEMES, DIFFS_TAG_NAME } from '../constants';\nimport { getSharedHighlighter } from '../highlighter/shared_highlighter';\nimport { queueRender } from '../managers/UniversalRenderingManager';\nimport { CodeToTokenTransformStream, type RecallToken } from '../shiki-stream';\nimport type {\n AppliedThemeStyleCache,\n BaseCodeOptions,\n DiffsHighlighter,\n SupportedLanguages,\n ThemedToken,\n ThemeTypes,\n} from '../types';\nimport { createSpanFromToken } from '../utils/createSpanNodeFromToken';\nimport { wrapThemeCSS } from '../utils/cssWrappers';\nimport { formatCSSVariablePrefix } from '../utils/formatCSSVariablePrefix';\nimport { getHighlighterOptions } from '../utils/getHighlighterOptions';\nimport { getHighlighterThemeStyles } from '../utils/getHighlighterThemeStyles';\nimport { getOrCreateCodeNode } from '../utils/getOrCreateCodeNode';\nimport { upsertHostThemeStyle } from '../utils/hostTheme';\nimport { getMeasuredScrollbarGutter } from '../utils/scrollbarGutter';\nimport { setPreNodeProperties } from '../utils/setWrapperNodeProps';\n\nexport interface FileStreamOptions extends BaseCodeOptions {\n lang?: SupportedLanguages;\n startingLineIndex?: number;\n\n onPreRender?(instance: FileStream): unknown;\n onPostRender?(instance: FileStream): unknown;\n\n onStreamStart?(controller: WritableStreamDefaultController): unknown;\n onStreamWrite?(token: ThemedToken | RecallToken): unknown;\n onStreamClose?(): unknown;\n onStreamAbort?(reason: unknown): unknown;\n}\n\nlet instanceId = -1;\n\nexport class FileStream {\n readonly __id: string = `file-stream:${++instanceId}`;\n\n private highlighter: DiffsHighlighter | undefined;\n private stream: ReadableStream<string> | undefined;\n private abortController: AbortController | undefined;\n private fileContainer: HTMLElement | undefined;\n private pre: HTMLPreElement | undefined;\n private code: HTMLElement | undefined;\n private gutterElement: HTMLElement | undefined;\n private contentElement: HTMLElement | undefined;\n private themeCSSStyle: HTMLStyleElement | undefined;\n private appliedThemeCSS: AppliedThemeStyleCache | undefined;\n private currentRowCount = 0;\n\n constructor(public options: FileStreamOptions = { theme: DEFAULT_THEMES }) {\n this.currentLineIndex = this.options.startingLineIndex ?? 1;\n }\n\n cleanUp(): void {\n this.abortController?.abort();\n this.abortController = undefined;\n }\n\n setThemeType(themeType: ThemeTypes): void {\n if ((this.options.themeType ?? 'system') === themeType) {\n return;\n }\n this.options = { ...this.options, themeType };\n if (\n typeof this.options.theme === 'string' ||\n this.fileContainer == null ||\n this.appliedThemeCSS == null\n ) {\n return;\n }\n this.applyThemeState(\n this.fileContainer,\n this.appliedThemeCSS.themeStyles,\n themeType,\n this.appliedThemeCSS.baseThemeType\n );\n }\n\n private async initializeHighlighter(): Promise<DiffsHighlighter> {\n this.highlighter = await getSharedHighlighter(\n getHighlighterOptions(this.options.lang, this.options)\n );\n return this.highlighter;\n }\n\n private queuedSetupArgs: [ReadableStream<string>, HTMLElement] | undefined;\n async setup(\n _source: ReadableStream<string>,\n _wrapper: HTMLElement\n ): Promise<void> {\n const isSettingUp = this.queuedSetupArgs != null;\n this.queuedSetupArgs = [_source, _wrapper];\n if (isSettingUp) {\n // TODO(amadeus): Make it so that this function can be properly\n // awaitable, maybe?\n return;\n }\n this.highlighter ??= await this.initializeHighlighter();\n\n const [source, wrapper] = this.queuedSetupArgs;\n this.queuedSetupArgs = undefined;\n\n const stream = source;\n\n this.setupStream(stream, wrapper, this.highlighter);\n }\n\n private setupStream(\n stream: ReadableStream<string>,\n wrapper: HTMLElement,\n highlighter: DiffsHighlighter\n ): void {\n const {\n disableLineNumbers = false,\n overflow = 'scroll',\n theme = DEFAULT_THEMES,\n themeType = 'system',\n } = this.options;\n const fileContainer = this.getOrCreateFileContainer();\n if (fileContainer.parentElement == null) {\n wrapper.appendChild(fileContainer);\n }\n this.pre ??= document.createElement('pre');\n if (this.pre.parentElement == null) {\n fileContainer.shadowRoot?.appendChild(this.pre);\n }\n const baseThemeType =\n typeof theme === 'string' ? highlighter.getTheme(theme).type : undefined;\n const themeStyles = getHighlighterThemeStyles({ theme, highlighter });\n this.applyThemeState(fileContainer, themeStyles, themeType, baseThemeType);\n const pre = setPreNodeProperties(this.pre, {\n type: 'file',\n diffIndicators: 'none',\n disableBackground: true,\n disableLineNumbers,\n overflow,\n split: false,\n totalLines: 0,\n });\n pre.textContent = '';\n\n this.pre = pre;\n this.code = getOrCreateCodeNode({ code: this.code, pre });\n this.gutterElement = undefined;\n this.contentElement = undefined;\n this.currentRowCount = 0;\n this.currentLineElement = undefined;\n this.currentLineIndex = this.options.startingLineIndex ?? 1;\n this.abortController?.abort();\n this.abortController = new AbortController();\n const { onStreamStart, onStreamClose, onStreamAbort } = this.options;\n // Cancel the prior source so upstream producers stop generating tokens.\n // Swallow AbortError / locked-stream rejections since we're tearing down.\n this.stream?.cancel().catch(() => {});\n this.stream = stream;\n this.stream\n .pipeThrough(\n typeof theme === 'string'\n ? new CodeToTokenTransformStream({\n ...this.options,\n theme,\n highlighter,\n allowRecalls: true,\n defaultColor: false,\n cssVariablePrefix: formatCSSVariablePrefix('token'),\n })\n : new CodeToTokenTransformStream({\n ...this.options,\n themes: theme,\n highlighter,\n allowRecalls: true,\n defaultColor: false,\n cssVariablePrefix: formatCSSVariablePrefix('token'),\n })\n )\n .pipeTo(\n new WritableStream({\n start(controller) {\n onStreamStart?.(controller);\n },\n close() {\n onStreamClose?.();\n },\n abort(reason) {\n onStreamAbort?.(reason);\n },\n write: this.handleWrite,\n }),\n { signal: this.abortController.signal }\n )\n .catch((error) => {\n // Ignore AbortError - it's expected when cleaning up\n if (error.name !== 'AbortError') {\n console.error('FileStream pipe error:', error);\n }\n });\n }\n\n private queuedTokens: (ThemedToken | RecallToken)[] = [];\n private handleWrite = (token: ThemedToken | RecallToken) => {\n // If we've recalled tokens we haven't rendered yet, we can just yeet them\n // and never apply them\n if ('recall' in token && this.queuedTokens.length >= token.recall) {\n this.queuedTokens.length = this.queuedTokens.length - token.recall;\n } else {\n this.queuedTokens.push(token);\n }\n queueRender(this.render);\n this.options.onStreamWrite?.(token);\n };\n\n private currentLineIndex: number;\n private currentLineElement: HTMLElement | undefined;\n private render = () => {\n this.options.onPreRender?.(this);\n const { gutter, content } = this.getOrCreateStreamColumns();\n const gutterFragment = document.createDocumentFragment();\n const contentFragment = document.createDocumentFragment();\n for (const token of this.queuedTokens) {\n if ('recall' in token) {\n if (this.currentLineElement == null) {\n throw new Error(\n 'FileStream.render: no current line element, shouldnt be possible to get here'\n );\n }\n if (token.recall > this.currentLineElement.childNodes.length) {\n throw new Error(\n `FileStream.render: Token recall exceed the current line, there's probably a bug...`\n );\n }\n for (let i = 0; i < token.recall; i++) {\n this.currentLineElement.lastChild?.remove();\n }\n } else {\n const span = createSpanFromToken(token);\n if (this.currentLineElement == null) {\n const { gutterLine, contentLine } = this.createLine();\n gutterFragment.appendChild(gutterLine);\n contentFragment.appendChild(contentLine);\n }\n this.currentLineElement?.appendChild(span);\n if (token.content === '\\n') {\n this.currentLineIndex++;\n const { gutterLine, contentLine } = this.createLine();\n gutterFragment.appendChild(gutterLine);\n contentFragment.appendChild(contentLine);\n }\n }\n }\n if (gutterFragment.childNodes.length > 0) {\n gutter.appendChild(gutterFragment);\n }\n if (contentFragment.childNodes.length > 0) {\n content.appendChild(contentFragment);\n }\n this.queuedTokens.length = 0;\n this.options.onPostRender?.(this);\n };\n\n private getOrCreateStreamColumns(): {\n gutter: HTMLElement;\n content: HTMLElement;\n } {\n if (this.code == null) {\n throw new Error('FileStream: expected code element to exist');\n }\n if (this.gutterElement != null && this.contentElement != null) {\n return { gutter: this.gutterElement, content: this.contentElement };\n }\n const gutter = document.createElement('div');\n gutter.dataset.gutter = '';\n const content = document.createElement('div');\n content.dataset.content = '';\n this.code.appendChild(gutter);\n this.code.appendChild(content);\n this.gutterElement = gutter;\n this.contentElement = content;\n return { gutter, content };\n }\n\n private updateRowSpan(): void {\n if (this.gutterElement != null) {\n this.gutterElement.style.gridRow = `span ${this.currentRowCount}`;\n }\n if (this.contentElement != null) {\n this.contentElement.style.gridRow = `span ${this.currentRowCount}`;\n }\n }\n\n private createLine(): { gutterLine: HTMLElement; contentLine: HTMLElement } {\n const lineNumber = this.currentLineIndex;\n const lineIndex = `${lineNumber - 1}`;\n const gutterLine = document.createElement('div');\n gutterLine.dataset.columnNumber = `${lineNumber}`;\n gutterLine.dataset.lineType = 'context';\n gutterLine.dataset.lineIndex = lineIndex;\n\n const numberContent = document.createElement('span');\n numberContent.dataset.lineNumberContent = '';\n numberContent.textContent = `${lineNumber}`;\n gutterLine.appendChild(numberContent);\n\n const contentLine = document.createElement('div');\n contentLine.dataset.line = `${lineNumber}`;\n contentLine.dataset.lineType = 'context';\n contentLine.dataset.lineIndex = lineIndex;\n\n this.currentRowCount += 1;\n this.updateRowSpan();\n this.currentLineElement = contentLine;\n return { gutterLine, contentLine };\n }\n\n private getOrCreateFileContainer(fileContainer?: HTMLElement): HTMLElement {\n if (\n (fileContainer != null && fileContainer === this.fileContainer) ||\n (fileContainer == null && this.fileContainer != null)\n ) {\n return this.fileContainer;\n }\n if (\n this.fileContainer != null &&\n fileContainer != null &&\n fileContainer !== this.fileContainer\n ) {\n this.themeCSSStyle = undefined;\n this.appliedThemeCSS = undefined;\n }\n this.fileContainer =\n fileContainer ?? document.createElement(DIFFS_TAG_NAME);\n return this.fileContainer;\n }\n\n private applyThemeState(\n container: HTMLElement,\n themeStyles: string,\n themeType: ThemeTypes,\n baseThemeType?: 'light' | 'dark'\n ): void {\n const shadowRoot =\n container.shadowRoot ?? container.attachShadow({ mode: 'open' });\n const effectiveThemeType = baseThemeType ?? themeType;\n const currentTheme = this.options.theme ?? DEFAULT_THEMES;\n const theme =\n typeof currentTheme === 'string' ? currentTheme : { ...currentTheme };\n const scrollbarGutter = getMeasuredScrollbarGutter(shadowRoot);\n if (\n this.themeCSSStyle?.parentNode === shadowRoot &&\n this.appliedThemeCSS?.themeStyles === themeStyles &&\n this.appliedThemeCSS.themeType === effectiveThemeType &&\n this.appliedThemeCSS.scrollbarGutter === scrollbarGutter\n ) {\n this.appliedThemeCSS.theme = theme;\n return;\n }\n this.themeCSSStyle = upsertHostThemeStyle({\n shadowRoot,\n currentNode: this.themeCSSStyle,\n themeCSS: wrapThemeCSS(themeStyles, effectiveThemeType, scrollbarGutter),\n });\n this.appliedThemeCSS =\n this.themeCSSStyle != null\n ? {\n theme,\n themeStyles,\n themeType: effectiveThemeType,\n baseThemeType,\n scrollbarGutter,\n }\n : undefined;\n }\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"FileStream.js","names":["options: FileStreamOptions"],"sources":["../../src/components/FileStream.ts"],"sourcesContent":["import { DEFAULT_THEMES, DIFFS_TAG_NAME } from '../constants';\nimport { getSharedHighlighter } from '../highlighter/shared_highlighter';\nimport { queueRender } from '../managers/UniversalRenderingManager';\nimport { CodeToTokenTransformStream, type RecallToken } from '../shiki-stream';\nimport type {\n AppliedThemeStyleCache,\n BaseCodeOptions,\n DiffsHighlighter,\n SupportedLanguages,\n ThemedToken,\n ThemeTypes,\n} from '../types';\nimport { createSpanFromToken } from '../utils/createSpanNodeFromToken';\nimport { wrapThemeCSS } from '../utils/cssWrappers';\nimport { formatCSSVariablePrefix } from '../utils/formatCSSVariablePrefix';\nimport { getHighlighterOptions } from '../utils/getHighlighterOptions';\nimport { getHighlighterThemeStyles } from '../utils/getHighlighterThemeStyles';\nimport { getOrCreateCodeNode } from '../utils/getOrCreateCodeNode';\nimport { upsertHostThemeStyle } from '../utils/hostTheme';\nimport { getMeasuredScrollbarGutter } from '../utils/scrollbarGutter';\nimport { setPreNodeProperties } from '../utils/setWrapperNodeProps';\n\nexport interface FileStreamOptions extends BaseCodeOptions {\n lang?: SupportedLanguages;\n startingLineIndex?: number;\n\n onPreRender?(instance: FileStream): unknown;\n onPostRender?(instance: FileStream): unknown;\n\n onStreamStart?(controller: WritableStreamDefaultController): unknown;\n onStreamWrite?(token: ThemedToken | RecallToken): unknown;\n onStreamClose?(): unknown;\n onStreamAbort?(reason: unknown): unknown;\n}\n\nlet instanceId = -1;\n\nexport class FileStream {\n readonly __id: string = `file-stream:${++instanceId}`;\n\n private highlighter: DiffsHighlighter | undefined;\n private stream: ReadableStream<string> | undefined;\n private abortController: AbortController | undefined;\n private fileContainer: HTMLElement | undefined;\n private pre: HTMLPreElement | undefined;\n private code: HTMLElement | undefined;\n private gutterElement: HTMLElement | undefined;\n private contentElement: HTMLElement | undefined;\n private themeCSSStyle: HTMLStyleElement | undefined;\n private appliedThemeCSS: AppliedThemeStyleCache | undefined;\n private currentRowCount = 0;\n\n constructor(public options: FileStreamOptions = { theme: DEFAULT_THEMES }) {\n this.currentLineIndex = this.options.startingLineIndex ?? 1;\n }\n\n cleanUp(): void {\n this.abortController?.abort();\n this.abortController = undefined;\n }\n\n setThemeType(themeType: ThemeTypes): void {\n if ((this.options.themeType ?? 'system') === themeType) {\n return;\n }\n this.options = { ...this.options, themeType };\n if (\n typeof this.options.theme === 'string' ||\n this.fileContainer == null ||\n this.appliedThemeCSS == null\n ) {\n return;\n }\n this.applyThemeState(\n this.fileContainer,\n this.appliedThemeCSS.themeStyles,\n themeType,\n this.appliedThemeCSS.baseThemeType\n );\n }\n\n private async initializeHighlighter(): Promise<DiffsHighlighter> {\n this.highlighter = await getSharedHighlighter(\n getHighlighterOptions(this.options.lang, this.options)\n );\n return this.highlighter;\n }\n\n private queuedSetupArgs: [ReadableStream<string>, HTMLElement] | undefined;\n async setup(\n _source: ReadableStream<string>,\n _wrapper: HTMLElement\n ): Promise<void> {\n const isSettingUp = this.queuedSetupArgs != null;\n this.queuedSetupArgs = [_source, _wrapper];\n if (isSettingUp) {\n // TODO(amadeus): Make it so that this function can be properly\n // awaitable, maybe?\n return;\n }\n this.highlighter ??= await this.initializeHighlighter();\n\n const [source, wrapper] = this.queuedSetupArgs;\n this.queuedSetupArgs = undefined;\n\n const stream = source;\n\n this.setupStream(stream, wrapper, this.highlighter);\n }\n\n private setupStream(\n stream: ReadableStream<string>,\n wrapper: HTMLElement,\n highlighter: DiffsHighlighter\n ): void {\n const {\n disableLineNumbers = false,\n overflow = 'scroll',\n theme = DEFAULT_THEMES,\n themeType = 'system',\n } = this.options;\n const fileContainer = this.getOrCreateFileContainer();\n if (fileContainer.parentElement == null) {\n wrapper.appendChild(fileContainer);\n }\n this.pre ??= document.createElement('pre');\n if (this.pre.parentElement == null) {\n fileContainer.shadowRoot?.appendChild(this.pre);\n }\n const baseThemeType =\n typeof theme === 'string' ? highlighter.getTheme(theme).type : undefined;\n const themeStyles = getHighlighterThemeStyles({ theme, highlighter });\n this.applyThemeState(fileContainer, themeStyles, themeType, baseThemeType);\n const pre = setPreNodeProperties(this.pre, {\n type: 'file',\n diffIndicators: 'none',\n disableBackground: true,\n disableLineNumbers,\n overflow,\n split: false,\n totalLines: 0,\n });\n pre.textContent = '';\n\n this.pre = pre;\n this.code = getOrCreateCodeNode({ code: this.code, pre });\n this.gutterElement = undefined;\n this.contentElement = undefined;\n this.currentRowCount = 0;\n this.currentLineElement = undefined;\n this.currentLineIndex = this.options.startingLineIndex ?? 1;\n this.abortController?.abort();\n this.abortController = new AbortController();\n const { onStreamStart, onStreamClose, onStreamAbort } = this.options;\n // Cancel the prior source so upstream producers stop generating tokens.\n // Swallow AbortError / locked-stream rejections since we're tearing down.\n this.stream?.cancel().catch(() => {});\n this.stream = stream;\n this.stream\n // tokenizeTimeLimit: 0 — never trade silently-wrong token colors for\n // latency; see renderFileWithHighlighter for the full rationale.\n .pipeThrough(\n typeof theme === 'string'\n ? new CodeToTokenTransformStream({\n ...this.options,\n theme,\n highlighter,\n allowRecalls: true,\n defaultColor: false,\n cssVariablePrefix: formatCSSVariablePrefix('token'),\n tokenizeTimeLimit: 0,\n })\n : new CodeToTokenTransformStream({\n ...this.options,\n themes: theme,\n highlighter,\n allowRecalls: true,\n defaultColor: false,\n cssVariablePrefix: formatCSSVariablePrefix('token'),\n tokenizeTimeLimit: 0,\n })\n )\n .pipeTo(\n new WritableStream({\n start(controller) {\n onStreamStart?.(controller);\n },\n close() {\n onStreamClose?.();\n },\n abort(reason) {\n onStreamAbort?.(reason);\n },\n write: this.handleWrite,\n }),\n { signal: this.abortController.signal }\n )\n .catch((error) => {\n // Ignore AbortError - it's expected when cleaning up\n if (error.name !== 'AbortError') {\n console.error('FileStream pipe error:', error);\n }\n });\n }\n\n private queuedTokens: (ThemedToken | RecallToken)[] = [];\n private handleWrite = (token: ThemedToken | RecallToken) => {\n // If we've recalled tokens we haven't rendered yet, we can just yeet them\n // and never apply them\n if ('recall' in token && this.queuedTokens.length >= token.recall) {\n this.queuedTokens.length = this.queuedTokens.length - token.recall;\n } else {\n this.queuedTokens.push(token);\n }\n queueRender(this.render);\n this.options.onStreamWrite?.(token);\n };\n\n private currentLineIndex: number;\n private currentLineElement: HTMLElement | undefined;\n private render = () => {\n this.options.onPreRender?.(this);\n const { gutter, content } = this.getOrCreateStreamColumns();\n const gutterFragment = document.createDocumentFragment();\n const contentFragment = document.createDocumentFragment();\n for (const token of this.queuedTokens) {\n if ('recall' in token) {\n if (this.currentLineElement == null) {\n throw new Error(\n 'FileStream.render: no current line element, shouldnt be possible to get here'\n );\n }\n if (token.recall > this.currentLineElement.childNodes.length) {\n throw new Error(\n `FileStream.render: Token recall exceed the current line, there's probably a bug...`\n );\n }\n for (let i = 0; i < token.recall; i++) {\n this.currentLineElement.lastChild?.remove();\n }\n } else {\n const span = createSpanFromToken(token);\n if (this.currentLineElement == null) {\n const { gutterLine, contentLine } = this.createLine();\n gutterFragment.appendChild(gutterLine);\n contentFragment.appendChild(contentLine);\n }\n this.currentLineElement?.appendChild(span);\n if (token.content === '\\n') {\n this.currentLineIndex++;\n const { gutterLine, contentLine } = this.createLine();\n gutterFragment.appendChild(gutterLine);\n contentFragment.appendChild(contentLine);\n }\n }\n }\n if (gutterFragment.childNodes.length > 0) {\n gutter.appendChild(gutterFragment);\n }\n if (contentFragment.childNodes.length > 0) {\n content.appendChild(contentFragment);\n }\n this.queuedTokens.length = 0;\n this.options.onPostRender?.(this);\n };\n\n private getOrCreateStreamColumns(): {\n gutter: HTMLElement;\n content: HTMLElement;\n } {\n if (this.code == null) {\n throw new Error('FileStream: expected code element to exist');\n }\n if (this.gutterElement != null && this.contentElement != null) {\n return { gutter: this.gutterElement, content: this.contentElement };\n }\n const gutter = document.createElement('div');\n gutter.dataset.gutter = '';\n const content = document.createElement('div');\n content.dataset.content = '';\n this.code.appendChild(gutter);\n this.code.appendChild(content);\n this.gutterElement = gutter;\n this.contentElement = content;\n return { gutter, content };\n }\n\n private updateRowSpan(): void {\n if (this.gutterElement != null) {\n this.gutterElement.style.gridRow = `span ${this.currentRowCount}`;\n }\n if (this.contentElement != null) {\n this.contentElement.style.gridRow = `span ${this.currentRowCount}`;\n }\n }\n\n private createLine(): { gutterLine: HTMLElement; contentLine: HTMLElement } {\n const lineNumber = this.currentLineIndex;\n const lineIndex = `${lineNumber - 1}`;\n const gutterLine = document.createElement('div');\n gutterLine.dataset.columnNumber = `${lineNumber}`;\n gutterLine.dataset.lineType = 'context';\n gutterLine.dataset.lineIndex = lineIndex;\n\n const numberContent = document.createElement('span');\n numberContent.dataset.lineNumberContent = '';\n numberContent.textContent = `${lineNumber}`;\n gutterLine.appendChild(numberContent);\n\n const contentLine = document.createElement('div');\n contentLine.dataset.line = `${lineNumber}`;\n contentLine.dataset.lineType = 'context';\n contentLine.dataset.lineIndex = lineIndex;\n\n this.currentRowCount += 1;\n this.updateRowSpan();\n this.currentLineElement = contentLine;\n return { gutterLine, contentLine };\n }\n\n private getOrCreateFileContainer(fileContainer?: HTMLElement): HTMLElement {\n if (\n (fileContainer != null && fileContainer === this.fileContainer) ||\n (fileContainer == null && this.fileContainer != null)\n ) {\n return this.fileContainer;\n }\n if (\n this.fileContainer != null &&\n fileContainer != null &&\n fileContainer !== this.fileContainer\n ) {\n this.themeCSSStyle = undefined;\n this.appliedThemeCSS = undefined;\n }\n this.fileContainer =\n fileContainer ?? document.createElement(DIFFS_TAG_NAME);\n return this.fileContainer;\n }\n\n private applyThemeState(\n container: HTMLElement,\n themeStyles: string,\n themeType: ThemeTypes,\n baseThemeType?: 'light' | 'dark'\n ): void {\n const shadowRoot =\n container.shadowRoot ?? container.attachShadow({ mode: 'open' });\n const effectiveThemeType = baseThemeType ?? themeType;\n const currentTheme = this.options.theme ?? DEFAULT_THEMES;\n const theme =\n typeof currentTheme === 'string' ? currentTheme : { ...currentTheme };\n const scrollbarGutter = getMeasuredScrollbarGutter(shadowRoot);\n if (\n this.themeCSSStyle?.parentNode === shadowRoot &&\n this.appliedThemeCSS?.themeStyles === themeStyles &&\n this.appliedThemeCSS.themeType === effectiveThemeType &&\n this.appliedThemeCSS.scrollbarGutter === scrollbarGutter\n ) {\n this.appliedThemeCSS.theme = theme;\n return;\n }\n this.themeCSSStyle = upsertHostThemeStyle({\n shadowRoot,\n currentNode: this.themeCSSStyle,\n themeCSS: wrapThemeCSS(themeStyles, effectiveThemeType, scrollbarGutter),\n });\n this.appliedThemeCSS =\n this.themeCSSStyle != null\n ? {\n theme,\n themeStyles,\n themeType: effectiveThemeType,\n baseThemeType,\n scrollbarGutter,\n }\n : undefined;\n }\n}\n"],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"UnresolvedFile.d.ts","names":["HunksRenderResult","UnresolvedFileHunksRenderer","UnresolvedFileHunksRendererOptions","FileContents","FileDiffMetadata","MergeConflictActionPayload","MergeConflictMarkerRow","MergeConflictResolution","PostRenderPhase","MergeConflictDiffAction","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","RenderMergeConflictActions","LAnnotation","UnresolvedFile","HTMLElement","DocumentFragment","MergeConflictActionsTypeOption","UnresolvedFileOptions","Omit","UnresolvedFileRenderProps","UnresolvedFileHydrationProps","GetOrComputeDiffProps","ResolveConflictReturn","UnresolvedFileDataCache","HTMLPreElement","getUnresolvedDiffHunksRendererOptions"],"sources":["../../src/components/UnresolvedFile.d.ts"],"sourcesContent":["import type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer, type UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictResolution, PostRenderPhase } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nexport type RenderMergeConflictActions<LAnnotation> = (action: MergeConflictDiffAction, instance: UnresolvedFile<LAnnotation>) => HTMLElement | DocumentFragment | null | undefined;\nexport type MergeConflictActionsTypeOption<LAnnotation> = 'none' | 'default' | RenderMergeConflictActions<LAnnotation>;\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'diffStyle' | 'onPostRender'> {\n onPostRender?(node: HTMLElement, instance: UnresolvedFile<LAnnotation>, phase: PostRenderPhase): unknown;\n mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n onMergeConflictAction?(payload: MergeConflictActionPayload, instance: UnresolvedFile<LAnnotation>): void;\n onMergeConflictResolve?(file: FileContents, payload: MergeConflictActionPayload): void;\n maxContextLines?: number;\n}\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<FileDiffRenderProps<LAnnotation>, 'oldFile' | 'newFile'> {\n file?: FileContents;\n actions?: (MergeConflictDiffAction | undefined)[];\n markerRows?: MergeConflictMarkerRow[];\n}\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<UnresolvedFileRenderProps<LAnnotation>, 'file'> {\n file?: FileContents;\n fileContainer: HTMLElement;\n prerenderedHTML?: string;\n}\ninterface GetOrComputeDiffProps {\n file: FileContents | undefined;\n fileDiff: FileDiffMetadata | undefined;\n actions: (MergeConflictDiffAction | undefined)[] | undefined;\n markerRows: MergeConflictMarkerRow[] | undefined;\n}\ninterface ResolveConflictReturn {\n file: FileContents;\n fileDiff: FileDiffMetadata;\n actions: (MergeConflictDiffAction | undefined)[];\n markerRows: MergeConflictMarkerRow[];\n}\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\nexport declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n options: UnresolvedFileOptions<LAnnotation>;\n readonly __id: string;\n readonly type = \"unresolved-file\";\n protected computedCache: UnresolvedFileDataCache;\n private conflictActions;\n private markerRows;\n private conflictActionCache;\n constructor(options?: UnresolvedFileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);\n setOptions(options: UnresolvedFileOptions<LAnnotation> | undefined): void;\n protected createHunksRenderer(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRenderer<LAnnotation>;\n protected getHunksRendererOptions(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\n protected applyPreNodeAttributes(pre: HTMLPreElement, result: HunksRenderResult): void;\n cleanUp(): void;\n private getOrComputeDiff;\n hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void;\n rerender(): void;\n render(props?: UnresolvedFileRenderProps<LAnnotation>): boolean;\n resolveConflict(conflictIndex: number, resolution: MergeConflictResolution, fileDiff?: FileDiffMetadata | undefined): ResolveConflictReturn | undefined;\n private resolveConflictAndRender;\n private setActiveMergeConflictState;\n private handleMergeConflictActionClick;\n private renderMergeConflictActionSlots;\n private renderMergeConflictAction;\n private clearMergeConflictActionCache;\n}\nexport declare function getUnresolvedDiffHunksRendererOptions<LAnnotation>(options?: UnresolvedFileOptions<LAnnotation>, baseOptions?: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\nexport {};\n//# sourceMappingURL=UnresolvedFile.d.ts.map"],"mappings":"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"}
1
+ {"version":3,"file":"UnresolvedFile.d.ts","names":["HunksRenderResult","UnresolvedFileHunksRenderer","UnresolvedFileHunksRendererOptions","FileContents","FileDiffMetadata","MergeConflictActionPayload","MergeConflictMarkerRow","MergeConflictResolution","PostRenderPhase","MergeConflictDiffAction","WorkerPoolManager","FileDiff","FileDiffOptions","FileDiffRenderProps","RenderMergeConflictActions","LAnnotation","UnresolvedFile","HTMLElement","DocumentFragment","MergeConflictActionsTypeOption","UnresolvedFileOptions","Omit","UnresolvedFileRenderProps","UnresolvedFileHydrationProps","GetOrComputeDiffProps","ResolveConflictReturn","UnresolvedFileDataCache","HTMLPreElement","getUnresolvedDiffHunksRendererOptions"],"sources":["../../src/components/UnresolvedFile.d.ts"],"sourcesContent":["import type { HunksRenderResult } from '../renderers/DiffHunksRenderer';\nimport { UnresolvedFileHunksRenderer, type UnresolvedFileHunksRendererOptions } from '../renderers/UnresolvedFileHunksRenderer';\nimport type { FileContents, FileDiffMetadata, MergeConflictActionPayload, MergeConflictMarkerRow, MergeConflictResolution, PostRenderPhase } from '../types';\nimport { type MergeConflictDiffAction } from '../utils/parseMergeConflictDiffFromFile';\nimport type { WorkerPoolManager } from '../worker';\nimport { FileDiff, type FileDiffOptions, type FileDiffRenderProps } from './FileDiff';\nexport type RenderMergeConflictActions<LAnnotation> = (action: MergeConflictDiffAction, instance: UnresolvedFile<LAnnotation>) => HTMLElement | DocumentFragment | null | undefined;\nexport type MergeConflictActionsTypeOption<LAnnotation> = 'none' | 'default' | RenderMergeConflictActions<LAnnotation>;\nexport interface UnresolvedFileOptions<LAnnotation> extends Omit<FileDiffOptions<LAnnotation>, 'diffStyle' | 'onPostRender'> {\n onPostRender?(node: HTMLElement, instance: UnresolvedFile<LAnnotation>, phase: PostRenderPhase): unknown;\n mergeConflictActionsType?: MergeConflictActionsTypeOption<LAnnotation>;\n onMergeConflictAction?(payload: MergeConflictActionPayload, instance: UnresolvedFile<LAnnotation>): void;\n onMergeConflictResolve?(file: FileContents, payload: MergeConflictActionPayload): void;\n maxContextLines?: number;\n}\nexport interface UnresolvedFileRenderProps<LAnnotation> extends Omit<FileDiffRenderProps<LAnnotation>, 'oldFile' | 'newFile'> {\n file?: FileContents;\n actions?: (MergeConflictDiffAction | undefined)[];\n markerRows?: MergeConflictMarkerRow[];\n}\nexport interface UnresolvedFileHydrationProps<LAnnotation> extends Omit<UnresolvedFileRenderProps<LAnnotation>, 'file'> {\n file?: FileContents;\n fileContainer: HTMLElement;\n prerenderedHTML?: string;\n}\ninterface GetOrComputeDiffProps {\n file: FileContents | undefined;\n fileDiff: FileDiffMetadata | undefined;\n actions: (MergeConflictDiffAction | undefined)[] | undefined;\n markerRows: MergeConflictMarkerRow[] | undefined;\n}\ninterface ResolveConflictReturn {\n file: FileContents;\n fileDiff: FileDiffMetadata;\n actions: (MergeConflictDiffAction | undefined)[];\n markerRows: MergeConflictMarkerRow[];\n}\ntype UnresolvedFileDataCache = GetOrComputeDiffProps;\nexport declare class UnresolvedFile<LAnnotation = undefined> extends FileDiff<LAnnotation> {\n options: UnresolvedFileOptions<LAnnotation>;\n readonly __id: string;\n readonly type = \"unresolved-file\";\n protected computedCache: UnresolvedFileDataCache;\n private conflictActions;\n private markerRows;\n private conflictActionCache;\n constructor(options?: UnresolvedFileOptions<LAnnotation>, workerManager?: WorkerPoolManager | undefined, isContainerManaged?: boolean);\n setOptions(options: UnresolvedFileOptions<LAnnotation> | undefined): void;\n protected createHunksRenderer(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRenderer<LAnnotation>;\n protected getHunksRendererOptions(options: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\n protected applyPreNodeAttributes(pre: HTMLPreElement, result: HunksRenderResult): void;\n cleanUp(): void;\n private getOrComputeDiff;\n hydrate(props: UnresolvedFileHydrationProps<LAnnotation>): void;\n rerender(): void;\n render(props?: UnresolvedFileRenderProps<LAnnotation>): boolean;\n resolveConflict(conflictIndex: number, resolution: MergeConflictResolution, fileDiff?: FileDiffMetadata | undefined): ResolveConflictReturn | undefined;\n private resolveConflictAndRender;\n private setActiveMergeConflictState;\n private handleMergeConflictActionClick;\n private renderMergeConflictActionSlots;\n private renderMergeConflictAction;\n private clearMergeConflictActionCache;\n}\nexport declare function getUnresolvedDiffHunksRendererOptions<LAnnotation>(options?: UnresolvedFileOptions<LAnnotation>, baseOptions?: UnresolvedFileOptions<LAnnotation>): UnresolvedFileHunksRendererOptions;\nexport {};\n//# sourceMappingURL=UnresolvedFile.d.ts.map"],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { FileContents, NumericScrollLineAnchor, PendingCodeViewLayoutReset, RenderWindow, StickySpecs, ThemeTypes, VirtualFileMetrics } from "../types.js";
1
+ import { FileContents, LineAnnotation, NumericScrollLineAnchor, PendingCodeViewLayoutReset, RenderWindow, StickySpecs, ThemeTypes, VirtualFileMetrics } from "../types.js";
2
2
  import { WorkerPoolManager } from "../worker/WorkerPoolManager.js";
3
3
  import "../worker/index.js";
4
4
  import { File, FileOptions, FileRenderProps } from "./File.js";
@@ -20,13 +20,16 @@ declare class VirtualizedFile<LAnnotation = undefined> extends File<LAnnotation>
20
20
  private currentCollapsed;
21
21
  constructor(options: FileOptions<LAnnotation> | undefined, virtualizer: Virtualizer | CodeView<LAnnotation>, metrics?: VirtualFileMetrics, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);
22
22
  setMetrics(metrics: VirtualFileMetrics, force?: boolean): void;
23
+ setLineAnnotations(lineAnnotations: LineAnnotation<LAnnotation>[]): void;
24
+ private syncLineAnnotations;
25
+ private hasLineAnnotations;
23
26
  getLineHeight(lineIndex: number, hasMetadataLine?: boolean): number;
24
27
  setOptions(options: FileOptions<LAnnotation> | undefined): void;
25
28
  setThemeType(themeType: ThemeTypes): void;
26
29
  private resetLayoutCache;
27
30
  reconcileHeights(): boolean;
28
31
  onRender: (dirty: boolean) => boolean;
29
- prepareCodeViewItem(file: FileContents, top: number, reset?: PendingCodeViewLayoutReset): number;
32
+ prepareCodeViewItem(file: FileContents, top: number, reset?: PendingCodeViewLayoutReset, lineAnnotations?: LineAnnotation<LAnnotation>[]): number;
30
33
  getLinePosition(lineNumber: number): {
31
34
  top: number;
32
35
  height: number;
@@ -42,6 +45,7 @@ declare class VirtualizedFile<LAnnotation = undefined> extends File<LAnnotation>
42
45
  fileContainer,
43
46
  file,
44
47
  forceRender,
48
+ lineAnnotations,
45
49
  ...props
46
50
  }: FileRenderProps<LAnnotation>): boolean;
47
51
  syncVirtualizedTop(): void;
@@ -1 +1 @@
1
- {"version":3,"file":"VirtualizedFile.d.ts","names":["FileContents","NumericScrollLineAnchor","PendingCodeViewLayoutReset","RenderWindow","StickySpecs","ThemeTypes","VirtualFileMetrics","WorkerPoolManager","CodeView","File","FileOptions","FileRenderProps","Virtualizer","VirtualizedFile","LAnnotation","fileContainer","file","forceRender"],"sources":["../../src/components/VirtualizedFile.d.ts"],"sourcesContent":["import type { FileContents, NumericScrollLineAnchor, PendingCodeViewLayoutReset, RenderWindow, StickySpecs, ThemeTypes, VirtualFileMetrics } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nimport type { CodeView } from './CodeView';\nimport { File, type FileOptions, type FileRenderProps } from './File';\nimport type { Virtualizer } from './Virtualizer';\nexport declare class VirtualizedFile<LAnnotation = undefined> extends File<LAnnotation> {\n private virtualizer;\n private metrics;\n readonly __id: string;\n top: number | undefined;\n height: number;\n private cache;\n private isVisible;\n private isSetup;\n private layoutDirty;\n private forceRenderOverride;\n private currentCollapsed;\n constructor(options: FileOptions<LAnnotation> | undefined, virtualizer: Virtualizer | CodeView<LAnnotation>, metrics?: VirtualFileMetrics, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);\n setMetrics(metrics: VirtualFileMetrics, force?: boolean): void;\n getLineHeight(lineIndex: number, hasMetadataLine?: boolean): number;\n setOptions(options: FileOptions<LAnnotation> | undefined): void;\n setThemeType(themeType: ThemeTypes): void;\n private resetLayoutCache;\n reconcileHeights(): boolean;\n onRender: (dirty: boolean) => boolean;\n prepareCodeViewItem(file: FileContents, top: number, reset?: PendingCodeViewLayoutReset): number;\n getLinePosition(lineNumber: number): {\n top: number;\n height: number;\n } | undefined;\n getNumericScrollAnchor(localViewportTop: number): NumericScrollLineAnchor | undefined;\n getVirtualizedHeight(): number;\n getAdvancedStickySpecs(windowSpecs?: RenderWindow): StickySpecs | undefined;\n cleanUp(recycle?: boolean): void;\n private computeApproximateSize;\n setVisibility(visible: boolean): void;\n rerender(): void;\n render({ fileContainer, file, forceRender, ...props }: FileRenderProps<LAnnotation>): boolean;\n syncVirtualizedTop(): void;\n protected shouldDisableVirtualizationBuffers(): boolean;\n private isSimpleMode;\n private isAdvancedMode;\n private addLayoutCheckpoint;\n private getLayoutCheckpointBeforeLineIndex;\n private getLayoutCheckpointBeforeTop;\n private getVirtualizedTop;\n private getSimpleVirtualizer;\n private isResizeDebuggingEnabled;\n private computeRenderRangeFromWindow;\n}\n//# sourceMappingURL=VirtualizedFile.d.ts.map"],"mappings":";;;;;;;;cAKqBa,iDAAiDJ,KAAKK;;;EAAtDD,SAAAA,IAAAA,EAAAA,MAAe;EAAuCC,GAAAA,EAAAA,MAAAA,GAAAA,SAAAA;EAYtCA,MAAAA,EAAAA,MAAAA;EAAZJ,QAAAA,KAAAA;EAAmDE,QAAAA,SAAAA;EAAuBE,QAAAA,OAAAA;EAATN,QAAAA,WAAAA;EAAiCF,QAAAA,mBAAAA;EAAoCC,QAAAA,gBAAAA;EACvID,WAAAA,CAAAA,OAAAA,EADCI,WACDJ,CADaQ,WACbR,CAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EADoDM,WACpDN,GADkEE,QAClEF,CAD2EQ,WAC3ER,CAAAA,EAAAA,OAAAA,CAAAA,EADmGA,kBACnGA,EAAAA,aAAAA,CAAAA,EADuIC,iBACvID,EAAAA,kBAAAA,CAAAA,EAAAA,OAAAA;EAEYQ,UAAAA,CAAAA,OAAAA,EAFZR,kBAEYQ,EAAAA,KAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAAZJ,aAAAA,CAAAA,SAAAA,EAAAA,MAAAA,EAAAA,eAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,MAAAA;EACIL,UAAAA,CAAAA,OAAAA,EADJK,WACIL,CADQS,WACRT,CAAAA,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EAIEL,YAAAA,CAAAA,SAAAA,EAJFK,UAIEL,CAAAA,EAAAA,IAAAA;EAAmCE,QAAAA,gBAAAA;EAKXD,gBAAAA,CAAAA,CAAAA,EAAAA,OAAAA;EAEbE,QAAAA,EAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,GAAAA,OAAAA;EAAeC,mBAAAA,CAAAA,IAAAA,EAP1BJ,YAO0BI,EAAAA,GAAAA,EAAAA,MAAAA,EAAAA,KAAAA,CAAAA,EAPSF,0BAOTE,CAAAA,EAAAA,MAAAA;EAK3CW,eAAAA,CAAAA,UAAAA,EAAAA,MAAAA,CAAAA,EAAAA;IAAeC,GAAAA,EAAAA,MAAAA;IAAMC,MAAAA,EAAAA,MAAAA;EAAyCH,CAAAA,GAAAA,SAAAA;EAAhBH,sBAAAA,CAAAA,gBAAAA,EAAAA,MAAAA,CAAAA,EAPLV,uBAOKU,GAAAA,SAAAA;EAhCWF,oBAAAA,CAAAA,CAAAA,EAAAA,MAAAA;EAAI,sBAAA,CAAA,WAAA,CAAA,EA2BjCN,YA3BiC,CAAA,EA2BlBC,WA3BkB,GAAA,SAAA;;;;;;;;;;KAgCfO,gBAAgBG"}
1
+ {"version":3,"file":"VirtualizedFile.d.ts","names":["FileContents","LineAnnotation","NumericScrollLineAnchor","PendingCodeViewLayoutReset","RenderWindow","StickySpecs","ThemeTypes","VirtualFileMetrics","WorkerPoolManager","CodeView","File","FileOptions","FileRenderProps","Virtualizer","VirtualizedFile","LAnnotation","fileContainer","file","forceRender","lineAnnotations"],"sources":["../../src/components/VirtualizedFile.d.ts"],"sourcesContent":["import type { FileContents, LineAnnotation, NumericScrollLineAnchor, PendingCodeViewLayoutReset, RenderWindow, StickySpecs, ThemeTypes, VirtualFileMetrics } from '../types';\nimport type { WorkerPoolManager } from '../worker';\nimport type { CodeView } from './CodeView';\nimport { File, type FileOptions, type FileRenderProps } from './File';\nimport type { Virtualizer } from './Virtualizer';\nexport declare class VirtualizedFile<LAnnotation = undefined> extends File<LAnnotation> {\n private virtualizer;\n private metrics;\n readonly __id: string;\n top: number | undefined;\n height: number;\n private cache;\n private isVisible;\n private isSetup;\n private layoutDirty;\n private forceRenderOverride;\n private currentCollapsed;\n constructor(options: FileOptions<LAnnotation> | undefined, virtualizer: Virtualizer | CodeView<LAnnotation>, metrics?: VirtualFileMetrics, workerManager?: WorkerPoolManager, isContainerManaged?: boolean);\n setMetrics(metrics: VirtualFileMetrics, force?: boolean): void;\n setLineAnnotations(lineAnnotations: LineAnnotation<LAnnotation>[]): void;\n private syncLineAnnotations;\n private hasLineAnnotations;\n getLineHeight(lineIndex: number, hasMetadataLine?: boolean): number;\n setOptions(options: FileOptions<LAnnotation> | undefined): void;\n setThemeType(themeType: ThemeTypes): void;\n private resetLayoutCache;\n reconcileHeights(): boolean;\n onRender: (dirty: boolean) => boolean;\n prepareCodeViewItem(file: FileContents, top: number, reset?: PendingCodeViewLayoutReset, lineAnnotations?: LineAnnotation<LAnnotation>[]): number;\n getLinePosition(lineNumber: number): {\n top: number;\n height: number;\n } | undefined;\n getNumericScrollAnchor(localViewportTop: number): NumericScrollLineAnchor | undefined;\n getVirtualizedHeight(): number;\n getAdvancedStickySpecs(windowSpecs?: RenderWindow): StickySpecs | undefined;\n cleanUp(recycle?: boolean): void;\n private computeApproximateSize;\n setVisibility(visible: boolean): void;\n rerender(): void;\n render({ fileContainer, file, forceRender, lineAnnotations, ...props }: FileRenderProps<LAnnotation>): boolean;\n syncVirtualizedTop(): void;\n protected shouldDisableVirtualizationBuffers(): boolean;\n private isSimpleMode;\n private isAdvancedMode;\n private addLayoutCheckpoint;\n private getLayoutCheckpointBeforeLineIndex;\n private getLayoutCheckpointBeforeTop;\n private getVirtualizedTop;\n private getSimpleVirtualizer;\n private isResizeDebuggingEnabled;\n private computeRenderRangeFromWindow;\n}\n//# sourceMappingURL=VirtualizedFile.d.ts.map"],"mappings":";;;;;;;;cAKqBc,iDAAiDJ,KAAKK;;;EAAtDD,SAAAA,IAAAA,EAAAA,MAAe;EAAuCC,GAAAA,EAAAA,MAAAA,GAAAA,SAAAA;EAYtCA,MAAAA,EAAAA,MAAAA;EAAZJ,QAAAA,KAAAA;EAAmDE,QAAAA,SAAAA;EAAuBE,QAAAA,OAAAA;EAATN,QAAAA,WAAAA;EAAiCF,QAAAA,mBAAAA;EAAoCC,QAAAA,gBAAAA;EACvID,WAAAA,CAAAA,OAAAA,EADCI,WACDJ,CADaQ,WACbR,CAAAA,GAAAA,SAAAA,EAAAA,WAAAA,EADoDM,WACpDN,GADkEE,QAClEF,CAD2EQ,WAC3ER,CAAAA,EAAAA,OAAAA,CAAAA,EADmGA,kBACnGA,EAAAA,aAAAA,CAAAA,EADuIC,iBACvID,EAAAA,kBAAAA,CAAAA,EAAAA,OAAAA;EAC+BQ,UAAAA,CAAAA,OAAAA,EAD/BR,kBAC+BQ,EAAAA,KAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAAfd,kBAAAA,CAAAA,eAAAA,EAAAA,cAAAA,CAAec,WAAfd,CAAAA,EAAAA,CAAAA,EAAAA,IAAAA;EAIJc,QAAAA,mBAAAA;EAAZJ,QAAAA,kBAAAA;EACIL,aAAAA,CAAAA,SAAAA,EAAAA,MAAAA,EAAAA,eAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,MAAAA;EAIEN,UAAAA,CAAAA,OAAAA,EALNW,WAKMX,CALMe,WAKNf,CAAAA,GAAAA,SAAAA,CAAAA,EAAAA,IAAAA;EAAmCG,YAAAA,CAAAA,SAAAA,EAJrCG,UAIqCH,CAAAA,EAAAA,IAAAA;EAA6DY,QAAAA,gBAAAA;EAAfd,gBAAAA,CAAAA,CAAAA,EAAAA,OAAAA;EAKzDC,QAAAA,EAAAA,CAAAA,KAAAA,EAAAA,OAAAA,EAAAA,GAAAA,OAAAA;EAEbE,mBAAAA,CAAAA,IAAAA,EAPXJ,YAOWI,EAAAA,GAAAA,EAAAA,MAAAA,EAAAA,KAAAA,CAAAA,EAPwBD,0BAOxBC,EAAAA,eAAAA,CAAAA,EAPsEH,cAOtEG,CAPqFW,WAOrFX,CAAAA,EAAAA,CAAAA,EAAAA,MAAAA;EAAeC,eAAAA,CAAAA,UAAAA,EAAAA,MAAAA,CAAAA,EAAAA;IAK3CW,GAAAA,EAAAA,MAAAA;IAAeC,MAAAA,EAAAA,MAAAA;EAAMC,CAAAA,GAAAA,SAAAA;EAAaC,sBAAAA,CAAAA,gBAAAA,EAAAA,MAAAA,CAAAA,EAPOjB,uBAOPiB,GAAAA,SAAAA;EAA6CJ,oBAAAA,CAAAA,CAAAA,EAAAA,MAAAA;EAAhBH,sBAAAA,CAAAA,WAAAA,CAAAA,EALnCR,YAKmCQ,CAAAA,EALpBP,WAKoBO,GAAAA,SAAAA;EAnCNF,OAAAA,CAAAA,OAAAA,CAAAA,EAAAA,OAAAA,CAAAA,EAAAA,IAAAA;EAAI,QAAA,sBAAA;;;;;;;;;KAmCEE,gBAAgBG"}
@@ -2,6 +2,7 @@ import { DEFAULT_VIRTUAL_FILE_METRICS } from "../constants.js";
2
2
  import { areObjectsEqual } from "../utils/areObjectsEqual.js";
3
3
  import { areOptionsEqual } from "../utils/areOptionsEqual.js";
4
4
  import { getVirtualFileHeaderRegion, getVirtualFilePaddingBottom } from "../utils/computeVirtualFileMetrics.js";
5
+ import { FILE_ANNOTATION_DOM_KEY, FILE_ANNOTATION_LINE_NUMBER, includesFileAnnotations, shouldRenderFileAnnotations } from "../utils/includesFileAnnotations.js";
5
6
  import { iterateOverFile } from "../utils/iterateOverFile.js";
6
7
  import { File } from "./File.js";
7
8
 
@@ -17,7 +18,8 @@ var VirtualizedFile = class extends File {
17
18
  height = 0;
18
19
  cache = {
19
20
  heights: /* @__PURE__ */ new Map(),
20
- checkpoints: []
21
+ checkpoints: [],
22
+ fileAnnotationHeight: 0
21
23
  };
22
24
  isVisible = false;
23
25
  isSetup = false;
@@ -34,6 +36,18 @@ var VirtualizedFile = class extends File {
34
36
  this.metrics = metrics;
35
37
  this.resetLayoutCache();
36
38
  }
39
+ setLineAnnotations(lineAnnotations) {
40
+ if (this.syncLineAnnotations(lineAnnotations)) this.resetLayoutCache();
41
+ }
42
+ syncLineAnnotations(lineAnnotations) {
43
+ if (lineAnnotations == null || lineAnnotations === this.lineAnnotations) return false;
44
+ if (lineAnnotations.length === 0 && this.lineAnnotations.length === 0) return false;
45
+ super.setLineAnnotations(lineAnnotations);
46
+ return true;
47
+ }
48
+ hasLineAnnotations() {
49
+ return this.lineAnnotations.some((annotation) => annotation.lineNumber > FILE_ANNOTATION_LINE_NUMBER);
50
+ }
37
51
  getLineHeight(lineIndex, hasMetadataLine = false) {
38
52
  const cached = this.cache.heights.get(lineIndex);
39
53
  if (cached != null) return cached;
@@ -57,6 +71,7 @@ var VirtualizedFile = class extends File {
57
71
  }
58
72
  resetLayoutCache(recompute = false) {
59
73
  this.layoutDirty = true;
74
+ this.cache.fileAnnotationHeight = 0;
60
75
  if (this.cache.heights.size > 0) this.cache.heights.clear();
61
76
  if (this.cache.checkpoints.length > 0) this.cache.checkpoints.length = 0;
62
77
  if (this.renderRange != null) this.renderRange = void 0;
@@ -75,6 +90,17 @@ var VirtualizedFile = class extends File {
75
90
  if (this.code == null) return hasHeightChange;
76
91
  const content = this.code.children[1];
77
92
  if (!(content instanceof HTMLElement)) return hasHeightChange;
93
+ const hasFileAnnotations = includesFileAnnotations(this.lineAnnotations);
94
+ if (this.renderRange != null && hasFileAnnotations && shouldRenderFileAnnotations(this.renderRange)) {
95
+ const nextFileAnnotationHeight = measureFileAnnotationHeight(content) ?? 0;
96
+ if (nextFileAnnotationHeight !== this.cache.fileAnnotationHeight) {
97
+ this.cache.fileAnnotationHeight = nextFileAnnotationHeight;
98
+ hasHeightChange = true;
99
+ }
100
+ } else if (!hasFileAnnotations && this.cache.fileAnnotationHeight !== 0) {
101
+ this.cache.fileAnnotationHeight = 0;
102
+ hasHeightChange = true;
103
+ }
78
104
  for (const line of content.children) {
79
105
  if (!(line instanceof HTMLElement)) continue;
80
106
  const lineIndexAttr = line.dataset.lineIndex;
@@ -100,8 +126,9 @@ var VirtualizedFile = class extends File {
100
126
  if (dirty) this.top = this.getVirtualizedTop();
101
127
  return this.render({ file: this.file });
102
128
  };
103
- prepareCodeViewItem(file, top, reset) {
104
- let shouldResetLayoutCache = reset?.resetFileLayoutCache === true;
129
+ prepareCodeViewItem(file, top, reset, lineAnnotations) {
130
+ const annotationsChanged = this.syncLineAnnotations(lineAnnotations);
131
+ let shouldResetLayoutCache = reset?.resetFileLayoutCache === true || annotationsChanged;
105
132
  if (reset?.metrics != null) {
106
133
  this.metrics = reset.metrics;
107
134
  shouldResetLayoutCache = true;
@@ -119,7 +146,7 @@ var VirtualizedFile = class extends File {
119
146
  return this.height;
120
147
  }
121
148
  getLinePosition(lineNumber) {
122
- if (this.file == null) return;
149
+ if (this.file == null || lineNumber < 1) return;
123
150
  const { disableFileHeader = false, collapsed = false } = this.options;
124
151
  const lastLineIndex = getLastVisibleLineIndex(this.getOrCreateLineCache(this.file));
125
152
  let top = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
@@ -130,7 +157,8 @@ var VirtualizedFile = class extends File {
130
157
  const clampedLineIndex = Math.min(Math.max(lineNumber - 1, 0), lastLineIndex);
131
158
  const { overflow = "scroll" } = this.options;
132
159
  const { lineHeight } = this.metrics;
133
- if (overflow === "scroll" && this.lineAnnotations.length === 0) return {
160
+ top += this.cache.fileAnnotationHeight;
161
+ if (overflow === "scroll" && !this.hasLineAnnotations()) return {
134
162
  top: top + clampedLineIndex * lineHeight,
135
163
  height: lineHeight
136
164
  };
@@ -152,17 +180,18 @@ var VirtualizedFile = class extends File {
152
180
  const firstRenderedLineIndex = Math.min(this.renderRange.startingLine, lastLineIndex);
153
181
  const lastRenderedLineIndex = Math.min(firstRenderedLineIndex + this.renderRange.totalLines - 1, lastLineIndex);
154
182
  if (lastRenderedLineIndex < firstRenderedLineIndex) return;
155
- if (overflow === "scroll" && this.lineAnnotations.length === 0) {
183
+ const { fileAnnotationHeight } = this.cache;
184
+ if (overflow === "scroll" && !this.hasLineAnnotations()) {
156
185
  const { lineHeight } = this.metrics;
157
- const firstRenderedLineTop = headerRegion + this.renderRange.bufferBefore;
186
+ const firstRenderedLineTop = headerRegion + (firstRenderedLineIndex === 0 ? fileAnnotationHeight : this.renderRange.bufferBefore);
158
187
  const lineIndex = firstRenderedLineIndex + Math.max(Math.ceil((localViewportTop - firstRenderedLineTop) / lineHeight), 0);
159
188
  if (lineIndex > lastRenderedLineIndex) return;
160
189
  return {
161
190
  lineNumber: lineIndex + 1,
162
- top: headerRegion + lineIndex * lineHeight
191
+ top: headerRegion + fileAnnotationHeight + lineIndex * lineHeight
163
192
  };
164
193
  }
165
- let top = headerRegion + this.renderRange.bufferBefore;
194
+ let top = headerRegion + (firstRenderedLineIndex === 0 ? fileAnnotationHeight : this.renderRange.bufferBefore);
166
195
  for (let lineIndex = firstRenderedLineIndex; lineIndex <= lastRenderedLineIndex; lineIndex++) {
167
196
  if (top >= localViewportTop) return {
168
197
  lineNumber: lineIndex + 1,
@@ -195,7 +224,7 @@ var VirtualizedFile = class extends File {
195
224
  }
196
225
  cleanUp(recycle = false) {
197
226
  if (this.fileContainer != null && this.isSimpleMode()) this.getSimpleVirtualizer()?.disconnect(this.fileContainer);
198
- if (!recycle) this.layoutDirty = true;
227
+ if (!recycle) this.resetLayoutCache();
199
228
  this.isSetup = false;
200
229
  super.cleanUp(recycle);
201
230
  }
@@ -219,7 +248,8 @@ var VirtualizedFile = class extends File {
219
248
  this.layoutDirty = false;
220
249
  return;
221
250
  }
222
- if (overflow === "scroll" && this.lineAnnotations.length === 0) this.height += this.getOrCreateLineCache(this.file).length * lineHeight;
251
+ this.height += this.cache.fileAnnotationHeight;
252
+ if (overflow === "scroll" && !this.hasLineAnnotations()) this.height += this.getOrCreateLineCache(this.file).length * lineHeight;
223
253
  else iterateOverFile({
224
254
  lines,
225
255
  callback: ({ lineIndex }) => {
@@ -254,9 +284,11 @@ var VirtualizedFile = class extends File {
254
284
  this.forceRenderOverride = true;
255
285
  this.virtualizer.instanceChanged(this, false);
256
286
  }
257
- render({ fileContainer, file, forceRender = false,...props }) {
287
+ render({ fileContainer, file, forceRender = false, lineAnnotations,...props }) {
258
288
  const { forceRenderOverride, isSetup } = this;
259
289
  this.forceRenderOverride = void 0;
290
+ const annotationsChanged = this.syncLineAnnotations(lineAnnotations);
291
+ if (annotationsChanged) this.resetLayoutCache();
260
292
  this.file ??= file;
261
293
  fileContainer = this.getOrCreateFileContainerNode(fileContainer);
262
294
  if (this.file == null) {
@@ -283,7 +315,8 @@ var VirtualizedFile = class extends File {
283
315
  file: this.file,
284
316
  fileContainer,
285
317
  renderRange,
286
- forceRender: forceRenderOverride ?? forceRender,
318
+ lineAnnotations,
319
+ forceRender: (forceRenderOverride ?? forceRender) || annotationsChanged,
287
320
  ...props
288
321
  });
289
322
  }
@@ -360,6 +393,12 @@ var VirtualizedFile = class extends File {
360
393
  const fileHeight = this.height;
361
394
  const headerRegion = getVirtualFileHeaderRegion(this.metrics, disableFileHeader);
362
395
  const paddingBottom = lineCount > 0 ? getVirtualFilePaddingBottom(this.metrics) : 0;
396
+ const { fileAnnotationHeight } = this.cache;
397
+ const codeRegionTop = headerRegion + fileAnnotationHeight;
398
+ const codeRowsHeight = Math.max(0, fileHeight - headerRegion - fileAnnotationHeight - paddingBottom);
399
+ const hasFileAnnotations = includesFileAnnotations(this.lineAnnotations);
400
+ const fileAnnotationTop = fileTop + headerRegion;
401
+ const measuredFileAnnotationVisible = fileAnnotationHeight > 0 && hasFileAnnotations && fileAnnotationTop < bottom && fileAnnotationTop + fileAnnotationHeight > top;
363
402
  if (fileTop < top - fileHeight || fileTop > bottom) return {
364
403
  startingLine: 0,
365
404
  totalLines: 0,
@@ -376,13 +415,21 @@ var VirtualizedFile = class extends File {
376
415
  const totalLines = Math.ceil(estimatedTargetLines / hunkLineCount) * hunkLineCount + hunkLineCount * 2;
377
416
  const totalHunks = totalLines / hunkLineCount;
378
417
  const viewportCenter = (top + bottom) / 2;
379
- if (overflow === "scroll" && this.lineAnnotations.length === 0) {
380
- const centerLine = Math.floor((viewportCenter - (fileTop + headerRegion)) / lineHeight);
418
+ if (overflow === "scroll" && !this.hasLineAnnotations()) {
419
+ const sourceRowsTop = fileTop + codeRegionTop;
420
+ const sourceRowsBottom = sourceRowsTop + codeRowsHeight;
421
+ if (!measuredFileAnnotationVisible && !(sourceRowsTop < bottom && sourceRowsBottom > top)) return {
422
+ startingLine: 0,
423
+ totalLines: 0,
424
+ bufferBefore: 0,
425
+ bufferAfter: fileHeight - headerRegion - paddingBottom
426
+ };
427
+ const centerLine = Math.floor(measuredFileAnnotationVisible && viewportCenter < fileTop + codeRegionTop ? 0 : (viewportCenter - (fileTop + codeRegionTop)) / lineHeight);
381
428
  const idealStartHunk$1 = Math.floor(centerLine / hunkLineCount) - Math.floor(totalHunks / 2);
382
429
  const totalHunksInFile = Math.ceil(lineCount / hunkLineCount);
383
430
  const startingLine$1 = Math.max(0, Math.min(idealStartHunk$1, totalHunksInFile)) * hunkLineCount;
384
431
  const clampedTotalLines$1 = idealStartHunk$1 < 0 ? totalLines + idealStartHunk$1 * hunkLineCount : totalLines;
385
- const bufferBefore$1 = startingLine$1 * lineHeight;
432
+ const bufferBefore$1 = startingLine$1 === 0 ? 0 : fileAnnotationHeight + startingLine$1 * lineHeight;
386
433
  const renderedLines = Math.min(clampedTotalLines$1, lineCount - startingLine$1);
387
434
  return {
388
435
  startingLine: startingLine$1,
@@ -394,7 +441,7 @@ var VirtualizedFile = class extends File {
394
441
  const overflowHunks = totalHunks;
395
442
  const hunkOffsets = [];
396
443
  const checkpoint = this.getLayoutCheckpointBeforeTop(Math.max(0, top - fileTop - totalLines * lineHeight * 2), hunkLineCount);
397
- let absoluteLineTop = fileTop + (checkpoint?.top ?? headerRegion);
444
+ let absoluteLineTop = fileTop + (checkpoint?.top ?? codeRegionTop);
398
445
  let currentLine = checkpoint?.lineIndex ?? 0;
399
446
  let firstVisibleHunk;
400
447
  let centerHunk;
@@ -406,7 +453,7 @@ var VirtualizedFile = class extends File {
406
453
  const isAtHunkBoundary = currentLine % hunkLineCount === 0;
407
454
  const currentHunk = Math.floor(currentLine / hunkLineCount);
408
455
  if (isAtHunkBoundary) {
409
- hunkOffsets[currentHunk] = absoluteLineTop - (fileTop + headerRegion);
456
+ hunkOffsets[currentHunk] = absoluteLineTop - (fileTop + codeRegionTop);
410
457
  if (overflowCounter != null) {
411
458
  if (overflowCounter <= 0) return true;
412
459
  overflowCounter--;
@@ -421,7 +468,10 @@ var VirtualizedFile = class extends File {
421
468
  return false;
422
469
  }
423
470
  });
424
- if (firstVisibleHunk == null) return {
471
+ if (firstVisibleHunk == null) if (measuredFileAnnotationVisible) {
472
+ firstVisibleHunk = 0;
473
+ centerHunk = 0;
474
+ } else return {
425
475
  startingLine: 0,
426
476
  totalLines: 0,
427
477
  bufferBefore: 0,
@@ -433,16 +483,27 @@ var VirtualizedFile = class extends File {
433
483
  const startHunk = Math.max(0, Math.min(idealStartHunk, maxStartHunk));
434
484
  const startingLine = startHunk * hunkLineCount;
435
485
  const clampedTotalLines = idealStartHunk < 0 ? totalLines + idealStartHunk * hunkLineCount : totalLines;
436
- const bufferBefore = hunkOffsets[startHunk] ?? 0;
486
+ const codeBufferBefore = hunkOffsets[startHunk] ?? 0;
487
+ const bufferBefore = startingLine === 0 ? 0 : fileAnnotationHeight + codeBufferBefore;
437
488
  const finalHunkIndex = startHunk + clampedTotalLines / hunkLineCount;
489
+ const bufferAfter = finalHunkIndex < hunkOffsets.length ? codeRowsHeight - hunkOffsets[finalHunkIndex] : codeRowsHeight - (absoluteLineTop - fileTop - codeRegionTop);
438
490
  return {
439
491
  startingLine,
440
492
  totalLines: clampedTotalLines,
441
493
  bufferBefore,
442
- bufferAfter: finalHunkIndex < hunkOffsets.length ? fileHeight - headerRegion - hunkOffsets[finalHunkIndex] - paddingBottom : fileHeight - (absoluteLineTop - fileTop) - paddingBottom
494
+ bufferAfter: Math.max(0, bufferAfter)
443
495
  };
444
496
  }
445
497
  };
498
+ function measureFileAnnotationHeight(content) {
499
+ let height;
500
+ for (const child of content.children) {
501
+ if (!(child instanceof HTMLElement)) continue;
502
+ if (child.dataset.lineAnnotation !== FILE_ANNOTATION_DOM_KEY) continue;
503
+ height = Math.max(height ?? 0, child.getBoundingClientRect().height);
504
+ }
505
+ return height;
506
+ }
446
507
  function getLastVisibleLineIndex(lines) {
447
508
  const lastLine = lines.at(-1);
448
509
  if (lastLine == null || lastLine === "" || lastLine === "\n" || lastLine === "\r\n" || lastLine === "\r") return lines.length - 2;