Merge branch 'main' into pokey/attempt-to-make-macos-ci-more-robust

.github/workflows/forbid-todo.yml

@@ -0,0 +1,15 @@
+name: Forbid TODO
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  merge_group:
+    branches: [main]
+
+jobs:
+  forbid-todo:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Forbid TODO
+        run: ./scripts/forbid-todo.sh

.github/workflows/test.yml

@@ -72,5 +72,3 @@ jobs:
           name: dumps
           path: ${{ env.VSCODE_CRASH_DIR }}
         if: failure()
-      - name: Forbid TODOs
-        run: ./scripts/forbid-todo.sh

.pre-commit-config.yaml

@@ -76,11 +76,8 @@ repos:
     hooks:
       - id: flynt
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.11
+    rev: v0.4.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.1.1
-    hooks:
-      - id: black
+      - id: ruff-format

.vscode/settings.json

@@ -1,7 +1,7 @@
 // Place your settings in this file to overwrite default and user settings.
 {
   "[python]": {
-    "editor.defaultFormatter": "ms-python.black-formatter"
+    "editor.defaultFormatter": "charliermarsh.ruff"
   },
   "[scm]": {
     "editor.defaultFormatter": "AndreasArvidsson.andreas-talon"

cursorless-talon/src/marks/decorated_mark.py

@@ -23,7 +23,7 @@ def cursorless_grapheme(m) -> str:
     except AttributeError:
         # NB: This represents unknown char in Unicode.  It will be translated
         # to "[unk]" by Cursorless extension.
-        return "\uFFFD"
+        return "\ufffd"
 
 
 @mod.capture(

cursorless-talon/src/private_api/private_api.py

@@ -31,7 +31,7 @@ def cursorless_private_build_primitive_target(
         return PrimitiveTarget(mark, modifiers)
 
     def cursorless_private_build_list_target(
-        elements: list[Union[PrimitiveTarget, RangeTarget]]
+        elements: list[Union[PrimitiveTarget, RangeTarget]],
     ) -> Union[PrimitiveTarget, ListTarget]:
         """Cursorless private api low-level target builder: Create a list target"""
         if len(elements) == 1:

pyproject.toml

@@ -8,10 +8,12 @@ force-exclude = '''
 '''
 
 [tool.ruff]
-select = ["E", "F", "C4", "I001", "UP", "SIM"]
-ignore = ["E501", "SIM105", "UP007", "UP035"]
 target-version = "py311"
 extend-exclude = ["vendor", "data/playground/**/*.py"]
 
+[tool.ruff.lint]
+select = ["E", "F", "C4", "I001", "UP", "SIM"]
+ignore = ["E501", "SIM105", "UP007", "UP035"]
+
 [tool.pyright]
 reportSelfClsParameterName = false

scripts/forbid-todo.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 
 # Find the string 'TODO' in all files tracked by git, excluding
 # this file
-TODOS_FOUND=$(git grep --color=always -nw TODO -- ':!scripts/forbid-todo.sh' || true)
+TODOS_FOUND=$(git grep --color=always -nw TODO -- ':!scripts/forbid-todo.sh' ':!.github/workflows/forbid-todo.yml' || true)
 
 if [ -n "$TODOS_FOUND" ]; then
   printf "\e[1;31mERROR: \e[0mTODOs found in codebase:\n"