diff --git a/LocalPackages/CodeEditSourceEditor/Package.resolved b/LocalPackages/CodeEditSourceEditor/Package.resolved index 10ff83930..bd1554cc2 100644 --- a/LocalPackages/CodeEditSourceEditor/Package.resolved +++ b/LocalPackages/CodeEditSourceEditor/Package.resolved @@ -18,24 +18,6 @@ "version" : "1.6.0" } }, - { - "identity" : "swift-custom-dump", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-custom-dump", - "state" : { - "revision" : "4fb9e7cbb4b8f5a7354005db39447f570d6b3e19", - "version" : "1.7.3" - } - }, - { - "identity" : "swift-issue-reporting", - "kind" : "remoteSourceControl", - "location" : "https://github.com/pointfreeco/swift-issue-reporting", - "state" : { - "revision" : "71c7c9a761d1ca6ed4ccb6ced040fe1c1a39e8e7", - "version" : "2.1.0" - } - }, { "identity" : "swifttreesitter", "kind" : "remoteSourceControl", diff --git a/LocalPackages/CodeEditSourceEditor/Package.swift b/LocalPackages/CodeEditSourceEditor/Package.swift index c0ca39260..33bc2b4c2 100644 --- a/LocalPackages/CodeEditSourceEditor/Package.swift +++ b/LocalPackages/CodeEditSourceEditor/Package.swift @@ -23,7 +23,6 @@ let package = Package( url: "https://github.com/ChimeHQ/TextFormation", from: "0.8.2" ), - .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.0.0") ], targets: [ // A source editor with useful features for code editing. @@ -42,7 +41,6 @@ let package = Package( dependencies: [ "CodeEditSourceEditor", "TableProGrammars", - .product(name: "CustomDump", package: "swift-custom-dump") ] ), ] diff --git a/LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+IndentTests.swift b/LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+IndentTests.swift index b61ad0505..5e4caf182 100644 --- a/LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+IndentTests.swift +++ b/LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+IndentTests.swift @@ -7,7 +7,6 @@ @testable import CodeEditSourceEditor @testable import CodeEditTextView -import CustomDump import XCTest final class TextViewControllerIndentTests: XCTestCase { @@ -26,7 +25,7 @@ final class TextViewControllerIndentTests: XCTestCase { controller.textView.selectionManager.textSelections = [.init(range: NSRange(location: 0, length: 0))] controller.handleIndent(inwards: true) - expectNoDifference(controller.text, "This is a test string") + XCTAssertEqual(controller.text, "This is a test string") // Normally, 4 spaces are used for indentation; however, now we only insert 2 leading spaces. // The outcome should be the same, though. @@ -35,7 +34,7 @@ final class TextViewControllerIndentTests: XCTestCase { controller.textView.selectionManager.textSelections = [.init(range: NSRange(location: 0, length: 0))] controller.handleIndent(inwards: true) - expectNoDifference(controller.text, "This is a test string") + XCTAssertEqual(controller.text, "This is a test string") } func testHandleIndentWithSpacesOutwards() { @@ -46,7 +45,7 @@ final class TextViewControllerIndentTests: XCTestCase { controller.handleIndent(inwards: false) - expectNoDifference(controller.text, " This is a test string") + XCTAssertEqual(controller.text, " This is a test string") } func testHandleIndentWithTabsInwards() { @@ -58,7 +57,7 @@ final class TextViewControllerIndentTests: XCTestCase { controller.handleIndent(inwards: true) - expectNoDifference(controller.text, "This is a test string") + XCTAssertEqual(controller.text, "This is a test string") } func testHandleIndentWithTabsOutwards() { @@ -72,7 +71,7 @@ final class TextViewControllerIndentTests: XCTestCase { // Normally, we expect nothing to happen because only one line is selected. // However, this logic is not handled inside `handleIndent`. - expectNoDifference(controller.text, "\tThis is a test string") + XCTAssertEqual(controller.text, "\tThis is a test string") } func testHandleIndentMultiLine() { @@ -95,7 +94,7 @@ final class TextViewControllerIndentTests: XCTestCase { controller.handleIndent() let expectedString = "\tThis is a test string\n\tWith multiple lines\n\tAnd some indentation" - expectNoDifference(controller.text, expectedString) + XCTAssertEqual(controller.text, expectedString) } func testHandleInwardIndentMultiLine() { @@ -118,7 +117,7 @@ final class TextViewControllerIndentTests: XCTestCase { controller.handleIndent(inwards: true) let expectedString = "This is a test string\nWith multiple lines\nAnd some indentation" - expectNoDifference(controller.text, expectedString) + XCTAssertEqual(controller.text, expectedString) } func testMultipleLinesHighlighted() { diff --git a/LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+MoveLinesTests.swift b/LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+MoveLinesTests.swift index 48327fda7..650a60995 100644 --- a/LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+MoveLinesTests.swift +++ b/LocalPackages/CodeEditSourceEditor/Tests/CodeEditSourceEditorTests/Controller/TextViewController+MoveLinesTests.swift @@ -7,7 +7,6 @@ @testable import CodeEditSourceEditor @testable import CodeEditTextView -import CustomDump import XCTest final class TextViewControllerMoveLinesTests: XCTestCase { @@ -37,7 +36,7 @@ final class TextViewControllerMoveLinesTests: XCTestCase { controller.moveLinesUp() let expectedString = "With multiple lines\nThis is a test string\n" - expectNoDifference(controller.text, expectedString) + XCTAssertEqual(controller.text, expectedString) } func testHandleMoveLinesDownForSingleLine() { @@ -58,7 +57,7 @@ final class TextViewControllerMoveLinesTests: XCTestCase { controller.moveLinesDown() let expectedString = "With multiple lines\nThis is a test string\n" - expectNoDifference(controller.text, expectedString) + XCTAssertEqual(controller.text, expectedString) } func testHandleMoveLinesUpForMultiLine() { @@ -80,7 +79,7 @@ final class TextViewControllerMoveLinesTests: XCTestCase { controller.moveLinesUp() let expectedString = "With multiple lines\nAnd additional info\nThis is a test string\n" - expectNoDifference(controller.text, expectedString) + XCTAssertEqual(controller.text, expectedString) } func testHandleMoveLinesDownForMultiLine() { @@ -102,6 +101,6 @@ final class TextViewControllerMoveLinesTests: XCTestCase { controller.moveLinesDown() let expectedString = "And additional info\nThis is a test string\nWith multiple lines\n" - expectNoDifference(controller.text, expectedString) + XCTAssertEqual(controller.text, expectedString) } }