Skip to content

Commit 613cd78

Browse files
MDoernerMDoerner
committed
Made attributes pass context supposed to hold the attributes for a declaration available on the declaration.
1 parent 41d91e1 commit 613cd78

37 files changed

+342
-167
lines changed

‎Rubberduck.Parsing/ComReflection/SerializableDeclaration.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -232,25 +232,25 @@ public Declaration Unwrap(Declaration parent)
232232
case DeclarationType.ProceduralModule:
233233
return new ProceduralModuleDeclaration(QualifiedMemberName, parent, IdentifierName, false, annotations, attributes);
234234
case DeclarationType.Procedure:
235-
return new SubroutineDeclaration(QualifiedMemberName, parent, parent, AsTypeName, Accessibility, null, Selection.Empty, false, annotations, attributes);
235+
return new SubroutineDeclaration(QualifiedMemberName, parent, parent, AsTypeName, Accessibility, null, null, Selection.Empty, false, annotations, attributes);
236236
case DeclarationType.Function:
237-
return new FunctionDeclaration(QualifiedMemberName, parent, parent, AsTypeName, null, TypeHint, Accessibility, null, Selection.Empty, IsArray, false, annotations, attributes);
237+
return new FunctionDeclaration(QualifiedMemberName, parent, parent, AsTypeName, null, TypeHint, Accessibility, null, null, Selection.Empty, IsArray, false, annotations, attributes);
238238
case DeclarationType.Event:
239239
return new EventDeclaration(QualifiedMemberName, parent, parent, AsTypeName, null, TypeHint, Accessibility, null, Selection.Empty, IsArray, false, annotations, attributes);
240240
case DeclarationType.PropertyGet:
241-
return new PropertyGetDeclaration(QualifiedMemberName, parent, parent, AsTypeName, null, TypeHint, Accessibility, null, Selection.Empty, IsArray, false, annotations, attributes);
241+
return new PropertyGetDeclaration(QualifiedMemberName, parent, parent, AsTypeName, null, TypeHint, Accessibility, null, null, Selection.Empty, IsArray, false, annotations, attributes);
242242
case DeclarationType.PropertyLet:
243-
return new PropertyLetDeclaration(QualifiedMemberName, parent, parent, AsTypeName, Accessibility, null, Selection.Empty, false, annotations, attributes);
243+
return new PropertyLetDeclaration(QualifiedMemberName, parent, parent, AsTypeName, Accessibility, null, null, Selection.Empty, false, annotations, attributes);
244244
case DeclarationType.PropertySet:
245-
return new PropertySetDeclaration(QualifiedMemberName, parent, parent, AsTypeName, Accessibility, null, Selection.Empty, false, annotations, attributes);
245+
return new PropertySetDeclaration(QualifiedMemberName, parent, parent, AsTypeName, Accessibility, null, null, Selection.Empty, false, annotations, attributes);
246246
case DeclarationType.Parameter:
247247
return new ParameterDeclaration(QualifiedMemberName, parent, AsTypeName, null, TypeHint, IsOptionalParam, IsByRefParam, IsArray, IsParamArray, DefaultValue);
248248
case DeclarationType.EnumerationMember:
249249
return new ValuedDeclaration(QualifiedMemberName, parent, ParentScope, AsTypeName, null, TypeHint, annotations, Accessibility, DeclarationType.EnumerationMember, Expression, null, Selection.Home, false);
250250
case DeclarationType.Constant:
251251
return new ValuedDeclaration(QualifiedMemberName, parent, ParentScope, AsTypeName, null, TypeHint, annotations, Accessibility, DeclarationType.Constant, Expression, null, Selection.Home, false);
252252
default:
253-
return new Declaration(QualifiedMemberName, parent, ParentScope, AsTypeName, TypeHint, IsSelfAssigned, IsWithEvents, Accessibility, DeclarationType, null, Selection.Empty, IsArray, null, IsUserDefined, null, attributes);
253+
return new Declaration(QualifiedMemberName, parent, ParentScope, AsTypeName, TypeHint, IsSelfAssigned, IsWithEvents, Accessibility, DeclarationType, null, null, Selection.Empty, IsArray, null, IsUserDefined, null, attributes);
254254
}
255255
}
256256
}

‎Rubberduck.Parsing/Symbols/AliasDeclaration.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public AliasDeclaration(ComAlias alias, Declaration parent, QualifiedModuleName
1717
Accessibility.Public,
1818
DeclarationType.ComAlias,
1919
null,
20+
null,
2021
Selection.Home,
2122
false,
2223
null,

‎Rubberduck.Parsing/Symbols/ClassModuleDeclaration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public ClassModuleDeclaration(
3939
Accessibility.Public,
4040
DeclarationType.ClassModule,
4141
null,
42+
null,
4243
Selection.Home,
4344
false,
4445
null,
@@ -78,6 +79,7 @@ public ClassModuleDeclaration(ComCoClass coClass, Declaration parent, QualifiedM
7879
Accessibility.Public,
7980
DeclarationType.ClassModule,
8081
null,
82+
null,
8183
Selection.Home,
8284
false,
8385
null,

‎Rubberduck.Parsing/Symbols/Declaration.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public Declaration(
3333
Accessibility accessibility,
3434
DeclarationType declarationType,
3535
ParserRuleContext context,
36+
ParserRuleContext attributesPassContext,
3637
Selection selection,
3738
bool isArray,
3839
VBAParser.AsTypeClauseContext asTypeContext,
@@ -51,6 +52,7 @@ public Declaration(
5152
accessibility,
5253
declarationType,
5354
context,
55+
attributesPassContext,
5456
selection,
5557
isArray,
5658
asTypeContext,
@@ -88,6 +90,7 @@ public Declaration(
8890
accessibility,
8991
declarationType,
9092
null,
93+
null,
9194
Selection.Home,
9295
isArray,
9396
asTypeContext,
@@ -107,6 +110,7 @@ public Declaration(
107110
Accessibility accessibility,
108111
DeclarationType declarationType,
109112
ParserRuleContext context,
113+
ParserRuleContext attributesPassContext,
110114
Selection selection,
111115
bool isArray,
112116
VBAParser.AsTypeClauseContext asTypeContext,
@@ -126,6 +130,7 @@ public Declaration(
126130
DeclarationType = declarationType;
127131
Selection = selection;
128132
Context = context;
133+
AttributesPassContext = attributesPassContext;
129134
IsUserDefined = isUserDefined;
130135
_annotations = annotations;
131136
_attributes = attributes ?? new Attributes();
@@ -159,6 +164,7 @@ public Declaration(ComEnumeration enumeration, Declaration parent, QualifiedModu
159164
Accessibility.Global,
160165
DeclarationType.Enumeration,
161166
null,
167+
null,
162168
Selection.Home,
163169
false,
164170
null,
@@ -178,6 +184,7 @@ public Declaration(ComStruct structure, Declaration parent, QualifiedModuleName
178184
Accessibility.Global,
179185
DeclarationType.UserDefinedType,
180186
null,
187+
null,
181188
Selection.Home,
182189
false,
183190
null,
@@ -196,6 +203,7 @@ public Declaration(ComEnumerationMember member, Declaration parent, QualifiedMod
196203
Accessibility.Global,
197204
DeclarationType.EnumerationMember,
198205
null,
206+
null,
199207
Selection.Home,
200208
false,
201209
null,
@@ -215,6 +223,7 @@ public Declaration(ComField field, Declaration parent, QualifiedModuleName modul
215223
Accessibility.Global,
216224
field.Type,
217225
null,
226+
null,
218227
Selection.Home,
219228
false,
220229
null,
@@ -282,6 +291,7 @@ public static Declaration GetProjectParent(Declaration declaration)
282291
public QualifiedModuleName QualifiedModuleName => QualifiedName.QualifiedModuleName;
283292

284293
public ParserRuleContext Context { get; }
294+
public ParserRuleContext AttributesPassContext { get; }
285295

286296
private ConcurrentBag<IdentifierReference> _references = new ConcurrentBag<IdentifierReference>();
287297
public IEnumerable<IdentifierReference> References => _references;

‎Rubberduck.Parsing/Symbols/DeclarationFinder.cs

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -681,9 +681,23 @@ public Declaration OnUndeclaredVariable(Declaration enclosingProcedure, string i
681681
var undeclaredLocal =
682682
new Declaration(
683683
new QualifiedMemberName(enclosingProcedure.QualifiedName.QualifiedModuleName, identifierName),
684-
enclosingProcedure, enclosingProcedure, "Variant", string.Empty, false, false,
685-
Accessibility.Implicit, DeclarationType.Variable, context, context.GetSelection(), false, null,
686-
true, annotations, null, true);
684+
enclosingProcedure,
685+
enclosingProcedure,
686+
"Variant",
687+
string.Empty,
688+
false,
689+
false,
690+
Accessibility.Implicit,
691+
DeclarationType.Variable,
692+
context,
693+
null,
694+
context.GetSelection(),
695+
false,
696+
null,
697+
true,
698+
annotations,
699+
null,
700+
true);
687701

688702
var hasUndeclared = _newUndeclared.ContainsKey(enclosingProcedure.QualifiedName);
689703
if (hasUndeclared)
@@ -739,7 +753,7 @@ public Declaration OnBracketedExpression(string expression, ParserRuleContext co
739753
return undeclared.SingleOrDefault();
740754
}
741755

742-
var item = new Declaration(qualifiedName, hostApp, hostApp, Tokens.Variant, string.Empty, false, false, Accessibility.Global, DeclarationType.BracketedExpression, context, context.GetSelection(), true, null);
756+
var item = new Declaration(qualifiedName, hostApp, hostApp, Tokens.Variant, string.Empty, false, false, Accessibility.Global, DeclarationType.BracketedExpression, context, null, context.GetSelection(), true, null);
743757
_newUndeclared.TryAdd(qualifiedName, new ConcurrentBag<Declaration> { item });
744758
return item;
745759
}

0 commit comments

Comments
 (0)