@@ -45,7 +45,7 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
4545 tree: SourceFileSyntax
4646 ) -> ( TextProvider , RangeConverter ) {
4747 let locationConverter = SourceLocationConverter (
48- file : document. documentURL. path,
48+ fileName : document. documentURL. path,
4949 tree: tree
5050 )
5151 return (
@@ -71,7 +71,7 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
7171 switch node {
7272 case let node as StructDeclSyntax :
7373 let type = node. structKeyword. text
74- let name = node. identifier . text
74+ let name = node. name . text
7575 return . init(
7676 node: node,
7777 signature: " \( type) \( name) "
@@ -84,7 +84,7 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
8484
8585 case let node as ClassDeclSyntax :
8686 let type = node. classKeyword. text
87- let name = node. identifier . text
87+ let name = node. name . text
8888 return . init(
8989 node: node,
9090 signature: " \( type) \( name) "
@@ -97,7 +97,7 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
9797
9898 case let node as EnumDeclSyntax :
9999 let type = node. enumKeyword. text
100- let name = node. identifier . text
100+ let name = node. name . text
101101 return . init(
102102 node: node,
103103 signature: " \( type) \( name) "
@@ -110,7 +110,7 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
110110
111111 case let node as ActorDeclSyntax :
112112 let type = node. actorKeyword. text
113- let name = node. identifier . text
113+ let name = node. name . text
114114 return . init(
115115 node: node,
116116 signature: " \( type) \( name) "
@@ -123,7 +123,7 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
123123
124124 case let node as MacroDeclSyntax :
125125 let type = node. macroKeyword. text
126- let name = node. identifier . text
126+ let name = node. name . text
127127 return . init(
128128 node: node,
129129 signature: " \( type) \( name) "
@@ -135,7 +135,7 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
135135
136136 case let node as ProtocolDeclSyntax :
137137 let type = node. protocolKeyword. text
138- let name = node. identifier . text
138+ let name = node. name . text
139139 return . init(
140140 node: node,
141141 signature: " \( type) \( name) "
@@ -161,7 +161,7 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
161161
162162 case let node as FunctionDeclSyntax :
163163 let type = node. funcKeyword. text
164- let name = node. identifier . text
164+ let name = node. name . text
165165 let signature = node. signature. trimmedDescription
166166 . split ( omittingEmptySubsequences: false , whereSeparator: \. isNewline)
167167 . map { $0. trimmingCharacters ( in: . whitespacesAndNewlines) }
@@ -293,15 +293,15 @@ public class SwiftFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
293293 func findTypeNameFromNode( _ node: SyntaxProtocol ) -> String ? {
294294 switch node {
295295 case let node as ClassDeclSyntax :
296- return node. identifier . text
296+ return node. name . text
297297 case let node as StructDeclSyntax :
298- return node. identifier . text
298+ return node. name . text
299299 case let node as EnumDeclSyntax :
300- return node. identifier . text
300+ return node. name . text
301301 case let node as ActorDeclSyntax :
302- return node. identifier . text
302+ return node. name . text
303303 case let node as ProtocolDeclSyntax :
304- return node. identifier . text
304+ return node. name . text
305305 case let node as ExtensionDeclSyntax :
306306 return node. extendedType. trimmedDescription
307307 default :
@@ -322,18 +322,18 @@ extension CursorRange {
322322// MARK: - Helper Types
323323
324324protocol AttributeAndModifierApplicableSyntax {
325- var attributes : AttributeListSyntax ? { get }
326- var modifiers : ModifierListSyntax ? { get }
325+ var attributes : AttributeListSyntax { get }
326+ var modifiers : DeclModifierListSyntax { get }
327327}
328328
329329extension AttributeAndModifierApplicableSyntax {
330330 func modifierAndAttributeText( _ extractText: ( SyntaxProtocol ) -> String ) -> String {
331- let attributeTexts = attributes? . map { attribute in
331+ let attributeTexts = attributes. map { attribute in
332332 extractText ( attribute)
333- } ?? [ ]
334- let modifierTexts = modifiers? . map { modifier in
333+ }
334+ let modifierTexts = modifiers. map { modifier in
335335 extractText ( modifier)
336- } ?? [ ]
336+ }
337337 let prefix = ( attributeTexts + modifierTexts) . joined ( separator: " " )
338338 return prefix
339339 }
@@ -352,13 +352,13 @@ extension VariableDeclSyntax: AttributeAndModifierApplicableSyntax {}
352352extension InitializerDeclSyntax : AttributeAndModifierApplicableSyntax { }
353353extension DeinitializerDeclSyntax : AttributeAndModifierApplicableSyntax { }
354354extension AccessorDeclSyntax : AttributeAndModifierApplicableSyntax {
355- var modifiers : SwiftSyntax . ModifierListSyntax ? { nil }
355+ var modifiers : SwiftSyntax . DeclModifierListSyntax { [ ] }
356356}
357357
358358extension SubscriptDeclSyntax : AttributeAndModifierApplicableSyntax { }
359359
360360protocol InheritanceClauseApplicableSyntax {
361- var inheritanceClause : TypeInheritanceClauseSyntax ? { get }
361+ var inheritanceClause : InheritanceClauseSyntax ? { get }
362362}
363363
364364extension StructDeclSyntax : InheritanceClauseApplicableSyntax { }
@@ -370,7 +370,7 @@ extension ExtensionDeclSyntax: InheritanceClauseApplicableSyntax {}
370370
371371extension InheritanceClauseApplicableSyntax {
372372 func inheritanceClauseTexts( _ extractText: ( SyntaxProtocol ) -> String ) -> String {
373- inheritanceClause? . inheritedTypeCollection . map { clause in
373+ inheritanceClause? . inheritedTypes . map { clause in
374374 extractText ( clause) . trimmingCharacters ( in: [ " , " ] )
375375 } . joined ( separator: " , " ) ?? " "
376376 }
0 commit comments