Merge pull request #2127 from rubberduck-vba/next

Release 2.0.7

Author: Hosch250

Installer Build Script.iss

@@ -27,6 +27,7 @@ OutputDir={#OutputDirectory}
 OutputBaseFilename=Rubberduck.Setup.{#AppVersion}
 Compression=lzma
 SolidCompression=yes
+SignTool=RubberduckSignTool /d $qRubberduck Installer$q $f
 
 ArchitecturesAllowed=x86 x64
 ArchitecturesInstallIn64BitMode=x64

RetailCoder.VBE/API/ParserState.cs

@@ -63,12 +63,12 @@ public void Initialize(VBE vbe)
                 throw new InvalidOperationException("ParserState is already initialized.");
             }
 
-            _state = new RubberduckParserState(vbe, new Sinks(vbe));
+            _state = new RubberduckParserState(new Sinks(vbe));
             _state.StateChanged += _state_StateChanged;
 
             Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
             _attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
-            _parser = new RubberduckParser(_state, _attributeParser, preprocessorFactory,
+            _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory,
                 new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new FormEventDeclarations(_state), new AliasDeclarations(_state) });
         }
 

RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspection.cs

@@ -5,11 +5,16 @@
 
 namespace Rubberduck.Inspections
 {
+    using SmartIndenter;
+
     public sealed class EncapsulatePublicFieldInspection : InspectionBase
     {
-        public EncapsulatePublicFieldInspection(RubberduckParserState state)
+        private readonly IIndenter _indenter;
+
+        public EncapsulatePublicFieldInspection(RubberduckParserState state, IIndenter indenter)
             : base(state, CodeInspectionSeverity.Suggestion)
         {
+            _indenter = indenter;
         }
 
         public override string Meta { get { return InspectionsUI.EncapsulatePublicFieldInspectionMeta; } }
@@ -21,7 +26,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
             var issues = UserDeclarations
                             .Where(declaration => declaration.DeclarationType == DeclarationType.Variable
                                                 && declaration.Accessibility == Accessibility.Public)
-                            .Select(issue => new EncapsulatePublicFieldInspectionResult(this, issue, State))
+                            .Select(issue => new EncapsulatePublicFieldInspectionResult(this, issue, State, _indenter))
                             .ToList();
 
             return issues;

RetailCoder.VBE/Inspections/EncapsulatePublicFieldInspectionResult.cs

@@ -9,16 +9,18 @@
 
 namespace Rubberduck.Inspections
 {
+    using SmartIndenter;
+
     public class EncapsulatePublicFieldInspectionResult : InspectionResultBase
     {
         private readonly IEnumerable<CodeInspectionQuickFix> _quickFixes;
 
-        public EncapsulatePublicFieldInspectionResult(IInspection inspection, Declaration target, RubberduckParserState state)
+        public EncapsulatePublicFieldInspectionResult(IInspection inspection, Declaration target, RubberduckParserState state, IIndenter indenter)
             : base(inspection, target)
         {
             _quickFixes = new CodeInspectionQuickFix[]
             {
-                new EncapsulateFieldQuickFix(target.Context, target.QualifiedSelection, target, state),
+                new EncapsulateFieldQuickFix(target.Context, target.QualifiedSelection, target, state, indenter),
                 new IgnoreOnceQuickFix(Context, QualifiedSelection, Inspection.AnnotationName)
             };
         }
@@ -38,22 +40,24 @@ public class EncapsulateFieldQuickFix : CodeInspectionQuickFix
     {
         private readonly Declaration _target;
         private readonly RubberduckParserState _state;
+        private readonly IIndenter _indenter;
 
-        public EncapsulateFieldQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state)
+        public EncapsulateFieldQuickFix(ParserRuleContext context, QualifiedSelection selection, Declaration target, RubberduckParserState state, IIndenter indenter)
             : base(context, selection, string.Format(InspectionsUI.EncapsulatePublicFieldInspectionQuickFix, target.IdentifierName))
         {
             _target = target;
             _state = state;
+            _indenter = indenter;
         }
 
         public override void Fix()
         {
             var vbe = Selection.QualifiedName.Project.VBE;
 
-            using (var view = new EncapsulateFieldDialog())
+            using (var view = new EncapsulateFieldDialog(_indenter))
             {
                 var factory = new EncapsulateFieldPresenterFactory(vbe, _state, view);
-                var refactoring = new EncapsulateFieldRefactoring(vbe, factory);
+                var refactoring = new EncapsulateFieldRefactoring(vbe, _indenter, factory);
                 refactoring.Refactor(_target);
                 IsCancelled = view.DialogResult != DialogResult.OK;
             }

RetailCoder.VBE/Inspections/IParseTreeInspection.cs

@@ -25,6 +25,6 @@ public ParseTreeResults()
         public IEnumerable<QualifiedContext> ObsoleteLetContexts;
         public IEnumerable<QualifiedContext> ArgListsWithOneByRefParam;
         public IEnumerable<QualifiedContext> EmptyStringLiterals;
-        public IEnumerable<QualifiedContext<VBAParser.AnnotationContext>> MalformedAnnotations;
+        public IEnumerable<QualifiedContext> MalformedAnnotations;
     }
 }

RetailCoder.VBE/Inspections/InspectionsUI.Designer.cs

@@ -304,7 +304,8 @@
     <value>Variable wird genutzt ohne das ihr ein Wert zugewiesen wurde.</value>
   </data>
   <data name="UntypedFunctionUsageInspectionMeta" xml:space="preserve">
-    <value>Eine gibt eine Funktion, die einen String Äquivalnet zurückgibt. Diese sollte bevorzugt genutzt werden, um implitizite Typumwandlungen zu vermeiden.</value>
+    <value>Eine gibt eine Funktion, die einen String Äquivalent zurückgibt. Diese sollte bevorzugt genutzt werden, um implitizite Typumwandlungen zu vermeiden.
+Falls der Parameter 'null' sein kann, bitte dieses Auftreten ignorieren. 'null' an die Funktion zu übergeben, die einen String erwartet würde zu einem "Type Mismatch"-Laufzeitfehler führen.</value>
   </data>
   <data name="UntypedFunctionUsageInspectionName" xml:space="preserve">
     <value>Nutzung einer Funktion, die einen 'String Variant' zurückgibt.</value>
@@ -554,4 +555,13 @@
   <data name="MultipleDeclarationsInspectionResultFormat" xml:space="preserve">
     <value>Instruktion enthält Mehrfachdeklaration</value>
   </data>
+  <data name="MalformedAnnotationInspectionName">
+    <value>Unlesbare Annotation</value>
+  </data>
+  <data name="MalformedAnnotationInspectionResultFormat">
+    <value>Annotation '{0}' ist nicht lesbar</value>
+  </data>
+  <data name="MalformedAnnotationInspectionMeta">
+    <value>Eine Annotation in einem Kommentar konnte nicht gelesen werden.</value>
+  </data>
 </root>

RetailCoder.VBE/Inspections/InspectionsUI.de.resx

@@ -304,7 +304,8 @@
     <value>Variable is used but not assigned</value>
   </data>
   <data name="UntypedFunctionUsageInspectionMeta" xml:space="preserve">
-    <value>A string-returning equivalent function exists and should preferably be used to avoid implicit type conversions.</value>
+    <value>A string-returning equivalent function exists and should preferably be used to avoid implicit type conversions. 
+If the parameter can be null, ignore this inspection result; passing a null value to a function expecting a string would raise a type mismatch runtime error.</value>
   </data>
   <data name="UntypedFunctionUsageInspectionName" xml:space="preserve">
     <value>Use of variant-returning string function</value>
@@ -564,4 +565,4 @@
   <data name="MalformedAnnotationInspectionResultFormat" xml:space="preserve">
     <value>Malformed '{0}' annotation.</value>
   </data>
-</root>
+</root>

RetailCoder.VBE/Inspections/InspectionsUI.resx

@@ -25,10 +25,10 @@ public Inspector(IGeneralConfigService configService, IEnumerable<IInspection> i
                 _inspections = inspections;
 
                 _configService = configService;
-                configService.SettingsChanged += ConfigServiceLanguageChanged;
+                configService.SettingsChanged += ConfigServiceSettingsChanged;
             }
 
-            private void ConfigServiceLanguageChanged(object sender, EventArgs e)
+            private void ConfigServiceSettingsChanged(object sender, EventArgs e)
             {
                 UpdateInspectionSeverity();
             }
@@ -125,7 +125,7 @@ public void Dispose()
             {
                 if (_configService != null)
                 {
-                    _configService.SettingsChanged -= ConfigServiceLanguageChanged;
+                    _configService.SettingsChanged -= ConfigServiceSettingsChanged;
                 }
             }
         }

RetailCoder.VBE/Inspections/Inspector.cs

@@ -27,16 +27,18 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
 
             var results = new List<MalformedAnnotationInspectionResult>();
 
-            foreach (var context in ParseTreeResults.MalformedAnnotations)
+            foreach (var result in ParseTreeResults.MalformedAnnotations)
             {
-                if (context.Context.annotationName().GetText() == AnnotationType.Ignore.ToString() ||
-                    context.Context.annotationName().GetText() == AnnotationType.Folder.ToString())
+                var context = (VBAParser.AnnotationContext)result.Context;
+
+                if (context.annotationName().GetText() == AnnotationType.Ignore.ToString() ||
+                    context.annotationName().GetText() == AnnotationType.Folder.ToString())
                 {
-                    if (context.Context.annotationArgList() == null)
+                    if (context.annotationArgList() == null)
                     {
                         results.Add(new MalformedAnnotationInspectionResult(this,
-                            new QualifiedContext<VBAParser.AnnotationContext>(context.ModuleName,
-                                context.Context)));
+                            new QualifiedContext<VBAParser.AnnotationContext>(result.ModuleName,
+                                context)));
                     }
                 }
             }