Skip to content

Commit ab46e4b

Browse files
MDoernerMDoerner
committed
Fixed stupid mistake from previous commit and renamed StandAloneModuleToModuleManager to ModuleToModuleManager
1 parent c691c8e commit ab46e4b

File tree

9 files changed

+26
-20
lines changed

9 files changed

+26
-20
lines changed

‎RetailCoder.VBE/API/ParserState.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void Initialize(Microsoft.Vbe.Interop.VBE vbe)
6868
Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(_vbe.Version, CultureInfo.InvariantCulture));
6969
_attributeParser = new AttributeParser(new ModuleExporter(), preprocessorFactory);
7070
var projectManager = new ProjectManager(_state, _vbe);
71-
var moduleToModuleReferenceManager = new StandAloneModuleToModuleReferenceManager();
71+
var moduleToModuleReferenceManager = new ModuleToModuleReferenceManager();
7272
var parserStateManager = new ParserStateManager(_state);
7373
var referenceRemover = new ReferenceRemover(_state, moduleToModuleReferenceManager);
7474
var comSynchronizer = new COMReferenceSynchronizer(_state, parserStateManager);

‎RetailCoder.VBE/Root/RubberduckModule.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public override void Load()
105105
Rebind<ICOMReferenceSynchronizer, IProjectReferencesProvider>().To<COMReferenceSynchronizer>().InSingletonScope().WithConstructorArgument("serializedDeclarationsPath", (string)null);
106106
Rebind<IBuiltInDeclarationLoader>().To<BuiltInDeclarationLoader>().InSingletonScope();
107107
Rebind<IDeclarationResolveRunner>().To<DeclarationResolveRunner>().InSingletonScope();
108-
Rebind<IModuleToModuleReferenceManager>().To<StandAloneModuleToModuleReferenceManager>().InSingletonScope();
108+
Rebind<IModuleToModuleReferenceManager>().To<ModuleToModuleReferenceManager>().InSingletonScope();
109109
Rebind<IParserStateManager>().To<ParserStateManager>().InSingletonScope();
110110
Rebind<IParseRunner>().To<ParseRunner>().InSingletonScope();
111111
Rebind<IParsingStageService>().To<ParsingStageService>().InSingletonScope();

‎Rubberduck.Parsing/Rubberduck.Parsing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
<Compile Include="VBA\AttributeParser.cs" />
336336
<Compile Include="VBA\Attributes.cs" />
337337
<Compile Include="VBA\BuiltInDeclarationLoader.cs" />
338-
<Compile Include="VBA\StandAloneModuleToModuleReferenceManager.cs" />
338+
<Compile Include="VBA\ModuleToModuleReferenceManager.cs" />
339339
<Compile Include="VBA\IDeclarationFinderProvider.cs" />
340340
<Compile Include="VBA\IParseTreeProvider.cs" />
341341
<Compile Include="VBA\ParsingStageService.cs" />

‎Rubberduck.Parsing/Symbols/DeclarationLoaders/DebugDeclarations.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,26 @@ namespace Rubberduck.Parsing.Symbols.DeclarationLoaders
99
public class DebugDeclarations : ICustomDeclarationLoader
1010
{
1111
public static Declaration DebugPrint;
12-
private readonly DeclarationFinder _finder;
12+
private readonly IDeclarationFinderProvider _finderProvider;
1313

1414
public DebugDeclarations(IDeclarationFinderProvider finderProvider)
1515
{
16-
_finder = finderProvider.DeclarationFinder;
16+
_finderProvider = finderProvider;
1717
}
1818

1919
public IReadOnlyList<Declaration> Load()
2020
{
21-
var vba = _finder.FindProject("VBA");
21+
var finder = _finderProvider.DeclarationFinder;
22+
23+
var vba = finder.FindProject("VBA");
2224
if (vba == null)
2325
{
2426
// If the VBA project is null, we haven't loaded any COM references;
2527
// we're in a unit test and the mock project didn't setup any references.
2628
return new List<Declaration>();
2729
}
2830

29-
if (WeHaveAlreadyLoadedTheDeclarationsBefore(_finder, vba))
31+
if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder, vba))
3032
{
3133
return new List<Declaration>();
3234
}
@@ -87,7 +89,7 @@ private static QualifiedModuleName DebugModuleName(Declaration parentProject)
8789
return new QualifiedModuleName(
8890
parentProject.QualifiedName.QualifiedModuleName.ProjectName,
8991
parentProject.QualifiedName.QualifiedModuleName.ProjectPath,
90-
"DebugClass");
92+
"DebugModule");
9193
}
9294

9395

‎Rubberduck.Parsing/Symbols/DeclarationLoaders/FormEventDeclarations.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,20 @@ namespace Rubberduck.Parsing.Symbols.DeclarationLoaders
77
{
88
public class FormEventDeclarations : ICustomDeclarationLoader
99
{
10-
private readonly DeclarationFinder _finder;
10+
private readonly IDeclarationFinderProvider _finderProvider;
1111

1212
public FormEventDeclarations(IDeclarationFinderProvider finderProvider)
1313
{
14-
_finder = finderProvider.DeclarationFinder;
14+
_finderProvider = finderProvider;
1515
}
1616

1717
public IReadOnlyList<Declaration> Load()
1818
{
19-
var formsClassModule = FormsClassModuleFromParserState(_finder);
19+
var finder = _finderProvider.DeclarationFinder;
2020

21-
if (formsClassModule == null || WeHaveAlreadyLoadedTheDeclarationsBefore(_finder, formsClassModule))
21+
var formsClassModule = FormsClassModuleFromParserState(finder);
22+
23+
if (formsClassModule == null || WeHaveAlreadyLoadedTheDeclarationsBefore(finder, formsClassModule))
2224
{
2325
return new List<Declaration>();
2426
}

‎Rubberduck.Parsing/Symbols/DeclarationLoaders/SpecialFormDeclarations.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,35 @@ namespace Rubberduck.Parsing.Symbols.DeclarationLoaders
88
{
99
public class SpecialFormDeclarations : ICustomDeclarationLoader
1010
{
11-
private readonly DeclarationFinder _finder;
11+
private readonly IDeclarationFinderProvider _finderProvider;
1212

1313
public SpecialFormDeclarations(IDeclarationFinderProvider finderProvider)
1414
{
15-
_finder = finderProvider.DeclarationFinder;
15+
_finderProvider = finderProvider;
1616
}
1717

1818

1919
public IReadOnlyList<Declaration> Load()
2020
{
21-
var vba = _finder.FindProject("VBA");
21+
var finder = _finderProvider.DeclarationFinder;
22+
23+
var vba = finder.FindProject("VBA");
2224
if (vba == null)
2325
{
2426
// If the VBA project is null, we haven't loaded any COM references;
2527
// we're in a unit test and the mock project didn't setup any references.
2628
return new List<Declaration>();
2729
}
2830

29-
var informationModule = _finder.FindStdModule("Information", vba, true);
31+
var informationModule = finder.FindStdModule("Information", vba, true);
3032
if (informationModule == null)
3133
{
3234
//This should not happen under normal circumstances.
3335
//Most probably, we are in a test that only addded parts of the VBA project.
3436
return new List<Declaration>();
3537
}
3638

37-
if (WeHaveAlreadyLoadedTheDeclarationsBefore(_finder, informationModule))
39+
if (WeHaveAlreadyLoadedTheDeclarationsBefore(finder, informationModule))
3840
{
3941
return new List<Declaration>();
4042
}

‎Rubberduck.Parsing/VBA/StandAloneModuleToModuleReferenceManager.cs‎ renamed to ‎Rubberduck.Parsing/VBA/ModuleToModuleReferenceManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Rubberduck.Parsing.VBA
66
{
7-
public class StandAloneModuleToModuleReferenceManager : ModuleToModuleReferenceManagerBase
7+
public class ModuleToModuleReferenceManager : ModuleToModuleReferenceManagerBase
88
{
99
private ConcurrentDictionary<QualifiedModuleName, ConcurrentDictionary<QualifiedModuleName, byte>> _referencesFrom = new ConcurrentDictionary<QualifiedModuleName, ConcurrentDictionary<QualifiedModuleName, byte>>();
1010
private ConcurrentDictionary<QualifiedModuleName, ConcurrentDictionary<QualifiedModuleName, byte>> _referencesTo = new ConcurrentDictionary<QualifiedModuleName, ConcurrentDictionary<QualifiedModuleName, byte>>();

‎RubberduckTests/Mocks/MockParser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static ParseCoordinator Create(IVBE vbe, RubberduckParserState state, IAt
4747
Path.Combine(Path.GetDirectoryName(Assembly.GetAssembly(typeof(MockParser)).Location), "TestFiles", "Resolver");
4848
Func<IVBAPreprocessor> preprocessorFactory = () => new VBAPreprocessor(double.Parse(vbe.Version, CultureInfo.InvariantCulture));
4949
var projectManager = new ProjectManager(state, vbe);
50-
var moduleToModuleReferenceManager = new StandAloneModuleToModuleReferenceManager();
50+
var moduleToModuleReferenceManager = new ModuleToModuleReferenceManager();
5151
var parserStateManager = new SynchronousParserStateManager(state);
5252
var referenceRemover = new SynchronousReferenceRemover(state, moduleToModuleReferenceManager);
5353
var comSynchronizer = new SynchronousCOMReferenceSynchronizer(

‎RubberduckTests/Parsing/Coordination/StandAloneModuleToModuleReferenceManagerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class StandAloneModuleToModuleReferenceManagerTests : IModuleToModuleRefe
1111
{
1212
protected override IModuleToModuleReferenceManager GetNewTestModuleToModuleReferenceManager()
1313
{
14-
return new StandAloneModuleToModuleReferenceManager();
14+
return new ModuleToModuleReferenceManager();
1515
}
1616
}
1717
}

0 commit comments

Comments
 (0)