Skip to content

Fix build warnings #2604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ahoppen wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

Fix build warnings #2604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Sources/BuildServerIntegration/SwiftPMBuildServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,10 @@ package actor SwiftPMBuildServer: BuiltInBuildServer {
}

let buildFlags = BuildFlags(
cCompilerFlags: options.swiftPMOrDefault.cCompilerFlags ?? [],
cxxCompilerFlags: options.swiftPMOrDefault.cxxCompilerFlags ?? [],
swiftCompilerFlags: options.swiftPMOrDefault.swiftCompilerFlags ?? [],
linkerFlags: options.swiftPMOrDefault.linkerFlags ?? []
cCompilerFlags: (options.swiftPMOrDefault.cCompilerFlags ?? []).map { BuildFlag(value: $0, source: nil) },
cxxCompilerFlags: (options.swiftPMOrDefault.cxxCompilerFlags ?? []).map { BuildFlag(value: $0, source: nil) },
swiftCompilerFlags: (options.swiftPMOrDefault.swiftCompilerFlags ?? []).map { BuildFlag(value: $0, source: nil) },
linkerFlags: (options.swiftPMOrDefault.linkerFlags ?? []).map { BuildFlag(value: $0, source: nil) },
)

self.toolsBuildParameters = try BuildParameters(
Expand Down
2 changes: 1 addition & 1 deletion Sources/SourceKitLSP/SourceKitLSPServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ extension SourceKitLSPServer {

capabilityRegistry = CapabilityRegistry(clientCapabilities: clientCapabilities)

let initializeOptions = orLog("Parsing options") { try SourceKitLSPOptions(fromLSPAny: req.initializationOptions) }
let initializeOptions = SourceKitLSPOptions(fromLSPAny: req.initializationOptions)
_options.withLock { options in
options = SourceKitLSPOptions.merging(base: options, override: initializeOptions)
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/SourceKitLSP/Workspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ package final class Workspace: Sendable, BuildServerManagerDelegate {
//
// Technically, we might be doing unnecessary work here if the output file map is already up-to-date. But since
// this option is mostly intended for testing purposes, this is acceptable.
await buildServerManager.scheduleRecomputeCopyFileMap().value
_ = await buildServerManager.scheduleRecomputeCopyFileMap().value
}
if request.index ?? false {
if let semanticIndexManager = await semanticIndexManager {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftLanguageService/SwiftLanguageService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import SemanticIndex
package import SourceKitD
package import SourceKitLSP
import SwiftExtensions
@_spi(ExperimentalLanguageFeatures) public import SwiftParser
@_spi(ExperimentalLanguageFeatures) package import SwiftParser
import SwiftParserDiagnostics
package import SwiftSyntax
package import ToolchainRegistry
Expand Down