Merge pull request #63601 from DougGregor/sourcekit-macro-buffer-loc

[SourceKit] Disable optimization that's now incorrect with macros.

Author: swift-ci

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -945,9 +945,13 @@ class SemanticAnnotator : public SourceEntityWalker {
     if (AvailableAttr::isUnavailable(D))
       return true;
 
+    Optional<unsigned> inBufferID;
+    if (SM.getRangeForBuffer(BufferID).contains(Range.getStart()))
+      inBufferID = BufferID;
+
     auto &SM = D->getASTContext().SourceMgr;
     if (D == D->getASTContext().getOptionalNoneDecl() &&
-        SM.extractText(Range, BufferID) == "nil") {
+        SM.extractText(Range, inBufferID) == "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.