https://github.com/jackdewinter/pymarkdown/issues/818 - Initial work #1129
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -2,12 +2,12 @@ | |
| "projectName": "pymarkdown", | ||
| "reportSource": "pytest", | ||
| "branchLevel": { | ||
| "totalMeasured": 5023, | ||
| "totalCovered": 5023 | ||
| }, | ||
| "lineLevel": { | ||
| "totalMeasured": 19960, | ||
| "totalCovered": 19960 | ||
| } | ||
| } | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ | |
| }, | ||
| "pymarkdown/application_logging.py": {}, | ||
| "pymarkdown/block_quotes/block_quote_count_helper.py": { | ||
| "too-many-arguments": 8 | ||
| }, | ||
| "pymarkdown/block_quotes/block_quote_data.py": {}, | ||
| "pymarkdown/block_quotes/block_quote_non_fenced_helper.py": { | ||
|
|
@@ -24,7 +24,8 @@ | |
| "too-many-locals": 1 | ||
| }, | ||
| "pymarkdown/block_quotes/block_quote_processor.py": { | ||
| "too-many-arguments": 5, | ||
| "too-many-locals": 2 | ||
| }, | ||
| "pymarkdown/coalesce/coalesce_processor.py": { | ||
| "too-few-public-methods": 1 | ||
|
|
@@ -320,7 +321,9 @@ | |
| "pymarkdown/plugins/rule_md_030.py": { | ||
| "too-many-instance-attributes": 1 | ||
| }, | ||
| "pymarkdown/plugins/rule_md_031.py": { | ||
| "too-many-instance-attributes": 1 | ||
| }, | ||
| "pymarkdown/plugins/rule_md_032.py": {}, | ||
| "pymarkdown/plugins/rule_md_033.py": {}, | ||
| "pymarkdown/plugins/rule_md_034.py": { | ||
|
|
@@ -483,7 +486,7 @@ | |
| "too-many-boolean-expressions": 1 | ||
| }, | ||
| "pymarkdown/transform_markdown/transform_list_block.py": { | ||
| "too-many-arguments": 4 | ||
| }, | ||
| "pymarkdown/transform_markdown/transform_new_list_item.py": { | ||
| "too-few-public-methods": 1, | ||
|
|
@@ -496,11 +499,11 @@ | |
| "pymarkdown/version.py": {} | ||
| }, | ||
| "disables-by-name": { | ||
| "too-many-instance-attributes": 25, | ||
| "too-many-public-methods": 4, | ||
| "too-few-public-methods": 39, | ||
| "too-many-arguments": 231, | ||
| "too-many-locals": 42, | ||
| "chained-comparison": 1, | ||
| "too-many-boolean-expressions": 2, | ||
| "protected-access": 25, | ||
|
|
||
This file contains 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 |
|---|---|---|
|
|
@@ -1300,7 +1300,7 @@ | |
| }, | ||
| { | ||
| "name": "test.rules.test_md027", | ||
| "totalTests": 110, | ||
| "failedTests": 0, | ||
| "errorTests": 0, | ||
| "skippedTests": 0, | ||
|
|
@@ -1364,7 +1364,7 @@ | |
| }, | ||
| { | ||
| "name": "test.rules.test_md031", | ||
| "totalTests": 110, | ||
| "failedTests": 0, | ||
| "errorTests": 0, | ||
| "skippedTests": 0, | ||
|
|
@@ -1620,10 +1620,10 @@ | |
| }, | ||
| { | ||
| "name": "test.test_markdown_extra", | ||
| "totalTests": 163, | ||
| "failedTests": 0, | ||
| "errorTests": 0, | ||
| "skippedTests": 1, | ||
| "elapsedTimeInMilliseconds": 0 | ||
| }, | ||
| { | ||
|
|
@@ -1692,7 +1692,7 @@ | |
| }, | ||
| { | ||
| "name": "test.tokens.test_markdown_token", | ||
| "totalTests": 5, | ||
| "failedTests": 0, | ||
| "errorTests": 0, | ||
| "skippedTests": 0, | ||
|
|
||
This file contains 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 | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -24,6 +24,9 @@ | |||||||
| ParagraphStackToken, | ||||||||
| ) | ||||||||
|
|
||||||||
| # pylint: disable=too-many-lines | ||||||||
|
|
||||||||
|
|
||||||||
| POGGER = ParserLogger(logging.getLogger(__name__)) | ||||||||
|
|
||||||||
|
|
||||||||
|
|
@@ -149,6 +152,41 @@ def __handle_bq_whitespace(adjusted_line: str, start_index: int) -> Tuple[str, i | |||||||
| start_index += 1 | ||||||||
| return adjusted_line, start_index | ||||||||
|
|
||||||||
| # pylint: disable=too-many-arguments | ||||||||
| @staticmethod | ||||||||
| def __xx( | ||||||||
|
There was a problem hiding this comment. suggestion: Rename method The method name
Suggested change
|
||||||||
| parser_state: ParserState, | ||||||||
| adjusted_line: str, | ||||||||
| start_index: int, | ||||||||
| current_count: int, | ||||||||
| stack_count: int, | ||||||||
| last_block_quote_index: int, | ||||||||
| ) -> Tuple[bool, int, int, int]: | ||||||||
| ( | ||||||||
| continue_processing, | ||||||||
| start_index, | ||||||||
| ) = BlockQuoteCountHelper.__is_special_double_block_case( | ||||||||
| parser_state, adjusted_line, start_index, current_count, stack_count | ||||||||
| ) | ||||||||
| if not continue_processing and current_count < stack_count: | ||||||||
| continue_proc, stack_token_index = BlockQuoteCountHelper.__xx_part_one( | ||||||||
| parser_state, start_index, current_count | ||||||||
| ) | ||||||||
| if continue_proc: | ||||||||
| current_count, start_index, last_block_quote_index = ( | ||||||||
| BlockQuoteCountHelper.__xx_part_two( | ||||||||
| parser_state, | ||||||||
| stack_token_index, | ||||||||
| start_index, | ||||||||
| current_count, | ||||||||
| stack_count, | ||||||||
| last_block_quote_index, | ||||||||
| ) | ||||||||
| ) | ||||||||
| return continue_processing, current_count, start_index, last_block_quote_index | ||||||||
|
|
||||||||
| # pylint: enable=too-many-arguments | ||||||||
|
|
||||||||
| # pylint: disable=too-many-arguments | ||||||||
| @staticmethod | ||||||||
| def __should_continue_processing( | ||||||||
|
|
@@ -214,14 +252,17 @@ def __should_continue_processing( | |||||||
| ): | ||||||||
| ( | ||||||||
| continue_processing, | ||||||||
| current_count, | ||||||||
| start_index, | ||||||||
| last_block_quote_index, | ||||||||
| ) = BlockQuoteCountHelper.__xx( | ||||||||
| parser_state, | ||||||||
| adjusted_line, | ||||||||
| start_index, | ||||||||
| current_count, | ||||||||
| stack_count, | ||||||||
| last_block_quote_index, | ||||||||
| ) | ||||||||
| else: | ||||||||
| continue_processing = True | ||||||||
| return ( | ||||||||
|
|
@@ -234,47 +275,77 @@ def __should_continue_processing( | |||||||
| ) | ||||||||
|
|
||||||||
| @staticmethod | ||||||||
| def __xx_part_one( | ||||||||
| parser_state: ParserState, start_index: int, current_count: int | ||||||||
| ) -> Tuple[bool, int]: | ||||||||
| if parser_state.token_stack[-1].is_fenced_code_block: | ||||||||
| return False, -1 | ||||||||
| assert parser_state.original_line_to_parse is not None | ||||||||
|
There was a problem hiding this comment. suggestion: Consider handling the case where While the assert statement ensures
Suggested change
|
||||||||
| block_quote_character_count = ParserHelper.count_characters_in_text( | ||||||||
| parser_state.original_line_to_parse[:start_index], ">" | ||||||||
| ) | ||||||||
| if block_quote_character_count > current_count: | ||||||||
| return False, -1 | ||||||||
| count_block_quotes = 0 | ||||||||
| found_index = -2 | ||||||||
| for stack_token_index, stack_token in enumerate( | ||||||||
| parser_state.token_stack | ||||||||
| ): # pragma: no cover | ||||||||
| if stack_token.is_block_quote: | ||||||||
| count_block_quotes += 1 | ||||||||
| if count_block_quotes == block_quote_character_count: | ||||||||
| found_index = stack_token_index | ||||||||
| break | ||||||||
| assert found_index != -2 | ||||||||
| assert found_index != len( | ||||||||
| parser_state.token_stack | ||||||||
| ), "should have completed before this" | ||||||||
| found_index += 1 | ||||||||
| return ( | ||||||||
| not parser_state.token_stack[found_index].is_block_quote, | ||||||||
| found_index, | ||||||||
| ) | ||||||||
|
|
||||||||
| @staticmethod | ||||||||
| def __xx_part_two( | ||||||||
| parser_state: ParserState, | ||||||||
| stack_index: int, | ||||||||
| start_index: int, | ||||||||
| current_count: int, | ||||||||
| stack_count: int, | ||||||||
| last_block_quote_index: int, | ||||||||
| ) -> Tuple[int, int, int]: | ||||||||
| # At this point, we have a "prefix", which may be partial, that has the | ||||||||
| # current_count of > characters, and ends with a list. If we are here, | ||||||||
| # we know that previous lines have had at least one more > character and | ||||||||
| # counted block quote. | ||||||||
| assert parser_state.token_stack[ | ||||||||
| stack_index | ||||||||
| ].is_list, "If not bq, must be a list." | ||||||||
| while parser_state.token_stack[stack_index].is_list: | ||||||||
| stack_index += 1 | ||||||||
| embedded_list_stack_token = cast( | ||||||||
| ListStackToken, parser_state.token_stack[stack_index - 1] | ||||||||
| ) | ||||||||
| assert parser_state.original_line_to_parse is not None | ||||||||
| if parser_state.original_line_to_parse[ | ||||||||
| start_index : embedded_list_stack_token.indent_level | ||||||||
| ].strip(): | ||||||||
| return current_count, start_index, last_block_quote_index | ||||||||
| assert current_count + 1 == stack_count | ||||||||
| if ( | ||||||||
| parser_state.original_line_to_parse[embedded_list_stack_token.indent_level] | ||||||||
| != ">" | ||||||||
| ): | ||||||||
| return current_count, start_index, last_block_quote_index | ||||||||
| last_block_quote_index = embedded_list_stack_token.indent_level + 1 | ||||||||
| if last_block_quote_index < len(parser_state.original_line_to_parse): | ||||||||
| character_after_block_quote = parser_state.original_line_to_parse[ | ||||||||
| last_block_quote_index | ||||||||
| ] | ||||||||
| assert character_after_block_quote == " " | ||||||||
| # if character_after_block_quote == " ": | ||||||||
| last_block_quote_index += 1 | ||||||||
|
|
||||||||
| return current_count + 1, last_block_quote_index, last_block_quote_index | ||||||||
|
|
||||||||
|
|
@@ -389,13 +460,14 @@ def __increase_stack( | |||||||
| stack_count, | ||||||||
| block_quote_data, | ||||||||
| ) | ||||||||
| assert not skip | ||||||||
| # if not skip: | ||||||||
| block_quote_data = BlockQuoteCountHelper.decrease_stack_to_level( | ||||||||
| parser_state, | ||||||||
| block_quote_data.current_count, | ||||||||
| stack_count, | ||||||||
| container_level_tokens, | ||||||||
| ) | ||||||||
| POGGER.debug( | ||||||||
| "container_level_tokens>>$", | ||||||||
| container_level_tokens, | ||||||||
|
|
@@ -955,21 +1027,24 @@ def __calculate_eligible_stack_hard_limit( | |||||||
| indent_text_count += delta | ||||||||
| length_of_available_whitespace -= delta | ||||||||
| extra_consumed_whitespace += delta | ||||||||
|
|
||||||||
| assert not adjust_current_block_quote | ||||||||
| _ = last_bq_index | ||||||||
| # if adjust_current_block_quote: | ||||||||
| # POGGER.debug( | ||||||||
| # "__calculate_stack_hard_limit>>last_block_token>>$", | ||||||||
| # parser_state.token_stack[last_bq_index].matching_markdown_token, | ||||||||
| # ) | ||||||||
| # block_token = cast( | ||||||||
| # BlockQuoteMarkdownToken, | ||||||||
| # parser_state.token_stack[last_bq_index].matching_markdown_token, | ||||||||
| # ) | ||||||||
| # block_token.add_bleading_spaces( | ||||||||
| # ParserHelper.repeat_string(ParserHelper.space_character, delta), True | ||||||||
| # ) | ||||||||
| # POGGER.debug( | ||||||||
| # "__calculate_stack_hard_limit>>last_block_token>>$", block_token | ||||||||
| # ) | ||||||||
|
|
||||||||
| return ( | ||||||||
| current_stack_index, | ||||||||
|
|
||||||||
Oops, something went wrong.
Oops, something went wrong.
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.
suggestion (documentation): Add a colon after 'Issue 1120'.
For consistency, add a colon after 'Issue 1120'.