Merge pull request #172 from asottile/all-repos_autofix_gh-funding-default

Use org-default .github/FUNDING.yml

.github/FUNDING.yml

@@ -1 +0,0 @@
-github: asottile

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
     -   id: name-tests-test
     -   id: requirements-txt-fixer
 -   repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+    rev: 4.0.1
     hooks:
     -   id: flake8
         additional_dependencies: [flake8-typing-imports==1.7.0]
@@ -25,20 +25,20 @@ repos:
     -   id: reorder-python-imports
         args: [--py3-plus, --add-import, 'from __future__ import annotations']
 -   repo: https://github.com/asottile/add-trailing-comma
-    rev: v2.1.0
+    rev: v2.2.1
     hooks:
     -   id: add-trailing-comma
         args: [--py36-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.25.0
+    rev: v2.29.1
     hooks:
     -   id: pyupgrade
         args: [--py37-plus]
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.17.0
+    rev: v1.20.0
     hooks:
     -   id: setup-cfg-fmt
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910
+    rev: v0.910-1
     hooks:
     -   id: mypy

babi/__main__.py

@@ -3,4 +3,4 @@ from __future__ import annotations
 from babi.main import main
 
 if __name__ == '__main__':
-    exit(main())
+    raise SystemExit(main())

babi/hl/syntax.py

@@ -20,6 +20,8 @@ from babi.user_data import prefix_data
 from babi.user_data import xdg_config
 from babi.user_data import xdg_data
 
+A_ITALIC = getattr(curses, 'A_ITALIC', 0x80000000)  # not always present
+
 
 class FileSyntax:
     include_edge = False
@@ -47,7 +49,7 @@ class FileSyntax:
         return (
             curses.color_pair(pair) |
             curses.A_BOLD * style.b |
-            curses.A_ITALIC * style.i |
+            A_ITALIC * style.i |
             curses.A_UNDERLINE * style.u
         )
 

babi/main.py

@@ -152,4 +152,4 @@ def main(argv: Sequence[str] | None = None) -> int:
 
 
 if __name__ == '__main__':
-    exit(main())
+    raise SystemExit(main())

babi/screen.py

@@ -7,6 +7,7 @@ import hashlib
 import os
 import re
 import signal
+import sre_parse
 import sys
 from typing import Generator
 from typing import NamedTuple
@@ -419,7 +420,12 @@ class Screen:
                 'replace with', history='replace', allow_empty=True,
             )
             if response is not PromptResult.CANCELLED:
-                self.file.replace(self, search_response, response)
+                try:
+                    sre_parse.parse_template(response, search_response)
+                except re.error:
+                    self.status.update('invalid replacement string')
+                else:
+                    self.file.replace(self, search_response, response)
 
     def command(self) -> EditResult | None:
         response = self.prompt('', history='command')

babi/textmate_demo.py

@@ -67,4 +67,4 @@ def main(argv: Sequence[str] | None = None) -> int:
 
 
 if __name__ == '__main__':
-    exit(main())
+    raise SystemExit(main())

bin/download-theme

@@ -87,4 +87,4 @@ def main() -> int:
 
 
 if __name__ == '__main__':
-    exit(main())
+    raise SystemExit(main())

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = babi
-version = 0.0.22
+version = 0.0.24
 description = a text editor
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -16,6 +16,7 @@ classifiers =
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
 
@@ -25,7 +26,7 @@ install_requires =
     babi-grammars
     identify
     onigurumacffi>=0.0.18
-    importlib_metadata>=1;python_version<"3.8"
+    importlib-metadata>=1;python_version<"3.8"
     windows-curses;sys_platform=="win32"
 python_requires = >=3.7
 

tests/features/replace_test.py

@@ -22,6 +22,16 @@ def test_replace_invalid_regex(run):
         h.await_text("invalid regex: '('")
 
 
+def test_replace_invalid_replacement(run, ten_lines):
+    with run(str(ten_lines)) as h, and_exit(h):
+        h.press('^\\')
+        h.await_text('search (to replace):')
+        h.press_and_enter('line_0')
+        h.await_text('replace with:')
+        h.press_and_enter('\\')
+        h.await_text('invalid replacement string')
+
+
 def test_replace_cancel_at_replace_string(run):
     with run() as h, and_exit(h):
         h.press('^\\')