-
Notifications
You must be signed in to change notification settings - Fork 12
Rewrite excerpt macro to support excerpt extension #209
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
Open
danielriedmueller
wants to merge
7
commits into
main
Choose a base branch
from
handle_excerpt_macro
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f6833f4
rewrite excerpt macro to support excerpt extension
0ebc31a
removed unused templates
37d412b
added templates
4f89081
code style
ad8698a
add broken macro
98e77e9
use placeholder instead of templates
2b6647e
use placeholder instead of templates
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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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,24 @@ | ||
| <?php | ||
|
|
||
| namespace HalloWelt\MigrateConfluence\Converter\Postprocessor; | ||
|
|
||
| use HalloWelt\MigrateConfluence\Converter\IPostprocessor; | ||
|
|
||
| class RestoreExcerptBlock implements IPostprocessor { | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function postprocess( string $wikiText ): string { | ||
| return preg_replace_callback( | ||
| '/#####EXCERPTBLOCKOPEN\|(.*?)\|(.*?)#####(.*?)#####EXCERPTBLOCKCLOSE#####/si', | ||
| static function ( $matches ) { | ||
| $name = $matches[1]; | ||
| $hidden = $matches[2]; | ||
| $content = $matches[3]; | ||
| return "<excerpt-block name=\"$name\" hidden=\"$hidden\">$content</excerpt-block>"; | ||
|
danielriedmueller marked this conversation as resolved.
|
||
| }, | ||
| $wikiText | ||
| ); | ||
| } | ||
| } | ||
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
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 |
|---|---|---|
| @@ -1,9 +1,6 @@ | ||
| <?xml version="1.0"?> | ||
| <xml xmlns:ac="sample_namespace" xmlns:ri="sample_second_namespace"> | ||
| {{ExcerptStart###BREAK### | ||
| |hidden = true###BREAK### | ||
| |atlassian-macro-output-type = BLOCK###BREAK### | ||
| }} | ||
| #####EXCERPTBLOCKOPEN|b50b3cdb-e32a-447c-8c42-7be043c457ce|true##### | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In my opinion it is better to name the params. It could be that one of the params is not set and then you may have a problem with assignment |
||
| <p>This is the <strong>text</strong> I want to reuse in other pages. This text is inside an Excerpt macro.</p> | ||
| {{ExcerptEnd}} | ||
| #####EXCERPTBLOCKCLOSE#####[[Category:Broken_macro/excerpt]] | ||
| </xml> | ||
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.
Check other names in post processors that handle macros. You will find at least TasksReportMacro. Stick to naming convention
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.
done