From 5a02bd10f95985c82d9fc25afdeb57f7771ae512 Mon Sep 17 00:00:00 2001 From: csh Date: Tue, 14 Jul 2026 12:08:09 +0800 Subject: [PATCH] :art: style(core): normalize lifecycle implementation --- lsp-server/src/core/dispatcher.cppm | 11 ++-- .../test_provider/provider_misc_test.cppm | 12 ++-- .../test_provider/provider_surface_test.cppm | 61 +++++++++---------- 3 files changed, 38 insertions(+), 46 deletions(-) diff --git a/lsp-server/src/core/dispatcher.cppm b/lsp-server/src/core/dispatcher.cppm index 8baac86..0604aac 100644 --- a/lsp-server/src/core/dispatcher.cppm +++ b/lsp-server/src/core/dispatcher.cppm @@ -45,10 +45,9 @@ export namespace lsp::core public: ExecutionContext(scheduler::async_executor::AsyncExecutor& scheduler, manager::ManagerHub& manager_hub, - std::stop_token stop_token = {}) - : async_executor_(scheduler), - manager_hub_(manager_hub), - stop_token_(stop_token) + std::stop_token stop_token = {}) : async_executor_(scheduler), + manager_hub_(manager_hub), + stop_token_(stop_token) { } @@ -120,8 +119,8 @@ namespace lsp::core { RequestDispatcher::RequestDispatcher( scheduler::async_executor::AsyncExecutor& scheduler, - manager::ManagerHub& manager_hub) - : async_executor_(scheduler), manager_hub_(manager_hub) + manager::ManagerHub& manager_hub) : async_executor_(scheduler), + manager_hub_(manager_hub) { } diff --git a/lsp-server/test/test_provider/provider_misc_test.cppm b/lsp-server/test/test_provider/provider_misc_test.cppm index 56dc308..48a5174 100644 --- a/lsp-server/test/test_provider/provider_misc_test.cppm +++ b/lsp-server/test/test_provider/provider_misc_test.cppm @@ -171,8 +171,7 @@ namespace lsp::test::provider manager::ManagerHub hub{}; core::ExecutionContext context; - ProviderEnv() - : context(scheduler, hub) + ProviderEnv() : context(scheduler, hub) { hub.Initialize(); } @@ -1411,8 +1410,7 @@ namespace lsp::test::provider auto tooltip_it = resolved.find("tooltip"); assertTrue(tooltip_it != resolved.end(), "InlayHint resolve should set tooltip"); assertTrue(tooltip_it->second.Is(), "InlayHint tooltip should be string"); - assertEqual(std::string("param: int"), tooltip_it->second.Get(), - "InlayHint tooltip should use detail"); + assertEqual(std::string("param: int"), tooltip_it->second.Get(), "InlayHint tooltip should use detail"); return result; } @@ -2891,10 +2889,8 @@ namespace lsp::test::provider { protocol::LSPObject diagnostic; diagnostic["range"] = protocol::LSPObject{ - { "start", protocol::LSPObject{ { "line", static_cast(error.location.start_line) }, - { "character", static_cast(error.location.start_column) } } }, - { "end", protocol::LSPObject{ { "line", static_cast(error.location.end_line) }, - { "character", static_cast(error.location.end_column) } } }, + { "start", protocol::LSPObject{ { "line", static_cast(error.location.start_line) }, { "character", static_cast(error.location.start_column) } } }, + { "end", protocol::LSPObject{ { "line", static_cast(error.location.end_line) }, { "character", static_cast(error.location.end_column) } } }, }; diagnostic["message"] = error.message; diagnostics.emplace_back(std::move(diagnostic)); diff --git a/lsp-server/test/test_provider/provider_surface_test.cppm b/lsp-server/test/test_provider/provider_surface_test.cppm index 226539c..3abd095 100644 --- a/lsp-server/test/test_provider/provider_surface_test.cppm +++ b/lsp-server/test/test_provider/provider_surface_test.cppm @@ -114,8 +114,7 @@ namespace lsp::test::provider manager::ManagerHub hub{}; core::ExecutionContext context; - ProviderEnv() - : context(scheduler, hub) + ProviderEnv() : context(scheduler, hub) { hub.Initialize(); } @@ -126,10 +125,8 @@ namespace lsp::test::provider const std::string& expected_name) { Provider provider; - assertEqual(expected_method, provider.GetMethod(), - "GetMethod mismatch for " + expected_name); - assertEqual(expected_name, provider.GetProviderName(), - "GetProviderName mismatch for " + expected_name); + assertEqual(expected_method, provider.GetMethod(), "GetMethod mismatch for " + expected_name); + assertEqual(expected_name, provider.GetProviderName(), "GetProviderName mismatch for " + expected_name); } template @@ -177,53 +174,53 @@ namespace lsp::test::provider CheckProviderMetadata("textDocument/rename", "TextDocumentRename"); CheckProviderMetadata("textDocument/references", "TextDocumentReferences"); CheckProviderMetadata("textDocument/semanticTokens/range", - "TextDocumentSemanticTokensRange"); + "TextDocumentSemanticTokensRange"); CheckProviderMetadata("textDocument/semanticTokens/full", - "SemanticTokensFull"); + "SemanticTokensFull"); CheckProviderMetadata("textDocument/semanticTokens/full/delta", - "SemanticTokensFullDelta"); + "SemanticTokensFullDelta"); CheckProviderMetadata("textDocument/hover", "TextDocumentHover"); CheckProviderMetadata("textDocument/formatting", "TextDocumentFormatting"); CheckProviderMetadata("textDocument/rangeFormatting", - "TextDocumentRangeFormatting"); + "TextDocumentRangeFormatting"); CheckProviderMetadata("textDocument/onTypeFormatting", - "TextDocumentOnTypeFormatting"); + "TextDocumentOnTypeFormatting"); CheckProviderMetadata("textDocument/documentSymbol", - "TextDocumentDocumentSymbol"); + "TextDocumentDocumentSymbol"); CheckProviderMetadata("textDocument/documentLink", - "TextDocumentDocumentLink"); + "TextDocumentDocumentLink"); CheckProviderMetadata("textDocument/documentHighlight", - "TextDocumentDocumentHighlight"); + "TextDocumentDocumentHighlight"); CheckProviderMetadata("textDocument/documentColor", - "TextDocumentDocumentColor"); + "TextDocumentDocumentColor"); CheckProviderMetadata("textDocument/colorPresentation", - "TextDocumentColorPresentation"); + "TextDocumentColorPresentation"); CheckProviderMetadata("textDocument/codeLens", "TextDocumentCodeLens"); CheckProviderMetadata("textDocument/codeAction", "TextDocumentCodeAction"); CheckProviderMetadata("textDocument/prepareTypeHierarchy", - "TextDocumentPrepareTypeHierarchy"); + "TextDocumentPrepareTypeHierarchy"); CheckProviderMetadata("textDocument/prepareRename", - "TextDocumentPrepareRename"); + "TextDocumentPrepareRename"); CheckProviderMetadata("textDocument/prepareCallHierarchy", - "TextDocumentPrepareCallHierarchy"); + "TextDocumentPrepareCallHierarchy"); CheckProviderMetadata("textDocument/typeDefinition", "TextDocumentTypeDefinition"); CheckProviderMetadata("textDocument/implementation", - "TextDocumentImplementation"); + "TextDocumentImplementation"); CheckProviderMetadata("textDocument/selectionRange", - "TextDocumentSelectionRange"); + "TextDocumentSelectionRange"); CheckProviderMetadata("textDocument/signatureHelp", - "TextDocumentSignatureHelp"); + "TextDocumentSignatureHelp"); CheckProviderMetadata("textDocument/inlayHint", "TextDocumentInlayHint"); CheckProviderMetadata("textDocument/inlineValue", - "TextDocumentInlineValue"); + "TextDocumentInlineValue"); CheckProviderMetadata("textDocument/linkedEditingRange", - "TextDocumentLinkedEditingRange"); + "TextDocumentLinkedEditingRange"); CheckProviderMetadata("textDocument/moniker", "TextDocumentMoniker"); CheckProviderMetadata("textDocument/diagnostic", - "TextDocumentDiagnostic"); + "TextDocumentDiagnostic"); CheckProviderMetadata("textDocument/foldingRange", - "TextDocumentFoldingRange"); + "TextDocumentFoldingRange"); CheckProviderMetadata("codeAction/resolve", "CodeActionResolve"); CheckProviderMetadata("codeLens/resolve", "CodeLensResolve"); CheckProviderMetadata("documentLink/resolve", "DocumentLinkResolve"); @@ -232,12 +229,12 @@ namespace lsp::test::provider CheckProviderMetadata("typeHierarchy/supertypes", "TypeHierarchySupertypes"); CheckProviderMetadata("typeHierarchy/subtypes", "TypeHierarchySubtypes"); CheckProviderMetadata("callHierarchy/incomingCalls", - "CallHierarchyIncomingCalls"); + "CallHierarchyIncomingCalls"); CheckProviderMetadata("callHierarchy/outgoingCalls", - "CallHierarchyOutgoingCalls"); + "CallHierarchyOutgoingCalls"); CheckProviderMetadata("workspace/diagnostic", "WorkspaceDiagnostic"); CheckProviderMetadata("workspace/executeCommand", - "WorkspaceExecuteCommand"); + "WorkspaceExecuteCommand"); CheckProviderMetadata("workspace/willCreateFiles", "WorkspaceWillCreateFiles"); CheckProviderMetadata("workspace/willDeleteFiles", "WorkspaceWillDeleteFiles"); CheckProviderMetadata("workspace/willRenameFiles", "WorkspaceWillRenameFiles"); @@ -260,11 +257,11 @@ namespace lsp::test::provider CheckProviderMetadata("telemetry/event", "TelemetryEvent"); CheckProviderMetadata("textDocument/publishDiagnostics", "TextDocumentPublishDiagnostics"); CheckProviderMetadata("workspace/didChangeConfiguration", - "WorkspaceDidChangeConfiguration"); + "WorkspaceDidChangeConfiguration"); CheckProviderMetadata("workspace/didChangeWatchedFiles", - "WorkspaceDidChangeWatchedFiles"); + "WorkspaceDidChangeWatchedFiles"); CheckProviderMetadata("workspace/didChangeWorkspaceFolders", - "WorkspaceDidChangeWorkspaceFolders"); + "WorkspaceDidChangeWorkspaceFolders"); CheckProviderMetadata("workspace/didCreateFiles", "WorkspaceDidCreateFiles"); CheckProviderMetadata("workspace/didDeleteFiles", "WorkspaceDidDeleteFiles"); CheckProviderMetadata("workspace/didRenameFiles", "WorkspaceDidRenameFiles");