From fc43fb477b44cc11842bf45af14d46385aa55442 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 21 Feb 2017 15:00:26 +0100 Subject: C++: Do not add double quotes when splitting raw string litterals Task-number: QTCREATORBUG-17717 Change-Id: Iffb34a3d77ada624dc13b8ab050ac08731d25863 Reviewed-by: Nikolai Kosjar --- src/libs/cplusplus/MatchingText.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libs/cplusplus/MatchingText.cpp') diff --git a/src/libs/cplusplus/MatchingText.cpp b/src/libs/cplusplus/MatchingText.cpp index 6a426ee468..73a3df4b5b 100644 --- a/src/libs/cplusplus/MatchingText.cpp +++ b/src/libs/cplusplus/MatchingText.cpp @@ -237,7 +237,7 @@ bool MatchingText::isInCommentHelper(const QTextCursor &cursor, Token *retToken) return tk.isComment(); } -bool MatchingText::isInStringHelper(const QTextCursor &cursor) +Kind MatchingText::stringKindAtCursor(const QTextCursor &cursor) { int prevState = 0; const Tokens tokens = getTokens(cursor, prevState); @@ -245,15 +245,15 @@ bool MatchingText::isInStringHelper(const QTextCursor &cursor) const unsigned pos = cursor.selectionEnd() - cursor.block().position(); if (tokens.isEmpty() || pos <= tokens.first().utf16charsBegin()) - return false; + return T_EOF_SYMBOL; if (pos >= tokens.last().utf16charsEnd()) { const Token tk = tokens.last(); - return tk.isStringLiteral() && prevState > 0; + return tk.isStringLiteral() && prevState > 0 ? tk.kind() : T_EOF_SYMBOL; } Token tk = tokenAtPosition(tokens, pos); - return tk.isStringLiteral() && pos > tk.utf16charsBegin(); + return tk.isStringLiteral() && pos > tk.utf16charsBegin() ? tk.kind() : T_EOF_SYMBOL; } QString MatchingText::insertMatchingBrace(const QTextCursor &cursor, const QString &textToProcess, -- cgit v1.2.1