AST: Use getSelfTypeInContext() consistently in typo correction

We actually want to not use types at all here and instead refactor
this code to use the various decl-level requests instead... but for
now lets be consistent between typo corrections inside function
and type context.

Author: slavapestov

lib/AST/LookupVisibleDecls.cpp

@@ -1014,11 +1014,11 @@ void swift::lookupVisibleDecls(VisibleDeclConsumer &Consumer,
         }
       }
     } else if (auto ED = dyn_cast<ExtensionDecl>(DC)) {
-      ExtendedType = ED->getDeclaredTypeInContext();
+      ExtendedType = ED->getSelfTypeInContext();
       if (ExtendedType)
         BaseDecl = ExtendedType->getNominalOrBoundGenericNominal();
     } else if (auto ND = dyn_cast<NominalTypeDecl>(DC)) {
-      ExtendedType = ND->getDeclaredTypeInContext();
+      ExtendedType = ND->getSelfTypeInContext();
       BaseDecl = ND;
     }
 

test/IDE/complete_where_clause.swift

@@ -127,9 +127,9 @@ protocol P2 {
 }
 
 // P2: Begin completions
-// P2-DAG: Decl[GenericTypeParam]/CurrNominal: Self[#Self#];
-// P2-DAG: Decl[AssociatedType]/CurrNominal:   T;
-// P2-DAG: Decl[AssociatedType]/CurrNominal:   U;
+// P2-DAG: Decl[GenericTypeParam]/Super: Self[#Self#];
+// P2-DAG: Decl[AssociatedType]/Super:   T;
+// P2-DAG: Decl[AssociatedType]/Super:   U;
 // P2: End completions
 
 // U_DOT: Begin completions