Skip to content

Commit f759651

Browse files
committed
Get the build settings of the main file for a given header in BuildSystemManager
1 parent 981bbda commit f759651

File tree

3 files changed

+3
-12
lines changed

3 files changed

+3
-12
lines changed

Sources/SKCore/BuildSystemManager.swift

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,16 +148,7 @@ extension BuildSystemManager {
148148
self.mainFilesProvider = mainFilesProvider
149149
}
150150

151-
/// Get the build settings for the given document, assuming it has the given
152-
/// language.
153-
///
154-
/// Returns `nil` if no build settings are available in the build system and
155-
/// no fallback build settings can be computed.
156-
///
157-
/// `isFallback` is `true` if the build settings couldn't be computed and
158-
/// fallback settings are used. These fallback settings are most likely not
159-
/// correct and provide limited semantic functionality.
160-
public func buildSettings(
151+
private func buildSettings(
161152
for document: DocumentURI,
162153
language: Language
163154
) async -> (buildSettings: FileBuildSettings, isFallback: Bool)? {

Sources/SourceKitLSP/Clang/ClangLanguageServer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ actor ClangLanguageServerShim: ToolchainLanguageServer, MessageHandler {
134134
guard let workspace = workspace.value, let language = openDocuments[document] else {
135135
return nil
136136
}
137-
guard let settings = await workspace.buildSystemManager.buildSettings(for: document, language: language) else {
137+
guard let settings = await workspace.buildSystemManager.buildSettings(ofMainFileFor: document, language: language) else {
138138
return nil
139139
}
140140
return ClangBuildSettings(settings.buildSettings, clangPath: clangdPath, isFallback: settings.isFallback)

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public actor SwiftLanguageServer: ToolchainLanguageServer {
186186
guard let workspace = await self.workspaceForDocument(document) else {
187187
return nil
188188
}
189-
if let settings = await workspace.buildSystemManager.buildSettings(for: document, language: .swift) {
189+
if let settings = await workspace.buildSystemManager.buildSettings(ofMainFileFor: document, language: .swift) {
190190
return SwiftCompileCommand(settings.buildSettings, isFallback: settings.isFallback)
191191
} else {
192192
return nil

0 commit comments

Comments
 (0)