Merge pull request #164 from rubberduck-vba/next

retailcoder · web-flow · commit 1370e4fe07c7 · 2016-11-18T10:39:28.000-05:00
Sync with main repo
diff --git a/RetailCoder.VBE/AutoSave/AutoSave.cs b/RetailCoder.VBE/AutoSave/AutoSave.cs
@@ -36,20 +36,26 @@ public void ConfigServiceSettingsChanged(object sender, EventArgs e)
 
         private void _timer_Elapsed(object sender, ElapsedEventArgs e)
         {
-            var saveCommand = _vbe.CommandBars.FindControl(VbeSaveCommandId);
-            var activeProject = _vbe.ActiveVBProject;
-            var unsaved = _vbe
-                .VBProjects
-                .Where(project => !project.IsSaved && !string.IsNullOrEmpty(project.FileName));
+            SaveAllUnsavedProjects();
+        }
 
-            foreach (var project in unsaved)
+            private void SaveAllUnsavedProjects()
             {
-                _vbe.ActiveVBProject = project;
-                saveCommand.Execute();
+                var saveCommand = _vbe.CommandBars.FindControl(VbeSaveCommandId);
+                var activeProject = _vbe.ActiveVBProject;
+                var unsaved = _vbe
+                    .VBProjects
+                    .Where(project => !project.IsSaved && !string.IsNullOrEmpty(project.FileName));
+
+                foreach (var project in unsaved)
+                {
+                    _vbe.ActiveVBProject = project;
+                    saveCommand.Execute();
+                }
+
+                _vbe.ActiveVBProject = activeProject;
             }
 
-            _vbe.ActiveVBProject = activeProject;
-        }
 
         public void Dispose()
         {
diff --git a/RetailCoder.VBE/Extension.cs b/RetailCoder.VBE/Extension.cs
@@ -143,14 +143,15 @@ private void InitializeAddIn()
                 return;
             }
 
-            var config = new XmlPersistanceService<GeneralSettings>
+            var configLoader = new XmlPersistanceService<GeneralSettings>
             {
                 FilePath =
                     Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
                         "Rubberduck", "rubberduck.config")
             };
-
-            var settings = config.Load(null);
+            var configProvider = new GeneralConfigProvider(configLoader);
+            
+            var settings = configProvider.Create();
             if (settings != null)
             {
                 try
diff --git a/RetailCoder.VBE/Inspections/NonReturningFunctionInspectionResult.cs b/RetailCoder.VBE/Inspections/NonReturningFunctionInspectionResult.cs
@@ -17,7 +17,10 @@ public NonReturningFunctionInspectionResult(IInspection inspection,
             : base(inspection, qualifiedContext.ModuleName, qualifiedContext.Context, target)
         {
             _quickFixes = isInterfaceImplementation 
-                ? new CodeInspectionQuickFix[] { }
+                ? new CodeInspectionQuickFix[] 
+                {
+                    new IgnoreOnceQuickFix(Context, QualifiedSelection, Inspection.AnnotationName),
+                }
                 : new CodeInspectionQuickFix[]
                 {
                     new ConvertToProcedureQuickFix(Context, QualifiedSelection, target),
diff --git a/Rubberduck.SettingsProvider/XmlPersistanceService.cs b/Rubberduck.SettingsProvider/XmlPersistanceService.cs
@@ -37,14 +37,14 @@ public T Load(T toDeserialize)
 
             if (!File.Exists(FilePath))
             {
-                return (T)Convert.ChangeType(null, type);
+                return FailedLoadReturnValue();
             }
             var doc = GetConfigurationDoc(FilePath);
             
             var node = doc.Descendants().FirstOrDefault(e => e.Name.LocalName.Equals(type.Name));
             if (node == null)
             {
-                return (T)Convert.ChangeType(null, type);
+                return FailedLoadReturnValue();
             }
 
             using (var reader = node.CreateReader())
@@ -57,11 +57,17 @@ public T Load(T toDeserialize)
                 }
                 catch
                 {
-                    return (T)Convert.ChangeType(null, type);
+                    return FailedLoadReturnValue();
                 }
             }  
         }
 
+            private static T FailedLoadReturnValue()
+            {
+                return (T)Convert.ChangeType(null, typeof(T));
+            }
+
+
         public void Save(T toSerialize)
         {
             var doc = GetConfigurationDoc(FilePath);
diff --git a/Rubberduck.SmartIndenter/AbsoluteCodeLine.cs b/Rubberduck.SmartIndenter/AbsoluteCodeLine.cs
@@ -14,7 +14,7 @@ internal class AbsoluteCodeLine
         private static readonly Regex StringReplaceRegex = new Regex(StringPlaceholder);
         private static readonly Regex LineNumberRegex = new Regex(@"^(?<number>\d+)\s+(?<code>.*)", RegexOptions.ExplicitCapture);
         private static readonly Regex EndOfLineCommentRegex = new Regex(@"^(?!(Rem\s)|('))(?<code>.*)(\s(?<comment>'.*))$", RegexOptions.ExplicitCapture);
-        private static readonly Regex ProcedureStartRegex = new Regex(@"^(Public\s|Private\s|Friend\s)?(Static\s)?(Sub|Function|Property\s(Let|Get|Set))");
+        private static readonly Regex ProcedureStartRegex = new Regex(@"^(Public\s|Private\s|Friend\s)?(Static\s)?(Sub|Function|Property\s(Let|Get|Set))\s");
         private static readonly Regex ProcedureStartIgnoreRegex = new Regex(@"^[LR]?Set\s|^Let\s|^(Public|Private)\sDeclare\s(Function|Sub)");
         private static readonly Regex ProcedureEndRegex = new Regex(@"^End\s(Sub|Function|Property)");
         private static readonly Regex TypeEnumStartRegex = new Regex(@"^(Public\s|Private\s)?(Enum\s|Type\s)");
diff --git a/RubberduckTests/Inspections/NonReturningFunctionInspectionTests.cs b/RubberduckTests/Inspections/NonReturningFunctionInspectionTests.cs
@@ -477,7 +477,7 @@ public void GivenParameterizedPropertyGetter_QuickFixKeepsParameter()
 
         [TestMethod]
         [TestCategory("Inspections")]
-        public void NonReturningFunction_ReturnsResult_InterfaceImplementation_NoQuickFix()
+        public void NonReturningFunction_ReturnsResult_InterfaceImplementation_OnlyIgnoreOnceQuickFix()
         {
             //Input
             const string inputCode1 =
@@ -507,7 +507,8 @@ Function IClass1_Foo() As Boolean
             var inspection = new NonReturningFunctionInspection(parser.State);
             var inspectionResults = inspection.GetInspectionResults();
 
-            Assert.AreEqual(0, inspectionResults.First().QuickFixes.Count());
+            Assert.IsTrue(inspectionResults.First().QuickFixes.Any() 
+                && inspectionResults.First().QuickFixes.All(quickfix => quickfix.Description == InspectionsUI.IgnoreOnce));
         }
 
         [TestMethod]
diff --git a/RubberduckTests/SmartIndenter/MiscAndCornerCaseTests.cs b/RubberduckTests/SmartIndenter/MiscAndCornerCaseTests.cs
@@ -435,5 +435,33 @@ public void OverIndentationLeftAligns()
             var actual = indenter.Indent(code, string.Empty);
             Assert.IsTrue(expected.SequenceEqual(actual));
         }
+
+        //http://chat.stackexchange.com/transcript/message/33575758#33575758
+        [TestMethod]
+        [TestCategory("Indenter")]
+        public void SubFooTokenIsNotInterpretedAsProcedureStart()
+        {
+            var code = new[]
+            {
+                "Public Sub Test()",
+                "If Subject = 0 Then",
+                "Subject = 1",
+                "End If",
+                "End Sub"
+            };
+
+            var expected = new[]
+            {
+                "Public Sub Test()",
+                "    If Subject = 0 Then",
+                "        Subject = 1",
+                "    End If",
+                "End Sub"
+            };
+
+            var indenter = new Indenter(null, () => IndenterSettingsTests.GetMockIndenterSettings());
+            var actual = indenter.Indent(code, string.Empty);
+            Assert.IsTrue(expected.SequenceEqual(actual));
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -143,14 +143,15 @@ private void InitializeAddIn()`
`143`	`143`	`return;`
`144`	`144`	`}`
`145`	`145`
`146`		`- var config = new XmlPersistanceService<GeneralSettings>`
	`146`	`+ var configLoader = new XmlPersistanceService<GeneralSettings>`
`147`	`147`	`{`
`148`	`148`	`FilePath =`
`149`	`149`	`Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),`
`150`	`150`	`"Rubberduck", "rubberduck.config")`
`151`	`151`	`};`
`152`		`-`
`153`		`- var settings = config.Load(null);`
	`152`	`+ var configProvider = new GeneralConfigProvider(configLoader);`
	`153`	`+`
	`154`	`+ var settings = configProvider.Create();`
`154`	`155`	`if (settings != null)`
`155`	`156`	`{`
`156`	`157`	`try`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,10 @@ public NonReturningFunctionInspectionResult(IInspection inspection,`
`17`	`17`	`: base(inspection, qualifiedContext.ModuleName, qualifiedContext.Context, target)`
`18`	`18`	`{`
`19`	`19`	`_quickFixes = isInterfaceImplementation`
`20`		`- ? new CodeInspectionQuickFix[] { }`
	`20`	`+ ? new CodeInspectionQuickFix[]`
	`21`	`+ {`
	`22`	`+ new IgnoreOnceQuickFix(Context, QualifiedSelection, Inspection.AnnotationName),`
	`23`	`+ }`
`21`	`24`	`: new CodeInspectionQuickFix[]`
`22`	`25`	`{`
`23`	`26`	`new ConvertToProcedureQuickFix(Context, QualifiedSelection, target),`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,14 @@ public T Load(T toDeserialize)`
`37`	`37`
`38`	`38`	`if (!File.Exists(FilePath))`
`39`	`39`	`{`
`40`		`- return (T)Convert.ChangeType(null, type);`
	`40`	`+ return FailedLoadReturnValue();`
`41`	`41`	`}`
`42`	`42`	`var doc = GetConfigurationDoc(FilePath);`
`43`	`43`
`44`	`44`	`var node = doc.Descendants().FirstOrDefault(e => e.Name.LocalName.Equals(type.Name));`
`45`	`45`	`if (node == null)`
`46`	`46`	`{`
`47`		`- return (T)Convert.ChangeType(null, type);`
	`47`	`+ return FailedLoadReturnValue();`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`using (var reader = node.CreateReader())`
`@@ -57,11 +57,17 @@ public T Load(T toDeserialize)`
`57`	`57`	`}`
`58`	`58`	`catch`
`59`	`59`	`{`
`60`		`- return (T)Convert.ChangeType(null, type);`
	`60`	`+ return FailedLoadReturnValue();`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
	`65`	`+ private static T FailedLoadReturnValue()`
	`66`	`+ {`
	`67`	`+ return (T)Convert.ChangeType(null, typeof(T));`
	`68`	`+ }`
	`69`	`+`
	`70`	`+`
`65`	`71`	`public void Save(T toSerialize)`
`66`	`72`	`{`
`67`	`73`	`var doc = GetConfigurationDoc(FilePath);`