Merge pull request #1542 from ahoppen/ahoppen/rename-ideutils

Rename IDEUtils -> SwiftIDEUtils

Author: ahoppen

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",
     ],

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,15 +250,15 @@ let package = Package(
 
     .executableTarget(
       name: "lit-test-helper",
-      dependencies: ["IDEUtils", "SwiftSyntax", "SwiftParser"]
+      dependencies: ["SwiftIDEUtils", "SwiftSyntax", "SwiftParser"]
     ),
 
     // MARK: PerformanceTest
     // TODO: Should be included in SwiftParserTest/SwiftSyntaxTest
 
     .testTarget(
       name: "PerformanceTest",
-      dependencies: ["IDEUtils", "SwiftParser", "SwiftSyntax"],
+      dependencies: ["SwiftIDEUtils", "SwiftParser", "SwiftSyntax"],
       exclude: ["Inputs"]
     ),
   ]

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)

Sources/IDEUtils/CMakeLists.txt renamed to 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)

Sources/IDEUtils/Syntax+Classifications.swift renamed to Sources/SwiftIDEUtils/Syntax+Classifications.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import IDEUtils
+import SwiftIDEUtils
 import SwiftSyntax
 
 extension SyntaxClassification {

Sources/IDEUtils/SyntaxClassifier.swift renamed to Sources/SwiftIDEUtils/SyntaxClassifier.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
-import IDEUtils
+import SwiftIDEUtils
 import SwiftSyntax
 import SwiftParser
 

Sources/IDEUtils/generated/SyntaxClassification.swift renamed to Sources/SwiftIDEUtils/generated/SyntaxClassification.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
-import IDEUtils
+import SwiftIDEUtils
 import SwiftSyntax
 import SwiftParser
 import _SwiftSyntaxTestSupport

Sources/lit-test-helper/ClassifiedSyntaxTreePrinter.swift

@@ -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")