From d519c8330ab7eda9c1c59f7c79727cde086ca21f Mon Sep 17 00:00:00 2001
From: Martin Trojer <mtrojer@fb.com>
Date: Thu, 10 Sep 2020 02:29:31 -0700
Subject: [PATCH] [FCP] merge dotfiles [3/N]

Summary: dont keep dotfiles in the facebook-clang-plugins folder, rather merge into the main ones

Reviewed By: ngorogiannis

Differential Revision: D23599305

fbshipit-source-id: ced837bc4
---
 .clang-format                                   | 3 ++-
 .gitignore                                      | 9 +++++++++
 facebook-clang-plugins/.gitignore               | 6 ------
 facebook-clang-plugins/clang-ocaml/.ocamlformat | 2 --
 4 files changed, 11 insertions(+), 9 deletions(-)
 delete mode 100644 facebook-clang-plugins/.gitignore
 delete mode 100644 facebook-clang-plugins/clang-ocaml/.ocamlformat

diff --git a/.clang-format b/.clang-format
index c4a052549..c5bcfd913 100644
--- a/.clang-format
+++ b/.clang-format
@@ -13,6 +13,7 @@ BreakBeforeBinaryOperators: false
 BreakBeforeBraces: Attach
 BreakConstructorInitializersBeforeComma: false
 ColumnLimit:     80
+CommentPragmas:  '^@atd'
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
@@ -26,7 +27,7 @@ MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 ObjCSpaceBeforeProtocolList: false
 PenaltyBreakBeforeFirstCallParameter: 10
-PenaltyBreakComment: 60
+PenaltyBreakComment: 1000
 PenaltyBreakFirstLessLess: 20
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
diff --git a/.gitignore b/.gitignore
index 1d48903b5..26219627a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -179,3 +179,12 @@ infer/src/.project
 /infer/src/deadcode/dune
 _opam
 _coverage
+
+# facebook-clang-plugins
+/facebook-clang-plugins/clang-ocaml/.depend
+/facebook-clang-plugins/clang-ocaml/build
+/facebook-clang-plugins/clang/install
+/facebook-clang-plugins/clang/installed.version
+/facebook-clang-plugins/clang/src/download
+/facebook-clang-plugins/libtooling/build
+/facebook-clang-plugins/xcode/*
diff --git a/facebook-clang-plugins/.gitignore b/facebook-clang-plugins/.gitignore
deleted file mode 100644
index 772ef34e6..000000000
--- a/facebook-clang-plugins/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-build
-clang-ocaml/.depend
-xcode/*
-*~
-clang/install
-clang/installed.version
diff --git a/facebook-clang-plugins/clang-ocaml/.ocamlformat b/facebook-clang-plugins/clang-ocaml/.ocamlformat
deleted file mode 100644
index a2e557f19..000000000
--- a/facebook-clang-plugins/clang-ocaml/.ocamlformat
+++ /dev/null
@@ -1,2 +0,0 @@
-margin 100
-version 0.5