Skip to content

Commit ed5eec9

Browse files
IvenBachIvenBach
committed
Merge branch 'next' of https://github.com/rubberduck-vba/rubberduck into Issue4282_Import_module_folder_annotation
2 parents 14c26dc + 0aaf7c1 commit ed5eec9

File tree

328 files changed

+12347
-50388
lines changed

Some content is hidden

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

328 files changed

+12347
-50388
lines changed

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*.sln.docstates
88
*.csproj.user
99
*.csproj.DotSettings
10+
launchSettings.json
1011

1112
# External NuGet Packages
1213
[Pp]ackages/
@@ -178,4 +179,7 @@ $RECYCLE.BIN/
178179
Installers/
179180
*.xlsx
180181

181-
CodeGraphData/
182+
CodeGraphData/
183+
/Rubberduck.Deployment/Properties/launchSettings.json
184+
/Rubberduck.Deployment/Rubberduck.API.idl
185+
/Rubberduck.Deployment/Rubberduck.idl

‎Rubberduck.API/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,7 @@
1-
using System.Reflection;
2-
using System.Runtime.CompilerServices;
1+
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43
using Rubberduck.Resources.Registration;
54

6-
// General Information about an assembly is controlled through the following
7-
// set of attributes. Change these attribute values to modify the information
8-
// associated with an assembly.
9-
[assembly: AssemblyTitle("Rubberduck.API")]
10-
[assembly: AssemblyDescription("Rubberduck Reflection API")]
11-
[assembly: AssemblyConfiguration("")]
12-
[assembly: AssemblyCompany("Rubberduck-VBA")]
13-
[assembly: AssemblyProduct("Rubberduck.API")]
14-
[assembly: AssemblyCopyright("Copyright © 2018")]
15-
[assembly: AssemblyCulture("en")]
16-
[assembly: AssemblyTrademark("")]
175
[assembly: InternalsVisibleTo("RubberduckTests")]
186

197
// Setting ComVisible to false makes the types in this assembly not visible
@@ -23,15 +11,3 @@
2311

2412
// The following GUID is for the ID of the typelib if this project is exposed to COM
2513
[assembly: Guid(RubberduckGuid.RubberduckApiTypeLibGuid)]
26-
27-
// Version information for an assembly consists of the following four values:
28-
//
29-
// Major Version
30-
// Minor Version
31-
// Build Number
32-
// Revision
33-
//
34-
// You can specify all the values or you can default the Build and Revision Numbers
35-
// by using the '*' as shown below:
36-
// [assembly: AssemblyVersion("1.0.*")]
37-
[assembly: AssemblyVersion("2.1.*")]

‎Rubberduck.API/Rubberduck.API.csproj‎

Lines changed: 14 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.NET.Sdk">
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
4+
<Product>Rubberduck.API</Product>
5+
<Description>Rubberduck Reflection API</Description>
6+
<Copyright>Copyright © 2018</Copyright>
77
<ProjectGuid>{AC1B4A57-364A-4F90-A0CD-6EE818349CE5}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Rubberduck.API</RootNamespace>
11-
<AssemblyName>Rubberduck.API</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
8+
<!--
9+
TODO: affix AssemblyVersion and/or FileVersion for COM-Registration?!
10+
-->
1511
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="System" />
35-
<Reference Include="System.Core" />
36-
<Reference Include="Microsoft.CSharp" />
37-
</ItemGroup>
38-
<ItemGroup>
39-
<Compile Include="VBA\ApiProvider.cs" />
40-
<Compile Include="VBA\Accessibility.cs" />
41-
<Compile Include="VBA\Declaration.cs" />
42-
<Compile Include="VBA\Declarations.cs" />
43-
<Compile Include="VBA\DeclarationType.cs" />
44-
<Compile Include="VBA\IdentifierReference.cs" />
45-
<Compile Include="VBA\IdentifierReferences.cs" />
46-
<Compile Include="VBA\Parser.cs" />
47-
<Compile Include="VBA\ParserState.cs" />
48-
<Compile Include="Properties\AssemblyInfo.cs" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj">
52-
<Project>{a1587eac-7b54-407e-853f-4c7493d0323e}</Project>
53-
<Name>Rubberduck.Core</Name>
54-
</ProjectReference>
55-
<ProjectReference Include="..\Rubberduck.Main\Rubberduck.Main.csproj">
56-
<Project>{E8AB5D93-2D0F-423D-BC15-5EE118673E48}</Project>
57-
<Name>Rubberduck.Main</Name>
58-
</ProjectReference>
59-
<ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj">
60-
<Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
61-
<Name>Rubberduck.Parsing</Name>
62-
</ProjectReference>
63-
<ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj">
64-
<Project>{1b84b387-f7c4-4876-9bdf-c644c365359a}</Project>
65-
<Name>Rubberduck.Resources</Name>
66-
</ProjectReference>
67-
<ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj">
68-
<Project>{8ce35eb3-8852-4ba1-84dd-df3f5d2967b0}</Project>
69-
<Name>Rubberduck.VBEditor</Name>
70-
</ProjectReference>
71-
</ItemGroup>
12+
<Import Project="..\RubberduckBaseProject.csproj" />
13+
7214
<ItemGroup>
73-
<Folder Include="Plugin\" />
15+
<ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj" />
16+
<ProjectReference Include="..\Rubberduck.Main\Rubberduck.Main.csproj" />
17+
<ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj" />
18+
<ProjectReference Include="..\Rubberduck.Resources\Rubberduck.Resources.csproj" />
19+
<ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj" />
7420
</ItemGroup>
7521
<ItemGroup>
7622
<None Include="app.config" />
7723
</ItemGroup>
78-
<ItemGroup>
79-
<Analyzer Include="..\RubberduckCodeAnalysis\bin\Release\RubberduckCodeAnalysis.dll" />
80-
</ItemGroup>
81-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8224
</Project>

‎Rubberduck.CodeAnalysis/CodePathAnalysis/Extensions/NodeExtensions.cs‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
using Rubberduck.Inspections.CodePathAnalysis.Nodes;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
6+
namespace Rubberduck.Inspections.CodePathAnalysis.Extensions
7+
{
8+
public static class NodeExtensions
9+
{
10+
public static IEnumerable<INode> GetFlattenedNodes(this INode node, IEnumerable<Type> excludedTypes)
11+
{
12+
foreach (var child in node.Children)
13+
{
14+
if (!excludedTypes.Contains(child.GetType()))
15+
{
16+
yield return child;
17+
}
18+
else
19+
{
20+
foreach (var nextChild in GetFlattenedNodes(child, excludedTypes))
21+
{
22+
yield return nextChild;
23+
}
24+
}
25+
}
26+
}
27+
28+
public static IEnumerable<INode> GetNodes(this INode node, IEnumerable<Type> types)
29+
{
30+
if (types.Contains(node.GetType()))
31+
{
32+
yield return node;
33+
}
34+
35+
foreach (var child in node.Children)
36+
{
37+
foreach (var childNode in GetNodes(child, types))
38+
{
39+
yield return childNode;
40+
}
41+
}
42+
}
43+
44+
public static INode GetFirstNode(this INode node, IEnumerable<Type> excludedTypes)
45+
{
46+
if (!excludedTypes.Contains(node.GetType()))
47+
{
48+
return node;
49+
}
50+
51+
return GetFirstNode(node.Children[0], excludedTypes);
52+
}
53+
}
54+
}

‎Rubberduck.CodeAnalysis/CodePathAnalysis/Nodes/IBranchNode.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace Rubberduck.Inspections.CodePathAnalysis.Nodes
2+
{
3+
public interface IBranchNode : INode
4+
{
5+
}
6+
}

‎Rubberduck.CodeAnalysis/CodePathAnalysis/Nodes/ILoopNode.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
namespace Rubberduck.Inspections.CodePathAnalysis.Nodes
2+
{
3+
public interface ILoopNode : INode
4+
{
5+
}
6+
}

‎Rubberduck.CodeAnalysis/CodePathAnalysis/Nodes/INode.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using Rubberduck.Parsing.Symbols;
2+
using System.Collections.Immutable;
3+
4+
namespace Rubberduck.Inspections.CodePathAnalysis.Nodes
5+
{
6+
public interface INode
7+
{
8+
int SortOrder { get; set; }
9+
ImmutableList<INode> Children { get; set; }
10+
INode Parent { get; set; }
11+
12+
Declaration Declaration { get; set; }
13+
IdentifierReference Reference { get; set; }
14+
}
15+
}

‎Rubberduck.CodeAnalysis/CodePathAnalysis/Nodes/Implementations/AssignmentNode.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System.Collections.Generic;
2+
using System.Collections.Immutable;
3+
using Rubberduck.Parsing.Symbols;
4+
5+
namespace Rubberduck.Inspections.CodePathAnalysis.Nodes
6+
{
7+
public class AssignmentNode : INode
8+
{
9+
public AssignmentNode()
10+
{
11+
Children = new List<INode>().ToImmutableList();
12+
}
13+
14+
public int SortOrder { get; set; }
15+
public ImmutableList<INode> Children { get; set; }
16+
public INode Parent { get; set; }
17+
18+
public Declaration Declaration { get; set; }
19+
public IdentifierReference Reference { get; set; }
20+
}
21+
}

‎Rubberduck.CodeAnalysis/CodePathAnalysis/Nodes/Implementations/BlockNode.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System.Collections.Generic;
2+
using System.Collections.Immutable;
3+
using Rubberduck.Parsing.Symbols;
4+
5+
namespace Rubberduck.Inspections.CodePathAnalysis.Nodes
6+
{
7+
public class BlockNode : INode
8+
{
9+
public BlockNode()
10+
{
11+
Children = new List<INode>().ToImmutableList();
12+
}
13+
14+
public int SortOrder { get; set; }
15+
public ImmutableList<INode> Children { get; set; }
16+
public INode Parent { get; set; }
17+
18+
public Declaration Declaration { get; set; }
19+
public IdentifierReference Reference { get; set; }
20+
}
21+
}

‎Rubberduck.CodeAnalysis/CodePathAnalysis/Nodes/Implementations/BranchNode.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System.Collections.Generic;
2+
using System.Collections.Immutable;
3+
using Rubberduck.Parsing.Symbols;
4+
5+
namespace Rubberduck.Inspections.CodePathAnalysis.Nodes
6+
{
7+
public class BranchNode : IBranchNode
8+
{
9+
public BranchNode()
10+
{
11+
Children = new List<INode>().ToImmutableList();
12+
}
13+
14+
public int SortOrder { get; set; }
15+
public ImmutableList<INode> Children { get; set; }
16+
public INode Parent { get; set; }
17+
18+
public Declaration Declaration { get; set; }
19+
public IdentifierReference Reference { get; set; }
20+
}
21+
}

0 commit comments

Comments
 (0)