Skip to content
This repository has been archived by the owner on Jan 23, 2021. It is now read-only.

Implement div block rule #101

Merged
merged 66 commits into from
Jan 11, 2021
Merged

Implement div block rule #101

merged 66 commits into from
Jan 11, 2021

Conversation

emmiegit
Copy link
Member

@emmiegit emmiegit commented Jan 4, 2021 •
edited
Loading

After merging #98 which contained [[code]], this PR implements [[div]] and [[div_]].

This replaces the BlockParser with extended methods on Parser instead, and adds utilities for parsing blocks to make their rule code simpler.

Ammon Smith added 30 commits January 3, 2021 23:10
Remove unnecessary special field from Blockparser.
39d96c5
Rename collect_merge() -> collect_text().
3963f84
Add get_body_text() method in BlockParser.
d70177e
Add debug assert for weird parameter edge case.
537b1cd
Fix comments.
7a8de06
Change body method to start after head.
27baaef
Use get_body_text() for BLOCK_CSS.
723b17f
Add stubbed get_body_elements().
0a60a90
Add get_body_generic() helper.
12d88cd
Remove argument from process step.
469cd1d
Rename end() -> finish().
f9b0fc9
Pass in parser during process step.
a29a820
Remove last closure.
74370a9
Use look_ahead() instead of clone to do TokenPair.
bb2c4c3
Run cargo fmt.
8957be9
Move slice assignment to next line.
adc0a3d
Accept closure as close condition in gather_paragraphs().
62bb381
Remove ParseCondition::Function.
820c6ac
Add comments to Token::InputEnd match branches in gather_paragraphs().
7af270a
Fix test regression by having generic return start and end.
4b6063e
Implement gather_paragraphs() in get_body_elements().
54d024f
Implement no-paragraphs body elements implementation.
28bab4e
Use pointer check step pattern.
585d40d
Use get_body_elements() in div block implementation.
c2e64e8
Allow [[/div_]].
7e74fff
Add first [[div_]] test.
d12b086
Add other initial [[div_]] tests.
dd5ebf7
Rename very long test filename.
e1d6bf4
Add more div_ tests.
7840553
Remove lint suppressions.
332509c
Ammon Smith added 21 commits January 10, 2021 14:21
Add Debug impl for BlockRule.
39dd01c 
This was missing??
Replace ParserWrapper with BlockParser as extra impls.
b3c457a
Rename block impls -> blocks.
c19a958
Return elements from get_body_elements_paragraphs().
8ab7553
Remove temporary lint suppression for block parser methods.
39421c0
Remove lint suppression from enums.
f076dd1
Move declarations for mod loggers.
dcbf226
Add [[div]] tests that mirror the [[div_]].
33f2dd0
Address clippy lints.
eaa2838
Change nested div tests.
1341e6a
Add deep nested [[div]] tests.
9db7e26
Store newline consumption in block rule.
692b78d
Remove unneeded 'p lifetime.
f0ad619
Add RULE_BLOCK_SKIP to account to ignore newlines before blocks.
4c00a73
Add RULE_BLOCK_SKIP to token rule mapping.
b2bce2f
Avoid unnecessary error creation.
374eb3a
Resolve warnings.
7d434d6
Avoid one return.
f3a45f0
Update tests.
9e21e62
Do not push null elements.
f2012af
Fix tests with null change.
2cb3942
@emmiegit emmiegit marked this pull request as ready for review January 11, 2021 00:13
@emmiegit emmiegit merged commit f23102c into master Jan 11, 2021
@emmiegit emmiegit deleted the FTML-41 branch January 11, 2021 01:32
@emmiegit
Copy link
Member Author

https://scuttle.atlassian.net/browse/FTML-41

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@emmiegit