feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: fix completion after forward-declared class

Browse Source 
Do not complete -> and . with global completions if
foo is a ptr/ref to forward-declared class.

Change-Id: I41e6745ffb07be1d973fe6a8132824f1b3bf7fb1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-06-02 15:23:18 +02:00
parent 821a2ad665
commit 9a0eca15c5
7 changed files with 87 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/tools/clangbackend/ipcsource/codecompleter.cpp
View File

@@ -56,6 +56,22 @@ CodeCompletions toCodeCompletions(const ClangCodeCompleteResults &results)
return codeCompletions;
}
void filterUnknownContextResults(ClangCodeCompleteResults &results,
const UnsavedFile &theUnsavedFile,
uint line,
uint column)
{
if (results.hasUnknownContext()) {
bool positionIsOk = false;
const uint position = theUnsavedFile.toUtf8Position(line, column - 1, &positionIsOk);
if (positionIsOk && (theUnsavedFile.hasCharacterAt(position, '.')
|| (theUnsavedFile.hasCharacterAt(position - 1, '-')
&& theUnsavedFile.hasCharacterAt(position, '>')))) {
results = {};
}
}
}
} // anonymous namespace
CodeCompleter::CodeCompleter(const TranslationUnit &translationUnit,
@@ -70,7 +86,7 @@ CodeCompletions CodeCompleter::complete(uint line, uint column)
neededCorrection_ = CompletionCorrection::NoCorrection;
ClangCodeCompleteResults results = completeHelper(line, column);
filterUnknownContextResults(results, unsavedFile(), line, column);
tryDotArrowCorrectionIfNoResults(results, line, column);
return toCodeCompletions(results);
@@ -139,6 +155,7 @@ ClangCodeCompleteResults CodeCompleter::completeWithArrowInsteadOfDot(uint line,
results = completeHelper(line, column + 1);
if (results.hasResults())
neededCorrection_ = CompletionCorrection::DotToArrowCorrection;
filterUnknownContextResults(results, unsavedFile(), line, column+1);
}
return results;