Fix messed up indentation in TypeCheckMacros.cpp

Author: rxwei

lib/AST/Module.cpp

@@ -242,12 +242,11 @@ void SourceLookupCache::addToUnqualifiedLookupCache(Range decls,
       }
     }
 
-    else if (auto *NTD = dyn_cast<NominalTypeDecl>(D)) {
+    if (auto *NTD = dyn_cast<NominalTypeDecl>(D))
       if (!NTD->hasUnparsedMembers() || NTD->maybeHasOperatorDeclarations())
         addToUnqualifiedLookupCache(NTD->getMembers(), true);
-    }
 
-    else if (auto *ED = dyn_cast<ExtensionDecl>(D)) {
+    if (auto *ED = dyn_cast<ExtensionDecl>(D)) {
       // Avoid populating the cache with the members of invalid extension
       // declarations.  These members can be used to point validation inside of
       // a malformed context.
@@ -257,13 +256,13 @@ void SourceLookupCache::addToUnqualifiedLookupCache(Range decls,
         addToUnqualifiedLookupCache(ED->getMembers(), true);
     }
 
-    else if (auto *OD = dyn_cast<OperatorDecl>(D))
+    if (auto *OD = dyn_cast<OperatorDecl>(D))
       Operators[OD->getName()].push_back(OD);
 
     else if (auto *PG = dyn_cast<PrecedenceGroupDecl>(D))
       PrecedenceGroups[PG->getName()].push_back(PG);
 
-    else if (auto *MED = dyn_cast<MacroExpansionDecl>(D))
+    if (auto *MED = dyn_cast<MacroExpansionDecl>(D))
       DelayedMacroExpansions.push_back(MED);
   }
 }

lib/AST/NameLookup.cpp

@@ -2001,7 +2001,7 @@ QualifiedLookupRequest::evaluate(Evaluator &eval, const DeclContext *DC,
   };
 
   // Add all of the nominal types to the stack.
-  for (auto nominal: typeDecls) {
+  for (auto nominal : typeDecls) {
     addNominalType(nominal);
   }
 

lib/Parse/ParseDecl.cpp

@@ -2191,6 +2191,7 @@ static Optional<MacroRole> getMacroRole(
   auto role = llvm::StringSwitch<Optional<MacroRole>>(roleName->str())
       .Case("declaration", MacroRole::Declaration)
       .Case("expression", MacroRole::Expression)
+      .Case("codeItem", MacroRole::CodeItem)
       .Case("accessor", MacroRole::Accessor)
       .Case("memberAttributes", MacroRole::MemberAttribute)
       .Case("synthesizedMembers", MacroRole::SynthesizedMembers)
@@ -4768,7 +4769,7 @@ bool Parser::isStartOfSwiftDecl(bool allowPoundIfAttributes) {
   // Skip a #if that contains only attributes in all branches. These will be
   // parsed as attributes of a declaration, not as separate declarations.
   if (Tok.is(tok::pound_if) && allowPoundIfAttributes) {
-      BacktrackingScope backtrack(*this);
+    BacktrackingScope backtrack(*this);
     bool sawAnyAttributes = false;
     return skipIfConfigOfAttributes(sawAnyAttributes) &&
         (Tok.is(tok::eof) || (sawAnyAttributes && isStartOfSwiftDecl()));