Skip to content

Commit

Permalink
Merge branch 'next' into FixForRemoveParameter
Browse files Browse the repository at this point in the history
  • Loading branch information
MDoerner committed Mar 14, 2018
2 parents e8c2937 + 91f0a31 commit 58a5da9
Show file tree
Hide file tree
Showing 795 changed files with 1,105 additions and 577 deletions.
6 changes: 2 additions & 4 deletions Installer Build Script.iss
@@ -1,8 +1,7 @@
#define BuildDir SourcePath + "RetailCoder.VBE\bin\Release"
#define BuildDir SourcePath + "Rubberduck.Main\bin\Release"
#define AppName "Rubberduck"
#define AddinDLL "Rubberduck.dll"
#define InspectionsDLL "Rubberduck.Inspections.dll"
#define AppVersion GetFileVersion(SourcePath + "RetailCoder.VBE\bin\Release\Rubberduck.dll")
#define AppVersion GetFileVersion(SourcePath + "Rubberduck.Main\bin\Release\Rubberduck.dll")
#define AppPublisher "Rubberduck"
#define AppURL "http://rubberduckvba.com"
#define License SourcePath + "\License.rtf"
Expand Down Expand Up @@ -42,7 +41,6 @@ Source: "{#BuildDir}\lib\win32\x64\*"; DestDir: "{app}"; Flags: ignoreversion; E
Source: "{#BuildDir}\lib\win32\x86\*"; DestDir: "{app}"; Flags: ignoreversion; Excludes: "{#AddinDLL}"; Check: Is32BitOfficeInstalled

Source: "{#BuildDir}\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Excludes: "{#AddinDLL},\NativeBinaries"
Source: "{#BuildDir}\{#InspectionsDLL}"; DestDir: "{app}"; Flags: ignoreversion
Source: "{#BuildDir}\{#AddinDLL}"; DestDir: "{app}"; Flags: ignoreversion; AfterInstall: RegisterAddin

[Run]
Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -29,6 +29,7 @@ If you like this project and would like to thank its contributors, you are welco
* [Installing](https://github.com/rubberduck-vba/Rubberduck/wiki/Installing)
* [Getting Started](https://github.com/rubberduck-vba/Rubberduck/blob/next/docs/GettingStarted.md) using Rubberduck
* [Contributing](https://github.com/rubberduck-vba/Rubberduck/blob/next/CONTRIBUTING.md)
* [User Testimonials](https://github.com/rubberduck-vba/Rubberduck/blob/next/thanks.md)

---

Expand Down
4 changes: 0 additions & 4 deletions RetailCoder.VBE/Rubberduck.csproj.DotSettings

This file was deleted.

15 changes: 0 additions & 15 deletions RetailCoder.VBE/UnitTesting/FakesProviderFactory.cs

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -8,11 +8,9 @@
using Rubberduck.Parsing.PreProcessing;
using Rubberduck.Parsing.Symbols.DeclarationLoaders;
using Rubberduck.Parsing.VBA;
using Rubberduck.UI.Command.MenuItems;
using Rubberduck.Parsing.Symbols;
using Rubberduck.Parsing.UIContext;
using Rubberduck.VBEditor.ComManagement;
using Rubberduck.VBEditor.Events;
using Rubberduck.VBEditor.SafeComWrappers.VBA;

namespace Rubberduck.API.VBA
Expand Down
36 changes: 36 additions & 0 deletions Rubberduck.API/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Rubberduck.API")]
[assembly: AssemblyDescription("API for programmatic access to Rubberduck's Code Analysis features.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Rubberduck-VBA")]
[assembly: AssemblyProduct("Rubberduck.API")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyCulture("en")]
[assembly: AssemblyTrademark("")]
[assembly: InternalsVisibleTo("RubberduckTests")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("ac1b4a57-364a-4f90-a0cd-6ee818349ce5")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.*")]
78 changes: 78 additions & 0 deletions Rubberduck.API/Rubberduck.API.csproj
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{AC1B4A57-364A-4F90-A0CD-6EE818349CE5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Rubberduck.API</RootNamespace>
<AssemblyName>Rubberduck.API</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VB6.Interop.VBIDE">
<HintPath>..\libs\Microsoft.VB6.Interop.VBIDE.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Vbe.Interop, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
<HintPath>..\libs\Microsoft.Vbe.Interop.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Vbe.Interop.Forms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes>
<HintPath>..\libs\Microsoft.Vbe.Interop.Forms.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Compile Include="API\VBA\Accessibility.cs" />
<Compile Include="API\VBA\Declaration.cs" />
<Compile Include="API\VBA\DeclarationType.cs" />
<Compile Include="API\VBA\IdentifierReference.cs" />
<Compile Include="API\VBA\ParserState.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Rubberduck.Core\Rubberduck.Core.csproj">
<Project>{a1587eac-7b54-407e-853f-4c7493d0323e}</Project>
<Name>Rubberduck.Core</Name>
</ProjectReference>
<ProjectReference Include="..\Rubberduck.Parsing\Rubberduck.Parsing.csproj">
<Project>{a4a618e1-cbca-435f-9c6c-5181e030adfc}</Project>
<Name>Rubberduck.Parsing</Name>
</ProjectReference>
<ProjectReference Include="..\Rubberduck.VBEEditor\Rubberduck.VBEditor.csproj">
<Project>{8ce35eb3-8852-4ba1-84dd-df3f5d2967b0}</Project>
<Name>Rubberduck.VBEditor</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="API\Plugin\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -11,6 +11,7 @@ public class ModuleExporter : IModuleExporter

public string ExportPath => TempFile
? ApplicationConstants.RUBBERDUCK_TEMP_PATH
// note that App is not in the entry-point assembly, since Core is not the entry point anymore
: Path.GetDirectoryName(Assembly.GetAssembly(typeof(App)).Location);

public string Export(IVBComponent component, bool tempFile = true)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -45,8 +45,9 @@ public static class User32
[return: MarshalAs(UnmanagedType.Bool)]
public static extern bool UnregisterHotKey(IntPtr hWnd, IntPtr id);

// TODO used to be internal. InternalsVisibleTo should expose this, right?
[DllImport("user32.dll", CharSet = CharSet.Auto)]
internal static extern IntPtr SendMessage(IntPtr hWnd, WM msg, IntPtr wParam, IntPtr lParam);
public static extern IntPtr SendMessage(IntPtr hWnd, WM msg, IntPtr wParam, IntPtr lParam);

public delegate int WindowEnumProc(IntPtr hwnd, IntPtr lparam);
[DllImport("user32.dll")]
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -92,7 +92,7 @@ public sealed class CodeExplorerViewModel : ViewModelBase, IDisposable
}

PrintCommand = commands.OfType<PrintCommand>().SingleOrDefault();

CopyResultsCommand = commands.OfType<CopyResultsCommand>().SingleOrDefault();

SetNameSortCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
Expand Down Expand Up @@ -531,7 +531,7 @@ private void SwitchNodeState(CodeExplorerItemViewModel node, bool expandedState)
public CommandBase RemoveCommand { get; }

public CommandBase PrintCommand { get; }

private readonly CommandBase _externalRemoveCommand;

// this is a special case--we have to reset SelectedItem to prevent a crash
Expand All @@ -549,7 +549,7 @@ private void ExecuteRemoveComand(object param)
public Visibility ExportVisibility => CanExecuteExportAllCommand ? Visibility.Collapsed : Visibility.Visible;

public Visibility ExportAllVisibility => CanExecuteExportAllCommand ? Visibility.Visible : Visibility.Collapsed;

public Visibility TreeViewVisibility => Projects == null || Projects.Count == 0 ? Visibility.Collapsed : Visibility.Visible;

public Visibility EmptyUIRefreshMessageVisibility => _isBusy ? Visibility.Hidden : Visibility.Visible;
Expand Down
File renamed without changes.
34 changes: 34 additions & 0 deletions Rubberduck.Core/Properties/AssemblyInfo.cs
@@ -0,0 +1,34 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die einer Assembly zugeordnet sind.
[assembly: AssemblyTitle("Rubberduck.Core")]
[assembly: AssemblyDescription("The core of Rubberduck")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Rubberduck-VBA")]
[assembly: AssemblyProduct("Rubberduck.Core")]
[assembly: AssemblyCopyright("Copyright © 2014-2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: InternalsVisibleTo("Rubberduck.Main")]
[assembly: InternalsVisibleTo("RubberduckTests")]

// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
[assembly: ComVisible(false)]

// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
[assembly: Guid("7f136926-696e-4051-bd40-efc19c8f78c6")]

// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
//
// Hauptversion
// Nebenversion
// Buildnummer
// Revision
//
[assembly: AssemblyVersion("2.1.*")]
File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -145,6 +145,18 @@
<Setting Name="ToDoMarker_Bug" Type="Rubberduck.Settings.ToDoMarker" Scope="Application">
<Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;ToDoMarker xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Text="BUG" /&gt;</Value>
</Setting>
<Setting Name="WindowSettings" Type="Rubberduck.Settings.WindowSettings" Scope="Application">
<Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;WindowSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;CodeExplorerVisibleOnStartup&gt;false&lt;/CodeExplorerVisibleOnStartup&gt;
&lt;CodeInspectionsVisibleOnStartup&gt;false&lt;/CodeInspectionsVisibleOnStartup&gt;
&lt;TestExplorerVisibleOnStartup&gt;false&lt;/TestExplorerVisibleOnStartup&gt;
&lt;TodoExplorerVisibleOnStartup&gt;false&lt;/TodoExplorerVisibleOnStartup&gt;
&lt;CodeExplorer_SortByName&gt;true&lt;/CodeExplorer_SortByName&gt;
&lt;CodeExplorer_SortByCodeOrder&gt;false&lt;/CodeExplorer_SortByCodeOrder&gt;
&lt;CodeExplorer_GroupByType&gt;false&lt;/CodeExplorer_GroupByType&gt;
&lt;/WindowSettings&gt;</Value>
</Setting>
<Setting Name="UnitTestSettings" Type="Rubberduck.Settings.UnitTestSettings" Scope="Application">
<Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
Expand Down Expand Up @@ -244,17 +256,5 @@
&lt;RunInspectionsOnSuccessfulParse&gt;true&lt;/RunInspectionsOnSuccessfulParse&gt;
&lt;/CodeInspectionSettings&gt;</Value>
</Setting>
<Setting Name="WindowSettings" Type="Rubberduck.Settings.WindowSettings" Scope="Application">
<Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;WindowSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;CodeExplorerVisibleOnStartup&gt;false&lt;/CodeExplorerVisibleOnStartup&gt;
&lt;CodeInspectionsVisibleOnStartup&gt;false&lt;/CodeInspectionsVisibleOnStartup&gt;
&lt;TestExplorerVisibleOnStartup&gt;false&lt;/TestExplorerVisibleOnStartup&gt;
&lt;TodoExplorerVisibleOnStartup&gt;false&lt;/TodoExplorerVisibleOnStartup&gt;
&lt;CodeExplorer_SortByName&gt;true&lt;/CodeExplorer_SortByName&gt;
&lt;CodeExplorer_SortByCodeOrder&gt;false&lt;/CodeExplorer_SortByCodeOrder&gt;
&lt;CodeExplorer_GroupByType&gt;false&lt;/CodeExplorer_GroupByType&gt;
&lt;/WindowSettings&gt;</Value>
</Setting>
</Settings>
</SettingsFile>
Expand Up @@ -27,11 +27,9 @@ public static class IEnumerableExt
{

var initialized = false;
T first = default(T);
T last = default(T);
T next = default(T);
Tuple<T, T> tuple = null;

T first = default;
T last = default;

foreach (var input in inputs)
{
if (!initialized)
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit 58a5da9

Please sign in to comment.