Browse Source
Breaks `GitDiffParser` static class into functions
Changes `GitDiff` to `GitDiffFile` and adds new `GitDiff`main
Eric Amodio
1 year ago
9 changed files with 237 additions and 222 deletions
Split View
Diff Options
-
+8 -12src/ai/aiProviderService.ts
-
+33 -31src/env/node/git/localGitProvider.ts
-
+4 -4src/git/gitProvider.ts
-
+4 -4src/git/gitProviderService.ts
-
+8 -5src/git/models/diff.ts
-
+173 -159src/git/parsers/diffParser.ts
-
+1 -1src/hovers/hovers.ts
-
+4 -4src/plus/github/githubGitProvider.ts
-
+2 -2src/trackers/gitDocumentTracker.ts
+ 8
- 12
src/ai/aiProviderService.ts
View File
+ 33
- 31
src/env/node/git/localGitProvider.ts
View File
+ 4
- 4
src/git/gitProvider.ts
View File
+ 4
- 4
src/git/gitProviderService.ts
View File
+ 8
- 5
src/git/models/diff.ts
View File
+ 173
- 159
src/git/parsers/diffParser.ts
View File
| @ -1,190 +1,204 @@ | |||
| import { debug } from '../../system/decorators/log'; | |||
| import { getLines } from '../../system/string'; | |||
| import type { GitDiff, GitDiffHunkLine, GitDiffLine, GitDiffShortStat } from '../models/diff'; | |||
| import { LogLevel } from '../../system/logger.constants'; | |||
| import { maybeStopWatch } from '../../system/stopwatch'; | |||
| import { getLines, pluralize } from '../../system/string'; | |||
| import type { GitDiffFile, GitDiffHunkLine, GitDiffLine, GitDiffShortStat } from '../models/diff'; | |||
| import { GitDiffHunk } from '../models/diff'; | |||
| import type { GitFile, GitFileStatus } from '../models/file'; | |||
| const shortStatDiffRegex = /(\d+)\s+files? changed(?:,\s+(\d+)\s+insertions?\(\+\))?(?:,\s+(\d+)\s+deletions?\(-\))?/; | |||
| const unifiedDiffRegex = /^@@ -([\d]+)(?:,([\d]+))? \+([\d]+)(?:,([\d]+))? @@(?:.*?)\n([\s\S]*?)(?=^@@)/gm; | |||
| // eslint-disable-next-line @typescript-eslint/no-extraneous-class | |||
| export class GitDiffParser { | |||
| @debug({ args: false, singleLine: true }) | |||
| static parse(data: string, includeRawDiff: boolean = false): GitDiff | undefined { | |||
| if (!data) return undefined; | |||
| const hunks: GitDiffHunk[] = []; | |||
| let previousStart; | |||
| let previousCount; | |||
| let currentStart; | |||
| let currentCount; | |||
| let hunk; | |||
| let match; | |||
| do { | |||
| match = unifiedDiffRegex.exec(`${data}\n@@`); | |||
| if (match == null) break; | |||
| [, previousStart, previousCount, currentStart, currentCount, hunk] = match; | |||
| previousCount = Number(previousCount) || 0; | |||
| previousStart = Number(previousStart) || 0; | |||
| currentCount = Number(currentCount) || 0; | |||
| currentStart = Number(currentStart) || 0; | |||
| hunks.push( | |||
| new GitDiffHunk( | |||
| // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 | |||
| ` ${hunk}`.substr(1), | |||
| { | |||
| count: currentCount === 0 ? 1 : currentCount, | |||
| position: { | |||
| start: currentStart, | |||
| end: currentStart + (currentCount > 0 ? currentCount - 1 : 0), | |||
| }, | |||
| export function parseFileDiff(data: string, includeContents: boolean = false): GitDiffFile | undefined { | |||
| if (!data) return undefined; | |||
| const sw = maybeStopWatch('parseFileDiff', { log: false, logLevel: LogLevel.Debug }); | |||
| const hunks: GitDiffHunk[] = []; | |||
| let previousStart; | |||
| let previousCount; | |||
| let currentStart; | |||
| let currentCount; | |||
| let hunk; | |||
| let match; | |||
| do { | |||
| match = unifiedDiffRegex.exec(`${data}\n@@`); | |||
| if (match == null) break; | |||
| [, previousStart, previousCount, currentStart, currentCount, hunk] = match; | |||
| previousCount = Number(previousCount) || 0; | |||
| previousStart = Number(previousStart) || 0; | |||
| currentCount = Number(currentCount) || 0; | |||
| currentStart = Number(currentStart) || 0; | |||
| hunks.push( | |||
| new GitDiffHunk( | |||
| // Stops excessive memory usage -- https://bugs.chromium.org/p/v8/issues/detail?id=2869 | |||
| ` ${hunk}`.substr(1), | |||
| { | |||
| count: currentCount === 0 ? 1 : currentCount, | |||
| position: { | |||
| start: currentStart, | |||
| end: currentStart + (currentCount > 0 ? currentCount - 1 : 0), | |||
| }, | |||
| { | |||
| count: previousCount === 0 ? 1 : previousCount, | |||
| position: { | |||
| start: previousStart, | |||
| end: previousStart + (previousCount > 0 ? previousCount - 1 : 0), | |||
| }, | |||
| }, | |||
| { | |||
| count: previousCount === 0 ? 1 : previousCount, | |||
| position: { | |||
| start: previousStart, | |||
| end: previousStart + (previousCount > 0 ? previousCount - 1 : 0), | |||
| }, | |||
| ), | |||
| ); | |||
| } while (true); | |||
| }, | |||
| ), | |||
| ); | |||
| } while (true); | |||
| if (!hunks.length) return undefined; | |||
| sw?.stop({ suffix: ` parsed ${pluralize('hunk', hunks.length)}` }); | |||
| const diff: GitDiff = { | |||
| diff: includeRawDiff ? data : undefined, | |||
| hunks: hunks, | |||
| }; | |||
| return diff; | |||
| } | |||
| if (!hunks.length) return undefined; | |||
| @debug({ args: false, singleLine: true }) | |||
| static parseHunk(hunk: GitDiffHunk): { lines: GitDiffHunkLine[]; state: 'added' | 'changed' | 'removed' } { | |||
| const currentStart = hunk.current.position.start; | |||
| const previousStart = hunk.previous.position.start; | |||
| const currentLines: (GitDiffLine | undefined)[] = | |||
| currentStart > previousStart | |||
| ? new Array(currentStart - previousStart).fill(undefined, 0, currentStart - previousStart) | |||
| : []; | |||
| const previousLines: (GitDiffLine | undefined)[] = | |||
| previousStart > currentStart | |||
| ? new Array(previousStart - currentStart).fill(undefined, 0, previousStart - currentStart) | |||
| : []; | |||
| let hasAddedOrChanged; | |||
| let hasRemoved; | |||
| let removed = 0; | |||
| for (const l of getLines(hunk.diff)) { | |||
| switch (l[0]) { | |||
| case '+': | |||
| hasAddedOrChanged = true; | |||
| currentLines.push({ | |||
| line: ` ${l.substring(1)}`, | |||
| state: 'added', | |||
| }); | |||
| if (removed > 0) { | |||
| removed--; | |||
| } else { | |||
| previousLines.push(undefined); | |||
| } | |||
| break; | |||
| case '-': | |||
| hasRemoved = true; | |||
| removed++; | |||
| previousLines.push({ | |||
| line: ` ${l.substring(1)}`, | |||
| state: 'removed', | |||
| }); | |||
| break; | |||
| default: | |||
| while (removed > 0) { | |||
| removed--; | |||
| currentLines.push(undefined); | |||
| } | |||
| currentLines.push({ line: l, state: 'unchanged' }); | |||
| previousLines.push({ line: l, state: 'unchanged' }); | |||
| break; | |||
| } | |||
| } | |||
| const diff: GitDiffFile = { | |||
| contents: includeContents ? data : undefined, | |||
| hunks: hunks, | |||
| }; | |||
| return diff; | |||
| } | |||
| while (removed > 0) { | |||
| removed--; | |||
| currentLines.push(undefined); | |||
| export function parseDiffHunk(hunk: GitDiffHunk): { lines: GitDiffHunkLine[]; state: 'added' | 'changed' | 'removed' } { | |||
| const sw = maybeStopWatch('parseDiffHunk', { log: false, logLevel: LogLevel.Debug }); | |||
| const currentStart = hunk.current.position.start; | |||
| const previousStart = hunk.previous.position.start; | |||
| const currentLines: (GitDiffLine | undefined)[] = | |||
| currentStart > previousStart | |||
| ? new Array(currentStart - previousStart).fill(undefined, 0, currentStart - previousStart) | |||
| : []; | |||
| const previousLines: (GitDiffLine | undefined)[] = | |||
| previousStart > currentStart | |||
| ? new Array(previousStart - currentStart).fill(undefined, 0, previousStart - currentStart) | |||
| : []; | |||
| let hasAddedOrChanged; | |||
| let hasRemoved; | |||
| let removed = 0; | |||
| for (const l of getLines(hunk.contents)) { | |||
| switch (l[0]) { | |||
| case '+': | |||
| hasAddedOrChanged = true; | |||
| currentLines.push({ | |||
| line: ` ${l.substring(1)}`, | |||
| state: 'added', | |||
| }); | |||
| if (removed > 0) { | |||
| removed--; | |||
| } else { | |||
| previousLines.push(undefined); | |||
| } | |||
| break; | |||
| case '-': | |||
| hasRemoved = true; | |||
| removed++; | |||
| previousLines.push({ | |||
| line: ` ${l.substring(1)}`, | |||
| state: 'removed', | |||
| }); | |||
| break; | |||
| default: | |||
| while (removed > 0) { | |||
| removed--; | |||
| currentLines.push(undefined); | |||
| } | |||
| currentLines.push({ line: l, state: 'unchanged' }); | |||
| previousLines.push({ line: l, state: 'unchanged' }); | |||
| break; | |||
| } | |||
| } | |||
| const hunkLines: GitDiffHunkLine[] = []; | |||
| while (removed > 0) { | |||
| removed--; | |||
| currentLines.push(undefined); | |||
| } | |||
| for (let i = 0; i < Math.max(currentLines.length, previousLines.length); i++) { | |||
| hunkLines.push({ | |||
| hunk: hunk, | |||
| current: currentLines[i], | |||
| previous: previousLines[i], | |||
| }); | |||
| } | |||
| const hunkLines: GitDiffHunkLine[] = []; | |||
| return { | |||
| lines: hunkLines, | |||
| state: hasAddedOrChanged && hasRemoved ? 'changed' : hasAddedOrChanged ? 'added' : 'removed', | |||
| }; | |||
| for (let i = 0; i < Math.max(currentLines.length, previousLines.length); i++) { | |||
| hunkLines.push({ | |||
| hunk: hunk, | |||
| current: currentLines[i], | |||
| previous: previousLines[i], | |||
| }); | |||
| } | |||
| @debug({ args: false, singleLine: true }) | |||
| static parseNameStatus(data: string, repoPath: string): GitFile[] | undefined { | |||
| if (!data) return undefined; | |||
| sw?.stop({ suffix: ` parsed ${pluralize('line', hunkLines.length)}` }); | |||
| return { | |||
| lines: hunkLines, | |||
| state: hasAddedOrChanged && hasRemoved ? 'changed' : hasAddedOrChanged ? 'added' : 'removed', | |||
| }; | |||
| } | |||
| export function parseDiffNameStatusFiles(data: string, repoPath: string): GitFile[] | undefined { | |||
| if (!data) return undefined; | |||
| const files: GitFile[] = []; | |||
| const sw = maybeStopWatch('parseDiffNameStatusFiles', { log: false, logLevel: LogLevel.Debug }); | |||
| let status; | |||
| const files: GitFile[] = []; | |||
| const fields = data.split('\0'); | |||
| for (let i = 0; i < fields.length - 1; i++) { | |||
| status = fields[i][0]; | |||
| if (status === '.') { | |||
| status = '?'; | |||
| } | |||
| let status; | |||
| files.push({ | |||
| status: status as GitFileStatus, | |||
| path: fields[++i], | |||
| originalPath: status.startsWith('R') || status.startsWith('C') ? fields[++i] : undefined, | |||
| repoPath: repoPath, | |||
| }); | |||
| const fields = data.split('\0'); | |||
| for (let i = 0; i < fields.length - 1; i++) { | |||
| status = fields[i][0]; | |||
| if (status === '.') { | |||
| status = '?'; | |||
| } | |||
| return files; | |||
| files.push({ | |||
| status: status as GitFileStatus, | |||
| path: fields[++i], | |||
| originalPath: status.startsWith('R') || status.startsWith('C') ? fields[++i] : undefined, | |||
| repoPath: repoPath, | |||
| }); | |||
| } | |||
| @debug({ args: false, singleLine: true }) | |||
| static parseShortStat(data: string): GitDiffShortStat | undefined { | |||
| if (!data) return undefined; | |||
| sw?.stop({ suffix: ` parsed ${pluralize('file', files.length)}` }); | |||
| const match = shortStatDiffRegex.exec(data); | |||
| if (match == null) return undefined; | |||
| return files; | |||
| } | |||
| const [, files, insertions, deletions] = match; | |||
| export function parseDiffShortStat(data: string): GitDiffShortStat | undefined { | |||
| if (!data) return undefined; | |||
| const diffShortStat: GitDiffShortStat = { | |||
| changedFiles: files == null ? 0 : parseInt(files, 10), | |||
| additions: insertions == null ? 0 : parseInt(insertions, 10), | |||
| deletions: deletions == null ? 0 : parseInt(deletions, 10), | |||
| }; | |||
| const sw = maybeStopWatch('parseDiffShortStat', { log: false, logLevel: LogLevel.Debug }); | |||
| return diffShortStat; | |||
| } | |||
| const match = shortStatDiffRegex.exec(data); | |||
| if (match == null) return undefined; | |||
| const [, files, insertions, deletions] = match; | |||
| const diffShortStat: GitDiffShortStat = { | |||
| changedFiles: files == null ? 0 : parseInt(files, 10), | |||
| additions: insertions == null ? 0 : parseInt(insertions, 10), | |||
| deletions: deletions == null ? 0 : parseInt(deletions, 10), | |||
| }; | |||
| sw?.stop({ | |||
| suffix: ` parsed ${pluralize('file', diffShortStat.changedFiles)}, +${diffShortStat.additions} -${ | |||
| diffShortStat.deletions | |||
| }`, | |||
| }); | |||
| return diffShortStat; | |||
| } | |||