Merge pull request swiftlang#35572 from bnbarham/async-refactorings

[Refactoring] Add async refactorings

Author: bnbarham

include/swift/AST/DiagnosticsRefactoring.def

@@ -54,5 +54,23 @@ WARNING(mismatched_rename, none, "the name at the given location cannot be renam
 
 ERROR(no_insert_position, none, "cannot find inserting position", ())
 
+ERROR(missing_callback_arg, none, "cannot refactor as callback closure argument missing", ())
+
+ERROR(mismatched_callback_args, none, "cannot refactor as callback arguments do not match declaration", ())
+
+ERROR(unknown_callback_conditions, none, "cannot refactor complex if conditions", ())
+
+ERROR(mixed_callback_conditions, none, "cannot refactor mixed nil and not-nil conditions", ())
+
+ERROR(callback_multiple_bound_names, none, "cannot refactor when multiple names bound to single declaration, had '%0' and found '%1'", (StringRef, StringRef))
+
+ERROR(callback_with_fallthrough, none, "cannot refactor switch with fallthrough", ())
+
+ERROR(callback_with_default, none, "cannot refactor switch with default case", ())
+
+ERROR(callback_multiple_case_items, none, "cannot refactor switch using a case with multiple items", ())
+
+ERROR(callback_where_case_item, none, "cannot refactor switch using a case with where clause", ())
+
 #define UNDEFINE_DIAGNOSTIC_MACROS
 #include "DefineDiagnosticMacros.h"

include/swift/AST/KnownStdlibTypes.def

@@ -91,4 +91,6 @@ KNOWN_STDLIB_TYPE_DECL(KeyedEncodingContainer, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(KeyedDecodingContainer, NominalTypeDecl, 1)
 KNOWN_STDLIB_TYPE_DECL(RangeReplaceableCollection, ProtocolDecl, 1)
 
+KNOWN_STDLIB_TYPE_DECL(Result, NominalTypeDecl, 2)
+
 #undef KNOWN_STDLIB_TYPE_DECL

include/swift/IDE/Refactoring.h

@@ -137,7 +137,8 @@ collectAvailableRefactorings(SourceFile *SF, RangeConfig Range,
                              llvm::ArrayRef<DiagnosticConsumer*> DiagConsumers);
 
 ArrayRef<RefactoringKind>
-collectAvailableRefactorings(SourceFile *SF, ResolvedCursorInfo CursorInfo,
+collectAvailableRefactorings(SourceFile *SF,
+                             const ResolvedCursorInfo &CursorInfo,
                              std::vector<RefactoringKind> &Scratch,
                              bool ExcludeRename);
 

include/swift/IDE/RefactoringKinds.def

@@ -54,6 +54,12 @@ CURSOR_REFACTORING(MemberwiseInitLocalRefactoring, "Generate Memberwise Initiali
 
 CURSOR_REFACTORING(AddEquatableConformance, "Add Equatable Conformance", add.equatable.conformance)
 
+CURSOR_REFACTORING(ConvertCallToAsyncAlternative, "Convert Call to Async Alternative", convert.call-to-async)
+
+CURSOR_REFACTORING(ConvertToAsync, "Convert Function to Async", convert.func-to-async)
+
+CURSOR_REFACTORING(AddAsyncAlternative, "Add Async Alternative", add.async-alternative)
+
 RANGE_REFACTORING(ExtractExpr, "Extract Expression", extract.expr)
 
 RANGE_REFACTORING(ExtractFunction, "Extract Method", extract.function)

include/swift/IDE/Utils.h

@@ -161,7 +161,6 @@ struct ResolvedCursorInfo {
   bool IsRef = true;
   bool IsKeywordArgument = false;
   Type Ty;
-  DeclContext *DC = nullptr;
   Type ContainerType;
   Stmt *TrailingStmt = nullptr;
   Expr *TrailingExpr = nullptr;
@@ -187,7 +186,6 @@ struct ResolvedCursorInfo {
     this->ExtTyRef = ExtTyRef;
     this->IsRef = IsRef;
     this->Ty = Ty;
-    this->DC = ValueD->getDeclContext();
     this->ContainerType = ContainerType;
   }
   void setModuleRef(ModuleEntity Mod) {
@@ -549,6 +547,7 @@ class EditorConsumerInsertStream: public raw_ostream {
   }
 };
 
+/// Outputs replacements as JSON, see `writeEditsInJson`
 class SourceEditJsonConsumer : public SourceEditConsumer {
   struct Implementation;
   Implementation &Impl;
@@ -558,6 +557,24 @@ class SourceEditJsonConsumer : public SourceEditConsumer {
   void accept(SourceManager &SM, RegionType RegionType, ArrayRef<Replacement> Replacements) override;
 };
 
+/// Outputs replacements to `OS` in the form
+/// ```
+/// // </path/to/file> startLine:startCol -> endLine:endCol
+/// replacement
+/// text
+///
+/// ```
+class SourceEditTextConsumer : public SourceEditConsumer {
+  llvm::raw_ostream &OS;
+
+public:
+  SourceEditTextConsumer(llvm::raw_ostream &OS);
+
+  void accept(SourceManager &SM, RegionType RegionType,
+              ArrayRef<Replacement> Replacements) override;
+};
+
+/// Outputs the rewritten buffer to `OS` with RUN and CHECK lines removed
 class SourceEditOutputConsumer : public SourceEditConsumer {
   struct Implementation;
   Implementation &Impl;