Function parseHunks

apps/lib/diff/gitdiff.cpp:241–309

* Parses a unified diff into a list of "diff hunks" (each hunk starts with a * line starting with @@ and represents a collection of localized changes). * * @param diff a diff in git's unified diff format * @returns a list of hunk structures * * The diff is assumed to be a collection of hunks, where each hunk has the * following structure: * * METADATA * --- a/SOURCE_PATH * +++ b/T

 * generates them anyway for files with unresolved conflicts.
 */
static std::vector<DiffHunk> parseHunks(VcsDiff &diff)
{
    std::vector<DiffHunk> ret;
    int lineNo = -1;
    QString curSrcFileName, curTgtFileName;
    QStringListIterator lines(diff.diff().split(u'\n'));
    while (lines.hasNext()) {
        lineNo++;
        auto curln = lines.next();
        auto m = DIFF_FILENAME_RE->match(curln);
        if (m.hasMatch()) {
            if (curln.startsWith(u'-'))
                curSrcFileName = m.captured(1);
            else if (curln.startsWith(u'+'))
                curTgtFileName = m.captured(1);
            continue;
        }
        m = HUNK_HEADER_RE->match(curln);
        if (!m.hasMatch())
            continue;
        const auto oldRange = parseRange(m.captured(1));
        const auto newRange = parseRange(m.captured(2));
        const auto heading = m.captured(3);
        uint firstLineIdx = lineNo;
        QStringList hunkLines;
        while (lines.hasNext() && (CONFLICT_START_RE->match(lines.peekNext()).hasMatch() || !META_LINE_RE->match(lines.peekNext()).hasMatch())) {
            // Consume the conflict
            if (CONFLICT_START_RE->match(lines.peekNext()).hasMatch()) {
                lineNo++;
                hunkLines << lines.next();
                while (lines.hasNext() && !CONFLICT_END_RE->match(lines.peekNext()).hasMatch()) {
                    lineNo++;
                    hunkLines << lines.next();
                }
                if (!CONFLICT_END_RE->match(lines.peekNext()).hasMatch()) {
                    qWarning("Invalid diff format, end of file reached before conflict finished");
                    qDebug("%ls", qUtf16Printable(diff.diff()));
                    break;
                }
            }
            lineNo++;
            hunkLines << lines.next();
        }

        // The number of filenames present in the diff should match the number
        // of hunks
        ret.push_back(DiffHunk{.srcStart = oldRange.line,
                               .srcCount = oldRange.count,
                               .tgtStart = newRange.line,
                               .tgtCount = newRange.count,
                               .headingLineIdx = firstLineIdx,
                               .srcFile = curSrcFileName,
                               .tgtFile = curTgtFileName,
                               .heading = heading,
                               .lines = hunkLines});
    }

    // If the diff ends with a newline, for the last hunk, when splitting into lines above