Skip to content

Commit f7d88d0

Browse files
committed
Fixes Untyped Functions Tests
Mock needed _HiddenModule, Input and InputB
1 parent bcb78b0 commit f7d88d0

File tree

2 files changed

+93
-1
lines changed

2 files changed

+93
-1
lines changed

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspection.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ public UntypedFunctionUsageInspection(RubberduckParserState state)
3030
Tokens.Chr,
3131
Tokens.ChrW,
3232
Tokens.Format,
33+
Tokens.Input,
34+
Tokens.InputB,
3335
Tokens.LCase,
3436
Tokens.Left,
3537
Tokens.LeftB,

RubberduckTests/Inspections/UntypedFunctionUsageInspectionTests.cs

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,15 @@ private List<Declaration> GetBuiltInDeclarations()
252252
new List<IAnnotation>(),
253253
new Attributes());
254254

255+
var hiddenModule = new ProceduralModuleDeclaration(
256+
new QualifiedMemberName(new QualifiedModuleName("VBA", MockVbeBuilder.LibraryPathVBA, "_HiddenModule"), "_HiddenModule"),
257+
vbaDeclaration,
258+
"_HiddenModule",
259+
true,
260+
new List<IAnnotation>(),
261+
new Attributes());
262+
263+
255264
var commandFunction = new FunctionDeclaration(
256265
new QualifiedMemberName(interactionModule.QualifiedName.QualifiedModuleName, "_B_var_Command"),
257266
interactionModule,
@@ -715,6 +724,80 @@ private List<Declaration> GetBuiltInDeclarations()
715724
new List<IAnnotation>(),
716725
new Attributes());
717726

727+
//*******************************************************************
728+
729+
var inputbFunction = new FunctionDeclaration(
730+
new QualifiedMemberName(hiddenModule.QualifiedName.QualifiedModuleName, "_B_var_InputB"),
731+
hiddenModule,
732+
hiddenModule,
733+
"Variant",
734+
null,
735+
null,
736+
Accessibility.Global,
737+
null,
738+
Selection.Home,
739+
false,
740+
true,
741+
new List<IAnnotation>(),
742+
new Attributes());
743+
744+
var firstInputBParam = new ParameterDeclaration(
745+
new QualifiedMemberName(hiddenModule.QualifiedName.QualifiedModuleName, "Number"),
746+
inputbFunction,
747+
"Long",
748+
null,
749+
null,
750+
false,
751+
true);
752+
753+
var secondInputBParam = new ParameterDeclaration(
754+
new QualifiedMemberName(hiddenModule.QualifiedName.QualifiedModuleName, "FileNumber"),
755+
inputbFunction,
756+
"Integer",
757+
null,
758+
null,
759+
false,
760+
true);
761+
762+
inputbFunction.AddParameter(firstInputBParam);
763+
inputbFunction.AddParameter(secondInputBParam);
764+
765+
var inputFunction = new FunctionDeclaration(
766+
new QualifiedMemberName(hiddenModule.QualifiedName.QualifiedModuleName, "_B_var_Input"),
767+
hiddenModule,
768+
hiddenModule,
769+
"Variant",
770+
null,
771+
null,
772+
Accessibility.Global,
773+
null,
774+
Selection.Home,
775+
false,
776+
true,
777+
new List<IAnnotation>(),
778+
new Attributes());
779+
780+
var firstInputParam = new ParameterDeclaration(
781+
new QualifiedMemberName(hiddenModule.QualifiedName.QualifiedModuleName, "Number"),
782+
inputFunction,
783+
"Long",
784+
null,
785+
null,
786+
false,
787+
true);
788+
789+
var secondInputParam = new ParameterDeclaration(
790+
new QualifiedMemberName(hiddenModule.QualifiedName.QualifiedModuleName, "FileNumber"),
791+
inputFunction,
792+
"Integer",
793+
null,
794+
null,
795+
false,
796+
true);
797+
798+
inputFunction.AddParameter(firstInputParam);
799+
inputFunction.AddParameter(secondInputParam);
800+
718801
return new List<Declaration>
719802
{
720803
vbaDeclaration,
@@ -723,6 +806,7 @@ private List<Declaration> GetBuiltInDeclarations()
723806
interactionModule,
724807
stringsModule,
725808
dateTimeModule,
809+
hiddenModule,
726810
commandFunction,
727811
environFunction,
728812
rtrimFunction,
@@ -756,7 +840,13 @@ private List<Declaration> GetBuiltInDeclarations()
756840
strFunction,
757841
curDirFunction,
758842
datePropertyGet,
759-
timePropertyGet
843+
timePropertyGet,
844+
inputbFunction,
845+
firstInputBParam,
846+
secondInputBParam,
847+
inputFunction,
848+
firstInputParam,
849+
secondInputParam
760850
};
761851
}
762852
}

0 commit comments

Comments
 (0)