Merge pull request #63608 from DougGregor/sourcekit-no-crash-macro-locations

Don't annotate entities not in the primary buffer

Author: swift-ci

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -945,13 +945,13 @@ class SemanticAnnotator : public SourceEntityWalker {
     if (AvailableAttr::isUnavailable(D))
       return true;
 
-    Optional<unsigned> inBufferID;
-    if (SM.getRangeForBuffer(BufferID).contains(Range.getStart()))
-      inBufferID = BufferID;
+    // FIXME: Ignore things that don't come from this buffer.
+    if (!SM.getRangeForBuffer(BufferID).contains(Range.getStart()))
+      return true;
 
     auto &SM = D->getASTContext().SourceMgr;
     if (D == D->getASTContext().getOptionalNoneDecl() &&
-        SM.extractText(Range, inBufferID) == "nil") {
+        SM.extractText(Range, BufferID) == "nil") {
       // If a 'nil' literal occurs in a swift-case statement, it gets replaced
       // by a reference to 'Optional.none' in the AST. We want to continue
       // highlighting 'nil' as a keyword and not as an enum element.