Skip to content

Commit

Permalink
Merge pull request #156 from rubberduck-vba/next
Browse files Browse the repository at this point in the history
Sync with main repo
  • Loading branch information
retailcoder committed Sep 3, 2016
2 parents 5415c5a + 86012c3 commit 6674e3c
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions RetailCoder.VBE/Inspections/UseMeaningfulNameInspection.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Rubberduck.Parsing.Symbols;
using Rubberduck.Parsing.VBA;
Expand All @@ -27,13 +26,8 @@ public UseMeaningfulNameInspection(IMessageBox messageBox, RubberduckParserState

public override IEnumerable<InspectionResultBase> GetInspectionResults()
{
var whitelistedNames = new List<string>();

try
{
whitelistedNames = _settings.Load(new CodeInspectionSettings()).WhitelistedIdentifiers.Select(s => s.Identifier).ToList();
}
catch (IOException) { }
var settings = _settings.Load(new CodeInspectionSettings()) ?? new CodeInspectionSettings();
var whitelistedNames = settings.WhitelistedIdentifiers.Select(s => s.Identifier).ToList();

var issues = UserDeclarations
.Where(declaration => declaration.DeclarationType != DeclarationType.ModuleOption &&
Expand Down

0 comments on commit 6674e3c

Please sign in to comment.