Merge pull request godotengine#96965 from Repiteo/style/gdscript-editorconfig

akien-mga · akien-mga · commit 41066484ff66 · 2024-09-16T13:35:25.000+02:00
Style: Consolidate &amp; migrate GDScript `.editorconfig`
diff --git a/modules/gdscript/.editorconfig b/modules/gdscript/.editorconfig
@@ -1,8 +1,3 @@
 [*.gd]
-indent_style = tab
 indent_size = 4
-insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.out]
-insert_final_newline = true
diff --git a/modules/gdscript/tests/scripts/.editorconfig b/modules/gdscript/tests/scripts/.editorconfig
@@ -0,0 +1,12 @@
+# This file is required to workaround `.editorconfig` autogeneration (see #96845).
+
+# Some tests handle invalid syntax deliberately; exclude relevant attributes.
+
+[parser/features/mixed_indentation_on_blank_lines.gd]
+trim_trailing_whitespace = false
+
+[parser/warnings/empty_file_newline.notest.gd]
+insert_final_newline = false
+
+[parser/warnings/empty_file_newline_comment.notest.gd]
+insert_final_newline = false
diff --git a/modules/gdscript/tests/scripts/parser/.editorconfig b/modules/gdscript/tests/scripts/parser/.editorconfig
