jvim 0.5.0__tar.gz → 0.7.0__tar.gz

{jvim-0.5.0 → jvim-0.7.0}/.claude/CLAUDE.md

@@ -1,6 +1,7 @@
 
 키 바인딩이 추가되면 help.json 파일을 업데이트한다.
 푸시할 때 버전의 업그레이드 여부를 분석해서 보고한다.
+푸시할 때 변경 사항에 대해 위키를 업데이트한다.
 버전이 업그레이드되는 경우 README.md 파일에 추가할 만한 항목을 분석한다.
 README.md 파일이 수정되면 README.kr.md 파일도 동일한 내용으로 수정한다.
 jvim에 적용되는 기능 중에서 jvimdiff에도 적용 가능한 기능은 적용 여부를 확인한다.

{jvim-0.5.0 → jvim-0.7.0}/.claude/settings.local.json

@@ -31,7 +31,10 @@
       "Bash(.venv/bin/pytest:*)",
       "Bash(.venv/bin/ruff check:*)",
       "Bash(wc:*)",
-      "Bash(ls:*)"
+      "Bash(ls:*)",
+      "Bash(uv run ruff check:*)",
+      "Bash(uv run ruff format:*)",
+      "Bash(uv run python3:*)"
     ]
   }
 }

{jvim-0.5.0 → jvim-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jvim
-Version: 0.5.0
+Version: 0.7.0
 Summary: JSON editor with vim-style keybindings
 Project-URL: Homepage, https://github.com/k2hyun/jvim
 Project-URL: Repository, https://github.com/k2hyun/jvim
@@ -50,6 +50,7 @@ JSON editor with vim-style keybindings, built with [Textual](https://github.com/
 - **JSONL support** - Edit JSON Lines files with smart formatting
 - **Embedded JSON editing** - Edit JSON strings within JSON with nested level support
 - **Visual mode** - Character-wise (`v`) and line-wise (`V`) selection with `d`/`y`/`c` operators
+- **Count prefix** - Vim-style numeric prefixes (`5j`, `3dd`, `d3d`) with fold-aware line operations
 - **Folding** - Collapse/expand JSON blocks and long string values
 - **Bracket matching** - Jump to matching brackets with `%`
 - **Undo/Redo** - Full undo history
@@ -330,6 +331,9 @@ Also available as `jvd` shortcut.
 - **Auto-fold** - On load, all structure is folded, then only diff sections are unfolded
 - **Hunk navigation** - `]c` next hunk, `[c` previous hunk (wraps around)
 - **Panel switch** - `Tab` to toggle focus between left and right panels
+- **Active panel indicator** - Title bar highlights the focused panel
+- **Cursor sync** - Cursor position syncs between panels
+- **Line numbers** - Logical line number (left) and JSONL record number (both panels)
 - **Embedded JSON diff** - `ej` to diff embedded JSON strings within each panel
 
 ## Keybindings

{jvim-0.5.0 → jvim-0.7.0}/README.kr.md

@@ -19,6 +19,7 @@
 - **JSONL 지원** - JSON Lines 파일을 스마트하게 포맷팅하여 편집
 - **내장 JSON 편집** - JSON 내 문자열로 저장된 JSON을 중첩 레벨까지 편집
 - **Visual 모드** - 문자 단위(`v`) 및 줄 단위(`V`) 선택 후 `d`/`y`/`c` 연산자 지원
+- **숫자 접두사(Count prefix)** - Vim 스타일 숫자 접두사(`5j`, `3dd`, `d3d`) 및 fold-aware 줄 조작
 - **접기(Folding)** - JSON 블록과 긴 문자열 값을 접기/펼치기
 - **괄호 매칭** - `%`로 짝이 맞는 괄호로 이동
 - **Undo/Redo** - 전체 실행 취소 기록 지원
@@ -299,6 +300,9 @@ jvimdiff --jsonl file1.json file2.json
 - **자동 접기** - 로드 시 전체 구조를 접고, diff가 있는 부분만 자동으로 펼침
 - **Hunk 탐색** - `]c` 다음 hunk, `[c` 이전 hunk (순환)
 - **패널 전환** - `Tab`으로 좌우 패널 간 포커스 전환
+- **활성 패널 표시** - 타이틀 바로 포커스된 패널을 강조 표시
+- **커서 동기화** - 양쪽 패널의 커서 위치가 동기화
+- **라인 번호** - 논리적 라인 번호(왼쪽)와 JSONL 레코드 번호(양쪽 패널)
 - **내장 JSON diff** - `ej`로 각 패널의 내장 JSON 문자열을 비교
 
 ## 키 바인딩

{jvim-0.5.0 → jvim-0.7.0}/README.md

@@ -21,6 +21,7 @@ JSON editor with vim-style keybindings, built with [Textual](https://github.com/
 - **JSONL support** - Edit JSON Lines files with smart formatting
 - **Embedded JSON editing** - Edit JSON strings within JSON with nested level support
 - **Visual mode** - Character-wise (`v`) and line-wise (`V`) selection with `d`/`y`/`c` operators
+- **Count prefix** - Vim-style numeric prefixes (`5j`, `3dd`, `d3d`) with fold-aware line operations
 - **Folding** - Collapse/expand JSON blocks and long string values
 - **Bracket matching** - Jump to matching brackets with `%`
 - **Undo/Redo** - Full undo history
@@ -301,6 +302,9 @@ Also available as `jvd` shortcut.
 - **Auto-fold** - On load, all structure is folded, then only diff sections are unfolded
 - **Hunk navigation** - `]c` next hunk, `[c` previous hunk (wraps around)
 - **Panel switch** - `Tab` to toggle focus between left and right panels
+- **Active panel indicator** - Title bar highlights the focused panel
+- **Cursor sync** - Cursor position syncs between panels
+- **Line numbers** - Logical line number (left) and JSONL record number (both panels)
 - **Embedded JSON diff** - `ej` to diff embedded JSON strings within each panel
 
 ## Keybindings

{jvim-0.5.0 → jvim-0.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "jvim"
-version = "0.5.0"
+version = "0.7.0"
 description = "JSON editor with vim-style keybindings"
 readme = "README.md"
 requires-python = ">=3.10"

{jvim-0.5.0 → jvim-0.7.0}/src/jvim/__init__.py

@@ -3,4 +3,4 @@
 from .widget import EditorMode, JsonEditor
 
 __all__ = ["EditorMode", "JsonEditor"]
-__version__ = "0.5.0"
+__version__ = "0.7.0"

{jvim-0.5.0 → jvim-0.7.0}/src/jvim/action/clipboard.py

@@ -45,11 +45,16 @@ class ClipboardMixin:
                 self.cursor_row += inserted
                 self.cursor_col = len(parts[-1]) - 1
             return
+        # fold-aware: fold 헤더이면 fold end 뒤에 삽입
+        insert_after = self.cursor_row
+        fold_end = self._folds.get(self.cursor_row)
+        if fold_end is not None:
+            insert_after = fold_end
         inserted = len(self.yank_buffer)
         for i, line in enumerate(self.yank_buffer):
-            self.lines.insert(self.cursor_row + 1 + i, line)
-        self._adjust_line_indices(self.cursor_row + 1, inserted)
-        self.cursor_row += 1
+            self.lines.insert(insert_after + 1 + i, line)
+        self._adjust_line_indices(insert_after + 1, inserted)
+        self.cursor_row = insert_after + 1
         self.cursor_col = 0
 
     def _paste_before(self) -> None:
@@ -88,11 +93,33 @@ class ClipboardMixin:
     def _join_lines(self) -> None:
         if self.cursor_row >= len(self.lines) - 1:
             return
-        self._save_undo()
-        cur = self.lines[self.cursor_row].rstrip()
-        nxt = self.lines[self.cursor_row + 1].lstrip()
-        self.cursor_col = len(cur)
-        self.lines[self.cursor_row] = cur + " " + nxt
-        deleted_at = self.cursor_row + 1
-        self.lines.pop(deleted_at)
-        self._adjust_line_indices(deleted_at, -1)
+        # fold-aware: fold 헤더이면 fold 전체를 제거한 뒤 다음 보이는 줄과 join
+        fold_end = self._folds.get(self.cursor_row)
+        if fold_end is not None:
+            next_row = fold_end + 1
+            if next_row >= len(self.lines):
+                return
+            self._save_undo()
+            cur = self.lines[self.cursor_row].rstrip()
+            # fold 내부 행 제거 (cursor_row+1 ~ fold_end)
+            del self.lines[self.cursor_row + 1 : next_row]
+            removed = fold_end - self.cursor_row
+            del self._folds[self.cursor_row]
+            self._folded_lines_dirty = True
+            self._adjust_line_indices(self.cursor_row + 1, -removed)
+            # 이제 cursor_row+1 = 원래 next_row (fold 뒤 첫 줄)
+            nxt = self.lines[self.cursor_row + 1].lstrip()
+            self.cursor_col = len(cur)
+            self.lines[self.cursor_row] = cur + " " + nxt
+            deleted_at = self.cursor_row + 1
+            self.lines.pop(deleted_at)
+            self._adjust_line_indices(deleted_at, -1)
+        else:
+            self._save_undo()
+            cur = self.lines[self.cursor_row].rstrip()
+            nxt = self.lines[self.cursor_row + 1].lstrip()
+            self.cursor_col = len(cur)
+            self.lines[self.cursor_row] = cur + " " + nxt
+            deleted_at = self.cursor_row + 1
+            self.lines.pop(deleted_at)
+            self._adjust_line_indices(deleted_at, -1)

{jvim-0.5.0 → jvim-0.7.0}/src/jvim/action/folding.py

@@ -17,6 +17,7 @@ class FoldMixin:
                 ne = e + delta if e >= from_line else e
                 new_folds[ns] = ne
             self._folds = new_folds
+            self._folded_lines_dirty = True
             self._collapsed_strings = {
                 (i + delta if i >= from_line else i) for i in self._collapsed_strings
             }
@@ -37,6 +38,7 @@ class FoldMixin:
                 else:
                     new_folds[s] = e - abs_d
             self._folds = new_folds
+            self._folded_lines_dirty = True
             self._collapsed_strings = {
                 (i - abs_d if i >= del_end else i)
                 for i in self._collapsed_strings
@@ -92,12 +94,22 @@ class FoldMixin:
                 return rng
         return None
 
-    def _is_line_folded(self, line_idx: int) -> bool:
-        """fold 안에 숨겨진 라인인지 확인."""
+    def _rebuild_folded_set(self) -> None:
+        """_folds로부터 숨겨진 라인 세트 재구성."""
+        s = set()
         for start, end in self._folds.items():
-            if start < line_idx <= end:
-                return True
-        return False
+            for i in range(start + 1, end + 1):
+                s.add(i)
+        self._folded_lines = s
+        self._folded_lines_dirty = False
+        self._folded_lines_folds_len = len(self._folds)
+
+    def _is_line_folded(self, line_idx: int) -> bool:
+        """fold 안에 숨겨진 라인인지 확인. O(1)."""
+        # dirty 플래그 또는 _folds 직접 변경 감지 (길이 불일치)
+        if self._folded_lines_dirty or len(self._folds) != self._folded_lines_folds_len:
+            self._rebuild_folded_set()
+        return line_idx in self._folded_lines
 
     def _next_visible_line(self, line_idx: int, direction: int = 1) -> int:
         """다음/이전 보이는 라인 인덱스 반환."""
@@ -123,6 +135,8 @@ class FoldMixin:
         to_remove = [s for s, e in self._folds.items() if s < line_idx <= e]
         for s in to_remove:
             del self._folds[s]
+        if to_remove:
+            self._folded_lines_dirty = True
 
     def _find_long_string_at(self, line_idx: int) -> tuple[int, int, int] | None:
         """라인에서 긴 string value를 찾는다.
@@ -152,14 +166,17 @@ class FoldMixin:
         """za: fold 토글."""
         if line_idx in self._folds:
             del self._folds[line_idx]
+            self._folded_lines_dirty = True
             return
         rng = self._find_foldable_at(line_idx)
         if rng:
             self._folds[rng[0]] = rng[1]
+            self._folded_lines_dirty = True
             return
         for start, end in list(self._folds.items()):
             if start < line_idx <= end:
                 del self._folds[start]
+                self._folded_lines_dirty = True
                 return
         if line_idx in self._collapsed_strings:
             self._collapsed_strings.discard(line_idx)
@@ -171,6 +188,7 @@ class FoldMixin:
         """zo: fold 열기."""
         if line_idx in self._folds:
             del self._folds[line_idx]
+            self._folded_lines_dirty = True
         self._collapsed_strings.discard(line_idx)
 
     def _close_fold(self, line_idx: int) -> None:
@@ -178,6 +196,7 @@ class FoldMixin:
         rng = self._find_foldable_at(line_idx)
         if rng:
             self._folds[rng[0]] = rng[1]
+            self._folded_lines_dirty = True
             return
         if self._find_long_string_at(line_idx):
             self._collapsed_strings.add(line_idx)
@@ -185,6 +204,7 @@ class FoldMixin:
         enclosing = self._find_enclosing_foldable(line_idx)
         if enclosing:
             self._folds[enclosing[0]] = enclosing[1]
+            self._folded_lines_dirty = True
             self.cursor_row = enclosing[0]
 
     def _fold_all(self) -> None:
@@ -201,10 +221,14 @@ class FoldMixin:
                 if self._find_long_string_at(i):
                     self._collapsed_strings.add(i)
                 i += 1
+        self._folded_lines_dirty = True
 
     def _unfold_all(self) -> None:
         """zR: 모든 fold 해제."""
         self._folds.clear()
+        self._folded_lines.clear()
+        self._folded_lines_dirty = False
+        self._folded_lines_folds_len = 0
         self._collapsed_strings.clear()
 
     def _fold_all_nested(self) -> None:
@@ -219,6 +243,7 @@ class FoldMixin:
                 self._collapsed_strings.add(i)
         if 0 in self._folds:
             del self._folds[0]
+        self._folded_lines_dirty = True
 
     def _fold_at_depth(self, depth: int) -> None:
         """지정된 depth의 foldable 블록과 긴 string을 접기."""
@@ -236,3 +261,4 @@ class FoldMixin:
                     self._folds[rng[0]] = rng[1]
                 elif self._find_long_string_at(i):
                     self._collapsed_strings.add(i)
+        self._folded_lines_dirty = True

{jvim-0.5.0 → jvim-0.7.0}/src/jvim/action/substitute.py

@@ -118,6 +118,9 @@ class SubstituteMixin:
                 if delta:
                     self._adjust_line_indices(end + 1, delta)
                 self._folds.clear()
+                self._folded_lines.clear()
+                self._folded_lines_dirty = False
+                self._folded_lines_folds_len = 0
                 self._collapsed_strings.clear()
             self.status_msg = f"{total_count} substitution(s)"
             self._invalidate_caches()

{jvim-0.5.0 → jvim-0.7.0}/src/jvim/action/visual.py

@@ -53,6 +53,9 @@ class VisualMixin:
         else:
             self.lines[sr : er + 1] = [""]
             self._folds.clear()
+            self._folded_lines.clear()
+            self._folded_lines_dirty = False
+            self._folded_lines_folds_len = 0
             self._collapsed_strings.clear()
         self.cursor_row = min(sr, len(self.lines) - 1)
         self.cursor_col = 0

{jvim-0.5.0 → jvim-0.7.0}/src/jvim/data/help.json

@@ -1,4 +1,14 @@
 {
+    "Count Prefix": {
+        "{N}motion": "repeat motion N times (e.g., 5j)",
+        "{N}G": "go to line N",
+        "{N}dd": "delete N lines (fold-aware)",
+        "{N}yy": "yank N lines (fold-aware)",
+        "d{N}d": "delete N lines (e.g., d3d)",
+        "{N}x": "delete N chars",
+        "{N}p {N}P": "paste N times",
+        "{N}J": "join N times"
+    },
     "Movement": {
         "h j k l": "left/down/up/right",
         "w b": "word forward/backward",
@@ -81,5 +91,15 @@
         ":x": "save and quit (alias for :wq)",
         ":help": "toggle this help",
         "Tab": "path completion for :e, :w"
+    },
+    "Diff Commands": {
+        "]c": "next hunk",
+        "[c": "previous hunk",
+        ":ig <path>": "ignore JSONPath in diff highlight",
+        ":ig": "show ignored paths",
+        ":ig!": "clear all ignored paths",
+        ":uig <path>": "unignore JSONPath",
+        ":uig + Tab": "tab-complete from ignored list",
+        "Tab": "switch left/right panel"
     }
 }