github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-19 22:04:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Fixed ALT+I issue with empty result #1213

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8922 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-09-14 11:36:28 +00:00
parent f1229a5e6b
commit 8bb314e412
4 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Core.h
View file

@ -80,7 +80,7 @@
#endif //PLATFORM_POSIX
#ifdef PLATFORM_POSIX
#define LOFF_T_ off_t
#define LOFF_T_ off_t
#define LSEEK64_ lseek
#define FTRUNCATE64_ ftruncate
#endif

2
uppsrc/CppBase/Pre.cpp
View file

@ -66,7 +66,7 @@ SrcFile PreProcess(Stream& in, Parser& parser) // This is not really C preproces
if(s[0] == 'd' && s[1] == 'e' && s[2] == 'f' &&
s[3] == 'i' && s[4] == 'n' && s[5] == 'e' && !iscid(s[6])) {
s += 6;
while(*s == ' ') s++;
while(*s == ' ' || *s == '\t') s++;
String macro;
while(iscid(*s))
macro.Cat(*s++);

2
uppsrc/ide/DCopy.cpp
View file

@ -81,7 +81,7 @@ void AssistEditor::DCopy()
for(int i = 0; i < id.GetCount(); i++)
r << "\tvoid " << id[i] << "();\n";
}
else
else
for(int i = 0; i < cpp.GetCount(); i++) {
const Array<CppItem>& n = cpp[i];
bool decl = decla;

3
uppsrc/ide/Goto.cpp
View file

@ -243,8 +243,7 @@ bool Ide::SwapSIf(const char *cref)
if(q < 0)
return false;
const Array<CppItem>& nn = CodeBase()[q];
// String qitem = QualifyKey(CodeBase(), p.current_scope, p.current_key, p.context.namespace_using);
if(cref && MakeCodeRef(p.current_scope, p.current_key) != cref)
if(cref && MakeCodeRef(p.current_scope, p.current_key) != cref || IsNull(p.current_name))
return false;
Vector<const CppItem *> n;
bool destructor = p.current_key.Find('~') >= 0;