From 9982d48a92beb35525c50890ae3a96ece3cf8de1 Mon Sep 17 00:00:00 2001 From: Ilya Biryukov Date: Mon, 8 Jun 2020 19:20:10 +0300 Subject: [PATCH] Updates to the 'CLion Integration' section in ClangFormat docs This commit updates the 'CLion Integration' section in ClangFormat docs. Key changes: - clang-format is enabled automatically when there is a config file; - formatting now works for indentations; - if clang-format is enabled without a config file, CLion suggests creating it based on the IDE settings or uses the LLVM style by default. Patch by Marina Kalashina! Reviewers: sylvestre.ledru, ilya-biryukov Reviewed By: ilya-biryukov Subscribers: ilya-biryukov, klimek, MyDeveloperDay, sammccall, gribozavr2 Differential Revision: https://reviews.llvm.org/D80721 --- clang/docs/ClangFormat.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/clang/docs/ClangFormat.rst b/clang/docs/ClangFormat.rst index cc1ef38dbb9d..b09f48b0027b 100644 --- a/clang/docs/ClangFormat.rst +++ b/clang/docs/ClangFormat.rst @@ -176,13 +176,14 @@ CLion Integration ================= :program:`clang-format` is integrated into `CLion `_ as an alternative code formatter. It is disabled by default and -can be turned on in Settings/Preferences | Editor | Code Style. +.com/clion/>`_ as an alternative code formatter. CLion turns it on +automatically when there is a ``.clang-format`` file under the project root. +Code style rules are applied as you type, including indentation, +auto-completion, code generation, and refactorings. -If :program:`clang-format` support is enabled, CLion detects config files when -opening a project and suggests overriding the current IDE settings. Code style -rules from the ``.clang-format`` files are then applied automatically to all -editor actions, including auto-completion, code generation, and refactorings. +:program:`clang-format` can also be enabled without a ``.clang-format`` file. +In this case, CLion prompts you to create one based on the current IDE settings +or the default LLVM style. Visual Studio Integration