Skip to content

Commit 5fe1079

Browse files
authored
Merge pull request #2352 from Kila2/main
fix failed to override buildSettingsTimeout when override is nil
2 parents d1a9857 + 239e455 commit 5fe1079

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Sources/SKOptions/SourceKitLSPOptions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ public struct SourceKitLSPOptions: Sendable, Codable, Equatable {
532532
base: base.fallbackBuildSystemOrDefault,
533533
override: override?.fallbackBuildSystem
534534
),
535-
buildSettingsTimeout: override?.buildSettingsTimeout,
535+
buildSettingsTimeout: override?.buildSettingsTimeout ?? base.buildSettingsTimeout,
536536
compilationDatabase: CompilationDatabaseOptions.merging(
537537
base: base.compilationDatabaseOrDefault,
538538
override: override?.compilationDatabase

0 commit comments

Comments
 (0)