github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

theide: Include assist improved

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3380 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2011-04-27 16:45:18 +00:00
commit d76085512f
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/ide/Assist.cpp
View file

@ -105,7 +105,7 @@ void AssistEditor::CloseAssist()
bool isincludefnchar(int c)
{
return c && c != '<' && c != '>' && c != '?' &&
c != ' ' && c != '\"' && c != '/' && c != '\\' && c != '\n';
c != ' ' && c != '\"' && c != '/' && c != '\\' && c != '\n' && c < 65536;
}
String AssistEditor::ReadIdBack(int q, bool include)
@ -720,12 +720,13 @@ bool AssistEditor::Key(dword key, int count)
int bcc = c > 0 ? GetChar(c - 1) : 0;
bool b = CodeEditor::Key(key, count);
if(assist.IsOpen()) {
if(!iscid(key) &&
!(iscid(cc) && (key == K_DELETE || key == K_RIGHT)) &&
!(iscid(bcc) && (key == K_LEFT || key == K_BACKSPACE))) {
bool (*test)(int c) = include_assist ? isincludefnchar : iscid;
if(!(*test)(key) &&
!((*test)(cc) && (key == K_DELETE || key == K_RIGHT)) &&
!((*test)(bcc) && (key == K_LEFT || key == K_BACKSPACE))) {
if(b) {
CloseAssist();
if(key == '.')
if(include_assist ? (key == '/' || key == '\\') : key == '.')
Assist();
}
}