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

QmlJS: Disable unhelpful completion in imports.

Browse Source 
Change-Id: I06773d4f1e4805d9d611f520c0a5e63ff6b226c6
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
This commit is contained in:
Christian Kamm
2011-12-07 10:11:31 +01:00
parent d30196daf3
commit 23b5e1ce42
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmljseditor/qmljscompletionassist.cpp
View File

@@ -646,9 +646,14 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const IAssistInterface
return 0;
}
// currently path-in-stringliteral is the only completion available in imports
if (contextFinder.isInImport())
return 0;
// member "a.bc<complete>" or function "foo(<complete>" completion
else if (completionOperator == QLatin1Char('.')
|| (completionOperator == QLatin1Char('(') && !onIdentifier)) {
if (completionOperator == QLatin1Char('.')
|| (completionOperator == QLatin1Char('(') && !onIdentifier)) {
// Look at the expression under cursor.
//QTextCursor tc = textWidget->textCursor();
QTextCursor tc(qmlInterface->document());
@@ -699,8 +704,9 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const IAssistInterface
return createContentProposal();
return 0;
}
// global completion
else if (onIdentifier || assistInterface->reason() == ExplicitlyInvoked) {
if (onIdentifier || assistInterface->reason() == ExplicitlyInvoked) {
bool doGlobalCompletion = true;
bool doQmlKeywordCompletion = true;