godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Honoring the Indent setting for gdscript

This commit is contained in:
Ramesh Ravone 2017-04-25 06:57:49 +05:30
parent d9eae920a9
commit 924bccdbd1
No known key found for this signature in database
GPG Key ID: 90B471D9AC10312A
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/gdscript/gd_editor.cpp
View File

@ -55,11 +55,12 @@ Ref<Script> GDScriptLanguage::get_template(const String &p_class_name, const Str
"# var a = 2\n" + "# var a = 2\n" +
"# var b = \"textvar\"\n\n" + "# var b = \"textvar\"\n\n" +
"func _ready():\n" + "func _ready():\n" +
"\t# Called every time the node is added to the scene.\n" + "%TS%# Called every time the node is added to the scene.\n" +
"\t# Initialization here\n" + "%TS%# Initialization here\n" +
"\tpass\n"; "%TS%pass\n";
_template = _template.replace("%BASE%", p_base_class_name); _template = _template.replace("%BASE%", p_base_class_name);
_template = _template.replace("%TS%", _get_indentation());
Ref<GDScript> script; Ref<GDScript> script;
script.instance(); script.instance();
@ -2418,6 +2419,7 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base
String GDScriptLanguage::_get_indentation() const { String GDScriptLanguage::_get_indentation() const {
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (SceneTree::get_singleton()->is_editor_hint()) {
bool use_space_indentation = EDITOR_DEF("text_editor/indent/type", "Tabs") == "Tabs" ? 0 : 1; bool use_space_indentation = EDITOR_DEF("text_editor/indent/type", "Tabs") == "Tabs" ? 0 : 1;
if (use_space_indentation) { if (use_space_indentation) {
@ -2429,6 +2431,7 @@ String GDScriptLanguage::_get_indentation() const {
} }
return space_indent; return space_indent;
} }
}
#endif #endif
return "\t"; return "\t";
} }