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

Fix html tag auto-completion bug 

Closes #1510
Prevent from auto-closing html tag for "br", "hr", "img", "link" and
"meta" not working under Windows 10 32 bits. This patch fix this bug.
This patch prevents also from closing <!doctype>.
This commit is contained in:
Don Ho 2016-02-29 01:32:45 +01:00
parent 86f3a953d6
commit 8aeb6f3f20
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PowerEditor/src/ScitillaComponent/AutoCompletion.cpp
View File

@ -383,8 +383,8 @@ void AutoCompletion::getCloseTag(char *closeTag, size_t closeTagSize, size_t car
if (size_t(foundTextLen) > closeTagSize - 2) // buffer size is not large enough. -2 for '/' & '\0' if (size_t(foundTextLen) > closeTagSize - 2) // buffer size is not large enough. -2 for '/' & '\0'
return; return;
char tagHead[10]; char tagHead[tagMaxLen];
_pEditView->getText(tagHead, targetStart, targetStart+9); _pEditView->getText(tagHead, targetStart, targetEnd);
if (tagHead[1] == '/') // "</toto>" will be ignored if (tagHead[1] == '/') // "</toto>" will be ignored
return; return;
@ -392,12 +392,13 @@ void AutoCompletion::getCloseTag(char *closeTag, size_t closeTagSize, size_t car
if (strncmp(tagHead, "<!--", 4) == 0) // Comments will be ignored if (strncmp(tagHead, "<!--", 4) == 0) // Comments will be ignored
return; return;
if (isHTML) // for HTML: "br", "hr", "img", "link" and "meta" will be ignored if (isHTML) // for HTML: "br", "hr", "img", "link", "!doctype" and "meta" will be ignored
{ {
char *disallowed_tags[] = { "br", "hr", "img", "link", "meta" }; char *disallowedTags[] = { "br", "hr", "img", "link", "meta", "!doctype" };
for (int i = 0; i < 5; ++i) size_t disallowedTagsLen = sizeof(disallowedTags) / sizeof(char *);
for (size_t i = 0; i < disallowedTagsLen; ++i)
{ {
if (strnicmp(tagHead + 1, disallowed_tags[i], strlen(disallowed_tags[i])) == 0) if (strnicmp(tagHead + 1, disallowedTags[i], strlen(disallowedTags[i])) == 0)
return; return;
} }
} }
@ -534,8 +535,8 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
// if there's no user defined matched pair found, continue to check notepad++'s one // if there's no user defined matched pair found, continue to check notepad++'s one
const size_t closeTagLen = 256;
char closeTag[closeTagLen]; char closeTag[tagMaxLen];
closeTag[0] = '\0'; closeTag[0] = '\0';
switch (character) switch (character)
{ {
@ -626,7 +627,7 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
{ {
if (matchedPairConf._doHtmlXmlTag && (_curLang == L_HTML || _curLang == L_XML)) if (matchedPairConf._doHtmlXmlTag && (_curLang == L_HTML || _curLang == L_XML))
{ {
getCloseTag(closeTag, closeTagLen, caretPos, _curLang == L_HTML); getCloseTag(closeTag, tagMaxLen, caretPos, _curLang == L_HTML);
if (closeTag[0] != '\0') if (closeTag[0] != '\0')
matchedChars = closeTag; matchedChars = closeTag;
} }

2
PowerEditor/src/ScitillaComponent/AutoCompletion.h
View File

@ -37,6 +37,8 @@
#include "tinyxml.h" #include "tinyxml.h"
#endif// TINYXML_INCLUDED #endif// TINYXML_INCLUDED
const size_t tagMaxLen = 256;
class ScintillaEditView; class ScintillaEditView;
struct MatchedCharInserted { struct MatchedCharInserted {