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

C++: Improve automatic quoting magic.

Browse Source 
Change-Id: I5d3a15dc100ae9c03bbc49de99714da1c89cb0d8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
David Schulz
2016-04-27 13:47:16 +02:00
parent 7595aaa227
commit 509c977f30
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libs/cplusplus/MatchingText.cpp
View File

@@ -102,9 +102,22 @@ static bool insertQuote(const QChar ch, const BackwardsScanner &tk)
const int index = tk.startToken() - 1; const int index = tk.startToken() - 1;
const Token &token = tk[index]; const Token &token = tk[index];
// Do not insert a matching quote when we are closing an open string/char literal.
return (ch == '"' && token.isStringLiteral() == isCompleteStringLiteral(tk, index)) // Insert an additional double quote after string literal only if previous literal was closed.
|| (ch == '\'' && token.isCharLiteral() == isCompleteCharLiteral(tk, index)); if (ch == '"' && token.isStringLiteral() && isCompleteStringLiteral(tk, index))
return true;
// Insert a matching quote after an operator.
if (token.isOperator())
return true;
if (token.isKeyword())
return tk.text(index) == "operator";
// Insert matching quote after identifier when identifier is a known literal prefixes
static const QStringList stringLiteralPrefixes = { "L", "U", "u", "u8", "R"};
return token.kind() == CPlusPlus::T_IDENTIFIER
&& stringLiteralPrefixes.contains(tk.text(index));
} }
static int countSkippedChars(const QString blockText, const QString &textToProcess) static int countSkippedChars(const QString blockText, const QString &textToProcess)