[index] Remove unused local/param variables from index kinds

We don't index local variables or parameters, so remove the index symbol
kinds.

Author: benlangmuir

include/swift/Index/IndexSymbol.h

@@ -38,14 +38,10 @@ enum class SymbolKind {
   GenericTypeParam,
 
   Function,
+  Variable,
   PrefixOperator,
   PostfixOperator,
   InfixOperator,
-
-  LocalVariable,
-  GlobalVariable,
-  ParamVariable,
-
   Accessor,
   Subscript,
   EnumElement,

lib/Index/IndexSymbol.cpp

@@ -53,9 +53,8 @@ static SymbolKind getVarSymbolKind(const VarDecl *VD) {
     return SymbolKind::InstanceProperty;
   }
 
-  if (DC->isLocalContext())
-    return SymbolKind::LocalVariable;
-  return SymbolKind::GlobalVariable;
+  assert(!DC->isLocalContext() && "local variable seen while indexing");
+  return SymbolKind::Variable;
 }
 
 SymbolKind index::getSymbolKindForDecl(const Decl *D) {
@@ -72,7 +71,8 @@ SymbolKind index::getSymbolKindForDecl(const Decl *D) {
     case DeclKind::Subscript:        return SymbolKind::Subscript;
     case DeclKind::Constructor:      return SymbolKind::Constructor;
     case DeclKind::Destructor:       return SymbolKind::Destructor;
-    case DeclKind::Param:            return SymbolKind::ParamVariable;
+    case DeclKind::Param:
+      llvm_unreachable("unexpected parameter seen while indexing");
 
     case DeclKind::Func:
       return getFuncSymbolKind(cast<FuncDecl>(D));

tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp

@@ -550,13 +550,8 @@ UIdent SwiftLangSupport::getUIDForSymbol(SymbolKind kind, SymbolSubKind subKind,
     return UID_FOR(FunctionPostfixOperator);
   case SymbolKind::InfixOperator:
     return UID_FOR(FunctionInfixOperator);
-  case SymbolKind::LocalVariable:
-    return UID_FOR(VarLocal);
-  case SymbolKind::GlobalVariable:
+  case SymbolKind::Variable:
     return UID_FOR(VarGlobal);
-  case SymbolKind::ParamVariable:
-    // There is no KindRefVarParam. It's not usually an interesting difference.
-    return isRef ? KindRefVarLocal : KindDeclVarParam;
   case SymbolKind::InstanceMethod:
     return UID_FOR(MethodInstance);
   case SymbolKind::ClassMethod: