SourceKit: Introduce a new enum class to describe the kind of resolved sema token kind. NFC (#7657)

Author: nkcsgexi

include/swift/IDE/Utils.h

@@ -143,7 +143,15 @@ class XMLEscapingPrinter : public StreamPrinter {
   void printXML(StringRef Text);
 };
 
+enum class SemaTokenKind {
+  Invalid,
+  ValueRef,
+  ModuleRef,
+  StmtStart,
+};
+
 struct SemaToken {
+  SemaTokenKind Kind = SemaTokenKind::Invalid;
   ValueDecl *ValueD = nullptr;
   TypeDecl *CtorTyRef = nullptr;
   ExtensionDecl *ExtTyRef = nullptr;
@@ -154,17 +162,20 @@ struct SemaToken {
   Type Ty;
   DeclContext *DC = nullptr;
   Type ContainerType;
+  Stmt *TrailingStmt = nullptr;
 
   SemaToken() = default;
   SemaToken(ValueDecl *ValueD, TypeDecl *CtorTyRef, ExtensionDecl *ExtTyRef,
             SourceLoc Loc, bool IsRef, Type Ty, Type ContainerType) :
-            ValueD(ValueD), CtorTyRef(CtorTyRef), ExtTyRef(ExtTyRef), Loc(Loc),
-            IsRef(IsRef), Ty(Ty), DC(ValueD->getDeclContext()),
-            ContainerType(ContainerType) {}
-  SemaToken(ModuleEntity Mod, SourceLoc Loc) : Mod(Mod), Loc(Loc) { }
-
-  bool isValid() const { return ValueD != nullptr || Mod; }
-  bool isInvalid() const { return !isValid(); }
+            Kind(SemaTokenKind::ValueRef), ValueD(ValueD), CtorTyRef(CtorTyRef),
+            ExtTyRef(ExtTyRef), Loc(Loc), IsRef(IsRef), Ty(Ty),
+            DC(ValueD->getDeclContext()), ContainerType(ContainerType) {}
+  SemaToken(ModuleEntity Mod, SourceLoc Loc) : Kind(SemaTokenKind::ModuleRef),
+                                               Mod(Mod), Loc(Loc) { }
+  SemaToken(Stmt *TrailingStmt) : Kind(SemaTokenKind::StmtStart),
+                                  TrailingStmt(TrailingStmt) {}
+  bool isValid() const { return !isInvalid(); }
+  bool isInvalid() const { return Kind == SemaTokenKind::Invalid; }
 };
 
 class SemaLocResolver : public SourceEntityWalker {
@@ -196,6 +207,7 @@ class SemaLocResolver : public SourceEntityWalker {
   bool tryResolve(ValueDecl *D, TypeDecl *CtorTyRef, ExtensionDecl *ExtTyRef,
                   SourceLoc Loc, bool IsRef, Type Ty = Type());
   bool tryResolve(ModuleEntity Mod, SourceLoc Loc);
+  bool tryResolve(Stmt *St);
   bool visitSubscriptReference(ValueDecl *D, CharSourceRange Range,
                                bool IsOpenBracket) override;
 };

lib/IDE/SwiftSourceDocInfo.cpp

@@ -91,6 +91,22 @@ bool SemaLocResolver::tryResolve(ModuleEntity Mod, SourceLoc Loc) {
   return false;
 }
 
+bool SemaLocResolver::tryResolve(Stmt *St) {
+  if (auto *LST = dyn_cast<LabeledStmt>(St)) {
+    if (LST->getStartLoc() == LocToResolve) {
+      SemaTok = { St };
+      return true;
+    }
+  }
+  if (auto *CS = dyn_cast<CaseStmt>(St)) {
+    if (CS->getStartLoc() == LocToResolve) {
+      SemaTok = { St };
+      return true;
+    }
+  }
+  return false;
+}
+
 bool SemaLocResolver::visitSubscriptReference(ValueDecl *D, CharSourceRange Range,
                                               bool IsOpenBracket) {
   // We should treat both open and close brackets equally
@@ -133,7 +149,7 @@ bool SemaLocResolver::walkToStmtPre(Stmt *S) {
   // non-implicit Stmts (fix Stmts created for lazy vars).
   if (!S->isImplicit() && !rangeContainsLoc(S->getSourceRange()))
     return false;
-  return true;
+  return !tryResolve(S);
 }
 
 bool SemaLocResolver::walkToStmtPost(Stmt *S) {

tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp

@@ -1075,10 +1075,12 @@ static void resolveCursor(SwiftLangSupport &Lang,
       CompilerInvocation CompInvok;
       ASTInvok->applyTo(CompInvok);
 
-      if (SemaTok.Mod) {
+      switch (SemaTok.Kind) {
+      case SemaTokenKind::ModuleRef:
         passCursorInfoForModule(SemaTok.Mod, Lang.getIFaceGenContexts(),
                                 CompInvok, Receiver);
-      } else {
+        return;
+      case SemaTokenKind::ValueRef: {
         ValueDecl *VD = SemaTok.CtorTyRef ? SemaTok.CtorTyRef : SemaTok.ValueD;
         bool Failed = passCursorInfoForDecl(VD, MainModule,
                                             SemaTok.ContainerType,
@@ -1095,6 +1097,15 @@ static void resolveCursor(SwiftLangSupport &Lang,
             Receiver({});
           }
         }
+        return;
+      }
+      case SemaTokenKind::StmtStart: {
+        Receiver({});
+        return;
+      }
+      case SemaTokenKind::Invalid: {
+        llvm_unreachable("bad sema token kind");
+      }
       }
     }
 
@@ -1169,9 +1180,11 @@ static void resolveName(SwiftLangSupport &Lang, StringRef InputFile,
       CompilerInvocation CompInvok;
       ASTInvok->applyTo(CompInvok);
 
-      if (SemaTok.Mod) {
+      switch(SemaTok.Kind) {
+      case SemaTokenKind::ModuleRef:
+        return;
 
-      } else {
+      case SemaTokenKind::ValueRef: {
         bool Failed = passNameInfoForDecl(SemaTok.ValueD, Input, Receiver);
         if (Failed) {
           if (!getPreviousASTSnaps().empty()) {
@@ -1182,6 +1195,14 @@ static void resolveName(SwiftLangSupport &Lang, StringRef InputFile,
             Receiver({});
           }
         }
+        return;
+      }
+      case SemaTokenKind::StmtStart: {
+        Receiver({});
+        return;
+      }
+      case SemaTokenKind::Invalid:
+        llvm_unreachable("bad sema token kind.");
       }
     }