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

QmlJS: Remove soft assert that could trigger for multi-line strings.

Browse Source 
Change-Id: I54f451677d78d6aefe0f567888b9bbcec426fc72
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Christian Kamm
2011-10-24 12:29:21 +02:00
parent 09cf26eb24
commit 7aa075c71b
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

@@ -571,9 +571,15 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const IAssistInterface
QmlExpressionUnderCursor expressionUnderCursor; QmlExpressionUnderCursor expressionUnderCursor;
expressionUnderCursor(tc); expressionUnderCursor(tc);
QString literalText = expressionUnderCursor.text(); QString literalText = expressionUnderCursor.text();
QTC_ASSERT(!literalText.isEmpty() && (
literalText.at(0) == QLatin1Char('"') // expression under cursor only looks at one line, so multi-line strings
|| literalText.at(0) == QLatin1Char('\'')), return 0); // are handled incorrectly and are recognizable by don't starting with ' or "
if (!literalText.isEmpty()
&& literalText.at(0) != QLatin1Char('"')
&& literalText.at(0) != QLatin1Char('\'')) {
return 0;
}
literalText = literalText.mid(1); literalText = literalText.mid(1);
if (contextFinder.isInImport()) { if (contextFinder.isInImport()) {