🔀 Merge pull request #86 from davep/tighten-linting

Tighten linting rules

Author: davep

Makefile

@@ -7,7 +7,7 @@ build    := uv build
 publish  := uv publish --username=__token__ --keyring-provider=subprocess
 python   := $(run) python
 ruff     := $(run) ruff
-lint     := $(ruff) check --select I
+lint     := $(ruff) check
 fmt      := $(ruff) format
 mypy     := $(run) mypy
 mkdocs   := $(run) mkdocs

pyproject.toml

@@ -70,3 +70,26 @@ explicit = true
 venvPath="."
 venv=".venv"
 exclude=[".venv"]
+
+[tool.ruff.lint]
+select = [
+    # pycodestyle
+    "E",
+    # Pyflakes
+    "F",
+    # pyupgrade
+    "UP",
+    # flake8-bugbear
+    "B",
+    # flake8-simplify
+    "SIM",
+    # isort
+    "I",
+]
+ignore = [
+    # I think try...expect...pass reads far better.
+    "SIM105",
+]
+
+[tool.ruff.lint.pycodestyle]
+max-line-length = 120

src/textual_fspicker/parts/directory_navigation.py

@@ -6,10 +6,11 @@
 
 ##############################################################################
 # Python imports.
+from collections.abc import Iterable
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
-from typing import ClassVar, Iterable, NamedTuple, Optional
+from typing import ClassVar, Final, NamedTuple, Optional
 
 ##############################################################################
 # Rich imports.
@@ -26,7 +27,6 @@
 from textual.widgets import OptionList
 from textual.widgets.option_list import Option
 from textual.worker import get_current_worker
-from typing_extensions import Final
 
 ##############################################################################
 # Local imports.
@@ -348,9 +348,12 @@ def hide(self, path: Path) -> bool:
             `True` if the path should be hidden, `False` if not.
         """
         # If there's a custom filter in place, give that a go first...
-        if self.file_filter is not None and is_file(path):
-            if not self.file_filter(path):
-                return True
+        if (
+            self.file_filter is not None
+            and is_file(path)
+            and not self.file_filter(path)
+        ):
+            return True
         # Either there is no custom filter, or whatever we're looking at
         # passed so far; not do final checks.
         return self.is_hidden(path) and not self.show_hidden