Fix formatting issues reported by the latest Ruff version (#616)

python-lsp · Feb 6, 2025 · cf2d16d · cf2d16d
1 parent 17fe8d1
commit cf2d16d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -39,7 +39,7 @@ jobs:
       # This error cannot be resolved by adding a pylint: disable=unused-argument comment ...
       - run: |
           pip install -e .[pylint,pycodestyle]
-          pip install ruff
+          pip install ruff==0.9.4
       - name: ruff linter and code style checks
         run: ruff check pylsp test
       - name: ruff code formatter check

diff --git a/pylsp/_utils.py b/pylsp/_utils.py
@@ -19,7 +19,7 @@
 # Eol chars accepted by the LSP protocol
 # the ordering affects performance
 EOL_CHARS = ["\r\n", "\r", "\n"]
-EOL_REGEX = re.compile(f'({"|".join(EOL_CHARS)})')
+EOL_REGEX = re.compile(f"({'|'.join(EOL_CHARS)})")
 
 log = logging.getLogger(__name__)
 

diff --git a/test/plugins/test_completion.py b/test/plugins/test_completion.py
@@ -65,6 +65,7 @@ class TypeCase(NamedTuple):
     expected: lsp.CompletionItemKind
 
 
+# fmt: off
 TYPE_CASES: Dict[str, TypeCase] = {
     "variable": TypeCase(
         document="test = 1\ntes",
@@ -115,6 +116,7 @@ class TypeCase(NamedTuple):
         expected=lsp.CompletionItemKind.Property,
     ),
 }
+# fmt: on
 
 
 @pytest.mark.parametrize("case", list(TYPE_CASES.values()), ids=list(TYPE_CASES.keys()))

diff --git a/test/test_utils.py b/test/test_utils.py
@@ -45,14 +45,14 @@ def notebook_with_python_cells(cells: List[str]):
             "cells": [
                 {
                     "kind": NotebookCellKind.Code,
-                    "document": f"cell_{i+1}_uri",
+                    "document": f"cell_{i + 1}_uri",
                 }
                 for i in range(len(cells))
             ],
         },
         "cellTextDocuments": [
             {
-                "uri": f"cell_{i+1}_uri",
+                "uri": f"cell_{i + 1}_uri",
                 "languageId": "python",
                 "text": cell,
             }

diff --git a/test/test_workspace.py b/test/test_workspace.py
@@ -238,7 +238,7 @@ def test_workspace_loads_pycodestyle_config(pylsp, tmpdir) -> None:
     # Test that project settings are loaded
     workspace2_dir = tmpdir.mkdir("NewTest456")
     cfg = workspace2_dir.join("pycodestyle.cfg")
-    cfg.write("[pycodestyle]\n" "max-line-length = 1000")
+    cfg.write("[pycodestyle]\nmax-line-length = 1000")
 
     workspace1 = {"uri": str(workspace1_dir)}
     workspace2 = {"uri": str(workspace2_dir)}
@@ -257,7 +257,7 @@ def test_workspace_loads_pycodestyle_config(pylsp, tmpdir) -> None:
     # Test switching to another workspace with different settings
     workspace3_dir = tmpdir.mkdir("NewTest789")
     cfg1 = workspace3_dir.join("pycodestyle.cfg")
-    cfg1.write("[pycodestyle]\n" "max-line-length = 20")
+    cfg1.write("[pycodestyle]\nmax-line-length = 20")
 
     workspace3 = {"uri": str(workspace3_dir)}
 
@@ -310,9 +310,9 @@ def test_progress_simple(workspace, consumer) -> None:
     assert init_call[0][0]["method"] == "window/workDoneProgress/create"
 
     # same method for all calls
-    assert all(
-        call[0][0]["method"] == "$/progress" for call in progress_calls
-    ), consumer.call_args_list
+    assert all(call[0][0]["method"] == "$/progress" for call in progress_calls), (
+        consumer.call_args_list
+    )
 
     # same token used in all calls
     assert (