We do not build texteditor files in unit-tests so some tricks
were required to make ClangFormatIndenter available.
First simple unit-test proofs it builds and runs.
Change-Id: I81d5ea099bd27fd1c1ed8b5b7877299dcc62a67f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
clang-format has problems with unfinished () blocks.
In case when the first formatting try failed it makes sense
to try again after appending ')' to the end of the line.
In case it does not solve the initial issue it does not
make it worse anyways.
Examples where this approach helps:
if (a<press CR>
or
if (a <press CR>&& b
Change-Id: Iacc35af79a7b19c1d512d141423d7549788a1a22
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Fix-its do not follow the current formatting style therefore
apply indention/formatting by using indenter.
This change will work best when ClangFormat plugin is
enabled to not only reindent line but also format it.
Task-number: QTCREATORBUG-21448
Change-Id: I8bcafcf49f3118aff7840326547e7a24052469b2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
We want to have the results of the 'format' call in order to
have understanding what has changed and if the existing offsets
have to be adjusted.
One of the possible use cases is the formatting after fix-its.
If we apply several fix-its in the same file we need to know
after each of them if the further ones are affected and shift them.
Change-Id: I17e8f4dbcf6d36224ab7da9e11035cf3be3d3125
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
The intention was to add 200 lines to the current
position, not 200 characters.
Change-Id: I5b4de24077fc354611fdeba2d6747c239a3f9d5f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Do not add indentation to the existing spaces in the line
but trim the line first and then indent it as an empty line.
Change-Id: I0e95ab5e4550410e55abfb12362035751c47b0b3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Document might be edited between consecutive currentBlock.next()
calls which is unsafe. Let's instead operate with block numbers.
Fixes: QTCREATORBUG-21521
Change-Id: I6863a77a32f5583269e1c796f38afb45cc9e7f77
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Provide the separate infrastructure for the formatting
but use it only when QTC_FORMAT_INSTEAD_OF_INDENT is
provided in run environment.
Fixes: QTCREATORBUG-21447
Fixes: QTCREATORBUG-21459
Change-Id: I1ad6fe23f5de17016c0c7b18749c6977fc03a22b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Existing Clang Format settings may not follow the
project/global pattern but can be expected to be used
for the indentation/formatting.
So let's proceed with UI for global/project settings
but use global settings only if there's no configuration
found for the current file.
Change-Id: I87c25ab3feb7e2e3deb0290848088657783cf972
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
And remove UI for default code style settings because
it does not affect anything when ClangFormat plugin is
enabled.
Change-Id: Ie348b7d2691b09ea2b4868da987f2a27347ea0f3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Limit the range of text which is indented to the last
non-empty character inside the block.
Fixes: QTCREATORBUG-21385
Change-Id: If9bc271e7ecf81482cb682efd0f09770e6fa02f5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
What's new:
1. New LibFormat option is used to prevent lines shrink,
which allows to drop most of tricks used before for that purpose.
2. Cached UTF-8 source code is used to improve performance
3. Improved error handling.
4. Slightly improved UI.
Change-Id: I4605200fa103167369a40650b2e1ad2c61e8133b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This is the new experimental plugin based on LibFormat.
It replaces the default indenter for CppEditorDocument
and applies clang-format after the CR or the set of 'electric'
characters.
Uses the global .clang-format kept in QtC settings or
the one for current project. Both can be configured.
For indentation some style modifications and code manipulations
are done to prevent line shrinking when it's not expected.
Manual indentation uses unmodified style from .clang-format file.
Change-Id: I6279b805e418e1804b553efa615f5c843f395a58
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
