Skip to content

Rename IDEUtils -> SwiftIDEUtils #1542

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.

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
Apr 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
32 changes: 16 additions & 16 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"]),
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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"]
),
]
Expand Down
2 changes: 1 addition & 1 deletion Sources/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ add_subdirectory(SwiftOperators)
add_subdirectory(SwiftSyntaxBuilder)
add_subdirectory(SwiftSyntaxMacros)
add_subdirectory(SwiftCompilerPluginMessageHandling)
add_subdirectory(IDEUtils)
add_subdirectory(SwiftIDEUtils)
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
//
//===----------------------------------------------------------------------===//

import IDEUtils
import SwiftIDEUtils
import SwiftSyntax

extension SyntaxClassification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//

import XCTest
import IDEUtils
import SwiftIDEUtils
import SwiftSyntax
import SwiftParser

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
//===----------------------------------------------------------------------===//

import XCTest
import IDEUtils
import SwiftIDEUtils
import SwiftSyntax
import SwiftParser
import _SwiftSyntaxTestSupport
Expand Down
4 changes: 2 additions & 2 deletions build-script.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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")
Expand Down