Merge pull request #31 from benlangmuir/build-system-cleanup1

[build-system] Various minor refactoring and cleanups
This commit is contained in:
Ben Langmuir
2018-12-04 14:32:31 -08:00
committed by GitHub
13 changed files with 159 additions and 144 deletions

View File

@@ -18,7 +18,7 @@ import LanguageServerProtocol
///
/// Provides build settings from a `CompilationDatabase` found by searching a project. For now, only
/// one compilation database, located at the project root.
public final class CompilationDatabaseBuildSystem: BuildSettingsProvider {
public final class CompilationDatabaseBuildSystem {
/// The compilation database.
var compdb: CompilationDatabase? = nil
@@ -31,8 +31,15 @@ public final class CompilationDatabaseBuildSystem: BuildSettingsProvider {
self.compdb = tryLoadCompilationDatabase(directory: path, fileSystem)
}
}
}
public func settings(for url: URL, language: Language) -> FileBuildSettings? {
extension CompilationDatabaseBuildSystem: BuildSystem {
// FIXME: derive from the compiler arguments.
public var indexStorePath: AbsolutePath? { return nil }
public var indexDatabasePath: AbsolutePath? { return nil }
public func settings(for url: URL, _ language: Language) -> FileBuildSettings? {
guard let db = database(for: url),
let cmd = db[url].first else { return nil }
return FileBuildSettings(