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

[NEW_FEATURE] Enhance Auto-insert feature (in progress).

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1294 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2014-11-23 16:46:44 +00:00
parent a509210cdc
commit 5a7b30789b
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,8 +429,37 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
{ {
case int('('): case int('('):
if (matchedPairConf._doParentheses) if (matchedPairConf._doParentheses)
{
matchedChars = ")"; matchedChars = ")";
_doIgnoreParenthease = true;
_parenthesePos = caretPos - 1;
}
break; break;
case int(')') :
if (matchedPairConf._doParentheses && _doIgnoreParenthease)
{
matchedChars = ")";
// if current pos is on the same line of _parenthesePos
// and current pos > _parenthesePos
if (_parenthesePos < caretPos)
{
// detect if ) is in between ( and )
int pos = isInBetween(_parenthesePos, ')', caretPos);
if (pos != -1)
{
_pEditView->execute(SCI_DELETERANGE, pos, 1);
_pEditView->execute(SCI_GOTOPOS, pos);
}
}
_doIgnoreParenthease = false;
_parenthesePos = -1;
return;
}
break;
case int('['): case int('['):
if (matchedPairConf._doBrackets) if (matchedPairConf._doBrackets)
matchedChars = "]"; matchedChars = "]";
@ -463,6 +492,31 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
_pEditView->execute(SCI_INSERTTEXT, caretPos, (LPARAM)matchedChars); _pEditView->execute(SCI_INSERTTEXT, caretPos, (LPARAM)matchedChars);
} }
int AutoCompletion::isInBetween(int startPos, char endChar, int posToDetect)
{
int posToDetectLine = _pEditView->execute(SCI_LINEFROMPOSITION, posToDetect);
int startPosLine = _pEditView->execute(SCI_LINEFROMPOSITION, startPos);
if (startPosLine != posToDetectLine)
return -1;
int endPos = _pEditView->execute(SCI_GETLINEENDPOSITION, startPosLine);
char startChar = (char)_pEditView->execute(SCI_GETCHARAT, startPos);
for (int i = posToDetect; i <= endPos; ++i)
{
char aChar = (char)_pEditView->execute(SCI_GETCHARAT, i);
if (aChar == startChar)
return -1;
if (aChar == endChar)
return i;
}
return -1;
}
void AutoCompletion::update(int character) void AutoCompletion::update(int character)
{ {
const NppGUI & nppGUI = NppParameters::getInstance()->getNppGUI(); const NppGUI & nppGUI = NppParameters::getInstance()->getNppGUI();

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

@ -79,6 +79,9 @@ private:
TiXmlDocument *_pXmlFile; TiXmlDocument *_pXmlFile;
TiXmlElement *_pXmlKeyword; TiXmlElement *_pXmlKeyword;
bool _doIgnoreParenthease;
int _parenthesePos;
bool _ignoreCase; bool _ignoreCase;
vector<generic_string> _keyWordArray; vector<generic_string> _keyWordArray;
@ -89,6 +92,7 @@ private:
const TCHAR * getApiFileName(); const TCHAR * getApiFileName();
void getWordArray(vector<generic_string> & wordArray, TCHAR *beginChars); void getWordArray(vector<generic_string> & wordArray, TCHAR *beginChars);
int isInBetween(int startPos, char endChar, int posToDetect);
}; };
#endif //AUTOCOMPLETION_H #endif //AUTOCOMPLETION_H