[IDE] Adopt ArgumentList

Author: hamishknight

include/swift/IDE/Utils.h

@@ -244,9 +244,9 @@ class NameMatcher: public ASTWalker {
   std::vector<ResolvedLoc> ResolvedLocs;
   ArrayRef<Token> TokensToCheck;
 
-  /// The \c Expr argument of a parent \c CustomAttr (if one exists) and
+  /// The \c ArgumentList of a parent \c CustomAttr (if one exists) and
   /// the \c SourceLoc of the type name it applies to.
-  llvm::Optional<Located<Expr *>> CustomAttrArg;
+  llvm::Optional<Located<ArgumentList *>> CustomAttrArgList;
   unsigned InactiveConfigRegionNestings = 0;
   unsigned SelectorNestings = 0;
 
@@ -265,12 +265,13 @@ class NameMatcher: public ASTWalker {
   bool shouldSkip(SourceRange Range);
   bool shouldSkip(CharSourceRange Range);
   bool tryResolve(ASTWalker::ParentTy Node, SourceLoc NameLoc);
-  bool tryResolve(ASTWalker::ParentTy Node, DeclNameLoc NameLoc, Expr *Arg);
+  bool tryResolve(ASTWalker::ParentTy Node, DeclNameLoc NameLoc,
+                  ArgumentList *Args);
   bool tryResolve(ASTWalker::ParentTy Node, SourceLoc NameLoc, LabelRangeType RangeType,
                   ArrayRef<CharSourceRange> LabelLocs,
                   Optional<unsigned> FirstTrailingLabel);
   bool handleCustomAttrs(Decl *D);
-  Expr *getApplicableArgFor(Expr* E);
+  ArgumentList *getApplicableArgsFor(Expr* E);
 
   std::pair<bool, Expr*> walkToExprPre(Expr *E) override;
   Expr* walkToExprPost(Expr *E) override;
@@ -283,6 +284,9 @@ class NameMatcher: public ASTWalker {
   std::pair<bool, Pattern*> walkToPatternPre(Pattern *P) override;
   bool shouldWalkIntoGenericParams() override { return true; }
 
+  std::pair<bool, ArgumentList *>
+  walkToArgumentListPre(ArgumentList *ArgList) override;
+
   // FIXME: Remove this
   bool shouldWalkAccessorsTheOldWay() override { return true; }
 
@@ -568,13 +572,14 @@ struct CallArgInfo {
 };
 
 std::vector<CallArgInfo>
-getCallArgInfo(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind);
+getCallArgInfo(SourceManager &SM, ArgumentList *Args, LabelRangeEndAt EndKind);
 
 // Get the ranges of argument labels from an Arg, either tuple or paren, and
 // the index of the first trailing closure argument, if any. This includes empty
 // ranges for any unlabelled arguments, including the first trailing closure.
 std::pair<std::vector<CharSourceRange>, Optional<unsigned>>
-getCallArgLabelRanges(SourceManager &SM, Expr *Arg, LabelRangeEndAt EndKind);
+getCallArgLabelRanges(SourceManager &SM, ArgumentList *Args,
+                      LabelRangeEndAt EndKind);
 
 /// Whether a decl is defined from clang source.
 bool isFromClang(const Decl *D);

include/swift/Sema/IDETypeChecking.h

@@ -233,50 +233,6 @@ namespace swift {
                            std::vector<VariableTypeInfo> &VariableTypeInfos,
                            llvm::raw_ostream &OS);
 
-  /// FIXME: All of the below goes away once CallExpr directly stores its
-  /// arguments.
-
-  /// Return value for getOriginalArgumentList().
-  struct OriginalArgumentList {
-    SmallVector<Expr *, 4> args;
-    SmallVector<Identifier, 4> labels;
-    SmallVector<SourceLoc, 4> labelLocs;
-    SourceLoc lParenLoc;
-    SourceLoc rParenLoc;
-    Optional<unsigned> unlabeledTrailingClosureIdx;
-
-    /// The number of trailing closures in the argument list.
-    unsigned getNumTrailingClosures() const {
-      if (!unlabeledTrailingClosureIdx)
-        return 0;
-      return args.size() - *unlabeledTrailingClosureIdx;
-    }
-
-    /// Whether any unlabeled or labeled trailing closures are present.
-    bool hasAnyTrailingClosures() const {
-      return unlabeledTrailingClosureIdx.hasValue();
-    }
-
-    /// Whether the given index is for an unlabeled trailing closure.
-    bool isUnlabeledTrailingClosureIdx(unsigned i) const {
-      return unlabeledTrailingClosureIdx && *unlabeledTrailingClosureIdx == i;
-    }
-
-    /// Whether the given index is for a labeled trailing closure in an
-    /// argument list with multiple trailing closures.
-    bool isLabeledTrailingClosureIdx(unsigned i) const {
-      if (!unlabeledTrailingClosureIdx)
-        return false;
-      return i > *unlabeledTrailingClosureIdx && i < args.size();
-    }
-  };
-
-  /// When applying a solution to a constraint system, the type checker rewrites
-  /// argument lists of calls to insert default arguments and collect varargs.
-  /// Sometimes for diagnostics we want to work on the original argument list as
-  /// written by the user; this performs the reverse transformation.
-  OriginalArgumentList getOriginalArgumentList(Expr *expr);
-
   /// Returns the root type and result type of the keypath type in a keypath
   /// dynamic member lookup subscript, or \c None if it cannot be determined.
   ///