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

[BUG_FIXED] Fix the class border determination problem (while open/close symbols are in the comment zone) in function list feature.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1153 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2013-11-29 17:44:11 +00:00
parent 80a672009e
commit 6e45308b79
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PowerEditor/src/WinControls/FunctionList/functionParser.cpp
View File

@ -433,7 +433,7 @@ bool FunctionParsersManager::parse(std::vector<foundInfo> & foundInfos, const As
return true; return true;
} }
size_t FunctionZoneParser::getBodyClosePos(size_t begin, const TCHAR *bodyOpenSymbol, const TCHAR *bodyCloseSymbol, ScintillaEditView **ppEditView) size_t FunctionZoneParser::getBodyClosePos(size_t begin, const TCHAR *bodyOpenSymbol, const TCHAR *bodyCloseSymbol, const std::vector< std::pair<int, int> > & commentZones, ScintillaEditView **ppEditView)
{ {
size_t cntOpen = 1; size_t cntOpen = 1;
@ -461,15 +461,19 @@ size_t FunctionZoneParser::getBodyClosePos(size_t begin, const TCHAR *bodyOpenSy
{ {
targetEnd = int((*ppEditView)->execute(SCI_GETTARGETEND)); targetEnd = int((*ppEditView)->execute(SCI_GETTARGETEND));
// Now we determinate the symbol (open or close) // Treat it only if it's NOT in the comment zone
int tmpStart = (*ppEditView)->searchInTarget(bodyOpenSymbol, lstrlen(bodyOpenSymbol), targetStart, targetEnd); if (!isInZones(targetStart, commentZones))
if (tmpStart != -1 && tmpStart != -2) // open symbol found
{ {
++cntOpen; // Now we determinate the symbol (open or close)
} int tmpStart = (*ppEditView)->searchInTarget(bodyOpenSymbol, lstrlen(bodyOpenSymbol), targetStart, targetEnd);
else // if it's not open symbol, then it must be the close one if (tmpStart != -1 && tmpStart != -2) // open symbol found
{ {
--cntOpen; ++cntOpen;
}
else // if it's not open symbol, then it must be the close one
{
--cntOpen;
}
} }
} }
else // nothing found else // nothing found
@ -508,7 +512,7 @@ void FunctionZoneParser::classParse(vector<foundInfo> & foundInfos, vector< pair
if (_openSymbole != TEXT("") && _closeSymbole != TEXT("")) if (_openSymbole != TEXT("") && _closeSymbole != TEXT(""))
{ {
targetEnd = getBodyClosePos(targetEnd, _openSymbole.c_str(), _closeSymbole.c_str(), ppEditView); targetEnd = getBodyClosePos(targetEnd, _openSymbole.c_str(), _closeSymbole.c_str(), commentZones, ppEditView);
} }
if (targetEnd > int(end)) //we found a result but outside our range, therefore do not process it if (targetEnd > int(end)) //we found a result but outside our range, therefore do not process it

2
PowerEditor/src/WinControls/FunctionList/functionParser.h
View File

@ -79,7 +79,7 @@ private:
generic_string _closeSymbole; generic_string _closeSymbole;
generic_string _functionExpr; generic_string _functionExpr;
size_t getBodyClosePos(size_t begin, const TCHAR *bodyOpenSymbol, const TCHAR *bodyCloseSymbol, ScintillaEditView **ppEditView); size_t getBodyClosePos(size_t begin, const TCHAR *bodyOpenSymbol, const TCHAR *bodyCloseSymbol, const std::vector< std::pair<int, int> > & commentZones, ScintillaEditView **ppEditView);
}; };