Merge branch 'rubberduck-vba/next' into InterfaceMemberCodeResuse

Author: BZngr

Rubberduck.CodeAnalysis/Inspections/Concrete/Excel/SheetAccessedUsingStringInspection.cs

@@ -100,7 +100,7 @@ protected override (bool isResult, string properties) IsResultReferenceWithAddit
             }
 
             var projectId = reference.QualifiedModuleName.ProjectId;
-            var sheetName = sheetNameArgumentLiteralExpressionContext.GetText().UnQuote();
+            var sheetName = sheetNameArgumentLiteralExpressionContext.GetText().FromVbaStringLiteral();
             var codeName = CodeNameOfVBComponentMatchingSheetName(projectId, sheetName);
 
             if (codeName == null)

Rubberduck.JunkDrawer/Output/StringExtensions.cs

@@ -66,6 +66,16 @@ public static string EnQuote(this string input)
             return $"\"{input}\"";
         }
 
+        public static string FromVbaStringLiteral(this string input)
+        {
+            return input.UnQuote().Replace("\"\"", "\"");
+        }
+
+        public static string ToVbaStringLiteral(this string input)
+        {
+            return input.Replace("\"", "\"\"");
+        }
+
         public static bool TryMatchHungarianNotationCriteria(this string identifier, out string nonHungarianName)
         {
             nonHungarianName = identifier;

Rubberduck.Parsing/Annotations/Concrete/ObsoleteAnnotation.cs

@@ -20,7 +20,7 @@ public override IReadOnlyList<string> ProcessAnnotationArguments(IEnumerable<str
             var args = arguments.ToList();
 
             ReplacementDocumentation = args.Any()
-                ? args[0].UnQuote()
+                ? args[0]
                 : string.Empty;
 
             return base.ProcessAnnotationArguments(args);

Rubberduck.Parsing/Annotations/Concrete/TestMethodAnnotation.cs

@@ -15,7 +15,7 @@ public TestMethodAnnotation()
 
         public IReadOnlyList<string> ProcessAnnotationArguments(IEnumerable<string> arguments)
         {
-            var firstParameter = arguments.FirstOrDefault()?.UnQuote();
+            var firstParameter = arguments.FirstOrDefault();
             var result = new List<string>();
             if (!string.IsNullOrWhiteSpace(firstParameter))
             {

Rubberduck.UnitTesting/UnitTesting/TestMethod.cs

@@ -25,8 +25,8 @@ public TestCategory Category
         {
             get
             {
-                var testMethodAnnotation = Declaration.Annotations.Where(pta => pta.Annotation is TestMethodAnnotation).First();
-                var argument = testMethodAnnotation.AnnotationArguments.FirstOrDefault()?.UnQuote();
+                var testMethodAnnotation = Declaration.Annotations.First(pta => pta.Annotation is TestMethodAnnotation);
+                var argument = testMethodAnnotation.AnnotationArguments.FirstOrDefault()?.FromVbaStringLiteral();
 
                 var categorization = string.IsNullOrWhiteSpace(argument)
                     ? TestExplorer.TestExplorer_Uncategorized 

RubberduckTests/Inspections/SheetAccessedUsingStringInspectionTests.cs

@@ -27,6 +27,45 @@ public void SheetAccessedUsingString_ReturnsResult_AccessingUsingWorkbookModule(
             Assert.AreEqual(2, ArrangeParserAndGetResults(inputCode).Count());
         }
 
+        [Test]
+        [Category("Inspections")]
+        public void SheetAccessedUsingString_DoesNotReturnResult_NoDocumentWithSheetName()
+        {
+            const string inputCode =
+                @"Public Sub Foo()
+    ThisWorkbook.Worksheets(""Sheet1"").Range(""A1"") = ""Foo""
+    ThisWorkbook.Sheets(""Sheet1"").Range(""A1"") = ""Foo""
+End Sub";
+
+            Assert.AreEqual(0, ArrangeParserAndGetResults(inputCode, "NotSheet1").Count());
+        }
+
+        [Test]
+        [Category("Inspections")]
+        public void SheetAccessedUsingString_ReturnsResult_CodeNameAndSheetNameDifferent()
+        {
+            const string inputCode =
+                @"Public Sub Foo()
+    ThisWorkbook.Worksheets(""NotSheet1"").Range(""A1"") = ""Foo""
+    ThisWorkbook.Sheets(""NotSheet1"").Range(""A1"") = ""Foo""
+End Sub";
+
+            Assert.AreEqual(2, ArrangeParserAndGetResults(inputCode, "NotSheet1").Count());
+        }
+
+        [Test]
+        [Category("Inspections")]
+        public void SheetAccessedUsingString_ReturnsResult_SheetNameContainsDoubleQuotes()
+        {
+            const string inputCode =
+                @"Public Sub Foo()
+    ThisWorkbook.Worksheets(""She""""et1"").Range(""A1"") = ""Foo""
+    ThisWorkbook.Sheets(""She""""et1"").Range(""A1"") = ""Foo""
+End Sub";
+
+            Assert.AreEqual(2, ArrangeParserAndGetResults(inputCode, "She\"et1").Count());
+        }
+
         [Test]
         [Category("Inspections")]
         //Access via Application is an access on the ActiveWorkbook, not necessarily ThisWorkbook.
@@ -172,7 +211,7 @@ Dim s As String
             Assert.AreEqual(0, ArrangeParserAndGetResults(inputCode).Count());
         }
 
-        private IEnumerable<IInspectionResult> ArrangeParserAndGetResults(string inputCode)
+        private IEnumerable<IInspectionResult> ArrangeParserAndGetResults(string inputCode, string sheetName = "Sheet1")
         {
             var builder = new MockVbeBuilder();
 
@@ -190,7 +229,7 @@ private IEnumerable<IInspectionResult> ArrangeParserAndGetResults(string inputCo
                 .AddComponent("Sheet1", ComponentType.Document, "",
                     properties: new[]
                     {
-                        CreateVBComponentPropertyMock("Name", "Sheet1").Object,
+                        CreateVBComponentPropertyMock("Name", sheetName).Object,
                         CreateVBComponentPropertyMock("CodeName", "Sheet1").Object
                     })
                 .AddReference("ReferencedProject", string.Empty, 0, 0)

RubberduckTests/QuickFixes/AccessSheetUsingCodeNameQuickFixTests.cs

@@ -31,6 +31,24 @@ Public Sub Foo()
             Assert.AreEqual(expectedCode, actualCode);
         }
 
+        [Test]
+        [Category("QuickFixes")]
+        public void SheetAccessedUsingString_QuickFixWorks_SheetNameContainingDoubleQuotes()
+        {
+            const string inputCode = @"
+Public Sub Foo()
+    ThisWorkbook.Sheets(""She""""et1"").Range(""A1"") = ""foo""
+End Sub";
+
+            const string expectedCode = @"
+Public Sub Foo()
+    Sheet1.Range(""A1"") = ""foo""
+End Sub";
+            var vbe = TestVbe(inputCode, "She\"et1", out _);
+            var actualCode = ApplyQuickFixToFirstInspectionResult(vbe, "Module1", state => new SheetAccessedUsingStringInspection(state, state.ProjectsProvider));
+            Assert.AreEqual(expectedCode, actualCode);
+        }
+
         [Test]
         [Category("QuickFixes")]
         public void SheetAccessedUsingString_QuickFixWorks_AssigningSheetToVariable()
@@ -191,14 +209,19 @@ protected override IQuickFix QuickFix(RubberduckParserState state)
         }
 
         protected override IVBE TestVbe(string code, out IVBComponent component)
+        {
+            return TestVbe(code, "Sheet1", out component);
+        }
+
+        private IVBE TestVbe(string code, string sheetName, out IVBComponent component)
         {
             var builder = new MockVbeBuilder();
             var project = builder.ProjectBuilder("VBAProject", ProjectProtection.Unprotected)
                 .AddComponent("Module1", ComponentType.StandardModule, code)
                 .AddComponent("Sheet1", ComponentType.Document, "",
                     properties: new[]
                     {
-                        CreateVBComponentPropertyMock("Name", "Sheet1").Object,
+                        CreateVBComponentPropertyMock("Name", sheetName).Object,
                         CreateVBComponentPropertyMock("CodeName", "Sheet1").Object
                     })
                 .AddComponent("SheetWithDifferentCodeName", ComponentType.Document, "",