[clangd] Fix the range for include reference to itself.

[VitaNuo]

Re-use the logic from include cleaner in clangd.

[kadircet]

clang-tools-extra/clangd/IncludeCleaner.h

87 ↗

(On Diff #540321)

nit: convention is to use /// for public documentation (as some tools don't export rest for public docs)

89 ↗

(On Diff #540321)

FWIW, this function has nothing specific about includes. what about renaming it to rangeTillEOL(llvm::StringRef Code, unsigned Offset); // Returns the Range starting at Offset and spanning the whole line. and moving it to SourceCode.h?

[VitaNuo]

Address comments.

[VitaNuo]

Thanks for the comments!

clang-tools-extra/clangd/XRefs.cpp

include_cleaner::walkUsed(
         Result.Loc.uri = URIMainFile;
         Results.References.push_back(std::move(Result));
       });
   if (Results.References.empty())
     return std::nullopt;
 
   // Add the #include line to the references list.
   auto IncludeLen = std::string{"#include"}.length() + Inc.Written.length() + 1;
+  auto Start =
+      offsetToPosition(SM.getBufferData(SM.getMainFileID()), Inc.HashOffset);
   ReferencesResult::Reference Result;
-  Result.Loc.range = clangd::Range{Position{Inc.HashLine, 0},
-                                   Position{Inc.HashLine, (int)IncludeLen}};
+  Result.Loc.range = clangd::Range{
+      Start, Position{Inc.HashLine, Start.character + (int)IncludeLen}};
   Result.Loc.uri = URIMainFile;
   Results.References.push_back(std::move(Result));
 
   if (Results.References.empty())
     return std::nullopt;
   return Results;
 }
 } // namespace

clang-tools-extra/clangd/unittests/XRefsTests.cpp

const char *Tests[] = {
     )cpp",
   };
   for (const char *Test : Tests)
     checkFindRefs(Test);
 }
 
 TEST(FindReferences, UsedSymbolsFromInclude) {
   const char *Tests[] = {
-      R"cpp([[#include ^"bar.h"]]
+      R"cpp(   [[#include ^"bar.h"]]
         #include <vector>
         int fstBar = [[bar1]]();
         int sndBar = [[bar2]]();
         [[Bar]] bar;
         int macroBar = [[BAR]];
         std::vector<int> vec;
       )cpp",