From 775e198f77934d792176560655a11c2d42822ebb Mon Sep 17 00:00:00 2001 From: Ben Langmuir Date: Tue, 19 Nov 2019 11:08:31 -0800 Subject: [PATCH] Rename LSPSupport -> LSPLogging to reflect reduced scope Ideally we can someday migrate this to something more standard such as swift-log, and make it explicit how to control logging for the JSONRPC module. --- Package.swift | 13 ++++++------- Sources/{LSPSupport => LSPLogging}/LogLevel.swift | 0 Sources/{LSPSupport => LSPLogging}/Logging.swift | 0 .../JSONRPCConnection.swift | 2 +- Sources/SKCore/BuildServerBuildSystem.swift | 2 +- Sources/SKCore/CompilationDatabaseBuildSystem.swift | 2 +- Sources/SKCore/LanguageServer.swift | 2 +- Sources/SKCore/Toolchain.swift | 2 +- Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift | 2 +- Sources/SourceKit/DocumentManager.swift | 2 +- Sources/SourceKit/SourceKitLSPCommandMetadata.swift | 2 +- Sources/SourceKit/SourceKitServer.swift | 2 +- Sources/SourceKit/Workspace.swift | 2 +- Sources/SourceKit/clangd/ClangLanguageServer.swift | 2 +- Sources/SourceKit/sourcekitd/Diagnostic.swift | 2 +- .../SourceKit/sourcekitd/SwiftLanguageServer.swift | 2 +- .../sourcekitd/SwiftSourceKitFramework.swift | 2 +- Sources/sourcekit-lsp/main.swift | 2 +- .../SupportTests.swift | 2 +- .../XCTestManifests.swift | 0 Tests/LinuxMain.swift | 4 ++-- Tests/SourceKitTests/LocalSwiftTests.swift | 2 +- 22 files changed, 25 insertions(+), 26 deletions(-) rename Sources/{LSPSupport => LSPLogging}/LogLevel.swift (100%) rename Sources/{LSPSupport => LSPLogging}/Logging.swift (100%) rename Tests/{LSPSupportTests => LSPLoggingTests}/SupportTests.swift (99%) rename Tests/{LSPSupportTests => LSPLoggingTests}/XCTestManifests.swift (100%) diff --git a/Package.swift b/Package.swift index 5ec2d50d..1c6d6eb3 100644 --- a/Package.swift +++ b/Package.swift @@ -94,15 +94,16 @@ let package = Package( ] ), + // Logging support used in LSP modules. .target( - name: "LSPSupport", + name: "LSPLogging", dependencies: [] ), .testTarget( - name: "LSPSupportTests", + name: "LSPLoggingTests", dependencies: [ - "LSPSupport", + "LSPLogging", ] ), @@ -119,7 +120,7 @@ let package = Package( name: "LanguageServerProtocolJSONRPC", dependencies: [ "LanguageServerProtocol", - "LSPSupport", + "LSPLogging", ] ), .testTarget( @@ -133,9 +134,7 @@ let package = Package( // LanguageServerProtocol: The core LSP types, suitable for any LSP implementation. .target( name: "LanguageServerProtocol", - dependencies: [ - "LSPSupport", - ] + dependencies: [] ), .testTarget( name: "LanguageServerProtocolTests", diff --git a/Sources/LSPSupport/LogLevel.swift b/Sources/LSPLogging/LogLevel.swift similarity index 100% rename from Sources/LSPSupport/LogLevel.swift rename to Sources/LSPLogging/LogLevel.swift diff --git a/Sources/LSPSupport/Logging.swift b/Sources/LSPLogging/Logging.swift similarity index 100% rename from Sources/LSPSupport/Logging.swift rename to Sources/LSPLogging/Logging.swift diff --git a/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift b/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift index db823d31..07fcba6f 100644 --- a/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift +++ b/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift @@ -13,7 +13,7 @@ import Dispatch import Foundation import LanguageServerProtocol -import LSPSupport +import LSPLogging /// A connection between a message handler (e.g. language server) in the same process as the connection object and a remote message handler (e.g. language client) that may run in another process using JSON RPC messages sent over a pair of in/out file descriptors. /// diff --git a/Sources/SKCore/BuildServerBuildSystem.swift b/Sources/SKCore/BuildServerBuildSystem.swift index 04a676ca..2dcf7b3d 100644 --- a/Sources/SKCore/BuildServerBuildSystem.swift +++ b/Sources/SKCore/BuildServerBuildSystem.swift @@ -14,7 +14,7 @@ import BuildServerProtocol import Foundation import LanguageServerProtocol import LanguageServerProtocolJSONRPC -import LSPSupport +import LSPLogging import SKSupport import TSCBasic diff --git a/Sources/SKCore/CompilationDatabaseBuildSystem.swift b/Sources/SKCore/CompilationDatabaseBuildSystem.swift index b9403b4c..c2631221 100644 --- a/Sources/SKCore/CompilationDatabaseBuildSystem.swift +++ b/Sources/SKCore/CompilationDatabaseBuildSystem.swift @@ -12,7 +12,7 @@ import BuildServerProtocol import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKSupport import TSCBasic diff --git a/Sources/SKCore/LanguageServer.swift b/Sources/SKCore/LanguageServer.swift index 9f2ffae6..a0f96376 100644 --- a/Sources/SKCore/LanguageServer.swift +++ b/Sources/SKCore/LanguageServer.swift @@ -12,7 +12,7 @@ import Dispatch import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKSupport public typealias Notification = LanguageServerProtocol.Notification diff --git a/Sources/SKCore/Toolchain.swift b/Sources/SKCore/Toolchain.swift index 4e7639d4..163312f8 100644 --- a/Sources/SKCore/Toolchain.swift +++ b/Sources/SKCore/Toolchain.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKSupport import TSCBasic import TSCUtility diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift index f88afce8..45d0c494 100644 --- a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift +++ b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift @@ -13,7 +13,7 @@ import Build import BuildServerProtocol import LanguageServerProtocol -import LSPSupport +import LSPLogging import PackageGraph import PackageLoading import PackageModel diff --git a/Sources/SourceKit/DocumentManager.swift b/Sources/SourceKit/DocumentManager.swift index b931037f..dd3828a4 100644 --- a/Sources/SourceKit/DocumentManager.swift +++ b/Sources/SourceKit/DocumentManager.swift @@ -12,7 +12,7 @@ import Dispatch import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKSupport public struct DocumentSnapshot { diff --git a/Sources/SourceKit/SourceKitLSPCommandMetadata.swift b/Sources/SourceKit/SourceKitLSPCommandMetadata.swift index 64ddd54f..96e3c911 100644 --- a/Sources/SourceKit/SourceKitLSPCommandMetadata.swift +++ b/Sources/SourceKit/SourceKitLSPCommandMetadata.swift @@ -12,7 +12,7 @@ import Foundation import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKSupport /// Represents metadata that SourceKit-LSP injects at every command returned by code actions. diff --git a/Sources/SourceKit/SourceKitServer.swift b/Sources/SourceKit/SourceKitServer.swift index 3079eddf..1d4b6f38 100644 --- a/Sources/SourceKit/SourceKitServer.swift +++ b/Sources/SourceKit/SourceKitServer.swift @@ -15,7 +15,7 @@ import Dispatch import Foundation import IndexStoreDB import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKCore import SKSupport import TSCBasic diff --git a/Sources/SourceKit/Workspace.swift b/Sources/SourceKit/Workspace.swift index 8094ba5d..4257c095 100644 --- a/Sources/SourceKit/Workspace.swift +++ b/Sources/SourceKit/Workspace.swift @@ -12,7 +12,7 @@ import IndexStoreDB import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKCore import SKSupport import SKSwiftPMWorkspace diff --git a/Sources/SourceKit/clangd/ClangLanguageServer.swift b/Sources/SourceKit/clangd/ClangLanguageServer.swift index 0cb884e1..4f3312a6 100644 --- a/Sources/SourceKit/clangd/ClangLanguageServer.swift +++ b/Sources/SourceKit/clangd/ClangLanguageServer.swift @@ -13,7 +13,7 @@ import Foundation import LanguageServerProtocol import LanguageServerProtocolJSONRPC -import LSPSupport +import LSPLogging import SKCore import SKSupport import TSCBasic diff --git a/Sources/SourceKit/sourcekitd/Diagnostic.swift b/Sources/SourceKit/sourcekitd/Diagnostic.swift index 0438a9bd..64032398 100644 --- a/Sources/SourceKit/sourcekitd/Diagnostic.swift +++ b/Sources/SourceKit/sourcekitd/Diagnostic.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKSupport import sourcekitd diff --git a/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift b/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift index 072ed4ea..24a1cbe2 100644 --- a/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift +++ b/Sources/SourceKit/sourcekitd/SwiftLanguageServer.swift @@ -13,7 +13,7 @@ import Dispatch import struct Foundation.CharacterSet import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKCore import SKSupport import sourcekitd diff --git a/Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift b/Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift index 3867be7a..7c13774b 100644 --- a/Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift +++ b/Sources/SourceKit/sourcekitd/SwiftSourceKitFramework.swift @@ -12,7 +12,7 @@ import Dispatch import LanguageServerProtocol -import LSPSupport +import LSPLogging import SKSupport import sourcekitd import TSCBasic diff --git a/Sources/sourcekit-lsp/main.swift b/Sources/sourcekit-lsp/main.swift index 8570c75c..01a42636 100644 --- a/Sources/sourcekit-lsp/main.swift +++ b/Sources/sourcekit-lsp/main.swift @@ -14,7 +14,7 @@ import Dispatch import Foundation import LanguageServerProtocol import LanguageServerProtocolJSONRPC -import LSPSupport +import LSPLogging import SKCore import SKSupport import SourceKit diff --git a/Tests/LSPSupportTests/SupportTests.swift b/Tests/LSPLoggingTests/SupportTests.swift similarity index 99% rename from Tests/LSPSupportTests/SupportTests.swift rename to Tests/LSPLoggingTests/SupportTests.swift index ea51eb04..2ae8adc7 100644 --- a/Tests/LSPSupportTests/SupportTests.swift +++ b/Tests/LSPLoggingTests/SupportTests.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import LSPSupport +import LSPLogging import XCTest final class SupportTests: XCTestCase { diff --git a/Tests/LSPSupportTests/XCTestManifests.swift b/Tests/LSPLoggingTests/XCTestManifests.swift similarity index 100% rename from Tests/LSPSupportTests/XCTestManifests.swift rename to Tests/LSPLoggingTests/XCTestManifests.swift diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift index a0604b1a..946171af 100644 --- a/Tests/LinuxMain.swift +++ b/Tests/LinuxMain.swift @@ -1,6 +1,6 @@ import XCTest -import LSPSupportTests +import LSPLoggingTests import LanguageServerProtocolJSONRPCTests import LanguageServerProtocolTests import SKCoreTests @@ -9,7 +9,7 @@ import SKSwiftPMWorkspaceTests import SourceKitTests var tests = [XCTestCaseEntry]() -tests += LSPSupportTests.__allTests() +tests += LSPLoggingTests.__allTests() tests += LanguageServerProtocolJSONRPCTests.__allTests() tests += LanguageServerProtocolTests.__allTests() tests += SKCoreTests.__allTests() diff --git a/Tests/SourceKitTests/LocalSwiftTests.swift b/Tests/SourceKitTests/LocalSwiftTests.swift index d6f4a191..1fcbca2f 100644 --- a/Tests/SourceKitTests/LocalSwiftTests.swift +++ b/Tests/SourceKitTests/LocalSwiftTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import LanguageServerProtocol -import LSPSupport +import LSPLogging import LSPTestSupport import SKTestSupport import SourceKit