From ab1ee4ea8cc595d5b9d27109770194742bee2f29 Mon Sep 17 00:00:00 2001 From: Richard Howell Date: Wed, 25 Sep 2019 14:26:38 -0700 Subject: [PATCH] return empty reply instead of ignoring targets request --- Sources/SKCore/CompilationDatabaseBuildSystem.swift | 2 +- Sources/SKCore/FallbackBuildSystem.swift | 2 +- Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Sources/SKCore/CompilationDatabaseBuildSystem.swift b/Sources/SKCore/CompilationDatabaseBuildSystem.swift index 9c3aaa03..e5c6eaf6 100644 --- a/Sources/SKCore/CompilationDatabaseBuildSystem.swift +++ b/Sources/SKCore/CompilationDatabaseBuildSystem.swift @@ -60,7 +60,7 @@ extension CompilationDatabaseBuildSystem: BuildSystem { /// We don't support change watching. public func unregisterForChangeNotifications(for: URL) {} - public func buildTargets(reply: @escaping ([BuildTarget]?) -> Void) { } + public func buildTargets(reply: @escaping ([BuildTarget]?) -> Void) { reply(nil) } func database(for url: URL) -> CompilationDatabase? { if let path = try? AbsolutePath(validating: url.path) { diff --git a/Sources/SKCore/FallbackBuildSystem.swift b/Sources/SKCore/FallbackBuildSystem.swift index 7daca8a3..9fd99dcf 100644 --- a/Sources/SKCore/FallbackBuildSystem.swift +++ b/Sources/SKCore/FallbackBuildSystem.swift @@ -62,7 +62,7 @@ public final class FallbackBuildSystem: BuildSystem { public func toolchain(for: URL, _ language: Language) -> Toolchain? { return nil } - public func buildTargets(reply: @escaping ([BuildTarget]?) -> Void) { } + public func buildTargets(reply: @escaping ([BuildTarget]?) -> Void) { reply(nil) } func settingsSwift(_ path: AbsolutePath) -> FileBuildSettings { var args: [String] = [] diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift index 33bd32e8..1243a402 100644 --- a/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift +++ b/Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift @@ -236,6 +236,7 @@ extension SwiftPMWorkspace: BuildSystem { public func buildTargets(reply: @escaping ([BuildTarget]?) -> Void) { // TODO: add target support for SwiftPM + reply(nil) } /// Returns the resolved target description for the given file, if one is known.