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

Fixed issue with s.Cat( assist

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8513 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-06-06 11:40:30 +00:00
commit da30c53630
2 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
uppsrc/ide/Assist.cpp
View file

@ -265,6 +265,8 @@ Vector<String> AssistEditor::ReadBack(int q)
continue;
}
else {
// if(findarg(c, '(', '[', '{') >= 0)
// break;
if(c == ']') {
if(wasid)
break;
@ -438,19 +440,12 @@ void AssistEditor::Assist()
thisback = false;
LTIMING("Assist2");
if(Ch(q - 1) == '(') {
--q;
String id = IdBack(q);
if(id == "THISBACK") {
int qq = q - 1;
String id = IdBack(qq);
int tn = findarg(id, "THISBACK", "THISBACK1", "THISBACK2", "THISBACK3", "THISBACK4");
if(tn >= 0) {
thisback = true;
thisbackn = false;
GatherItems(parser.current_scope, false, in_types, false);
RemoveDuplicates();
PopUpAssist();
return;
}
if(id == "THISBACK1" || id == "THISBACK2" || id == "THISBACK3" || id == "THISBACK4") {
thisback = true;
thisbackn = true;
thisbackn = tn > 0;
GatherItems(parser.current_scope, false, in_types, false);
RemoveDuplicates();
PopUpAssist();