Skip to content

Commit f572046

Browse files
authored
Merge pull request #2485 from retailcoder/next
added VBA.Strings.String aliased function
2 parents 5eeba8e + 027103a commit f572046

File tree

7 files changed

+637
-588
lines changed

7 files changed

+637
-588
lines changed

RetailCoder.VBE/NLog.dll.nlog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
archiveAboveSize="5242880"
1313
archiveNumbering="Sequence"
1414
concurrentWrites="true"
15+
archiveEvery="Day"
16+
deleteOldFileOnStartup="true"
1517
keepFileOpen="false"
1618
encoding="UTF-8"/>
1719
<target

Rubberduck.Parsing/Binding/SimpleNameDefaultBinding.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,12 @@ within the enclosing project other than the enclosing module.
200200
{
201201
return new SimpleNameExpression(accessibleConstant, ExpressionClassification.Variable, _context);
202202
}
203-
var accessibleType = _declarationFinder.FindMemberEnclosedProjectWithoutEnclosingModule(_project, _module, _parent, _name, DeclarationType.Enumeration);
203+
var accessibleType = _declarationFinder.FindMemberEnclosedProjectWithoutEnclosingModule(_project, _module, _parent, _name, DeclarationType.EnumerationMember);
204204
if (IsValidMatch(accessibleType, _name))
205205
{
206206
return new SimpleNameExpression(accessibleType, ExpressionClassification.Type, _context);
207207
}
208-
var accessibleMember = _declarationFinder.FindMemberEnclosedProjectWithoutEnclosingModule(_project, _module, _parent, _name, DeclarationType.EnumerationMember);
208+
var accessibleMember = _declarationFinder.FindMemberEnclosedProjectWithoutEnclosingModule(_project, _module, _parent, _name, DeclarationType.Enumeration);
209209
if (IsValidMatch(accessibleMember, _name))
210210
{
211211
return new SimpleNameExpression(accessibleMember, ExpressionClassification.Value, _context);
@@ -328,6 +328,7 @@ private IBoundExpression ResolveModuleReferencedProjectNamespace()
328328
{
329329
return new SimpleNameExpression(globalClassModuleSubroutine, ExpressionClassification.Subroutine, _context);
330330
}
331+
331332
return null;
332333
}
333334

@@ -354,7 +355,7 @@ private bool IsValidMatch(Declaration match, string name)
354355
{
355356
return true;
356357
}
357-
if (((IDeclarationWithParameter)match).Parameters.Count() > 0)
358+
if (((IDeclarationWithParameter)match).Parameters.Any())
358359
{
359360
return true;
360361
}

0 commit comments

Comments
 (0)