Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Osenkov <KirillOsenkov@users.noreply.github.com>2019-02-06 01:44:21 +0300
committerGitHub <noreply@github.com>2019-02-06 01:44:21 +0300
commit8de4c8e9ce9cbefa7dc9d4394917885c019d1f07 (patch)
tree6de62ff81fc426edc4f63b136022acdff5b75775 /main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor
parentc96930b0d8d00096be3756fbc94a35f790f8df96 (diff)
Fix option so it builds on Windows. (#151)
On Windows the EnableHighlightCurrentLine option is in a different type (DefaultWpfViewOptions). Just use a string so it compiles on both.
Diffstat (limited to 'main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor')
-rw-r--r--main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorPreferences.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorPreferences.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorPreferences.cs
index 89d38e9d96..cca7744ce3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorPreferences.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor/EditorPreferences.cs
@@ -75,7 +75,8 @@ namespace MonoDevelop.Ide.Editor
ConvertTabsToSpaces = Wrap<bool> ("TabsToSpaces", DefaultOptions.ConvertTabsToSpacesOptionName);
EnableBraceCompletion = Wrap<bool> ("AutoInsertMatchingBracket", DefaultTextViewOptions.BraceCompletionEnabledOptionName);
EnableCompletionSuggestionMode = Map<bool> ("ForceCompletionSuggestionMode", PredefinedCompletionNames.SuggestionModeInCompletionOptionName, IdeApp.Preferences.ForceSuggestionMode);
- EnableHighlightCurrentLine = Wrap ("HighlightCaretLine", DefaultTextViewOptions.EnableHighlightCurrentLineName, false);
+ // have to use literal because it's in different types on different platforms (DefaultTextViewOptions vs. DefaultWpfViewOptions)
+ EnableHighlightCurrentLine = Wrap ("HighlightCaretLine", "Adornments/HighlightCurrentLine/Enable", false);
EnableHighlightDelimiter = Wrap<bool> ("HighlightMatchingBracket", DefaultOptions.AutomaticDelimiterHighlightingName);
FollowCodingConventions = Wrap<bool> ("FollowCodingConventions", DefaultOptions.FollowCodingConventionsName);
IndentSize = Wrap<int> ("TabIndent", DefaultOptions.IndentSizeOptionName);