Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Further improve support for escape sequences #37

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Further improve support for escape sequences #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9656a05
Use stripped length when padding.
Roslund Jan 14, 2018
b6b2a08
Completely changed strippingPattern to find color and only color.
Roslund Jan 14, 2018
c2dd034
Changed stripping pattern to mach tests as well
Roslund Jun 19, 2018
54efa98
Added Unit test for Stripped with color and bold.
Roslund Jun 19, 2018
22fa090
Missed a tab...
Roslund Jun 19, 2018
306b210
Merge branch 'master' into master
Roslund Nov 14, 2018
5b5143f
Merge remote-tracking branch 'upstream/master'
Roslund Apr 2, 2019
32561c2
Merge pull request #1 from scottrhoyt/master
Roslund Aug 7, 2019
01cdbeb
Improved strippingPattern: shorter, catches bold and underline.
Roslund Aug 7, 2019
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 Source/SwiftyTextTable/TextTable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Foundation

typealias Regex = NSRegularExpression

private let strippingPattern = "\\\u{001B}\\[([0-9][0-9]?m|[0-9](;[0-9]*)*m)"
private let strippingPattern = "\\\u{1B}\\[[0-9][0-9]?(;?[0-9]*)*m"

// We can safely force try this regex because the pattern has be tested to work.
// swiftlint:disable:next force_try
Expand Down
11 changes: 11 additions & 0 deletions Tests/SwiftyTextTableTests/SwiftyTextTableTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,17 @@ class SwiftyTextTableTests: XCTestCase {

let c9 = TextTableColumn(header: "\u{001B}[1;31mHello World\u{001B}[0;30m")
XCTAssertEqual(c9.width(), 11)

let c10 = TextTableColumn(header: "\u{1B}[31mHello World\u{1B}[0m")
XCTAssertEqual(c10.width(), 11)

// Test underline
let c11 = TextTableColumn(header: "\u{1B}[31;4mX\u{1B}[0m")
XCTAssertEqual(c11.width(), 1)

// Test bold
let c12 = TextTableColumn(header: "\u{1B}[31;1mX\u{1B}[0m")
XCTAssertEqual(c12.width(), 1)
#endif
}

Expand Down