[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
matt-j-griffin · Sep 10, 2020 · d519c83 · d519c83
1 parent 0ded780
commit d519c83
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git 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
@@ -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
diff --git a/facebook-clang-plugins/clang-ocaml/.ocamlformat b/facebook-clang-plugins/clang-ocaml/.ocamlformat