Merge pull request #1923 from Hosch250/bugs

Untyped functions are now resolved correctly

Author: retailcoder

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspection.cs

@@ -43,10 +43,9 @@ public UntypedFunctionUsageInspection(RubberduckParserState state)
         public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
             var declarations = BuiltInDeclarations
-                // note: these *should* be functions, but somehow they're not defined as such
                 .Where(item =>
                         _tokens.Any(token => item.IdentifierName == token || item.IdentifierName == "_B_var_" + token) &&
-                        item.References.Any(reference => _tokens.Contains(reference.IdentifierName)));
+                        item.Scope.StartsWith("VBE7.DLL;"));
 
             return declarations.SelectMany(declaration => declaration.References
                 .Where(item => _tokens.Contains(item.IdentifierName))

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspectionResult.cs

@@ -67,7 +67,8 @@ public override void Fix()
             var module = Selection.QualifiedName.Component.CodeModule;
             var lines = module.Lines[selection.StartLine, selection.LineCount];
 
-            var result = lines.Replace(originalInstruction, newInstruction);
+            var result = lines.Remove(Context.Start.Column, originalInstruction.Length)
+                .Insert(Context.Start.Column, newInstruction);
             module.ReplaceLine(selection.StartLine, result);
         }
 

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -134,6 +134,7 @@
     <Compile Include="Symbols\CommentNode.cs" />
     <Compile Include="Symbols\ComParameter.cs" />
     <Compile Include="Symbols\DebugDeclarations.cs" />
+    <Compile Include="Symbols\AliasDeclarations.cs" />
     <Compile Include="Symbols\FormEventDeclarations.cs" />
     <Compile Include="Symbols\ICustomDelarationLoader.cs" />
     <Compile Include="Symbols\Identifier.cs" />