[SourceKit/CursorInfo] Add locations for external files to result

.swiftsourceinfo files contain the serialized location for declarations.
Use this when outputting locations in cursor info so that clients need
not perform an extra index lookup for external modules.

Author: bnbarham

lib/IDE/CommentConversion.cpp

@@ -315,7 +315,7 @@ visitDocComment(const DocComment *DC, TypeOrExtensionDecl SynthesizedTarget) {
 
   {
     // Print line and column number.
-    auto Loc = D->getLoc();
+    auto Loc = D->getLoc(/*SerializedOK=*/true);
     if (Loc.isValid()) {
       const auto &SM = D->getASTContext().SourceMgr;
       StringRef FileName = SM.getDisplayNameForLoc(Loc);

test/SourceKit/CursorInfo/cursor_info.swift

@@ -283,8 +283,8 @@ func checkAnyIsAKeyword(x: Any) {}
 // CHECK5-NEXT: source.lang.swift
 // CHECK5-NEXT: (Int) -> (){{$}}
 
-// RUN: %sourcekitd-test -req=cursor -pos=9:32 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK6 %s
-// CHECK6:      source.lang.swift.ref.function.free ()
+// RUN: %sourcekitd-test -req=global-config -req-opts=optimize_for_ide=0 == -req=cursor -pos=9:32 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK6 %s
+// CHECK6:      source.lang.swift.ref.function.free ({{.*}}/FooSwiftModule.swift:2:13-2:25)
 // CHECK6-NEXT: fooSwiftFunc
 // CHECK6-NEXT: s:14FooSwiftModule03fooB4FuncSiyF
 // CHECK6-NEXT: source.lang.swift
@@ -293,7 +293,7 @@ func checkAnyIsAKeyword(x: Any) {}
 // CHECK6-NEXT: FooSwiftModule
 // CHECK6-NEXT: <Declaration>func fooSwiftFunc() -&gt; <Type usr="s:Si">Int</Type></Declaration>
 // CHECK6-NEXT: <decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooSwiftFunc</decl.name>() -&gt; <decl.function.returntype><ref.struct usr="s:Si">Int</ref.struct></decl.function.returntype></decl.function.free>
-// CHECK6-NEXT: {{^}}<Function><Name>fooSwiftFunc()</Name><USR>s:14FooSwiftModule03fooB4FuncSiyF</USR><Declaration>func fooSwiftFunc() -&gt; Int</Declaration><CommentParts><Abstract><Para>This is ‘fooSwiftFunc’ from ‘FooSwiftModule’.</Para></Abstract></CommentParts></Function>{{$}}
+// CHECK6-NEXT: {{^}}<Function file="{{.*}}/FooSwiftModule.swift" line="2" column="13"><Name>fooSwiftFunc()</Name><USR>s:14FooSwiftModule03fooB4FuncSiyF</USR><Declaration>func fooSwiftFunc() -&gt; Int</Declaration><CommentParts><Abstract><Para>This is ‘fooSwiftFunc’ from ‘FooSwiftModule’.</Para></Abstract></CommentParts></Function>{{$}}
 
 // RUN: %sourcekitd-test -req=cursor -pos=14:10 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %s | %FileCheck -check-prefix=CHECK7 %s
 // CHECK7:      source.lang.swift.ref.struct (13:8-13:10)

test/SourceKit/CursorInfo/cursor_symbol_graph_referenced.swift

@@ -19,7 +19,7 @@ extension Parent {
 
 // RUN: %empty-directory(%t)
 // RUN: echo 'public struct FromSomeModule {} ' > %t/SomeModule.swift
-// RUN: %target-build-swift %t/SomeModule.swift -module-name SomeModule -emit-module -emit-module-path %t/
+// RUN: %target-build-swift %t/SomeModule.swift -emit-module -module-name SomeModule -o %t/SomeModule.swiftmodule
 
 // References should cover symbols from the symbol graph declaration fragments, even if not present in the original source.
 // RUN:  %sourcekitd-test -req=cursor -pos=3:5 -req-opts=retrieve_symbol_graph=1 %s -- %s -target %target-triple -I %t | %FileCheck -check-prefixes=GLOBAL %s
@@ -133,7 +133,7 @@ extension Parent {
 
 
 // References to unsupported types (like generic parameters) should be ignored.
-// RUN:  %sourcekitd-test -req=cursor -pos=11:14 -req-opts=retrieve_symbol_graph=1 %s -- %s -target %target-triple -I %t | %FileCheck -check-prefixes=NESTED %s
+// RUN: %sourcekitd-test -req=global-config -req-opts=optimize_for_ide=0 == -req=cursor -pos=11:14 -req-opts=retrieve_symbol_graph=1 %s -- %s -target %target-triple -I %t | %FileCheck -check-prefixes=NESTED %s
 //
 // NESTED:      SYMBOL GRAPH BEGIN
 // NESTED:        "declarationFragments": [
@@ -225,8 +225,7 @@ extension Parent {
 // NESTED-NEXT: [[ExtInner_USR]] | internal | {{.*}}cursor_symbol_graph_referenced.swift | cursor_symbol_graph_referenced | User | NonSPI | source.lang.swift
 // NESTED-NEXT:   Parent swift.struct s:30cursor_symbol_graph_referenced6ParentV
 // NESTED-NEXT:   ExtInner swift.struct [[ExtInner_USR]]
-// FIXME: We should get the file path via the swiftsourceinfo file for user modules (rdar://75582627)
-// NESTED-NEXT: [[FromSomeModule_USR]] | public | <empty> | SomeModule | User | NonSPI | source.lang.swift
+// NESTED-NEXT: [[FromSomeModule_USR]] | public | {{.*}}/SomeModule.swift | SomeModule | User | NonSPI | source.lang.swift
 // NESTED-NEXT:   FromSomeModule swift.struct [[FromSomeModule_USR]]
 // NESTED-NEXT: REFERENCED DECLS END
 

tools/SourceKit/include/SourceKit/Core/LangSupport.h

@@ -444,7 +444,7 @@ struct CursorSymbolInfo {
   /// Stores the Symbol Graph title, kind, and USR of the parent contexts of the
   /// symbol under the cursor.
   ArrayRef<ParentInfo> ParentContexts;
-  /// The set of decls referenced in the symbol graph delcaration fragments.
+  /// The set of decls referenced in the symbol graph declaration fragments.
   ArrayRef<ReferencedDeclInfo> ReferencedSymbols;
   /// For calls this lists the USRs of the receiver types (multiple only in the
   /// case that the base is a protocol composition).

tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp

@@ -850,7 +850,8 @@ getLocationInfo(const ValueDecl *VD,
 
   auto ClangNode = VD->getClangNode();
 
-  if (VD->getLoc().isValid()) {
+  auto Loc = VD->getLoc(/*SerializedOK=*/true);
+  if (Loc.isValid()) {
     auto getSignatureRange = [&](const ValueDecl *VD) -> Optional<unsigned> {
       if (auto FD = dyn_cast<AbstractFunctionDecl>(VD)) {
         SourceRange R = FD->getSignatureSourceRange();
@@ -865,14 +866,13 @@ getLocationInfo(const ValueDecl *VD,
     } else if (VD->hasName()) {
       NameLen = VD->getBaseName().userFacingName().size();
     } else {
-      NameLen = getCharLength(SM, VD->getLoc());
+      NameLen = getCharLength(SM, Loc);
     }
 
-    unsigned DeclBufID = SM.findBufferContainingLoc(VD->getLoc());
-    DeclarationLoc = {SM.getLocOffsetInBuffer(VD->getLoc(), DeclBufID),
+    unsigned DeclBufID = SM.findBufferContainingLoc(Loc);
+    DeclarationLoc = {SM.getLocOffsetInBuffer(Loc, DeclBufID),
                       NameLen};
     Filename = SM.getIdentifierForBuffer(DeclBufID);
-
   } else if (ClangNode) {
     ClangImporter *Importer =
         static_cast<ClangImporter *>(Ctx.getClangModuleLoader());