@pierre/diffs 1.1.0-beta.4 → 1.1.0-beta.5
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/dist/constants.d.ts +2 -1
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +2 -1
- package/dist/constants.js.map +1 -1
- package/dist/highlighter/languages/constants.d.ts +3 -1
- package/dist/highlighter/languages/constants.d.ts.map +1 -1
- package/dist/highlighter/languages/constants.js +2 -1
- package/dist/highlighter/languages/constants.js.map +1 -1
- package/dist/highlighter/languages/registerCustomLanguage.d.ts +12 -0
- package/dist/highlighter/languages/registerCustomLanguage.d.ts.map +1 -0
- package/dist/highlighter/languages/registerCustomLanguage.js +21 -0
- package/dist/highlighter/languages/registerCustomLanguage.js.map +1 -0
- package/dist/highlighter/languages/resolveLanguage.d.ts.map +1 -1
- package/dist/highlighter/languages/resolveLanguage.js +4 -3
- package/dist/highlighter/languages/resolveLanguage.js.map +1 -1
- package/dist/index.d.ts +5 -4
- package/dist/index.js +5 -4
- package/dist/react/jsx.d.ts +1 -1
- package/dist/react/jsx.d.ts.map +1 -1
- package/dist/react/types.js +0 -1
- package/dist/renderers/DiffHunksRenderer.d.ts.map +1 -1
- package/dist/renderers/DiffHunksRenderer.js +10 -6
- package/dist/renderers/DiffHunksRenderer.js.map +1 -1
- package/dist/style.js +1 -1
- package/dist/style.js.map +1 -1
- package/dist/types.d.ts +3 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/getFiletypeFromFileName.d.ts +2 -1
- package/dist/utils/getFiletypeFromFileName.d.ts.map +1 -1
- package/dist/utils/getFiletypeFromFileName.js +14 -4
- package/dist/utils/getFiletypeFromFileName.js.map +1 -1
- package/dist/utils/iterateOverDiff.d.ts +2 -0
- package/dist/utils/iterateOverDiff.d.ts.map +1 -1
- package/dist/utils/iterateOverDiff.js +7 -5
- package/dist/utils/iterateOverDiff.js.map +1 -1
- package/dist/utils/renderDiffWithHighlighter.d.ts +2 -1
- package/dist/utils/renderDiffWithHighlighter.d.ts.map +1 -1
- package/dist/utils/renderDiffWithHighlighter.js +3 -2
- package/dist/utils/renderDiffWithHighlighter.js.map +1 -1
- package/dist/utils/setLanguageOverride.d.ts +2 -1
- package/dist/utils/setLanguageOverride.d.ts.map +1 -1
- package/dist/utils/setLanguageOverride.js.map +1 -1
- package/dist/worker/WorkerPoolManager.d.ts +1 -1
- package/dist/worker/WorkerPoolManager.d.ts.map +1 -1
- package/dist/worker/WorkerPoolManager.js +3 -2
- package/dist/worker/WorkerPoolManager.js.map +1 -1
- package/dist/worker/worker-portable.js +29 -11
- package/dist/worker/worker-portable.js.map +1 -1
- package/dist/worker/worker.js +17 -8
- package/dist/worker/worker.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
//#region src/utils/getFiletypeFromFileName.ts
|
|
2
|
+
const CUSTOM_EXTENSION_TO_FILE_FORMAT = /* @__PURE__ */ new Map();
|
|
2
3
|
const EXTENSION_TO_FILE_FORMAT = {
|
|
3
4
|
"1c": "1c",
|
|
4
5
|
abap: "abap",
|
|
@@ -329,15 +330,24 @@ const EXTENSION_TO_FILE_FORMAT = {
|
|
|
329
330
|
sty: "tex"
|
|
330
331
|
};
|
|
331
332
|
function getFiletypeFromFileName(fileName) {
|
|
333
|
+
if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(fileName)) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(fileName) ?? "text";
|
|
332
334
|
if (EXTENSION_TO_FILE_FORMAT[fileName] != null) return EXTENSION_TO_FILE_FORMAT[fileName];
|
|
333
335
|
const compoundMatch = fileName.match(/\.([^/\\]+\.[^/\\]+)$/);
|
|
334
|
-
if (compoundMatch != null
|
|
335
|
-
|
|
336
|
+
if (compoundMatch != null) {
|
|
337
|
+
if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(compoundMatch[1])) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(compoundMatch[1]) ?? "text";
|
|
338
|
+
if (EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] != null) return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? "text";
|
|
339
|
+
}
|
|
340
|
+
const simpleMatch = fileName.match(/\.([^.]+)$/)?.[1] ?? "";
|
|
341
|
+
if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(simpleMatch)) return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(simpleMatch) ?? "text";
|
|
342
|
+
return EXTENSION_TO_FILE_FORMAT[simpleMatch] ?? "text";
|
|
336
343
|
}
|
|
337
344
|
function extendFileFormatMap(map) {
|
|
338
|
-
for (const key in map)
|
|
345
|
+
for (const key in map) {
|
|
346
|
+
const lang = map[key];
|
|
347
|
+
if (lang != null) CUSTOM_EXTENSION_TO_FILE_FORMAT.set(key, lang);
|
|
348
|
+
}
|
|
339
349
|
}
|
|
340
350
|
|
|
341
351
|
//#endregion
|
|
342
|
-
export { EXTENSION_TO_FILE_FORMAT, extendFileFormatMap, getFiletypeFromFileName };
|
|
352
|
+
export { CUSTOM_EXTENSION_TO_FILE_FORMAT, EXTENSION_TO_FILE_FORMAT, extendFileFormatMap, getFiletypeFromFileName };
|
|
343
353
|
//# sourceMappingURL=getFiletypeFromFileName.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFiletypeFromFileName.js","names":["EXTENSION_TO_FILE_FORMAT: ExtensionFormatMap"],"sources":["../../src/utils/getFiletypeFromFileName.ts"],"sourcesContent":["import type { ExtensionFormatMap, SupportedLanguages } from '../types';\n\nexport const EXTENSION_TO_FILE_FORMAT: ExtensionFormatMap = {\n '1c': '1c',\n abap: 'abap',\n as: 'actionscript-3',\n ada: 'ada',\n adb: 'ada',\n ads: 'ada',\n adoc: 'asciidoc',\n asciidoc: 'asciidoc',\n 'component.html': 'angular-html',\n 'component.ts': 'angular-ts',\n conf: 'nginx',\n htaccess: 'apache',\n cls: 'tex',\n trigger: 'apex',\n apl: 'apl',\n applescript: 'applescript',\n scpt: 'applescript',\n ara: 'ara',\n asm: 'asm',\n s: 'riscv',\n astro: 'astro',\n awk: 'awk',\n bal: 'ballerina',\n sh: 'zsh',\n bash: 'zsh',\n bat: 'cmd',\n cmd: 'cmd',\n be: 'berry',\n beancount: 'beancount',\n bib: 'bibtex',\n bicep: 'bicep',\n 'blade.php': 'blade',\n bsl: 'bsl',\n c: 'c',\n h: 'objective-cpp',\n cs: 'csharp',\n cpp: 'cpp',\n hpp: 'cpp',\n cc: 'cpp',\n cxx: 'cpp',\n hh: 'cpp',\n cdc: 'cdc',\n cairo: 'cairo',\n clar: 'clarity',\n clj: 'clojure',\n cljs: 'clojure',\n cljc: 'clojure',\n soy: 'soy',\n cmake: 'cmake',\n 'CMakeLists.txt': 'cmake',\n cob: 'cobol',\n cbl: 'cobol',\n cobol: 'cobol',\n CODEOWNERS: 'codeowners',\n ql: 'ql',\n coffee: 'coffeescript',\n lisp: 'lisp',\n cl: 'lisp',\n lsp: 'lisp',\n log: 'log',\n v: 'verilog',\n cql: 'cql',\n cr: 'crystal',\n css: 'css',\n csv: 'csv',\n cue: 'cue',\n cypher: 'cypher',\n cyp: 'cypher',\n d: 'd',\n dart: 'dart',\n dax: 'dax',\n desktop: 'desktop',\n diff: 'diff',\n patch: 'diff',\n Dockerfile: 'dockerfile',\n dockerfile: 'dockerfile',\n env: 'dotenv',\n dm: 'dream-maker',\n edge: 'edge',\n el: 'emacs-lisp',\n ex: 'elixir',\n exs: 'elixir',\n elm: 'elm',\n erb: 'erb',\n erl: 'erlang',\n hrl: 'erlang',\n f: 'fortran-fixed-form',\n for: 'fortran-fixed-form',\n fs: 'fsharp',\n fsi: 'fsharp',\n fsx: 'fsharp',\n f03: 'f03',\n f08: 'f08',\n f18: 'f18',\n f77: 'f77',\n f90: 'fortran-free-form',\n f95: 'fortran-free-form',\n fnl: 'fennel',\n fish: 'fish',\n ftl: 'ftl',\n tres: 'gdresource',\n res: 'gdresource',\n gd: 'gdscript',\n gdshader: 'gdshader',\n gs: 'genie',\n feature: 'gherkin',\n COMMIT_EDITMSG: 'git-commit',\n 'git-rebase-todo': 'git-rebase',\n gjs: 'glimmer-js',\n gleam: 'gleam',\n gts: 'glimmer-ts',\n glsl: 'glsl',\n vert: 'glsl',\n frag: 'glsl',\n shader: 'shaderlab',\n gp: 'gnuplot',\n plt: 'gnuplot',\n gnuplot: 'gnuplot',\n go: 'go',\n graphql: 'graphql',\n gql: 'graphql',\n groovy: 'groovy',\n gvy: 'groovy',\n hack: 'hack',\n haml: 'haml',\n hbs: 'handlebars',\n handlebars: 'handlebars',\n hs: 'haskell',\n lhs: 'haskell',\n hx: 'haxe',\n hcl: 'hcl',\n hjson: 'hjson',\n hlsl: 'hlsl',\n fx: 'hlsl',\n html: 'html',\n htm: 'html',\n http: 'http',\n rest: 'http',\n hxml: 'hxml',\n hy: 'hy',\n imba: 'imba',\n ini: 'ini',\n cfg: 'ini',\n jade: 'pug',\n pug: 'pug',\n java: 'java',\n js: 'javascript',\n mjs: 'javascript',\n cjs: 'javascript',\n jinja: 'jinja',\n jinja2: 'jinja',\n j2: 'jinja',\n jison: 'jison',\n jl: 'julia',\n json: 'json',\n json5: 'json5',\n jsonc: 'jsonc',\n jsonl: 'jsonl',\n jsonnet: 'jsonnet',\n libsonnet: 'jsonnet',\n jssm: 'jssm',\n jsx: 'jsx',\n kt: 'kotlin',\n kts: 'kts',\n kql: 'kusto',\n tex: 'tex',\n ltx: 'tex',\n lean: 'lean4',\n less: 'less',\n liquid: 'liquid',\n lit: 'lit',\n ll: 'llvm',\n logo: 'logo',\n lua: 'lua',\n luau: 'luau',\n Makefile: 'makefile',\n mk: 'makefile',\n makefile: 'makefile',\n md: 'markdown',\n markdown: 'markdown',\n marko: 'marko',\n m: 'wolfram',\n mat: 'matlab',\n mdc: 'mdc',\n mdx: 'mdx',\n wiki: 'wikitext',\n mediawiki: 'wikitext',\n mmd: 'mermaid',\n mermaid: 'mermaid',\n mips: 'mipsasm',\n mojo: 'mojo',\n '🔥': 'mojo',\n move: 'move',\n nar: 'narrat',\n nf: 'nextflow',\n nim: 'nim',\n nims: 'nim',\n nimble: 'nim',\n nix: 'nix',\n nu: 'nushell',\n mm: 'objective-cpp',\n ml: 'ocaml',\n mli: 'ocaml',\n mll: 'ocaml',\n mly: 'ocaml',\n pas: 'pascal',\n p: 'pascal',\n pl: 'prolog',\n pm: 'perl',\n t: 'perl',\n raku: 'raku',\n p6: 'raku',\n pl6: 'raku',\n php: 'php',\n phtml: 'php',\n pls: 'plsql',\n sql: 'sql',\n po: 'po',\n polar: 'polar',\n pcss: 'postcss',\n pot: 'pot',\n potx: 'potx',\n pq: 'powerquery',\n pqm: 'powerquery',\n ps1: 'powershell',\n psm1: 'powershell',\n psd1: 'powershell',\n prisma: 'prisma',\n pro: 'prolog',\n P: 'prolog',\n properties: 'properties',\n proto: 'protobuf',\n pp: 'puppet',\n purs: 'purescript',\n py: 'python',\n pyw: 'python',\n pyi: 'python',\n qml: 'qml',\n qmldir: 'qmldir',\n qss: 'qss',\n r: 'r',\n R: 'r',\n rkt: 'racket',\n rktl: 'racket',\n razor: 'razor',\n cshtml: 'razor',\n rb: 'ruby',\n rbw: 'ruby',\n reg: 'reg',\n regex: 'regexp',\n rel: 'rel',\n rs: 'rust',\n rst: 'rst',\n rake: 'ruby',\n gemspec: 'ruby',\n sas: 'sas',\n sass: 'sass',\n scala: 'scala',\n sc: 'scala',\n scm: 'scheme',\n ss: 'scheme',\n sld: 'scheme',\n scss: 'scss',\n sdbl: 'sdbl',\n shadergraph: 'shader',\n st: 'smalltalk',\n sol: 'solidity',\n sparql: 'sparql',\n rq: 'sparql',\n spl: 'splunk',\n config: 'ssh-config',\n do: 'stata',\n ado: 'stata',\n dta: 'stata',\n styl: 'stylus',\n stylus: 'stylus',\n svelte: 'svelte',\n swift: 'swift',\n sv: 'system-verilog',\n svh: 'system-verilog',\n service: 'systemd',\n socket: 'systemd',\n device: 'systemd',\n timer: 'systemd',\n talon: 'talonscript',\n tasl: 'tasl',\n tcl: 'tcl',\n templ: 'templ',\n tf: 'tf',\n tfvars: 'tfvars',\n toml: 'toml',\n ts: 'typescript',\n tsp: 'typespec',\n tsv: 'tsv',\n tsx: 'tsx',\n ttl: 'turtle',\n twig: 'twig',\n typ: 'typst',\n vv: 'v',\n vala: 'vala',\n vapi: 'vala',\n vb: 'vb',\n vbs: 'vb',\n bas: 'vb',\n vh: 'verilog',\n vhd: 'vhdl',\n vhdl: 'vhdl',\n vim: 'vimscript',\n vue: 'vue',\n 'vine.ts': 'vue-vine',\n vy: 'vyper',\n wasm: 'wasm',\n wat: 'wasm',\n wy: '文言',\n wgsl: 'wgsl',\n wit: 'wit',\n wl: 'wolfram',\n nb: 'wolfram',\n xml: 'xml',\n xsl: 'xsl',\n xslt: 'xsl',\n yaml: 'yaml',\n yml: 'yml',\n zs: 'zenscript',\n zig: 'zig',\n zsh: 'zsh',\n sty: 'tex',\n};\n\nexport function getFiletypeFromFileName(fileName: string): SupportedLanguages {\n // Handle special files without extensions first\n if (EXTENSION_TO_FILE_FORMAT[fileName] != null) {\n return EXTENSION_TO_FILE_FORMAT[fileName];\n }\n\n // Try compound extensions first (e.g., .blade.php, .component.ts)\n const compoundMatch = fileName.match(/\\.([^/\\\\]+\\.[^/\\\\]+)$/);\n if (\n compoundMatch != null &&\n EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] != null\n ) {\n return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? 'text';\n }\n\n // Fall back to simple extension\n const simpleMatch = fileName.match(/\\.([^.]+)$/);\n return EXTENSION_TO_FILE_FORMAT[simpleMatch?.[1] ?? ''] ?? 'text';\n}\n\nexport function extendFileFormatMap(map: ExtensionFormatMap): void {\n for (const key in map) {\n EXTENSION_TO_FILE_FORMAT[key] = map[key];\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"getFiletypeFromFileName.js","names":["CUSTOM_EXTENSION_TO_FILE_FORMAT: Map<string, SupportedLanguages>","EXTENSION_TO_FILE_FORMAT: ExtensionFormatMap"],"sources":["../../src/utils/getFiletypeFromFileName.ts"],"sourcesContent":["import type { ExtensionFormatMap, SupportedLanguages } from '../types';\n\nexport const CUSTOM_EXTENSION_TO_FILE_FORMAT: Map<string, SupportedLanguages> =\n new Map();\n\nexport const EXTENSION_TO_FILE_FORMAT: ExtensionFormatMap = {\n '1c': '1c',\n abap: 'abap',\n as: 'actionscript-3',\n ada: 'ada',\n adb: 'ada',\n ads: 'ada',\n adoc: 'asciidoc',\n asciidoc: 'asciidoc',\n 'component.html': 'angular-html',\n 'component.ts': 'angular-ts',\n conf: 'nginx',\n htaccess: 'apache',\n cls: 'tex',\n trigger: 'apex',\n apl: 'apl',\n applescript: 'applescript',\n scpt: 'applescript',\n ara: 'ara',\n asm: 'asm',\n s: 'riscv',\n astro: 'astro',\n awk: 'awk',\n bal: 'ballerina',\n sh: 'zsh',\n bash: 'zsh',\n bat: 'cmd',\n cmd: 'cmd',\n be: 'berry',\n beancount: 'beancount',\n bib: 'bibtex',\n bicep: 'bicep',\n 'blade.php': 'blade',\n bsl: 'bsl',\n c: 'c',\n h: 'objective-cpp',\n cs: 'csharp',\n cpp: 'cpp',\n hpp: 'cpp',\n cc: 'cpp',\n cxx: 'cpp',\n hh: 'cpp',\n cdc: 'cdc',\n cairo: 'cairo',\n clar: 'clarity',\n clj: 'clojure',\n cljs: 'clojure',\n cljc: 'clojure',\n soy: 'soy',\n cmake: 'cmake',\n 'CMakeLists.txt': 'cmake',\n cob: 'cobol',\n cbl: 'cobol',\n cobol: 'cobol',\n CODEOWNERS: 'codeowners',\n ql: 'ql',\n coffee: 'coffeescript',\n lisp: 'lisp',\n cl: 'lisp',\n lsp: 'lisp',\n log: 'log',\n v: 'verilog',\n cql: 'cql',\n cr: 'crystal',\n css: 'css',\n csv: 'csv',\n cue: 'cue',\n cypher: 'cypher',\n cyp: 'cypher',\n d: 'd',\n dart: 'dart',\n dax: 'dax',\n desktop: 'desktop',\n diff: 'diff',\n patch: 'diff',\n Dockerfile: 'dockerfile',\n dockerfile: 'dockerfile',\n env: 'dotenv',\n dm: 'dream-maker',\n edge: 'edge',\n el: 'emacs-lisp',\n ex: 'elixir',\n exs: 'elixir',\n elm: 'elm',\n erb: 'erb',\n erl: 'erlang',\n hrl: 'erlang',\n f: 'fortran-fixed-form',\n for: 'fortran-fixed-form',\n fs: 'fsharp',\n fsi: 'fsharp',\n fsx: 'fsharp',\n f03: 'f03',\n f08: 'f08',\n f18: 'f18',\n f77: 'f77',\n f90: 'fortran-free-form',\n f95: 'fortran-free-form',\n fnl: 'fennel',\n fish: 'fish',\n ftl: 'ftl',\n tres: 'gdresource',\n res: 'gdresource',\n gd: 'gdscript',\n gdshader: 'gdshader',\n gs: 'genie',\n feature: 'gherkin',\n COMMIT_EDITMSG: 'git-commit',\n 'git-rebase-todo': 'git-rebase',\n gjs: 'glimmer-js',\n gleam: 'gleam',\n gts: 'glimmer-ts',\n glsl: 'glsl',\n vert: 'glsl',\n frag: 'glsl',\n shader: 'shaderlab',\n gp: 'gnuplot',\n plt: 'gnuplot',\n gnuplot: 'gnuplot',\n go: 'go',\n graphql: 'graphql',\n gql: 'graphql',\n groovy: 'groovy',\n gvy: 'groovy',\n hack: 'hack',\n haml: 'haml',\n hbs: 'handlebars',\n handlebars: 'handlebars',\n hs: 'haskell',\n lhs: 'haskell',\n hx: 'haxe',\n hcl: 'hcl',\n hjson: 'hjson',\n hlsl: 'hlsl',\n fx: 'hlsl',\n html: 'html',\n htm: 'html',\n http: 'http',\n rest: 'http',\n hxml: 'hxml',\n hy: 'hy',\n imba: 'imba',\n ini: 'ini',\n cfg: 'ini',\n jade: 'pug',\n pug: 'pug',\n java: 'java',\n js: 'javascript',\n mjs: 'javascript',\n cjs: 'javascript',\n jinja: 'jinja',\n jinja2: 'jinja',\n j2: 'jinja',\n jison: 'jison',\n jl: 'julia',\n json: 'json',\n json5: 'json5',\n jsonc: 'jsonc',\n jsonl: 'jsonl',\n jsonnet: 'jsonnet',\n libsonnet: 'jsonnet',\n jssm: 'jssm',\n jsx: 'jsx',\n kt: 'kotlin',\n kts: 'kts',\n kql: 'kusto',\n tex: 'tex',\n ltx: 'tex',\n lean: 'lean4',\n less: 'less',\n liquid: 'liquid',\n lit: 'lit',\n ll: 'llvm',\n logo: 'logo',\n lua: 'lua',\n luau: 'luau',\n Makefile: 'makefile',\n mk: 'makefile',\n makefile: 'makefile',\n md: 'markdown',\n markdown: 'markdown',\n marko: 'marko',\n m: 'wolfram',\n mat: 'matlab',\n mdc: 'mdc',\n mdx: 'mdx',\n wiki: 'wikitext',\n mediawiki: 'wikitext',\n mmd: 'mermaid',\n mermaid: 'mermaid',\n mips: 'mipsasm',\n mojo: 'mojo',\n '🔥': 'mojo',\n move: 'move',\n nar: 'narrat',\n nf: 'nextflow',\n nim: 'nim',\n nims: 'nim',\n nimble: 'nim',\n nix: 'nix',\n nu: 'nushell',\n mm: 'objective-cpp',\n ml: 'ocaml',\n mli: 'ocaml',\n mll: 'ocaml',\n mly: 'ocaml',\n pas: 'pascal',\n p: 'pascal',\n pl: 'prolog',\n pm: 'perl',\n t: 'perl',\n raku: 'raku',\n p6: 'raku',\n pl6: 'raku',\n php: 'php',\n phtml: 'php',\n pls: 'plsql',\n sql: 'sql',\n po: 'po',\n polar: 'polar',\n pcss: 'postcss',\n pot: 'pot',\n potx: 'potx',\n pq: 'powerquery',\n pqm: 'powerquery',\n ps1: 'powershell',\n psm1: 'powershell',\n psd1: 'powershell',\n prisma: 'prisma',\n pro: 'prolog',\n P: 'prolog',\n properties: 'properties',\n proto: 'protobuf',\n pp: 'puppet',\n purs: 'purescript',\n py: 'python',\n pyw: 'python',\n pyi: 'python',\n qml: 'qml',\n qmldir: 'qmldir',\n qss: 'qss',\n r: 'r',\n R: 'r',\n rkt: 'racket',\n rktl: 'racket',\n razor: 'razor',\n cshtml: 'razor',\n rb: 'ruby',\n rbw: 'ruby',\n reg: 'reg',\n regex: 'regexp',\n rel: 'rel',\n rs: 'rust',\n rst: 'rst',\n rake: 'ruby',\n gemspec: 'ruby',\n sas: 'sas',\n sass: 'sass',\n scala: 'scala',\n sc: 'scala',\n scm: 'scheme',\n ss: 'scheme',\n sld: 'scheme',\n scss: 'scss',\n sdbl: 'sdbl',\n shadergraph: 'shader',\n st: 'smalltalk',\n sol: 'solidity',\n sparql: 'sparql',\n rq: 'sparql',\n spl: 'splunk',\n config: 'ssh-config',\n do: 'stata',\n ado: 'stata',\n dta: 'stata',\n styl: 'stylus',\n stylus: 'stylus',\n svelte: 'svelte',\n swift: 'swift',\n sv: 'system-verilog',\n svh: 'system-verilog',\n service: 'systemd',\n socket: 'systemd',\n device: 'systemd',\n timer: 'systemd',\n talon: 'talonscript',\n tasl: 'tasl',\n tcl: 'tcl',\n templ: 'templ',\n tf: 'tf',\n tfvars: 'tfvars',\n toml: 'toml',\n ts: 'typescript',\n tsp: 'typespec',\n tsv: 'tsv',\n tsx: 'tsx',\n ttl: 'turtle',\n twig: 'twig',\n typ: 'typst',\n vv: 'v',\n vala: 'vala',\n vapi: 'vala',\n vb: 'vb',\n vbs: 'vb',\n bas: 'vb',\n vh: 'verilog',\n vhd: 'vhdl',\n vhdl: 'vhdl',\n vim: 'vimscript',\n vue: 'vue',\n 'vine.ts': 'vue-vine',\n vy: 'vyper',\n wasm: 'wasm',\n wat: 'wasm',\n wy: '文言',\n wgsl: 'wgsl',\n wit: 'wit',\n wl: 'wolfram',\n nb: 'wolfram',\n xml: 'xml',\n xsl: 'xsl',\n xslt: 'xsl',\n yaml: 'yaml',\n yml: 'yml',\n zs: 'zenscript',\n zig: 'zig',\n zsh: 'zsh',\n sty: 'tex',\n};\n\nexport function getFiletypeFromFileName(fileName: string): SupportedLanguages {\n if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(fileName)) {\n return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(fileName) ?? 'text';\n }\n // Handle special files without extensions first\n if (EXTENSION_TO_FILE_FORMAT[fileName] != null) {\n return EXTENSION_TO_FILE_FORMAT[fileName];\n }\n\n // Try compound extensions first (e.g., .blade.php, .component.ts)\n const compoundMatch = fileName.match(/\\.([^/\\\\]+\\.[^/\\\\]+)$/);\n if (compoundMatch != null) {\n if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(compoundMatch[1])) {\n return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(compoundMatch[1]) ?? 'text';\n }\n if (EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] != null) {\n return EXTENSION_TO_FILE_FORMAT[compoundMatch[1]] ?? 'text';\n }\n }\n\n // Fall back to simple extension\n const simpleMatch = fileName.match(/\\.([^.]+)$/)?.[1] ?? '';\n if (CUSTOM_EXTENSION_TO_FILE_FORMAT.has(simpleMatch)) {\n return CUSTOM_EXTENSION_TO_FILE_FORMAT.get(simpleMatch) ?? 'text';\n }\n return EXTENSION_TO_FILE_FORMAT[simpleMatch] ?? 'text';\n}\n\nexport function extendFileFormatMap(map: ExtensionFormatMap): void {\n for (const key in map) {\n const lang = map[key];\n if (lang != null) {\n CUSTOM_EXTENSION_TO_FILE_FORMAT.set(key, lang);\n }\n }\n}\n"],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ interface IterateOverDiffProps {
|
|
|
24
24
|
startingLine?: number;
|
|
25
25
|
totalLines?: number;
|
|
26
26
|
expandedHunks?: Map<number, HunkExpansionRegion> | true;
|
|
27
|
+
collapsedContextThreshold?: number;
|
|
27
28
|
callback: DiffLineCallback;
|
|
28
29
|
}
|
|
29
30
|
declare function iterateOverDiff({
|
|
@@ -32,6 +33,7 @@ declare function iterateOverDiff({
|
|
|
32
33
|
startingLine,
|
|
33
34
|
totalLines,
|
|
34
35
|
expandedHunks,
|
|
36
|
+
collapsedContextThreshold,
|
|
35
37
|
callback
|
|
36
38
|
}: IterateOverDiffProps): void;
|
|
37
39
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iterateOverDiff.d.ts","names":[],"sources":["../../src/utils/iterateOverDiff.ts"],"sourcesContent":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"iterateOverDiff.d.ts","names":[],"sources":["../../src/utils/iterateOverDiff.ts"],"sourcesContent":[],"mappings":";;;UAQiB,qBAAA;;EAAjB,IAAiB,EAET,IAFS,GAAA,SAAA;EAkCjB,eAAY,EAAA,MAAA;EAEZ,cAAiB,EAAA,MAAA;EACT,wBAAA,EAAA,MAAA,GAAA,SAAA;EAIsB,wBAAA,EAAA,MAAA,GAAA,SAAA;EAAZ,cAAA,EAAA,MAAA;EAEN,iBAAA,EAAA,MAAA,GAAA,SAAA;EAAA,iBAAA,EAAA,MAAA,GAAA,SAAA;EAGZ,kBAAgB,EAAA,MAAA,GAAA,SAAA;EACd,kBAAA,EAAA,MAAA,GAAA,SAAA;EACA,IAAA,EAAA,SAAA,GAAA,kBAAA,GAAA,QAAA;EACA,eAAA,EAAA,OAAA;EACA,eAAA,EAAA,OAAA;;AAEA,KAlBU,gBAAA,GAkBV,CAAA,KAAA,EAlBqC,qBAkBrC,EAAA,GAAA,OAAA,GAAA,IAAA;AACA,UAjBe,oBAAA,CAiBf;EACC,IAAA,EAjBK,gBAiBL;EAAA,SAAA,EAAA,SAAA,GAAA,OAAA,GAAA,MAAA;;;kBAbe,YAAY;;YAElB;;iBAGI,eAAA;;;;;;;;GAQb"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
+
import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from "../constants.js";
|
|
2
|
+
|
|
1
3
|
//#region src/utils/iterateOverDiff.ts
|
|
2
|
-
function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, callback }) {
|
|
4
|
+
function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infinity, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, callback }) {
|
|
3
5
|
const state = {
|
|
4
6
|
finalHunk: diff.hunks.at(-1),
|
|
5
7
|
viewportStart: startingLine,
|
|
@@ -50,14 +52,14 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
50
52
|
};
|
|
51
53
|
hunkIterator: for (const [hunkIndex, hunk] of diff.hunks.entries()) {
|
|
52
54
|
if (state.shouldBreak()) break;
|
|
53
|
-
const leadingRegion = getExpandedRegion(diff.isPartial, hunk.collapsedBefore, expandedHunks, hunkIndex);
|
|
55
|
+
const leadingRegion = getExpandedRegion(diff.isPartial, hunk.collapsedBefore, expandedHunks, hunkIndex, collapsedContextThreshold);
|
|
54
56
|
const trailingRegion = (() => {
|
|
55
57
|
if (hunk !== state.finalHunk || !hasFinalCollapsedHunk(diff)) return;
|
|
56
58
|
const additionRemaining = diff.additionLines.length - (hunk.additionLineIndex + hunk.additionCount);
|
|
57
59
|
const deletionRemaining = diff.deletionLines.length - (hunk.deletionLineIndex + hunk.deletionCount);
|
|
58
60
|
if (additionRemaining !== deletionRemaining) throw new Error(`iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`);
|
|
59
61
|
const trailingRangeSize = Math.min(additionRemaining, deletionRemaining);
|
|
60
|
-
return getExpandedRegion(diff.isPartial, trailingRangeSize, expandedHunks, diff.hunks.length);
|
|
62
|
+
return getExpandedRegion(diff.isPartial, trailingRangeSize, expandedHunks, diff.hunks.length, collapsedContextThreshold);
|
|
61
63
|
})();
|
|
62
64
|
const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;
|
|
63
65
|
function getTrailingCollapsedAfter(unifiedLineIndex$1, splitLineIndex$1) {
|
|
@@ -246,7 +248,7 @@ function iterateOverDiff({ diff, diffStyle, startingLine = 0, totalLines = Infin
|
|
|
246
248
|
}
|
|
247
249
|
}
|
|
248
250
|
}
|
|
249
|
-
function getExpandedRegion(isPartial, rangeSize, expandedHunks, hunkIndex) {
|
|
251
|
+
function getExpandedRegion(isPartial, rangeSize, expandedHunks, hunkIndex, collapsedContextThreshold) {
|
|
250
252
|
rangeSize = Math.max(rangeSize, 0);
|
|
251
253
|
if (rangeSize === 0 || isPartial) return {
|
|
252
254
|
fromStart: 0,
|
|
@@ -254,7 +256,7 @@ function getExpandedRegion(isPartial, rangeSize, expandedHunks, hunkIndex) {
|
|
|
254
256
|
rangeSize,
|
|
255
257
|
collapsedLines: Math.max(rangeSize, 0)
|
|
256
258
|
};
|
|
257
|
-
if (expandedHunks === true) return {
|
|
259
|
+
if (expandedHunks === true || rangeSize <= collapsedContextThreshold) return {
|
|
258
260
|
fromStart: rangeSize,
|
|
259
261
|
fromEnd: 0,
|
|
260
262
|
rangeSize,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"iterateOverDiff.js","names":["state: IterationState","unifiedLineIndex","splitLineIndex","deletionLineIndex","additionLineIndex","deletionLineNumber","additionLineNumber","iterationRanges: [number, number][]","merged: [number, number][]"],"sources":["../../src/utils/iterateOverDiff.ts"],"sourcesContent":["import type {\n ChangeContent,\n FileDiffMetadata,\n Hunk,\n HunkExpansionRegion,\n} from '../types';\n\nexport interface DiffLineCallbackProps {\n hunkIndex: number;\n hunk: Hunk | undefined; // undefined for trailing expansion region\n collapsedBefore: number; // > 0 means separator before this line, value = hidden lines\n collapsedAfter: number; // > 0 only on final line if trailing collapsed content\n unifiedDeletionLineIndex: number | undefined;\n unifiedAdditionLineIndex: number | undefined;\n splitLineIndex: number;\n additionLineIndex: number | undefined;\n deletionLineIndex: number | undefined;\n additionLineNumber: number | undefined; // 1-based file line number\n deletionLineNumber: number | undefined;\n type: 'context' | 'context-expanded' | 'change';\n // noEOFCR metadata - true if this is the last line and has no trailing newline\n noEOFCRAddition: boolean;\n noEOFCRDeletion: boolean;\n}\n\ninterface IterationState {\n finalHunk: Hunk | undefined;\n isWindowedHighlight: boolean;\n viewportStart: number;\n viewportEnd: number;\n splitCount: number;\n unifiedCount: number;\n shouldBreak(): boolean;\n shouldSkip(unifiedHeight: number, splitHeight: number): boolean;\n incrementCounts(unifiedValue: number, splitValue: number): void;\n isInWindow(unifiedHeight: number, splitHeight: number): boolean;\n isInUnifiedWindow(height: number): boolean;\n isInSplitWindow(height: number): boolean;\n emit(props: DiffLineCallbackProps, silent?: boolean): boolean;\n}\n\nexport type DiffLineCallback = (props: DiffLineCallbackProps) => boolean | void;\n\nexport interface IterateOverDiffProps {\n diff: FileDiffMetadata;\n diffStyle: 'unified' | 'split' | 'both';\n startingLine?: number;\n totalLines?: number;\n expandedHunks?: Map<number, HunkExpansionRegion> | true;\n callback: DiffLineCallback;\n}\n\nexport function iterateOverDiff({\n diff,\n diffStyle,\n startingLine = 0,\n totalLines = Infinity,\n expandedHunks,\n callback,\n}: IterateOverDiffProps): void {\n const state: IterationState = {\n finalHunk: diff.hunks.at(-1),\n viewportStart: startingLine,\n viewportEnd: startingLine + totalLines,\n isWindowedHighlight: startingLine > 0 || totalLines < Infinity,\n splitCount: 0,\n unifiedCount: 0,\n shouldBreak() {\n if (!state.isWindowedHighlight) {\n return false;\n }\n\n const breakUnified = state.unifiedCount >= startingLine + totalLines;\n const breakSplit = state.splitCount >= startingLine + totalLines;\n\n if (diffStyle === 'unified') {\n return breakUnified;\n } else if (diffStyle === 'split') {\n return breakSplit;\n } else {\n return breakUnified && breakSplit;\n }\n },\n shouldSkip(unifiedHeight: number, splitHeight: number) {\n if (!state.isWindowedHighlight) {\n return false;\n }\n\n const skipUnified = state.unifiedCount + unifiedHeight < startingLine;\n const skipSplit = state.splitCount + splitHeight < startingLine;\n\n if (diffStyle === 'unified') {\n return skipUnified;\n } else if (diffStyle === 'split') {\n return skipSplit;\n } else {\n return skipUnified && skipSplit;\n }\n },\n incrementCounts(unifiedValue: number, splitValue: number) {\n if (diffStyle === 'unified' || diffStyle === 'both') {\n state.unifiedCount += unifiedValue;\n }\n if (diffStyle === 'split' || diffStyle === 'both') {\n state.splitCount += splitValue;\n }\n },\n isInWindow(unifiedHeight: number, splitHeight: number) {\n if (!state.isWindowedHighlight) {\n return true;\n }\n\n const unifiedInWindow = state.isInUnifiedWindow(unifiedHeight);\n const splitInWindow = state.isInSplitWindow(splitHeight);\n\n if (diffStyle === 'unified') {\n return unifiedInWindow;\n } else if (diffStyle === 'split') {\n return splitInWindow;\n } else {\n return unifiedInWindow || splitInWindow;\n }\n },\n isInUnifiedWindow(unifiedHeight: number) {\n return (\n !state.isWindowedHighlight ||\n (state.unifiedCount >= startingLine - unifiedHeight &&\n state.unifiedCount < startingLine + totalLines)\n );\n },\n isInSplitWindow(splitHeight: number) {\n return (\n !state.isWindowedHighlight ||\n (state.splitCount >= startingLine - splitHeight &&\n state.splitCount < startingLine + totalLines)\n );\n },\n emit(props: DiffLineCallbackProps, silent = false): boolean {\n if (!silent) {\n if (diffStyle === 'unified') {\n state.incrementCounts(1, 0);\n } else if (diffStyle === 'split') {\n state.incrementCounts(0, 1);\n } else {\n state.incrementCounts(1, 1);\n // FIXME MAYBE\n // state.incrementCounts(\n // state.isInUnifiedWindow(0) ? 1 : 0,\n // state.isInSplitWindow(0) ? 1 : 0\n // );\n }\n }\n return callback(props) ?? false;\n },\n };\n\n hunkIterator: for (const [hunkIndex, hunk] of diff.hunks.entries()) {\n if (state.shouldBreak()) {\n break;\n }\n\n const leadingRegion = getExpandedRegion(\n diff.isPartial,\n hunk.collapsedBefore,\n expandedHunks,\n hunkIndex\n );\n // We only create a trailing region if it's the last hunk\n const trailingRegion = (() => {\n if (hunk !== state.finalHunk || !hasFinalCollapsedHunk(diff)) {\n return undefined;\n }\n const additionRemaining =\n diff.additionLines.length -\n (hunk.additionLineIndex + hunk.additionCount);\n const deletionRemaining =\n diff.deletionLines.length -\n (hunk.deletionLineIndex + hunk.deletionCount);\n\n if (additionRemaining !== deletionRemaining) {\n throw new Error(\n `iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`\n );\n }\n const trailingRangeSize = Math.min(additionRemaining, deletionRemaining);\n return getExpandedRegion(\n diff.isPartial,\n trailingRangeSize,\n expandedHunks,\n // hunkIndex for trailing region\n diff.hunks.length\n );\n })();\n const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;\n\n function getTrailingCollapsedAfter(\n unifiedLineIndex: number,\n splitLineIndex: number\n ) {\n if (\n trailingRegion == null ||\n trailingRegion.collapsedLines <= 0 ||\n trailingRegion.fromStart + trailingRegion.fromEnd > 0\n ) {\n return 0;\n }\n if (diffStyle === 'unified') {\n return unifiedLineIndex ===\n hunk.unifiedLineStart + hunk.unifiedLineCount - 1\n ? trailingRegion.collapsedLines\n : 0;\n }\n return splitLineIndex === hunk.splitLineStart + hunk.splitLineCount - 1\n ? trailingRegion.collapsedLines\n : 0;\n }\n function getPendingCollapsed() {\n if (leadingRegion.collapsedLines === 0) {\n return 0;\n }\n const value = leadingRegion.collapsedLines;\n leadingRegion.collapsedLines = 0;\n return value;\n }\n\n // Emit for expanded lines\n if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {\n let unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.rangeSize;\n let splitLineIndex = hunk.splitLineStart - leadingRegion.rangeSize;\n\n let deletionLineIndex = hunk.deletionLineIndex - leadingRegion.rangeSize;\n let additionLineIndex = hunk.additionLineIndex - leadingRegion.rangeSize;\n let deletionLineNumber = hunk.deletionStart - leadingRegion.rangeSize;\n let additionLineNumber = hunk.additionStart - leadingRegion.rangeSize;\n\n let index = 0;\n // FIXME: add skip\n while (index < leadingRegion.fromStart) {\n if (state.isInWindow(0, 0)) {\n if (\n state.emit({\n hunkIndex,\n hunk: hunk,\n collapsedBefore: 0,\n collapsedAfter: 0,\n // NOTE(amadeus): Pretty sure this is would never return a value,\n // so lets not call it, but if i notice a bug, i may need to\n // bring this back.\n // collapsedAfter: getTrailingCollapsedAfter(\n // unifiedRowIndex,\n // splitRowIndex\n // ),\n unifiedDeletionLineIndex: unifiedLineIndex + index,\n unifiedAdditionLineIndex: unifiedLineIndex + index,\n splitLineIndex: splitLineIndex + index,\n deletionLineIndex: deletionLineIndex + index,\n additionLineIndex: additionLineIndex + index,\n deletionLineNumber: deletionLineNumber + index,\n additionLineNumber: additionLineNumber + index,\n type: 'context-expanded',\n noEOFCRAddition: false,\n noEOFCRDeletion: false,\n })\n ) {\n break hunkIterator;\n }\n } else {\n state.incrementCounts(1, 1);\n }\n index++;\n }\n\n unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.fromEnd;\n splitLineIndex = hunk.splitLineStart - leadingRegion.fromEnd;\n\n deletionLineIndex = hunk.deletionLineIndex - leadingRegion.fromEnd;\n additionLineIndex = hunk.additionLineIndex - leadingRegion.fromEnd;\n deletionLineNumber = hunk.deletionStart - leadingRegion.fromEnd;\n additionLineNumber = hunk.additionStart - leadingRegion.fromEnd;\n index = 0;\n\n // FIXME(amadeus): Implement a skip if needed\n while (index < leadingRegion.fromEnd) {\n if (state.isInWindow(0, 0)) {\n if (\n state.emit({\n hunkIndex,\n hunk,\n collapsedBefore: getPendingCollapsed(),\n collapsedAfter: 0,\n // NOTE(amadeus): Pretty sure this is would never return a value,\n // so lets not call it, but if i notice a bug, i may need to\n // bring this back.\n // collapsedAfter: getTrailingCollapsedAfter(\n // unifiedRowIndex,\n // splitRowIndex\n // ),\n unifiedDeletionLineIndex: unifiedLineIndex + index,\n unifiedAdditionLineIndex: unifiedLineIndex + index,\n splitLineIndex: splitLineIndex + index,\n deletionLineIndex: deletionLineIndex + index,\n additionLineIndex: additionLineIndex + index,\n deletionLineNumber: deletionLineNumber + index,\n additionLineNumber: additionLineNumber + index,\n type: 'context-expanded',\n noEOFCRAddition: false,\n noEOFCRDeletion: false,\n })\n ) {\n break hunkIterator;\n }\n } else {\n state.incrementCounts(1, 1);\n }\n index++;\n }\n } else {\n state.incrementCounts(expandedLineCount, expandedLineCount);\n getPendingCollapsed();\n }\n\n let unifiedLineIndex = hunk.unifiedLineStart;\n let splitLineIndex = hunk.splitLineStart;\n\n let deletionLineIndex = hunk.deletionLineIndex;\n let additionLineIndex = hunk.additionLineIndex;\n let deletionLineNumber = hunk.deletionStart;\n let additionLineNumber = hunk.additionStart;\n const lastContent = hunk.hunkContent.at(-1);\n\n for (const content of hunk.hunkContent) {\n if (state.shouldBreak()) {\n break hunkIterator;\n }\n\n const isLastContent = content === lastContent;\n\n // Hunk Context Content\n if (content.type === 'context') {\n if (!state.shouldSkip(content.lines, content.lines)) {\n let index = 0;\n // FIXME: add a skip if we aren't rendering all the lines\n while (index < content.lines) {\n if (state.isInWindow(0, 0)) {\n const isLastLine = isLastContent && index === content.lines - 1;\n const unifiedRowIndex = unifiedLineIndex + index;\n const splitRowIndex = splitLineIndex + index;\n if (\n state.emit({\n hunkIndex,\n hunk,\n collapsedBefore: getPendingCollapsed(),\n collapsedAfter: getTrailingCollapsedAfter(\n unifiedRowIndex,\n splitRowIndex\n ),\n unifiedDeletionLineIndex: unifiedRowIndex,\n unifiedAdditionLineIndex: unifiedRowIndex,\n splitLineIndex: splitRowIndex,\n deletionLineIndex: deletionLineIndex + index,\n additionLineIndex: additionLineIndex + index,\n deletionLineNumber: deletionLineNumber + index,\n additionLineNumber: additionLineNumber + index,\n type: 'context',\n noEOFCRAddition: isLastLine && hunk.noEOFCRAdditions,\n noEOFCRDeletion: isLastLine && hunk.noEOFCRDeletions,\n })\n ) {\n break hunkIterator;\n }\n } else {\n state.incrementCounts(1, 1);\n }\n index++;\n }\n } else {\n state.incrementCounts(content.lines, content.lines);\n getPendingCollapsed();\n }\n unifiedLineIndex += content.lines;\n splitLineIndex += content.lines;\n\n deletionLineIndex += content.lines;\n additionLineIndex += content.lines;\n deletionLineNumber += content.lines;\n additionLineNumber += content.lines;\n }\n // Hunk Change Content\n else {\n const splitCount = Math.max(content.deletions, content.additions);\n const unifiedCount = content.deletions + content.additions;\n const shouldSkipChange = state.shouldSkip(unifiedCount, splitCount);\n if (!shouldSkipChange) {\n const iterationRanges = getChangeIterationRanges(\n state,\n content,\n diffStyle\n );\n\n // No need for any skipping because the render ranges skip for us\n for (const [rangeStart, rangeEnd] of iterationRanges) {\n for (let index = rangeStart; index < rangeEnd; index++) {\n const unifiedRowIndex = unifiedLineIndex + index;\n const splitRowIndex =\n diffStyle === 'unified'\n ? splitLineIndex +\n (index < content.deletions\n ? index\n : index - content.deletions)\n : splitLineIndex + index;\n const collapsedAfter = getTrailingCollapsedAfter(\n unifiedRowIndex,\n splitRowIndex\n );\n if (\n state.emit(\n getChangeLineData({\n hunkIndex,\n hunk,\n collapsedBefore: getPendingCollapsed(),\n collapsedAfter,\n diffStyle,\n index,\n unifiedLineIndex,\n splitLineIndex,\n additionLineIndex,\n deletionLineIndex,\n additionLineNumber,\n deletionLineNumber,\n content,\n isLastContent,\n unifiedCount,\n splitCount,\n }),\n true\n )\n ) {\n break hunkIterator;\n }\n }\n }\n }\n\n getPendingCollapsed();\n state.incrementCounts(unifiedCount, splitCount);\n unifiedLineIndex += unifiedCount;\n splitLineIndex += splitCount;\n deletionLineIndex += content.deletions;\n additionLineIndex += content.additions;\n deletionLineNumber += content.deletions;\n additionLineNumber += content.additions;\n }\n }\n\n if (trailingRegion != null) {\n const { collapsedLines, fromStart, fromEnd } = trailingRegion;\n const len = fromStart + fromEnd;\n let index = 0;\n // FIXME: add a skip\n while (index < len) {\n if (state.shouldBreak()) {\n break hunkIterator;\n }\n if (state.isInWindow(0, 0)) {\n const isLastLine = index === len - 1;\n if (\n state.emit({\n hunkIndex: diff.hunks.length,\n hunk: undefined,\n collapsedBefore: 0,\n collapsedAfter: isLastLine ? collapsedLines : 0,\n unifiedDeletionLineIndex: unifiedLineIndex + index,\n unifiedAdditionLineIndex: unifiedLineIndex + index,\n splitLineIndex: splitLineIndex + index,\n additionLineIndex: additionLineIndex + index,\n deletionLineIndex: deletionLineIndex + index,\n additionLineNumber: additionLineNumber + index,\n deletionLineNumber: deletionLineNumber + index,\n type: 'context-expanded',\n noEOFCRAddition: false,\n noEOFCRDeletion: false,\n })\n ) {\n break hunkIterator;\n }\n } else {\n state.incrementCounts(1, 1);\n }\n index++;\n }\n }\n }\n}\n\ninterface ExpandedRegionResult {\n fromStart: number;\n fromEnd: number;\n rangeSize: number;\n collapsedLines: number;\n}\n\nfunction getExpandedRegion(\n isPartial: boolean,\n rangeSize: number,\n expandedHunks: Map<number, HunkExpansionRegion> | true | undefined,\n hunkIndex: number\n): ExpandedRegionResult {\n rangeSize = Math.max(rangeSize, 0);\n if (rangeSize === 0 || isPartial) {\n return {\n fromStart: 0,\n fromEnd: 0,\n rangeSize,\n collapsedLines: Math.max(rangeSize, 0),\n };\n }\n if (expandedHunks === true) {\n return {\n fromStart: rangeSize,\n fromEnd: 0,\n rangeSize,\n collapsedLines: 0,\n };\n }\n const region = expandedHunks?.get(hunkIndex);\n const fromStart = Math.min(Math.max(region?.fromStart ?? 0, 0), rangeSize);\n const fromEnd = Math.min(Math.max(region?.fromEnd ?? 0, 0), rangeSize);\n const expandedCount = fromStart + fromEnd;\n const renderAll = expandedCount >= rangeSize;\n return {\n fromStart: renderAll ? rangeSize : fromStart,\n fromEnd: renderAll ? 0 : fromEnd,\n rangeSize,\n collapsedLines: Math.max(rangeSize - expandedCount, 0),\n };\n}\n\nfunction hasFinalCollapsedHunk(diff: FileDiffMetadata): boolean {\n const lastHunk = diff.hunks.at(-1);\n if (\n lastHunk == null ||\n diff.isPartial ||\n diff.additionLines.length === 0 ||\n diff.deletionLines.length === 0\n ) {\n return false;\n }\n return (\n lastHunk.additionLineIndex + lastHunk.additionCount <\n diff.additionLines.length ||\n lastHunk.deletionLineIndex + lastHunk.deletionCount <\n diff.deletionLines.length\n );\n}\n\n// The intention of this function is to grab the appropriate windowed ranges of\n// the change content. If diffStyle is both, we will iterate AS split, however\n// we will encompass all needed lines to allow us to render split or unified\nfunction getChangeIterationRanges(\n state: IterationState,\n content: ChangeContent,\n diffStyle: 'split' | 'unified' | 'both'\n): [number, number][] {\n // If not a window highlight, then we should just render the entire range\n if (!state.isWindowedHighlight) {\n return [\n [\n 0,\n diffStyle === 'unified'\n ? content.deletions + content.additions\n : Math.max(content.deletions, content.additions),\n ],\n ];\n }\n const useUnified = diffStyle !== 'split';\n const useSplit = diffStyle !== 'unified';\n const iterationSpace = diffStyle === 'unified' ? 'unified' : 'split';\n const iterationRanges: [number, number][] = [];\n function getVisibleRange(\n start: number,\n count: number\n ): [number, number] | undefined {\n const end = start + count;\n if (end <= state.viewportStart || start >= state.viewportEnd) {\n return undefined;\n }\n const visibleStart = Math.max(0, state.viewportStart - start);\n const visibleEnd = Math.min(count, state.viewportEnd - start);\n return visibleEnd > visibleStart ? [visibleStart, visibleEnd] : undefined;\n }\n function mapRangeToIteration(\n range: [number, number],\n kind: 'deletions' | 'additions'\n ): [number, number] {\n if (iterationSpace === 'split') {\n // For split iteration, additions/deletions are already in split row space.\n return range;\n }\n return kind === 'additions'\n ? [range[0] + content.deletions, range[1] + content.deletions]\n : range;\n }\n function pushRange(\n range: [number, number] | undefined,\n kind: 'deletions' | 'additions'\n ) {\n if (range == null) {\n return;\n }\n const [start, end] = mapRangeToIteration(range, kind);\n if (end > start) {\n iterationRanges.push([start, end]);\n }\n }\n\n if (useUnified) {\n pushRange(\n getVisibleRange(state.unifiedCount, content.deletions),\n 'deletions'\n );\n pushRange(\n getVisibleRange(\n state.unifiedCount + content.deletions,\n content.additions\n ),\n 'additions'\n );\n }\n\n if (useSplit) {\n pushRange(\n getVisibleRange(state.splitCount, content.deletions),\n 'deletions'\n );\n pushRange(\n getVisibleRange(state.splitCount, content.additions),\n 'additions'\n );\n }\n\n if (iterationRanges.length === 0) {\n return iterationRanges;\n }\n\n iterationRanges.sort((a, b) => a[0] - b[0]);\n const merged: [number, number][] = [iterationRanges[0]];\n for (const [start, end] of iterationRanges.slice(1)) {\n const last = merged[merged.length - 1];\n if (start <= last[1]) {\n last[1] = Math.max(last[1], end);\n } else {\n merged.push([start, end]);\n }\n }\n\n return merged;\n}\n\ninterface GetChangeLineDataProps {\n hunkIndex: number;\n hunk: Hunk;\n collapsedBefore: number;\n collapsedAfter: number;\n diffStyle: 'split' | 'unified' | 'both';\n index: number;\n unifiedLineIndex: number;\n splitLineIndex: number;\n additionLineIndex: number;\n additionLineNumber: number;\n deletionLineNumber: number;\n deletionLineIndex: number;\n content: ChangeContent;\n isLastContent: boolean;\n unifiedCount: number;\n splitCount: number;\n}\n\n// NOTE(amadeus): It's quite tedious to grab the appropriate line info and\n// related props for change content regions, so I made it a specialized\n// function to help make the main hunkIterator easy to reason about\nfunction getChangeLineData({\n hunkIndex,\n hunk,\n collapsedAfter,\n collapsedBefore,\n diffStyle,\n index,\n unifiedLineIndex,\n splitLineIndex,\n additionLineIndex,\n deletionLineIndex,\n additionLineNumber,\n deletionLineNumber,\n content,\n isLastContent,\n unifiedCount,\n splitCount,\n}: GetChangeLineDataProps): DiffLineCallbackProps {\n if (diffStyle === 'unified') {\n return {\n type: 'change',\n hunkIndex,\n hunk,\n collapsedAfter,\n collapsedBefore,\n unifiedDeletionLineIndex:\n index < content.deletions ? unifiedLineIndex + index : undefined,\n unifiedAdditionLineIndex:\n index >= content.deletions ? unifiedLineIndex + index : undefined,\n splitLineIndex:\n splitLineIndex +\n (index < content.deletions ? index : index - content.deletions),\n additionLineIndex:\n index >= content.deletions\n ? additionLineIndex + (index - content.deletions)\n : undefined,\n additionLineNumber:\n index >= content.deletions\n ? additionLineNumber + (index - content.deletions)\n : undefined,\n deletionLineIndex:\n index < content.deletions ? deletionLineIndex + index : undefined,\n deletionLineNumber:\n index < content.deletions ? deletionLineNumber + index : undefined,\n noEOFCRDeletion:\n isLastContent &&\n index === content.deletions - 1 &&\n hunk.noEOFCRDeletions,\n noEOFCRAddition:\n isLastContent && index === unifiedCount - 1 && hunk.noEOFCRAdditions,\n };\n }\n return {\n type: 'change',\n hunkIndex,\n hunk,\n collapsedAfter,\n collapsedBefore,\n unifiedDeletionLineIndex:\n index < content.deletions ? unifiedLineIndex + index : undefined,\n unifiedAdditionLineIndex:\n index < content.additions\n ? unifiedLineIndex + content.deletions + index\n : undefined,\n splitLineIndex: splitLineIndex + index,\n additionLineIndex:\n index < content.additions ? additionLineIndex + index : undefined,\n additionLineNumber:\n index < content.additions ? additionLineNumber + index : undefined,\n deletionLineIndex:\n index < content.deletions ? deletionLineIndex + index : undefined,\n deletionLineNumber:\n index < content.deletions ? deletionLineNumber + index : undefined,\n noEOFCRDeletion:\n isLastContent && index === splitCount - 1 && hunk.noEOFCRDeletions,\n noEOFCRAddition:\n isLastContent && index === splitCount - 1 && hunk.noEOFCRAdditions,\n };\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"iterateOverDiff.js","names":["state: IterationState","unifiedLineIndex","splitLineIndex","deletionLineIndex","additionLineIndex","deletionLineNumber","additionLineNumber","iterationRanges: [number, number][]","merged: [number, number][]"],"sources":["../../src/utils/iterateOverDiff.ts"],"sourcesContent":["import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } from '../constants';\nimport type {\n ChangeContent,\n FileDiffMetadata,\n Hunk,\n HunkExpansionRegion,\n} from '../types';\n\nexport interface DiffLineCallbackProps {\n hunkIndex: number;\n hunk: Hunk | undefined; // undefined for trailing expansion region\n collapsedBefore: number; // > 0 means separator before this line, value = hidden lines\n collapsedAfter: number; // > 0 only on final line if trailing collapsed content\n unifiedDeletionLineIndex: number | undefined;\n unifiedAdditionLineIndex: number | undefined;\n splitLineIndex: number;\n additionLineIndex: number | undefined;\n deletionLineIndex: number | undefined;\n additionLineNumber: number | undefined; // 1-based file line number\n deletionLineNumber: number | undefined;\n type: 'context' | 'context-expanded' | 'change';\n // noEOFCR metadata - true if this is the last line and has no trailing newline\n noEOFCRAddition: boolean;\n noEOFCRDeletion: boolean;\n}\n\ninterface IterationState {\n finalHunk: Hunk | undefined;\n isWindowedHighlight: boolean;\n viewportStart: number;\n viewportEnd: number;\n splitCount: number;\n unifiedCount: number;\n shouldBreak(): boolean;\n shouldSkip(unifiedHeight: number, splitHeight: number): boolean;\n incrementCounts(unifiedValue: number, splitValue: number): void;\n isInWindow(unifiedHeight: number, splitHeight: number): boolean;\n isInUnifiedWindow(height: number): boolean;\n isInSplitWindow(height: number): boolean;\n emit(props: DiffLineCallbackProps, silent?: boolean): boolean;\n}\n\nexport type DiffLineCallback = (props: DiffLineCallbackProps) => boolean | void;\n\nexport interface IterateOverDiffProps {\n diff: FileDiffMetadata;\n diffStyle: 'unified' | 'split' | 'both';\n startingLine?: number;\n totalLines?: number;\n expandedHunks?: Map<number, HunkExpansionRegion> | true;\n collapsedContextThreshold?: number;\n callback: DiffLineCallback;\n}\n\nexport function iterateOverDiff({\n diff,\n diffStyle,\n startingLine = 0,\n totalLines = Infinity,\n expandedHunks,\n collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD,\n callback,\n}: IterateOverDiffProps): void {\n const state: IterationState = {\n finalHunk: diff.hunks.at(-1),\n viewportStart: startingLine,\n viewportEnd: startingLine + totalLines,\n isWindowedHighlight: startingLine > 0 || totalLines < Infinity,\n splitCount: 0,\n unifiedCount: 0,\n shouldBreak() {\n if (!state.isWindowedHighlight) {\n return false;\n }\n\n const breakUnified = state.unifiedCount >= startingLine + totalLines;\n const breakSplit = state.splitCount >= startingLine + totalLines;\n\n if (diffStyle === 'unified') {\n return breakUnified;\n } else if (diffStyle === 'split') {\n return breakSplit;\n } else {\n return breakUnified && breakSplit;\n }\n },\n shouldSkip(unifiedHeight: number, splitHeight: number) {\n if (!state.isWindowedHighlight) {\n return false;\n }\n\n const skipUnified = state.unifiedCount + unifiedHeight < startingLine;\n const skipSplit = state.splitCount + splitHeight < startingLine;\n\n if (diffStyle === 'unified') {\n return skipUnified;\n } else if (diffStyle === 'split') {\n return skipSplit;\n } else {\n return skipUnified && skipSplit;\n }\n },\n incrementCounts(unifiedValue: number, splitValue: number) {\n if (diffStyle === 'unified' || diffStyle === 'both') {\n state.unifiedCount += unifiedValue;\n }\n if (diffStyle === 'split' || diffStyle === 'both') {\n state.splitCount += splitValue;\n }\n },\n isInWindow(unifiedHeight: number, splitHeight: number) {\n if (!state.isWindowedHighlight) {\n return true;\n }\n\n const unifiedInWindow = state.isInUnifiedWindow(unifiedHeight);\n const splitInWindow = state.isInSplitWindow(splitHeight);\n\n if (diffStyle === 'unified') {\n return unifiedInWindow;\n } else if (diffStyle === 'split') {\n return splitInWindow;\n } else {\n return unifiedInWindow || splitInWindow;\n }\n },\n isInUnifiedWindow(unifiedHeight: number) {\n return (\n !state.isWindowedHighlight ||\n (state.unifiedCount >= startingLine - unifiedHeight &&\n state.unifiedCount < startingLine + totalLines)\n );\n },\n isInSplitWindow(splitHeight: number) {\n return (\n !state.isWindowedHighlight ||\n (state.splitCount >= startingLine - splitHeight &&\n state.splitCount < startingLine + totalLines)\n );\n },\n emit(props: DiffLineCallbackProps, silent = false): boolean {\n if (!silent) {\n if (diffStyle === 'unified') {\n state.incrementCounts(1, 0);\n } else if (diffStyle === 'split') {\n state.incrementCounts(0, 1);\n } else {\n state.incrementCounts(1, 1);\n // FIXME MAYBE\n // state.incrementCounts(\n // state.isInUnifiedWindow(0) ? 1 : 0,\n // state.isInSplitWindow(0) ? 1 : 0\n // );\n }\n }\n return callback(props) ?? false;\n },\n };\n\n hunkIterator: for (const [hunkIndex, hunk] of diff.hunks.entries()) {\n if (state.shouldBreak()) {\n break;\n }\n\n const leadingRegion = getExpandedRegion(\n diff.isPartial,\n hunk.collapsedBefore,\n expandedHunks,\n hunkIndex,\n collapsedContextThreshold\n );\n // We only create a trailing region if it's the last hunk\n const trailingRegion = (() => {\n if (hunk !== state.finalHunk || !hasFinalCollapsedHunk(diff)) {\n return undefined;\n }\n const additionRemaining =\n diff.additionLines.length -\n (hunk.additionLineIndex + hunk.additionCount);\n const deletionRemaining =\n diff.deletionLines.length -\n (hunk.deletionLineIndex + hunk.deletionCount);\n\n if (additionRemaining !== deletionRemaining) {\n throw new Error(\n `iterateOverDiff: trailing context mismatch (additions=${additionRemaining}, deletions=${deletionRemaining}) for ${diff.name}`\n );\n }\n const trailingRangeSize = Math.min(additionRemaining, deletionRemaining);\n return getExpandedRegion(\n diff.isPartial,\n trailingRangeSize,\n expandedHunks,\n // hunkIndex for trailing region\n diff.hunks.length,\n collapsedContextThreshold\n );\n })();\n const expandedLineCount = leadingRegion.fromStart + leadingRegion.fromEnd;\n\n function getTrailingCollapsedAfter(\n unifiedLineIndex: number,\n splitLineIndex: number\n ) {\n if (\n trailingRegion == null ||\n trailingRegion.collapsedLines <= 0 ||\n trailingRegion.fromStart + trailingRegion.fromEnd > 0\n ) {\n return 0;\n }\n if (diffStyle === 'unified') {\n return unifiedLineIndex ===\n hunk.unifiedLineStart + hunk.unifiedLineCount - 1\n ? trailingRegion.collapsedLines\n : 0;\n }\n return splitLineIndex === hunk.splitLineStart + hunk.splitLineCount - 1\n ? trailingRegion.collapsedLines\n : 0;\n }\n function getPendingCollapsed() {\n if (leadingRegion.collapsedLines === 0) {\n return 0;\n }\n const value = leadingRegion.collapsedLines;\n leadingRegion.collapsedLines = 0;\n return value;\n }\n\n // Emit for expanded lines\n if (!state.shouldSkip(expandedLineCount, expandedLineCount)) {\n let unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.rangeSize;\n let splitLineIndex = hunk.splitLineStart - leadingRegion.rangeSize;\n\n let deletionLineIndex = hunk.deletionLineIndex - leadingRegion.rangeSize;\n let additionLineIndex = hunk.additionLineIndex - leadingRegion.rangeSize;\n let deletionLineNumber = hunk.deletionStart - leadingRegion.rangeSize;\n let additionLineNumber = hunk.additionStart - leadingRegion.rangeSize;\n\n let index = 0;\n // FIXME: add skip\n while (index < leadingRegion.fromStart) {\n if (state.isInWindow(0, 0)) {\n if (\n state.emit({\n hunkIndex,\n hunk: hunk,\n collapsedBefore: 0,\n collapsedAfter: 0,\n // NOTE(amadeus): Pretty sure this is would never return a value,\n // so lets not call it, but if i notice a bug, i may need to\n // bring this back.\n // collapsedAfter: getTrailingCollapsedAfter(\n // unifiedRowIndex,\n // splitRowIndex\n // ),\n unifiedDeletionLineIndex: unifiedLineIndex + index,\n unifiedAdditionLineIndex: unifiedLineIndex + index,\n splitLineIndex: splitLineIndex + index,\n deletionLineIndex: deletionLineIndex + index,\n additionLineIndex: additionLineIndex + index,\n deletionLineNumber: deletionLineNumber + index,\n additionLineNumber: additionLineNumber + index,\n type: 'context-expanded',\n noEOFCRAddition: false,\n noEOFCRDeletion: false,\n })\n ) {\n break hunkIterator;\n }\n } else {\n state.incrementCounts(1, 1);\n }\n index++;\n }\n\n unifiedLineIndex = hunk.unifiedLineStart - leadingRegion.fromEnd;\n splitLineIndex = hunk.splitLineStart - leadingRegion.fromEnd;\n\n deletionLineIndex = hunk.deletionLineIndex - leadingRegion.fromEnd;\n additionLineIndex = hunk.additionLineIndex - leadingRegion.fromEnd;\n deletionLineNumber = hunk.deletionStart - leadingRegion.fromEnd;\n additionLineNumber = hunk.additionStart - leadingRegion.fromEnd;\n index = 0;\n\n // FIXME(amadeus): Implement a skip if needed\n while (index < leadingRegion.fromEnd) {\n if (state.isInWindow(0, 0)) {\n if (\n state.emit({\n hunkIndex,\n hunk,\n collapsedBefore: getPendingCollapsed(),\n collapsedAfter: 0,\n // NOTE(amadeus): Pretty sure this is would never return a value,\n // so lets not call it, but if i notice a bug, i may need to\n // bring this back.\n // collapsedAfter: getTrailingCollapsedAfter(\n // unifiedRowIndex,\n // splitRowIndex\n // ),\n unifiedDeletionLineIndex: unifiedLineIndex + index,\n unifiedAdditionLineIndex: unifiedLineIndex + index,\n splitLineIndex: splitLineIndex + index,\n deletionLineIndex: deletionLineIndex + index,\n additionLineIndex: additionLineIndex + index,\n deletionLineNumber: deletionLineNumber + index,\n additionLineNumber: additionLineNumber + index,\n type: 'context-expanded',\n noEOFCRAddition: false,\n noEOFCRDeletion: false,\n })\n ) {\n break hunkIterator;\n }\n } else {\n state.incrementCounts(1, 1);\n }\n index++;\n }\n } else {\n state.incrementCounts(expandedLineCount, expandedLineCount);\n getPendingCollapsed();\n }\n\n let unifiedLineIndex = hunk.unifiedLineStart;\n let splitLineIndex = hunk.splitLineStart;\n\n let deletionLineIndex = hunk.deletionLineIndex;\n let additionLineIndex = hunk.additionLineIndex;\n let deletionLineNumber = hunk.deletionStart;\n let additionLineNumber = hunk.additionStart;\n const lastContent = hunk.hunkContent.at(-1);\n\n for (const content of hunk.hunkContent) {\n if (state.shouldBreak()) {\n break hunkIterator;\n }\n\n const isLastContent = content === lastContent;\n\n // Hunk Context Content\n if (content.type === 'context') {\n if (!state.shouldSkip(content.lines, content.lines)) {\n let index = 0;\n // FIXME: add a skip if we aren't rendering all the lines\n while (index < content.lines) {\n if (state.isInWindow(0, 0)) {\n const isLastLine = isLastContent && index === content.lines - 1;\n const unifiedRowIndex = unifiedLineIndex + index;\n const splitRowIndex = splitLineIndex + index;\n if (\n state.emit({\n hunkIndex,\n hunk,\n collapsedBefore: getPendingCollapsed(),\n collapsedAfter: getTrailingCollapsedAfter(\n unifiedRowIndex,\n splitRowIndex\n ),\n unifiedDeletionLineIndex: unifiedRowIndex,\n unifiedAdditionLineIndex: unifiedRowIndex,\n splitLineIndex: splitRowIndex,\n deletionLineIndex: deletionLineIndex + index,\n additionLineIndex: additionLineIndex + index,\n deletionLineNumber: deletionLineNumber + index,\n additionLineNumber: additionLineNumber + index,\n type: 'context',\n noEOFCRAddition: isLastLine && hunk.noEOFCRAdditions,\n noEOFCRDeletion: isLastLine && hunk.noEOFCRDeletions,\n })\n ) {\n break hunkIterator;\n }\n } else {\n state.incrementCounts(1, 1);\n }\n index++;\n }\n } else {\n state.incrementCounts(content.lines, content.lines);\n getPendingCollapsed();\n }\n unifiedLineIndex += content.lines;\n splitLineIndex += content.lines;\n\n deletionLineIndex += content.lines;\n additionLineIndex += content.lines;\n deletionLineNumber += content.lines;\n additionLineNumber += content.lines;\n }\n // Hunk Change Content\n else {\n const splitCount = Math.max(content.deletions, content.additions);\n const unifiedCount = content.deletions + content.additions;\n const shouldSkipChange = state.shouldSkip(unifiedCount, splitCount);\n if (!shouldSkipChange) {\n const iterationRanges = getChangeIterationRanges(\n state,\n content,\n diffStyle\n );\n\n // No need for any skipping because the render ranges skip for us\n for (const [rangeStart, rangeEnd] of iterationRanges) {\n for (let index = rangeStart; index < rangeEnd; index++) {\n const unifiedRowIndex = unifiedLineIndex + index;\n const splitRowIndex =\n diffStyle === 'unified'\n ? splitLineIndex +\n (index < content.deletions\n ? index\n : index - content.deletions)\n : splitLineIndex + index;\n const collapsedAfter = getTrailingCollapsedAfter(\n unifiedRowIndex,\n splitRowIndex\n );\n if (\n state.emit(\n getChangeLineData({\n hunkIndex,\n hunk,\n collapsedBefore: getPendingCollapsed(),\n collapsedAfter,\n diffStyle,\n index,\n unifiedLineIndex,\n splitLineIndex,\n additionLineIndex,\n deletionLineIndex,\n additionLineNumber,\n deletionLineNumber,\n content,\n isLastContent,\n unifiedCount,\n splitCount,\n }),\n true\n )\n ) {\n break hunkIterator;\n }\n }\n }\n }\n\n getPendingCollapsed();\n state.incrementCounts(unifiedCount, splitCount);\n unifiedLineIndex += unifiedCount;\n splitLineIndex += splitCount;\n deletionLineIndex += content.deletions;\n additionLineIndex += content.additions;\n deletionLineNumber += content.deletions;\n additionLineNumber += content.additions;\n }\n }\n\n if (trailingRegion != null) {\n const { collapsedLines, fromStart, fromEnd } = trailingRegion;\n const len = fromStart + fromEnd;\n let index = 0;\n // FIXME: add a skip\n while (index < len) {\n if (state.shouldBreak()) {\n break hunkIterator;\n }\n if (state.isInWindow(0, 0)) {\n const isLastLine = index === len - 1;\n if (\n state.emit({\n hunkIndex: diff.hunks.length,\n hunk: undefined,\n collapsedBefore: 0,\n collapsedAfter: isLastLine ? collapsedLines : 0,\n unifiedDeletionLineIndex: unifiedLineIndex + index,\n unifiedAdditionLineIndex: unifiedLineIndex + index,\n splitLineIndex: splitLineIndex + index,\n additionLineIndex: additionLineIndex + index,\n deletionLineIndex: deletionLineIndex + index,\n additionLineNumber: additionLineNumber + index,\n deletionLineNumber: deletionLineNumber + index,\n type: 'context-expanded',\n noEOFCRAddition: false,\n noEOFCRDeletion: false,\n })\n ) {\n break hunkIterator;\n }\n } else {\n state.incrementCounts(1, 1);\n }\n index++;\n }\n }\n }\n}\n\ninterface ExpandedRegionResult {\n fromStart: number;\n fromEnd: number;\n rangeSize: number;\n collapsedLines: number;\n}\n\nfunction getExpandedRegion(\n isPartial: boolean,\n rangeSize: number,\n expandedHunks: Map<number, HunkExpansionRegion> | true | undefined,\n hunkIndex: number,\n collapsedContextThreshold: number\n): ExpandedRegionResult {\n rangeSize = Math.max(rangeSize, 0);\n if (rangeSize === 0 || isPartial) {\n return {\n fromStart: 0,\n fromEnd: 0,\n rangeSize,\n collapsedLines: Math.max(rangeSize, 0),\n };\n }\n if (expandedHunks === true || rangeSize <= collapsedContextThreshold) {\n return {\n fromStart: rangeSize,\n fromEnd: 0,\n rangeSize,\n collapsedLines: 0,\n };\n }\n const region = expandedHunks?.get(hunkIndex);\n const fromStart = Math.min(Math.max(region?.fromStart ?? 0, 0), rangeSize);\n const fromEnd = Math.min(Math.max(region?.fromEnd ?? 0, 0), rangeSize);\n const expandedCount = fromStart + fromEnd;\n const renderAll = expandedCount >= rangeSize;\n return {\n fromStart: renderAll ? rangeSize : fromStart,\n fromEnd: renderAll ? 0 : fromEnd,\n rangeSize,\n collapsedLines: Math.max(rangeSize - expandedCount, 0),\n };\n}\n\nfunction hasFinalCollapsedHunk(diff: FileDiffMetadata): boolean {\n const lastHunk = diff.hunks.at(-1);\n if (\n lastHunk == null ||\n diff.isPartial ||\n diff.additionLines.length === 0 ||\n diff.deletionLines.length === 0\n ) {\n return false;\n }\n return (\n lastHunk.additionLineIndex + lastHunk.additionCount <\n diff.additionLines.length ||\n lastHunk.deletionLineIndex + lastHunk.deletionCount <\n diff.deletionLines.length\n );\n}\n\n// The intention of this function is to grab the appropriate windowed ranges of\n// the change content. If diffStyle is both, we will iterate AS split, however\n// we will encompass all needed lines to allow us to render split or unified\nfunction getChangeIterationRanges(\n state: IterationState,\n content: ChangeContent,\n diffStyle: 'split' | 'unified' | 'both'\n): [number, number][] {\n // If not a window highlight, then we should just render the entire range\n if (!state.isWindowedHighlight) {\n return [\n [\n 0,\n diffStyle === 'unified'\n ? content.deletions + content.additions\n : Math.max(content.deletions, content.additions),\n ],\n ];\n }\n const useUnified = diffStyle !== 'split';\n const useSplit = diffStyle !== 'unified';\n const iterationSpace = diffStyle === 'unified' ? 'unified' : 'split';\n const iterationRanges: [number, number][] = [];\n function getVisibleRange(\n start: number,\n count: number\n ): [number, number] | undefined {\n const end = start + count;\n if (end <= state.viewportStart || start >= state.viewportEnd) {\n return undefined;\n }\n const visibleStart = Math.max(0, state.viewportStart - start);\n const visibleEnd = Math.min(count, state.viewportEnd - start);\n return visibleEnd > visibleStart ? [visibleStart, visibleEnd] : undefined;\n }\n function mapRangeToIteration(\n range: [number, number],\n kind: 'deletions' | 'additions'\n ): [number, number] {\n if (iterationSpace === 'split') {\n // For split iteration, additions/deletions are already in split row space.\n return range;\n }\n return kind === 'additions'\n ? [range[0] + content.deletions, range[1] + content.deletions]\n : range;\n }\n function pushRange(\n range: [number, number] | undefined,\n kind: 'deletions' | 'additions'\n ) {\n if (range == null) {\n return;\n }\n const [start, end] = mapRangeToIteration(range, kind);\n if (end > start) {\n iterationRanges.push([start, end]);\n }\n }\n\n if (useUnified) {\n pushRange(\n getVisibleRange(state.unifiedCount, content.deletions),\n 'deletions'\n );\n pushRange(\n getVisibleRange(\n state.unifiedCount + content.deletions,\n content.additions\n ),\n 'additions'\n );\n }\n\n if (useSplit) {\n pushRange(\n getVisibleRange(state.splitCount, content.deletions),\n 'deletions'\n );\n pushRange(\n getVisibleRange(state.splitCount, content.additions),\n 'additions'\n );\n }\n\n if (iterationRanges.length === 0) {\n return iterationRanges;\n }\n\n iterationRanges.sort((a, b) => a[0] - b[0]);\n const merged: [number, number][] = [iterationRanges[0]];\n for (const [start, end] of iterationRanges.slice(1)) {\n const last = merged[merged.length - 1];\n if (start <= last[1]) {\n last[1] = Math.max(last[1], end);\n } else {\n merged.push([start, end]);\n }\n }\n\n return merged;\n}\n\ninterface GetChangeLineDataProps {\n hunkIndex: number;\n hunk: Hunk;\n collapsedBefore: number;\n collapsedAfter: number;\n diffStyle: 'split' | 'unified' | 'both';\n index: number;\n unifiedLineIndex: number;\n splitLineIndex: number;\n additionLineIndex: number;\n additionLineNumber: number;\n deletionLineNumber: number;\n deletionLineIndex: number;\n content: ChangeContent;\n isLastContent: boolean;\n unifiedCount: number;\n splitCount: number;\n}\n\n// NOTE(amadeus): It's quite tedious to grab the appropriate line info and\n// related props for change content regions, so I made it a specialized\n// function to help make the main hunkIterator easy to reason about\nfunction getChangeLineData({\n hunkIndex,\n hunk,\n collapsedAfter,\n collapsedBefore,\n diffStyle,\n index,\n unifiedLineIndex,\n splitLineIndex,\n additionLineIndex,\n deletionLineIndex,\n additionLineNumber,\n deletionLineNumber,\n content,\n isLastContent,\n unifiedCount,\n splitCount,\n}: GetChangeLineDataProps): DiffLineCallbackProps {\n if (diffStyle === 'unified') {\n return {\n type: 'change',\n hunkIndex,\n hunk,\n collapsedAfter,\n collapsedBefore,\n unifiedDeletionLineIndex:\n index < content.deletions ? unifiedLineIndex + index : undefined,\n unifiedAdditionLineIndex:\n index >= content.deletions ? unifiedLineIndex + index : undefined,\n splitLineIndex:\n splitLineIndex +\n (index < content.deletions ? index : index - content.deletions),\n additionLineIndex:\n index >= content.deletions\n ? additionLineIndex + (index - content.deletions)\n : undefined,\n additionLineNumber:\n index >= content.deletions\n ? additionLineNumber + (index - content.deletions)\n : undefined,\n deletionLineIndex:\n index < content.deletions ? deletionLineIndex + index : undefined,\n deletionLineNumber:\n index < content.deletions ? deletionLineNumber + index : undefined,\n noEOFCRDeletion:\n isLastContent &&\n index === content.deletions - 1 &&\n hunk.noEOFCRDeletions,\n noEOFCRAddition:\n isLastContent && index === unifiedCount - 1 && hunk.noEOFCRAdditions,\n };\n }\n return {\n type: 'change',\n hunkIndex,\n hunk,\n collapsedAfter,\n collapsedBefore,\n unifiedDeletionLineIndex:\n index < content.deletions ? unifiedLineIndex + index : undefined,\n unifiedAdditionLineIndex:\n index < content.additions\n ? unifiedLineIndex + content.deletions + index\n : undefined,\n splitLineIndex: splitLineIndex + index,\n additionLineIndex:\n index < content.additions ? additionLineIndex + index : undefined,\n additionLineNumber:\n index < content.additions ? additionLineNumber + index : undefined,\n deletionLineIndex:\n index < content.deletions ? deletionLineIndex + index : undefined,\n deletionLineNumber:\n index < content.deletions ? deletionLineNumber + index : undefined,\n noEOFCRDeletion:\n isLastContent && index === splitCount - 1 && hunk.noEOFCRDeletions,\n noEOFCRAddition:\n isLastContent && index === splitCount - 1 && hunk.noEOFCRAdditions,\n };\n}\n"],"mappings":"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"}
|
|
@@ -5,7 +5,8 @@ declare function renderDiffWithHighlighter(diff: FileDiffMetadata, highlighter:
|
|
|
5
5
|
forcePlainText,
|
|
6
6
|
startingLine,
|
|
7
7
|
totalLines,
|
|
8
|
-
expandedHunks
|
|
8
|
+
expandedHunks,
|
|
9
|
+
collapsedContextThreshold
|
|
9
10
|
}?: ForcePlainTextOptions): ThemedDiffResult;
|
|
10
11
|
//#endregion
|
|
11
12
|
export { renderDiffWithHighlighter };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderDiffWithHighlighter.d.ts","names":[],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"renderDiffWithHighlighter.d.ts","names":[],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":[],"mappings":";;;iBAqCgB,yBAAA,OACR,+BACO,2BACJ;;;;;;IAON,wBACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DEFAULT_THEMES } from "../constants.js";
|
|
1
|
+
import { DEFAULT_COLLAPSED_CONTEXT_THRESHOLD, DEFAULT_THEMES } from "../constants.js";
|
|
2
2
|
import { getFiletypeFromFileName } from "./getFiletypeFromFileName.js";
|
|
3
3
|
import { cleanLastNewline } from "./cleanLastNewline.js";
|
|
4
4
|
import { createTransformerWithState } from "./createTransformerWithState.js";
|
|
@@ -11,7 +11,7 @@ import { diffChars, diffWordsWithSpace } from "diff";
|
|
|
11
11
|
|
|
12
12
|
//#region src/utils/renderDiffWithHighlighter.ts
|
|
13
13
|
const DEFAULT_PLAIN_TEXT_OPTIONS = { forcePlainText: false };
|
|
14
|
-
function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText, startingLine, totalLines, expandedHunks } = DEFAULT_PLAIN_TEXT_OPTIONS) {
|
|
14
|
+
function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText, startingLine, totalLines, expandedHunks, collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD } = DEFAULT_PLAIN_TEXT_OPTIONS) {
|
|
15
15
|
if (forcePlainText) {
|
|
16
16
|
startingLine ??= 0;
|
|
17
17
|
totalLines ??= Infinity;
|
|
@@ -63,6 +63,7 @@ function renderDiffWithHighlighter(diff, highlighter, options, { forcePlainText,
|
|
|
63
63
|
startingLine,
|
|
64
64
|
totalLines,
|
|
65
65
|
expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,
|
|
66
|
+
collapsedContextThreshold,
|
|
66
67
|
callback: ({ hunkIndex, additionLineIndex, deletionLineIndex, additionLineNumber, deletionLineNumber, unifiedAdditionLineIndex, unifiedDeletionLineIndex, splitLineIndex, type }) => {
|
|
67
68
|
const bucket = getBucketForHunk(hunkIndex);
|
|
68
69
|
if (type === "change" && lineDiffType !== "none" && additionLineIndex != null && deletionLineIndex != null) computeLineDiffDecorations({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderDiffWithHighlighter.js","names":["DEFAULT_PLAIN_TEXT_OPTIONS: ForcePlainTextOptions","code: RenderDiffFilesResult","deletionSpans: [0 | 1, string][]","additionSpans: [0 | 1, string][]","hastConfig: CodeToHastOptions<DiffsThemeNames>"],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":["import { diffChars, diffWordsWithSpace } from 'diff';\n\nimport { DEFAULT_THEMES } from '../constants';\nimport type {\n CodeToHastOptions,\n DecorationItem,\n DiffsHighlighter,\n DiffsThemeNames,\n FileContents,\n FileDiffMetadata,\n ForcePlainTextOptions,\n LineDiffTypes,\n LineInfo,\n RenderDiffFilesResult,\n RenderDiffOptions,\n SupportedLanguages,\n ThemedDiffResult,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\nimport { iterateOverDiff } from './iterateOverDiff';\nimport {\n createDiffSpanDecoration,\n pushOrJoinSpan,\n} from './parseDiffDecorations';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForcePlainTextOptions = {\n forcePlainText: false,\n};\n\nexport function renderDiffWithHighlighter(\n diff: FileDiffMetadata,\n highlighter: DiffsHighlighter,\n options: RenderDiffOptions,\n {\n forcePlainText,\n startingLine,\n totalLines,\n expandedHunks,\n }: ForcePlainTextOptions = DEFAULT_PLAIN_TEXT_OPTIONS\n): ThemedDiffResult {\n if (forcePlainText) {\n startingLine ??= 0;\n totalLines ??= Infinity;\n } else {\n // If we aren't forcing plain text, then we intentionally do not support\n // ranges for highlighting as that could break the syntax highlighting, we\n // we override any values that may have been passed in. Maybe one day we\n // warn about this?\n startingLine = 0;\n totalLines = Infinity;\n }\n const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;\n const baseThemeType = (() => {\n const theme = options.theme ?? DEFAULT_THEMES;\n if (typeof theme === 'string') {\n return highlighter.getTheme(theme).type;\n }\n return undefined;\n })();\n const themeStyles = getHighlighterThemeStyles({\n theme: options.theme,\n highlighter,\n });\n\n // If we have a large file and we are rendering the WHOLE plain diff ast,\n // then we should remove the lineDiffType to make sure things render quickly.\n // For highlighted ASTs or windowed highlights, we should just inherit the\n // setting\n const lineDiffType =\n forcePlainText &&\n !isWindowedHighlight &&\n (diff.unifiedLineCount > 1000 || diff.splitLineCount > 1000)\n ? 'none'\n : options.lineDiffType;\n\n const code: RenderDiffFilesResult = {\n deletionLines: [],\n additionLines: [],\n };\n\n const shouldGroupAll = !forcePlainText && !diff.isPartial;\n const expandedHunksForIteration = forcePlainText ? expandedHunks : undefined;\n const buckets = new Map<number, RenderBucket>();\n function getBucketForHunk(hunkIndex: number) {\n const index = shouldGroupAll ? 0 : hunkIndex;\n const bucket = buckets.get(index) ?? createBucket();\n buckets.set(index, bucket);\n return bucket;\n }\n\n function appendContent(\n lineContent: string,\n lineIndex: number,\n segments: HighlightSegment[],\n contentWrapper: FakeArrayType\n ) {\n if (isWindowedHighlight) {\n let segment = segments.at(-1);\n if (\n segment == null ||\n segment.targetIndex + segment.count !== lineIndex\n ) {\n segment = {\n targetIndex: lineIndex,\n originalOffset: contentWrapper.length,\n count: 0,\n };\n segments.push(segment);\n }\n segment.count++;\n }\n contentWrapper.push(lineContent);\n }\n\n iterateOverDiff({\n diff,\n diffStyle: 'both',\n startingLine,\n totalLines,\n expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,\n callback: ({\n hunkIndex,\n additionLineIndex,\n deletionLineIndex,\n additionLineNumber,\n deletionLineNumber,\n unifiedAdditionLineIndex,\n unifiedDeletionLineIndex,\n splitLineIndex,\n type,\n }) => {\n const bucket = getBucketForHunk(hunkIndex);\n\n if (\n type === 'change' &&\n lineDiffType !== 'none' &&\n additionLineIndex != null &&\n deletionLineIndex != null\n ) {\n computeLineDiffDecorations({\n additionLine: diff.additionLines[additionLineIndex],\n deletionLine: diff.deletionLines[deletionLineIndex],\n deletionLineIndex: bucket.deletionContent.length,\n additionLineIndex: bucket.additionContent.length,\n deletionDecorations: bucket.deletionDecorations,\n additionDecorations: bucket.additionDecorations,\n lineDiffType,\n });\n }\n\n if (\n deletionLineIndex != null &&\n deletionLineNumber != null &&\n unifiedDeletionLineIndex != null\n ) {\n appendContent(\n diff.deletionLines[deletionLineIndex],\n deletionLineIndex,\n bucket.deletionSegments,\n bucket.deletionContent\n );\n bucket.deletionInfo.push({\n type: type === 'change' ? 'change-deletion' : type,\n lineNumber: deletionLineNumber,\n altLineNumber:\n type === 'change' ? undefined : (additionLineNumber ?? undefined),\n lineIndex: `${unifiedDeletionLineIndex},${splitLineIndex}`,\n });\n }\n\n if (\n additionLineIndex != null &&\n additionLineNumber != null &&\n unifiedAdditionLineIndex != null\n ) {\n appendContent(\n diff.additionLines[additionLineIndex],\n additionLineIndex,\n bucket.additionSegments,\n bucket.additionContent\n );\n bucket.additionInfo.push({\n type: type === 'change' ? 'change-addition' : type,\n lineNumber: additionLineNumber,\n altLineNumber:\n type === 'change' ? undefined : (deletionLineNumber ?? undefined),\n lineIndex: `${unifiedAdditionLineIndex},${splitLineIndex}`,\n });\n }\n },\n });\n\n for (const bucket of buckets.values()) {\n if (\n bucket.deletionContent.length === 0 &&\n bucket.additionContent.length === 0\n ) {\n continue;\n }\n\n const deletionFile = {\n name: diff.prevName ?? diff.name,\n contents: bucket.deletionContent.value,\n };\n const additionFile = {\n name: diff.name,\n contents: bucket.additionContent.value,\n };\n const { deletionLines, additionLines } = renderTwoFiles({\n deletionFile,\n deletionInfo: bucket.deletionInfo,\n deletionDecorations: bucket.deletionDecorations,\n\n additionFile,\n additionInfo: bucket.additionInfo,\n additionDecorations: bucket.additionDecorations,\n\n highlighter,\n options,\n languageOverride: forcePlainText ? 'text' : diff.lang,\n });\n\n if (shouldGroupAll) {\n code.deletionLines = deletionLines;\n code.additionLines = additionLines;\n continue;\n }\n\n if (bucket.deletionSegments.length > 0) {\n for (const seg of bucket.deletionSegments) {\n for (let i = 0; i < seg.count; i++) {\n code.deletionLines[seg.targetIndex + i] =\n deletionLines[seg.originalOffset + i];\n }\n }\n } else {\n code.deletionLines.push(...deletionLines);\n }\n if (bucket.additionSegments.length > 0) {\n for (const seg of bucket.additionSegments) {\n for (let i = 0; i < seg.count; i++) {\n code.additionLines[seg.targetIndex + i] =\n additionLines[seg.originalOffset + i];\n }\n }\n } else {\n code.additionLines.push(...additionLines);\n }\n }\n\n return { code, themeStyles, baseThemeType };\n}\n\ninterface ProcessLineDiffProps {\n deletionLine: string | undefined;\n additionLine: string | undefined;\n deletionLineIndex: number;\n additionLineIndex: number;\n deletionDecorations: DecorationItem[];\n additionDecorations: DecorationItem[];\n lineDiffType: LineDiffTypes;\n}\n\nfunction computeLineDiffDecorations({\n deletionLine,\n additionLine,\n deletionLineIndex,\n additionLineIndex,\n deletionDecorations,\n additionDecorations,\n lineDiffType,\n}: ProcessLineDiffProps) {\n if (deletionLine == null || additionLine == null || lineDiffType === 'none') {\n return;\n }\n deletionLine = cleanLastNewline(deletionLine);\n additionLine = cleanLastNewline(additionLine);\n // NOTE(amadeus): Because we visually trim trailing newlines when rendering,\n // we also gotta make sure the diff parsing doesn't include the newline\n // character that could be there...\n const lineDiff =\n lineDiffType === 'char'\n ? diffChars(deletionLine, additionLine)\n : diffWordsWithSpace(deletionLine, additionLine);\n const deletionSpans: [0 | 1, string][] = [];\n const additionSpans: [0 | 1, string][] = [];\n const enableJoin = lineDiffType === 'word-alt';\n const lastItem = lineDiff.at(-1);\n for (const item of lineDiff) {\n const isLastItem = item === lastItem;\n if (!item.added && !item.removed) {\n pushOrJoinSpan({\n item,\n arr: deletionSpans,\n enableJoin,\n isNeutral: true,\n isLastItem,\n });\n pushOrJoinSpan({\n item,\n arr: additionSpans,\n enableJoin,\n isNeutral: true,\n isLastItem,\n });\n } else if (item.removed) {\n pushOrJoinSpan({ item, arr: deletionSpans, enableJoin, isLastItem });\n } else {\n pushOrJoinSpan({ item, arr: additionSpans, enableJoin, isLastItem });\n }\n }\n let spanIndex = 0;\n for (const span of deletionSpans) {\n if (span[0] === 1) {\n deletionDecorations.push(\n createDiffSpanDecoration({\n line: deletionLineIndex,\n spanStart: spanIndex,\n spanLength: span[1].length,\n })\n );\n }\n spanIndex += span[1].length;\n }\n spanIndex = 0;\n for (const span of additionSpans) {\n if (span[0] === 1) {\n additionDecorations.push(\n createDiffSpanDecoration({\n line: additionLineIndex,\n spanStart: spanIndex,\n spanLength: span[1].length,\n })\n );\n }\n spanIndex += span[1].length;\n }\n}\n\ninterface HighlightSegment {\n // The where the highlighted region starts\n originalOffset: number;\n // Where to place the highlighted line in RenderDiffFilesResult\n targetIndex: number;\n // Number of highlighted lines\n count: number;\n}\n\ninterface FakeArrayType {\n push(value: string): void;\n value: string;\n length: number;\n}\n\ninterface RenderBucket {\n deletionContent: FakeArrayType;\n additionContent: FakeArrayType;\n deletionInfo: (LineInfo | undefined)[];\n additionInfo: (LineInfo | undefined)[];\n deletionDecorations: DecorationItem[];\n additionDecorations: DecorationItem[];\n deletionSegments: HighlightSegment[];\n additionSegments: HighlightSegment[];\n}\n\nfunction createBucket(): RenderBucket {\n return {\n deletionContent: {\n push(value: string) {\n this.value += value;\n this.length++;\n },\n value: '',\n length: 0,\n },\n additionContent: {\n push(value: string) {\n this.value += value;\n this.length++;\n },\n value: '',\n length: 0,\n },\n deletionInfo: [],\n additionInfo: [],\n deletionDecorations: [],\n additionDecorations: [],\n deletionSegments: [],\n additionSegments: [],\n };\n}\n\ninterface RenderTwoFilesProps {\n deletionFile: FileContents;\n additionFile: FileContents;\n deletionInfo: (LineInfo | undefined)[];\n additionInfo: (LineInfo | undefined)[];\n deletionDecorations: DecorationItem[];\n additionDecorations: DecorationItem[];\n options: RenderDiffOptions;\n highlighter: DiffsHighlighter;\n languageOverride: SupportedLanguages | undefined;\n}\n\nfunction renderTwoFiles({\n deletionFile,\n additionFile,\n deletionInfo,\n additionInfo,\n highlighter,\n deletionDecorations,\n additionDecorations,\n languageOverride,\n options: { theme: themeOrThemes = DEFAULT_THEMES, ...options },\n}: RenderTwoFilesProps): RenderDiffFilesResult {\n const deletionLang =\n languageOverride ?? getFiletypeFromFileName(deletionFile.name);\n const additionLang =\n languageOverride ?? getFiletypeFromFileName(additionFile.name);\n const { state, transformers } = createTransformerWithState();\n const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n return typeof themeOrThemes === 'string'\n ? {\n ...options,\n // language will be overwritten for each highlight\n lang: 'text',\n theme: themeOrThemes,\n transformers,\n decorations: undefined,\n defaultColor: false,\n cssVariablePrefix: formatCSSVariablePrefix('token'),\n }\n : {\n ...options,\n // language will be overwritten for each highlight\n lang: 'text',\n themes: themeOrThemes,\n transformers,\n decorations: undefined,\n defaultColor: false,\n cssVariablePrefix: formatCSSVariablePrefix('token'),\n };\n })();\n\n const deletionLines = (() => {\n if (deletionFile.contents === '') {\n return [];\n }\n hastConfig.lang = deletionLang;\n state.lineInfo = deletionInfo;\n hastConfig.decorations = deletionDecorations;\n return getLineNodes(\n highlighter.codeToHast(\n cleanLastNewline(deletionFile.contents),\n hastConfig\n )\n );\n })();\n const additionLines = (() => {\n if (additionFile.contents === '') {\n return [];\n }\n hastConfig.lang = additionLang;\n hastConfig.decorations = additionDecorations;\n state.lineInfo = additionInfo;\n return getLineNodes(\n highlighter.codeToHast(\n cleanLastNewline(additionFile.contents),\n hastConfig\n )\n );\n })();\n\n return { deletionLines, additionLines };\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"renderDiffWithHighlighter.js","names":["DEFAULT_PLAIN_TEXT_OPTIONS: ForcePlainTextOptions","code: RenderDiffFilesResult","deletionSpans: [0 | 1, string][]","additionSpans: [0 | 1, string][]","hastConfig: CodeToHastOptions<DiffsThemeNames>"],"sources":["../../src/utils/renderDiffWithHighlighter.ts"],"sourcesContent":["import { diffChars, diffWordsWithSpace } from 'diff';\n\nimport {\n DEFAULT_COLLAPSED_CONTEXT_THRESHOLD,\n DEFAULT_THEMES,\n} from '../constants';\nimport type {\n CodeToHastOptions,\n DecorationItem,\n DiffsHighlighter,\n DiffsThemeNames,\n FileContents,\n FileDiffMetadata,\n ForcePlainTextOptions,\n LineDiffTypes,\n LineInfo,\n RenderDiffFilesResult,\n RenderDiffOptions,\n SupportedLanguages,\n ThemedDiffResult,\n} from '../types';\nimport { cleanLastNewline } from './cleanLastNewline';\nimport { createTransformerWithState } from './createTransformerWithState';\nimport { formatCSSVariablePrefix } from './formatCSSVariablePrefix';\nimport { getFiletypeFromFileName } from './getFiletypeFromFileName';\nimport { getHighlighterThemeStyles } from './getHighlighterThemeStyles';\nimport { getLineNodes } from './getLineNodes';\nimport { iterateOverDiff } from './iterateOverDiff';\nimport {\n createDiffSpanDecoration,\n pushOrJoinSpan,\n} from './parseDiffDecorations';\n\nconst DEFAULT_PLAIN_TEXT_OPTIONS: ForcePlainTextOptions = {\n forcePlainText: false,\n};\n\nexport function renderDiffWithHighlighter(\n diff: FileDiffMetadata,\n highlighter: DiffsHighlighter,\n options: RenderDiffOptions,\n {\n forcePlainText,\n startingLine,\n totalLines,\n expandedHunks,\n collapsedContextThreshold = DEFAULT_COLLAPSED_CONTEXT_THRESHOLD,\n }: ForcePlainTextOptions = DEFAULT_PLAIN_TEXT_OPTIONS\n): ThemedDiffResult {\n if (forcePlainText) {\n startingLine ??= 0;\n totalLines ??= Infinity;\n } else {\n // If we aren't forcing plain text, then we intentionally do not support\n // ranges for highlighting as that could break the syntax highlighting, we\n // we override any values that may have been passed in. Maybe one day we\n // warn about this?\n startingLine = 0;\n totalLines = Infinity;\n }\n const isWindowedHighlight = startingLine > 0 || totalLines < Infinity;\n const baseThemeType = (() => {\n const theme = options.theme ?? DEFAULT_THEMES;\n if (typeof theme === 'string') {\n return highlighter.getTheme(theme).type;\n }\n return undefined;\n })();\n const themeStyles = getHighlighterThemeStyles({\n theme: options.theme,\n highlighter,\n });\n\n // If we have a large file and we are rendering the WHOLE plain diff ast,\n // then we should remove the lineDiffType to make sure things render quickly.\n // For highlighted ASTs or windowed highlights, we should just inherit the\n // setting\n const lineDiffType =\n forcePlainText &&\n !isWindowedHighlight &&\n (diff.unifiedLineCount > 1000 || diff.splitLineCount > 1000)\n ? 'none'\n : options.lineDiffType;\n\n const code: RenderDiffFilesResult = {\n deletionLines: [],\n additionLines: [],\n };\n\n const shouldGroupAll = !forcePlainText && !diff.isPartial;\n const expandedHunksForIteration = forcePlainText ? expandedHunks : undefined;\n const buckets = new Map<number, RenderBucket>();\n function getBucketForHunk(hunkIndex: number) {\n const index = shouldGroupAll ? 0 : hunkIndex;\n const bucket = buckets.get(index) ?? createBucket();\n buckets.set(index, bucket);\n return bucket;\n }\n\n function appendContent(\n lineContent: string,\n lineIndex: number,\n segments: HighlightSegment[],\n contentWrapper: FakeArrayType\n ) {\n if (isWindowedHighlight) {\n let segment = segments.at(-1);\n if (\n segment == null ||\n segment.targetIndex + segment.count !== lineIndex\n ) {\n segment = {\n targetIndex: lineIndex,\n originalOffset: contentWrapper.length,\n count: 0,\n };\n segments.push(segment);\n }\n segment.count++;\n }\n contentWrapper.push(lineContent);\n }\n\n iterateOverDiff({\n diff,\n diffStyle: 'both',\n startingLine,\n totalLines,\n expandedHunks: isWindowedHighlight ? expandedHunksForIteration : true,\n collapsedContextThreshold,\n callback: ({\n hunkIndex,\n additionLineIndex,\n deletionLineIndex,\n additionLineNumber,\n deletionLineNumber,\n unifiedAdditionLineIndex,\n unifiedDeletionLineIndex,\n splitLineIndex,\n type,\n }) => {\n const bucket = getBucketForHunk(hunkIndex);\n\n if (\n type === 'change' &&\n lineDiffType !== 'none' &&\n additionLineIndex != null &&\n deletionLineIndex != null\n ) {\n computeLineDiffDecorations({\n additionLine: diff.additionLines[additionLineIndex],\n deletionLine: diff.deletionLines[deletionLineIndex],\n deletionLineIndex: bucket.deletionContent.length,\n additionLineIndex: bucket.additionContent.length,\n deletionDecorations: bucket.deletionDecorations,\n additionDecorations: bucket.additionDecorations,\n lineDiffType,\n });\n }\n\n if (\n deletionLineIndex != null &&\n deletionLineNumber != null &&\n unifiedDeletionLineIndex != null\n ) {\n appendContent(\n diff.deletionLines[deletionLineIndex],\n deletionLineIndex,\n bucket.deletionSegments,\n bucket.deletionContent\n );\n bucket.deletionInfo.push({\n type: type === 'change' ? 'change-deletion' : type,\n lineNumber: deletionLineNumber,\n altLineNumber:\n type === 'change' ? undefined : (additionLineNumber ?? undefined),\n lineIndex: `${unifiedDeletionLineIndex},${splitLineIndex}`,\n });\n }\n\n if (\n additionLineIndex != null &&\n additionLineNumber != null &&\n unifiedAdditionLineIndex != null\n ) {\n appendContent(\n diff.additionLines[additionLineIndex],\n additionLineIndex,\n bucket.additionSegments,\n bucket.additionContent\n );\n bucket.additionInfo.push({\n type: type === 'change' ? 'change-addition' : type,\n lineNumber: additionLineNumber,\n altLineNumber:\n type === 'change' ? undefined : (deletionLineNumber ?? undefined),\n lineIndex: `${unifiedAdditionLineIndex},${splitLineIndex}`,\n });\n }\n },\n });\n\n for (const bucket of buckets.values()) {\n if (\n bucket.deletionContent.length === 0 &&\n bucket.additionContent.length === 0\n ) {\n continue;\n }\n\n const deletionFile = {\n name: diff.prevName ?? diff.name,\n contents: bucket.deletionContent.value,\n };\n const additionFile = {\n name: diff.name,\n contents: bucket.additionContent.value,\n };\n const { deletionLines, additionLines } = renderTwoFiles({\n deletionFile,\n deletionInfo: bucket.deletionInfo,\n deletionDecorations: bucket.deletionDecorations,\n\n additionFile,\n additionInfo: bucket.additionInfo,\n additionDecorations: bucket.additionDecorations,\n\n highlighter,\n options,\n languageOverride: forcePlainText ? 'text' : diff.lang,\n });\n\n if (shouldGroupAll) {\n code.deletionLines = deletionLines;\n code.additionLines = additionLines;\n continue;\n }\n\n if (bucket.deletionSegments.length > 0) {\n for (const seg of bucket.deletionSegments) {\n for (let i = 0; i < seg.count; i++) {\n code.deletionLines[seg.targetIndex + i] =\n deletionLines[seg.originalOffset + i];\n }\n }\n } else {\n code.deletionLines.push(...deletionLines);\n }\n if (bucket.additionSegments.length > 0) {\n for (const seg of bucket.additionSegments) {\n for (let i = 0; i < seg.count; i++) {\n code.additionLines[seg.targetIndex + i] =\n additionLines[seg.originalOffset + i];\n }\n }\n } else {\n code.additionLines.push(...additionLines);\n }\n }\n\n return { code, themeStyles, baseThemeType };\n}\n\ninterface ProcessLineDiffProps {\n deletionLine: string | undefined;\n additionLine: string | undefined;\n deletionLineIndex: number;\n additionLineIndex: number;\n deletionDecorations: DecorationItem[];\n additionDecorations: DecorationItem[];\n lineDiffType: LineDiffTypes;\n}\n\nfunction computeLineDiffDecorations({\n deletionLine,\n additionLine,\n deletionLineIndex,\n additionLineIndex,\n deletionDecorations,\n additionDecorations,\n lineDiffType,\n}: ProcessLineDiffProps) {\n if (deletionLine == null || additionLine == null || lineDiffType === 'none') {\n return;\n }\n deletionLine = cleanLastNewline(deletionLine);\n additionLine = cleanLastNewline(additionLine);\n // NOTE(amadeus): Because we visually trim trailing newlines when rendering,\n // we also gotta make sure the diff parsing doesn't include the newline\n // character that could be there...\n const lineDiff =\n lineDiffType === 'char'\n ? diffChars(deletionLine, additionLine)\n : diffWordsWithSpace(deletionLine, additionLine);\n const deletionSpans: [0 | 1, string][] = [];\n const additionSpans: [0 | 1, string][] = [];\n const enableJoin = lineDiffType === 'word-alt';\n const lastItem = lineDiff.at(-1);\n for (const item of lineDiff) {\n const isLastItem = item === lastItem;\n if (!item.added && !item.removed) {\n pushOrJoinSpan({\n item,\n arr: deletionSpans,\n enableJoin,\n isNeutral: true,\n isLastItem,\n });\n pushOrJoinSpan({\n item,\n arr: additionSpans,\n enableJoin,\n isNeutral: true,\n isLastItem,\n });\n } else if (item.removed) {\n pushOrJoinSpan({ item, arr: deletionSpans, enableJoin, isLastItem });\n } else {\n pushOrJoinSpan({ item, arr: additionSpans, enableJoin, isLastItem });\n }\n }\n let spanIndex = 0;\n for (const span of deletionSpans) {\n if (span[0] === 1) {\n deletionDecorations.push(\n createDiffSpanDecoration({\n line: deletionLineIndex,\n spanStart: spanIndex,\n spanLength: span[1].length,\n })\n );\n }\n spanIndex += span[1].length;\n }\n spanIndex = 0;\n for (const span of additionSpans) {\n if (span[0] === 1) {\n additionDecorations.push(\n createDiffSpanDecoration({\n line: additionLineIndex,\n spanStart: spanIndex,\n spanLength: span[1].length,\n })\n );\n }\n spanIndex += span[1].length;\n }\n}\n\ninterface HighlightSegment {\n // The where the highlighted region starts\n originalOffset: number;\n // Where to place the highlighted line in RenderDiffFilesResult\n targetIndex: number;\n // Number of highlighted lines\n count: number;\n}\n\ninterface FakeArrayType {\n push(value: string): void;\n value: string;\n length: number;\n}\n\ninterface RenderBucket {\n deletionContent: FakeArrayType;\n additionContent: FakeArrayType;\n deletionInfo: (LineInfo | undefined)[];\n additionInfo: (LineInfo | undefined)[];\n deletionDecorations: DecorationItem[];\n additionDecorations: DecorationItem[];\n deletionSegments: HighlightSegment[];\n additionSegments: HighlightSegment[];\n}\n\nfunction createBucket(): RenderBucket {\n return {\n deletionContent: {\n push(value: string) {\n this.value += value;\n this.length++;\n },\n value: '',\n length: 0,\n },\n additionContent: {\n push(value: string) {\n this.value += value;\n this.length++;\n },\n value: '',\n length: 0,\n },\n deletionInfo: [],\n additionInfo: [],\n deletionDecorations: [],\n additionDecorations: [],\n deletionSegments: [],\n additionSegments: [],\n };\n}\n\ninterface RenderTwoFilesProps {\n deletionFile: FileContents;\n additionFile: FileContents;\n deletionInfo: (LineInfo | undefined)[];\n additionInfo: (LineInfo | undefined)[];\n deletionDecorations: DecorationItem[];\n additionDecorations: DecorationItem[];\n options: RenderDiffOptions;\n highlighter: DiffsHighlighter;\n languageOverride: SupportedLanguages | undefined;\n}\n\nfunction renderTwoFiles({\n deletionFile,\n additionFile,\n deletionInfo,\n additionInfo,\n highlighter,\n deletionDecorations,\n additionDecorations,\n languageOverride,\n options: { theme: themeOrThemes = DEFAULT_THEMES, ...options },\n}: RenderTwoFilesProps): RenderDiffFilesResult {\n const deletionLang =\n languageOverride ?? getFiletypeFromFileName(deletionFile.name);\n const additionLang =\n languageOverride ?? getFiletypeFromFileName(additionFile.name);\n const { state, transformers } = createTransformerWithState();\n const hastConfig: CodeToHastOptions<DiffsThemeNames> = (() => {\n return typeof themeOrThemes === 'string'\n ? {\n ...options,\n // language will be overwritten for each highlight\n lang: 'text',\n theme: themeOrThemes,\n transformers,\n decorations: undefined,\n defaultColor: false,\n cssVariablePrefix: formatCSSVariablePrefix('token'),\n }\n : {\n ...options,\n // language will be overwritten for each highlight\n lang: 'text',\n themes: themeOrThemes,\n transformers,\n decorations: undefined,\n defaultColor: false,\n cssVariablePrefix: formatCSSVariablePrefix('token'),\n };\n })();\n\n const deletionLines = (() => {\n if (deletionFile.contents === '') {\n return [];\n }\n hastConfig.lang = deletionLang;\n state.lineInfo = deletionInfo;\n hastConfig.decorations = deletionDecorations;\n return getLineNodes(\n highlighter.codeToHast(\n cleanLastNewline(deletionFile.contents),\n hastConfig\n )\n );\n })();\n const additionLines = (() => {\n if (additionFile.contents === '') {\n return [];\n }\n hastConfig.lang = additionLang;\n hastConfig.decorations = additionDecorations;\n state.lineInfo = additionInfo;\n return getLineNodes(\n highlighter.codeToHast(\n cleanLastNewline(additionFile.contents),\n hastConfig\n )\n );\n })();\n\n return { deletionLines, additionLines };\n}\n"],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { FileContents, FileDiffMetadata, SupportedLanguages } from "../types.js";
|
|
2
2
|
|
|
3
3
|
//#region src/utils/setLanguageOverride.d.ts
|
|
4
|
-
declare function setLanguageOverride
|
|
4
|
+
declare function setLanguageOverride(fileOrDiff: FileContents, lang: SupportedLanguages): FileContents;
|
|
5
|
+
declare function setLanguageOverride(fileOrDiff: FileDiffMetadata, lang: SupportedLanguages): FileDiffMetadata;
|
|
5
6
|
//#endregion
|
|
6
7
|
export { setLanguageOverride };
|
|
7
8
|
//# sourceMappingURL=setLanguageOverride.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLanguageOverride.d.ts","names":[],"sources":["../../src/utils/setLanguageOverride.ts"],"sourcesContent":[],"mappings":";;;iBAMgB,
|
|
1
|
+
{"version":3,"file":"setLanguageOverride.d.ts","names":[],"sources":["../../src/utils/setLanguageOverride.ts"],"sourcesContent":[],"mappings":";;;iBAMgB,mBAAA,aACF,oBACN,qBACL;iBACa,mBAAA,aACF,wBACN,qBACL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setLanguageOverride.js","names":[],"sources":["../../src/utils/setLanguageOverride.ts"],"sourcesContent":["import type {\n FileContents,\n FileDiffMetadata,\n SupportedLanguages,\n} from '../types';\n\nexport function setLanguageOverride
|
|
1
|
+
{"version":3,"file":"setLanguageOverride.js","names":[],"sources":["../../src/utils/setLanguageOverride.ts"],"sourcesContent":["import type {\n FileContents,\n FileDiffMetadata,\n SupportedLanguages,\n} from '../types';\n\nexport function setLanguageOverride(\n fileOrDiff: FileContents,\n lang: SupportedLanguages\n): FileContents;\nexport function setLanguageOverride(\n fileOrDiff: FileDiffMetadata,\n lang: SupportedLanguages\n): FileDiffMetadata;\nexport function setLanguageOverride(\n fileOrDiff: FileContents | FileDiffMetadata,\n lang: SupportedLanguages\n): FileContents | FileDiffMetadata {\n return { ...fileOrDiff, lang };\n}\n"],"mappings":";AAcA,SAAgB,oBACd,YACA,MACiC;AACjC,QAAO;EAAE,GAAG;EAAY;EAAM"}
|
|
@@ -59,7 +59,7 @@ declare class WorkerPoolManager {
|
|
|
59
59
|
highlightFileAST(instance: FileRendererInstance, file: FileContents): void;
|
|
60
60
|
getPlainFileAST(file: FileContents): ThemedFileResult | undefined;
|
|
61
61
|
highlightDiffAST(instance: DiffRendererInstance, diff: FileDiffMetadata): void;
|
|
62
|
-
getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true): ThemedDiffResult | undefined;
|
|
62
|
+
getPlainDiffAST(diff: FileDiffMetadata, startingLine: number, totalLines: number, expandedHunks?: Map<number, HunkExpansionRegion> | true, collapsedContextThreshold?: number): ThemedDiffResult | undefined;
|
|
63
63
|
terminate(): void;
|
|
64
64
|
private terminateWorkers;
|
|
65
65
|
getStats(): WorkerStats;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkerPoolManager.d.ts","names":["options: WorkerPoolOptions"],"sources":["../../src/worker/WorkerPoolManager.ts"],"sourcesContent":[],"mappings":";;;;;UAqDU,eAAA;aACG,SAAA,CAAU,eAAe;EAL/B,SAIG,EAEG,SAAA,CAAU,MAFb,CAAA,MAAA,EAE4B,gBAF5B,CAAA;;UAYA,eAAA,CAXa;EACe,QAAA,EAAA,EAAA,IAAA;;AAAf,cAcV,iBAAA,CAdU;EAAA,QAUb,OAAA;EAIV,QAAa,WAAA;EAoBQ,QAAA,aAAA;EAEf,QAAA,WAAA;EACA,QAAA,OAAA;EACA,QAAA,SAAA;EACA,QAAA,YAAA;EACC,QAAA,aAAA;EAYoB,QAAA,gBAAA;EAAe,QAAA,aAAA;EAMf,QAAA,kBAAA;EAAmB,QAAA,eAAA;EAM3B,QAAA,SAAA;EAsBf,QAAA,SAAA;EACA,QAAA,gBAAA;EACA,WAAA,CAAA,OAAA,EAtDiB,iBAsDjB,EAAA;IAAA,KAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAhDG,iCAgDH;EACS,aAAA,CAAA,CAAA,EAAA,OAAA;EAAR,kBAAA,CAAA,IAAA,EArCsB,YAqCtB,CAAA,EArCqC,gBAqCrC,GAAA,SAAA;EAAkC,kBAAA,CAAA,IAAA,EA/BZ,gBA+BY,CAAA,EA/BO,gBA+BP,GAAA,SAAA;EAoDb,aAAA,CAAA,CAAA,EA7EP,eA6EO;EAKA,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAiDU,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EASE,gBAAA,CAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAnHjC,OAmHiC,CAnHzB,sBAmHyB,CAAA,CAAA,EAnHC,OAmHD,CAAA,IAAA,CAAA;EAMhB,oBAAA,CAAA,CAAA,EArEI,iBAqEJ;EA0BR,oBAAA,CAAA,CAAA,EA1FY,iBA0FZ;EAAuB,QAAA,yBAAA;EAoBP,uBAAA,CAAA,QAAA,EA7DM,eA6DN,CAAA,EAAA,GAAA,GAAA,IAAA;EAA4B,yBAAA,CAAA,QAAA,EApDpB,eAoDoB,CAAA,EAAA,IAAA;EAoI7B,sBAAA,CAAA,QAAA,EAAA,CAAA,KAAA,EAlLP,WAkLO,EAAA,GAAA,OAAA,CAAA,EAAA,GAAA,GAAA,IAAA;EAA4B,QAAA,0BAAA;EAoBjC,QAAA,sBAAA;EAAe,mBAAA,CAAA,QAAA,EA5KzB,oBA4KyB,GA5KF,oBA4KE,CAAA,EAAA,IAAA;EAczB,aAAA,CAAA,CAAA,EAAA,OAAA;EACJ,UAAA,CAAA,SAAA,CAAA,EAvKoB,kBAuKpB,EAAA,CAAA,EAvKgD,OAuKhD,CAAA,IAAA,CAAA;EAsBA,QAAA,iBAAA;EAGsB,QAAA,UAAA;EAAZ,gBAAA,CAAA,QAAA,EA5DS,oBA4DT,EAAA,IAAA,EA5DqC,YA4DrC,CAAA,EAAA,IAAA;
|
|
1
|
+
{"version":3,"file":"WorkerPoolManager.d.ts","names":["options: WorkerPoolOptions"],"sources":["../../src/worker/WorkerPoolManager.ts"],"sourcesContent":[],"mappings":";;;;;UAqDU,eAAA;aACG,SAAA,CAAU,eAAe;EAL/B,SAIG,EAEG,SAAA,CAAU,MAFb,CAAA,MAAA,EAE4B,gBAF5B,CAAA;;UAYA,eAAA,CAXa;EACe,QAAA,EAAA,EAAA,IAAA;;AAAf,cAcV,iBAAA,CAdU;EAAA,QAUb,OAAA;EAIV,QAAa,WAAA;EAoBQ,QAAA,aAAA;EAEf,QAAA,WAAA;EACA,QAAA,OAAA;EACA,QAAA,SAAA;EACA,QAAA,YAAA;EACC,QAAA,aAAA;EAYoB,QAAA,gBAAA;EAAe,QAAA,aAAA;EAMf,QAAA,kBAAA;EAAmB,QAAA,eAAA;EAM3B,QAAA,SAAA;EAsBf,QAAA,SAAA;EACA,QAAA,gBAAA;EACA,WAAA,CAAA,OAAA,EAtDiB,iBAsDjB,EAAA;IAAA,KAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAhDG,iCAgDH;EACS,aAAA,CAAA,CAAA,EAAA,OAAA;EAAR,kBAAA,CAAA,IAAA,EArCsB,YAqCtB,CAAA,EArCqC,gBAqCrC,GAAA,SAAA;EAAkC,kBAAA,CAAA,IAAA,EA/BZ,gBA+BY,CAAA,EA/BO,gBA+BP,GAAA,SAAA;EAoDb,aAAA,CAAA,CAAA,EA7EP,eA6EO;EAKA,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EAiDU,kBAAA,CAAA,QAAA,EAAA,MAAA,CAAA,EAAA,OAAA;EASE,gBAAA,CAAA;IAAA,KAAA;IAAA,YAAA;IAAA;EAAA,CAAA,EAnHjC,OAmHiC,CAnHzB,sBAmHyB,CAAA,CAAA,EAnHC,OAmHD,CAAA,IAAA,CAAA;EAMhB,oBAAA,CAAA,CAAA,EArEI,iBAqEJ;EA0BR,oBAAA,CAAA,CAAA,EA1FY,iBA0FZ;EAAuB,QAAA,yBAAA;EAoBP,uBAAA,CAAA,QAAA,EA7DM,eA6DN,CAAA,EAAA,GAAA,GAAA,IAAA;EAA4B,yBAAA,CAAA,QAAA,EApDpB,eAoDoB,CAAA,EAAA,IAAA;EAoI7B,sBAAA,CAAA,QAAA,EAAA,CAAA,KAAA,EAlLP,WAkLO,EAAA,GAAA,OAAA,CAAA,EAAA,GAAA,GAAA,IAAA;EAA4B,QAAA,0BAAA;EAoBjC,QAAA,sBAAA;EAAe,mBAAA,CAAA,QAAA,EA5KzB,oBA4KyB,GA5KF,oBA4KE,CAAA,EAAA,IAAA;EAczB,aAAA,CAAA,CAAA,EAAA,OAAA;EACJ,UAAA,CAAA,SAAA,CAAA,EAvKoB,kBAuKpB,EAAA,CAAA,EAvKgD,OAuKhD,CAAA,IAAA,CAAA;EAsBA,QAAA,iBAAA;EAGsB,QAAA,UAAA;EAAZ,gBAAA,CAAA,QAAA,EA5DS,oBA4DT,EAAA,IAAA,EA5DqC,YA4DrC,CAAA,EAAA,IAAA;EAEf,eAAA,CAAA,IAAA,EA1CmB,YA0CnB,CAAA,EA1CkC,gBA0ClC,GAAA,SAAA;EAgCS,gBAAA,CAAA,QAAA,EA5DA,oBA4DA,EAAA,IAAA,EA3DJ,gBA2DI,CAAA,EAAA,IAAA;EAAA,eAAA,CAAA,IAAA,EArCJ,gBAqCI,EAAA,YAAA,EAAA,MAAA,EAAA,UAAA,EAAA,MAAA,EAAA,aAAA,CAAA,EAlCM,GAkCN,CAAA,MAAA,EAlCkB,mBAkClB,CAAA,GAAA,IAAA,EAAA,yBAAA,CAAA,EAAA,MAAA,CAAA,EAhCT,gBAgCS,GAAA,SAAA;;;cAAA"}
|
|
@@ -301,12 +301,13 @@ var WorkerPoolManager = class {
|
|
|
301
301
|
diff
|
|
302
302
|
});
|
|
303
303
|
}
|
|
304
|
-
getPlainDiffAST(diff, startingLine, totalLines, expandedHunks) {
|
|
304
|
+
getPlainDiffAST(diff, startingLine, totalLines, expandedHunks, collapsedContextThreshold) {
|
|
305
305
|
return this.highlighter != null ? renderDiffWithHighlighter(diff, this.highlighter, this.renderOptions, {
|
|
306
306
|
forcePlainText: true,
|
|
307
307
|
startingLine,
|
|
308
308
|
totalLines,
|
|
309
|
-
expandedHunks
|
|
309
|
+
expandedHunks,
|
|
310
|
+
collapsedContextThreshold
|
|
310
311
|
}) : void 0;
|
|
311
312
|
}
|
|
312
313
|
terminate() {
|