omdev 0.0.46__tar.gz → 0.0.47__tar.gz

{omdev-0.0.46/omdev.egg-info → omdev-0.0.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.46
+Version: 0.0.47
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.46
+Requires-Dist: omcore==0.0.47
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.46; extra == "ominfra"
+Requires-Dist: ominfra==0.0.47; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.46; extra == "omllm"
+Requires-Dist: omllm==0.0.47; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c
@@ -42,18 +42,32 @@ Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: tui
 Requires-Dist: rich~=15.0; extra == "tui"
-Requires-Dist: textual~=8.2; extra == "tui"
-Requires-Dist: textual-dev~=1.8; extra == "tui"
-Requires-Dist: textual-speedups~=0.2; extra == "tui"
+Provides-Extra: tui-syntax
+Requires-Dist: tree-sitter~=0.26; extra == "tui-syntax"
+Requires-Dist: tree-sitter-bash~=0.24; extra == "tui-syntax"
+Requires-Dist: tree-sitter-css~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-go~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-html~=0.23; extra == "tui-syntax"
+Requires-Dist: tree-sitter-java~=0.23; extra == "tui-syntax"
+Requires-Dist: tree-sitter-javascript~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-json~=0.24; extra == "tui-syntax"
+Requires-Dist: tree-sitter-markdown~=0.5; extra == "tui-syntax"
+Requires-Dist: tree-sitter-python~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-regex~=0.25; extra == "tui-syntax"
+Requires-Dist: tree-sitter-rust~=0.24; extra == "tui-syntax"
+Requires-Dist: tree-sitter-sql~=0.3; extra == "tui-syntax"
+Requires-Dist: tree-sitter-toml~=0.7; extra == "tui-syntax"
+Requires-Dist: tree-sitter-xml~=0.7; extra == "tui-syntax"
+Requires-Dist: tree-sitter-yaml~=0.7; extra == "tui-syntax"
 Provides-Extra: cext
-Requires-Dist: omdev-cext==0.0.46; extra == "cext"
+Requires-Dist: omdev-cext==0.0.47; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.46; extra == "rs"
+Requires-Dist: omdev-rs==0.0.47; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.46; extra == "cli"
+Requires-Dist: omdev-cli==0.0.47; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.46; extra == "all"
-Requires-Dist: omllm==0.0.46; extra == "all"
+Requires-Dist: ominfra==0.0.47; extra == "all"
+Requires-Dist: omllm==0.0.47; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -68,12 +82,25 @@ Requires-Dist: pillow~=12.3; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
 Requires-Dist: rich~=15.0; extra == "all"
-Requires-Dist: textual~=8.2; extra == "all"
-Requires-Dist: textual-dev~=1.8; extra == "all"
-Requires-Dist: textual-speedups~=0.2; extra == "all"
-Requires-Dist: omdev-cext==0.0.46; extra == "all"
-Requires-Dist: omdev-rs==0.0.46; extra == "all"
-Requires-Dist: omdev-cli==0.0.46; extra == "all"
+Requires-Dist: tree-sitter~=0.26; extra == "all"
+Requires-Dist: tree-sitter-bash~=0.24; extra == "all"
+Requires-Dist: tree-sitter-css~=0.25; extra == "all"
+Requires-Dist: tree-sitter-go~=0.25; extra == "all"
+Requires-Dist: tree-sitter-html~=0.23; extra == "all"
+Requires-Dist: tree-sitter-java~=0.23; extra == "all"
+Requires-Dist: tree-sitter-javascript~=0.25; extra == "all"
+Requires-Dist: tree-sitter-json~=0.24; extra == "all"
+Requires-Dist: tree-sitter-markdown~=0.5; extra == "all"
+Requires-Dist: tree-sitter-python~=0.25; extra == "all"
+Requires-Dist: tree-sitter-regex~=0.25; extra == "all"
+Requires-Dist: tree-sitter-rust~=0.24; extra == "all"
+Requires-Dist: tree-sitter-sql~=0.3; extra == "all"
+Requires-Dist: tree-sitter-toml~=0.7; extra == "all"
+Requires-Dist: tree-sitter-xml~=0.7; extra == "all"
+Requires-Dist: tree-sitter-yaml~=0.7; extra == "all"
+Requires-Dist: omdev-cext==0.0.47; extra == "all"
+Requires-Dist: omdev-rs==0.0.47; extra == "all"
+Requires-Dist: omdev-cli==0.0.47; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.46 → omdev-0.0.47}/omdev/.om-manifests.json

@@ -343,7 +343,7 @@
     "module": ".tools.cloc",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/cloc.py",
-    "line": 248,
+    "line": 260,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cloc",
@@ -585,21 +585,6 @@
       }
     }
   },
-  {
-    "module": ".tui.apps.markdown.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tui/apps/markdown/__main__.py",
-    "line": 4,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": [
-          "tui/markdown",
-          "tui/md"
-        ],
-        "module": "omdev.tui.apps.markdown.__main__"
-      }
-    }
-  },
   {
     "module": ".tui.rich.diff.__main__",
     "attr": "_CLI_MODULE",

{omdev-0.0.46 → omdev-0.0.47}/omdev/__about__.py

@@ -64,9 +64,25 @@ class Project(ProjectBase):
 
         'tui': [
             'rich ~= 15.0',
-            'textual ~= 8.2',  # [syntax]
-            'textual-dev ~= 1.8',
-            'textual-speedups ~= 0.2',
+        ],
+
+        'tui-syntax': [
+            'tree-sitter ~= 0.26',
+            'tree-sitter-bash ~= 0.24',
+            'tree-sitter-css ~= 0.25',
+            'tree-sitter-go ~= 0.25',
+            'tree-sitter-html ~= 0.23',
+            'tree-sitter-java ~= 0.23',
+            'tree-sitter-javascript ~= 0.25',
+            'tree-sitter-json ~= 0.24',
+            'tree-sitter-markdown ~= 0.5',
+            'tree-sitter-python ~= 0.25',
+            'tree-sitter-regex ~= 0.25',
+            'tree-sitter-rust ~= 0.24',
+            'tree-sitter-sql ~= 0.3',
+            'tree-sitter-toml ~= 0.7',
+            'tree-sitter-xml ~= 0.7',
+            'tree-sitter-yaml ~= 0.7',
         ],
     }
 

{omdev-0.0.46 → omdev-0.0.47}/omdev/dockerdev/resources/.python-versions.json

@@ -1,9 +1,9 @@
 {
   "8": "3.8.20",
   "9": "3.9.25",
-  "10": "3.10.20",
-  "11": "3.11.15",
-  "12": "3.12.13",
+  "10": "3.10.21",
+  "11": "3.11.16",
+  "12": "3.12.14",
   "13": "3.13.15",
   "13d": "3.13.15d",
   "13t": "3.13.15t",

{omdev-0.0.46 → omdev-0.0.47}/omdev/dockerdev/resources/depsets/system.toml

@@ -85,6 +85,8 @@ deps = [
   'libgdbm6',
   'libpq-dev',
   'libsqlite3-dev',
+  'mysql-server',
+  'postgresql',
   'postgresql-client',
   'redis',
   'sqlite3',

omdev-0.0.47/omdev/dockerdev/resources/scripts/run-mysql

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -ex
+
+if ! sudo test -d /var/lib/mysql/mysql; then
+    sudo mysqld --initialize-insecure --user=mysql
+fi
+
+sudo install -d -o mysql -g mysql -m 0755 /var/run/mysqld
+
+sudo tee /var/run/mysqld/init.sql > /dev/null <<'SQL'
+ALTER USER 'root'@'localhost' IDENTIFIED WITH caching_sha2_password BY 'om';
+CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY 'om';
+ALTER USER 'root'@'%' IDENTIFIED WITH caching_sha2_password BY 'om';
+GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION;
+CREATE USER IF NOT EXISTS 'om'@'%' IDENTIFIED BY 'om';
+ALTER USER 'om'@'%' IDENTIFIED WITH caching_sha2_password BY 'om';
+SQL
+
+# --skip-log-error overrides the packaged config's log_error file and sends the error log to stderr instead. dumb-init
+# rewrites SIGINT to SIGTERM, as mysqld ignores SIGINT but shuts down cleanly on SIGTERM.
+exec sudo dumb-init --rewrite 2:15 mysqld --user=mysql --init-file=/var/run/mysqld/init.sql --skip-log-error

omdev-0.0.47/omdev/dockerdev/resources/scripts/run-postgres

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ex
+
+PG_VERSION=$(ls /usr/lib/postgresql | sort -n | tail -n 1)
+PG_BIN=/usr/lib/postgresql/$PG_VERSION/bin
+
+if ! pg_lsclusters -h | grep -q "^$PG_VERSION main "; then
+    sudo pg_createcluster "$PG_VERSION" main
+fi
+
+echo "ALTER USER postgres PASSWORD 'om';" | sudo runuser -u postgres -- "$PG_BIN/postgres" --single \
+    -D "/var/lib/postgresql/$PG_VERSION/main" \
+    -c "config_file=/etc/postgresql/$PG_VERSION/main/postgresql.conf" \
+    postgres
+
+exec sudo pg_ctlcluster "$PG_VERSION" main start --foreground

{omdev-0.0.46 → omdev-0.0.47}/omdev/specs/jsonschema/codegen/ir.py

@@ -119,7 +119,7 @@ class EmptyTypeDef(lang.Final):
     name: str
 
 
-TypeDef: ta.TypeAlias = ta.Union[  # noqa
+TypeDef: ta.TypeAlias = ta.Union[  # noqa: UP007
     ObjectTypeDef,
     StringEnumTypeDef,
     DiscriminatedUnionTypeDef,

{omdev-0.0.46 → omdev-0.0.47}/omdev/tools/cloc.py

@@ -41,9 +41,21 @@ _LANG = [
         comment_pats=(r'//', r'/\*', r'\*/'),
     ),
 
+    Lang(
+        'rust',
+        {'.rs'},
+        comment_pats=(r'//', r'/\*', r'\*/'),
+    ),
+
     Lang(
         'javascript',
-        {'.js'},
+        {'.js', '.mjs'},
+        comment_pats=(r'//', r'/\*', r'\*/'),
+    ),
+
+    Lang(
+        'typescript',
+        {'.ts'},
         comment_pats=(r'//', r'/\*', r'\*/'),
     ),
 ]

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/docs/documents.py

@@ -14,7 +14,7 @@ from .edits import TextEdit
 from .positions import Pos
 
 
-DocumentListener: ta.TypeAlias = ta.Callable[['Document', AppliedEdit], None]
+type DocumentListener = ta.Callable[[Document, AppliedEdit], None]
 
 
 ##

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/events/parsing.py

@@ -20,7 +20,7 @@ from omcore import lang
 from .types import Event
 
 
-ParseGenerator: ta.TypeAlias = ta.Generator['Read1', str]
+type ParseGenerator = ta.Generator[Read1, str]
 
 
 ##

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/text/markdownit.py

@@ -13,7 +13,7 @@ import typing as ta
 
 from omcore import dataclasses as dc
 
-from ....markdown import incparse
+from ....markdownit import incparse
 from .markdown import MarkdownStreamBackend
 from .markdown import MdBlock
 from .markdown import MdCode

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/text/segments.py

@@ -15,9 +15,9 @@ from omcore import lang
 from .styles import StyleLike
 
 
-Segments: ta.TypeAlias = ta.Sequence['Segment']
+type Segments = ta.Sequence[Segment]
 
-SegmentRows: ta.TypeAlias = ta.Sequence[ta.Sequence['Segment']]
+type SegmentRows = ta.Sequence[ta.Sequence[Segment]]
 
 
 ##

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/vim/engine.py

@@ -94,15 +94,22 @@ TOKEN_MOTIONS: ta.Mapping[str, str] = {
     '<end>': '$',
 }
 
+
+class Synonym(ta.NamedTuple):
+    op: str
+    mkey: str | None
+    doubled: bool
+
+
 # Synonym commands compile straight to op+motion / doubled op, like vim.
-SYNONYMS: ta.Mapping[str, tuple[str, str | None, bool]] = {
-    'x': ('d', 'l', False),
-    'X': ('d', 'h', False),
-    'D': ('d', '$', False),
-    'C': ('c', '$', False),
-    's': ('c', 'l', False),
-    'S': ('c', None, True),
-    'Y': ('y', None, True),
+SYNONYMS: ta.Mapping[str, Synonym] = {
+    'x': Synonym('d', 'l', False),
+    'X': Synonym('d', 'h', False),
+    'D': Synonym('d', '$', False),
+    'C': Synonym('c', '$', False),
+    's': Synonym('c', 'l', False),
+    'S': Synonym('c', None, True),
+    'Y': Synonym('y', None, True),
 }
 
 
@@ -471,8 +478,10 @@ class VimEngine:
         def make(pos: Pos) -> tuple[Pos, Pos, str] | None:
             if pos.col > 0:
                 return (Pos(pos.row, pos.col - 1), pos, '')
+
             if pos.row > 0:
                 return (Pos(pos.row - 1, llen(doc, pos.row - 1)), Pos(pos.row, 0), '')
+
             return None
 
         self._edit_at_cursors(make, lambda a: a.edit.start)
@@ -483,21 +492,29 @@ class VimEngine:
         def move(pos: Pos) -> Pos:
             if key == '<left>':
                 return Pos(pos.row, max(0, pos.col - 1))
+
             if key == '<right>':
                 return Pos(pos.row, min(pos.col + 1, llen(doc, pos.row)))
+
             if key == '<up>' and pos.row > 0:
                 return Pos(pos.row - 1, min(pos.col, llen(doc, pos.row - 1)))
+
             if key == '<down>' and pos.row + 1 < doc.line_count():
                 return Pos(pos.row + 1, min(pos.col, llen(doc, pos.row + 1)))
+
             if key == '<home>':
                 return Pos(pos.row, 0)
+
             if key == '<end>':
                 return Pos(pos.row, llen(doc, pos.row))
+
             if key == '<a-b>':  # emacs backward-word: start of the current/previous word
                 return word_back(doc, pos, 1, False)
+
             if key == '<a-f>':  # emacs forward-word: just past the end of the current/next word
                 end = word_end(doc, pos, 1, False)
                 return Pos(end.row, min(end.col + 1, llen(doc, end.row)))
+
             return pos
 
         self._set_all_cursors([move(c.pos) for c in self._cursors])
@@ -514,6 +531,7 @@ class VimEngine:
                 if pos.row > 0:
                     return (Pos(pos.row - 1, llen(doc, pos.row - 1)), pos, '')
                 return None
+
             start = word_back(doc, pos, 1, False)
             if start.row < pos.row:  # word-back crossed the newline; the kill stops at BOL (vim ctrl+w does too)
                 start = Pos(pos.row, 0)
@@ -529,6 +547,7 @@ class VimEngine:
                 if pos.row + 1 < doc.line_count():
                     return (pos, Pos(pos.row + 1, 0), '')
                 return None
+
             end = word_end(doc, pos, 1, False)  # emacs M-d kills through to the end of the next word
             return (pos, Pos(end.row, end.col + 1), '')
 
@@ -541,11 +560,15 @@ class VimEngine:
             if to_end:
                 if pos.col < (eol := llen(doc, pos.row)):
                     return (pos, Pos(pos.row, eol), '')
+
                 if pos.row + 1 < doc.line_count():  # emacs C-k at EOL kills the newline
                     return (pos, Pos(pos.row + 1, 0), '')
+
                 return None
+
             if pos.col > 0:
                 return (Pos(pos.row, 0), pos, '')
+
             return None
 
         self._edit_at_cursors(make, lambda a: a.edit.start)
@@ -577,12 +600,15 @@ class VimEngine:
         if key == '<c-w>':
             self._delete_word_back_at_cursors()
             return
+
         if key == '<a-d>':
             self._delete_word_fwd_at_cursors()
             return
+
         if key == '<c-k>':
             self._kill_to_line_edge_at_cursors(to_end=True)
             return
+
         if key == '<c-u>':
             self._kill_to_line_edge_at_cursors(to_end=False)
             return
@@ -649,7 +675,11 @@ class VimEngine:
             return False
 
         if rng is None:
-            rng = parse_ex_range('.', current_row=self.cursor.row, last_row=doc.line_count() - 1)[0]
+            rng = parse_ex_range(
+                '.',
+                current_row=self.cursor.row,
+                last_row=doc.line_count() - 1,
+            )[0]
             rng = check.not_none(rng)
 
         last_query = self._last_search[0] if self._last_search is not None else None
@@ -988,7 +1018,12 @@ class VimEngine:
                 return None
             lk, ch = self._last_ft
             if k == ',':
-                lk = {'f': 'F', 'F': 'f', 't': 'T', 'T': 't'}[lk]
+                lk = {
+                    'f': 'F',
+                    'F': 'f',
+                    't': 'T',
+                    'T': 't',
+                }[lk]
             fwd, till = lk in 'ft', lk in 'tT'
             t_ = find_char(doc, p, ch, n, forward=fwd, till=till, repeat=True)
             if t_ is None:
@@ -1080,9 +1115,11 @@ class VimEngine:
 
     def _extract(self, span: Span) -> tuple[list[str], SpanKind]:
         doc = self._doc
+
         if span.kind is SpanKind.LINEWISE:
             return ([doc.line(r) for r in range(span.start.row, span.end.row + 1)], SpanKind.LINEWISE)
-        if span.kind is SpanKind.BLOCK:
+
+        elif span.kind is SpanKind.BLOCK:
             return (
                 [
                     doc.line(r)[span.start.col: min(span.end.col, llen(doc, r))]
@@ -1090,10 +1127,13 @@ class VimEngine:
                 ],
                 SpanKind.BLOCK,
             )
-        return (doc.get_text(span.start, span.end).split('\n'), SpanKind.EXCLUSIVE)
+
+        else:
+            return (doc.get_text(span.start, span.end).split('\n'), SpanKind.EXCLUSIVE)
 
     def _delete_span(self, span: Span) -> None:
         doc = self._doc
+
         if span.kind is SpanKind.BLOCK:
             # Row-local deletes: column positions on other rows are unaffected, so order doesn't matter.
             for r in range(span.start.row, span.end.row + 1):
@@ -1105,7 +1145,8 @@ class VimEngine:
             pos = clamp_col(doc, self._doc.clamp(Pos(span.start.row, span.start.col)))
             self._set_cursor(pos, want=pos.col)
             return
-        if span.kind is SpanKind.LINEWISE:
+
+        elif span.kind is SpanKind.LINEWISE:
             r1, r2 = span.start.row, span.end.row
             last = doc.line_count() - 1
             if r2 >= last:
@@ -1118,6 +1159,7 @@ class VimEngine:
             row = min(r1, doc.line_count() - 1)
             col = first_nonblank(doc, row)
             self._set_cursor(Pos(row, col), want=col)
+
         else:
             doc.delete(span.start, span.end)
             pos = clamp_col(doc, span.start)
@@ -1141,20 +1183,27 @@ class VimEngine:
         if a and a in 'iIaAoO':
             self._begin_change()
             line = doc.line(cur.row)
+
             if a == 'i':
                 pass
+
             elif a == 'I':
                 self._set_cursor(Pos(cur.row, first_nonblank(doc, cur.row)))
+
             elif a == 'a':
                 self._set_cursor(Pos(cur.row, cur.col + 1 if line else 0))
+
             elif a == 'A':
                 self._set_cursor(Pos(cur.row, len(line)))
+
             elif a == 'o':
                 doc.insert(Pos(cur.row, len(line)), '\n')
                 self._set_cursor(Pos(cur.row + 1, 0))
+
             elif a == 'O':
                 doc.insert(Pos(cur.row, 0), '\n')
                 self._set_cursor(Pos(cur.row, 0))
+
             self._mode = Mode.INSERT
             return True
 

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/vim/parsing.py

@@ -19,7 +19,7 @@ from .motions import MOTION_NEEDS_ARG
 from .textobjs import TEXTOBJ_KEYS
 
 
-ParseResult: ta.TypeAlias = tuple[str, ta.Optional['Command']]  # ('more'|'cmd'|'abort', command)
+type ParseResult = tuple[str, Command | None]  # ('more'|'cmd'|'abort', command)
 
 
 ##

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/vim/status.py

@@ -11,24 +11,27 @@ from .modes import Mode
 ##
 
 
+MODE_TEXT_MAP = {
+    Mode.NORMAL: '',
+    Mode.INSERT: '-- INSERT --',
+    Mode.VISUAL: '-- VISUAL --',
+    Mode.VISUAL_LINE: '-- VISUAL LINE --',
+    Mode.VISUAL_BLOCK: '-- VISUAL BLOCK --',
+    Mode.CMDLINE: '',
+}
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class VimStatus(lang.Final):
     mode: Mode
-    pending: str = ''            # keys of an in-progress normal-mode command ('"a2d' ...)
-    cmdline: str | None = None   # full command line incl. its ':'/'/'/'?' prefix, when in CMDLINE mode
-    message: str = ''            # transient message (errors, ex feedback)
-    cursor_count: int = 1        # >1 during multi-cursor (blockwise insert, add_cursor)
+    pending: str = ''           # keys of an in-progress normal-mode command ('"a2d' ...)
+    cmdline: str | None = None  # full command line incl. its ':'/'/'/'?' prefix, when in CMDLINE mode
+    message: str = ''           # transient message (errors, ex feedback)
+    cursor_count: int = 1       # >1 during multi-cursor (blockwise insert, add_cursor)
 
     @property
     def mode_text(self) -> str:
-        return {
-            Mode.NORMAL: '',
-            Mode.INSERT: '-- INSERT --',
-            Mode.VISUAL: '-- VISUAL --',
-            Mode.VISUAL_LINE: '-- VISUAL LINE --',
-            Mode.VISUAL_BLOCK: '-- VISUAL BLOCK --',
-            Mode.CMDLINE: '',
-        }[self.mode]
+        return MODE_TEXT_MAP[self.mode]
 
 
 ##

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/vim/substitutes.py

@@ -90,12 +90,22 @@ def parse_ex_range(
     if text.startswith('%'):
         return (ExRange(0, last_row), text[1:])
 
-    first, rest = _parse_address(text, current_row=current_row, last_row=last_row, visual=visual)
+    first, rest = _parse_address(
+        text,
+        current_row=current_row,
+        last_row=last_row,
+        visual=visual,
+    )
     if first is None:
         return (None, text)
 
     if rest.startswith(','):
-        second, rest2 = _parse_address(rest[1:], current_row=current_row, last_row=last_row, visual=visual)
+        second, rest2 = _parse_address(
+            rest[1:],
+            current_row=current_row,
+            last_row=last_row,
+            visual=visual,
+        )
         if second is None:
             return (None, text)
         lo, hi = sorted((first, second))
@@ -247,4 +257,8 @@ def apply_substitute(
     if not replaced:
         raise SubstituteError(f'Pattern not found: {pattern}')
 
-    return SubstituteResult(replaced=replaced, lines=lines_changed, last_row=last_changed)
+    return SubstituteResult(
+        replaced=replaced,
+        lines=lines_changed,
+        last_row=last_changed,
+    )

{omdev-0.0.46 → omdev-0.0.47}/omdev/tui/minitui/vim/textobjs.py

@@ -151,10 +151,27 @@ def _obj_quote(doc: Document, p: Pos, *, around: bool, q: str) -> Span | None:
 
 def textobj(doc: Document, p: Pos, *, around: bool, obj: str, count: int) -> Span | None:
     if obj in 'wW':
-        return _obj_word(doc, p, around=around, big=obj == 'W', count=count)
+        return _obj_word(
+            doc,
+            p,
+            around=around,
+            big=obj == 'W',
+            count=count,
+        )
     if obj in PAIRS:
         pair = PAIRS[obj]
-        return _obj_pair(doc, p, around=around, open_ch=pair[0], close_ch=pair[1])
+        return _obj_pair(
+            doc,
+            p,
+            around=around,
+            open_ch=pair[0],
+            close_ch=pair[1],
+        )
     if obj in QUOTES:
-        return _obj_quote(doc, p, around=around, q=obj)
+        return _obj_quote(
+            doc,
+            p,
+            around=around,
+            q=obj,
+        )
     return None