check pyproject for ruff entry, add (.)ruff.toml

jhossbach · jhossbach · commit d6755afaae89 · 2023-04-11T15:28:19.000+02:00
diff --git a/pylsp_ruff/plugin.py b/pylsp_ruff/plugin.py
@@ -6,6 +6,11 @@
 from subprocess import PIPE, Popen
 from typing import Dict, Generator, List, Optional
 
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
+
 from lsprotocol.types import (
     CodeAction,
     CodeActionContext,
@@ -527,12 +532,23 @@ def load_settings(workspace: Workspace, document_path: str) -> PluginSettings:
         workspace.root_path, document_path, ["pyproject.toml"]
     )
 
-    # Check if pyproject is present, ignore user settings if toml exists
+    config_in_pyproject = False
     if pyproject_file:
-        log.debug(
-            f"Found pyproject file: {str(pyproject_file[0])}, "
-            + "skipping pylsp config."
-        )
+        try:
+            with open(pyproject_file[0], "rb") as f:
+                toml_dict = tomllib.load(f)
+        except tomllib.TOMLDecodeError:
+            log.warn("Error while parsing toml file, ignoring config.")
+        if "tool.ruff" in toml_dict:
+            config_in_pyproject = True
+
+    ruff_toml = find_parents(
+        workspace.root_path, document_path, ["ruff.toml", ".ruff.toml"]
+    )
+
+    # Check if pyproject is present, ignore user settings if toml exists
+    if config_in_pyproject or ruff_toml:
+        log.debug("Found existing configuration for ruff, skipping pylsp config.")
         # Leave config to pyproject.toml
         return PluginSettings(
             enabled=plugin_settings.executable,
diff --git a/pyproject.toml b/pyproject.toml
@@ -16,6 +16,7 @@ dependencies = [
   "ruff>=0.0.260",
   "python-lsp-server",
   "lsprotocol>=2022.0.0a1",
+  "tomli>=1.1.0; python_version < '3.11'",
 ]
 
 [project.optional-dependencies]

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ dependencies = [`
`16`	`16`	`"ruff>=0.0.260",`
`17`	`17`	`"python-lsp-server",`
`18`	`18`	`"lsprotocol>=2022.0.0a1",`
	`19`	`+ "tomli>=1.1.0; python_version < '3.11'",`
`19`	`20`	`]`
`20`	`21`
`21`	`22`	`[project.optional-dependencies]`