Change LSPArray and LSPObject types to be more lax (#30)

Author: rchl

generate.py

@@ -33,6 +33,11 @@
     'ApplyKind': 'IntFlag',
 }
 
+ALIAS_OVERRIDES: dict[str, str] = {
+    'LSPArray': "Sequence['LSPAny']",
+    'LSPObject': 'Mapping[str, Any]'
+}
+
 
 def generate(output: str) -> None:
     reset_new_literal_structures()
@@ -48,7 +53,7 @@ def generate(output: str) -> None:
             f'# LSP v{specification_version}\n',
             'from __future__ import annotations',
             'from enum import IntEnum, IntFlag, StrEnum',
-            'from typing import Dict, List, Literal, TypedDict, Union',
+            'from typing import Any, Dict, List, Literal, Mapping, Sequence, TypedDict, Union',
             'from typing_extensions import NotRequired\n\n',
             'URI = str',
             'DocumentUri = str',
@@ -60,7 +65,7 @@ def generate(output: str) -> None:
     content += '\n\n\n'
     content += '\n\n\n'.join(generate_enumerations(lsp_json['enumerations'], ENUM_OVERRIDES))
     content += '\n\n'
-    content += '\n'.join(generate_type_aliases(lsp_json['typeAliases']))
+    content += '\n'.join(generate_type_aliases(lsp_json['typeAliases'], ALIAS_OVERRIDES))
     content += '\n\n\n'
     content += '\n\n\n'.join(generate_structures(lsp_json['structures']))
     content += '\n\n'

generated/lsp_types.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 from enum import IntEnum, IntFlag, StrEnum
-from typing import Dict, List, Literal, TypedDict, Union
+from typing import Any, Dict, List, Literal, Mapping, Sequence, TypedDict, Union
 from typing_extensions import NotRequired
 
 
@@ -865,7 +865,7 @@ class TokenFormat(StrEnum):
 the defining symbol
 """
 
-LSPArray = List['LSPAny']
+LSPArray = Sequence['LSPAny']
 """
 LSP arrays.
 @since 3.17.0
@@ -970,7 +970,7 @@ class TokenFormat(StrEnum):
 @since 3.17.0 - support for NotebookCellTextDocumentFilter.
 """
 
-LSPObject = Dict[str, 'LSPAny']
+LSPObject = Mapping[str, Any]
 """
 LSP object definition.
 @since 3.17.0
@@ -6079,7 +6079,7 @@ class ParameterInformation(TypedDict):
     have a label and a doc-comment.
     """
 
-    label: Union[str, tuple[Uint, Uint]]
+    label: Union[str, list[Uint]]
     """
     The label of this parameter information.
 

utils/generate_type_aliases.py

@@ -6,11 +6,14 @@
     from lsp_schema import TypeAlias
 
 
-def generate_type_aliases(type_aliases: list[TypeAlias]) -> list[str]:
+def generate_type_aliases(type_aliases: list[TypeAlias], overrides: dict[str, str]) -> list[str]:
     def to_string(type_alias: TypeAlias) -> str:
         symbol_name = type_alias['name']
         documentation = format_comment(type_alias.get('documentation'))
-        value = format_type(type_alias['type'], {'root_symbol_name': symbol_name}, StructureKind.Class)
+        if symbol_name in overrides:
+            value = overrides[symbol_name]
+        else:
+            value = format_type(type_alias['type'], {'root_symbol_name': symbol_name}, StructureKind.Class)
         result = f"""
 {symbol_name} = {value}"""
         if documentation:

utils/helpers.py

@@ -90,7 +90,7 @@ def format_type(typ: EveryType, context: FormatTypeContext, preferred_structure_
         return f'Union[{", ".join(union)}]'
     elif typ['kind'] == 'tuple':
         union = [format_type(item, context, preferred_structure_kind) for item in typ['items']]
-        return f'tuple[{", ".join(union)}]'
+        return f'list[{" | ".join(set(union))}]'
     elif typ['kind'] == 'literal':
         if not typ['value']['properties']:
             return 'Dict[str, LSPAny]'