Skip to content

Commit 19ebfb9

Browse files
committed
Rewire autocomplete settings. Closes #4339
1 parent 6df939d commit 19ebfb9

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

Rubberduck.Core/AutoComplete/AutoCompleteService.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public AutoCompleteService(IGeneralConfigService configService, SelfClosingPairC
3535
{
3636
_selfClosingPairCompletion = selfClosingPairCompletion;
3737
_configService = configService;
38+
InitializeConfig();
3839
_configService.SettingsChanged += ConfigServiceSettingsChanged;
3940
}
4041

Rubberduck.Core/Common/RubberduckHooks.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public void HookHotkeys()
3232
_hooks.Clear();
3333

3434
var config = _config.LoadConfiguration();
35-
AutoComplete.ApplyAutoCompleteSettings(config);
3635
var settings = config.UserSettings.HotkeySettings;
3736

3837
foreach (var hotkeySetting in settings.Settings.Where(hotkeySetting => hotkeySetting.IsEnabled))
@@ -73,7 +72,6 @@ public void Attach()
7372

7473
try
7574
{
76-
AutoComplete.Enable();
7775
foreach (var hook in Hooks)
7876
{
7977
hook.Attach();
@@ -96,7 +94,6 @@ public void Detach()
9694

9795
try
9896
{
99-
AutoComplete.Disable();
10097
foreach (var hook in Hooks)
10198
{
10299
hook.MessageReceived -= hook_MessageReceived;

Rubberduck.Core/Settings/ConfigurationLoader.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ public void SaveConfiguration(Configuration toSerialize)
9999
var inspectOnReparse = toSerialize.UserSettings.CodeInspectionSettings.RunInspectionsOnSuccessfulParse;
100100
var oldAutoCompleteSettings = _autoCompleteProvider.Create().AutoCompletes.Select(s => Tuple.Create(s.Key, s.IsEnabled));
101101
var newAutoCompleteSettings = toSerialize.UserSettings.AutoCompleteSettings.AutoCompletes.Select(s => Tuple.Create(s.Key, s.IsEnabled));
102-
var autoCompletesChanged = !oldAutoCompleteSettings.SequenceEqual(newAutoCompleteSettings);
102+
var autoCompletesChanged = !oldAutoCompleteSettings.SequenceEqual(newAutoCompleteSettings) ||
103+
toSerialize.UserSettings.AutoCompleteSettings.IsEnabled != _autoCompleteProvider.Create().IsEnabled;
103104

104105
_generalProvider.Save(toSerialize.UserSettings.GeneralSettings);
105106
_hotkeyProvider.Save(toSerialize.UserSettings.HotkeySettings);

0 commit comments

Comments
 (0)