Skip to content

Commit cb50716

Browse files
Hosch250Hosch250
committed
Merge with conflicts
2 parents b44c020 + 7af0c3e commit cb50716

File tree

166 files changed

+2286
-1669
lines changed

Some content is hidden

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

166 files changed

+2286
-1669
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<img src="http://i.stack.imgur.com/jnBEp.jpg" width=100% />
22

3+
<!-- campaign is no longer accepting donations
34
### Donate!
45
56
If you like this project and would like to thank its contributors, you are welcome to support our GoFundMe campaign to finance Rubberduck swag and international shipping - contributors will be getting t-shirts, mugs, and other cool things.
67
78
[![GoFundMe campaign](https://user-images.githubusercontent.com/5751684/29191799-e3d20b72-7dec-11e7-8ec6-0c69da4a3135.png)](https://www.gofundme.com/rubberduckvba)
9+
-->
810

911
Branch | Description | Build Status |
1012
|------------|---|--------------|

‎RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerItemViewModel.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,17 @@ public bool IsExpanded
190190

191191
public bool IsSelected { get; set; }
192192

193+
private bool _isVisisble = true;
194+
public bool IsVisible
195+
{
196+
get { return _isVisisble; }
197+
set
198+
{
199+
_isVisisble = value;
200+
OnPropertyChanged();
201+
}
202+
}
203+
193204
public abstract string Name { get; }
194205
public abstract string NameWithSignature { get; }
195206
public abstract BitmapImage CollapsedIcon { get; }

‎RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -577,6 +577,23 @@ public Visibility EmptyUIRefreshMessageVisibility
577577
}
578578
}
579579

580+
public void FilterByName(IEnumerable<CodeExplorerItemViewModel> nodes, string searchString)
581+
{
582+
foreach (var item in nodes)
583+
{
584+
if (item == null) { continue; }
585+
586+
if (item.Items.Any())
587+
{
588+
FilterByName(item.Items, searchString);
589+
}
590+
591+
item.IsVisible = item.Items.Any(c => c.IsVisible) ||
592+
item.Name.ToLowerInvariant().Contains(searchString.ToLowerInvariant()) ||
593+
string.IsNullOrEmpty(searchString);
594+
}
595+
}
596+
580597
public void Dispose()
581598
{
582599
if (_state != null)

‎RetailCoder.VBE/Resources/magnifier-medium.png

586 Bytes
Loading

‎RetailCoder.VBE/Root/EnumerableCounterInterceptor.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎RetailCoder.VBE/Root/InterceptedException.cs

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎RetailCoder.VBE/Root/InterceptorBase.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎RetailCoder.VBE/Root/RubberduckModule.cs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,12 @@ private void ApplyAbstractFactoryConvention(IEnumerable<Assembly> assemblies)
294294
private void BindCodeInspectionTypes(IEnumerable<Assembly> assemblies)
295295
{
296296
var inspections = assemblies
297-
.SelectMany(a => a.GetTypes().Where(type => type.IsClass && !type.IsAbstract && type.GetInterfaces().Contains(typeof(IInspection))))
298-
.ToList();
297+
.SelectMany(a => a.GetTypes()
298+
.Where(type => type.IsClass
299+
&& !type.IsAbstract
300+
&& type.GetInterfaces().Contains(typeof(IInspection))
301+
)
302+
);
299303

300304
// multibinding for IEnumerable<IInspection> dependency
301305
foreach(var inspection in inspections)
@@ -308,17 +312,12 @@ private void BindCodeInspectionTypes(IEnumerable<Assembly> assemblies)
308312
.InCallScope()
309313
.Named(inspection.FullName);
310314

311-
binding.Intercept().With<TimedCallLoggerInterceptor>();
312-
binding.Intercept().With<EnumerableCounterInterceptor<IInspectionResult>>();
313-
314315
var localInspection = inspection;
315316
Bind<IInspection>().ToMethod(c => (IInspection)c.Kernel.Get(iParseTreeInspection, localInspection.FullName));
316317
}
317318
else
318319
{
319320
var binding = Bind<IInspection>().To(inspection).InCallScope();
320-
binding.Intercept().With<TimedCallLoggerInterceptor>();
321-
binding.Intercept().With<EnumerableCounterInterceptor<IInspectionResult>>();
322321
}
323322
}
324323
}
@@ -509,6 +508,7 @@ private IEnumerable<IMenuItem> GetRubberduckMenuItems()
509508
{
510509
return new[]
511510
{
511+
KernelInstance.Get<RefreshCommandMenuItem>(),
512512
KernelInstance.Get<AboutCommandMenuItem>(),
513513
KernelInstance.Get<SettingsCommandMenuItem>(),
514514
KernelInstance.Get<InspectionResultsCommandMenuItem>(),
@@ -613,7 +613,8 @@ private IEnumerable<IMenuItem> GetFormDesignerContextMenuItems()
613613
{
614614
return new IMenuItem[]
615615
{
616-
KernelInstance.Get<FormDesignerRefactorRenameCommandMenuItem>()
616+
KernelInstance.Get<FormDesignerRefactorRenameCommandMenuItem>(),
617+
KernelInstance.Get<FormDesignerFindAllReferencesCommandMenuItem>()
617618
};
618619
}
619620

‎RetailCoder.VBE/Root/TimedCallLoggerInterceptor.cs

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,6 @@
373373
<Compile Include="Refactorings\ExtractMethod\IExtractMethodProc.cs" />
374374
<Compile Include="Refactorings\ExtractMethod\IExtractMethodRule.cs" />
375375
<Compile Include="Refactorings\ExtractMethod\IExtractMethodSelectionValidation.cs" />
376-
<Compile Include="Root\EnumerableCounterInterceptor.cs" />
377-
<Compile Include="Root\InterceptedException.cs" />
378-
<Compile Include="Root\InterceptorBase.cs" />
379-
<Compile Include="Root\TimedCallLoggerInterceptor.cs" />
380376
<Compile Include="RubberduckGuid.cs" />
381377
<Compile Include="RubberduckProgId.cs" />
382378
<Compile Include="Settings\CodeInspectionConfigProvider.cs" />
@@ -405,6 +401,8 @@
405401
<Compile Include="UI\CodeExplorer\Commands\CommitCommand.cs" />
406402
<Compile Include="UI\CodeExplorer\Commands\AddUserFormCommand.cs" />
407403
<Compile Include="UI\CodeExplorer\Commands\CopyResultsCommand.cs" />
404+
<Compile Include="UI\CodeExplorer\Converters\StringHasNoValueToVisibilityConverter.cs" />
405+
<Compile Include="UI\CodeExplorer\Converters\StringHasValueToVisibilityConverter.cs" />
408406
<Compile Include="UI\Command\ExportAllCommand.cs" />
409407
<Compile Include="UI\CodeExplorer\Commands\OpenProjectPropertiesCommand.cs" />
410408
<Compile Include="UI\CodeExplorer\Commands\RenameCommand.cs" />
@@ -421,10 +419,14 @@
421419
<Compile Include="UI\CodeExplorer\Commands\AddStdModuleCommand.cs" />
422420
<Compile Include="UI\CodeExplorer\Commands\AddTestModuleCommand.cs" />
423421
<Compile Include="UI\CodeExplorer\Commands\AddComponentCommand.cs" />
422+
<Compile Include="UI\Command\FormDesignerFindAllReferencesCommand.cs" />
424423
<Compile Include="UI\Command\IndentCurrentProjectCommand.cs" />
425424
<Compile Include="UI\Command\MenuItems\CommandBars\ContextDescriptionLabelMenuItem.cs" />
425+
<Compile Include="UI\Command\MenuItems\RefreshCommandMenuItem.cs" />
426+
<Compile Include="UI\Command\MenuItems\FormDesignerFindAllReferencesCommandMenuItem.cs" />
426427
<Compile Include="UI\Command\MenuItems\IndentCurrentProjectCommandMenuItem.cs" />
427428
<Compile Include="UI\Command\MenuItems\ExportAllCommandMenuItem.cs" />
429+
<Compile Include="UI\Command\RefreshCommand .cs" />
428430
<Compile Include="UI\Controls\EmptyUIRefresh.xaml.cs">
429431
<DependentUpon>EmptyUIRefresh.xaml</DependentUpon>
430432
</Compile>
@@ -1289,6 +1291,7 @@
12891291
<Resource Include="Resources\folder-open.png" />
12901292
<Resource Include="Resources\folder.png" />
12911293
<None Include="Resources\RD-300x250-base.png" />
1294+
<Resource Include="Resources\magnifier-medium.png" />
12921295
<Content Include="Resources\Rubberduck\RD-AboutWindow.png" />
12931296
<Content Include="Resources\Rubberduck\RD-InstallBanner.bmp" />
12941297
<Content Include="Resources\Rubberduck\RD-InstallWindow.bmp" />

0 commit comments

Comments
 (0)