asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #97270 from timothyqiu/optional-edconfig

Browse source 
Create `.editorconfig` file only on project creation
This commit is contained in:
Thaddeus Crews 2024-10-08 11:14:43 -05:00
commit f31a2cc9c9
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
3 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
editor/editor_paths.cpp
View file

@ -257,22 +257,6 @@ EditorPaths::EditorPaths() {
} }
} }
// Check that `.editorconfig` file exists.
String project_editorconfig_path = "res://.editorconfig";
if (!FileAccess::exists(project_editorconfig_path)) {
Ref<FileAccess> f = FileAccess::open(project_editorconfig_path, FileAccess::WRITE);
if (f.is_valid()) {
f->store_line("root = true");
f->store_line("");
f->store_line("[*]");
f->store_line("charset = utf-8");
f->close();
} else {
ERR_PRINT("Failed to create file " + project_editorconfig_path.quote() + ".");
}
FileAccess::set_hidden_attribute(project_editorconfig_path, true);
}
Engine::get_singleton()->set_shader_cache_path(project_data_dir); Engine::get_singleton()->set_shader_cache_path(project_data_dir);
// Editor metadata dir. // Editor metadata dir.

15
editor/project_manager/project_dialog.cpp
View file

@ -552,6 +552,21 @@ void ProjectDialog::ok_pressed() {
fa_icon->store_string(get_default_project_icon()); fa_icon->store_string(get_default_project_icon());
EditorVCSInterface::create_vcs_metadata_files(EditorVCSInterface::VCSMetadata(vcs_metadata_selection->get_selected()), path); EditorVCSInterface::create_vcs_metadata_files(EditorVCSInterface::VCSMetadata(vcs_metadata_selection->get_selected()), path);
// Ensures external editors and IDEs use UTF-8 encoding.
const String editor_config_path = path.path_join(".editorconfig");
Ref<FileAccess> f = FileAccess::open(editor_config_path, FileAccess::WRITE);
if (f.is_null()) {
// .editorconfig isn't so critical.
ERR_PRINT("Couldn't create .editorconfig in project path.");
} else {
f->store_line("root = true");
f->store_line("");
f->store_line("[*]");
f->store_line("charset = utf-8");
f->close();
FileAccess::set_hidden_attribute(editor_config_path, true);
}
} }
// Two cases for importing a ZIP. // Two cases for importing a ZIP.

2
modules/gdscript/tests/scripts/.editorconfig
View file

@ -1,5 +1,3 @@
# This file is required to workaround `.editorconfig` autogeneration (see #96845).
# Some tests handle invalid syntax deliberately; exclude relevant attributes. # Some tests handle invalid syntax deliberately; exclude relevant attributes.
[parser/features/mixed_indentation_on_blank_lines.gd] [parser/features/mixed_indentation_on_blank_lines.gd]