Fix parsing includes and imports

Author: intitni

Tool/Sources/FocusedCodeFinder/ObjectiveC/ObjectiveCCodeFinder.swift

@@ -172,7 +172,11 @@ public class ObjectiveCFocusedCodeFinder: KnownLanguageFocusedCodeFinder<
         textProvider: @escaping TextProvider
     ) -> NodeInfo? {
         guard let typeNode = node.child(byFieldName: "type") else { return nil }
-        return parseSignatureBeforeBody(typeNode, textProvider: textProvider)
+        guard var result = parseSignatureBeforeBody(typeNode, textProvider: textProvider)
+        else { return nil }
+        result.signature = "typedef \(result.signature)"
+        result.node = node
+        return result
     }
 
     func parseFunctionDefinitionNode(

Tool/Sources/FocusedCodeFinder/ObjectiveC/ObjectiveCScopeHierarchySyntaxVisitor.swift

@@ -23,13 +23,13 @@ final class ObjectiveCScopeHierarchySyntaxVisitor: ASTTreeVisitor {
         self.textProvider = textProvider
         super.init(tree: tree)
     }
-    
+
     /// The nodes containing the current range, sorted from inner to outer.
     func findScopeHierarchy(_ node: ASTNode) -> [ASTNode] {
         walk(node)
         return _scopeHierarchy.sorted { $0.range.location > $1.range.location }
     }
-    
+
     /// The nodes containing the current range, sorted from inner to outer.
     func findScopeHierarchy() -> [ASTNode] {
         walk()
@@ -70,7 +70,7 @@ final class ObjectiveCScopeHierarchySyntaxVisitor: ASTTreeVisitor {
         case .structSpecifier, .enumSpecifier, .nsEnumSpecifier:
             guard cursorRange.strictlyContains(range) else { return .skipChildren }
             _scopeHierarchy.append(node)
-            return .skipChildren 
+            return .skipChildren
         case .functionDefinition:
             guard cursorRange.strictlyContains(range) else { return .skipChildren }
             _scopeHierarchy.append(node)
@@ -85,45 +85,28 @@ final class ObjectiveCScopeHierarchySyntaxVisitor: ASTTreeVisitor {
     // MARK: Imports
 
     func handlePreprocInclude(_ node: ASTNode) {
-        let children = node.children
-        for child in children {
-            if let pathNode = child.child(byFieldName: "path") {
-                let path = textProvider(pathNode)
-                if !path.isEmpty {
-                    includes.append(path.replacingOccurrences(of: "\"", with: ""))
-                }
-                break
+        if let pathNode = node.child(byFieldName: "path") {
+            let path = textProvider(pathNode)
+            if !path.isEmpty {
+                includes.append(path)
             }
         }
     }
 
     func handlePreprocImport(_ node: ASTNode) {
-        let children = node.children
-        for child in children {
-            if let pathNode = child.child(byFieldName: "path") {
-                let path = textProvider(pathNode)
-                if !path.isEmpty {
-                    imports.append(
-                        path
-                            .replacingOccurrences(of: "\"", with: "")
-                            .replacingOccurrences(of: "<", with: "")
-                            .replacingOccurrences(of: ">", with: "")
-                    )
-                }
-                break
+        if let pathNode = node.child(byFieldName: "path") {
+            let path = textProvider(pathNode)
+            if !path.isEmpty {
+                imports.append(path)
             }
         }
     }
 
     func handleModuleImport(_ node: ASTNode) {
-        let children = node.children
-        for child in children {
-            if let pathNode = child.child(byFieldName: "module") {
-                let path = textProvider(pathNode)
-                if !path.isEmpty {
-                    imports.append(path)
-                }
-                break
+        if let pathNode = node.child(byFieldName: "module") {
+            let path = textProvider(pathNode)
+            if !path.isEmpty {
+                imports.append(path)
             }
         }
     }

Tool/Tests/FocusedCodeFinderTests/ObjectiveCFocusedCodeFinderTests.swift

@@ -231,5 +231,140 @@ final class ObjectiveCFocusedCodeFinder_Selection_Tests: XCTestCase {
             includes: []
         ))
     }
+    
+    func test_selecting_a_line_inside_a_struct_the_scope_should_be_the_struct() {
+        let code = """
+        struct Foo {
+            NSInteger foo;
+            NSInteger bar;
+            NSInteger baz;
+        }
+        """
+        let range = CursorRange(
+            start: CursorPosition(line: 1, character: 0),
+            end: CursorPosition(line: 3, character: 31)
+        )
+        let context = ObjectiveCFocusedCodeFinder().findFocusedCode(
+            in: document(code: code),
+            containingRange: range
+        )
+        XCTAssertEqual(context, .init(
+            scope: .scope(signature: [
+                .init(
+                    signature: "struct Foo",
+                    name: "Foo",
+                    range: .init(startPair: (0, 0), endPair: (4, 1))
+                ),
+            ]),
+            contextRange: .init(startPair: (0, 0), endPair: (4, 1)),
+            focusedRange: range,
+            focusedCode: """
+                NSInteger foo;
+                NSInteger bar;
+                NSInteger baz;
+            
+            """,
+            imports: [],
+            includes: []
+        ))
+    }
+    
+    func test_selecting_a_line_inside_a_enum_the_scope_should_be_the_enum() {
+        let code = """
+        enum Foo {
+            foo,
+            bar,
+            baz
+        };
+        """
+        let range = CursorRange(
+            start: CursorPosition(line: 1, character: 0),
+            end: CursorPosition(line: 3, character: 31)
+        )
+        let context = ObjectiveCFocusedCodeFinder().findFocusedCode(
+            in: document(code: code),
+            containingRange: range
+        )
+        XCTAssertEqual(context, .init(
+            scope: .scope(signature: [
+                .init(
+                    signature: "enum Foo",
+                    name: "Foo",
+                    range: .init(startPair: (0, 0), endPair: (4, 1))
+                ),
+            ]),
+            contextRange: .init(startPair: (0, 0), endPair: (4, 1)),
+            focusedRange: range,
+            focusedCode: """
+                foo,
+                bar,
+                baz
+            
+            """,
+            imports: [],
+            includes: []
+        ))
+    }
+    
+    func test_selecting_a_line_inside_an_NSEnum_the_scope_should_be_the_enum() {
+        let code = """
+        typedef NS_ENUM(NSInteger, Foo) {
+            foo,
+            bar,
+            baz
+        };
+        """
+        let range = CursorRange(
+            start: CursorPosition(line: 1, character: 0),
+            end: CursorPosition(line: 3, character: 31)
+        )
+        let context = ObjectiveCFocusedCodeFinder().findFocusedCode(
+            in: document(code: code),
+            containingRange: range
+        )
+        XCTAssertEqual(context, .init(
+            scope: .scope(signature: [
+                .init(
+                    signature: "typedef NS_ENUM(NSInteger, Foo)",
+                    name: "Foo",
+                    range: .init(startPair: (0, 0), endPair: (4, 2))
+                ),
+            ]),
+            contextRange: .init(startPair: (0, 0), endPair: (4, 2)),
+            focusedRange: range,
+            focusedCode: """
+                foo,
+                bar,
+                baz
+            
+            """,
+            imports: [],
+            includes: []
+        ))
+    }
 }
 
+final class ObjectiveCFocusedCodeFinder_Imports_Tests: XCTestCase {
+    func test_parsing_imports() {
+        let code = """
+        #import <Foundation/Foundation.h>
+        @import UIKit;
+        #import "Foo.h"
+        #include "Bar.h"
+        """
+        
+        let context = ObjectiveCFocusedCodeFinder().findFocusedCode(
+            in: document(code: code),
+            containingRange: .zero
+        )
+        
+        XCTAssertEqual(context.imports, [
+            "<Foundation/Foundation.h>",
+            "UIKit",
+            "\"Foo.h\""
+        ])
+        XCTAssertEqual(context.includes, [
+            "\"Bar.h\""
+        ])
+    }
+}