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

Fix Javascript not working regression in Function list since 2016

Browse Source 
due to 2 commits:
5d438aa
fb189fa
This commit is contained in:
Don HO 2018-04-09 00:35:53 +02:00
parent 01cfe5d083
commit 985fa654b9
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,8 +324,8 @@ void FunctionListPanel::reload()
Buffer* currentBuf = (*_ppEditView)->getCurrentBuffer(); Buffer* currentBuf = (*_ppEditView)->getCurrentBuffer();
const TCHAR *fn = currentBuf->getFileName(); const TCHAR *fn = currentBuf->getFileName();
LangType langID = currentBuf->getLangType(); LangType langID = currentBuf->getLangType();
if (langID == L_JAVASCRIPT) if (langID == L_JS)
langID = L_JS; langID = L_JAVASCRIPT;
const TCHAR *udln = NULL; const TCHAR *udln = NULL;
if (langID == L_USER) if (langID == L_USER)
@ -343,25 +343,7 @@ void FunctionListPanel::reload()
for (size_t i = 0, len = _foundFuncInfos.size(); i < len; ++i) for (size_t i = 0, len = _foundFuncInfos.size(); i < len; ++i)
{ {
// no 2 levels addEntry(_foundFuncInfos[i]._data2.c_str(), _foundFuncInfos[i]._data.c_str(), _foundFuncInfos[i]._pos);
/*
bool b = false;
if (b)
{
generic_string entryName = TEXT("");
if (!_foundFuncInfos[i]._data2.empty())
{
entryName = _foundFuncInfos[i]._data2;
entryName += TEXT("=>");
}
entryName += _foundFuncInfos[i]._data;
addEntry(NULL, entryName.c_str(), _foundFuncInfos[i]._pos);
}
else
*/
{
addEntry(_foundFuncInfos[i]._data2.c_str(), _foundFuncInfos[i]._data.c_str(), _foundFuncInfos[i]._pos);
}
} }
HTREEITEM root = _treeView.getRoot(); HTREEITEM root = _treeView.getRoot();