tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-23 13:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Skip auto-complete of <?xml> tag"

Browse Source 
This reverts commit 9183281921b180428e3cc748c074db9977d1d5e2.
This commit is contained in:
dail8859 2016-07-07 17:25:01 -04:00
parent 797765173d
commit ace8a4cf58
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -368,7 +368,7 @@ bool AutoCompletion::showFunctionComplete()
return false; return false;
} }
void AutoCompletion::getCloseTag(char *closeTag, size_t closeTagSize, size_t caretPos, LangType language) void AutoCompletion::getCloseTag(char *closeTag, size_t closeTagSize, size_t caretPos, bool isHTML)
{ {
char prev = (char)_pEditView->execute(SCI_GETCHARAT, caretPos - 2); char prev = (char)_pEditView->execute(SCI_GETCHARAT, caretPos - 2);
char prevprev = (char)_pEditView->execute(SCI_GETCHARAT, caretPos - 3); char prevprev = (char)_pEditView->execute(SCI_GETCHARAT, caretPos - 3);
@ -407,9 +407,9 @@ 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 (language == L_HTML) // for HTML: "br", "hr", "img", "link", "!doctype" and "meta" will be ignored if (isHTML) // for HTML: "br", "hr", "img", "link", "!doctype" and "meta" will be ignored
{ {
const char *disallowedTags[] = { "br", "hr", "img", "link", "meta", "!doctype" }; char *disallowedTags[] = { "br", "hr", "img", "link", "meta", "!doctype" };
size_t disallowedTagsLen = sizeof(disallowedTags) / sizeof(char *); size_t disallowedTagsLen = sizeof(disallowedTags) / sizeof(char *);
for (size_t i = 0; i < disallowedTagsLen; ++i) for (size_t i = 0; i < disallowedTagsLen; ++i)
{ {
@ -417,12 +417,6 @@ void AutoCompletion::getCloseTag(char *closeTag, size_t closeTagSize, size_t car
return; return;
} }
} }
else if (language == L_XML)
{
// Ignore "?xml"
if (strnicmp(tagHead + 1, "?xml", strlen("?xml")) == 0)
return;
}
closeTag[0] = '<'; closeTag[0] = '<';
closeTag[1] = '/'; closeTag[1] = '/';
@ -642,7 +636,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, tagMaxLen, caretPos, _curLang); 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

@ -84,7 +84,7 @@ public:
void insertMatchedChars(int character, const MatchedPairConf & matchedPairConf); void insertMatchedChars(int character, const MatchedPairConf & matchedPairConf);
void update(int character); void update(int character);
void callTipClick(int direction); void callTipClick(int direction);
void getCloseTag(char *closeTag, size_t closeTagLen, size_t caretPos, LangType language); void getCloseTag(char *closeTag, size_t closeTagLen, size_t caretPos, bool isHTML);
private: private:
bool _funcCompletionActive = false; bool _funcCompletionActive = false;