From 00c1a3b3eb328b870cf5aa0822105db5b1b60b83 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 13 Apr 2017 11:35:07 +0200 Subject: [PATCH] Renamed editor.auto_close_braces pref and set default value --- app/src/processing/app/EditorTab.java | 2 +- arduino-core/src/processing/app/PreferencesData.java | 7 +++++++ build/shared/lib/preferences.txt | 5 ++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/processing/app/EditorTab.java b/app/src/processing/app/EditorTab.java index 90089ff95..eab701d80 100644 --- a/app/src/processing/app/EditorTab.java +++ b/app/src/processing/app/EditorTab.java @@ -148,7 +148,7 @@ public class EditorTab extends JPanel implements SketchFile.TextStorage { textArea.setMarginLineEnabled(false); textArea.setCodeFoldingEnabled(PreferencesData.getBoolean("editor.code_folding")); textArea.setAutoIndentEnabled(PreferencesData.getBoolean("editor.indent")); - textArea.setCloseCurlyBraces(PreferencesData.getBoolean("editor.autocomplete")); + textArea.setCloseCurlyBraces(PreferencesData.getBoolean("editor.auto_close_braces", true)); textArea.setAntiAliasingEnabled(PreferencesData.getBoolean("editor.antialias")); textArea.setTabsEmulated(PreferencesData.getBoolean("editor.tabs.expand")); textArea.setTabSize(PreferencesData.getInteger("editor.tabs.size")); diff --git a/arduino-core/src/processing/app/PreferencesData.java b/arduino-core/src/processing/app/PreferencesData.java index 6757e7e6e..3de047a2e 100644 --- a/arduino-core/src/processing/app/PreferencesData.java +++ b/arduino-core/src/processing/app/PreferencesData.java @@ -176,6 +176,13 @@ public class PreferencesData { prefs.remove(attribute); } + static public boolean getBoolean(String attribute, boolean defaultValue) { + if (has(attribute)) { + return getBoolean(attribute); + } + + return defaultValue; + } static public boolean getBoolean(String attribute) { return prefs.getBoolean(attribute); diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt index 24b98861b..ec1852e58 100644 --- a/build/shared/lib/preferences.txt +++ b/build/shared/lib/preferences.txt @@ -146,9 +146,8 @@ editor.tabs.size = 2 # automatically indent each line editor.indent = true -# enable/disable any 'autocomplete' features -# this currently includes 'auto curly brace' -editor.autocomplete = true +# enable/disable auto-close of curly brace +editor.auto_close_braces = true # size of divider between editing area and the console editor.divider.size = 0