[IDE] Use consistent PrintOptions in swift-ide-test

Use the same set of PrintOptions when printing the results for
different requests.

Author: hamishknight

include/swift/IDE/Utils.h

@@ -402,7 +402,8 @@ struct ResolvedRangeInfo {
                     /*Single entry*/true, /*UnhandledEffects*/{},
                     OrphanKind::None, {}, {}, {}) {}
   ResolvedRangeInfo(): ResolvedRangeInfo(ArrayRef<Token>()) {}
-  void print(llvm::raw_ostream &OS) const;
+  void print(llvm::raw_ostream &OS,
+             const PrintOptions &PO = PrintOptions()) const;
   ExitState exit() const { return ExitInfo.Exit; }
   Type getType() const { return ExitInfo.ReturnType; }
 

lib/IDE/SwiftSourceDocInfo.cpp

@@ -70,7 +70,8 @@ void XMLEscapingPrinter::printXML(StringRef Text) {
   OS << Text;
 }
 
-void ResolvedRangeInfo::print(llvm::raw_ostream &OS) const {
+void ResolvedRangeInfo::print(llvm::raw_ostream &OS,
+                              const PrintOptions &PO) const {
   OS << "<Kind>";
   switch (Kind) {
   case RangeKind::SingleExpression: OS << "SingleExpression"; break;
@@ -87,7 +88,7 @@ void ResolvedRangeInfo::print(llvm::raw_ostream &OS) const {
 
   if (auto Ty = getType()) {
     OS << "<Type>";
-    Ty->print(OS);
+    Ty->print(OS, PO);
     OS << "</Type>";
     switch(exit()) {
     case ExitState::Positive: OS << "<Exit>true</Exit>"; break;
@@ -147,7 +148,7 @@ void ResolvedRangeInfo::print(llvm::raw_ostream &OS) const {
   for (auto &RD : ReferencedDecls) {
     OS << "<Referenced>" << RD.VD->getBaseName() << "</Referenced>";
     OS << "<Type>";
-    RD.Ty->print(OS);
+    RD.Ty->print(OS, PO);
     OS << "</Type>\n";
   }
 

test/IDE/range_info_basics.swift

@@ -497,7 +497,7 @@ func testPropertyWrapper() {
 // CHECK27-NEXT:     foo9(1, 2)</Content>
 // CHECK27-NEXT: <Type>Void</Type>
 // CHECK27-NEXT: <Context>swift_ide_test.(file).foo9(_:_:)</Context>
-// CHECK27-NEXT: <Referenced>foo9</Referenced><Type>(Int, Int) -> Int</Type>
+// CHECK27-NEXT: <Referenced>foo9</Referenced><Type>(_ a: Int, _ b: Int) -> Int</Type>
 // CHECK27-NEXT: <ASTNodes>2</ASTNodes>
 // CHECK27-NEXT: <end>
 

test/IDE/range_info_expr.swift

@@ -109,7 +109,7 @@ func bar(x: C2 = .main) {}
 // CHECK-MTEE-EXPR-3-NEXT: <Content>{ escapable in
 // CHECK-MTEE-EXPR-3-NEXT:     _ = escapable
 // CHECK-MTEE-EXPR-3-NEXT:   }</Content>
-// CHECK-MTEE-EXPR-3-NEXT: <Type>(@escaping (Int) -> Void) -> ()</Type><Exit>false</Exit>
+// CHECK-MTEE-EXPR-3-NEXT: <Type>(_ escapable: @escaping (Int) -> Void) -> ()</Type><Exit>false</Exit>
 // CHECK-MTEE-EXPR-3-NEXT: <Context>swift_ide_test.(file).testWithoutActuallyEscaping(closure:)</Context>
 // CHECK-MTEE-EXPR-3-NEXT: <Declared>escapable</Declared><OutscopeReference>false</OutscopeReference>
 // CHECK-MTEE-EXPR-3-NEXT: <Referenced>escapable</Referenced><Type>(Int) -> Void</Type>

tools/swift-ide-test/swift-ide-test.cpp

@@ -1186,14 +1186,15 @@ printResult(CancellableResult<ResultType> Result,
   }
 }
 
-static int printTypeContextInfo(
-    CancellableResult<TypeContextInfoResult> CancellableResult) {
+static int
+printTypeContextInfo(CancellableResult<TypeContextInfoResult> CancellableResult,
+                     const PrintOptions &PO) {
   return printResult<TypeContextInfoResult>(
-      CancellableResult, [](const TypeContextInfoResult &Result) {
+      CancellableResult, [&](const TypeContextInfoResult &Result) {
         llvm::outs() << "-----BEGIN TYPE CONTEXT INFO-----\n";
         for (auto resultItem : Result.Results) {
           llvm::outs() << "- TypeName: ";
-          resultItem.ExpectedTy.print(llvm::outs());
+          resultItem.ExpectedTy.print(llvm::outs(), PO);
           llvm::outs() << "\n";
 
           llvm::outs() << "  TypeUSR: ";
@@ -1224,11 +1225,10 @@ static int printTypeContextInfo(
       });
 }
 
-static int doTypeContextInfo(const CompilerInvocation &InitInvok,
-                             StringRef SourceFilename,
-                             StringRef SecondSourceFileName,
-                             StringRef CodeCompletionToken,
-                             bool CodeCompletionDiagnostics) {
+static int
+doTypeContextInfo(const CompilerInvocation &InitInvok, StringRef SourceFilename,
+                  StringRef SecondSourceFileName, StringRef CodeCompletionToken,
+                  bool CodeCompletionDiagnostics, const PrintOptions &PO) {
   return performWithCompletionLikeOperationParams(
       InitInvok, SourceFilename, SecondSourceFileName, CodeCompletionToken,
       CodeCompletionDiagnostics,
@@ -1241,24 +1241,25 @@ static int doTypeContextInfo(const CompilerInvocation &InitInvok,
             Params.CompletionBuffer, Params.Offset, Params.DiagC,
             /*CancellationFlag=*/nullptr,
             [&](CancellableResult<TypeContextInfoResult> Result) {
-              ExitCode = printTypeContextInfo(Result);
+              ExitCode = printTypeContextInfo(Result, PO);
             });
         return ExitCode;
       });
 }
 
 static int printConformingMethodList(
-    CancellableResult<ConformingMethodListResults> CancellableResult) {
+    CancellableResult<ConformingMethodListResults> CancellableResult,
+    const PrintOptions &PO) {
   return printResult<ConformingMethodListResults>(
-      CancellableResult, [](const ConformingMethodListResults &Results) {
+      CancellableResult, [&](const ConformingMethodListResults &Results) {
         auto Result = Results.Result;
         if (!Result) {
           return 0;
         }
         llvm::outs() << "-----BEGIN CONFORMING METHOD LIST-----\n";
 
         llvm::outs() << "- TypeName: ";
-        Result->ExprType.print(llvm::outs());
+        Result->ExprType.print(llvm::outs(), PO);
         llvm::outs() << "\n";
 
         llvm::outs() << "- Members: ";
@@ -1275,7 +1276,7 @@ static int printConformingMethodList(
           llvm::outs() << "\n";
 
           llvm::outs() << "     TypeName: ";
-          resultTy.print(llvm::outs());
+          resultTy.print(llvm::outs(), PO);
           llvm::outs() << "\n";
 
           StringRef BriefDoc = VD->getSemanticBriefComment();
@@ -1291,12 +1292,11 @@ static int printConformingMethodList(
       });
 }
 
-static int
-doConformingMethodList(const CompilerInvocation &InitInvok,
-                       StringRef SourceFilename, StringRef SecondSourceFileName,
-                       StringRef CodeCompletionToken,
-                       bool CodeCompletionDiagnostics,
-                       const std::vector<std::string> expectedTypeNames) {
+static int doConformingMethodList(
+    const CompilerInvocation &InitInvok, StringRef SourceFilename,
+    StringRef SecondSourceFileName, StringRef CodeCompletionToken,
+    bool CodeCompletionDiagnostics,
+    const std::vector<std::string> expectedTypeNames, const PrintOptions &PO) {
   SmallVector<const char *, 4> typeNames;
   for (auto &name : expectedTypeNames)
     typeNames.push_back(name.c_str());
@@ -1313,7 +1313,7 @@ doConformingMethodList(const CompilerInvocation &InitInvok,
             Params.CompletionBuffer, Params.Offset, Params.DiagC, typeNames,
             /*CancellationFlag=*/nullptr,
             [&](CancellableResult<ConformingMethodListResults> Result) {
-              ExitCode = printConformingMethodList(Result);
+              ExitCode = printConformingMethodList(Result, PO);
             });
         return ExitCode;
       });
@@ -2754,7 +2754,8 @@ static int doPrintExpressionTypes(const CompilerInvocation &InitInvok,
 }
 
 static int doPrintLocalTypes(const CompilerInvocation &InitInvok,
-                             const std::vector<std::string> ModulesToPrint) {
+                             const std::vector<std::string> ModulesToPrint,
+                             const PrintOptions &PO) {
   using NodeKind = Demangle::Node::Kind;
 
   CompilerInvocation Invocation(InitInvok);
@@ -2775,8 +2776,6 @@ static int doPrintLocalTypes(const CompilerInvocation &InitInvok,
 
   int ExitCode = 0;
 
-  PrintOptions Options = PrintOptions::printDeclarations();
-
   for (StringRef ModuleName : ModulesToPrint) {
     auto *M = getModuleByFullName(Context, ModuleName);
     if (!M) {
@@ -2867,9 +2866,7 @@ static int doPrintLocalTypes(const CompilerInvocation &InitInvok,
 
       llvm::outs() << remangled << "\n";
 
-      auto Options = PrintOptions::printDeclarations();
-      Options.PrintAccess = false;
-      LTD->print(llvm::outs(), Options);
+      LTD->print(llvm::outs(), PO);
       llvm::outs() << "\n";
     }
   }
@@ -3410,8 +3407,7 @@ class ASTTypePrinter : public ASTWalker {
 } // unnamed namespace
 
 static int doPrintTypes(const CompilerInvocation &InitInvok,
-                        StringRef SourceFilename,
-                        bool FullyQualifiedTypes) {
+                        StringRef SourceFilename, const PrintOptions &PO) {
   CompilerInvocation Invocation(InitInvok);
   Invocation.getFrontendOptions().InputsAndOutputs.addInputFile(SourceFilename);
 
@@ -3427,9 +3423,7 @@ static int doPrintTypes(const CompilerInvocation &InitInvok,
   registerIDERequestFunctions(CI.getASTContext().evaluator);
   CI.performSema();
 
-  PrintOptions Options = PrintOptions::printDeclarations();
-  Options.FullyQualifiedTypes = FullyQualifiedTypes;
-  ASTTypePrinter Printer(CI.getSourceMgr(), Options);
+  ASTTypePrinter Printer(CI.getSourceMgr(), PO);
 
   CI.getMainModule()->walk(Printer);
 
@@ -3971,10 +3965,12 @@ class TypeReconstructWalker : public SourceEntityWalker {
   llvm::raw_ostream &Stream;
   llvm::DenseSet<ValueDecl *> SeenDecls;
   llvm::SmallVector<DeclContext *, 2> NestedDCs;
+  const PrintOptions &PO;
 
 public:
-  TypeReconstructWalker(ASTContext &Ctx, llvm::raw_ostream &Stream)
-      : Ctx(Ctx), Stream(Stream) {}
+  TypeReconstructWalker(ASTContext &Ctx, llvm::raw_ostream &Stream,
+                        const PrintOptions &PO)
+      : Ctx(Ctx), Stream(Stream), PO(PO) {}
 
   bool walkToDeclPre(Decl *D, CharSourceRange range) override {
     if (auto *VD = dyn_cast<ValueDecl>(D)) {
@@ -4019,7 +4015,7 @@ class TypeReconstructWalker : public SourceEntityWalker {
         Demangle::getTypeForMangling(Ctx, mangledName));
     Stream << "type: ";
     if (ReconstructedType) {
-      ReconstructedType->print(Stream);
+      ReconstructedType->print(Stream, PO);
     } else {
       Stream << "FAILURE";
     }
@@ -4044,7 +4040,11 @@ class TypeReconstructWalker : public SourceEntityWalker {
     }
 
     if (TypeDecl *reDecl = Demangle::getTypeDeclForUSR(Ctx, USR)) {
-      PrintOptions POpts;
+      PrintOptions POpts = PO.clone();
+      POpts.TypeDefinitions = false;
+      POpts.VarInitializers = false;
+      POpts.FunctionDefinitions = false;
+      POpts.PrintExprs = false;
       POpts.PreferTypeRepr = false;
       POpts.PrintParameterSpecifiers = true;
       reDecl->print(Stream, POpts);
@@ -4056,7 +4056,7 @@ class TypeReconstructWalker : public SourceEntityWalker {
 };
 
 static int doReconstructType(const CompilerInvocation &InitInvok,
-                             StringRef SourceFilename) {
+                             StringRef SourceFilename, const PrintOptions &PO) {
   CompilerInvocation Invocation(InitInvok);
   Invocation.getFrontendOptions().InputsAndOutputs.addInputFile(SourceFilename);
   Invocation.getLangOptions().DisableAvailabilityChecking = false;
@@ -4080,15 +4080,14 @@ static int doReconstructType(const CompilerInvocation &InitInvok,
       break;
   }
   assert(SF && "no source file?");
-  TypeReconstructWalker Walker(SF->getASTContext(), llvm::outs());
+  TypeReconstructWalker Walker(SF->getASTContext(), llvm::outs(), PO);
   Walker.walk(SF);
   return 0;
 }
 
 static int doPrintRangeInfo(const CompilerInvocation &InitInvok,
-                            StringRef SourceFileName,
-                            StringRef StartPos,
-                            StringRef EndPos) {
+                            StringRef SourceFileName, StringRef StartPos,
+                            StringRef EndPos, const PrintOptions &PO) {
   auto StartOp = parseLineCol(StartPos);
   auto EndOp = parseLineCol(EndPos);
   if (!StartOp.has_value() || !EndOp.has_value())
@@ -4127,7 +4126,7 @@ static int doPrintRangeInfo(const CompilerInvocation &InitInvok,
                                          EndLineCol.second);
   ResolvedRangeInfo Result = evaluateOrDefault(SF->getASTContext().evaluator,
     RangeInfoRequest(RangeInfoOwner({SF, StartLoc, EndLoc})), ResolvedRangeInfo());
-  Result.print(llvm::outs());
+  Result.print(llvm::outs(), PO);
   return 0;
 }
 
@@ -4828,11 +4827,10 @@ int main(int argc, char *argv[]) {
       llvm::errs() << "token name required\n";
       return 1;
     }
-    ExitCode = doTypeContextInfo(InitInvok,
-                                  options::SourceFilename,
-                                  options::SecondSourceFilename,
-                                  options::CodeCompletionToken,
-                                  options::CodeCompletionDiagnostics);
+    ExitCode = doTypeContextInfo(InitInvok, options::SourceFilename,
+                                 options::SecondSourceFilename,
+                                 options::CodeCompletionToken,
+                                 options::CodeCompletionDiagnostics, PrintOpts);
     break;
 
   case ActionType::PrintExpressionTypes:
@@ -4846,12 +4844,10 @@ int main(int argc, char *argv[]) {
       llvm::errs() << "token name required\n";
       return 1;
     }
-    ExitCode = doConformingMethodList(InitInvok,
-                                      options::SourceFilename,
-                                      options::SecondSourceFilename,
-                                      options::CodeCompletionToken,
-                                      options::CodeCompletionDiagnostics,
-                                      options::ConformingMethodListExpectedTypes);
+    ExitCode = doConformingMethodList(
+        InitInvok, options::SourceFilename, options::SecondSourceFilename,
+        options::CodeCompletionToken, options::CodeCompletionDiagnostics,
+        options::ConformingMethodListExpectedTypes, PrintOpts);
     break;
 
   case ActionType::SyntaxColoring:
@@ -4892,7 +4888,7 @@ int main(int argc, char *argv[]) {
     break;
   }
   case ActionType::PrintLocalTypes:
-    ExitCode = doPrintLocalTypes(InitInvok, options::ModuleToPrint);
+    ExitCode = doPrintLocalTypes(InitInvok, options::ModuleToPrint, PrintOpts);
     break;
 
   case ActionType::PrintModuleGroups:
@@ -4943,8 +4939,7 @@ int main(int argc, char *argv[]) {
   }
 
   case ActionType::PrintTypes:
-    ExitCode = doPrintTypes(InitInvok, options::SourceFilename,
-                            options::FullyQualifiedTypes);
+    ExitCode = doPrintTypes(InitInvok, options::SourceFilename, PrintOpts);
     break;
 
   case ActionType::PrintComments:
@@ -4979,12 +4974,12 @@ int main(int argc, char *argv[]) {
                                                 options::USR);
     break;
   case ActionType::ReconstructType:
-    ExitCode = doReconstructType(InitInvok, options::SourceFilename);
+    ExitCode = doReconstructType(InitInvok, options::SourceFilename, PrintOpts);
     break;
   case ActionType::Range:
     ExitCode = doPrintRangeInfo(InitInvok, options::SourceFilename,
                                 options::LineColumnPair,
-                                options::EndLineColumnPair);
+                                options::EndLineColumnPair, PrintOpts);
     break;
   case ActionType::PrintIndexedSymbols:
       if (options::ModuleToPrint.empty()) {