huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup some IDE warnings

This commit is contained in:
Pranav K 2018-07-30 15:06:43 -07:00
parent b2a1a7c9de
commit ddde149792
No known key found for this signature in database
GPG Key ID: 1963DA6D96C3057A
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs
View File

@ -257,8 +257,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// not function properly. // not function properly.
Href = output.Attributes[HrefAttributeName]?.Value as string; Href = output.Attributes[HrefAttributeName]?.Value as string;
Mode mode; if (!AttributeMatcher.TryDetermineMode(context, ModeDetails, Compare, out var mode))
if (!AttributeMatcher.TryDetermineMode(context, ModeDetails, Compare, out mode))
{ {
// No attributes matched so we have nothing to do // No attributes matched so we have nothing to do
return; return;
@ -295,8 +294,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
if (mode == Mode.Fallback && HasStyleSheetLinkType(output.Attributes)) if (mode == Mode.Fallback && HasStyleSheetLinkType(output.Attributes))
{ {
string resolvedUrl; if (TryResolveUrl(FallbackHref, resolvedUrl: out string resolvedUrl))
if (TryResolveUrl(FallbackHref, resolvedUrl: out resolvedUrl))
{ {
FallbackHref = resolvedUrl; FallbackHref = resolvedUrl;
} }
@ -395,17 +393,15 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
private bool HasStyleSheetLinkType(TagHelperAttributeList attributes) private bool HasStyleSheetLinkType(TagHelperAttributeList attributes)
{ {
TagHelperAttribute relAttribute; if (!attributes.TryGetAttribute(RelAttributeName, out var relAttribute) ||
if (!attributes.TryGetAttribute(RelAttributeName, out relAttribute) ||
relAttribute.Value == null) relAttribute.Value == null)
{ {
return false; return false;
} }
var attributeValue = relAttribute.Value; var attributeValue = relAttribute.Value;
var contentValue = attributeValue as IHtmlContent;
var stringValue = attributeValue as string; var stringValue = attributeValue as string;
if (contentValue != null) if (attributeValue is IHtmlContent contentValue)
{ {
contentValue.WriteTo(StringWriter, HtmlEncoder); contentValue.WriteTo(StringWriter, HtmlEncoder);
stringValue = StringWriter.ToString(); stringValue = StringWriter.ToString();

6
src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs
View File

@ -221,8 +221,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
// not function properly. // not function properly.
Src = output.Attributes[SrcAttributeName]?.Value as string; Src = output.Attributes[SrcAttributeName]?.Value as string;
Mode mode; if (!AttributeMatcher.TryDetermineMode(context, ModeDetails, Compare, out var mode))
if (!AttributeMatcher.TryDetermineMode(context, ModeDetails, Compare, out mode))
{ {
// No attributes matched so we have nothing to do // No attributes matched so we have nothing to do
return; return;
@ -259,8 +258,7 @@ namespace Microsoft.AspNetCore.Mvc.TagHelpers
if (mode == Mode.Fallback) if (mode == Mode.Fallback)
{ {
string resolvedUrl; if (TryResolveUrl(FallbackSrc, resolvedUrl: out string resolvedUrl))
if (TryResolveUrl(FallbackSrc, resolvedUrl: out resolvedUrl))
{ {
FallbackSrc = resolvedUrl; FallbackSrc = resolvedUrl;
} }