Skip to content

Commit 89d989b

Browse files
committed
Create the request using the dict
1 parent 67d3137 commit 89d989b

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

Sources/SwiftLanguageService/CopyObjCSelector.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ extension SwiftLanguageService {
2626
let offset = snapshot.utf8Offset(of: command.positionRange.lowerBound)
2727

2828
let keys = self.keys
29-
let skreq = sourcekitd.dictionary([:])
30-
skreq.set(keys.offset, to: offset)
31-
skreq.set(keys.sourceFile, to: snapshot.uri.sourcekitdSourceFile)
29+
let skreq = sourcekitd.dictionary([
30+
keys.offset: offset,
31+
keys.sourceFile: snapshot.uri.sourcekitdSourceFile,
32+
])
33+
3234
if let primaryFile = snapshot.uri.primaryFile?.pseudoPath {
3335
skreq.set(keys.primaryFile, to: primaryFile)
3436
}

Sources/SwiftLanguageService/SwiftLanguageService.swift

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,18 +1001,14 @@ extension SwiftLanguageService {
10011001
let offset = snapshot.utf8Offset(of: range.lowerBound)
10021002

10031003
let keys = self.keys
1004+
let primaryFile = snapshot.uri.primaryFile?.pseudoPath
1005+
let compilerArgs: [any SKDRequestValue] = compileCommand?.compilerArgs ?? []
10041006
let skreq = sourcekitd.dictionary([
10051007
keys.offset: offset,
10061008
keys.sourceFile: snapshot.uri.sourcekitdSourceFile,
10071009
keys.primaryFile: primaryFile,
1008-
keys.compilerArgs: compilerArgs as [any SKDRequestValue]
1010+
keys.compilerArgs: compilerArgs
10091011
])
1010-
if let primaryFile = snapshot.uri.primaryFile?.pseudoPath {
1011-
skreq.set(keys.primaryFile, to: primaryFile)
1012-
}
1013-
if let compilerArgs = compileCommand?.compilerArgs {
1014-
skreq.set(keys.compilerArgs, to: compilerArgs as [any SKDRequestValue])
1015-
}
10161012

10171013
do {
10181014
let dict = try await send(sourcekitdRequest: \.objcSelector, skreq, snapshot: snapshot)

0 commit comments

Comments
 (0)