Merge pull request #942 from ahoppen/ahoppen/log-less-noisy

Make logs less noisy

Author: ahoppen

Sources/SKCore/CompilationDatabaseBuildSystem.swift

@@ -73,12 +73,16 @@ public actor CompilationDatabaseBuildSystem {
     return nil
   }
 
-  public init(projectRoot: AbsolutePath? = nil, searchPaths: [RelativePath], fileSystem: FileSystem = localFileSystem) {
+  public init?(projectRoot: AbsolutePath? = nil, searchPaths: [RelativePath], fileSystem: FileSystem = localFileSystem) {
     self.fileSystem = fileSystem
     self.projectRoot = projectRoot
     self.searchPaths = searchPaths
-    if let path = projectRoot {
-      self.compdb = tryLoadCompilationDatabase(directory: path, additionalSearchPaths: searchPaths, fileSystem)
+    if let path = projectRoot,
+      let compdb = tryLoadCompilationDatabase(directory: path, additionalSearchPaths: searchPaths, fileSystem)
+    {
+      self.compdb = compdb
+    } else {
+      return nil
     }
   }
 }

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

@@ -554,7 +554,7 @@ private func findPackageDirectory(
 extension Basics.Diagnostic.Severity {
   var asLogLevel: LogLevel {
     switch self {
-    case .error, .warning: return .error
+    case .error, .warning: return .default
     case .info: return .info
     case .debug: return .debug
     }

Sources/SourceKitLSP/Workspace.swift

@@ -118,8 +118,16 @@ public final class Workspace {
         reloadPackageStatusCallback: reloadPackageStatusCallback
       ) {
         buildSystem = swiftpm
+      } else if let compdb = CompilationDatabaseBuildSystem(
+        projectRoot: rootPath,
+        searchPaths: compilationDatabaseSearchPaths
+      ) {
+        buildSystem = compdb
       } else {
-        buildSystem = CompilationDatabaseBuildSystem(projectRoot: rootPath, searchPaths: compilationDatabaseSearchPaths)
+        logger.error(
+          "Could not set up a build system for workspace at '\(rootUri.forLogging)'"
+        )
+        buildSystem = nil
       }
     } else {
       // We assume that workspaces are directories. This is only true for URLs not for URIs in general.

Tests/SKCoreTests/CompilationDatabaseTests.swift

@@ -453,5 +453,5 @@ private func checkCompilationDatabaseBuildSystem(
     searchPaths: try [RelativePath(validating: ".")],
     fileSystem: fs
   )
-  try await block(buildSystem)
+  try await block(XCTUnwrap(buildSystem))
 }