From 66ec0014d36f3f7d4c9d9c50859c4431ed71f9ab Mon Sep 17 00:00:00 2001 From: Alex Hoppen Date: Tue, 25 Jun 2024 03:32:48 -0700 Subject: [PATCH] Sort cases in `handleImpl` --- Sources/SourceKitLSP/SourceKitLSPServer.swift | 132 +++++++++--------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/Sources/SourceKitLSP/SourceKitLSPServer.swift b/Sources/SourceKitLSP/SourceKitLSPServer.swift index e5da16dfe..378641ef6 100644 --- a/Sources/SourceKitLSP/SourceKitLSPServer.swift +++ b/Sources/SourceKitLSP/SourceKitLSPServer.swift @@ -576,26 +576,26 @@ extension SourceKitLSPServer: MessageHandler { logger.log("Received notification: \(notification.forLogging)") switch notification { - case let notification as InitializedNotification: - self.clientInitialized(notification) - case let notification as ExitNotification: - await self.exit(notification) - case let notification as DidOpenTextDocumentNotification: - await self.openDocument(notification) - case let notification as DidCloseTextDocumentNotification: - await self.closeDocument(notification) - case let notification as ReopenTextDocumentNotification: - await self.reopenDocument(notification) case let notification as DidChangeTextDocumentNotification: await self.changeDocument(notification) case let notification as DidChangeWorkspaceFoldersNotification: await self.didChangeWorkspaceFolders(notification) + case let notification as DidCloseTextDocumentNotification: + await self.closeDocument(notification) case let notification as DidChangeWatchedFilesNotification: await self.didChangeWatchedFiles(notification) - case let notification as WillSaveTextDocumentNotification: - await self.withLanguageServiceAndWorkspace(for: notification, notificationHandler: self.willSaveDocument) + case let notification as DidOpenTextDocumentNotification: + await self.openDocument(notification) case let notification as DidSaveTextDocumentNotification: await self.withLanguageServiceAndWorkspace(for: notification, notificationHandler: self.didSaveDocument) + case let notification as InitializedNotification: + self.clientInitialized(notification) + case let notification as ExitNotification: + await self.exit(notification) + case let notification as ReopenTextDocumentNotification: + await self.reopenDocument(notification) + case let notification as WillSaveTextDocumentNotification: + await self.withLanguageServiceAndWorkspace(for: notification, notificationHandler: self.willSaveDocument) // IMPORTANT: When adding a new entry to this switch, also add it to the `MessageHandlingDependencyTracker` initializer. default: break @@ -681,82 +681,82 @@ extension SourceKitLSPServer: MessageHandler { } switch request { - case let request as RequestAndReply: - await request.reply { try await initialize(request.params) } - // Only set `initialized` to `true` after we have sent the response to the initialize request to the client. - initialized = true - case let request as RequestAndReply: - await request.reply { try await shutdown(request.params) } - case let request as RequestAndReply: - await request.reply { try await workspaceSymbols(request.params) } - case let request as RequestAndReply: - await request.reply { try await workspaceTests(request.params) } - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.documentTests) - case let request as RequestAndReply: - await request.reply { try await pollIndex(request.params) } case let request as RequestAndReply: await request.reply { VoidResponse() } - case let request as RequestAndReply: - await request.reply { try await executeCommand(request.params) } case let request as RequestAndReply: await request.reply { try await incomingCalls(request.params) } case let request as RequestAndReply: await request.reply { try await outgoingCalls(request.params) } - case let request as RequestAndReply: - await request.reply { try await supertypes(request.params) } - case let request as RequestAndReply: - await request.reply { try await subtypes(request.params) } - case let request as RequestAndReply: - await request.reply { try await rename(request.params) } + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.prepareCallHierarchy) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.codeAction) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.colorPresentation) case let request as RequestAndReply: await self.handleRequest(for: request, requestHandler: self.completion) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.hover) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.openGeneratedInterface) case let request as RequestAndReply: await self.handleRequest(for: request, requestHandler: self.declaration) case let request as RequestAndReply: await self.handleRequest(for: request, requestHandler: self.definition) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.references) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.implementation) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.prepareCallHierarchy) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.prepareTypeHierarchy) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.symbolInfo) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.documentSymbolHighlight) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.documentFormatting) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.foldingRange) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.documentSymbol) case let request as RequestAndReply: await self.handleRequest(for: request, requestHandler: self.documentColor) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.documentSemanticTokens) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.documentDiagnostic) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.documentFormatting) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.documentSymbolHighlight) case let request as RequestAndReply: await self.handleRequest(for: request, requestHandler: self.documentSemanticTokensDelta) case let request as RequestAndReply: await self.handleRequest(for: request, requestHandler: self.documentSemanticTokensRange) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.colorPresentation) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.codeAction) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.documentSemanticTokens) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.documentSymbol) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.documentTests) + case let request as RequestAndReply: + await request.reply { try await executeCommand(request.params) } + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.foldingRange) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.hover) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.implementation) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.indexedRename) + case let request as RequestAndReply: + await request.reply { try await initialize(request.params) } + // Only set `initialized` to `true` after we have sent the response to the initialize request to the client. + initialized = true case let request as RequestAndReply: await self.handleRequest(for: request, requestHandler: self.inlayHint) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.documentDiagnostic) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.openGeneratedInterface) + case let request as RequestAndReply: + await request.reply { try await pollIndex(request.params) } case let request as RequestAndReply: await self.handleRequest(for: request, requestHandler: self.prepareRename) - case let request as RequestAndReply: - await self.handleRequest(for: request, requestHandler: self.indexedRename) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.references) + case let request as RequestAndReply: + await request.reply { try await rename(request.params) } + case let request as RequestAndReply: + await request.reply { try await shutdown(request.params) } + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.symbolInfo) + case let request as RequestAndReply: + await self.handleRequest(for: request, requestHandler: self.prepareTypeHierarchy) + case let request as RequestAndReply: + await request.reply { try await subtypes(request.params) } + case let request as RequestAndReply: + await request.reply { try await supertypes(request.params) } + case let request as RequestAndReply: + await request.reply { try await workspaceSymbols(request.params) } + case let request as RequestAndReply: + await request.reply { try await workspaceTests(request.params) } // IMPORTANT: When adding a new entry to this switch, also add it to the `MessageHandlingDependencyTracker` initializer. default: await request.reply { throw ResponseError.methodNotFound(R.method) }