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

C++: Fine-tune auto insertion of '}'

Browse Source 
Do not insert for these cases:
 * <Cursor>{
 * namespace X <Cursor>
 * if the next block is indented, like e.g.:
     if (e) <Cursor>
        g();
 * on empty line if text before looks like a finished statement or
   scope opening/end

Change-Id: Id9decc1e964a775724a929c2a3e79b5283105560
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2017-07-17 12:57:23 +02:00
parent 2c9feb1f4b
commit a6aa287720
6 changed files with 343 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/texteditor/autocompleter.cpp
View File

@@ -150,6 +150,24 @@ bool AutoCompleter::isQuote(const QString &text)
return text == QLatin1String("\"") || text == QLatin1String("'");
}
bool AutoCompleter::isNextBlockIndented(const QTextBlock &currentBlock) const
{
QTextBlock block = currentBlock;
int indentation = m_tabSettings.indentationColumn(block.text());
if (block.next().isValid()) { // not the last block
block = block.next();
//skip all empty blocks
while (block.isValid() && m_tabSettings.onlySpace(block.text()))
block = block.next();
if (block.isValid()
&& m_tabSettings.indentationColumn(block.text()) > indentation)
return true;
}
return false;
}
QString AutoCompleter::replaceSelection(QTextCursor &cursor, const QString &textToInsert) const
{
if (!cursor.hasSelection())
@@ -301,17 +319,8 @@ int AutoCompleter::paragraphSeparatorAboutToBeInserted(QTextCursor &cursor)
if (condition) {|
statement;
*/
int indentation = m_tabSettings.indentationColumn(block.text());
if (block.next().isValid()) { // not the last block
block = block.next();
//skip all empty blocks
while (block.isValid() && m_tabSettings.onlySpace(block.text()))
block = block.next();
if (block.isValid()
&& m_tabSettings.indentationColumn(block.text()) > indentation)
return 0;
}
if (isNextBlockIndented(block))
return 0;
const QString &textToInsert = insertParagraphSeparator(cursor);
int pos = cursor.position();