Merge pull request #4459 from retailcoder/next

Fix broken .resx reference in Settings dialog / AC settings
rubberduck-vba · Oct 26, 2018 · e8564b4 · e8564b4
2 parents 197bce0 + eb52bbd
commit e8564b4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml b/Rubberduck.Core/UI/Settings/AutoCompleteSettings.xaml
@@ -109,7 +109,7 @@
                 <CheckBox Margin="15,0,15,0" 
                           IsEnabled="{Binding EnableSmartConcat}"
                           IsChecked="{Binding ConcatVbNewLine}" 
-                          Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=ConcatVbNewline}" />
+                          Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=ConcatVbNewLine}" />
 
                 <Label Margin="10" 
                        Content="{Resx ResxName=Rubberduck.Resources.Settings.AutoCompletesPage, Key=BlockCompletion}"

diff --git a/RubberduckTests/AutoComplete/SelfClosingPairCompletionTests.cs b/RubberduckTests/AutoComplete/SelfClosingPairCompletionTests.cs
@@ -70,6 +70,18 @@ public void WhenNextPositionIsClosingChar_ClosingCharMovesSelection()
             Assert.AreEqual(expected, result);
         }
 
+        [Test]
+        public void WhenNextPositionIsClosingChar_Nested_ClosingCharMovesSelection()
+        {
+            var pair = new SelfClosingPair('(', ')');
+            var input = pair.ClosingChar;
+            var original = @"foo = MsgBox(""""|)".ToCodeString();
+            var expected = @"foo = MsgBox("""")|".ToCodeString();
+
+            var result = Run(pair, original, input);
+            Assert.AreEqual(expected, result);
+        }
+
         [Test]
         public void DeletingOpeningCharRemovesPairedClosingChar_Parens()
         {