Skip to content

Commit d3793a4

Browse files
committed
Rename IDEUtils -> SwiftIDEUtils
All targets in SwiftSyntax are prefixed with “Swift”, except for “IDEUtils”. To make it consistent, also prefix “IDEUtils” with “Swift”.
1 parent ab0015f commit d3793a4

File tree

11 files changed

+25
-25
lines changed

11 files changed

+25
-25
lines changed

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("//utils/bazel:swift_syntax_library.bzl", "swift_syntax_library")
33
package(default_visibility = ["//visibility:public"])
44

55
swift_syntax_library(
6-
name = "IDEUtils",
6+
name = "SwiftIDEUtils",
77
deps = [
88
":SwiftSyntax",
99
],

Package.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ let package = Package(
3838
.macCatalyst(.v13),
3939
],
4040
products: [
41-
.library(name: "IDEUtils", type: .static, targets: ["IDEUtils"]),
4241
.library(name: "SwiftCompilerPlugin", type: .static, targets: ["SwiftCompilerPlugin"]),
4342
.library(name: "SwiftCompilerPluginMessageHandling", type: .static, targets: ["SwiftCompilerPluginMessageHandling"]),
4443
.library(name: "SwiftDiagnostics", type: .static, targets: ["SwiftDiagnostics"]),
44+
.library(name: "SwiftIDEUtils", type: .static, targets: ["SwiftIDEUtils"]),
4545
.library(name: "SwiftOperators", type: .static, targets: ["SwiftOperators"]),
4646
.library(name: "SwiftParser", type: .static, targets: ["SwiftParser"]),
4747
.library(name: "SwiftParserDiagnostics", type: .static, targets: ["SwiftParserDiagnostics"]),
@@ -71,19 +71,6 @@ let package = Package(
7171
// In that case package and internal dependencies are on different lines.
7272
// - All array elements are sorted alphabetically
7373

74-
// MARK: IDEUtils
75-
76-
.target(
77-
name: "IDEUtils",
78-
dependencies: ["SwiftSyntax"],
79-
exclude: ["CMakeLists.txt"]
80-
),
81-
82-
.testTarget(
83-
name: "IDEUtilsTest",
84-
dependencies: ["_SwiftSyntaxTestSupport", "IDEUtils", "SwiftParser", "SwiftSyntax"]
85-
),
86-
8774
// MARK: SwiftBasicFormat
8875

8976
.target(
@@ -125,6 +112,19 @@ let package = Package(
125112
dependencies: ["_SwiftSyntaxTestSupport", "SwiftDiagnostics", "SwiftParser", "SwiftParserDiagnostics"]
126113
),
127114

115+
// MARK: SwiftIDEUtils
116+
117+
.target(
118+
name: "SwiftIDEUtils",
119+
dependencies: ["SwiftSyntax"],
120+
exclude: ["CMakeLists.txt"]
121+
),
122+
123+
.testTarget(
124+
name: "SwiftIDEUtilsTest",
125+
dependencies: ["_SwiftSyntaxTestSupport", "SwiftIDEUtils", "SwiftParser", "SwiftSyntax"]
126+
),
127+
128128
// MARK: SwiftSyntax
129129

130130
.target(
@@ -236,15 +236,15 @@ let package = Package(
236236

237237
.executableTarget(
238238
name: "lit-test-helper",
239-
dependencies: ["IDEUtils", "SwiftSyntax", "SwiftSyntaxParser"]
239+
dependencies: ["SwiftIDEUtils", "SwiftSyntax", "SwiftSyntaxParser"]
240240
),
241241

242242
// MARK: PerformanceTest
243243
// TODO: Should be included in SwiftParserTest/SwiftSyntaxTest
244244

245245
.testTarget(
246246
name: "PerformanceTest",
247-
dependencies: ["IDEUtils", "SwiftParser", "SwiftSyntax", "SwiftSyntaxParser"],
247+
dependencies: ["SwiftIDEUtils", "SwiftParser", "SwiftSyntax", "SwiftSyntaxParser"],
248248
exclude: ["Inputs"]
249249
),
250250

Sources/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ add_subdirectory(SwiftOperators)
4040
add_subdirectory(SwiftSyntaxBuilder)
4141
add_subdirectory(SwiftSyntaxMacros)
4242
add_subdirectory(SwiftCompilerPluginMessageHandling)
43-
add_subdirectory(IDEUtils)
43+
add_subdirectory(SwiftIDEUtils)

Sources/IDEUtils/CMakeLists.txt renamed to Sources/SwiftIDEUtils/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
# See http://swift.org/LICENSE.txt for license information
77
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors
88

9-
add_swift_host_library(IDEUtils
9+
add_swift_host_library(SwiftIDEUtils
1010
generated/SyntaxClassification.swift
1111
Syntax+Classifications.swift
1212
SyntaxClassifier.swift
1313
)
1414

15-
target_link_libraries(IDEUtils PUBLIC
15+
target_link_libraries(SwiftIDEUtils PUBLIC
1616
SwiftSyntax)

Sources/lit-test-helper/ClassifiedSyntaxTreePrinter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
import IDEUtils
13+
import SwiftIDEUtils
1414
import SwiftSyntax
1515

1616
extension SyntaxClassification {

Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import XCTest
14-
import IDEUtils
14+
import SwiftIDEUtils
1515
import SwiftSyntax
1616
import SwiftSyntaxParser
1717

Tests/IDEUtilsTest/ClassificationTests.swift renamed to Tests/SwiftIDEUtilsTest/ClassificationTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import XCTest
14-
import IDEUtils
14+
import SwiftIDEUtils
1515
import SwiftSyntax
1616
import SwiftParser
1717
import _SwiftSyntaxTestSupport

build-script.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
WORKSPACE_DIR = os.path.dirname(PACKAGE_DIR)
1717
EXAMPLES_DIR = os.path.join(PACKAGE_DIR, "Examples")
1818
SOURCES_DIR = os.path.join(PACKAGE_DIR, "Sources")
19-
IDEUTILS_DIR = os.path.join(SOURCES_DIR, "IDEUtils")
19+
SWIFTIDEUTILS_DIR = os.path.join(SOURCES_DIR, "SwiftIDEUtils")
2020
SWIFTSYNTAX_DIR = os.path.join(SOURCES_DIR, "SwiftSyntax")
2121
SWIFTSYNTAX_DOCUMENTATION_DIR = \
2222
os.path.join(SWIFTSYNTAX_DIR, "Documentation.docc")
@@ -256,7 +256,7 @@ def verify_code_generated_files(
256256

257257
print("** Verifing code generated files **")
258258

259-
for module in ["SwiftBasicFormat", "IDEUtils", \
259+
for module in ["SwiftBasicFormat", "SwiftIDEUtils", \
260260
"SwiftParser", "SwiftSyntax", "SwiftSyntaxBuilder"]:
261261
self_generated_dir = os.path.join(self_temp_dir, module, "generated")
262262
user_generated_dir = os.path.join(SOURCES_DIR, module, "generated")

0 commit comments

Comments
 (0)