Refactor how new lines after extends are inserted

[shadr]

This PR refactors how new line character is inserted after extends statement and moves logic from topiary query to the regex postprocess step. (close #99)
I wanted to close #99, but then I realized that we basically need to undo some of the topiary query logic, so I refactored how it works.
I changed previous preprocess step into a postprocessing one, modified regex and made regex_replace_all_outside_strings accept Replacer instead of only &str to conditionally insert new line character only if it doesn't land on the EOF.

[shadr]

I forgot that I based this PR on the branch from my previous PR and I can't figure out how to rebase it onto main. Is there any way to rebase it or it will resolve itself when previous PR is merged ?

[NathanLovato]

You can just let me know when the work on this is done and I will take care of any issues that may arise, no worries. If this is close to completion, we can also simply directly merge this PR and close the other

[fstxz]

I can't figure out how to rebase it onto main

Have you tried git rebase main ?

[shadr]

You can just let me know when the work on this is done and I will take care of any issues that may arise, no worries. If this is close to completion, we can also simply directly merge this PR and close the other

It is ready, but I just was curious how to do a rebase when I already sent a PR.

I can't figure out how to rebase it onto main

Have you tried git rebase main ?

Yes it gives me
Current branch remove-blank-line-between-extends-and-doc-comment is up to date.

[fstxz]

Does this PR depends on your other PR? If not, you can run git rebase -i main, then comment out the first line (with #) then save and exit.

[shadr]

Does this PR depends on your other PR? If not, you can run git rebase -i main, then comment out the first line (with #) then save and exit.

Thank you that helped, but I needed to do a force push to update a remote branch (or I didn't know how to do without a force push). Force pushes are always scary, I'll try to base my branches on the main in future :)

[fstxz]

or I didn't know how to do without a force push

I don't think it's possible without force

[NathanLovato]

@shadr Whenever you rewrite the history, like what git rebase does, you need to force push because, by default, there is a protection against rewriting history on the server. Force pushing means "overwrite anything on the server with my stuff, even if there's loss in the process." Rebase itself rewrites a new history with your changes based on the thing you rebase on (it creates new commits from scratch with your additions and deletions).

Usually in teams where we use force pushes, we do it like this: git push --force-with-lease, which means "overwrite the history on the server but only if nobody else uploaded work to that branch"

If you know what you're doing it's okay, it's relatively safe: git also keeps a history of changes you make to the history, the reference log, and in many cases you can undo a change like this. You can undo a git rebase and then force push again.

[NathanLovato]

Great work, thank you!

[shadr]

@NathanLovato thank you for the explanation!