diff --git a/clang-tools-extra/clang-tidy/.editorconfig b/clang-tools-extra/clang-tidy/.editorconfig
new file mode 100644
index 0000000000000..202fd98590174
--- /dev/null
+++ b/clang-tools-extra/clang-tidy/.editorconfig
@@ -0,0 +1,5 @@
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+max_line_length = 80
diff --git a/clang-tools-extra/docs/clang-tidy/checks/.editorconfig b/clang-tools-extra/docs/clang-tidy/checks/.editorconfig
new file mode 100644
index 0000000000000..08694705c38d8
--- /dev/null
+++ b/clang-tools-extra/docs/clang-tidy/checks/.editorconfig
@@ -0,0 +1,10 @@
+[{**/*.rst,*.rst}]
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+indent_style = space
+max_line_length = 80
+
+[list.rst]
+max_line_length = unset