[gnome-builder] prefs: add gsetting for insert-trailing-newline



commit 33561f597ed946522294201aa33169db7bf64f72
Author: Christian Hergert <chergert redhat com>
Date:   Mon Jan 15 02:46:16 2018 -0800

    prefs: add gsetting for insert-trailing-newline
    
    This allows setting the value without having to use an
    .editorconfig file.
    
    Fixes #210

 data/gsettings/org.gnome.builder.editor.language.gschema.xml | 3 +++
 src/libide/files/defaults.ini                                | 5 ++++-
 src/libide/gsettings/ide-gsettings-file-settings.c           | 1 +
 src/libide/preferences/ide-preferences-builtin.c             | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/data/gsettings/org.gnome.builder.editor.language.gschema.xml 
b/data/gsettings/org.gnome.builder.editor.language.gschema.xml
index 1129aa546..df03680ea 100644
--- a/data/gsettings/org.gnome.builder.editor.language.gschema.xml
+++ b/data/gsettings/org.gnome.builder.editor.language.gschema.xml
@@ -13,6 +13,9 @@
     <key name="insert-matching-brace" type="b">
       <default>false</default>
     </key>
+    <key name="insert-trailing-newline" type="b">
+      <default>false</default>
+    </key>
     <key name="overwrite-braces" type="b">
       <default>true</default>
     </key>
diff --git a/src/libide/files/defaults.ini b/src/libide/files/defaults.ini
index fca96606f..97c288cf3 100644
--- a/src/libide/files/defaults.ini
+++ b/src/libide/files/defaults.ini
@@ -7,7 +7,7 @@
 # "all languages" default value will get that setting overridden. A potential
 # alternative is to layer backends, which is out of scope at the moment.
 [global]
-version = 3
+version = 4
 
 [automake]
 insert-spaces-instead-of-tabs = false
@@ -18,6 +18,7 @@ insert-spaces-instead-of-tabs = true
 tab-width = 2
 auto-indent = true
 insert-matching-brace = true
+insert-trailing-newline = true
 overwrite-braces = true
 
 [chdr]
@@ -25,6 +26,7 @@ insert-spaces-instead-of-tabs = true
 tab-width = 2
 auto-indent = true
 insert-matching-brace = true
+insert-trailing-newline = true
 overwrite-braces = true
 
 [cpp]
@@ -32,6 +34,7 @@ insert-spaces-instead-of-tabs = true
 tab-width = 4
 auto-indent = true
 insert-matching-brace = true
+insert-trailing-newline = true
 overwrite-braces = true
 
 [c-sharp]
diff --git a/src/libide/gsettings/ide-gsettings-file-settings.c 
b/src/libide/gsettings/ide-gsettings-file-settings.c
index 9b04b8013..c21a115b9 100644
--- a/src/libide/gsettings/ide-gsettings-file-settings.c
+++ b/src/libide/gsettings/ide-gsettings-file-settings.c
@@ -66,6 +66,7 @@ static SettingsMapping language_mappings [] = {
   { "tab-width",                     "tab-width",                NULL             },
   { "trim-trailing-whitespace",      "trim-trailing-whitespace", NULL             },
   { "insert-matching-brace",         "insert-matching-brace",    NULL             },
+  { "insert-trailing-newline",       "insert-trailing-newline",  NULL             },
   { "overwrite-braces",              "overwrite-braces",         NULL             },
 };
 
diff --git a/src/libide/preferences/ide-preferences-builtin.c 
b/src/libide/preferences/ide-preferences-builtin.c
index 4d5e8a9dc..b4dc090f0 100644
--- a/src/libide/preferences/ide-preferences-builtin.c
+++ b/src/libide/preferences/ide-preferences-builtin.c
@@ -322,6 +322,7 @@ ide_preferences_builtin_register_languages (DzlPreferences *preferences)
   dzl_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language", 
"trim-trailing-whitespace", "/org/gnome/builder/editor/language/{id}/", NULL, _("Trim trailing whitespace"), 
_("Upon saving, trailing whitespace from modified lines will be trimmed."), NULL, 10);
   dzl_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language", 
"overwrite-braces", "/org/gnome/builder/editor/language/{id}/", NULL, _("Overwrite Braces"), _("Overwrite 
closing braces"), NULL, 20);
   dzl_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language", 
"insert-matching-brace", "/org/gnome/builder/editor/language/{id}/", NULL, _("Insert Matching Brace"), 
_("Insert matching character for { [ ( or \""), NULL, 20);
+  dzl_preferences_add_switch (preferences, "languages.id", "basic", "org.gnome.builder.editor.language", 
"insert-trailing-newline", "/org/gnome/builder/editor/language/{id}/", NULL, _("Insert Trailing Newline"), 
_("Ensure files end with a newline"), NULL, 30);
 
   dzl_preferences_add_list_group (preferences, "languages.id", "margin", _("Margins"), GTK_SELECTION_NONE, 
0);
   dzl_preferences_add_radio (preferences, "languages.id", "margin", "org.gnome.builder.editor.language", 
"show-right-margin", "/org/gnome/builder/editor/language/{id}/", NULL, _("Show right margin"), NULL, NULL, 0);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]