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

Enhance auto-insert for parenthesis, bracket and Braces 

Enhance auto-insert behaviour for parenthesis, bracket and Braces inside
of
parenthesis, bracket or Braces.
This commit is contained in:
Don Ho 2015-10-14 20:38:12 +02:00
parent 2c80fc3018
commit 6571731236
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,7 +504,7 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
bool isCharPrevBlank = (charPrev == ' ' || charPrev == '\t' || charPrev == '\n' || charPrev == '\r' || charPrev == '\0');
int docLen = _pEditView->getCurrentDocLen();
bool isCharNextBlank = (charNext == ' ' || charNext == '\t' || charNext == '\n' || charNext == '\r' || caretPos == docLen);
bool isInSandwich = (charPrev == '(' && charNext == ')') || (charPrev == '[' && charNext == ']') || (charPrev == '{' && charNext == '}');
// User defined matched pairs should be checked firstly
for (size_t i = 0, len = matchedPairs.size(); i < len; ++i)
@ -531,7 +531,8 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
case int('('):
if (matchedPairConf._doParentheses)
{
if (isCharNextBlank)
if (isCharNextBlank || isInSandwich)
{
matchedChars = ")";
_insertedMatchedChars.add(MatchedCharInserted(char(character), caretPos - 1));
@ -542,7 +543,7 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
case int('['):
if (matchedPairConf._doBrackets)
{
if (isCharNextBlank)
if (isCharNextBlank || isInSandwich)
{
matchedChars = "]";
_insertedMatchedChars.add(MatchedCharInserted(char(character), caretPos - 1));
@ -553,7 +554,7 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
case int('{'):
if (matchedPairConf._doCurlyBrackets)
{
if (isCharNextBlank)
if (isCharNextBlank || isInSandwich)
{
matchedChars = "}";
_insertedMatchedChars.add(MatchedCharInserted(char(character), caretPos - 1));
@ -575,10 +576,10 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
}
}
if ((isCharPrevBlank && isCharNextBlank) ||
(charPrev == '(' && charNext == ')') || (charPrev == '(' && isCharNextBlank) || (isCharPrevBlank && charNext == ')') ||
(charPrev == '[' && charNext == ']') || (charPrev == '[' && isCharNextBlank) || (isCharPrevBlank && charNext == ']') ||
(charPrev == '{' && charNext == '}') || (charPrev == '{' && isCharNextBlank) || (isCharPrevBlank && charNext == '}'))
if ((isCharPrevBlank && isCharNextBlank) || isInSandwich ||
(charPrev == '(' && isCharNextBlank) || (isCharPrevBlank && charNext == ')') ||
(charPrev == '[' && isCharNextBlank) || (isCharPrevBlank && charNext == ']') ||
(charPrev == '{' && isCharNextBlank) || (isCharPrevBlank && charNext == '}'))
{
matchedChars = "\"";
_insertedMatchedChars.add(MatchedCharInserted(char(character), caretPos - 1));
@ -599,10 +600,10 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
}
}
if ((isCharPrevBlank && isCharNextBlank) ||
(charPrev == '(' && charNext == ')') || (charPrev == '(' && isCharNextBlank) || (isCharPrevBlank && charNext == ')') ||
(charPrev == '[' && charNext == ']') || (charPrev == '[' && isCharNextBlank) || (isCharPrevBlank && charNext == ']') ||
(charPrev == '{' && charNext == '}') || (charPrev == '{' && isCharNextBlank) || (isCharPrevBlank && charNext == '}'))
if ((isCharPrevBlank && isCharNextBlank) || isInSandwich ||
(charPrev == '(' && isCharNextBlank) || (isCharPrevBlank && charNext == ')') ||
(charPrev == '[' && isCharNextBlank) || (isCharPrevBlank && charNext == ']') ||
(charPrev == '{' && isCharNextBlank) || (isCharPrevBlank && charNext == '}'))
{
matchedChars = "'";
_insertedMatchedChars.add(MatchedCharInserted(char(character), caretPos - 1));