Skip to content

IDE: Break CMake cycle involving IDE, FrontendTool, Frontend, and Migrator #61774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2022
Merged

IDE: Break CMake cycle involving IDE, FrontendTool, Frontend, and Migrator #61774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 include/swift/IDE/CompileInstance.h → include/swift/IDETool/CompileInstance.h
View file
Open in desktop
File renamed without changes.
0 include/swift/IDE/CompletionInstance.h → include/swift/IDETool/CompletionInstance.h
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ add_subdirectory(Frontend)
add_subdirectory(FrontendTool)
add_subdirectory(Index)
add_subdirectory(IDE)
add_subdirectory(IDETool)
add_subdirectory(Immediate)
add_subdirectory(IRGen)
add_subdirectory(LLVMPasses)
Expand Down
1 change: 1 addition & 0 deletions lib/Frontend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ add_dependencies(swiftFrontend
SwiftOptions)
target_link_libraries(swiftFrontend PRIVATE
swiftAST
swiftConstExtract
swiftSIL
swiftMigrator
swiftOption
Expand Down
5 changes: 0 additions & 5 deletions lib/IDE/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@ add_swift_host_library(swiftIDE STATIC
CodeCompletionString.cpp
CodeCompletionStringPrinter.cpp
CommentConversion.cpp
CompileInstance.cpp
CompletionInstance.cpp
CompletionLookup.cpp
CompletionOverrideLookup.cpp
ConformingMethodList.cpp
DependencyChecking.cpp
ExprCompletion.cpp
ExprContextAnalysis.cpp
Formatting.cpp
Expand All @@ -45,8 +42,6 @@ target_link_libraries(swiftIDE PRIVATE
swiftAST
swiftClangImporter
swiftDriver
swiftFrontend
swiftFrontendTool
swiftIndex
swiftParse
swiftSema)
Expand Down
14 changes: 14 additions & 0 deletions lib/IDETool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

add_swift_host_library(swiftIDETool STATIC
CompileInstance.cpp
CompletionInstance.cpp
DependencyChecking.cpp
)

target_link_libraries(swiftIDETool PRIVATE
swiftAST
swiftDriver
swiftFrontend
swiftFrontendTool)

set_swift_llvm_is_available(swiftIDETool)
3 changes: 1 addition & 2 deletions lib/IDE/CompileInstance.cpp → lib/IDETool/CompileInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#include "swift/IDE/CompileInstance.h"
#include "swift/IDETool/CompileInstance.h"

#include "DependencyChecking.h"
#include "swift/AST/ASTContext.h"
Expand All @@ -25,7 +25,6 @@
#include "swift/Driver/FrontendUtil.h"
#include "swift/Frontend/Frontend.h"
#include "swift/FrontendTool/FrontendTool.h"
#include "swift/IDE/Utils.h"
#include "swift/Parse/Lexer.h"
#include "swift/Parse/PersistentParserState.h"
#include "swift/Subsystems.h"
Expand Down
2 changes: 1 addition & 1 deletion lib/IDE/CompletionInstance.cpp → lib/IDETool/CompletionInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

#include "swift/IDE/CompletionInstance.h"
#include "swift/IDETool/CompletionInstance.h"

#include "DependencyChecking.h"
#include "swift/AST/ASTContext.h"
Expand Down
0 lib/IDE/DependencyChecking.cpp → lib/IDETool/DependencyChecking.cpp
View file
Open in desktop
File renamed without changes.
0 lib/IDE/DependencyChecking.h → lib/IDETool/DependencyChecking.h
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions tools/SourceKit/lib/SwiftLang/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target_link_libraries(SourceKitSwiftLang PRIVATE
swiftFrontend
swiftClangImporter
swiftIDE
swiftIDETool
swiftAST
swiftMarkup
swiftParse
Expand Down
2 changes: 1 addition & 1 deletion tools/SourceKit/lib/SwiftLang/SwiftCompile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#include "SourceKit/Support/FileSystemProvider.h"

#include "swift/IDE/CompileInstance.h"
#include "swift/IDETool/CompileInstance.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/MemoryBuffer.h"

Expand Down
2 changes: 1 addition & 1 deletion tools/SourceKit/lib/SwiftLang/SwiftCompletion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
#include "swift/IDE/CodeCompletionCache.h"
#include "swift/IDE/CodeCompletionResultPrinter.h"
#include "swift/IDE/CompletionInstance.h"
#include "swift/IDETool/CompletionInstance.h"

#include "llvm/Support/Compiler.h"
#include "llvm/Support/MemoryBuffer.h"
Expand Down
2 changes: 1 addition & 1 deletion tools/SourceKit/lib/SwiftLang/SwiftConformingMethodList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "swift/Frontend/Frontend.h"
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
#include "swift/IDE/ConformingMethodList.h"
#include "swift/IDE/CompletionInstance.h"
#include "swift/IDETool/CompletionInstance.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Comment.h"
#include "clang/AST/Decl.h"
Expand Down
2 changes: 1 addition & 1 deletion tools/SourceKit/lib/SwiftLang/SwiftLangSupport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
#include "swift/Config.h"
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
#include "swift/IDE/CodeCompletionCache.h"
#include "swift/IDE/CompletionInstance.h"
#include "swift/IDE/SyntaxModel.h"
#include "swift/IDE/Utils.h"
#include "swift/IDETool/CompletionInstance.h"

#include "clang/Lex/HeaderSearch.h"
#include "clang/Lex/Preprocessor.h"
Expand Down
4 changes: 2 additions & 2 deletions tools/SourceKit/lib/SwiftLang/SwiftLangSupport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
#include "swift/AST/DiagnosticConsumer.h"
#include "swift/Basic/ThreadSafeRefCounted.h"
#include "swift/IDE/CancellableResult.h"
#include "swift/IDE/CompileInstance.h"
#include "swift/IDE/CompletionInstance.h"
#include "swift/IDE/Indenting.h"
#include "swift/IDE/Refactoring.h"
#include "swift/IDETool/CompileInstance.h"
#include "swift/IDETool/CompletionInstance.h"
#include "swift/Index/IndexSymbol.h"
#include "llvm/ADT/IntrusiveRefCntPtr.h"
#include "llvm/ADT/StringMap.h"
Expand Down
2 changes: 1 addition & 1 deletion tools/SourceKit/lib/SwiftLang/SwiftTypeContextInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include "SwiftEditorDiagConsumer.h"
#include "swift/Frontend/Frontend.h"
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
#include "swift/IDE/CompletionInstance.h"
#include "swift/IDE/TypeContextInfo.h"
#include "swift/IDETool/CompletionInstance.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Comment.h"
#include "clang/AST/Decl.h"
Expand Down
1 change: 1 addition & 0 deletions tools/swift-ide-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ target_link_libraries(swift-ide-test
swiftDriver
swiftFrontend
swiftIDE
swiftIDETool
swiftCompilerModules)

# If libxml2 is available, make it available for swift-ide-test.
Expand Down
2 changes: 1 addition & 1 deletion tools/swift-ide-test/swift-ide-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include "swift/Frontend/PrintingDiagnosticConsumer.h"
#include "swift/IDE/CodeCompletionResultPrinter.h"
#include "swift/IDE/CommentConversion.h"
#include "swift/IDE/CompletionInstance.h"
#include "swift/IDE/ConformingMethodList.h"
#include "swift/IDE/IDERequests.h"
#include "swift/IDE/ModuleInterfacePrinting.h"
Expand All @@ -47,6 +46,7 @@
#include "swift/IDE/SyntaxModel.h"
#include "swift/IDE/TypeContextInfo.h"
#include "swift/IDE/Utils.h"
#include "swift/IDETool/CompletionInstance.h"
#include "swift/Index/Index.h"
#include "swift/Markup/Markup.h"
#include "swift/Parse/ParseVersion.h"
Expand Down