From 4a2bae2306c9dab1e6b73f04897a416f18631f36 Mon Sep 17 00:00:00 2001 From: Martino Facchin Date: Mon, 27 Mar 2017 11:59:51 +0200 Subject: [PATCH 1/3] Apply editor.indent preference Solves #6128 --- app/src/processing/app/EditorTab.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/processing/app/EditorTab.java b/app/src/processing/app/EditorTab.java index c2fdbb9b464..875c5446a1b 100644 --- a/app/src/processing/app/EditorTab.java +++ b/app/src/processing/app/EditorTab.java @@ -147,6 +147,7 @@ private SketchTextArea createTextArea(RSyntaxDocument document) textArea.setMarkOccurrences(PreferencesData.getBoolean("editor.advanced")); textArea.setMarginLineEnabled(false); textArea.setCodeFoldingEnabled(PreferencesData.getBoolean("editor.code_folding")); + textArea.setAutoIndentEnabled(PreferencesData.getBoolean("editor.indent")); textArea.setAntiAliasingEnabled(PreferencesData.getBoolean("editor.antialias")); textArea.setTabsEmulated(PreferencesData.getBoolean("editor.tabs.expand")); textArea.setTabSize(PreferencesData.getInteger("editor.tabs.size")); From 60947889ae86a4b3afe301744cbfb669ac0ee0a8 Mon Sep 17 00:00:00 2001 From: bob Date: Wed, 5 Apr 2017 06:41:52 -0700 Subject: [PATCH 2/3] add editor.autocomplete flag to disable automatic curly braces --- app/src/processing/app/EditorTab.java | 3 ++- build/shared/lib/preferences.txt | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/processing/app/EditorTab.java b/app/src/processing/app/EditorTab.java index 875c5446a1b..90089ff9585 100644 --- a/app/src/processing/app/EditorTab.java +++ b/app/src/processing/app/EditorTab.java @@ -148,6 +148,7 @@ private SketchTextArea createTextArea(RSyntaxDocument document) textArea.setMarginLineEnabled(false); textArea.setCodeFoldingEnabled(PreferencesData.getBoolean("editor.code_folding")); textArea.setAutoIndentEnabled(PreferencesData.getBoolean("editor.indent")); + textArea.setCloseCurlyBraces(PreferencesData.getBoolean("editor.autocomplete")); textArea.setAntiAliasingEnabled(PreferencesData.getBoolean("editor.antialias")); textArea.setTabsEmulated(PreferencesData.getBoolean("editor.tabs.expand")); textArea.setTabSize(PreferencesData.getInteger("editor.tabs.size")); @@ -599,4 +600,4 @@ public boolean requestFocusInWindow() { return textarea.requestFocusInWindow(); } -} \ No newline at end of file +} diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt index 8657dd50b27..24b98861bab 100644 --- a/build/shared/lib/preferences.txt +++ b/build/shared/lib/preferences.txt @@ -146,6 +146,10 @@ 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 + # size of divider between editing area and the console editor.divider.size = 0 # the larger divider on windows is ugly with the little arrows From 2973c450317d145f8e50783b01814495d0f0246b Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Thu, 13 Apr 2017 11:35:07 +0200 Subject: [PATCH 3/3] 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 90089ff9585..eab701d80a0 100644 --- a/app/src/processing/app/EditorTab.java +++ b/app/src/processing/app/EditorTab.java @@ -148,7 +148,7 @@ private SketchTextArea createTextArea(RSyntaxDocument document) 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 6757e7e6e49..3de047a2ec4 100644 --- a/arduino-core/src/processing/app/PreferencesData.java +++ b/arduino-core/src/processing/app/PreferencesData.java @@ -176,6 +176,13 @@ static public void unset(String attribute) { 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 24b98861bab..ec1852e58c6 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