Remove Redundant Parsing of Links #4507
Merged
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -67,7 +67,7 @@ namespace { | |||
|
|
|||
| LinkParser::LinkParser(const QString &unparsedString) | |||
| { | |||
| this->match_ = unparsedString; | |||
| ParsedLink result; | |||
There was a problem hiding this comment.
warning: variable 'result' of type 'chatterino::ParsedLink' can be declared 'const' [misc-const-correctness]
Suggested change
| ParsedLink result; | |
| ParsedLink const result; |
| @@ -92,8 +94,10 @@ LinkParser::LinkParser(const QString &unparsedString) | |||
|
|
|||
| // Host `a.b.c.com` | |||
| QStringRef host = l; | |||
| ParsedLink::StringView rest; | |||
There was a problem hiding this comment.
warning: variable 'rest' is not initialized [cppcoreguidelines-init-variables]
Suggested change
| ParsedLink::StringView rest; | |
| ParsedLink::StringView rest = 0; |
| bool lastWasDot = true; | ||
| bool inIpv6 = false; | ||
| bool hasMatch = false; |
There was a problem hiding this comment.
warning: variable 'hasMatch' of type 'bool' can be declared 'const' [misc-const-correctness]
Suggested change
| bool hasMatch = false; | |
| bool const hasMatch = false; |
| @@ -2,19 +2,31 @@ | |||
|
|
|||
| #include <QString> | |||
There was a problem hiding this comment.
warning: 'QString' file not found [clang-diagnostic-error]
#include <QString>
^| namespace chatterino { | ||
|
|
||
| struct ParsedLink { |
There was a problem hiding this comment.
warning: constructor does not initialize these fields: protocol, host, rest, source [cppcoreguidelines-pro-type-member-init]
src/common/LinkParser.hpp:14:
- StringView protocol;
- StringView host;
- StringView rest;
- QString source;
+ StringView protocol{};
+ StringView host{};
+ StringView rest{};
+ QString source{};
Merged
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Pull request checklist:
CHANGELOG.mdwas updated, if applicableDescription
This is a followup to #4436. While refactoring the
LinkParser, I noticed that when matching/adding links, they're essentially parsed three times - first by the link-parser, then with up to three regexes and lastly by another regex.All the regex-parsing can be eliminated:
ftpandspotifyregexes aren't needed, because these types of links will never be parsed by theLinkParser.https?regex can be removed, because theLinkParserknows whether the link contains a protocol or not.LinkParserknows where the host part of the link is (sidenote: the current regex is even wrong, if you have a link such aschatterino.com#FOO, then it will display aschatterino.com#foo).I updated the tests to match the new format and added some tests that check the case-insensitivity of the parser. This doesn't change the parsing inside
LinkParseryet.