Skip to content

Commit ea55b3b

Browse files
committed
Lint files
1 parent 163c46c commit ea55b3b

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

Sources/SourceKitBazelBSP/RequestHandlers/BuildTargets/BazelTargetQuerierParser.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,14 @@ final class BazelTargetQuerierParserImpl: BazelTargetQuerierParser {
276276
canDebug: false
277277
)
278278

279-
guard let ruleType = DependencyRuleType(rawValue: rule.ruleClass), supportedDependencyRuleTypesSet.contains(ruleType) else {
279+
guard let ruleType = DependencyRuleType(rawValue: rule.ruleClass),
280+
supportedDependencyRuleTypesSet.contains(ruleType)
281+
else {
280282
// The cquery seems to pick up things that have the expected name somewhere within the string, like
281283
// my_custom_swift_library. Ignore those
282-
logger.warning("Skipping target \(rule.name, privacy: .public) with unexpected rule class: \(rule.ruleClass)")
284+
logger.warning(
285+
"Skipping target \(rule.name, privacy: .public) with unexpected rule class: \(rule.ruleClass). This can also happen if you used --dependency-rule-to-discover flag is set to filter this type."
286+
)
283287
continue
284288
}
285289

Sources/SourceKitBazelBSP/RequestHandlers/BuildTargets/BazelTargetStore.swift

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,11 @@ final class BazelTargetStoreImpl: BazelTargetStore, @unchecked Sendable {
8989
self.initializedConfig = initializedConfig
9090
self.bazelTargetQuerier = bazelTargetQuerier
9191
self.supportedDependencyRuleTypes = initializedConfig.baseConfig.dependencyRulesToDiscover
92-
self.compileMnemonicsToFilter = Set(initializedConfig.baseConfig.dependencyRulesToDiscover.map { $0.compileMnemonic }).sorted()
93-
self.topLevelMnemonicsToFilter = Set(initializedConfig.baseConfig.topLevelRulesToDiscover.map { $0.mmnemonic }).sorted()
92+
self.compileMnemonicsToFilter = Set(
93+
initializedConfig.baseConfig.dependencyRulesToDiscover.map { $0.compileMnemonic }
94+
).sorted()
95+
self.topLevelMnemonicsToFilter = Set(initializedConfig.baseConfig.topLevelRulesToDiscover.map { $0.mmnemonic })
96+
.sorted()
9497
}
9598

9699
/// Returns true if the store has actually processed something.

Sources/SourceKitBazelBSP/RequestHandlers/BuildTargets/SupportedExtension.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ enum SupportedExtension: String, CaseIterable {
4848
// Source: https://github.com/swiftlang/sourcekit-lsp/blob/7495f5532fdb17184d69518f46a207e596b26c64/Sources/LanguageServerProtocolExtensions/Language%2BInference.swift#L33
4949
var language: Language {
5050
switch self {
51-
case .c: return .c
52-
case .cpp, .cc, .cxx, .hpp: return .cpp
53-
case .m: return .objective_c
54-
case .mm, .h: return .objective_cpp
55-
case .swift: return .swift
51+
case .c: return .c
52+
case .cpp, .cc, .cxx, .hpp: return .cpp
53+
case .m: return .objective_c
54+
case .mm, .h: return .objective_cpp
55+
case .swift: return .swift
5656
}
5757
}
5858
}

Sources/SourceKitBazelBSP/RequestHandlers/SKOptions/BazelTargetCompilerArgsExtractor.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ final class BazelTargetCompilerArgsExtractor {
8686
case .swift:
8787
return .swiftModule
8888
case .c, .cpp, .objective_c, .objective_cpp:
89-
if let pathExtension = uri.fileURL?.pathExtension, SupportedExtension(rawValue: pathExtension)?.kind == .header {
89+
if let pathExtension = uri.fileURL?.pathExtension,
90+
SupportedExtension(rawValue: pathExtension)?.kind == .header
91+
{
9092
return .cHeader
9193
}
9294
// Make the path relative, as this is what aquery will return

0 commit comments

Comments
 (0)