github
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix URL enclosed in apostrophes or backtick not working issue 

Check if URL is enclosed in apostrophes or backtick (grave accent). Only if URL is directly preceded by apostrophe/backtick and URL ends with apostrophe/backtick respectively.

Fix #14978, fix #14323, fix #14212, close #15058
pull/15098/head
MarkusBodensee 2024-04-28 08:36:40 +02:00 committed by Don Ho
parent 6281227d84
commit c584a77e0e
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
PowerEditor/src/Notepad_plus.cpp
View File

@ -3278,6 +3278,18 @@ void scanToUrlEnd(TCHAR *text, int textLen, int start, int* distance)
*distance = p - start; *distance = p - start;
} }
// removeUnwantedTrailingCharFromEnclosedUrl removes a single unwanted trailing character from a URL if the URL is enclosed by a pair of characters.
void removeUnwantedTrailingCharFromEnclosedUrl(int start, TCHAR const * text, int * length)
{
// Check if URL is enclosed in apostrophes.
if (start > 0 && text [start - 1] == '\'' && text [start + *length - 1] == '\'')
*length -= 1;
// Check if URL is enclosed in grave accents.
if (start > 0 && text [start - 1] == '`' && text [start + *length - 1] == '`')
*length -= 1;
}
// removeUnwantedTrailingCharFromUrl removes a single unwanted trailing character from an URL. // removeUnwantedTrailingCharFromUrl removes a single unwanted trailing character from an URL.
// It has to be called repeatedly, until it returns false, meaning that all unwanted characters are gone. // It has to be called repeatedly, until it returns false, meaning that all unwanted characters are gone.
bool removeUnwantedTrailingCharFromUrl (TCHAR const *text, int* length) bool removeUnwantedTrailingCharFromUrl (TCHAR const *text, int* length)
@ -3350,6 +3362,8 @@ bool isUrl(TCHAR * text, int textLen, int start, int* segmentLen)
bool r = InternetCrackUrl(& text [start], len, 0, & url); bool r = InternetCrackUrl(& text [start], len, 0, & url);
if (r) if (r)
{ {
removeUnwantedTrailingCharFromEnclosedUrl(start, & text [0], & len);
while (removeUnwantedTrailingCharFromUrl (& text [start], & len)); while (removeUnwantedTrailingCharFromUrl (& text [start], & len));
*segmentLen = len; *segmentLen = len;
return true; return true;