diff --git a/BUILD.bazel b/BUILD.bazel index fad2dd3cd37..bf875dda1bb 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -3,7 +3,7 @@ load("//utils/bazel:swift_syntax_library.bzl", "swift_syntax_library") package(default_visibility = ["//visibility:public"]) swift_syntax_library( - name = "IDEUtils", + name = "SwiftIDEUtils", deps = [ ":SwiftSyntax", ], diff --git a/CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift b/CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift index bd42ede58b8..d2abf41adc5 100644 --- a/CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift +++ b/CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift @@ -20,7 +20,7 @@ import Utils private let generatedDirName = "generated" private let swiftBasicFormatGeneratedDir = ["SwiftBasicFormat", generatedDirName] -private let ideUtilsGeneratedDir = ["IDEUtils", generatedDirName] +private let swiftIdeUtilsGeneratedDir = ["SwiftIDEUtils", generatedDirName] private let swiftParserGeneratedDir = ["SwiftParser", generatedDirName] private let swiftParserDiagnosticsGeneratedDir = ["SwiftParserDiagnostics", generatedDirName] private let swiftSyntaxGeneratedDir = ["SwiftSyntax", generatedDirName] @@ -83,7 +83,7 @@ struct GenerateSwiftSyntax: ParsableCommand { GeneratedFileSpec(swiftBasicFormatGeneratedDir + ["BasicFormat.swift"], basicFormatFile), // IDEUtils - GeneratedFileSpec(ideUtilsGeneratedDir + ["SyntaxClassification.swift"], syntaxClassificationFile), + GeneratedFileSpec(swiftIdeUtilsGeneratedDir + ["SyntaxClassification.swift"], syntaxClassificationFile), // SwiftParser GeneratedFileSpec(swiftParserGeneratedDir + ["DeclarationModifier.swift"], declarationModifierFile), diff --git a/Package.swift b/Package.swift index 2bdd67205f7..46ad9df8342 100644 --- a/Package.swift +++ b/Package.swift @@ -45,10 +45,10 @@ let package = Package( .macCatalyst(.v13), ], products: [ - .library(name: "IDEUtils", type: .static, targets: ["IDEUtils"]), .library(name: "SwiftCompilerPlugin", type: .static, targets: ["SwiftCompilerPlugin"]), .library(name: "SwiftCompilerPluginMessageHandling", type: .static, targets: ["SwiftCompilerPluginMessageHandling"]), .library(name: "SwiftDiagnostics", type: .static, targets: ["SwiftDiagnostics"]), + .library(name: "SwiftIDEUtils", type: .static, targets: ["SwiftIDEUtils"]), .library(name: "SwiftOperators", type: .static, targets: ["SwiftOperators"]), .library(name: "SwiftParser", type: .static, targets: ["SwiftParser"]), .library(name: "SwiftParserDiagnostics", type: .static, targets: ["SwiftParserDiagnostics"]), @@ -82,19 +82,6 @@ let package = Package( // In that case package and internal dependencies are on different lines. // - All array elements are sorted alphabetically - // MARK: IDEUtils - - .target( - name: "IDEUtils", - dependencies: ["SwiftSyntax"], - exclude: ["CMakeLists.txt"] - ), - - .testTarget( - name: "IDEUtilsTest", - dependencies: ["_SwiftSyntaxTestSupport", "IDEUtils", "SwiftParser", "SwiftSyntax"] - ), - // MARK: SwiftBasicFormat .target( @@ -136,6 +123,19 @@ let package = Package( dependencies: ["_SwiftSyntaxTestSupport", "SwiftDiagnostics", "SwiftParser", "SwiftParserDiagnostics"] ), + // MARK: SwiftIDEUtils + + .target( + name: "SwiftIDEUtils", + dependencies: ["SwiftSyntax"], + exclude: ["CMakeLists.txt"] + ), + + .testTarget( + name: "SwiftIDEUtilsTest", + dependencies: ["_SwiftSyntaxTestSupport", "SwiftIDEUtils", "SwiftParser", "SwiftSyntax"] + ), + // MARK: SwiftSyntax .target( @@ -250,7 +250,7 @@ let package = Package( .executableTarget( name: "lit-test-helper", - dependencies: ["IDEUtils", "SwiftSyntax", "SwiftParser"] + dependencies: ["SwiftIDEUtils", "SwiftSyntax", "SwiftParser"] ), // MARK: PerformanceTest @@ -258,7 +258,7 @@ let package = Package( .testTarget( name: "PerformanceTest", - dependencies: ["IDEUtils", "SwiftParser", "SwiftSyntax"], + dependencies: ["SwiftIDEUtils", "SwiftParser", "SwiftSyntax"], exclude: ["Inputs"] ), ] diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index a9172ce9150..bae4daa7df7 100644 --- a/Sources/CMakeLists.txt +++ b/Sources/CMakeLists.txt @@ -40,4 +40,4 @@ add_subdirectory(SwiftOperators) add_subdirectory(SwiftSyntaxBuilder) add_subdirectory(SwiftSyntaxMacros) add_subdirectory(SwiftCompilerPluginMessageHandling) -add_subdirectory(IDEUtils) +add_subdirectory(SwiftIDEUtils) diff --git a/Sources/IDEUtils/CMakeLists.txt b/Sources/SwiftIDEUtils/CMakeLists.txt similarity index 84% rename from Sources/IDEUtils/CMakeLists.txt rename to Sources/SwiftIDEUtils/CMakeLists.txt index bc07192f645..6c5fb195496 100644 --- a/Sources/IDEUtils/CMakeLists.txt +++ b/Sources/SwiftIDEUtils/CMakeLists.txt @@ -6,11 +6,11 @@ # See http://swift.org/LICENSE.txt for license information # See http://swift.org/CONTRIBUTORS.txt for Swift project authors -add_swift_host_library(IDEUtils +add_swift_host_library(SwiftIDEUtils generated/SyntaxClassification.swift Syntax+Classifications.swift SyntaxClassifier.swift ) -target_link_libraries(IDEUtils PUBLIC +target_link_libraries(SwiftIDEUtils PUBLIC SwiftSyntax) diff --git a/Sources/IDEUtils/Syntax+Classifications.swift b/Sources/SwiftIDEUtils/Syntax+Classifications.swift similarity index 100% rename from Sources/IDEUtils/Syntax+Classifications.swift rename to Sources/SwiftIDEUtils/Syntax+Classifications.swift diff --git a/Sources/IDEUtils/SyntaxClassifier.swift b/Sources/SwiftIDEUtils/SyntaxClassifier.swift similarity index 100% rename from Sources/IDEUtils/SyntaxClassifier.swift rename to Sources/SwiftIDEUtils/SyntaxClassifier.swift diff --git a/Sources/IDEUtils/generated/SyntaxClassification.swift b/Sources/SwiftIDEUtils/generated/SyntaxClassification.swift similarity index 100% rename from Sources/IDEUtils/generated/SyntaxClassification.swift rename to Sources/SwiftIDEUtils/generated/SyntaxClassification.swift diff --git a/Sources/lit-test-helper/ClassifiedSyntaxTreePrinter.swift b/Sources/lit-test-helper/ClassifiedSyntaxTreePrinter.swift index c6739d09b78..40382ef6bcb 100644 --- a/Sources/lit-test-helper/ClassifiedSyntaxTreePrinter.swift +++ b/Sources/lit-test-helper/ClassifiedSyntaxTreePrinter.swift @@ -10,7 +10,7 @@ // //===----------------------------------------------------------------------===// -import IDEUtils +import SwiftIDEUtils import SwiftSyntax extension SyntaxClassification { diff --git a/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift b/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift index 3b5dbd13c5b..ac2d4891f45 100644 --- a/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift +++ b/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import XCTest -import IDEUtils +import SwiftIDEUtils import SwiftSyntax import SwiftParser diff --git a/Tests/IDEUtilsTest/ClassificationTests.swift b/Tests/SwiftIDEUtilsTest/ClassificationTests.swift similarity index 99% rename from Tests/IDEUtilsTest/ClassificationTests.swift rename to Tests/SwiftIDEUtilsTest/ClassificationTests.swift index 1b1d5926bb3..7d18d05b999 100644 --- a/Tests/IDEUtilsTest/ClassificationTests.swift +++ b/Tests/SwiftIDEUtilsTest/ClassificationTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import XCTest -import IDEUtils +import SwiftIDEUtils import SwiftSyntax import SwiftParser import _SwiftSyntaxTestSupport diff --git a/build-script.py b/build-script.py index 303d479db3c..2b0dce497ca 100755 --- a/build-script.py +++ b/build-script.py @@ -16,7 +16,7 @@ WORKSPACE_DIR = os.path.dirname(PACKAGE_DIR) EXAMPLES_DIR = os.path.join(PACKAGE_DIR, "Examples") SOURCES_DIR = os.path.join(PACKAGE_DIR, "Sources") -IDEUTILS_DIR = os.path.join(SOURCES_DIR, "IDEUtils") +SWIFTIDEUTILS_DIR = os.path.join(SOURCES_DIR, "SwiftIDEUtils") SWIFTSYNTAX_DIR = os.path.join(SOURCES_DIR, "SwiftSyntax") SWIFTSYNTAX_DOCUMENTATION_DIR = \ os.path.join(SWIFTSYNTAX_DIR, "Documentation.docc") @@ -261,7 +261,7 @@ def verify_code_generated_files( print("** Verifing code generated files **") - for module in ["SwiftBasicFormat", "IDEUtils", \ + for module in ["SwiftBasicFormat", "SwiftIDEUtils", \ "SwiftParser", "SwiftSyntax", "SwiftSyntaxBuilder"]: self_generated_dir = os.path.join(self_temp_dir, module, "generated") user_generated_dir = os.path.join(SOURCES_DIR, module, "generated")