[Refactoring] Separate refactoring files to its own library

rintaro · rintaro · commit 45828af5ed65 · 2022-11-02T12:39:26.000-07:00
IDE/Refactoring had dependencies to libswiftIndex, but libswiftIndex
also depends on libswiftIDE (SourceEntityWalker, etc.)

To break libswiftIndex &lt;-&gt; libswiftIDE dependency cycle, move
"refactoring" related files to a new library 'libswiftRefactoring'

rdar://101692282
diff --git a/include/swift/Refactoring/Refactoring.h b/include/swift/Refactoring/Refactoring.h
diff --git a/include/swift/Refactoring/RefactoringKinds.def b/include/swift/Refactoring/RefactoringKinds.def
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -42,6 +42,7 @@ add_subdirectory(Migrator)
 add_subdirectory(Option)
 add_subdirectory(Parse)
 add_subdirectory(PrintAsClang)
+add_subdirectory(Refactoring)
 add_subdirectory(RemoteAST)
 add_subdirectory(Sema)
 add_subdirectory(Serialization)
diff --git a/lib/IDE/CMakeLists.txt b/lib/IDE/CMakeLists.txt
@@ -28,7 +28,6 @@ add_swift_host_library(swiftIDE STATIC
   KeyPathCompletion.cpp
   ModuleInterfacePrinting.cpp
   PostfixCompletion.cpp
-  Refactoring.cpp
   REPLCodeCompletion.cpp
   SourceEntityWalker.cpp
   SwiftSourceDocInfo.cpp
@@ -42,7 +41,6 @@ target_link_libraries(swiftIDE PRIVATE
   swiftAST
   swiftClangImporter
   swiftDriver
-  swiftIndex
   swiftParse
   swiftSema)
 
diff --git a/lib/Refactoring/CMakeLists.txt b/lib/Refactoring/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_swift_host_library(swiftRefactoring STATIC
+  Refactoring.cpp)
+
+target_link_libraries(swiftRefactoring PRIVATE
+  swiftAST
+  swiftClangImporter
+  swiftIDE
+  swiftIndex
+  swiftParse
+  swiftSema)
+
+set_swift_llvm_is_available(swiftRefactoring)
+
diff --git a/lib/Refactoring/Refactoring.cpp b/lib/Refactoring/Refactoring.cpp
@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/IDE/Refactoring.h"
+#include "swift/Refactoring/Refactoring.h"
 #include "swift/AST/ASTContext.h"
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/Decl.h"
@@ -814,7 +814,7 @@ class RefactoringAction##KIND: public TokenBasedRefactoringAction {           \
     return RefactoringAction##KIND::isApplicable(CursorInfo, DiagEngine) ;    \
   }                                                                           \
 };
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
 class RangeBasedRefactoringAction : public RefactoringAction {
 protected:
@@ -843,7 +843,7 @@ class RefactoringAction##KIND: public RangeBasedRefactoringAction {           \
     return RefactoringAction##KIND::isApplicable(RangeInfo, DiagEngine) ;     \
   }                                                                           \
 };
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
 bool RefactoringActionLocalRename::
 isApplicable(const ResolvedCursorInfo &CursorInfo, DiagnosticEngine &Diag) {
@@ -8409,7 +8409,7 @@ getDescriptiveRefactoringKindName(RefactoringKind Kind) {
       case RefactoringKind::None:
         llvm_unreachable("Should be a valid refactoring kind");
 #define REFACTORING(KIND, NAME, ID) case RefactoringKind::KIND: return NAME;
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
     }
     llvm_unreachable("unhandled kind");
   }
@@ -8598,7 +8598,7 @@ void swift::ide::collectAvailableRefactorings(
   if (RefactoringKind::KIND != RefactoringKind::LocalRename &&                 \
       RefactoringAction##KIND::isApplicable(CursorInfo, DiagEngine))           \
     Kinds.push_back(RefactoringKind::KIND);
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 }
 
 void swift::ide::collectAvailableRefactorings(
@@ -8629,7 +8629,7 @@ void swift::ide::collectAvailableRefactorings(
 #define INTERNAL_RANGE_REFACTORING(KIND, NAME, ID)                            \
   if (enableInternalRefactoring)                                              \
     RANGE_REFACTORING(KIND, NAME, ID)
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
   CollectRangeStartRefactorings = collectRangeStartRefactorings(Result);
 }
@@ -8654,7 +8654,7 @@ case RefactoringKind::KIND: {                                                  \
         return Action.performChange();                                         \
       return true;                                                             \
   }
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
     case RefactoringKind::GlobalRename:
     case RefactoringKind::FindGlobalRenameRanges:
     case RefactoringKind::FindLocalRenameRanges:
diff --git a/tools/SourceKit/include/SourceKit/Core/LangSupport.h b/tools/SourceKit/include/SourceKit/Core/LangSupport.h
@@ -526,7 +526,7 @@ struct NameTranslatingInfo {
 enum class SemanticRefactoringKind {
   None,
 #define SEMANTIC_REFACTORING(KIND, NAME, ID) KIND,
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 };
 
 struct SemanticRefactoringInfo {
diff --git a/tools/SourceKit/lib/SwiftLang/CMakeLists.txt b/tools/SourceKit/lib/SwiftLang/CMakeLists.txt
@@ -45,6 +45,7 @@ target_link_libraries(SourceKitSwiftLang PRIVATE
   swiftSyntax
   swiftOption
   swiftSymbolGraphGen
+  swiftRefactoring
   libcmark-gfm_static
   # Clang dependencies.
   clangIndex
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp
@@ -28,7 +28,7 @@
 #include "swift/IDE/ModuleInterfacePrinting.h"
 #include "swift/IDE/SourceEntityWalker.h"
 #include "swift/IDE/SyntaxModel.h"
-#include "swift/IDE/Refactoring.h"
+#include "swift/Refactoring/Refactoring.h"
 // This is included only for createLazyResolver(). Move to different header ?
 #include "swift/Sema/IDETypeChecking.h"
 #include "swift/Config.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
@@ -62,7 +62,7 @@ using swift::index::SymbolRoleSet;
 #include "SourceKit/Core/ProtocolUIDs.def"
 
 #define REFACTORING(KIND, NAME, ID) static UIdent Kind##Refactoring##KIND("source.refactoring.kind."#ID);
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
 static UIdent Attr_IBAction("source.decl.attribute.ibaction");
 static UIdent Attr_IBOutlet("source.decl.attribute.iboutlet");
@@ -377,7 +377,7 @@ UIdent SwiftLangSupport::getUIDForRefactoringKind(ide::RefactoringKind Kind){
   case ide::RefactoringKind::None: llvm_unreachable("cannot end up here.");
 #define REFACTORING(KIND, NAME, ID)                                            \
   case ide::RefactoringKind::KIND: return KindRefactoring##KIND;
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
   }
 }
 
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h b/tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
@@ -25,7 +25,7 @@
 #include "swift/Basic/ThreadSafeRefCounted.h"
 #include "swift/IDE/CancellableResult.h"
 #include "swift/IDE/Indenting.h"
-#include "swift/IDE/Refactoring.h"
+#include "swift/Refactoring/Refactoring.h"
 #include "swift/IDETool/CompileInstance.h"
 #include "swift/IDETool/CompletionInstance.h"
 #include "swift/Index/IndexSymbol.h"
diff --git a/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp b/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
@@ -33,7 +33,7 @@
 #include "swift/IDE/CommentConversion.h"
 #include "swift/IDE/IDERequests.h"
 #include "swift/IDE/ModuleInterfacePrinting.h"
-#include "swift/IDE/Refactoring.h"
+#include "swift/Refactoring/Refactoring.h"
 #include "swift/IDE/SourceEntityWalker.h"
 #include "swift/IDE/Utils.h"
 #include "swift/Markup/XMLUtils.h"
@@ -2464,7 +2464,7 @@ static RefactoringKind getIDERefactoringKind(SemanticRefactoringInfo Info) {
     case SemanticRefactoringKind::None: return RefactoringKind::None;
 #define SEMANTIC_REFACTORING(KIND, NAME, ID)                                   \
     case SemanticRefactoringKind::KIND: return RefactoringKind::KIND;
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
   }
 }
 
diff --git a/tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp b/tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp
@@ -154,7 +154,7 @@ bool TestOptions::parseArgs(llvm::ArrayRef<const char *> Args) {
         .Case("compile", SourceKitRequest::Compile)
         .Case("compile.close", SourceKitRequest::CompileClose)
 #define SEMANTIC_REFACTORING(KIND, NAME, ID) .Case("refactoring." #ID, SourceKitRequest::KIND)
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
         .Default(SourceKitRequest::None);
 
       if (Request == SourceKitRequest::None) {
@@ -205,7 +205,7 @@ bool TestOptions::parseArgs(llvm::ArrayRef<const char *> Args) {
                      << "- global-config\n"
                      << "- dependency-updated\n"
 #define SEMANTIC_REFACTORING(KIND, NAME, ID) << "- refactoring." #ID "\n"
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
                         "\n";
         return true;
       }
diff --git a/tools/SourceKit/tools/sourcekitd-test/TestOptions.h b/tools/SourceKit/tools/sourcekitd-test/TestOptions.h
@@ -71,7 +71,7 @@ enum class SourceKitRequest {
   Compile,
   CompileClose,
 #define SEMANTIC_REFACTORING(KIND, NAME, ID) KIND,
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 };
 
 struct TestOptions {
diff --git a/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp b/tools/SourceKit/tools/sourcekitd-test/sourcekitd-test.cpp
@@ -127,7 +127,7 @@ static SourceKitRequest ActiveRequest = SourceKitRequest::None;
 #include "SourceKit/Core/ProtocolUIDs.def"
 
 #define REFACTORING(KIND, NAME, ID) static sourcekitd_uid_t Kind##Refactoring##KIND;
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
 static sourcekitd_uid_t SemaDiagnosticStage;
 
@@ -252,7 +252,7 @@ static void skt_main(skt_args *args) {
 #include "SourceKit/Core/ProtocolUIDs.def"
 
 #define REFACTORING(KIND, NAME, ID) Kind##Refactoring##KIND = sourcekitd_uid_get_from_cstr("source.refactoring.kind."#ID);
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
   // A test invocation may initialize the options to be used for subsequent
   // invocations.
@@ -806,7 +806,7 @@ static int handleTestInvocation(TestOptions Opts, TestOptions &InitOpts) {
   case SourceKitRequest::KIND:                                                 \
     setRefactoringFields(Req, Opts, KindRefactoring##KIND, SourceBuf.get());   \
     break;
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
   case SourceKitRequest::MarkupToXML: {
     sourcekitd_request_dictionary_set_uid(Req, KeyRequest, RequestMarkupToXML);
@@ -1496,7 +1496,7 @@ static bool handleResponse(sourcekitd_response_t Resp, const TestOptions &Opts,
         printModuleGroupNames(Info, llvm::outs());
         break;
 #define SEMANTIC_REFACTORING(KIND, NAME, ID) case SourceKitRequest::KIND:
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
       case SourceKitRequest::SyntacticRename:
         printSyntacticRenameEdits(Info, llvm::outs());
         break;
diff --git a/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp b/tools/SourceKit/tools/sourcekitd/lib/API/Requests.cpp
@@ -102,7 +102,7 @@ static void fillDictionaryForDiagnosticInfo(ResponseBuilder::Dictionary Elem,
 #include "SourceKit/Core/ProtocolUIDs.def"
 
 #define REFACTORING(KIND, NAME, ID) static LazySKDUID Kind##Refactoring##KIND("source.refactoring.kind."#ID);
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
 static SourceKit::Context *GlobalCtx = nullptr;
 
@@ -1203,7 +1203,7 @@ static void handleSemanticRequest(
 
 #define SEMANTIC_REFACTORING(KIND, NAME, ID)                                   \
   if (KA == KindRefactoring##KIND) Info.Kind = SemanticRefactoringKind::KIND;
-#include "swift/IDE/RefactoringKinds.def"
+#include "swift/Refactoring/RefactoringKinds.def"
 
     if (Info.Kind == SemanticRefactoringKind::None)
       return Rec(createErrorRequestInvalid("'key.actionuid' isn't recognized"));
diff --git a/tools/swift-refactor/CMakeLists.txt b/tools/swift-refactor/CMakeLists.txt
@@ -7,4 +7,5 @@ target_link_libraries(swift-refactor
                       PRIVATE
                         swiftDriver
                         swiftFrontend
-                        swiftIDE)
+                        swiftIDE
+                        swiftRefactoring)
diff --git a/tools/swift-refactor/swift-refactor.cpp b/tools/swift-refactor/swift-refactor.cpp
@@ -14,7 +14,7 @@
 #include "swift/Basic/LLVMInitialize.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
-#include "swift/IDE/Refactoring.h"
+#include "swift/Refactoring/Refactoring.h"
 #include "swift/IDE/Utils.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ using swift::index::SymbolRoleSet;`
`62`	`62`	`#include "SourceKit/Core/ProtocolUIDs.def"`
`63`	`63`
`64`	`64`	`#define REFACTORING(KIND, NAME, ID) static UIdent Kind##Refactoring##KIND("source.refactoring.kind."#ID);`
`65`		`-#include "swift/IDE/RefactoringKinds.def"`
	`65`	`+#include "swift/Refactoring/RefactoringKinds.def"`
`66`	`66`
`67`	`67`	`static UIdent Attr_IBAction("source.decl.attribute.ibaction");`
`68`	`68`	`static UIdent Attr_IBOutlet("source.decl.attribute.iboutlet");`
`@@ -377,7 +377,7 @@ UIdent SwiftLangSupport::getUIDForRefactoringKind(ide::RefactoringKind Kind){`
`377`	`377`	`case ide::RefactoringKind::None: llvm_unreachable("cannot end up here.");`
`378`	`378`	`#define REFACTORING(KIND, NAME, ID) \`
`379`	`379`	`case ide::RefactoringKind::KIND: return KindRefactoring##KIND;`
`380`		`-#include "swift/IDE/RefactoringKinds.def"`
	`380`	`+#include "swift/Refactoring/RefactoringKinds.def"`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`