fixed concat test config

Author: retailcoder

Rubberduck.Core/AutoComplete/Service/SmartConcatenationHandler.cs

@@ -26,7 +26,7 @@ public override bool Handle(AutoCompleteEventArgs e, AutoCompleteSettings settin
 
             var currentContent = CodePaneHandler.GetCurrentLogicalLine(e.Module);
             if ((!currentContent?.IsInsideStringLiteral ?? true) 
-                || currentContent.Lines.Length >= settings.SmartConcat.MaxLogicalLineLineCount)
+                || currentContent.Lines.Length >= settings.SmartConcat.ConcatMaxLines)
             {
                 // selection spans more than a single logical line, or spans too many lines to be legal;
                 // too many line continuations throws COMException if we attempt to modify.

Rubberduck.Core/Settings/AutoCompleteSettings.cs

@@ -63,15 +63,15 @@ public AutoCompleteSettings()
 
         public class SmartConcatSettings : IEquatable<SmartConcatSettings>
         {
-            private int _maxLogicalLineLineCount;
+            private int _concatMaxLines;
 
             [XmlAttribute]
             public bool IsEnabled { get; set; }
             public ModifierKeySetting ConcatVbNewLineModifier { get; set; }
 
-            public int MaxLogicalLineLineCount
+            public int ConcatMaxLines
             {
-                get => _maxLogicalLineLineCount;
+                get => _concatMaxLines;
                 set
                 {
                     if (value > ConcatMaxLinesMaxValue)
@@ -83,15 +83,15 @@ public int MaxLogicalLineLineCount
                         value = ConcatMaxLinesMinValue;
                     }
 
-                    _maxLogicalLineLineCount = value;
+                    _concatMaxLines = value;
                 }
             }
 
             public bool Equals(SmartConcatSettings other)
                 => other != null &&
                    other.IsEnabled == IsEnabled &&
                    other.ConcatVbNewLineModifier == ConcatVbNewLineModifier &&
-                   other.MaxLogicalLineLineCount == MaxLogicalLineLineCount;
+                   other.ConcatMaxLines == ConcatMaxLines;
         }
 
         public class SelfClosingPairSettings : IEquatable<SelfClosingPairSettings>

Rubberduck.Core/UI/Settings/AutoCompleteSettingsViewModel.cs

@@ -29,7 +29,7 @@ public void UpdateConfig(Configuration config)
             config.UserSettings.AutoCompleteSettings.SmartConcat.IsEnabled = EnableSmartConcat;
             config.UserSettings.AutoCompleteSettings.SmartConcat.ConcatVbNewLineModifier =
                 ConcatVbNewLine ? ModifierKeySetting.CtrlKey : ModifierKeySetting.None;
-            config.UserSettings.AutoCompleteSettings.SmartConcat.MaxLogicalLineLineCount = ConcatMaxLines;
+            config.UserSettings.AutoCompleteSettings.SmartConcat.ConcatMaxLines = ConcatMaxLines;
             config.UserSettings.AutoCompleteSettings.BlockCompletion.IsEnabled = EnableBlockCompletion;
             config.UserSettings.AutoCompleteSettings.BlockCompletion.CompleteOnTab = CompleteBlockOnTab;
             config.UserSettings.AutoCompleteSettings.BlockCompletion.CompleteOnEnter = CompleteBlockOnEnter;
@@ -43,7 +43,7 @@ private void TransferSettingsToView(Rubberduck.Settings.AutoCompleteSettings toL
 
             EnableSmartConcat = toLoad.SmartConcat.IsEnabled;
             ConcatVbNewLine = toLoad.SmartConcat.ConcatVbNewLineModifier == ModifierKeySetting.CtrlKey;
-            ConcatMaxLines = toLoad.SmartConcat.MaxLogicalLineLineCount;
+            ConcatMaxLines = toLoad.SmartConcat.ConcatMaxLines;
 
             EnableBlockCompletion = toLoad.BlockCompletion.IsEnabled;
             CompleteBlockOnTab = toLoad.BlockCompletion.CompleteOnTab;

Rubberduck.Core/app.config

@@ -398,7 +398,7 @@
             xmlns:xsd="http://www.w3.org/2001/XMLSchema" IsEnabled="false">
             <SmartConcat IsEnabled="false">
               <ConcatVbNewLineModifier>None</ConcatVbNewLineModifier>
-              <MaxLogicalLineLineCount>25</MaxLogicalLineLineCount>
+              <ConcatMaxLines>25</ConcatMaxLines>
             </SmartConcat>
             <SelfClosingPairs IsEnabled="false" />
             <BlockCompletion IsEnabled="false" CompleteOnEnter="false" CompleteOnTab="false" />

RubberduckTests/AutoComplete/SmartConcatCompletionTests.cs

@@ -116,6 +116,7 @@ private static SmartConcatenationHandler InitializeSut(TestCodeString original,
             settings = new AutoCompleteSettings {IsEnabled = true};
             settings.SmartConcat.IsEnabled = true;
             settings.SmartConcat.ConcatVbNewLineModifier = ModifierKeySetting.CtrlKey;
+            settings.SmartConcat.ConcatMaxLines = AutoCompleteSettings.ConcatMaxLinesMaxValue;
 
             var handler = new CodePaneSourceCodeHandler(new ProjectsRepository(vbe.Object));
             var sut = new SmartConcatenationHandler(handler);