diff --git a/.editorconfig b/.editorconfig
index 5ac3b0f8e5..2cb4ea3868 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,6 +19,10 @@ indent_size = 4
 max_line_length = 0
 trim_trailing_whitespace = false
 
+[*.diff]
+max_line_length = 0
+trim_trailing_whitespace = false
+
 [*.rst]
 max_line_length = 0
 indent_style = space
diff --git a/.gitignore b/.gitignore
index 38ab7d96c0..6cebb7f37a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,6 +90,9 @@ ENV/
 /.exrc
 .ripgreprc
 .neoconf.json
+/.zed
+/.ropeproject
+pyrightconfig.json
 
 # Pants
 /.pants.d/