NFC: Rename DeclVisibilityKind::LocalVariable -> LocalDecl

This includes local types, so make the name a bit
more generic.

Author: hamishknight

include/swift/AST/NameLookup.h

@@ -261,7 +261,7 @@ inline UnqualifiedLookupOptions operator|(UnqualifiedLookupFlags flag1,
 /// Describes the reason why a certain declaration is visible.
 enum class DeclVisibilityKind {
   /// Declaration is a local variable or type.
-  LocalVariable,
+  LocalDecl,
 
   /// Declaration is a function parameter.
   FunctionParameter,

lib/AST/NameLookup.cpp

@@ -160,13 +160,13 @@ void UsableFilteringDeclConsumer::foundDecl(ValueDecl *D,
   }
 
   switch (reason) {
-  case DeclVisibilityKind::LocalVariable:
+  case DeclVisibilityKind::LocalDecl:
   case DeclVisibilityKind::FunctionParameter:
     // Skip if Loc is before the found decl if the decl is a var/let decl.
     // Type and func decls can be referenced before its declaration, or from
     // within nested type decls.
     if (isa<VarDecl>(D)) {
-      if (reason == DeclVisibilityKind::LocalVariable) {
+      if (reason == DeclVisibilityKind::LocalDecl) {
         // Workaround for fast-completion. A loc in the current context might be
         // in a loc
         auto tmpLoc = Loc;
@@ -240,7 +240,7 @@ void UsableFilteringDeclConsumer::foundDecl(ValueDecl *D,
       return;
 
     switch (shadowingReason) {
-    case DeclVisibilityKind::LocalVariable:
+    case DeclVisibilityKind::LocalDecl:
     case DeclVisibilityKind::FunctionParameter:
       // Local func and var/let with a conflicting name.
       //   func foo() {
@@ -251,7 +251,7 @@ void UsableFilteringDeclConsumer::foundDecl(ValueDecl *D,
       // So, for confilicting local values in the same decl context, even if the
       // 'var value' is reported after 'func value', don't shadow it, but we
       // shadow everything with the name after that.
-      if (reason == DeclVisibilityKind::LocalVariable &&
+      if (reason == DeclVisibilityKind::LocalDecl &&
           isa<VarDecl>(D) && !isa<VarDecl>(shadowingD) &&
           shadowingD->getDeclContext() == D->getDeclContext()) {
         // Replace the shadowing decl so we shadow subsequent conflicting decls.
@@ -3967,7 +3967,7 @@ void FindLocalVal::checkStmtCondition(const StmtCondition &Cond) {
     if (auto *P = entry.getPatternOrNull()) {
       SourceRange previousConditionsToHere = SourceRange(start, entry.getEndLoc());
       if (!isReferencePointInRange(previousConditionsToHere))
-        checkPattern(P, DeclVisibilityKind::LocalVariable);
+        checkPattern(P, DeclVisibilityKind::LocalDecl);
     }
   }
 }
@@ -4017,7 +4017,7 @@ void FindLocalVal::visitForEachStmt(ForEachStmt *S) {
     return;
   visit(S->getBody());
   if (!isReferencePointInRange(S->getParsedSequence()->getSourceRange()))
-    checkPattern(S->getPattern(), DeclVisibilityKind::LocalVariable);
+    checkPattern(S->getPattern(), DeclVisibilityKind::LocalDecl);
 }
 
 void FindLocalVal::visitBraceStmt(BraceStmt *S, bool isTopLevelCode) {
@@ -4061,7 +4061,7 @@ void FindLocalVal::visitBraceStmt(BraceStmt *S, bool isTopLevelCode) {
   std::function<void(Decl *)> visitDecl;
   visitDecl = [&](Decl *D) {
     if (auto *VD = dyn_cast<ValueDecl>(D))
-      checkValueDecl(VD, DeclVisibilityKind::LocalVariable);
+      checkValueDecl(VD, DeclVisibilityKind::LocalDecl);
     D->visitAuxiliaryDecls(visitDecl);
   };
   for (auto elem : S->getElements()) {
@@ -4111,15 +4111,15 @@ void FindLocalVal::visitCaseStmt(CaseStmt *S) {
     for (const auto &CLI : items) {
       auto guard = CLI.getGuardExpr();
       if (guard && isReferencePointInRange(guard->getSourceRange())) {
-        checkPattern(CLI.getPattern(), DeclVisibilityKind::LocalVariable);
+        checkPattern(CLI.getPattern(), DeclVisibilityKind::LocalDecl);
         break;
       }
     }
   }
 
   if (!inPatterns && !items.empty()) {
     for (auto *vd : S->getCaseBodyVariablesOrEmptyArray()) {
-      checkValueDecl(vd, DeclVisibilityKind::LocalVariable);
+      checkValueDecl(vd, DeclVisibilityKind::LocalDecl);
     }
   }
   visit(S->getBody());

lib/IDE/CompletionLookup.cpp

@@ -394,7 +394,7 @@ CompletionLookup::getSemanticContext(const Decl *D, DeclVisibilityKind Reason,
     return *ForcedSemanticContext;
 
   switch (Reason) {
-  case DeclVisibilityKind::LocalVariable:
+  case DeclVisibilityKind::LocalDecl:
   case DeclVisibilityKind::FunctionParameter:
   case DeclVisibilityKind::GenericParameter:
     return SemanticContextKind::Local;
@@ -2976,7 +2976,7 @@ void CompletionLookup::getGenericRequirementCompletions(
   // qualified by the current type. Thus also suggest current self type so the
   // user can do a memberwise lookup on it.
   if (auto SelfType = typeContext->getSelfNominalTypeDecl()) {
-    addNominalTypeRef(SelfType, DeclVisibilityKind::LocalVariable,
+    addNominalTypeRef(SelfType, DeclVisibilityKind::LocalDecl,
                       DynamicLookupInfo());
   }
 

lib/Sema/LookupVisibleDecls.cpp

@@ -794,12 +794,12 @@ namespace llvm {
 
 template <> struct DenseMapInfo<FoundDeclTy> {
   static inline FoundDeclTy getEmptyKey() {
-    return FoundDeclTy{nullptr, DeclVisibilityKind::LocalVariable, {}};
+    return FoundDeclTy{nullptr, DeclVisibilityKind::LocalDecl, {}};
   }
 
   static inline FoundDeclTy getTombstoneKey() {
     return FoundDeclTy{reinterpret_cast<ValueDecl *>(0x1),
-                       DeclVisibilityKind::LocalVariable,
+                       DeclVisibilityKind::LocalDecl,
                        {}};
   }
 
@@ -988,7 +988,7 @@ class OverrideFilteringConsumer : public VisibleDeclConsumer {
                 VD->getFormalAccess() > OtherVD->getFormalAccess());
             if (preferVD) {
               FilteredResults.remove(
-                  FoundDeclTy(OtherVD, DeclVisibilityKind::LocalVariable, {}));
+                  FoundDeclTy(OtherVD, DeclVisibilityKind::LocalDecl, {}));
               FilteredResults.insert(DeclAndReason);
               *I = VD;
             }