Commit Graph

14 Commits

Author SHA1 Message Date
Ivan Donchevskii
87762eb8ee ClangFormat: Fix the end offset for the reformat call
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>
2018-12-05 08:04:35 +00:00
Ivan Donchevskii
f1634df8b3 ClangFormat: Trim space-only lines to properly indent them
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>
2018-11-27 10:20:17 +00:00
Ivan Donchevskii
386535cf18 ClangFormat: Fix iteration through text blocks
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>
2018-11-27 10:20:09 +00:00
Ivan Donchevskii
e9d0083ccd ClangFormat: Do not format text but indent only
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>
2018-11-14 09:29:41 +00:00
Ivan Donchevskii
9a85ce88a7 ClangFormat: Use relevant settings for each file
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>
2018-11-14 09:29:30 +00:00
Ivan Donchevskii
0e5c7f51fa ClangFormat: Synchronize with C++ code style settings
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>
2018-11-08 14:23:06 +00:00
Ivan Donchevskii
0a29e12d0c ClangFormat: Fix text indentation after inserted snippet
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>
2018-11-08 14:19:01 +00:00
Ivan Donchevskii
918713a059 ClangFormat: Make more readable helper functions
Change-Id: I25828a17104a778d4be156bf2a2879cefbd08691
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-24 12:23:49 +00:00
Ivan Donchevskii
cafd5ced1a Clang: Significantly improve ClangFormat plugin usability
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>
2018-10-17 07:16:04 +00:00
Ivan Donchevskii
e0d7d03720 Clang: Fix ClangFormat build with clang-7
Change-Id: I0859b7aad1a49f8d46ee4b32cc32039cfa0b482b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-05 11:08:27 +00:00
Tobias Hunger
74813fba3a ClangFormat: Fix unused parameter warning
Change-Id: Ib2d46e88a236a8ac7706a9827535b664e9f08792
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-12 13:58:40 +00:00
Tobias Hunger
a5f63f4aa0 ClangFormat: Fix warnings about signed/unsigned int
Change-Id: I5cff5054d3440ee6fb0f262e6306ae525afa94c9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-12 13:58:33 +00:00
Tobias Hunger
5462527c0d ClangFormat: Fix warnings about fallthrough
Change-Id: Iaa2effe38153844552e2b1baa9d9d5336ed886ab
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-09-12 13:58:06 +00:00
Ivan Donchevskii
ca84a51f86 Clang: Use clang-format for indentation
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>
2018-09-12 07:59:30 +00:00