0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI2/Lua Console: use static vector for constant tab match values

Browse source
This commit is contained in:
Charles Dang 2017-05-06 14:50:13 +11:00
parent bf60a0a209
commit 7d68b4ffba
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/gui/dialogs/lua_interpreter.cpp
View file

@ -593,27 +593,31 @@ void lua_interpreter::controller::tab()
text = text.substr(prefix_end_pos + 1);
}
static std::vector<std::string> static_matches {
"and",
"break",
"else",
"elseif",
"end",
"false",
"for",
"function",
"local",
"nil",
"not",
"repeat",
"return",
"then",
"true",
"until",
"while"
};
std::vector<std::string> matches;
if (text.find('.') == std::string::npos) {
matches = lua_model_->get_globals();
matches.push_back("and");
matches.push_back("break");
matches.push_back("else");
matches.push_back("elseif");
matches.push_back("end");
matches.push_back("false");
matches.push_back("for");
matches.push_back("function");
matches.push_back("local");
matches.push_back("nil");
matches.push_back("not");
matches.push_back("repeat");
matches.push_back("return");
matches.push_back("then");
matches.push_back("true");
matches.push_back("until");
matches.push_back("while");
matches.insert(matches.end(), static_matches.begin(), static_matches.end());
} else {
matches = lua_model_->get_attribute_names(text);
}