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

CppEditor: Use MatchingText instead of CppAutoCompleter.

Browse Source 
Change-Id: Ice517c21e47a50c56fac9d1513bf70b59593cf01
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
David Schulz
2016-04-19 11:17:12 +02:00
parent 42ed3b44c8
commit 30719398b9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -70,6 +70,7 @@
#include <cplusplus/ASTPath.h>
#include <cplusplus/FastPreprocessor.h>
#include <cplusplus/MatchingText.h>
#include <utils/qtcassert.h>
#include <QAction>
@@ -621,7 +622,7 @@ bool CppEditorWidget::handleStringSplitting(QKeyEvent *e) const
if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
QTextCursor cursor = textCursor();
if (autoCompleter()->isInString(cursor)) {
if (CPlusPlus::MatchingText::isInStringHelper(cursor)) {
cursor.beginEditBlock();
if (cursor.positionInBlock() > 0
&& cursor.block().text().at(cursor.positionInBlock() - 1) == QLatin1Char('\\')) {