Skip to content

Commit 29e0e31

Browse files
MDoernerMDoerner
committed
Merge branch 'next' into ExtractComponentsFromQMNsSecondTry
2 parents 52fbfcc + 69ff5c9 commit 29e0e31

File tree

77 files changed

+155
-42648
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+155
-42648
lines changed

‎RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private void RewriteCall(VBAParser.ArgumentListContext argList, ICodeModule modu
160160
var args = argList.argument().Select((s, i) => new { Index = i, Text = s.GetText() }).ToList();
161161
for (var i = 0; i < _model.Parameters.Count; i++)
162162
{
163-
if (argList.argument().Count <= i)
163+
if (argList.argument().Length <= i)
164164
{
165165
break;
166166
}

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
4-
<Import Project="..\packages\Antlr4.4.3.0\build\Antlr4.props" Condition="Exists('..\packages\Antlr4.4.3.0\build\Antlr4.props')" />
54
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
65
<PropertyGroup>
76
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -229,9 +228,8 @@
229228
<StartupObject />
230229
</PropertyGroup>
231230
<ItemGroup>
232-
<Reference Include="Antlr4.Runtime.net45">
233-
<HintPath>..\packages\Antlr4.Runtime.4.3.0\lib\net45\Antlr4.Runtime.net45.dll</HintPath>
234-
<EmbedInteropTypes>False</EmbedInteropTypes>
231+
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
232+
<HintPath>..\packages\Antlr4.Runtime.4.6.4\lib\net45\Antlr4.Runtime.dll</HintPath>
235233
</Reference>
236234
<Reference Include="Castle.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
237235
<HintPath>..\packages\Castle.Core.4.1.1\lib\net45\Castle.Core.dll</HintPath>
@@ -1516,12 +1514,9 @@
15161514
<PropertyGroup>
15171515
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
15181516
</PropertyGroup>
1519-
<Error Condition="!Exists('..\packages\Antlr4.4.3.0\build\Antlr4.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.3.0\build\Antlr4.props'))" />
1520-
<Error Condition="!Exists('..\packages\Antlr4.4.3.0\build\Antlr4.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Antlr4.4.3.0\build\Antlr4.targets'))" />
15211517
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
15221518
<Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props'))" />
15231519
</Target>
1524-
<Import Project="..\packages\Antlr4.4.3.0\build\Antlr4.targets" Condition="Exists('..\packages\Antlr4.4.3.0\build\Antlr4.targets')" />
15251520
<PropertyGroup>
15261521
<PostBuildEvent>
15271522
</PostBuildEvent>

‎RetailCoder.VBE/app.config

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
4+
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
55
<section name="Rubberduck.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
66
</sectionGroup>
77
</configSections>
@@ -17,8 +17,7 @@
1717
<Rubberduck.Properties.Settings>
1818
<setting name="DefaultHotkey_CodePaneRefactorRenameCommand" serializeAs="Xml">
1919
<value>
20-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
20+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
2221
<Key1>R</Key1>
2322
<IsEnabled>true</IsEnabled>
2423
<HasShiftModifier>true</HasShiftModifier>
@@ -28,11 +27,9 @@
2827
</HotkeySetting>
2928
</value>
3029
</setting>
31-
<setting name="DefaultHotkey_RefactorEncapsulateFieldCommand"
32-
serializeAs="Xml">
30+
<setting name="DefaultHotkey_RefactorEncapsulateFieldCommand" serializeAs="Xml">
3331
<value>
34-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
35-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
32+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3633
<Key1>F</Key1>
3734
<IsEnabled>true</IsEnabled>
3835
<HasShiftModifier>true</HasShiftModifier>
@@ -44,8 +41,7 @@
4441
</setting>
4542
<setting name="DefaultHotkey_RefactorExtractMethodCommand" serializeAs="Xml">
4643
<value>
47-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
48-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
44+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
4945
<Key1>M</Key1>
5046
<IsEnabled>true</IsEnabled>
5147
<HasShiftModifier>true</HasShiftModifier>
@@ -55,11 +51,9 @@
5551
</HotkeySetting>
5652
</value>
5753
</setting>
58-
<setting name="DefaultHotkey_RefactorMoveCloserToUsageCommand"
59-
serializeAs="Xml">
54+
<setting name="DefaultHotkey_RefactorMoveCloserToUsageCommand" serializeAs="Xml">
6055
<value>
61-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
62-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
56+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
6357
<Key1>C</Key1>
6458
<IsEnabled>true</IsEnabled>
6559
<HasShiftModifier>true</HasShiftModifier>
@@ -71,8 +65,7 @@
7165
</setting>
7266
<setting name="DefaultHotkey_CodeExplorerCommand" serializeAs="Xml">
7367
<value>
74-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
75-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
68+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
7669
<Key1>R</Key1>
7770
<IsEnabled>true</IsEnabled>
7871
<HasShiftModifier>false</HasShiftModifier>
@@ -84,8 +77,7 @@
8477
</setting>
8578
<setting name="DefaultHotkey_ExportAllCommand" serializeAs="Xml">
8679
<value>
87-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
88-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
80+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
8981
<Key1>E</Key1>
9082
<IsEnabled>true</IsEnabled>
9183
<HasShiftModifier>true</HasShiftModifier>
@@ -97,8 +89,7 @@
9789
</setting>
9890
<setting name="DefaultHotkey_FindSymbolCommand" serializeAs="Xml">
9991
<value>
100-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
101-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
92+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
10293
<Key1>T</Key1>
10394
<IsEnabled>true</IsEnabled>
10495
<HasShiftModifier>false</HasShiftModifier>
@@ -110,8 +101,7 @@
110101
</setting>
111102
<setting name="DefaultHotkey_IndentCurrentModuleCommand" serializeAs="Xml">
112103
<value>
113-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
114-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
104+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
115105
<Key1>M</Key1>
116106
<IsEnabled>true</IsEnabled>
117107
<HasShiftModifier>false</HasShiftModifier>
@@ -123,8 +113,7 @@
123113
</setting>
124114
<setting name="DefaultHotkey_IndentCurrentProcedureCommand" serializeAs="Xml">
125115
<value>
126-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
127-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
116+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
128117
<Key1>P</Key1>
129118
<IsEnabled>true</IsEnabled>
130119
<HasShiftModifier>false</HasShiftModifier>
@@ -136,8 +125,7 @@
136125
</setting>
137126
<setting name="DefaultHotkey_InspectionResultsCommand" serializeAs="Xml">
138127
<value>
139-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
140-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
128+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
141129
<Key1>I</Key1>
142130
<IsEnabled>true</IsEnabled>
143131
<HasShiftModifier>true</HasShiftModifier>
@@ -149,8 +137,7 @@
149137
</setting>
150138
<setting name="DefaultHotkey_ReparseCommand" serializeAs="Xml">
151139
<value>
152-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
153-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
140+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
154141
<Key1>`</Key1>
155142
<IsEnabled>true</IsEnabled>
156143
<HasShiftModifier>false</HasShiftModifier>
@@ -162,8 +149,7 @@
162149
</setting>
163150
<setting name="DefaultHotkey_SourceControlCommand" serializeAs="Xml">
164151
<value>
165-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
166-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
152+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
167153
<Key1>D6</Key1>
168154
<IsEnabled>true</IsEnabled>
169155
<HasShiftModifier>true</HasShiftModifier>
@@ -175,8 +161,7 @@
175161
</setting>
176162
<setting name="DefaultHotkey_TestExplorerCommand" serializeAs="Xml">
177163
<value>
178-
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
179-
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
164+
<HotkeySetting xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
180165
<Key1>T</Key1>
181166
<IsEnabled>true</IsEnabled>
182167
<HasShiftModifier>true</HasShiftModifier>

‎RetailCoder.VBE/packages.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr4" version="4.3.0" targetFramework="net45" />
4-
<package id="Antlr4.Runtime" version="4.3.0" targetFramework="net45" />
3+
<package id="Antlr4.Runtime" version="4.6.4" targetFramework="net45" />
54
<package id="AvalonEdit" version="5.0.4" targetFramework="net45" />
65
<package id="Castle.Core" version="4.1.1" targetFramework="net45" />
76
<package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />

‎Rubberduck.Inspections/Concrete/MultipleDeclarationsInspection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ public void ClearContexts()
4545

4646
public override void ExitVariableListStmt([NotNull] VBAParser.VariableListStmtContext context)
4747
{
48-
if (context.variableSubStmt().Count > 1)
48+
if (context.variableSubStmt().Length > 1)
4949
{
5050
_contexts.Add(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
5151
}
5252
}
5353

5454
public override void ExitConstStmt([NotNull] VBAParser.ConstStmtContext context)
5555
{
56-
if (context.constSubStmt().Count > 1)
56+
if (context.constSubStmt().Length > 1)
5757
{
5858
_contexts.Add(new QualifiedContext<ParserRuleContext>(CurrentModuleName, context));
5959
}

‎Rubberduck.Inspections/Rubberduck.Inspections.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@
3636
<RunPostBuildEvent>Always</RunPostBuildEvent>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Antlr4.Runtime.net45, Version=4.3.0.0, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
40-
<HintPath>..\packages\Antlr4.Runtime.4.3.0\lib\net45\Antlr4.Runtime.net45.dll</HintPath>
41-
<Private>True</Private>
39+
<Reference Include="Antlr4.Runtime, Version=4.6.0.0, Culture=neutral, PublicKeyToken=09abb75b9ed49849, processorArchitecture=MSIL">
40+
<HintPath>..\packages\Antlr4.Runtime.4.6.4\lib\net45\Antlr4.Runtime.dll</HintPath>
4241
</Reference>
4342
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
4443
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>

‎Rubberduck.Inspections/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Antlr4.Runtime" version="4.3.0" targetFramework="net452" />
3+
<package id="Antlr4.Runtime" version="4.6.4" targetFramework="net45" />
44
<package id="NLog" version="4.4.12" targetFramework="net45" />
55
<package id="NLog.Schema" version="4.4.12" targetFramework="net45" />
66
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />

‎Rubberduck.Parsing/Binding/BinaryOpDefaultBinding.cs renamed to ‎Rubberduck.Parsing/Binding/Bindings/BinaryOpDefaultBinding.cs

File renamed without changes.

‎Rubberduck.Parsing/Binding/IExpressionBinding.cs renamed to ‎Rubberduck.Parsing/Binding/Bindings/IExpressionBinding.cs

File renamed without changes.

‎Rubberduck.Parsing/Binding/IndexDefaultBinding.cs renamed to ‎Rubberduck.Parsing/Binding/Bindings/IndexDefaultBinding.cs

File renamed without changes.

0 commit comments

Comments
 (0)