From 2f0e30c15030098bd13342081249509bc45405ea Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 23 Mar 2010 16:06:00 +0100 Subject: [PATCH] Fixed #import completion to act the same as #include completion. --- src/libs/cplusplus/SimpleLexer.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp index 0dd83585c4f..94be6331476 100644 --- a/src/libs/cplusplus/SimpleLexer.cpp +++ b/src/libs/cplusplus/SimpleLexer.cpp @@ -156,6 +156,10 @@ QList SimpleLexer::operator()(const QString &text, int state) else if (inPreproc && tokens.size() == 1 && simpleTk.is(T_IDENTIFIER) && simpleTk.text() == QLatin1String("include")) lex.setScanAngleStringLiteralTokens(true); + else if (_objCEnabled + && inPreproc && tokens.size() == 1 && simpleTk.is(T_IDENTIFIER) && + simpleTk.text() == QLatin1String("import")) + lex.setScanAngleStringLiteralTokens(true); if (_objCEnabled && tk.is(T_IDENTIFIER)) simpleTk.f._objcTypeQualifier = (classifyObjectiveCContextKeyword(firstChar + tk.offset, tk.f.length) != Token_identifier);