-
Notifications
You must be signed in to change notification settings - Fork 149
Blockquote + Lists: Fixing UI Glitch #714
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
jleandroperez
merged 12 commits into
develop
from
issue/645-blockquote-within-list-glitch
Sep 6, 2017
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
657af29
LayoutManager: Style Cleanup
jleandroperez e85ede2
LayoutManager + Blockquotes: Handling Line Separators
jleandroperez c730370
LayoutManager: Tunning height padding
jleandroperez 9313c7e
String+EndOfLine: Simplifies Helper
jleandroperez 4be148e
LayoutManager: Fixing MarkerItem Layout
jleandroperez 7e16598
String+EndOfLine: Implements isEndOfParagraph Helper
jleandroperez f2f1565
LayoutManager: Updating logic
jleandroperez 2e1b060
Implements String+EndOfParagraph
jleandroperez 3c9a9ea
Implements StringEndOfParagraphTests
jleandroperez 2eeefdf
LayoutManager: Wiring new helper
jleandroperez a76f708
StringEndOfParagraphTests: Updates Tests
jleandroperez 8d012af
Merge remote-tracking branch 'origin/develop' into issue/645-blockquo…
jleandroperez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import Foundation | ||
|
|
||
|
|
||
| // MARK: - Paragraph Analysis Helpers | ||
| // | ||
| extension String { | ||
|
|
||
| /// This methods verifies if the receiver string contains an End of Paragraph before the specified index. | ||
| /// | ||
| /// - Parameters: | ||
| /// - index: the index to check | ||
| /// | ||
| /// - Returns: `true` if the receiver contains an end-of-paragraph character before the specified Index. | ||
| /// | ||
| func isEndOfParagraph(before index: String.Index) -> Bool { | ||
| assert(index != startIndex) | ||
|
|
||
| let previousIndex = self.index(before: index) | ||
| guard previousIndex != endIndex else { | ||
| return true | ||
| } | ||
|
|
||
| let endingString = substring(with: previousIndex ..< index) | ||
| let paragraphSeparators = [String(.carriageReturn), String(.lineFeed), String(.paragraphSeparator)] | ||
|
|
||
| return paragraphSeparators.contains(endingString) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import XCTest | ||
| @testable import Aztec | ||
|
|
||
| class StringEndOfParagraphTests: XCTestCase { | ||
|
|
||
| func testIsEndOfParagraphReturnsTrueWheneverTestStringEndsWithCarriageReturn() { | ||
| let test = "something" + String(.carriageReturn) | ||
|
|
||
| XCTAssertTrue(test.isEndOfParagraph(before: test.endIndex)) | ||
| } | ||
|
|
||
| func testIsEndOfParagraphReturnsFalseWheneverTestStringEndsWithLineSeparator() { | ||
| let test = "something" + String(.lineSeparator) | ||
|
|
||
| XCTAssertFalse(test.isEndOfParagraph(before: test.endIndex)) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed privately, this will need to change in an upcoming PR since it's impossible to trigger this guard.
Documenting for history.