Skip to content

Commit

Permalink
Rename StringBasics package with StringUtils
Browse files Browse the repository at this point in the history
  • Loading branch information
1024jp committed Aug 24, 2024
1 parent bdb9c5c commit e9bae2f
Show file tree
Hide file tree
Showing 47 changed files with 64 additions and 64 deletions.
2 changes: 1 addition & 1 deletion CotEditor/Sources/ConsolePanelController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import AppKit
import Defaults
import StringBasics
import StringUtils

struct Console {

Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/CustomSurroundView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//

import SwiftUI
import StringBasics
import StringUtils

struct CustomSurroundView: View {

Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/EditorCounter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import Foundation
import Observation
import StringBasics
import StringUtils

@MainActor protocol EditorSource: AnyObject {

Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/EditorTextView+SurroundSelection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import AppKit
import SwiftUI
import StringBasics
import StringUtils

extension EditorTextView {

Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/EditorTextView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import Defaults
import LineEnding
import Shortcut
import Syntax
import StringBasics
import StringUtils

private extension NSAttributedString.Key {

Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/EditorTextViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import ControlUI
import CharacterInfo
import Defaults
import FuzzyRange
import StringBasics
import StringUtils
import TextClipping

final class EditorTextViewController: NSViewController, NSServicesMenuRequestor, NSTextViewDelegate {
Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/NSTextView+BracePair.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//

import AppKit
import StringBasics
import StringUtils

extension NSTextView {

Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/NSTextView+TextReplacement.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//

import AppKit
import StringBasics
import StringUtils
import TextEditing

extension NSValue: @unchecked @retroactive Sendable { }
Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/OutlineInspectorView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import Observation
import Combine
import Defaults
import Syntax
import StringBasics
import StringUtils

final class OutlineInspectorViewController: NSHostingController<OutlineInspectorView>, DocumentOwner {

Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/RegexFindPanelTextView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import AppKit
import RegexHighlighting
import StringBasics
import StringUtils

final class RegexFindPanelTextView: FindPanelTextView {

Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/SyntaxParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import Foundation
import AppKit.NSTextStorage
import OSLog
import EditedRangeSet
import StringBasics
import StringUtils
import Syntax

extension NSAttributedString.Key {
Expand Down
2 changes: 1 addition & 1 deletion CotEditor/Sources/URLDetector.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import AppKit.NSTextStorage
import EditedRangeSet
import StringBasics
import StringUtils
import ValueRange

@MainActor final class URLDetector {
Expand Down
20 changes: 10 additions & 10 deletions Packages/EditorCore/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let package = Package(
"Invisible",
"LineEnding",
"LineSort",
"StringBasics",
"StringUtils",
"Syntax",
"TextClipping",
"TextEditing",
Expand All @@ -39,7 +39,7 @@ let package = Package(
.library(name: "Invisible", targets: ["Invisible"]),
.library(name: "LineEnding", targets: ["LineEnding"]),
.library(name: "LineSort", targets: ["LineSort"]),
.library(name: "StringBasics", targets: ["StringBasics"]),
.library(name: "StringUtils", targets: ["StringUtils"]),
.library(name: "Syntax", targets: ["Syntax"]),
.library(name: "TextClipping", targets: ["TextClipping"]),
.library(name: "TextEditing", targets: ["TextEditing"]),
Expand All @@ -56,7 +56,7 @@ let package = Package(
.target(name: "Defaults"),
.testTarget(name: "DefaultsTests", dependencies: ["Defaults"]),

.target(name: "EditedRangeSet", dependencies: ["StringBasics"]),
.target(name: "EditedRangeSet", dependencies: ["StringUtils"]),
.testTarget(name: "EditedRangeSetTests", dependencies: ["EditedRangeSet"]),

.target(name: "FileEncoding", dependencies: ["ValueRange"], resources: [.process("Resources")]),
Expand All @@ -74,24 +74,24 @@ let package = Package(
.target(name: "Invisible"),

.target(name: "LineEnding", dependencies: ["ValueRange"]),
.testTarget(name: "LineEndingTests", dependencies: ["LineEnding", "StringBasics"]),
.testTarget(name: "LineEndingTests", dependencies: ["LineEnding", "StringUtils"]),

.target(name: "LineSort", dependencies: ["StringBasics"]),
.target(name: "LineSort", dependencies: ["StringUtils"]),
.testTarget(name: "LineSortTests", dependencies: ["LineSort"]),

.target(name: "StringBasics"),
.testTarget(name: "StringBasicsTests", dependencies: ["StringBasics"]),
.target(name: "StringUtils"),
.testTarget(name: "StringUtilsTests", dependencies: ["StringUtils"]),

.target(name: "Syntax", dependencies: ["StringBasics", "ValueRange"]),
.target(name: "Syntax", dependencies: ["StringUtils", "ValueRange"]),
.testTarget(name: "SyntaxTests", dependencies: ["Syntax"]),

.target(name: "TextClipping"),
.testTarget(name: "TextClippingTests", dependencies: ["TextClipping"], resources: [.process("Resources")]),

.target(name: "TextEditing", dependencies: ["StringBasics", "Syntax"]),
.target(name: "TextEditing", dependencies: ["StringUtils", "Syntax"]),
.testTarget(name: "TextEditingTests", dependencies: ["TextEditing"]),

.target(name: "TextFind", dependencies: ["StringBasics", "ValueRange"]),
.target(name: "TextFind", dependencies: ["StringUtils", "ValueRange"]),
.testTarget(name: "TextFindTests", dependencies: ["TextFind"]),

.target(name: "UnicodeNormalization"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//

import Foundation
import StringBasics
import StringUtils

/// Edited range storage to postpone validations.
///
Expand Down
2 changes: 1 addition & 1 deletion Packages/EditorCore/Sources/EditedRangeSet/NSRange.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//

import Foundation
import StringBasics
import StringUtils

extension Sequence<NSRange> {

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

import Foundation
import StringBasics
import StringUtils
import ValueRange

protocol LazyLineEndingCaching: AnyObject, LineRangeCalculating {
Expand Down
2 changes: 1 addition & 1 deletion Packages/EditorCore/Sources/LineSort/SortPattern.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//

import Foundation
import StringBasics
import StringUtils

public enum SortPatternError: Error {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// BracePair.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Collection.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// NSAttributedString.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// NSRange.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// NSRegularExpression+Additions.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// String+NSRange.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// Pair.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// String+Case.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// String+Counting.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// String+Escaping.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// String+FullwidthTransform.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// String+LineRange.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// String+Match.swift
// StringBasics
// StringUtils
//
// CotEditor
// https://coteditor.com
Expand Down
2 changes: 1 addition & 1 deletion Packages/EditorCore/Sources/Syntax/HighlightParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//

import Foundation
import StringBasics
import StringUtils
import ValueRange


Expand Down
2 changes: 1 addition & 1 deletion Packages/EditorCore/Sources/Syntax/Syntax.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//

import Foundation
import StringBasics
import StringUtils

public enum SyntaxType: String, Sendable, CaseIterable {

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

import Foundation
import StringBasics
import StringUtils
import Syntax

public struct CommentTypes: OptionSet, Sendable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
//

import Foundation
import StringBasics
import StringUtils

public enum IndentStyle: Equatable, Sendable {

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

import Foundation
import StringBasics
import StringUtils

public extension String {

Expand Down
2 changes: 1 addition & 1 deletion Packages/EditorCore/Sources/TextFind/TextFind.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//

import Foundation
import StringBasics
import StringUtils
import ValueRange

public struct TextFind: Equatable, Sendable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

import Foundation
import Testing
import StringBasics
import StringUtils
import ValueRange
@testable import LineEnding

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//
// BracePairTests.swift
// StringBasicsTests
// StringUtilsTests
//
// CotEditor
// https://coteditor.com
Expand All @@ -25,7 +25,7 @@
//

import Testing
@testable import StringBasics
@testable import StringUtils

struct BracePairTests {

Expand Down
Loading

0 comments on commit e9bae2f

Please sign in to comment.