Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix auto-insert bug

Browse Source 
Fix #6078, fix #7733, close #7742
This commit is contained in:
Don HO 2019-12-15 03:16:34 +01:00
parent 62622afaeb
commit 1929cce416
No known key found for this signature in database
GPG Key ID: 6C429F1D8D84F46E
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,6 +555,7 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
bool isCharPrevBlank = (charPrev == ' ' || charPrev == '\t' || charPrev == '\n' || charPrev == '\r' || charPrev == '\0'); bool isCharPrevBlank = (charPrev == ' ' || charPrev == '\t' || charPrev == '\n' || charPrev == '\r' || charPrev == '\0');
int docLen = _pEditView->getCurrentDocLen(); int docLen = _pEditView->getCurrentDocLen();
bool isCharNextBlank = (charNext == ' ' || charNext == '\t' || charNext == '\n' || charNext == '\r' || caretPos == docLen); bool isCharNextBlank = (charNext == ' ' || charNext == '\t' || charNext == '\n' || charNext == '\r' || caretPos == docLen);
bool isCharNextCloseSymbol = (charNext == ')' || charNext == ']' || charNext == '}');
bool isInSandwich = (charPrev == '(' && charNext == ')') || (charPrev == '[' && charNext == ']') || (charPrev == '{' && charNext == '}'); bool isInSandwich = (charPrev == '(' && charNext == ')') || (charPrev == '[' && charNext == ']') || (charPrev == '{' && charNext == '}');
// User defined matched pairs should be checked firstly // User defined matched pairs should be checked firstly
@ -582,8 +583,7 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
case int('('): case int('('):
if (matchedPairConf._doParentheses) if (matchedPairConf._doParentheses)
{ {
if (isCharNextBlank || isInSandwich) if (isCharNextBlank || isCharNextCloseSymbol)
{ {
matchedChars = ")"; matchedChars = ")";
_insertedMatchedChars.add(MatchedCharInserted(static_cast<char>(character), caretPos - 1)); _insertedMatchedChars.add(MatchedCharInserted(static_cast<char>(character), caretPos - 1));
@ -594,7 +594,7 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
case int('['): case int('['):
if (matchedPairConf._doBrackets) if (matchedPairConf._doBrackets)
{ {
if (isCharNextBlank || isInSandwich) if (isCharNextBlank || isCharNextCloseSymbol)
{ {
matchedChars = "]"; matchedChars = "]";
_insertedMatchedChars.add(MatchedCharInserted(static_cast<char>(character), caretPos - 1)); _insertedMatchedChars.add(MatchedCharInserted(static_cast<char>(character), caretPos - 1));
@ -605,7 +605,7 @@ void AutoCompletion::insertMatchedChars(int character, const MatchedPairConf & m
case int('{'): case int('{'):
if (matchedPairConf._doCurlyBrackets) if (matchedPairConf._doCurlyBrackets)
{ {
if (isCharNextBlank || isInSandwich) if (isCharNextBlank || isCharNextCloseSymbol)
{ {
matchedChars = "}"; matchedChars = "}";
_insertedMatchedChars.add(MatchedCharInserted(static_cast<char>(character), caretPos - 1)); _insertedMatchedChars.add(MatchedCharInserted(static_cast<char>(character), caretPos - 1));