Merge branch 'main' into fix/virtual_documents_dir

Author: jhossbach

pyproject.toml

@@ -7,7 +7,7 @@ name = "python-lsp-ruff"
 authors = [
   {name = "Julian Hossbach", email = "julian.hossbach@gmx.de"}
 ]
-version = "2.3.1"
+version = "2.3.2"
 description = "Ruff linting plugin for pylsp"
 readme = "README.md"
 requires-python = ">=3.8"

tests/test_ruff_lint.py

@@ -141,12 +141,13 @@ def get_ruff_settings(workspace, doc, config_str):
 
 def test_ruff_settings(workspace):
     config_str = r"""[tool.ruff]
+select = ["E402", "F401", "F841"]
 ignore = ["F841"]
 exclude = [
     "blah/__init__.py",
     "file_2.py"
 ]
-extend-select = ["D"]
+extend-select = ["D103", "D104"]
 [tool.ruff.per-file-ignores]
 "test_something.py" = ["F401"]
 """
@@ -290,6 +291,11 @@ def test_ruff_lint_strips_virtual_documents_path(notebook_workspace):
 
 
 def test_notebook_input(workspace):
+    # Explicitly enable the rules we're expecting to find.
+    workspace._config.update(
+        {"plugins": {"ruff": {"select": ["E402", "F401", "F841"]}}}
+    )
+
     doc_str = r"""
 print('hi')
 import os