ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhanced tab auto complete for _functions

This commit is contained in:
Thomas Jentzsch 2021-05-08 10:35:37 +02:00
parent 96f42e1a6d
commit 023882b423
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/bspf.hxx
View File

@ -281,18 +281,20 @@ namespace BSPF
// (case sensitive for upper case characters in second string, except first one) // (case sensitive for upper case characters in second string, except first one)
// - the first character must match // - the first character must match
// - the following characters must appear in the order of the first string // - the following characters must appear in the order of the first string
inline bool matches(const string_view s1, const string_view s2) inline bool matchesCamelCase(const string_view s1, const string_view s2)
{ {
if(startsWithIgnoreCase(s1, s2.substr(0, 1))) // skip leading '_' for matching
{ uInt32 ofs = (s1[0] == '_' && s2[0] == '_') ? 1 : 0;
size_t pos = 1;
size_t lastUpper = 0;
for(uInt32 j = 1; j < s2.size(); ++j) if(startsWithIgnoreCase(s1.substr(ofs), s2.substr(ofs, 1)))
{
size_t lastUpper = ofs, pos = 1;
for(uInt32 j = 1 + ofs; j < s2.size(); ++j)
{ {
if(std::isupper(s2[j])) if(std::isupper(s2[j]))
{ {
size_t found = s1.find_first_of(s2[j], pos); size_t found = s1.find_first_of(s2[j], pos + ofs);
if(found == string::npos) if(found == string::npos)
return false; return false;
@ -306,7 +308,7 @@ namespace BSPF
} }
else else
{ {
size_t found = findIgnoreCase(s1, s2.substr(j, 1), pos); size_t found = findIgnoreCase(s1, s2.substr(j, 1), pos + ofs);
if(found == string::npos) if(found == string::npos)
return false; return false;

2
src/debugger/CartDebug.cxx
View File

@ -1509,7 +1509,7 @@ void CartDebug::getCompletions(const char* in, StringList& completions) const
for(const auto& iter: myUserAddresses) for(const auto& iter: myUserAddresses)
{ {
const char* l = iter.first.c_str(); const char* l = iter.first.c_str();
if(BSPF::matches(l, in)) if(BSPF::matchesCamelCase(l, in))
completions.push_back(l); completions.push_back(l);
} }
} }

4
src/debugger/Debugger.cxx
View File

@ -893,12 +893,12 @@ void Debugger::getCompletions(const char* in, StringList& list) const
for(const auto& iter : myFunctions) for(const auto& iter : myFunctions)
{ {
const char* l = iter.first.c_str(); const char* l = iter.first.c_str();
if(BSPF::matches(l, in)) if(BSPF::matchesCamelCase(l, in))
list.push_back(l); list.push_back(l);
} }
for(const auto& reg: ourPseudoRegisters) for(const auto& reg: ourPseudoRegisters)
if(BSPF::matches(reg.name, in)) if(BSPF::matchesCamelCase(reg.name, in))
list.push_back(reg.name); list.push_back(reg.name);
} }
} }

2
src/debugger/DebuggerParser.cxx
View File

@ -180,7 +180,7 @@ void DebuggerParser::getCompletions(const char* in, StringList& completions) con
// cerr << "Attempting to complete \"" << in << "\"" << endl; // cerr << "Attempting to complete \"" << in << "\"" << endl;
for(const auto& c: commands) for(const auto& c: commands)
{ {
if(BSPF::matches(c.cmdString, in)) if(BSPF::matchesCamelCase(c.cmdString, in))
completions.push_back(c.cmdString); completions.push_back(c.cmdString);
} }
} }