Preference to toggle "highlight selected word" on/off

Defaulted to off because the feature doesn't work all that well IMHO
rstudio · Jun 10, 2011 · 1f1be6a · 1f1be6a
1 parent 678cc72
commit 1f1be6a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/prefs/model/UIPrefs.java b/src/gwt/src/org/rstudio/studio/client/workbench/prefs/model/UIPrefs.java
@@ -33,7 +33,7 @@ public PrefValue<Boolean> showLineNumbers()
 
    public PrefValue<Boolean> highlightSelectedWord()
    {
-      return bool("highlight_selected_word", true);
+      return bool("highlight_selected_word", false);
    }
 
    public PrefValue<Boolean> highlightSelectedLine()

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/prefs/views/EditingPreferencesPane.java b/src/gwt/src/org/rstudio/studio/client/workbench/prefs/views/EditingPreferencesPane.java
@@ -37,6 +37,7 @@ public EditingPreferencesPane(SourceServerOperations server,
       prefs_ = prefs;
       res_ = res;
 
+      add(checkboxPref("Highlight selected word", prefs.highlightSelectedWord()));
       add(checkboxPref("Highlight selected line", prefs.highlightSelectedLine()));
       add(checkboxPref("Show line numbers", prefs.showLineNumbers()));
       add(tight(spacesForTab_ = checkboxPref("Insert spaces for tab", prefs.useSpacesForTab())));

diff --git a/src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/AceEditor.java b/src/gwt/src/org/rstudio/studio/client/workbench/views/source/editors/text/AceEditor.java
@@ -670,6 +670,11 @@ public void setHighlightSelectedLine(boolean on)
       widget_.getEditor().setHighlightActiveLine(on);
    }
 
+   public void setHighlightSelectedWord(boolean on)
+   {
+      widget_.getEditor().setHighlightSelectedWord(on);
+   }
+
    public void setShowLineNumbers(boolean on)
    {
       widget_.getEditor().getRenderer().setShowGutter(on);

diff --git a/.../src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTarget.java b/.../src/org/rstudio/studio/client/workbench/views/source/editors/text/TextEditingTarget.java
@@ -142,6 +142,7 @@ AnchoredSelection createAnchoredSelection(Position start,
       void onVisibilityChanged(boolean visible);
 
       void setHighlightSelectedLine(boolean on);
+      void setHighlightSelectedWord(boolean on);
       void setShowLineNumbers(boolean on);
       void setUseSoftTabs(boolean on);
       void setUseWrapMode(boolean on);
@@ -638,6 +639,11 @@ private void registerPrefs()
                public void execute(Boolean arg) {
                   docDisplay_.setHighlightSelectedLine(arg);
                }}));
+      releaseOnDismiss_.add(prefs_.highlightSelectedWord().bind(
+            new CommandWithArg<Boolean>() {
+               public void execute(Boolean arg) {
+                  docDisplay_.setHighlightSelectedWord(arg);
+               }}));
       releaseOnDismiss_.add(prefs_.showLineNumbers().bind(
             new CommandWithArg<Boolean>() {
                public void execute(Boolean arg) {