This repository has been archived by the owner on Oct 9, 2020. It is now read-only.
Fix regexp not removing multi-line comments #88
Conversation
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
The previous regular expression had two issues: 1. It was only able to remove 1-line comments. 2. It was not set to be ungreedy, and could potentially remove content between two comments. E.g. when something like `<!-- comment --> content <!-- comment -->` does not contain a newline character, the content would actually be removed. We run into this issue at https://gerrit.wikimedia.org/r/489323. As a temporary workaround we made all our comments 1-line comments, and made sure each comment is on a separate line.
|
|
WMDE-Fisch
approved these changes
Feb 12, 2019
niedzielski
approved these changes
Feb 12, 2019
|
|
||
| // SVG XML -> HTML5 | ||
| [/\<([A-Za-z]+)([^\>]*)\/\>/g, "<$1$2></$1>"], // convert self-closing XML SVG nodes to explicitly closed HTML5 SVG nodes | ||
| [/\<([a-z]+)([^\>]*)\/\>/gi, "<$1$2></$1>"], // convert self-closing XML SVG nodes to explicitly closed HTML5 SVG nodes |
There was a problem hiding this comment.
In case anyone else is a little rusty on their RegExps, this is a readability improvement: drop A-Z and make a-z case-insensitive with the i flag.
| @@ -12,10 +12,10 @@ var regexSequences = [ | |||
| // Remove XML stuffs and comments | |||
| [/<\?xml[\s\S]*?>/gi, ""], | |||
| [/<!doctype[\s\S]*?>/gi, ""], | |||
| [/<!--.*-->/gi, ""], | |||
| [/<!--[\s\S]*?-->/g, ""], | |||
There was a problem hiding this comment.
Again, not sure if anyone else is rusty but . does not match newlines. Adding newlines can be done with (.|\n) but that adds a capturing group so [\s\S] is used instead, which matches all whitespace and all non-whitespace characters which together form the set of all characters. No casing specifier is needed so that's dropped. *? is like * but non-greedy.
anikethsaha
approved these changes
Feb 8, 2020
jamesgeorge007
approved these changes
Feb 8, 2020
wizardofhogwarts
approved these changes
Feb 19, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The previous regular expression had two issues:
<!-- comment --> content <!-- comment -->does not contain a newline character, the content would actually be removed.We run into this issue at https://gerrit.wikimedia.org/r/489323. As a temporary workaround we made all our comments 1-line comments, and made sure each comment is on a separate line.