correctly handle files included through symlinks

Author: sdkrystian

src/lib/AST/ASTVisitor.cpp

@@ -3114,25 +3114,18 @@ ASTVisitor::
 findFileInfo(clang::SourceLocation const loc)
 {
     MRDOCS_CHECK_OR(!loc.isInvalid(), nullptr);
-
-    // KRYSTIAN FIXME: we really should not be calling getPresumedLoc this often,
-    // it's quite expensive
-    auto const presumed = source_.getPresumedLoc(loc, false);
-    MRDOCS_CHECK_OR(!presumed.isInvalid(), nullptr);
-
-    FileEntry const* entry = source_.getFileEntryForID( presumed.getFileID());
-    MRDOCS_CHECK_OR(entry, nullptr);
+    // Find the presumed location, ignoring #line directives
+    PresumedLoc presumed = source_.getPresumedLoc(loc, false);
+    FileID id = presumed.getFileID();
+    if(id.isInvalid())
+        return nullptr;
 
     // Find in the cache
-    if (auto const it = files_.find(entry); it != files_.end())
-    {
+    if(auto const it = files_.find(id); it != files_.end())
         return std::addressof(it->second);
-    }
 
-    // Build FileInfo
-    auto const FI = buildFileInfo(entry);
-    MRDOCS_CHECK_OR(FI, nullptr);
-    auto [it, inserted] = files_.try_emplace(entry, std::move(*FI));
+    auto [it, inserted] = files_.try_emplace(
+        id, buildFileInfo(presumed.getFilename()));
     return std::addressof(it->second);
 }
 
@@ -3148,15 +3141,6 @@ findFileInfo(Decl const* D)
     return findFileInfo(Loc);
 }
 
-std::optional<ASTVisitor::FileInfo>
-ASTVisitor::
-buildFileInfo(FileEntry const* entry)
-{
-    std::string_view const file_path = entry->tryGetRealPathName();
-    MRDOCS_CHECK_OR(!file_path.empty(), std::nullopt);
-    return buildFileInfo(file_path);
-}
-
 ASTVisitor::FileInfo
 ASTVisitor::
 buildFileInfo(std::string_view const file_path)

src/lib/AST/ASTVisitor.hpp

@@ -138,7 +138,7 @@ class ASTVisitor
         if a file should be extracted or to add the
         SourceInfo to an Info object.
     */
-    std::unordered_map<FileEntry const*, FileInfo> files_;
+    llvm::DenseMap<FileID, FileInfo> files_;
 
     /*  Determine how a Decl matched the filters
      */
@@ -1112,26 +1112,6 @@ class ASTVisitor
     FileInfo*
     findFileInfo(Decl const* D);
 
-    /* Build a FileInfo for a FileEntry
-
-        This function will build a FileInfo object for a
-        given Clang FileEntry object.
-
-        The function will extract the full path and short
-        path of the file, and store the information in the
-        FileInfo object.
-
-        This function is used as an auxiliary function to
-        `findFileInfo` when the FileInfo object does not
-        exist in the cache.
-
-        @param file The Clang FileEntry object to build the FileInfo for.
-        @return the FileInfo object.
-
-     */
-    std::optional<FileInfo>
-    buildFileInfo(FileEntry const* entry);
-
     /* Build a FileInfo for a string path
 
         This function will build a FileInfo object for a

test-files/golden-tests/filters/file/excluded.hpp

@@ -0,0 +1,4 @@
+/** A brief.
+*/
+
+void f();

test-files/golden-tests/filters/file/include-symlink.adoc

@@ -0,0 +1,11 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+
+
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#

test-files/golden-tests/filters/file/include-symlink.cpp

@@ -0,0 +1 @@
+#include "included.hpp"

test-files/golden-tests/filters/file/include-symlink.yml

@@ -0,0 +1,3 @@
+# Exclude excluded.hpp
+exclude:
+  - 'excluded.hpp'

test-files/golden-tests/filters/file/included.hpp

@@ -0,0 +1 @@
+excluded.hpp