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

QmlJS editor: Fix automatic quote insertion.

Browse Source 
The new multiline string literals mixed things up.

Task-number: QTCREATORBUG-3244
Reviewed-by: Roberto Raggi
This commit is contained in:
Christian Kamm
2010-12-01 12:00:01 +01:00
parent da308b1f0f
commit dfedba3074
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ using namespace QmlJS;
static int blockStartState(const QTextBlock &block)
{
int state = block.userState();
int state = block.previous().userState();
if (state == -1)
return 0;
@@ -181,7 +181,15 @@ bool AutoCompleter::contextAllowsAutoParentheses(const QTextCursor &cursor,
case Token::String: {
const QString blockText = cursor.block().text();
const QStringRef tokenText = blockText.midRef(token.offset, token.length);
const QChar quote = tokenText.at(0);
QChar quote = tokenText.at(0);
// if a string literal doesn't start with a quote, it must be multiline
if (quote != QLatin1Char('"') && quote != QLatin1Char('\'')) {
const int startState = blockStartState(cursor.block());
if (startState == Scanner::MultiLineStringDQuote)
quote = QLatin1Char('"');
else if (startState == Scanner::MultiLineStringSQuote)
quote = QLatin1Char('\'');
}
// never insert ' into string literals, it adds spurious ' when writing contractions
if (ch == QLatin1Char('\''))