Switch to more descriptive case names

z2oh · z2oh · commit c006421667b4 · 2023-12-08T15:23:03.000-08:00
diff --git a/Sources/LanguageServerProtocol/SupportTypes/WorkspaceFolder.swift b/Sources/LanguageServerProtocol/SupportTypes/WorkspaceFolder.swift
@@ -22,7 +22,7 @@ public enum BuildConfiguration: Hashable, Codable {
 ///
 /// **(LSP Extension)**
 public enum WorkspaceType: Hashable, Codable {
-  case buildserver, compdb, swiftpm
+  case buildServer, compilationDatabase, swiftPM
 }
 
 /// Build settings that should be used for a workspace.
diff --git a/Sources/SKSupport/WorkspaceType.swift b/Sources/SKSupport/WorkspaceType.swift
@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 public enum WorkspaceType: String {
-  case buildserver
-  case compdb
-  case swiftpm
+  case buildServer
+  case compilationDatabase
+  case swiftPM
 }
diff --git a/Sources/SourceKitLSP/SourceKitServer.swift b/Sources/SourceKitLSP/SourceKitServer.swift
@@ -974,13 +974,13 @@ extension LanguageServerProtocol.BuildConfiguration {
   }
 }
 
-extension LanguageServerProtocol.WorkspaceType {
+private extension LanguageServerProtocol.WorkspaceType {
   /// Convert `LanguageServerProtocol.WorkspaceType` to `SkSupport.WorkspaceType`.
   var workspaceType: SKSupport.WorkspaceType {
     switch self {
-    case .buildserver: return .buildserver
-    case .compdb: return .compdb
-    case .swiftpm: return .swiftpm
+    case .buildServer: return .buildServer
+    case .compilationDatabase: return .compilationDatabase
+    case .swiftPM: return .swiftPM
     }
   }
 }
diff --git a/Sources/SourceKitLSP/Workspace.swift b/Sources/SourceKitLSP/Workspace.swift
@@ -130,12 +130,14 @@ public final class Workspace {
     }
 
     if let rootUrl = rootUri.fileURL, let rootPath = try? AbsolutePath(validating: rootUrl.path) {
-      if let defaultWorkspaceType = buildSetup.defaultWorkspaceType, let defaultBuildSystem: BuildSystem? =
-        switch defaultWorkspaceType {
-          case .buildserver: await buildBuildServerWorkspace(rootPath: rootPath)
-          case .compdb: buildCompDBWorkspace(rootPath: rootPath)
-          case .swiftpm: await buildSwiftPMWorkspace(rootUrl: rootUrl)
-      } {
+      let defaultBuildSystem: BuildSystem? =
+        switch buildSetup.defaultWorkspaceType {
+          case .buildServer: await buildBuildServerWorkspace(rootPath: rootPath)
+          case .compilationDatabase: buildCompDBWorkspace(rootPath: rootPath)
+          case .swiftPM: await buildSwiftPMWorkspace(rootUrl: rootUrl)
+          case nil: nil
+        }
+      if let defaultBuildSystem {
         buildSystem = defaultBuildSystem
       } else if let buildServer = await buildBuildServerWorkspace(rootPath: rootPath) {
         buildSystem = buildServer
diff --git a/Sources/sourcekit-lsp/SourceKitLSP.swift b/Sources/sourcekit-lsp/SourceKitLSP.swift
@@ -176,8 +176,7 @@ struct SourceKitLSP: ParsableCommand {
   var indexPrefixMappings = [PathPrefixMapping]()
 
   @Option(
-    name: .customLong("default-workspace-type"),
-    help: "Override default workspace type selection; one of 'swiftpm', 'compdb', or 'buildserver'"
+    help: "Override default workspace type selection; one of 'swiftPM', 'compilationDatabase', or 'buildServer'"
   )
   var defaultWorkspaceType: SKSupport.WorkspaceType?
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public enum BuildConfiguration: Hashable, Codable {`
`22`	`22`	`///`
`23`	`23`	`/// (LSP Extension)`
`24`	`24`	`public enum WorkspaceType: Hashable, Codable {`
`25`		`- case buildserver, compdb, swiftpm`
	`25`	`+ case buildServer, compilationDatabase, swiftPM`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/// Build settings that should be used for a workspace.`
Original file line number	Diff line number	Diff line change
`@@ -974,13 +974,13 @@ extension LanguageServerProtocol.BuildConfiguration {`
`974`	`974`	`}`
`975`	`975`	`}`
`976`	`976`
`977`		`-extension LanguageServerProtocol.WorkspaceType {`
	`977`	`+private extension LanguageServerProtocol.WorkspaceType {`
`978`	`978`	/// Convert `LanguageServerProtocol.WorkspaceType` to `SkSupport.WorkspaceType`.
`979`	`979`	`var workspaceType: SKSupport.WorkspaceType {`
`980`	`980`	`switch self {`
`981`		`- case .buildserver: return .buildserver`
`982`		`- case .compdb: return .compdb`
`983`		`- case .swiftpm: return .swiftpm`
	`981`	`+ case .buildServer: return .buildServer`
	`982`	`+ case .compilationDatabase: return .compilationDatabase`
	`983`	`+ case .swiftPM: return .swiftPM`
`984`	`984`	`}`
`985`	`985`	`}`
`986`	`986`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,7 @@ struct SourceKitLSP: ParsableCommand {`
`176`	`176`	`var indexPrefixMappings = [PathPrefixMapping]()`
`177`	`177`
`178`	`178`	`@Option(`
`179`		`- name: .customLong("default-workspace-type"),`
`180`		`- help: "Override default workspace type selection; one of 'swiftpm', 'compdb', or 'buildserver'"`
	`179`	`+ help: "Override default workspace type selection; one of 'swiftPM', 'compilationDatabase', or 'buildServer'"`
`181`	`180`	`)`
`182`	`181`	`var defaultWorkspaceType: SKSupport.WorkspaceType?`
`183`	`182`