commit 2be4569719357c55fa9680265bbdcfb798468e9a
author Sam McCall <sam.mccall@gmail.com> Mon Mar 02 16:54:56 2020 +0100
committer Sam McCall <sam.mccall@gmail.com> Wed Mar 04 23:57:21 2020 +0100
tree 7972735e9dfcafe11955e9fe80b889f7ce5a05ef
parent 37549464c13e5f059925b9d8be1ea8e87711537e

[clangd] Fix isInsideMainFile to be aware of preamble.

Reviewers: kadircet

Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, usaxena95, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D75460

clang-tools-extra/clangd/SourceCode.cpp

diff --git a/clang-tools-extra/clangd/SourceCode.cpp b/clang-tools-extra/clangd/SourceCode.cpp
index d18daa9..7515472 100644
--- a/clang-tools-extra/clangd/SourceCode.cpp
+++ b/clang-tools-extra/clangd/SourceCode.cpp
@@ -420,7 +420,10 @@
 }
 
 bool isInsideMainFile(SourceLocation Loc, const SourceManager &SM) {
-  return Loc.isValid() && SM.isWrittenInMainFile(SM.getExpansionLoc(Loc));
+  if (!Loc.isValid())
+    return false;
+  FileID FID = SM.getFileID(SM.getExpansionLoc(Loc));
+  return FID == SM.getMainFileID() || FID == SM.getPreambleFileID();
 }
 
 llvm::Optional<SourceRange> toHalfOpenFileRange(const SourceManager &SM,