summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/gdscript/.editorconfig5
-rw-r--r--modules/gdscript/tests/scripts/.editorconfig12
-rw-r--r--modules/gdscript/tests/scripts/parser/.editorconfig2
3 files changed, 12 insertions, 7 deletions
diff --git a/modules/gdscript/.editorconfig b/modules/gdscript/.editorconfig
index 640c205093..b380846f86 100644
--- 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
new file mode 100644
index 0000000000..da1efefe3c
--- /dev/null
+++ 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
deleted file mode 100644
index fa43b3ad78..0000000000
--- a/modules/gdscript/tests/scripts/parser/.editorconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-[*.{gd,out}]
-trim_trailing_whitespace = false