diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-10-24 12:29:21 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-10-24 13:49:48 +0200 |
| commit | 7aa075c71bfed21eb201ca4fec4b4099d18a3902 (patch) | |
| tree | bda69592be94b897871d58182b90ecfda7d3e7b1 /src/plugins/qmljseditor | |
| parent | 09cf26eb24a52772155c01f7c2b8797af437f4a1 (diff) | |
| download | qt-creator-7aa075c71bfed21eb201ca4fec4b4099d18a3902.tar.gz | |
QmlJS: Remove soft assert that could trigger for multi-line strings.
Change-Id: I54f451677d78d6aefe0f567888b9bbcec426fc72
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Diffstat (limited to 'src/plugins/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/qmljscompletionassist.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index c25f0077a3..67daa0d8be 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -571,9 +571,15 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const IAssistInterface QmlExpressionUnderCursor expressionUnderCursor; expressionUnderCursor(tc); QString literalText = expressionUnderCursor.text(); - QTC_ASSERT(!literalText.isEmpty() && ( - literalText.at(0) == QLatin1Char('"') - || literalText.at(0) == QLatin1Char('\'')), return 0); + + // expression under cursor only looks at one line, so multi-line strings + // 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); if (contextFinder.isInImport()) { |