Skip to content

Commit a8792e6

Browse files
retailcoderretailcoder
committed
fixed merge glitch
1 parent 3394ec6 commit a8792e6

File tree

1 file changed

+146
-147
lines changed

1 file changed

+146
-147
lines changed

‎Rubberduck.Parsing/Symbols/FormEventDeclarations.cs

Lines changed: 146 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Collections.Generic;
2-
using System.Linq;
32
using Rubberduck.Parsing.VBA;
43
using Rubberduck.VBEditor;
54
using Rubberduck.Parsing.Annotations;
@@ -27,35 +26,35 @@ public IReadOnlyList<Declaration> Load()
2726
return AddHiddenMSFormDeclarations(formsClassModule);
2827
}
2928

30-
private static Declaration FormsClassModuleFromParserState(RubberduckParserState state)
31-
{
32-
var finder = new DeclarationFinder(state.AllDeclarations, new CommentNode[] { }, new IAnnotation[] { });
29+
private static Declaration FormsClassModuleFromParserState(RubberduckParserState state)
30+
{
31+
var finder = new DeclarationFinder(state.AllDeclarations, new CommentNode[] { }, new IAnnotation[] { });
3332

34-
var msForms = finder.FindProject("MSForms");
35-
if (msForms == null)
36-
{
37-
// If the VBA project is null, we haven't loaded any COM references;
38-
// we're in a unit test and the mock project didn't setup any references.
39-
return null;
33+
var msForms = finder.FindProject("MSForms");
34+
if (msForms == null)
35+
{
36+
// If the VBA project is null, we haven't loaded any COM references;
37+
// we're in a unit test and the mock project didn't setup any references.
38+
return null;
4039
}
4140

42-
return finder.FindStdModule("FormEvents", msForms, true);
43-
}
41+
return finder.FindStdModule("FormEvents", msForms, true);
42+
}
4443

4544

46-
private IReadOnlyList<Declaration> AddHiddenMSFormDeclarations(Declaration formsClassModule)
47-
{
45+
private IReadOnlyList<Declaration> AddHiddenMSFormDeclarations(Declaration formsClassModule)
46+
{
4847

49-
var userFormActivateEvent = CreateDeclaration(formsClassModule, "Activate");
50-
var userFormDeactivateEvent = CreateDeclaration(formsClassModule, "Deactivate");
51-
var userFormInitializeEvent = CreateDeclaration(formsClassModule, "Initialize");
52-
var userFormQueryCloseEvent = CreateDeclaration(formsClassModule, "QueryClose");
53-
var userFormQueryCloseEventCancelParameter = CreateParameter(userFormQueryCloseEvent, "Cancel", "Integer", true);
54-
var userFormQueryCloseEventCloseModeParameter = CreateParameter(userFormQueryCloseEvent, "CloseMode", "Integer", true);
55-
var userFormResizeEvent = CreateDeclaration(formsClassModule, "Resize");
56-
var userFormTerminateEvent = CreateDeclaration(formsClassModule, "Terminate");
48+
var userFormActivateEvent = UserFormActivateEvent(formsClassModule);
49+
var userFormDeactivateEvent = UserFormDeactivateEvent(formsClassModule);
50+
var userFormInitializeEvent = UserFormInitializeEvent(formsClassModule);
51+
var userFormQueryCloseEvent = UserFormQueryCloseEvent(formsClassModule);
52+
var userFormQueryCloseEventCancelParameter = UserFormQueryCloseEventCancelParameter(userFormQueryCloseEvent);
53+
var userFormQueryCloseEventCloseModeParameter = UserFormQueryCloseEventCloseModeParameter(userFormQueryCloseEvent);
54+
var userFormResizeEvent = UserFormResizeEvent(formsClassModule);
55+
var userFormTerminateEvent = UserFormTerminateEvent(formsClassModule);
5756

58-
return new List<Declaration>
57+
return new List<Declaration>
5958
{
6059
userFormActivateEvent,
6160
userFormDeactivateEvent,
@@ -66,131 +65,131 @@ private IReadOnlyList<Declaration> AddHiddenMSFormDeclarations(Declaration forms
6665
userFormResizeEvent,
6766
userFormTerminateEvent
6867
};
69-
}
68+
}
7069

71-
private static Declaration CreateDeclaration(Declaration parent, string name)
72-
{
73-
return new Declaration(
74-
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Activate"),
75-
formsClassModule,
76-
formsClassModule.Scope,
77-
string.Empty,
78-
string.Empty,
79-
false,
80-
false,
81-
Accessibility.Global,
82-
DeclarationType.Event,
83-
false,
84-
null);
85-
}
86-
87-
private static Declaration UserFormDeactivateEvent(Declaration formsClassModule)
88-
{
89-
return new Declaration(
90-
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Deactivate"),
91-
formsClassModule,
92-
formsClassModule.Scope,
93-
string.Empty,
94-
string.Empty,
95-
false,
96-
false,
97-
Accessibility.Global,
98-
DeclarationType.Event,
99-
false,
100-
null);
101-
}
102-
103-
private static Declaration UserFormInitializeEvent(Declaration formsClassModule)
104-
{
105-
return new Declaration(
106-
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Initialize"),
107-
formsClassModule,
108-
formsClassModule.Scope,
109-
string.Empty,
110-
string.Empty,
111-
false,
112-
false,
113-
Accessibility.Global,
114-
DeclarationType.Event,
115-
false,
116-
null);
117-
}
118-
119-
private static Declaration UserFormQueryCloseEvent(Declaration formsClassModule)
120-
{
121-
return new Declaration(
122-
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "QueryClose"),
123-
formsClassModule,
124-
formsClassModule.Scope,
125-
string.Empty,
126-
string.Empty,
127-
false,
128-
false,
129-
Accessibility.Global,
130-
DeclarationType.Event,
131-
false,
132-
null);
133-
}
134-
135-
private static ParameterDeclaration UserFormQueryCloseEventCancelParameter(Declaration userFormQueryCloseEvent)
136-
{
137-
return new ParameterDeclaration(
138-
new QualifiedMemberName(userFormQueryCloseEvent.QualifiedName.QualifiedModuleName, "Cancel"),
139-
userFormQueryCloseEvent,
140-
null,
141-
Selection.Empty,
142-
asType,
143-
null,
144-
string.Empty,
145-
isOptional,
146-
isByRef);
147-
}
148-
149-
private static ParameterDeclaration UserFormQueryCloseEventCloseModeParameter(Declaration userFormQueryCloseEvent)
150-
{
151-
return new ParameterDeclaration(
152-
new QualifiedMemberName(userFormQueryCloseEvent.QualifiedName.QualifiedModuleName, "CloseMode"),
153-
userFormQueryCloseEvent,
154-
null,
155-
new Selection(),
156-
"Integer",
157-
null,
158-
string.Empty,
159-
false,
160-
true);
161-
}
162-
163-
private static Declaration UserFormResizeEvent(Declaration formsClassModule)
164-
{
165-
return new Declaration(
166-
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Resize"),
167-
formsClassModule,
168-
formsClassModule.Scope,
169-
string.Empty,
170-
string.Empty,
171-
false,
172-
false,
173-
Accessibility.Global,
174-
DeclarationType.Event,
175-
false,
176-
null);
177-
}
178-
179-
private static Declaration UserFormTerminateEvent(Declaration formsClassModule)
180-
{
181-
return new Declaration(
182-
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Terminate"),
183-
formsClassModule,
184-
formsClassModule.Scope,
185-
string.Empty,
186-
string.Empty,
187-
false,
188-
false,
189-
Accessibility.Global,
190-
DeclarationType.Event,
191-
false,
192-
null);
193-
}
70+
private static Declaration UserFormActivateEvent(Declaration formsClassModule)
71+
{
72+
return new Declaration(
73+
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Activate"),
74+
formsClassModule,
75+
formsClassModule.Scope,
76+
string.Empty,
77+
string.Empty,
78+
false,
79+
false,
80+
Accessibility.Global,
81+
DeclarationType.Event,
82+
false,
83+
null);
84+
}
85+
86+
private static Declaration UserFormDeactivateEvent(Declaration formsClassModule)
87+
{
88+
return new Declaration(
89+
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Deactivate"),
90+
formsClassModule,
91+
formsClassModule.Scope,
92+
string.Empty,
93+
string.Empty,
94+
false,
95+
false,
96+
Accessibility.Global,
97+
DeclarationType.Event,
98+
false,
99+
null);
100+
}
101+
102+
private static Declaration UserFormInitializeEvent(Declaration formsClassModule)
103+
{
104+
return new Declaration(
105+
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Initialize"),
106+
formsClassModule,
107+
formsClassModule.Scope,
108+
string.Empty,
109+
string.Empty,
110+
false,
111+
false,
112+
Accessibility.Global,
113+
DeclarationType.Event,
114+
false,
115+
null);
116+
}
117+
118+
private static Declaration UserFormQueryCloseEvent(Declaration formsClassModule)
119+
{
120+
return new Declaration(
121+
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "QueryClose"),
122+
formsClassModule,
123+
formsClassModule.Scope,
124+
string.Empty,
125+
string.Empty,
126+
false,
127+
false,
128+
Accessibility.Global,
129+
DeclarationType.Event,
130+
false,
131+
null);
132+
}
133+
134+
private static ParameterDeclaration UserFormQueryCloseEventCancelParameter(Declaration userFormQueryCloseEvent)
135+
{
136+
return new ParameterDeclaration(
137+
new QualifiedMemberName(userFormQueryCloseEvent.QualifiedName.QualifiedModuleName, "Cancel"),
138+
userFormQueryCloseEvent,
139+
null,
140+
new Selection(),
141+
"Integer",
142+
null,
143+
string.Empty,
144+
false,
145+
true);
146+
}
147+
148+
private static ParameterDeclaration UserFormQueryCloseEventCloseModeParameter(Declaration userFormQueryCloseEvent)
149+
{
150+
return new ParameterDeclaration(
151+
new QualifiedMemberName(userFormQueryCloseEvent.QualifiedName.QualifiedModuleName, "CloseMode"),
152+
userFormQueryCloseEvent,
153+
null,
154+
new Selection(),
155+
"Integer",
156+
null,
157+
string.Empty,
158+
false,
159+
true);
160+
}
161+
162+
private static Declaration UserFormResizeEvent(Declaration formsClassModule)
163+
{
164+
return new Declaration(
165+
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Resize"),
166+
formsClassModule,
167+
formsClassModule.Scope,
168+
string.Empty,
169+
string.Empty,
170+
false,
171+
false,
172+
Accessibility.Global,
173+
DeclarationType.Event,
174+
false,
175+
null);
176+
}
177+
178+
private static Declaration UserFormTerminateEvent(Declaration formsClassModule)
179+
{
180+
return new Declaration(
181+
new QualifiedMemberName(formsClassModule.QualifiedName.QualifiedModuleName, "Terminate"),
182+
formsClassModule,
183+
formsClassModule.Scope,
184+
string.Empty,
185+
string.Empty,
186+
false,
187+
false,
188+
Accessibility.Global,
189+
DeclarationType.Event,
190+
false,
191+
null);
192+
}
194193

195194
}
196195
}

0 commit comments

Comments
 (0)