From 6b4b24258234c75a17a5310137ea8493d5492742 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 28 May 2015 14:30:57 +0800 Subject: [PATCH] src/Builder4/Editor.bjs src/Builder4/Editor.vala --- src/Builder4/Editor.bjs | 2 +- src/Builder4/Editor.vala | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs index 669a0ca7d..b23ce45f5 100644 --- a/src/Builder4/Editor.bjs +++ b/src/Builder4/Editor.bjs @@ -72,7 +72,7 @@ "gboolean highlight_current_line" : true, "$ gboolean auto_indent" : true, "$ xns" : "Gtk", - "| void load" : " (string str) {\n\n// show the help page for the active node..\n //this.get('/Help').show();\n\n\n // this.get('/BottomPane').el.set_current_page(0);\n var buf = (Gtk.SourceBuffer)this.el.get_buffer();\n buf.set_text(str, str.length);\n buf.set_undo_manager(null);\n \n var lm = Gtk.SourceLanguageManager.get_default();\n var lang = \"vala\";\n if (_this.file != null) {\n lang = _this.file.language;\n }\n print(\"lang=%s, content_type = %s\\n\", lang, _this.file.content_type);\n \n ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(\n _this.file.content_type.length > 0 ?\n lm.guess_language(_this.file.path, _this.file.content_type) :\n lm.get_language(lang)\n );\n \n \n _this.dirty = false;\n this.el.grab_focus();\n _this.save_button.el.sensitive = false;\n}", + "| void load" : " (string str) {\n\n// show the help page for the active node..\n //this.get('/Help').show();\n\n\n // this.get('/BottomPane').el.set_current_page(0);\n var buf = (Gtk.SourceBuffer)this.el.get_buffer();\n buf.set_text(str, str.length);\n buf.set_undo_manager(null);\n \n var lm = Gtk.SourceLanguageManager.get_default();\n var lang = \"vala\";\n if (_this.file != null) {\n lang = _this.file.language;\n }\n print(\"lang=%s, content_type = %s\\n\", lang, _this.file.content_type);\n var lg = _this.file.content_type.length > 0 ?\n lm.guess_language(_this.file.path, _this.file.content_type) :\n lm.get_language(lang);\n \n \n \n ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg); \n \n if (lg.name == \"vala\") {\n this.el.insert_spaces_instead_of_tabs = false;\n }\n \n _this.dirty = false;\n this.el.grab_focus();\n _this.save_button.el.sensitive = false;\n}", "bool insert_spaces_instead_of_tabs" : true, "indent_width" : 4, "$ show_line_numbers" : true, diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala index c4823b102..30b0036e0 100644 --- a/src/Builder4/Editor.vala +++ b/src/Builder4/Editor.vala @@ -347,13 +347,17 @@ public class Editor : Object lang = _this.file.language; } print("lang=%s, content_type = %s\n", lang, _this.file.content_type); - - ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language( - _this.file.content_type.length > 0 ? + var lg = _this.file.content_type.length > 0 ? lm.guess_language(_this.file.path, _this.file.content_type) : - lm.get_language(lang) - ); - + lm.get_language(lang); + + + + ((Gtk.SourceBuffer)(this.el.get_buffer())) .set_language(lg); + + if (lg.name == "vala") { + this.el.insert_spaces_instead_of_tabs = false; + } _this.dirty = false; this.el.grab_focus(); -- 2.39.2