je-editor 0.0.202__py3-none-any.whl → 0.0.228__py3-none-any.whl

je_editor/pyside_ui/git_ui/code_diff_compare/line_number_code_viewer.py

@@ -0,0 +1,141 @@
+from PySide6.QtCore import QRect, QSize, Qt
+from PySide6.QtGui import QPainter, QColor
+from PySide6.QtWidgets import QPlainTextEdit, QWidget, QTextEdit
+
+
+class LineNumberArea(QWidget):
+    """
+    Side widget for displaying line numbers.
+    用來顯示行號的側邊元件。
+    """
+
+    def __init__(self, editor):
+        super().__init__(editor)
+        self.code_editor = editor  # 綁定主要的編輯器 / Bind to main editor
+
+    def sizeHint(self):
+        """
+        Suggest width for line number area.
+        建議行號區域的寬度。
+        """
+        return QSize(self.code_editor.line_number_area_width(), 0)
+
+    def paintEvent(self, event):
+        """
+        Delegate paint event to the main editor.
+        將繪製事件交給主要編輯器處理。
+        """
+        self.code_editor.line_number_area_paint_event(event)
+
+
+class LineNumberedCodeViewer(QPlainTextEdit):
+    """
+    QPlainTextEdit with line numbers.
+    帶有行號顯示的文字編輯器。
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.lineNumberArea = LineNumberArea(self)
+
+        # === 信號連接 / Signal connections ===
+        self.blockCountChanged.connect(self.update_line_number_area_width)  # 當行數改變時更新行號區寬度
+        self.updateRequest.connect(self.update_line_number_area)  # 當需要重繪時更新行號區
+        self.cursorPositionChanged.connect(self.highlight_current_line)  # 當游標移動時高亮當前行
+
+        # 初始化行號區寬度與高亮
+        self.update_line_number_area_width(0)
+        self.highlight_current_line()
+
+    def line_number_area_width(self):
+        """
+        Calculate width of line number area based on digit count.
+        根據行數位數計算行號區寬度。
+        """
+        digits = len(str(max(1, self.blockCount())))
+        space = 3 + self.fontMetrics().horizontalAdvance('9') * digits
+        return space
+
+    def update_line_number_area_width(self, _):
+        """
+        Adjust viewport margins to fit line number area.
+        調整視口邊界以容納行號區。
+        """
+        self.setViewportMargins(self.line_number_area_width(), 0, 0, 0)
+
+    def update_line_number_area(self, rect, dy):
+        """
+        Update/redraw line number area when scrolling or editing.
+        當滾動或編輯時更新行號區。
+        """
+        if dy:
+            self.lineNumberArea.scroll(0, dy)
+        else:
+            self.lineNumberArea.update(0, rect.y(), self.lineNumberArea.width(), rect.height())
+        if rect.contains(self.viewport().rect()):
+            self.update_line_number_area_width(0)
+
+    def resizeEvent(self, event):
+        """
+        Resize line number area when editor resizes.
+        編輯器大小改變時調整行號區。
+        """
+        super().resizeEvent(event)
+        cr = self.contentsRect()
+        self.lineNumberArea.setGeometry(QRect(cr.left(), cr.top(), self.line_number_area_width(), cr.height()))
+
+    def line_number_area_paint_event(self, event):
+        """
+        Paint line numbers.
+        繪製行號。
+        """
+        painter = QPainter(self.lineNumberArea)
+        # 背景顏色依主題切換 / Background color depends on theme
+        painter.fillRect(event.rect(), QColor(40, 40, 40) if getattr(self, "is_dark", False) else QColor(230, 230, 230))
+
+        block = self.firstVisibleBlock()
+        blockNumber = block.blockNumber()
+        top = int(self.blockBoundingGeometry(block).translated(self.contentOffset()).top())
+        bottom = top + int(self.blockBoundingRect(block).height())
+
+        while block.isValid() and top <= event.rect().bottom():
+            if block.isVisible() and bottom >= event.rect().top():
+                number = str(blockNumber + 1)
+                # 行號顏色依主題切換 / Line number color depends on theme
+                painter.setPen(QColor("#d4d4d4") if getattr(self, "is_dark", False) else Qt.GlobalColor.black)
+                painter.drawText(
+                    0, top, self.lineNumberArea.width() - 2, self.fontMetrics().height(),
+                    Qt.AlignmentFlag.AlignRight, number
+                )
+            block = block.next()
+            top = bottom
+            bottom = top + int(self.blockBoundingRect(block).height())
+            blockNumber += 1
+
+    def highlight_current_line(self):
+        """
+        Highlight the current line where the cursor is.
+        高亮顯示游標所在的行。
+        """
+        selection = QTextEdit.ExtraSelection()
+        lineColor = QColor(50, 50, 50) if getattr(self, "is_dark", False) else QColor(232, 232, 255)
+        selection.format.setBackground(lineColor)
+        selection.cursor = self.textCursor()
+        selection.cursor.clearSelection()
+
+        # Keep current-line extras for merging
+        self._current_line_extras = [selection]
+
+        # Merge with diff extras if present
+        if hasattr(self, "_diff_extras"):
+            merged = self._diff_extras + self._current_line_extras
+        else:
+            merged = self._current_line_extras
+
+        self.setExtraSelections(merged)
+
+    def apply_theme_to_editor(self, dark: bool):
+        self.setStyleSheet("QPlainTextEdit { background-color: #1e1e1e; color: #d4d4d4; }" if dark
+                           else "QPlainTextEdit { background-color: white; color: black; }")
+        # Re-trigger current line highlight with the new color
+        self.highlight_current_line()

je_editor/pyside_ui/git_ui/code_diff_compare/multi_file_diff_viewer.py

@@ -0,0 +1,88 @@
+from PySide6.QtWidgets import QTabWidget, QVBoxLayout, QWidget
+
+from je_editor.pyside_ui.git_ui.code_diff_compare.side_by_side_diff_widget import SideBySideDiffWidget
+
+
+class MultiFileDiffViewer(QWidget):
+    """
+    Multi-file diff viewer using tabs to display each file.
+    多檔案差異檢視器，使用分頁 (tab) 來顯示每個檔案的差異。
+    """
+
+    def __init__(self, parent=None):
+        """
+        Initialize the multi-file diff viewer.
+        初始化多檔案差異檢視器。
+        """
+        super().__init__(parent)
+        # Tab widget to hold each file's diff
+        # 用來存放每個檔案差異的分頁元件
+        self.tabs = QTabWidget()
+
+        # Layout: vertical box with only the tab widget
+        # 版面配置：垂直佈局，僅包含分頁元件
+        layout = QVBoxLayout(self)
+        layout.addWidget(self.tabs)
+
+    def set_diff_text(self, diff_text: str):
+        """
+        Set the diff text and split it into per-file tabs.
+        設定差異文字，並依檔案拆分成多個分頁。
+        """
+        self.tabs.clear()
+        file_diffs = self._split_by_file(diff_text)
+        for file_name, ftext in file_diffs:
+            viewer = SideBySideDiffWidget()  # 每個檔案使用 side-by-side viewer
+            viewer.set_diff_text(ftext)
+            self.tabs.addTab(viewer, file_name)  # 新增分頁，標題為檔名
+
+    def _split_by_file(self, diff_text: str):
+        """
+        Split a unified diff text into chunks per file.
+        將 unified diff 文字依檔案切分。
+        """
+        chunks = []
+        current = []
+        file_name = None
+
+        for line in diff_text.splitlines():
+            if line.startswith("diff --git"):
+                # 如果遇到新的檔案 diff，先把前一個檔案的內容存起來
+                if current and file_name:
+                    chunks.append((file_name, "\n".join(current)))
+                    current = []
+                # 解析檔名，格式通常為 "diff --git a/file b/file"
+                parts = line.split()
+                if len(parts) >= 4:
+                    file_name = parts[2][2:]  # 去掉 "a/"
+                else:
+                    file_name = "unknown"
+                current.append(line)
+            else:
+                current.append(line)
+
+        # 最後一個檔案也要加入結果
+        if current and file_name:
+            chunks.append((file_name, "\n".join(current)))
+
+        return chunks
+
+    def set_dark_theme(self):
+        """
+        Apply dark theme to all tabs.
+        對所有分頁套用深色主題。
+        """
+        for i in range(self.tabs.count()):
+            w = self.tabs.widget(i)
+            if isinstance(w, SideBySideDiffWidget):
+                w.set_dark_theme()
+
+    def set_light_theme(self):
+        """
+        Apply light theme to all tabs.
+        對所有分頁套用淺色主題。
+        """
+        for i in range(self.tabs.count()):
+            w = self.tabs.widget(i)
+            if isinstance(w, SideBySideDiffWidget):
+                w.set_light_theme()

je_editor/pyside_ui/git_ui/code_diff_compare/side_by_side_diff_widget.py

@@ -0,0 +1,284 @@
+from PySide6.QtGui import QColor, QTextCursor, QTextCharFormat, QFont
+from PySide6.QtWidgets import QPlainTextEdit, QTextEdit, QWidget, QHBoxLayout, QVBoxLayout, QLabel
+
+from je_editor.pyside_ui.git_ui.code_diff_compare.line_number_code_viewer import LineNumberedCodeViewer
+
+
+class SideBySideDiffWidget(QWidget):
+    """
+    Side-by-side diff viewer widget.
+    左右對照的差異檢視元件。
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        # === 顏色設定 / Color configuration ===
+        self.is_dark = True
+        # 刪除行背景 / Deleted line background
+        self.color_del = QColor("#ffcccc")  # 淡紅色，深淺背景都清楚
+        # 新增行背景 / Added line background
+        self.color_add = QColor("#ccffcc")  # 淡綠色，對比度佳
+        # Hunk header 背景
+        self.color_hunk = QColor("#cce5ff")  # 淡藍色，醒目但不刺眼
+        # Diff header 背景
+        self.color_header = QColor("#e0e0e0")  # 淺灰，適合標題區塊
+
+        # === 左右檔名標籤 / File name labels ===
+        self.leftLabel = QLabel("Left: (old)")
+        self.rightLabel = QLabel("Right: (new)")
+        font = QFont()
+        font.setBold(True)
+        self.leftLabel.setFont(font)
+        self.rightLabel.setFont(font)
+
+        # === 左右文字編輯器 / Left and right code editors ===
+        self.leftEdit = LineNumberedCodeViewer()
+        self.rightEdit = LineNumberedCodeViewer()
+        for edit in (self.leftEdit, self.rightEdit):
+            edit.setReadOnly(True)  # 設為唯讀 / Read-only
+            edit.setLineWrapMode(QPlainTextEdit.LineWrapMode.NoWrap)  # 不自動換行 / Disable line wrap
+            mono = QFont("Consolas")  # 使用等寬字型 / Monospaced font
+            mono.setStyleHint(QFont.StyleHint.Monospace)
+            edit.setFont(mono)
+
+        # === 版面配置 / Layout ===
+        leftBox = QVBoxLayout()
+        leftBox.addWidget(self.leftLabel)
+        leftBox.addWidget(self.leftEdit)
+
+        rightBox = QVBoxLayout()
+        rightBox.addWidget(self.rightLabel)
+        rightBox.addWidget(self.rightEdit)
+
+        main = QHBoxLayout(self)
+        leftContainer = QWidget()
+        leftContainer.setLayout(leftBox)
+        rightContainer = QWidget()
+        rightContainer.setLayout(rightBox)
+        main.addWidget(leftContainer)
+        main.addWidget(rightContainer)
+
+        # 同步左右捲軸 / Sync scrollbars
+        self._sync_scrollbars()
+
+        # 預設深色模式 / Default to dark theme
+        self.set_dark_theme()
+
+    def _sync_scrollbars(self):
+        """
+        Synchronize scrollbars between left and right editors.
+        同步左右編輯器的捲軸。
+        """
+        self.leftEdit.verticalScrollBar().valueChanged.connect(
+            self.rightEdit.verticalScrollBar().setValue
+        )
+        self.rightEdit.verticalScrollBar().valueChanged.connect(
+            self.leftEdit.verticalScrollBar().setValue
+        )
+        self.leftEdit.horizontalScrollBar().valueChanged.connect(
+            self.rightEdit.horizontalScrollBar().setValue
+        )
+        self.rightEdit.horizontalScrollBar().valueChanged.connect(
+            self.leftEdit.horizontalScrollBar().setValue
+        )
+
+    def set_diff_text(self, diff_text: str):
+        """
+        Parse unified diff text and display it in side-by-side editors.
+        解析 unified diff 文字並顯示在左右編輯器。
+        """
+        left_lines, right_lines, left_marks, right_marks, left_name, right_name = \
+            self._parse_unified_diff(diff_text)
+
+        self.leftLabel.setText(f"Left: {left_name or '(old)'}")
+        self.rightLabel.setText(f"Right: {right_name or '(new)'}")
+
+        self._set_text_with_highlights(self.leftEdit, left_lines, left_marks)
+        self._set_text_with_highlights(self.rightEdit, right_lines, right_marks)
+
+        # 游標移到開頭 / Move cursor to start
+        self.leftEdit.moveCursor(QTextCursor.MoveOperation.Start)
+        self.rightEdit.moveCursor(QTextCursor.MoveOperation.Start)
+
+    def _set_text_with_highlights(self, edit: QPlainTextEdit, lines, marks):
+        """
+        Set text and apply syntax highlighting based on diff marks.
+        設定文字並依 diff 標記加上背景色。
+        """
+        edit.setPlainText("\n".join(lines))
+
+        diff_extras = []
+        for i, mark in enumerate(marks):
+            fmt = QTextCharFormat()
+            # Always set foreground so it won't fall back
+            # 永遠設定前景色，避免 fallback
+            fmt.setForeground(QColor("#d4d4d4") if self.is_dark else QColor("black"))
+
+            if mark == "DEL":
+                fmt.setBackground(self.color_del)
+            elif mark == "ADD":
+                fmt.setBackground(self.color_add)
+            elif mark == "HUNK":
+                fmt.setBackground(self.color_hunk)
+            elif mark == "HDR":
+                fmt.setBackground(self.color_header)
+            else:
+                continue
+
+            sel = self._line_selection(edit, i, fmt)
+            diff_extras.append(sel)
+
+        # 保留 diff selections，方便主題切換時重用
+        setattr(edit, "_diff_extras", diff_extras)
+
+        # 嘗試合併其他高亮（例如 LineNumberedCodeViewer 的當前行高亮）
+        if hasattr(edit, "_current_line_extras"):
+            merged = diff_extras + edit._current_line_extras
+        else:
+            merged = diff_extras
+
+        edit.setExtraSelections(merged)
+
+    def _line_selection(self, edit: QPlainTextEdit, line_index: int, fmt: QTextCharFormat):
+        """
+        Create a selection for a specific line with given format.
+        建立某一行的選取區並套用格式。
+        """
+        sel = QTextEdit.ExtraSelection()
+        sel.format = fmt
+        cursor = edit.textCursor()
+        cursor.movePosition(QTextCursor.MoveOperation.Start)
+        for _ in range(line_index):
+            cursor.movePosition(QTextCursor.MoveOperation.Down)
+        cursor.select(QTextCursor.SelectionType.LineUnderCursor)
+        sel.cursor = cursor
+        return sel
+
+    def _parse_unified_diff(self, diff_text: str):
+        """
+        Parse unified diff into left/right lines and marks.
+        將 unified diff 解析成左右行與標記。
+        """
+        left_lines, right_lines, left_marks, right_marks = [], [], [], []
+        left_name, right_name = None, None
+
+        def add_left(line, mark=None):
+            left_lines.append(line)
+            left_marks.append(mark or "CTX")
+
+        def add_right(line, mark=None):
+            right_lines.append(line)
+            right_marks.append(mark or "CTX")
+
+        def align():
+            # 對齊左右行數 / Align left and right line counts
+            if len(left_lines) < len(right_lines):
+                for _ in range(len(right_lines) - len(left_lines)):
+                    add_left("")
+            elif len(right_lines) < len(left_lines):
+                for _ in range(len(left_lines) - len(right_lines)):
+                    add_right("")
+
+        for raw in diff_text.splitlines():
+            if raw.startswith("diff "):
+                add_left(raw, "HDR");
+                add_right(raw, "HDR");
+                align()
+            elif raw.startswith("--- "):
+                left_name = raw[4:].strip()
+                add_left(raw, "HDR");
+                add_right("", "HDR");
+                align()
+            elif raw.startswith("+++ "):
+                right_name = raw[4:].strip()
+                add_left("", "HDR");
+                add_right(raw, "HDR");
+                align()
+            elif raw.startswith("@@"):
+                add_left(raw, "HUNK");
+                add_right(raw, "HUNK");
+                align()
+            elif raw.startswith("-"):
+                add_left(raw, "DEL");
+                add_right("", None);
+                align()
+            elif raw.startswith("+"):
+                add_left("", None);
+                add_right(raw, "ADD");
+                align()
+            else:
+                add_left(raw, None);
+                add_right(raw, None);
+                align()
+
+        return left_lines, right_lines, left_marks, right_marks, left_name, right_name
+
+    def _reapply_highlights_for_theme(self):
+        """
+        Reapply highlights when theme changes.
+        主題切換時重新套用高亮。
+        """
+        for edit in (self.leftEdit, self.rightEdit):
+            if hasattr(edit, "_diff_extras"):
+                updated = []
+                for sel in edit._diff_extras:
+                    fmt: QTextCharFormat = QTextCharFormat(sel.format)
+
+                    # 前景色依主題切換
+                    fmt.setForeground(QColor("#d4d4d4") if self.is_dark else QColor("black"))
+
+                    # 依照 mark 更新背景色
+                    cursor = sel.cursor
+                    cursor.select(QTextCursor.SelectionType.LineUnderCursor)
+                    text = cursor.selectedText()
+
+                    if text.startswith("-"):
+                        fmt.setBackground(self.color_del)
+                    elif text.startswith("+"):
+                        fmt.setBackground(self.color_add)
+                    elif text.startswith("@@"):
+                        fmt.setBackground(self.color_hunk)
+                    elif text.startswith("diff") or text.startswith("---") or text.startswith("+++"):
+                        fmt.setBackground(self.color_header)
+
+                    sel.format = fmt
+                    updated.append(sel)
+
+                edit._diff_extras = updated
+
+                if hasattr(edit, "_current_line_extras"):
+                    merged = updated + edit._current_line_extras
+                else:
+                    merged = updated
+                edit.setExtraSelections(merged)
+
+    def set_dark_theme(self):
+        """
+        Apply dark theme colors.
+        套用深色主題配色。
+        """
+        self.is_dark = True
+        self.color_del = QColor(60, 20, 20)
+        self.color_add = QColor(20, 60, 20)
+        self.color_hunk = QColor(25, 25, 60)
+        self.color_header = QColor(50, 50, 50)
+        self.setStyleSheet("""QWidget { background-color: #1e1e1e; color: #d4d4d4; }""")
+        self._reapply_highlights_for_theme()
+        self.leftEdit.apply_theme_to_editor(dark=self.is_dark)
+        self.rightEdit.apply_theme_to_editor(dark=self.is_dark)
+
+    def set_light_theme(self):
+        """
+        Apply light  theme colors.
+        套用淺色主題配色。
+        """
+        self.is_dark = False
+        self.color_del = QColor(255, 230, 230)
+        self.color_add = QColor(230, 255, 230)
+        self.color_hunk = QColor(230, 230, 255)
+        self.color_header = QColor(240, 240, 240)
+        self.setStyleSheet("""QWidget { background-color: white; color: black; }""")
+        self._reapply_highlights_for_theme()
+        self.leftEdit.apply_theme_to_editor(dark=self.is_dark)
+        self.rightEdit.apply_theme_to_editor(dark=self.is_dark)

je_editor/pyside_ui/git_ui/git_client/commit_table.py

@@ -0,0 +1,65 @@
+from PySide6.QtGui import QStandardItemModel, QStandardItem
+from PySide6.QtWidgets import QTableView
+
+
+class CommitTable(QTableView):
+    """
+    CommitTable 類別：用來顯示 Git Commit 紀錄的表格
+    CommitTable class: A table view to display Git commit history
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+
+        # 建立一個 QStandardItemModel，初始為 0 行 5 欄
+        # Create a QStandardItemModel with 0 rows and 5 columns
+        self.model_data = QStandardItemModel(0, 5, self)  # 多一欄 / 5 columns
+
+        # 設定表頭標籤
+        # Set horizontal header labels
+        self.model_data.setHorizontalHeaderLabels(["#", "SHA", "Message", "Author", "Date"])
+
+        # 將模型綁定到 QTableView
+        # Set the model for QTableView
+        self.setModel(self.model_data)
+
+        # 設定選擇行為為整列選取
+        # Set selection behavior to select entire rows
+        self.setSelectionBehavior(QTableView.SelectionBehavior.SelectRows)
+
+        # 禁止編輯表格內容
+        # Disable editing of table cells
+        self.setEditTriggers(QTableView.EditTrigger.NoEditTriggers)
+
+        # 讓最後一欄自動延展填滿
+        # Stretch the last column to fill available space
+        self.horizontalHeader().setStretchLastSection(True)
+
+    def set_commits(self, commits):
+        """
+        將 commit 資料填入表格
+        Populate the table with commit data
+        :param commits: commit 資料清單 (list of dicts with sha, message, author, date)
+        """
+        # 清空現有資料
+        # Clear existing rows
+        self.model_data.setRowCount(0)
+
+        # 遍歷 commit 清單，逐行加入表格
+        # Iterate over commits and append rows
+        for index, commit in enumerate(commits, start=1):
+            row = [
+                QStandardItem(str(index)),  # 行號 / row number
+                QStandardItem(commit["sha"][:7]),  # SHA 短碼 / short SHA
+                QStandardItem(commit["message"]),  # 提交訊息 / commit message
+                QStandardItem(commit["author"]),  # 作者 / author
+                QStandardItem(commit["date"]),  # 日期 / date
+            ]
+            # 設定每個欄位不可編輯
+            # Make each item non-editable
+            for item in row:
+                item.setEditable(False)
+
+            # 將這一列加入模型
+            # Append row to the model
+            self.model_data.appendRow(row)