From: Sylvestre Ledru <sylvestre@debian.org>
Date: Wed, 3 Apr 2019 08:56:30 +0000 (+0000)
Subject: Adding 'CLion integration' to clang-format doc
X-Git-Tag: llvmorg-10-init~8600
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=acab05feeeb591b0c3fd265be80e0a01c57f15d8;p=platform%2Fupstream%2Fllvm.git

Adding 'CLion integration' to clang-format doc

Summary:
This commit adds a chapter 'CLion integration' to ClangFormat.rst.
The official announcement of clang-format support in CLion 2019.1: https://blog.jetbrains.com/clion/2019/03/clion-2019-1-embedded-dev-clangformat-memory-view/

Patch by Marina Kalashina

Reviewers: djasper, sylvestre.ledru, krasimir

Reviewed By: sylvestre.ledru

Subscribers: jdoerfert, cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D60115

llvm-svn: 357566
---

diff --git a/clang/docs/ClangFormat.rst b/clang/docs/ClangFormat.rst
index 4a448c0..c1347f3 100644
--- a/clang/docs/ClangFormat.rst
+++ b/clang/docs/ClangFormat.rst
@@ -165,6 +165,19 @@ menu item by renaming the script, and can assign the menu item a keyboard
 shortcut in the BBEdit preferences, under Menus & Shortcuts.
 
 
+CLion Integration
+==================
+
+:program:`clang-format` is integrated into `CLion <https://www.jetbrains
+.com/clion/>`_ as an alternative code formatter. It is disabled by default and
+can be turned on in Settings/Preferences | Editor | Code Style.
+
+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.
+
+
 Visual Studio Integration
 =========================