refactor: change method() to iter_methods()

observerw · observerw · commit a292649d7f87 · 2025-12-25T00:48:18.000+08:00
diff --git a/src/lsp_client/capability/notification/did_change_configuration.py b/src/lsp_client/capability/notification/did_change_configuration.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator
 from typing import Any, Protocol, override, runtime_checkable
 
 from lsp_client.protocol import CapabilityClientProtocol, WorkspaceCapabilityProtocol
@@ -19,8 +19,9 @@ class WithNotifyDidChangeConfiguration(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.WORKSPACE_DID_CHANGE_CONFIGURATION,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.WORKSPACE_DID_CHANGE_CONFIGURATION,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/notification/text_document_synchronize.py b/src/lsp_client/capability/notification/text_document_synchronize.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from lsp_client.protocol import CapabilityClientProtocol, TextDocumentCapabilityProtocol
@@ -21,8 +21,9 @@ class WithNotifyTextDocumentSynchronize(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (
             lsp_type.TEXT_DOCUMENT_DID_OPEN,
             lsp_type.TEXT_DOCUMENT_DID_CHANGE,
             lsp_type.TEXT_DOCUMENT_DID_CLOSE,
diff --git a/src/lsp_client/capability/request/call_hierarchy.py b/src/lsp_client/capability/request/call_hierarchy.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 import asyncer
@@ -25,8 +25,9 @@ class WithRequestCallHierarchy(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (
             lsp_type.TEXT_DOCUMENT_PREPARE_CALL_HIERARCHY,
             lsp_type.CALL_HIERARCHY_INCOMING_CALLS,
             lsp_type.CALL_HIERARCHY_OUTGOING_CALLS,
diff --git a/src/lsp_client/capability/request/completion.py b/src/lsp_client/capability/request/completion.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 import asyncer
@@ -27,8 +27,9 @@ class WithRequestCompletion(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (
             lsp_type.TEXT_DOCUMENT_COMPLETION,
             lsp_type.COMPLETION_ITEM_RESOLVE,
         )
diff --git a/src/lsp_client/capability/request/declaration.py b/src/lsp_client/capability/request/declaration.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from loguru import logger
@@ -23,8 +23,9 @@ class WithRequestDeclaration(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_DECLARATION,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_DECLARATION,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/definition.py b/src/lsp_client/capability/request/definition.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from loguru import logger
@@ -26,8 +26,9 @@ class WithRequestDefinition(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_DEFINITION,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_DEFINITION,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/document_symbol.py b/src/lsp_client/capability/request/document_symbol.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from loguru import logger
@@ -23,8 +23,9 @@ class WithRequestDocumentSymbol(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return ("text_document/document_symbol",)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from ("text_document/document_symbol",)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/hover.py b/src/lsp_client/capability/request/hover.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator
 from typing import Protocol, override, runtime_checkable
 
 from lsp_client.jsonrpc.id import jsonrpc_uuid
@@ -20,8 +20,9 @@ class WithRequestHover(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_HOVER,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_HOVER,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/implementation.py b/src/lsp_client/capability/request/implementation.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from loguru import logger
@@ -23,8 +23,9 @@ class WithRequestImplementation(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_IMPLEMENTATION,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_IMPLEMENTATION,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/inlay_hint.py b/src/lsp_client/capability/request/inlay_hint.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 import asyncer
@@ -25,8 +25,9 @@ class WithRequestInlayHint(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (
             lsp_type.TEXT_DOCUMENT_INLAY_HINT,
             lsp_type.INLAY_HINT_RESOLVE,
         )
diff --git a/src/lsp_client/capability/request/inline_value.py b/src/lsp_client/capability/request/inline_value.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from lsp_client.jsonrpc.id import jsonrpc_uuid
@@ -20,8 +20,9 @@ class WithRequestInlineValue(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_INLINE_VALUE,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_INLINE_VALUE,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/pull_diagnostic.py b/src/lsp_client/capability/request/pull_diagnostic.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from loguru import logger
@@ -25,8 +25,9 @@ class WithRequestPullDiagnostic(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_DIAGNOSTIC,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_DIAGNOSTIC,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/reference.py b/src/lsp_client/capability/request/reference.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from lsp_client.jsonrpc.id import jsonrpc_uuid
@@ -20,8 +20,9 @@ class WithRequestReferences(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_REFERENCES,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_REFERENCES,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/signature_help.py b/src/lsp_client/capability/request/signature_help.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator
 from typing import Protocol, override, runtime_checkable
 
 import attrs
@@ -22,8 +22,9 @@ class WithRequestSignatureHelp(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_SIGNATURE_HELP,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_SIGNATURE_HELP,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/type_definition.py b/src/lsp_client/capability/request/type_definition.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from loguru import logger
@@ -23,8 +23,9 @@ class WithRequestTypeDefinition(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_TYPE_DEFINITION,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_TYPE_DEFINITION,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/request/type_hierarchy.py b/src/lsp_client/capability/request/type_hierarchy.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 import asyncer
@@ -22,8 +22,9 @@ class WithRequestTypeHierarchy(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (
             lsp_type.TEXT_DOCUMENT_PREPARE_TYPE_HIERARCHY,
             lsp_type.TYPE_HIERARCHY_SUPERTYPES,
             lsp_type.TYPE_HIERARCHY_SUBTYPES,
diff --git a/src/lsp_client/capability/request/workspace_symbol.py b/src/lsp_client/capability/request/workspace_symbol.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator, Sequence
 from typing import Protocol, override, runtime_checkable
 
 from lsp_client.jsonrpc.id import jsonrpc_uuid
@@ -20,8 +20,9 @@ class WithRequestWorkspaceSymbol(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.WORKSPACE_SYMBOL,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.WORKSPACE_SYMBOL,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/server_notification/log_message.py b/src/lsp_client/capability/server_notification/log_message.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator
 from typing import Protocol, override, runtime_checkable
 
 import lsprotocol.types as lsp_type
@@ -28,8 +28,9 @@ class WithReceiveLogMessage(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.WINDOW_LOG_MESSAGE,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.WINDOW_LOG_MESSAGE,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/server_notification/log_trace.py b/src/lsp_client/capability/server_notification/log_trace.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator
 from typing import Protocol, override, runtime_checkable
 
 import lsprotocol.types as lsp_type
@@ -28,8 +28,9 @@ class WithReceiveLogTrace(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.LOG_TRACE,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.LOG_TRACE,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/server_notification/publish_diagnostics.py b/src/lsp_client/capability/server_notification/publish_diagnostics.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
+from collections.abc import Iterator
 from typing import Protocol, override, runtime_checkable
 
 import lsprotocol.types as lsp_type
@@ -28,8 +28,9 @@ class WithReceivePublishDiagnostics(
 
     @override
     @classmethod
-    def methods(cls) -> Sequence[str]:
-        return (lsp_type.TEXT_DOCUMENT_PUBLISH_DIAGNOSTICS,)
+    def iter_methods(cls) -> Iterator[str]:
+        yield from super().iter_methods()
+        yield from (lsp_type.TEXT_DOCUMENT_PUBLISH_DIAGNOSTICS,)
 
     @override
     @classmethod
diff --git a/src/lsp_client/capability/server_notification/show_message.py b/src/lsp_client/capability/server_notification/show_message.py
diff --git a/src/lsp_client/capability/server_request/inlay_hint_refresh.py b/src/lsp_client/capability/server_request/inlay_hint_refresh.py
diff --git a/src/lsp_client/capability/server_request/show_document_request.py b/src/lsp_client/capability/server_request/show_document_request.py
diff --git a/src/lsp_client/capability/server_request/show_message_request.py b/src/lsp_client/capability/server_request/show_message_request.py
diff --git a/src/lsp_client/capability/server_request/workspace_configuration.py b/src/lsp_client/capability/server_request/workspace_configuration.py
diff --git a/src/lsp_client/capability/server_request/workspace_folders.py b/src/lsp_client/capability/server_request/workspace_folders.py
diff --git a/src/lsp_client/protocol/capability.py b/src/lsp_client/protocol/capability.py
