"""Explicit, line-based conflict choices; the editor's version is always the default.""" from __future__ import annotations from difflib import SequenceMatcher class ConflictComparison: def __init__(self, current: str, disk: str): self.current = current.splitlines(keepends=True) self.disk = disk.splitlines(keepends=True) self.parts = SequenceMatcher(None, self.current, self.disk, autojunk=False).get_opcodes() self.changes = [part for part in self.parts if part[0] != "equal"] def merge(self, disk_choices=()) -> str: chosen, result, change = set(disk_choices), [], 0 for tag, a, b, c, d in self.parts: if tag == "equal": result.extend(self.current[a:b]) else: result.extend(self.disk[c:d] if change in chosen else self.current[a:b]) change += 1 return "".join(result) def resolve_save_conflict(parent, path, current: str, disk: str, baseline: str, deleted=False) -> str | None: from PySide6.QtCore import Qt from PySide6.QtGui import QColor, QTextCursor from PySide6.QtWidgets import (QDialog, QDialogButtonBox, QHBoxLayout, QLabel, QListWidget, QListWidgetItem, QPlainTextEdit, QPushButton, QSplitter, QTextEdit, QVBoxLayout) comparison = ConflictComparison(current, disk) dialog = QDialog(parent) dialog.setWindowTitle(f"保存冲突 — {path.name}") dialog.resize(1150, 800) layout = QVBoxLayout(dialog) layout.addWidget(QLabel(("磁盘文件已删除。" if deleted else "磁盘文件已被外部修改。") + "勾选差异段落可采用磁盘内容;未勾选保留编辑内容。下方合并结果可继续编辑。")) panels = QSplitter(Qt.Orientation.Horizontal) editors = [] for title, source in (("当前编辑内容", current), ("磁盘内容", disk)): from PySide6.QtWidgets import QWidget container = QWidget(); column = QVBoxLayout(container) column.addWidget(QLabel(title)) editor = QPlainTextEdit(source); editor.setReadOnly(True) column.addWidget(editor); editors.append(editor); panels.addWidget(container) layout.addWidget(panels, 3) changes = QListWidget(); changes.setMaximumHeight(140) for index, (_, a, b, c, d) in enumerate(comparison.changes): item = QListWidgetItem(f"差异 {index + 1}:编辑区第 {a + 1}–{max(a + 1, b)} 行 ↔ 磁盘第 {c + 1}–{max(c + 1, d)} 行(勾选采用磁盘段落)") item.setFlags(item.flags() | Qt.ItemFlag.ItemIsUserCheckable) item.setCheckState(Qt.CheckState.Unchecked) changes.addItem(item) layout.addWidget(changes) for side, editor in enumerate(editors): selections = [] for part in comparison.changes: start, end = part[1:3] if side == 0 else part[3:5] for line in range(start, max(start + 1, end)): block = editor.document().findBlockByNumber(line) if not block.isValid(): continue selection = QTextEdit.ExtraSelection() selection.cursor = QTextCursor(block) selection.cursor.select(QTextCursor.SelectionType.LineUnderCursor) selection.format.setBackground(QColor("#fff0bb" if side == 0 else "#d7f4dd")) selections.append(selection) editor.setExtraSelections(selections) layout.addWidget(QLabel("合并结果(更改勾选会重新生成此处内容)")) result = QPlainTextEdit(current); layout.addWidget(result, 2) def update_result(): result.setPlainText(comparison.merge(i for i in range(changes.count()) if changes.item(i).checkState() == Qt.CheckState.Checked)) changes.itemChanged.connect(update_result) def locate(row): if row < 0: return part = comparison.changes[row] for editor, line in zip(editors, (part[1], part[3])): block = editor.document().findBlockByNumber(line) if block.isValid(): editor.setTextCursor(QTextCursor(block)); editor.centerCursor() changes.currentRowChanged.connect(locate) buttons = QDialogButtonBox(QDialogButtonBox.StandardButton.Cancel) buttons.addButton("保存合并结果", QDialogButtonBox.ButtonRole.AcceptRole) overwrite = buttons.addButton("用全部编辑内容覆盖", QDialogButtonBox.ButtonRole.ActionRole) original = buttons.addButton("查看上次保存内容", QDialogButtonBox.ButtonRole.ActionRole) def show_baseline(): view = QDialog(dialog); view.setWindowTitle("上次保存内容(只读)"); view.resize(750, 500) box = QVBoxLayout(view); text = QPlainTextEdit(baseline); text.setReadOnly(True); box.addWidget(text) view.exec() original.clicked.connect(show_baseline) overwrite.clicked.connect(lambda: (result.setPlainText(current), dialog.accept())) buttons.accepted.connect(dialog.accept); buttons.rejected.connect(dialog.reject) layout.addWidget(buttons) return result.toPlainText() if dialog.exec() == QDialog.DialogCode.Accepted else None