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

[NEW_FEATURE] Smart Indent (in progress).

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1293 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2014-11-18 00:17:33 +00:00
parent 22c70653a0
commit a509210cdc
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PowerEditor/src/Notepad_plus.cpp
View File

@ -2302,7 +2302,7 @@ int Notepad_plus::findMachedBracePos(size_t startPos, size_t endPos, char target
if (startPos > endPos) // backward if (startPos > endPos) // backward
{ {
for (size_t i = startPos; i > endPos; --i) for (size_t i = startPos; i >= endPos; --i)
{ {
char aChar = (char)_pEditView->execute(SCI_GETCHARAT, i); char aChar = (char)_pEditView->execute(SCI_GETCHARAT, i);
if (aChar == targetSymbol) if (aChar == targetSymbol)
@ -2355,7 +2355,7 @@ void Notepad_plus::maintainIndentation(TCHAR ch)
int curPos = _pEditView->execute(SCI_GETCURRENTPOS); int curPos = _pEditView->execute(SCI_GETCURRENTPOS);
UCHAR nextChar = (UCHAR)_pEditView->execute(SCI_GETCHARAT, curPos); UCHAR nextChar = (UCHAR)_pEditView->execute(SCI_GETCHARAT, curPos);
if (prevChar == '{')// && c++ java, c# js php) if (prevChar == '{')
{ {
if (nextChar == '}') if (nextChar == '}')
{ {
@ -2404,8 +2404,27 @@ void Notepad_plus::maintainIndentation(TCHAR ch)
if (prevLine >= 0) if (prevLine >= 0)
{ {
indentAmountPrevLine = _pEditView->getLineIndent(prevLine); indentAmountPrevLine = _pEditView->getLineIndent(prevLine);
int startPos = _pEditView->execute(SCI_POSITIONFROMLINE, prevLine);
int endPos = _pEditView->execute(SCI_GETLINEENDPOSITION, prevLine);
_pEditView->execute(SCI_SETSEARCHFLAGS, SCFIND_REGEXP | SCFIND_POSIX);
_pEditView->execute(SCI_SETTARGETSTART, startPos);
_pEditView->execute(SCI_SETTARGETEND, endPos);
const char braceExpr[] = "[ \t]*\\{.*";
int posFound = _pEditView->execute(SCI_SEARCHINTARGET, strlen(braceExpr), (LPARAM)braceExpr);
if (posFound != -1 && posFound != -2)
{
int end = int(_pEditView->execute(SCI_GETTARGETEND));
if (end == endPos)
indentAmountPrevLine += tabWidth;
}
} }
_pEditView->setLineIndent(curLine, indentAmountPrevLine);
if (indentAmountPrevLine)
_pEditView->setLineIndent(curLine, indentAmountPrevLine);
} }
else if (ch == '}') else if (ch == '}')
{ {