Merge pull request #2421 from MDoerner/issue2414

Fix for issue 2414

Author: retailcoder

RetailCoder.VBE/API/ParserState.cs

@@ -73,7 +73,7 @@ public void Initialize(VBE vbe)
             Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
             _attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
             _parser = new RubberduckParser(vbe, _state, _attributeParser, preprocessorFactory,
-                new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new FormEventDeclarations(_state), new AliasDeclarations(_state) });
+                new List<ICustomDeclarationLoader> { new DebugDeclarations(_state), new SpecialFormDeclarations(_state), new FormEventDeclarations(_state), new AliasDeclarations(_state) });
         }
 
         /// <summary>

Rubberduck.Parsing/Rubberduck.Parsing.csproj

@@ -129,6 +129,7 @@
     <Compile Include="Preprocessing\VBADateListener.cs" />
     <Compile Include="Preprocessing\VBADateParser.cs" />
     <Compile Include="Preprocessing\VBADateVisitor.cs" />
+    <Compile Include="Symbols\SpecialFormDeclarations.cs" />
     <Compile Include="Symbols\ComInformation.cs" />
     <Compile Include="Symbols\CommentNode.cs" />
     <Compile Include="Symbols\ComParameter.cs" />

Rubberduck.Parsing/Symbols/DebugDeclarations.cs

@@ -34,13 +34,7 @@ public IReadOnlyList<Declaration> Load()
                 return new List<Declaration>();
             }
 
-            var informationModule = _finder.FindStdModule("Information", vba, true);
-            Debug.Assert(informationModule != null, "We expect the information module to exist in the VBA project.");
-
-            var debugDeclarations = LoadDebugDeclarations(vba);
-            var specialFormDeclarations = LoadSpecialFormDeclarations(informationModule);
-
-            return debugDeclarations.Concat(specialFormDeclarations).ToList();
+            return LoadDebugDeclarations(vba);
         }
 
             private static bool ThereIsAGlobalBuiltInErrVariableDeclaration(DeclarationFinder finder) 
@@ -161,179 +155,5 @@ private static SubroutineDeclaration DebugPrintDeclaration(ClassModuleDeclaratio
                     new Attributes());
             }
 
-
-        private List<Declaration> LoadSpecialFormDeclarations(Declaration parentModule)
-        {
-            Debug.Assert(parentModule != null);
-
-            var arrayFunction = ArrayFunction(parentModule);
-            var inputFunction = InputFunction(parentModule);
-            var inputBFunction = InputBFunction(parentModule);
-            var lboundFunction = LBoundFunction(parentModule);
-            var uboundFunction = UBoundFunction(parentModule);
-
-            return new List<Declaration> { 
-                arrayFunction,
-                inputFunction,
-                inputBFunction,
-                lboundFunction,
-                uboundFunction
-            };
-        }
-
-            private static FunctionDeclaration ArrayFunction(Declaration parentModule)
-            {
-                return new FunctionDeclaration(
-                    new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "Array"),
-                    parentModule,
-                    parentModule,
-                    "Variant",
-                    null,
-                    null,
-                    Accessibility.Public,
-                    null,
-                    Selection.Home,
-                    false,
-                    true,
-                    null,
-                    new Attributes());
-            }
-
-            private static SubroutineDeclaration InputFunction(Declaration parentModule)
-            {
-                var inputFunction = InputFunctionWithoutParameters(parentModule);
-                inputFunction.AddParameter(NumberParameter(parentModule, inputFunction));
-                inputFunction.AddParameter(FileNumberParameter(parentModule, inputFunction));
-                return inputFunction;
-            }
-
-                private static SubroutineDeclaration InputFunctionWithoutParameters(Declaration parentModule)
-                {
-                    return new SubroutineDeclaration(
-                        new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "Input"), 
-                        parentModule, 
-                        parentModule, 
-                        "Variant", 
-                        Accessibility.Public, 
-                        null, 
-                        Selection.Home, 
-                        true, 
-                        null, 
-                        new Attributes());
-                }
-
-                private static ParameterDeclaration NumberParameter(Declaration parentModule, SubroutineDeclaration ParentSubroutine)
-                {
-                    return new ParameterDeclaration(
-                        new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "Number"), 
-                        ParentSubroutine, 
-                        "Integer", 
-                        null, 
-                        null, 
-                        false, 
-                        false);
-                }
-
-                private static ParameterDeclaration FileNumberParameter(Declaration parentModule, SubroutineDeclaration ParentSubroutine)
-                {
-                    return new ParameterDeclaration(
-                        new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "Filenumber"), 
-                        ParentSubroutine, 
-                        "Integer", 
-                        null, 
-                        null, 
-                        false, 
-                        false);
-                }
-
-            private static SubroutineDeclaration InputBFunction(Declaration parentModule)
-            {
-                var inputBFunction = InputBFunctionWithoutParameters(parentModule);
-                inputBFunction.AddParameter(NumberParameter(parentModule, inputBFunction));
-                inputBFunction.AddParameter(FileNumberParameter(parentModule, inputBFunction));
-                return inputBFunction;
-            }
-
-                private static SubroutineDeclaration InputBFunctionWithoutParameters(Declaration parentModule)
-                {
-                    return new SubroutineDeclaration(
-                        new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "InputB"), 
-                        parentModule, 
-                        parentModule, 
-                        "Variant", 
-                        Accessibility.Public, 
-                        null, 
-                        Selection.Home, 
-                        true, 
-                        null, 
-                        new Attributes());
-                }
-
-
-            private static FunctionDeclaration LBoundFunction(Declaration parentModule)
-            {
-                var lboundFunction = LBoundFunctionWithoutParameters(parentModule);
-                lboundFunction.AddParameter(ArrayNameParameter(parentModule, lboundFunction));
-                lboundFunction.AddParameter(DimensionParameter(parentModule, lboundFunction));
-                return lboundFunction;
-            }
-
-                private static FunctionDeclaration LBoundFunctionWithoutParameters(Declaration parentModule)
-                {
-                    return new FunctionDeclaration(
-                        new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "LBound"),
-                        parentModule,
-                        parentModule,
-                        "Long",
-                        null,
-                        null,
-                        Accessibility.Public,
-                        null,
-                        Selection.Home,
-                        false,
-                        true,
-                        null,
-                        new Attributes());
-                }
-        
-                private static ParameterDeclaration ArrayNameParameter(Declaration parentModule, FunctionDeclaration parentFunction)
-                {
-                    var arrayParam = new ParameterDeclaration(new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "Arrayname"), parentFunction, "Variant", null, null, false, false, true);
-                    return arrayParam;
-                }
-
-                private static ParameterDeclaration DimensionParameter(Declaration parentModule, FunctionDeclaration parentFunction)
-                {
-                    var rankParam = new ParameterDeclaration(new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "Dimension"), parentFunction, "Long", null, null, true, false);
-                    return rankParam;
-                }
-
-
-            private static FunctionDeclaration UBoundFunction(Declaration parentModule)
-            {
-                var uboundFunction = UBoundFunctionWithoutParameters(parentModule);
-                uboundFunction.AddParameter(ArrayNameParameter(parentModule, uboundFunction));
-                uboundFunction.AddParameter(DimensionParameter(parentModule, uboundFunction));
-                return uboundFunction;
-            }
-
-                private static FunctionDeclaration UBoundFunctionWithoutParameters(Declaration parentModule)
-                {
-                    return new FunctionDeclaration(
-                        new QualifiedMemberName(parentModule.QualifiedName.QualifiedModuleName, "UBound"),
-                        parentModule,
-                        parentModule,
-                        "Long",
-                        null,
-                        null,
-                        Accessibility.Public,
-                        null,
-                        Selection.Home,
-                        false,
-                        true,
-                        null,
-                        new Attributes());
-                }
-
     }
 }