Merge pull request pappasam#283 from PeterJCLaw/remove-pydantic

Author: pappasam

jedi_language_server/initialization_options.py

@@ -4,18 +4,23 @@
 initialization options.
 """
 
-from dataclasses import dataclass, field
+import re
+import sys
+from dataclasses import dataclass, field, fields, is_dataclass
 from typing import Any, List, Optional, Pattern, Set
 
-from attrs import fields, has
 from cattrs import Converter
 from cattrs.gen import make_dict_structure_fn, override
 from lsprotocol.types import MarkupKind
 
 # pylint: disable=missing-class-docstring
 # pylint: disable=too-few-public-methods
 
-light_dataclass = dataclass(kw_only=True, eq=False, match_args=False)
+if sys.version_info >= (3, 10):
+    # pylint: disable-next=unexpected-keyword-arg
+    light_dataclass = dataclass(kw_only=True, eq=False, match_args=False)
+else:
+    light_dataclass = dataclass(eq=False)
 
 
 @light_dataclass
@@ -148,5 +153,16 @@ def structure(cls: type) -> Any:
 
 
 initialization_options_converter.register_structure_hook_factory(
-    has, structure
+    is_dataclass, structure
+)
+
+
+initialization_options_converter.register_structure_hook_factory(
+    lambda x: x == Pattern[str],
+    lambda _: lambda x, _: re.compile(x),
+)
+
+initialization_options_converter.register_unstructure_hook_factory(
+    lambda x: x == Pattern[str],
+    lambda _: lambda x: x.pattern,
 )

tests/test_initialization_options.py

@@ -0,0 +1,46 @@
+"""Test parsing of the initialization options."""
+
+import re
+
+from hamcrest import assert_that, is_
+
+from jedi_language_server.initialization_options import (
+    InitializationOptions,
+    initialization_options_converter,
+)
+
+
+def test_initialization_options() -> None:
+    """Test our adjustments to parsing of the initialization options."""
+
+    initialization_options = initialization_options_converter.structure(
+        {
+            "completion": {
+                "resolveEagerly": True,
+                "ignorePatterns": [r"foo", r"bar/.*"],
+            },
+            "hover": {
+                "disable": {
+                    "keyword": {"all": False},
+                    "class": {"all": True},
+                    "function": {"all": True},
+                },
+            },
+            "extra": "ignored",
+        },
+        InitializationOptions,
+    )
+
+    assert_that(initialization_options.completion.resolve_eagerly, is_(True))
+    assert_that(
+        initialization_options.completion.ignore_patterns,
+        is_(
+            [
+                re.compile(r"foo"),
+                re.compile(r"bar/.*"),
+            ]
+        ),
+    )
+    assert_that(initialization_options.hover.disable.keyword_.all, is_(False))
+    assert_that(initialization_options.hover.disable.class_.all, is_(True))
+    assert_that(initialization_options.hover.disable.function_.all, is_(True))