lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

VS code cleanup: Apply parenthesis preferences

Browse Source
This commit is contained in:
Benedek Farkas
2025-10-31 21:43:05 +01:00
parent 417b595dd5
commit d08bfe58d6
78 changed files with 208 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Specs/Hosting/RequestExtensions.cs
View File

@@ -36,7 +36,7 @@ namespace Orchard.Specs.Hosting
}
var physicalFilePath = physicalPath.Combine(details.UrlPath.TrimStart('/', '\\'));
details.Page = (isHomepage ? "" : physicalFilePath.GetRelativePath(physicalPath).ToString());
details.Page = isHomepage ? "" : physicalFilePath.GetRelativePath(physicalPath).ToString();
if (!File.Exists(physicalFilePath))
details.Page = details.Page.Replace('\\', '/');

2
src/Orchard.Tests/Commands/CommandManagerTests.cs
View File

@@ -33,7 +33,7 @@ namespace Orchard.Tests.Commands
[Test]
public void ManagerCanRunACompositeCommand()
{
var context = new CommandParameters { Arguments = ("Foo Bar Bleah").Split(' '), Output = new StringWriter() };
var context = new CommandParameters { Arguments = "Foo Bar Bleah".Split(' '), Output = new StringWriter() };
_manager.Execute(context);
Assert.That(context.Output.ToString(), Is.EqualTo("Bleah"));
}

2
src/Orchard.Tests/Environment/Extensions/ExtensionLoaderCoordinatorTests.cs
View File

@@ -532,7 +532,7 @@ Features:
foreach (var type in feature.ExportedTypes)
{
Assert.That(type != typeof(Phi));
Assert.That((type == typeof(Alpha) || (type == typeof(Beta))));
Assert.That(type == typeof(Alpha) || (type == typeof(Beta)));
}
}
}

6
src/Orchard.Tests/Environment/Extensions/ExtensionManagerTests.cs
View File

@@ -472,7 +472,7 @@ Features:
foreach (var type in feature.ExportedTypes)
{
Assert.That(type != typeof(Phi));
Assert.That((type == typeof(Alpha) || (type == typeof(Beta))));
Assert.That(type == typeof(Alpha) || (type == typeof(Beta)));
}
}
}
@@ -594,8 +594,8 @@ Name: {0}
Version: 1.0.3
OrchardVersion: 1{1}{2}",
name,
(dependencies == null ? null : "\nDependencies: " + dependencies),
(priority == null ? null : "\nPriority:" + priority));
dependencies == null ? null : "\nDependencies: " + dependencies,
priority == null ? null : "\nPriority:" + priority);
}
private static void AssertFeaturesAreInOrder(StubFolders folder, StubLoaders loader, string expectedOrder)

2
src/Orchard.Tests/Environment/Loaders/DynamicExtensionLoaderTests.cs
View File

@@ -128,7 +128,7 @@ namespace Orchard.Tests.Environment.Loaders
// Result for project b and c
_mockedStubProjectFileParser
.Setup(stubProjectFileParser => stubProjectFileParser.Parse(It.Is<string>(virtualPath => (virtualPath == project2Path || virtualPath == project3Path))))
.Setup(stubProjectFileParser => stubProjectFileParser.Parse(It.Is<string>(virtualPath => virtualPath == project2Path || virtualPath == project3Path)))
.Returns(
new ProjectFileDescriptor
{

6
src/Orchard.Tests/Localization/TestHelpers.cs
View File

@@ -69,9 +69,9 @@ namespace Orchard.Tests.Localization
public override T GetState<T>(string name)
{
if (name == "CurrentCulture") return (T)((object)CultureName);
if (name == "CurrentCalendar") return (T)((object)CalendarName);
if (name == "CurrentTimeZone") return (T)((object)TimeZone);
if (name == "CurrentCulture") return (T)(object)CultureName;
if (name == "CurrentCalendar") return (T)(object)CalendarName;
if (name == "CurrentTimeZone") return (T)(object)TimeZone;
throw new NotImplementedException(string.Format("Property '{0}' is not implemented.", name));
}

2
src/Orchard.Tests/Storage/FileSystemStorageProviderTests.cs
View File

@@ -80,7 +80,7 @@ namespace Orchard.Tests.Storage
[Test]
public void GetFileThatDoesNotExistShouldThrow()
{
Assert.Throws<ArgumentException>((() => _storageProvider.GetFile("notexisting")));
Assert.Throws<ArgumentException>(() => _storageProvider.GetFile("notexisting"));
}
[Test]

4
src/Orchard.Web/Core/Contents/ViewModels/PublishContentViewModel.cs
View File

@@ -17,10 +17,10 @@ namespace Orchard.Core.Contents.ViewModels
{
get
{
return (
return
(ContentItem.VersionRecord != null)
&& ((ContentItem.VersionRecord.Published == false)
|| (ContentItem.VersionRecord.Published && ContentItem.VersionRecord.Latest == false)));
|| (ContentItem.VersionRecord.Published && ContentItem.VersionRecord.Latest == false));
}
}

16
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -611,7 +611,7 @@ namespace Orchard.Core.Shapes
var route = shapeRoute as RouteData;
if (route != null)
{
shapeRouteData = (route).Values;
shapeRouteData = route.Values;
}
}
@@ -1039,17 +1039,9 @@ namespace Orchard.Core.Shapes
/// </summary>
private IHtmlString EncodeOrDisplay(dynamic Value, dynamic Display, HtmlHelper Html)
{
if (Value is IHtmlString)
{
return Value;
}
if (Value is IShape)
{
return Display(Value).ToString();
}
return Html.Raw(Html.Encode(Value.ToString()));
return Value is IHtmlString
? (IHtmlString)Value
: Value is IShape ? (IHtmlString)Display(Value).ToString() : (IHtmlString)Html.Raw(Html.Encode(Value.ToString()));
}
}
}

2
src/Orchard.Web/Modules/Lucene/Services/LuceneIndexProvider.cs
View File

@@ -179,7 +179,7 @@ namespace Lucene.Services
using (var writer = new IndexWriter(GetDirectory(indexName), _analyzerProvider.GetAnalyzer(indexName), false, IndexWriter.MaxFieldLength.UNLIMITED))
{
// Process documents by batch as there is a max number of terms a query can contain (1024 by default).
var pageCount = documentIds.Count() / BatchSize + 1;
var pageCount = (documentIds.Count() / BatchSize) + 1;
for (int page = 0; page < pageCount; page++)
{
var query = new BooleanQuery();

2
src/Orchard.Web/Modules/Orchard.ArchiveLater/Services/ArchiveLaterService.cs
View File

@@ -40,7 +40,7 @@ namespace Orchard.ArchiveLater.Services
var task = _scheduledTaskManager.GetTasks(archiveLaterPart.ContentItem)
.SingleOrDefault(t => t.TaskType == UnpublishTaskType);
return (task == null ? null : task.ScheduledUtc);
return task == null ? null : task.ScheduledUtc;
}
public void RemoveArchiveLaterTasks(ContentItem contentItem)

7
src/Orchard.Web/Modules/Orchard.AuditTrail/Services/AuditTrailManager.cs
View File

@@ -277,7 +277,7 @@ namespace Orchard.AuditTrail.Services
public IEnumerable<AuditTrailEventRecord> Trim(TimeSpan retentionPeriod)
{
var dateThreshold = (_clock.UtcNow.EndOfDay() - retentionPeriod);
var dateThreshold = _clock.UtcNow.EndOfDay() - retentionPeriod;
var query = _auditTrailRepository.Table.Where(x => x.CreatedUtc <= dateThreshold);
var recordsToDeleteArray = query.ToArray();
@@ -328,10 +328,7 @@ namespace Orchard.AuditTrail.Services
{
var settings = _siteService.GetSiteSettings().As<AuditTrailSettingsPart>();
if (!settings.EnableClientIpAddressLogging)
return null;
return _clientHostAddressAccessor.GetClientAddress();
return !settings.EnableClientIpAddressLogging ? null : _clientHostAddressAccessor.GetClientAddress();
}
private bool IsEventEnabled(AuditTrailEventDescriptor eventDescriptor)

14
src/Orchard.Web/Modules/Orchard.Autoroute/Providers/SlugTokens.cs
View File

@@ -44,9 +44,9 @@ namespace Orchard.Autoroute.Providers
{
context.For<IContent>("Content")
// {Content.Slug}
.Token("Slug", (content => content == null ? string.Empty : _slugService.Slugify(content)))
.Chain("Slug", "Text", (content => content == null ? string.Empty : _slugService.Slugify(content)))
.Token("Path", (content =>
.Token("Slug", content => content == null ? string.Empty : _slugService.Slugify(content))
.Chain("Slug", "Text", content => content == null ? string.Empty : _slugService.Slugify(content))
.Token("Path", content =>
{
var autoroutePart = content.As<AutoroutePart>();
if (autoroutePart == null)
@@ -55,9 +55,9 @@ namespace Orchard.Autoroute.Providers
}
var isHomePage = _homeAliasService.IsHomePage(autoroutePart);
return isHomePage ? string.Empty : autoroutePart.DisplayAlias;
}))
})
// {Content.ParentPath}
.Token("ParentPath", (content =>
.Token("ParentPath", content =>
{
var common = content.As<CommonPart>();
if (common == null || common.Container == null)
@@ -74,11 +74,11 @@ namespace Orchard.Autoroute.Providers
var isHomePage = _homeAliasService.IsHomePage(containerAutoroutePart);
return isHomePage ? "/" : containerAutoroutePart.DisplayAlias + "/";
}));
});
context.For<ContentTypeDefinition>("TypeDefinition")
// {Content.ContentType.Slug}
.Token("Slug", (ctd => _slugService.Slugify(ctd.DisplayName)));
.Token("Slug", ctd => _slugService.Slugify(ctd.DisplayName));
context.For<string>("Text")
.Token("Slug", text => _slugService.Slugify(text));

4
src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs
View File

@@ -39,10 +39,10 @@ namespace Orchard.Blogs.Models
{
get
{
return (
return
(ContentItem.VersionRecord != null) && (
(ContentItem.VersionRecord.Published == false) ||
(ContentItem.VersionRecord.Published && ContentItem.VersionRecord.Latest == false)));
(ContentItem.VersionRecord.Published && ContentItem.VersionRecord.Latest == false));
}
}

2
src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs
View File

@@ -150,7 +150,7 @@ namespace Orchard.Blogs.Services
public DateTime? GetScheduledPublishUtc(BlogPostPart blogPostPart)
{
var task = _publishingTaskManager.GetPublishTask(blogPostPart.ContentItem);
return (task == null ? null : task.ScheduledUtc);
return task == null ? null : task.ScheduledUtc;
}
private IContentQuery<ContentItem, CommonPartRecord> GetBlogQuery(BlogPart blog, VersionOptions versionOptions)

11
src/Orchard.Web/Modules/Orchard.DesignerTools/Services/ObjectDumper.cs
View File

@@ -182,7 +182,7 @@ namespace Orchard.DesignerTools.Services
continue;
}
if ((o is ContentPart && (member.Name == "ContentItem")))
if (o is ContentPart && (member.Name == "ContentItem"))
{
continue;
}
@@ -302,7 +302,7 @@ namespace Orchard.DesignerTools.Services
// remove central part if tool long
if (formatted.Length > MaxStringLength)
{
formatted = formatted.Substring(0, MaxStringLength / 2) + "..." + formatted.Substring(formatted.Length - MaxStringLength / 2);
formatted = formatted.Substring(0, MaxStringLength / 2) + "..." + formatted.Substring(formatted.Length - (MaxStringLength / 2));
}
formatted = "\"" + formatted + "\"";
@@ -314,12 +314,7 @@ namespace Orchard.DesignerTools.Services
private static string FormatType(object item)
{
var shape = item as IShape;
if (shape != null)
{
return shape.Metadata.Type + " Shape";
}
return FormatType(item.GetType());
return shape != null ? shape.Metadata.Type + " Shape" : FormatType(item.GetType());
}
private static string FormatType(Type type)

2
src/Orchard.Web/Modules/Orchard.DynamicForms/Services/FormService.cs
View File

@@ -182,7 +182,7 @@ namespace Orchard.DynamicForms.Services
string result = "";
do
{
result = ((char)((columnNumber - 1) % 26 + (int)'A')).ToString() + result;
result = ((char)(((columnNumber - 1) % 26) + (int)'A')).ToString() + result;
columnNumber = (columnNumber - 1) / 26;
} while (columnNumber != 0);
return result;

2
src/Orchard.Web/Modules/Orchard.Email/Forms/EmailForm.cs
View File

@@ -87,7 +87,7 @@ namespace Orchard.Email.Forms
Id: "priority",
Name: "Priority",
Title: T("Priority"),
Description: ("The priority of this message.")
Description: "The priority of this message."
));
form._Type._Priority.Add(new SelectListItem { Value = "-50", Text = T("Low").Text });

2
src/Orchard.Web/Modules/Orchard.Fields/Drivers/NumericFieldDriver.cs
View File

@@ -123,7 +123,7 @@ namespace Orchard.Fields.Drivers
protected override void Importing(ContentPart part, NumericField field, ImportContentContext context)
{
Action empty = (() => field.Value = (decimal?)null);
Action empty = () => field.Value = (decimal?)null;
var element = context.Data.Element(field.FieldDefinition.Name + "." + field.Name);
// If element is not in the ImportContentContext, field must not be reset.
if (element == null)

4
src/Orchard.Web/Modules/Orchard.Forms/Shapes/EditorShapes.cs
View File

@@ -447,7 +447,7 @@ namespace Orchard.Forms.Shapes
{
var itemStr = (string)item;
selectItem.Text = itemStr;
selectItem.Selected = (itemStr == Convert.ToString(Shape.Value));
selectItem.Selected = itemStr == Convert.ToString(Shape.Value);
}
else
{
@@ -456,7 +456,7 @@ namespace Orchard.Forms.Shapes
{
var value = GetSelectProperty(item, DataValueField);
selectItem.Value = Convert.ToString(value);
selectItem.Selected = (value == Shape.Value);
selectItem.Selected = value == Shape.Value;
}
}
}

2
src/Orchard.Web/Modules/Orchard.Localization/Conditions/CultureConditionProvider.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.Localization.Conditions
.Cast<bool>()
.SingleOrDefault();
ruleContext.Result = (isRtl == currentUserCulture.TextInfo.IsRightToLeft);
ruleContext.Result = isRtl == currentUserCulture.TextInfo.IsRightToLeft;
}
private void ProcessCultureCode(dynamic ruleContext)

2
src/Orchard.Web/Modules/Orchard.Media/Helpers/MediaHelpers.cs
View File

@@ -26,7 +26,7 @@ namespace Orchard.Media.Helpers
string currentPath = string.Empty;
foreach (string navigationPart in navigationParts)
{
currentPath = (string.IsNullOrEmpty(currentPath) ? navigationPart : currentPath + "\\" + navigationPart);
currentPath = string.IsNullOrEmpty(currentPath) ? navigationPart : currentPath + "\\" + navigationPart;
navigations.Add(new FolderNavigation { FolderName = navigationPart, FolderPath = currentPath });
}

18
src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/MediaLibraryService.cs
View File

@@ -110,7 +110,7 @@ namespace Orchard.MediaLibrary.Services
if (recursive)
{
var subfolderSearch = folderPath.EndsWith(Path.DirectorySeparatorChar.ToString()) ? folderPath : folderPath + Path.DirectorySeparatorChar;
query = query.Join<MediaPartRecord>().Where(m => (m.FolderPath == folderPath || m.FolderPath.StartsWith(subfolderSearch)));
query = query.Join<MediaPartRecord>().Where(m => m.FolderPath == folderPath || m.FolderPath.StartsWith(subfolderSearch));
}
else
{
@@ -217,10 +217,7 @@ namespace Orchard.MediaLibrary.Services
.Where(x => x != null)
.OrderByDescending(x => x.Priority);
if (!requestMediaFactoryResults.Any())
return null;
return requestMediaFactoryResults.First().MediaFactory;
return !requestMediaFactoryResults.Any() ? null : requestMediaFactoryResults.First().MediaFactory;
}
/// <summary>
@@ -300,14 +297,9 @@ namespace Orchard.MediaLibrary.Services
isMyfolder = true;
}
if (isMyfolder)
{
return _orchardServices.Authorizer.Authorize(Permissions.ManageOwnMedia);
}
else
{ // other
return _orchardServices.Authorizer.Authorize(permission);
}
return isMyfolder
? _orchardServices.Authorizer.Authorize(Permissions.ManageOwnMedia)
: _orchardServices.Authorizer.Authorize(permission);
}
/// <summary>

2
src/Orchard.Web/Modules/Orchard.MediaProcessing/Services/ImageProfileManager.cs
View File

@@ -82,7 +82,7 @@ namespace Orchard.MediaProcessing.Services
// If content item is null (it means it's not passed as a parameter of the ResizeMediaUrl call),
// this function processes the file like it did before this patch;
// this means it could possibly throw and log exceptions for svg files.
bool checkForProfile = (contentItem == null || contentItem.Has<ImagePart>());
bool checkForProfile = contentItem == null || contentItem.Has<ImagePart>();
if (checkForProfile)
{

2
src/Orchard.Web/Modules/Orchard.OpenId/Providers/ActiveDirectoryFederationServices.cs
View File

@@ -39,7 +39,7 @@ namespace Orchard.OpenId.Providers
site = scope.Resolve<ISiteService>().GetSiteSettings();
settings = site.As<ActiveDirectoryFederationServicesSettingsPart>();
return (settings != null && settings.IsValid());
return settings != null && settings.IsValid();
}
catch (Exception)
{

2
src/Orchard.Web/Modules/Orchard.OpenId/Providers/AzureActiveDirectory.cs
View File

@@ -39,7 +39,7 @@ namespace Orchard.OpenId.Providers
site = scope.Resolve<ISiteService>().GetSiteSettings();
settings = site.As<AzureActiveDirectorySettingsPart>();
return (settings != null && settings.IsValid());
return settings != null && settings.IsValid();
}
catch (Exception)
{

2
src/Orchard.Web/Modules/Orchard.OpenId/Providers/Facebook.cs
View File

@@ -39,7 +39,7 @@ namespace Orchard.OpenId.Providers
site = scope.Resolve<ISiteService>().GetSiteSettings();
settings = site.As<FacebookSettingsPart>();
return (settings != null && settings.IsValid());
return settings != null && settings.IsValid();
}
catch (Exception)
{

2
src/Orchard.Web/Modules/Orchard.OpenId/Providers/Google.cs
View File

@@ -40,7 +40,7 @@ namespace Orchard.OpenId.Providers
site = scope.Resolve<ISiteService>().GetSiteSettings();
settings = site.As<GoogleSettingsPart>();
return (settings != null && settings.IsValid());
return settings != null && settings.IsValid();
}
catch (Exception)
{

2
src/Orchard.Web/Modules/Orchard.OpenId/Providers/Twitter.cs
View File

@@ -39,7 +39,7 @@ namespace Orchard.OpenId.Providers
site = scope.Resolve<ISiteService>().GetSiteSettings();
settings = site.As<TwitterSettingsPart>();
return (settings != null && settings.IsValid());
return settings != null && settings.IsValid();
}
catch (Exception)
{

11
src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
View File

@@ -452,7 +452,7 @@ namespace Orchard.OutputCache.Filters
continue;
// In exclusive mode, don't vary if the key matches
if (CacheSettings.VaryByQueryStringIsExclusive && (CacheSettings.VaryByQueryStringParameters != null && CacheSettings.VaryByQueryStringParameters.Contains(key)))
if (CacheSettings.VaryByQueryStringIsExclusive && CacheSettings.VaryByQueryStringParameters != null && CacheSettings.VaryByQueryStringParameters.Contains(key))
continue;
// In inclusive mode, don't vary if the key doesn't match
@@ -550,14 +550,7 @@ namespace Orchard.OutputCache.Filters
qs.Add(_refreshKey, refresh.ToString("x"));
var querystring = "?" + string.Join("&", Array.ConvertAll(qs.AllKeys, k => string.Format("{0}={1}", HttpUtility.UrlEncode(k), HttpUtility.UrlEncode(qs[k]))));
if (epIndex > 0)
{
redirectUrl = redirectUrl.Substring(0, epIndex) + querystring;
}
else
{
redirectUrl = redirectUrl + querystring;
}
redirectUrl = epIndex > 0 ? redirectUrl.Substring(0, epIndex) + querystring : redirectUrl + querystring;
}
filterContext.Result = new RedirectResult(redirectUrl, redirectResult.Permanent);

6
src/Orchard.Web/Modules/Orchard.Projections/Providers/Layouts/LayoutShapes.cs
View File

@@ -39,13 +39,13 @@ namespace Orchard.Projections.Providers.Layouts
}
// resolves which item to display in a specific cell
Func<int, int, int> seekItem = (row, col) => row * Columns + col;
int maxRows = (itemsCount - 1) / Columns + 1;
Func<int, int, int> seekItem = (row, col) => (row * Columns) + col;
int maxRows = ((itemsCount - 1) / Columns) + 1;
int maxCols = Columns;
if (!Horizontal)
{
seekItem = (row, col) => col * Columns + row;
seekItem = (row, col) => (col * Columns) + row;
maxCols = maxRows;
maxRows = Columns;
}

2
src/Orchard.Web/Modules/Orchard.PublishLater/Services/PublishLaterService.cs
View File

@@ -34,7 +34,7 @@ namespace Orchard.PublishLater.Services
DateTime? IPublishLaterService.GetScheduledPublishUtc(PublishLaterPart publishLaterPart)
{
IScheduledTask task = _publishingTaskManager.GetPublishTask(publishLaterPart.ContentItem);
return (task == null ? null : task.ScheduledUtc);
return task == null ? null : task.ScheduledUtc;
}
}
}

4
src/Orchard.Web/Modules/Orchard.PublishLater/ViewModels/PublishLaterViewModel.cs
View File

@@ -21,10 +21,10 @@ namespace Orchard.PublishLater.ViewModels
{
get
{
return (
return
(ContentItem.VersionRecord != null)
&& ((ContentItem.VersionRecord.Published == false)
|| (ContentItem.VersionRecord.Published && ContentItem.VersionRecord.Latest == false)));
|| (ContentItem.VersionRecord.Published && ContentItem.VersionRecord.Latest == false));
}
}

4
src/Orchard.Web/Modules/Orchard.Recipes/Providers/Executors/CommandStep.cs
View File

@@ -83,8 +83,8 @@ namespace Orchard.Recipes.Providers.Executors
//If arg is not empty and starts with '/'
int index = arg.IndexOf(':');
var switchName = (index < 0 ? arg.Substring(1) : arg.Substring(1, index - 1));
var switchValue = (index < 0 || index >= arg.Length ? string.Empty : arg.Substring(index + 1));
var switchName = index < 0 ? arg.Substring(1) : arg.Substring(1, index - 1);
var switchValue = index < 0 || index >= arg.Length ? string.Empty : arg.Substring(index + 1);
if (string.IsNullOrEmpty(switchName))
{

2
src/Orchard.Web/Modules/Orchard.Roles/Services/RoleService.cs
View File

@@ -230,7 +230,7 @@ namespace Orchard.Roles.Services
/// <returns>Returns false if a role with the given name already exits</returns>
public bool VerifyRoleUnicity(string name)
{
return (_roleRepository.Get(x => x.Name == name) == null);
return _roleRepository.Get(x => x.Name == name) == null;
}

2
src/Orchard.Web/Modules/Orchard.Scripting/Ast/AstNode.cs
View File

@@ -14,7 +14,7 @@ namespace Orchard.Scripting.Ast
{
var sb = new StringBuilder();
sb.Append(this.GetType().Name);
var ewt = (this as IAstNodeWithToken);
var ewt = this as IAstNodeWithToken;
if (ewt != null)
{
sb.Append(" - ");

9
src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Parser.cs
View File

@@ -208,12 +208,7 @@ namespace Orchard.Scripting.Compiler
var expr = ParseExpression();
// ')'
if (IsMatch(TokenKind.CloseParen) == null)
{
return ExpectedTokenError(TokenKind.CloseParen);
}
return expr;
return IsMatch(TokenKind.CloseParen) == null ? ExpectedTokenError(TokenKind.CloseParen) : expr;
}
private AstNode ParseMethodCallExpression()
@@ -221,7 +216,7 @@ namespace Orchard.Scripting.Compiler
var target = _lexer.Token();
_lexer.NextToken();
bool isParenthesizedCall = (IsMatch(TokenKind.OpenParen) != null);
bool isParenthesizedCall = IsMatch(TokenKind.OpenParen) != null;
// This is to avoid parsing method calls within method calls that have no
// parenthesis (language ambiguity)

2
src/Orchard.Web/Modules/Orchard.Scripting/Compiler/Tokenizer.cs
View File

@@ -344,7 +344,7 @@ namespace Orchard.Scripting.Compiler
private bool Eof()
{
return (_index >= _expression.Length);
return _index >= _expression.Length;
}
}
}

2
src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
View File

@@ -94,7 +94,7 @@ namespace Orchard.Search.Controllers
{
Query = q,
TotalItemCount = searchHits.TotalItemCount,
StartPosition = (pager.Page - 1) * pager.PageSize + 1,
StartPosition = ((pager.Page - 1) * pager.PageSize) + 1,
EndPosition = pager.Page * pager.PageSize > searchHits.TotalItemCount ? searchHits.TotalItemCount : pager.Page * pager.PageSize,
ContentItems = list,
Pager = pagerShape,

2
src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
View File

@@ -76,7 +76,7 @@ namespace Orchard.Search.Drivers
};
foreach (var field in _indexManager.GetSearchIndexProvider().GetFields(x))
{
indexSettings.Fields.Add(new SearchSettingsEntry { Field = field, Selected = (searchFields.ContainsKey(x) && searchFields[x].Contains(field)) });
indexSettings.Fields.Add(new SearchSettingsEntry { Field = field, Selected = searchFields.ContainsKey(x) && searchFields[x].Contains(field) });
}
return indexSettings;

2
src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
View File

@@ -110,7 +110,7 @@ namespace Orchard.Setup.Controllers
}
if (model.Recipe == null)
{
if (!(recipes.Select(r => r.Name).Contains(DefaultRecipe)))
if (!recipes.Select(r => r.Name).Contains(DefaultRecipe))
{
ModelState.AddModelError("Recipe", T("No recipes were found.").Text);
}

2
src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
View File

@@ -80,7 +80,7 @@ namespace Orchard.Taxonomies.Drivers
if (updater.TryUpdateModel(viewModel, GetPrefix(field, part), null, null))
{
var checkedTerms = viewModel.Terms
.Where(t => (t.IsChecked || t.Id == viewModel.SingleTermId))
.Where(t => t.IsChecked || t.Id == viewModel.SingleTermId)
.Select(t => GetOrCreateTerm(t, viewModel.TaxonomyId, field))
.Where(t => t != null).ToList();

49
src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TaxonomyService.cs
View File

@@ -259,23 +259,17 @@ namespace Orchard.Taxonomies.Services
public int GetTermsCount(int taxonomyId)
{
// If taxonomyId isn't valid, return 0 without executing the query.
if (taxonomyId <= 0)
{
return 0;
}
return GetTermsQuery(taxonomyId)
.Count();
return taxonomyId <= 0
? 0
: GetTermsQuery(taxonomyId).Count();
}
public TermPart GetTerm(int id)
{
// If term id isn't valid, return null without executing the query.
if (id <= 0)
{
return null;
}
return GetTermsQuery()
.Where(x => x.Id == id).List().FirstOrDefault();
return id <= 0
? null
: GetTermsQuery().Where(x => x.Id == id).List().FirstOrDefault();
}
public IEnumerable<TermPart> GetTermsForContentItem(
@@ -301,15 +295,13 @@ namespace Orchard.Taxonomies.Services
public TermPart GetTermByName(int taxonomyId, string name)
{
// If taxonomyId isn't valid, return null without executing the query.
if (taxonomyId <= 0)
{
return null;
}
return GetTermsQuery(taxonomyId)
.Join<TitlePartRecord>()
.Where(r => r.Title == name)
.List()
.FirstOrDefault();
return taxonomyId <= 0
? null
: GetTermsQuery(taxonomyId)
.Join<TitlePartRecord>()
.Where(r => r.Title == name)
.List()
.FirstOrDefault();
}
public void CreateTerm(TermPart termPart)
@@ -398,20 +390,15 @@ namespace Orchard.Taxonomies.Services
var query = _contentManager
.Query<TermsPart, TermsPartRecord>();
if (string.IsNullOrWhiteSpace(fieldName))
{
query = query.Where(
query = string.IsNullOrWhiteSpace(fieldName)
? query.Where(
tpr => tpr.Terms.Any(tr =>
tr.TermRecord.Id == term.Id
|| tr.TermRecord.Path.StartsWith(rootPath)));
}
else
{
query = query.Where(
|| tr.TermRecord.Path.StartsWith(rootPath)))
: query.Where(
tpr => tpr.Terms.Any(tr =>
tr.Field == fieldName
&& (tr.TermRecord.Id == term.Id || tr.TermRecord.Path.StartsWith(rootPath))));
}
return query;
}
@@ -706,7 +693,7 @@ namespace Orchard.Taxonomies.Services
.Where(sib => sib.Weight == part.Weight)
.Select(tp => tp.Id)
.ToArray();
var siblingsWeight = (1048575).ToString("X5");
var siblingsWeight = 1048575.ToString("X5");
for (int i = 0; i < siblingsIds.Length; i++)
{
if (siblingsIds[i] == part.Id)

2
src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeFilter.cs
View File

@@ -28,7 +28,7 @@ namespace Orchard.Themes.Preview
public void OnResultExecuting(ResultExecutingContext filterContext)
{
if (filterContext.Result as ViewResult == null)
if ((filterContext.Result as ViewResult) == null)
{
return;
}

54
src/Orchard.Web/Modules/Orchard.Tokens/Providers/ContentTokens.cs
View File

@@ -208,22 +208,12 @@ namespace Orchard.Tokens.Providers
private IContent Container(IContent content)
{
var commonPart = content.As<ICommonPart>();
if (commonPart == null)
{
return null;
}
return commonPart.Container;
return commonPart == null ? null : commonPart.Container;
}
private string DisplayText(IContent content)
{
if (content == null)
{
return string.Empty;
}
return _contentManager.GetItemMetadata(content).DisplayText;
return content == null ? string.Empty : _contentManager.GetItemMetadata(content).DisplayText;
}
private object Date(IContent content)
@@ -233,22 +223,12 @@ namespace Orchard.Tokens.Providers
private string DisplayUrl(IContent content)
{
if (content == null)
{
return string.Empty;
}
return _urlHelper.RouteUrl(_contentManager.GetItemMetadata(content).DisplayRouteValues);
return content == null ? string.Empty : _urlHelper.RouteUrl(_contentManager.GetItemMetadata(content).DisplayRouteValues);
}
private string EditUrl(IContent content)
{
if (content == null)
{
return string.Empty;
}
return _urlHelper.RouteUrl(_contentManager.GetItemMetadata(content).EditorRouteValues);
return content == null ? string.Empty : _urlHelper.RouteUrl(_contentManager.GetItemMetadata(content).EditorRouteValues);
}
private string Body(IContent content)
@@ -259,12 +239,7 @@ namespace Orchard.Tokens.Providers
}
var bodyPart = content.As<BodyPart>();
if (bodyPart == null)
{
return string.Empty;
}
return bodyPart.Text;
return bodyPart == null ? string.Empty : bodyPart.Text;
}
//returns Id:* Token
@@ -281,28 +256,17 @@ namespace Orchard.Tokens.Providers
chainIndex = token.IndexOf(".");
tokenLength = (tokenPrefix + ":").Length;
if (!token.StartsWith((tokenPrefix + ":"), StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength)
if (!token.StartsWith(tokenPrefix + ":", StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength)
{
return null;
}
else if (chainIndex == 0)
{// "." has not be found
result = token.Substring(tokenLength);
}
else
{
result = token.Substring(0, chainIndex);
{// "." has not be found
result = chainIndex == 0 ? token.Substring(tokenLength) : token.Substring(0, chainIndex);
}
// return the resulting id if it is a number, otherwise an empty string
if (int.TryParse(result.Substring(tokenPrefix.Length + 1), out var contentid))
{
return result;
}
else
{
return "";
}
return int.TryParse(result.Substring(tokenPrefix.Length + 1), out var contentid) ? result : "";
}
}
}

43
src/Orchard.Web/Modules/Orchard.Tokens/Providers/RequestTokens.cs
View File

@@ -85,12 +85,7 @@ namespace Orchard.Tokens.Providers
private static string GetRouteValue(string token, HttpRequestBase request)
{
object result;
if (!request.RequestContext.RouteData.Values.TryGetValue(token, out result))
{
return string.Empty;
}
return result.ToString();
return !request.RequestContext.RouteData.Values.TryGetValue(token, out result) ? string.Empty : result.ToString();
}
private ContentItem GetRoutedContentItem(HttpRequestBase request)
@@ -134,12 +129,7 @@ namespace Orchard.Tokens.Providers
private string DisplayText(IContent content)
{
if (content == null)
{
return string.Empty;
}
return _contentManager.GetItemMetadata(content).DisplayText;
return content == null ? string.Empty : _contentManager.GetItemMetadata(content).DisplayText;
}
private static string FilterTokenParam(string token)
@@ -159,15 +149,11 @@ namespace Orchard.Tokens.Providers
// use ")." as chars combination to discover the end of the parameter
chainIndex = token.IndexOf(").") + 1;
tokenLength = (tokenPrefix + ":").Length;
if (chainIndex == 0)
{// ")." has not be found
return token.Substring(tokenLength).Trim(new char[] { '(', ')' });
}
if (!token.StartsWith((tokenPrefix + ":"), StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength)
{
return null;
}
return token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' });
return chainIndex == 0
? token.Substring(tokenLength).Trim(new char[] { '(', ')' })
: !token.StartsWith(tokenPrefix + ":", StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength
? null
: token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' });
}
private static Tuple<string, string> FilterChainParam(string token)
{
@@ -187,16 +173,11 @@ namespace Orchard.Tokens.Providers
// use ")." as chars combination to discover the end of the parameter
chainIndex = token.IndexOf(").") + 1;
tokenLength = (tokenPrefix + ":").Length;
if (chainIndex == 0)
{ // ")." has not be found
return new Tuple<string, string>(token.Substring(tokenLength).Trim(new char[] { '(', ')' }), "");
}
if (!token.StartsWith((tokenPrefix + ":"), StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength)
{
return null;
}
return new Tuple<string, string>(token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' }), token.Substring(chainIndex + 1));
return chainIndex == 0
? new Tuple<string, string>(token.Substring(tokenLength).Trim(new char[] { '(', ')' }), "")
: !token.StartsWith(tokenPrefix + ":", StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength
? null
: new Tuple<string, string>(token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' }), token.Substring(chainIndex + 1));
}
}

47
src/Orchard.Web/Modules/Orchard.Tokens/Providers/TextTokens.cs
View File

@@ -102,14 +102,7 @@ namespace Orchard.Tokens.Providers
if (!token.StartsWith(tokenName, StringComparison.OrdinalIgnoreCase)) return null;
string tokenPrefix;
int chainIndex, tokenLength;
if (token.IndexOf(":") == -1)
{
tokenPrefix = token;
}
else
{
tokenPrefix = token.Substring(0, token.IndexOf(":"));
}
tokenPrefix = token.IndexOf(":") == -1 ? token : token.Substring(0, token.IndexOf(":"));
if (!_textChainableTokens.Contains(tokenPrefix, StringComparer.OrdinalIgnoreCase))
{
return token.StartsWith(tokenName, StringComparison.OrdinalIgnoreCase) ? token.Substring(tokenName.Length) : null;
@@ -118,15 +111,11 @@ namespace Orchard.Tokens.Providers
// use ")." as chars combination to discover the end of the parameter
chainIndex = token.IndexOf(").") + 1;
tokenLength = (tokenPrefix + ":").Length;
if (chainIndex == 0)
{// ")." has not be found
return token.Substring(tokenLength).Trim(new char[] { '(', ')' });
}
if (!token.StartsWith((tokenPrefix + ":"), StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength)
{
return null;
}
return token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' });
return chainIndex == 0
? token.Substring(tokenLength).Trim(new char[] { '(', ')' })
: !token.StartsWith(tokenPrefix + ":", StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength
? null
: token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' });
}
/// <summary>
@@ -141,14 +130,7 @@ namespace Orchard.Tokens.Providers
string tokenPrefix;
int chainIndex, tokenLength;
if (token.IndexOf(":") == -1)
{
tokenPrefix = token;
}
else
{
tokenPrefix = token.Substring(0, token.IndexOf(":"));
}
tokenPrefix = token.IndexOf(":") == -1 ? token : token.Substring(0, token.IndexOf(":"));
if (!_textChainableTokens.Contains(tokenPrefix, StringComparer.OrdinalIgnoreCase))
{
return new Tuple<string, string>(token, token);
@@ -157,16 +139,11 @@ namespace Orchard.Tokens.Providers
// use ")." as chars combination to discover the end of the parameter
chainIndex = token.IndexOf(").") + 1;
tokenLength = (tokenPrefix + ":").Length;
if (chainIndex == 0)
{ // ")." has not be found
return new Tuple<string, string>(token.Substring(tokenLength).Trim(new char[] { '(', ')' }), "");
}
if (!token.StartsWith((tokenPrefix + ":"), StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength)
{
return null;
}
return new Tuple<string, string>(token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' }), token.Substring(chainIndex + 1));
return chainIndex == 0
? new Tuple<string, string>(token.Substring(tokenLength).Trim(new char[] { '(', ')' }), "")
: !token.StartsWith(tokenPrefix + ":", StringComparison.OrdinalIgnoreCase) || chainIndex <= tokenLength
? null
: new Tuple<string, string>(token.Substring(tokenLength, chainIndex - tokenLength).Trim(new char[] { '(', ')' }), token.Substring(chainIndex + 1));
}
private static string TrimStart(string param, string token)

2
src/Orchard.Web/Modules/Orchard.Users/Services/PasswordService.cs
View File

@@ -101,7 +101,7 @@ namespace Orchard.Users.Services
var bytesAreEqual = true;
for (int i = 0; i < a.Length; i++)
{
bytesAreEqual &= (aBytes[i] == bBytes[i]);
bytesAreEqual &= aBytes[i] == bBytes[i];
}
return bytesAreEqual;

2
src/Orchard.Web/Modules/Orchard.Warmup/Controllers/AdminController.cs
View File

@@ -76,7 +76,7 @@ namespace Orchard.Warmup.Controllers
{
continue;
}
if (!Uri.IsWellFormedUriString(relativeUrl, UriKind.Relative) || !(relativeUrl.StartsWith("/")))
if (!Uri.IsWellFormedUriString(relativeUrl, UriKind.Relative) || !relativeUrl.StartsWith("/"))
{
AddModelError("Urls", T("\"{0}\" is an invalid warmup url.", relativeUrl));
}

7
src/Orchard.Web/Modules/Orchard.Warmup/Services/WebDownloader.cs
View File

@@ -47,12 +47,7 @@ namespace Orchard.Warmup.Services
}
catch (WebException e)
{
if (e.Response as HttpWebResponse != null)
{
return new DownloadResult { StatusCode = ((HttpWebResponse)e.Response).StatusCode };
}
return null;
return (e.Response as HttpWebResponse) != null ? new DownloadResult { StatusCode = ((HttpWebResponse)e.Response).StatusCode } : null;
}
catch (Exception e)
{

2
src/Orchard/Caching/Cache.cs
View File

@@ -36,7 +36,7 @@ namespace Orchard.Caching
private CacheEntry UpdateEntry(CacheEntry currentEntry, TKey k, Func<AcquireContext<TKey>, TResult> acquire)
{
var entry = (currentEntry.Tokens.Any(t => t != null && !t.IsCurrent)) ? CreateEntry(k, acquire) : currentEntry;
var entry = currentEntry.Tokens.Any(t => t != null && !t.IsCurrent) ? CreateEntry(k, acquire) : currentEntry;
PropagateTokens(entry);
return entry;
}

2
src/Orchard/Collections/PageOfItems.cs
View File

@@ -17,7 +17,7 @@ namespace Orchard.Collections
public int TotalItemCount { get; set; }
public int TotalPageCount => (int)Math.Ceiling((double)TotalItemCount / PageSize);
public int StartPosition => (PageNumber - 1) * PageSize + 1;
public int StartPosition => ((PageNumber - 1) * PageSize) + 1;
public int EndPosition => PageNumber * PageSize > TotalItemCount ? TotalItemCount : PageNumber * PageSize;
#endregion

2
src/Orchard/Commands/DefaultCommandManager.cs
View File

@@ -93,7 +93,7 @@ namespace Orchard.Commands
private static CommandHandlerDescriptor GetDescriptor(IDictionary<string, object> metadata)
{
return ((CommandHandlerDescriptor)metadata[typeof(CommandHandlerDescriptor).FullName]);
return (CommandHandlerDescriptor)metadata[typeof(CommandHandlerDescriptor).FullName];
}
private class Match

25
src/Orchard/ContentManagement/ContentExtensions.cs
View File

@@ -17,10 +17,7 @@ namespace Orchard.ContentManagement
return null;
var part = contentItem.Get<T>();
if (part == null)
throw new InvalidCastException();
return part;
return part == null ? throw new InvalidCastException() : part;
}
public static void Create(this IContentManager manager, IContent content)
@@ -216,26 +213,19 @@ namespace Orchard.ContentManagement
public static TContent BuildDisplayShape<TContent>(this IContentManager manager, int id, string displayType) where TContent : class, IContent
{
var content = manager.Get<TContent>(id);
if (content == null)
return null;
return manager.BuildDisplay(content, displayType);
return content == null ? null : (TContent)manager.BuildDisplay(content, displayType);
}
public static TContent BuildEditorShape<TContent>(this IContentManager manager, int id) where TContent : class, IContent
{
var content = manager.Get<TContent>(id);
if (content == null)
return null;
return manager.BuildEditor(content);
return content == null ? null : (TContent)manager.BuildEditor(content);
}
public static TContent UpdateEditorShape<TContent>(this IContentManager manager, int id, IUpdateModel updater) where TContent : class, IContent
{
var content = manager.Get<TContent>(id);
if (content == null)
return null;
return manager.UpdateEditor(content, updater);
return content == null ? null : (TContent)manager.UpdateEditor(content, updater);
}
@@ -272,10 +262,9 @@ namespace Orchard.ContentManagement
}
public static bool HasDraft(this IContent content)
{
return (
(content.ContentItem.VersionRecord != null)
&& ((content.ContentItem.VersionRecord.Published == false)
|| (content.ContentItem.VersionRecord.Published && content.ContentItem.VersionRecord.Latest == false)));
return (content.ContentItem.VersionRecord != null)
&& ((content.ContentItem.VersionRecord.Published == false)
|| (content.ContentItem.VersionRecord.Published && content.ContentItem.VersionRecord.Latest == false));
}
public static bool HasPublished(this IContent content)
{

12
src/Orchard/ContentManagement/InfosetHelper.cs
View File

@@ -125,7 +125,7 @@ namespace Orchard.ContentManagement
public static void Store<TProperty>(this InfosetPart infosetPart, string partName, string name, TProperty value, bool versioned = false)
{
var infoset = (versioned ? infosetPart.VersionInfoset : infosetPart.Infoset);
var infoset = versioned ? infosetPart.VersionInfoset : infosetPart.Infoset;
var partElement = infoset.Element.Element(partName);
if (partElement == null)
{
@@ -157,13 +157,9 @@ namespace Orchard.ContentManagement
/// <returns>The original string if no invalid characters were found.</returns>
public static string ThrowIfContainsInvalidXmlCharacter(string value)
{
if (!value.Any(character => InvalidXmlCharacters.Contains(character)))
{
return value;
}
throw new ArgumentException(
$"The string contains character(s) that are invalid in XML and which should be removed.");
return !value.Any(character => InvalidXmlCharacters.Contains(character))
? value
: throw new ArgumentException($"The string contains character(s) that are invalid in XML and which should be removed.");
}
}
}

62
src/Orchard/ContentManagement/XmlHelper.cs
View File

@@ -204,15 +204,9 @@ namespace Orchard.ContentManagement
{
var doubleValue = (double)(object)value;
if (double.IsPositiveInfinity(doubleValue))
{
return "infinity";
}
if (double.IsNegativeInfinity(doubleValue))
{
return "-infinity";
}
return doubleValue.ToString(CultureInfo.InvariantCulture);
return double.IsPositiveInfinity(doubleValue)
? "infinity"
: double.IsNegativeInfinity(doubleValue) ? "-infinity" : doubleValue.ToString(CultureInfo.InvariantCulture);
}
if (type == typeof(float) ||
@@ -220,15 +214,9 @@ namespace Orchard.ContentManagement
{
var floatValue = (float)(object)value;
if (float.IsPositiveInfinity(floatValue))
{
return "infinity";
}
if (float.IsNegativeInfinity(floatValue))
{
return "-infinity";
}
return floatValue.ToString(CultureInfo.InvariantCulture);
return float.IsPositiveInfinity(floatValue)
? "infinity"
: float.IsNegativeInfinity(floatValue) ? "-infinity" : floatValue.ToString(CultureInfo.InvariantCulture);
}
if (type == typeof(decimal) ||
@@ -246,12 +234,9 @@ namespace Orchard.ContentManagement
var underlyingType = Nullable.GetUnderlyingType(type) ?? type;
if (underlyingType.IsEnum)
{
return value.ToString();
}
throw new NotSupportedException(string.Format("Could not handle type {0}", type.Name));
return underlyingType.IsEnum
? value.ToString()
: throw new NotSupportedException(string.Format("Could not handle type {0}", type.Name));
}
/// <summary>
@@ -269,8 +254,8 @@ namespace Orchard.ContentManagement
return (T)(object)value;
}
if (value == null ||
"null".Equals(value, StringComparison.Ordinal) &&
((!type.IsValueType || Nullable.GetUnderlyingType(type) != null)))
("null".Equals(value, StringComparison.Ordinal) &&
(!type.IsValueType || Nullable.GetUnderlyingType(type) != null)))
{
return default(T);
@@ -278,15 +263,19 @@ namespace Orchard.ContentManagement
if ("infinity".Equals(value, StringComparison.Ordinal))
{
if (type == typeof(float) || type == typeof(float?)) return (T)(object)float.PositiveInfinity;
if (type == typeof(double) || type == typeof(double?)) return (T)(object)double.PositiveInfinity;
throw new NotSupportedException(string.Format("Infinity not supported for type {0}", type.Name));
return type == typeof(float) || type == typeof(float?)
? (T)(object)float.PositiveInfinity
: type == typeof(double) || type == typeof(double?)
? (T)(object)double.PositiveInfinity
: throw new NotSupportedException(string.Format("Infinity not supported for type {0}", type.Name));
}
if ("-infinity".Equals(value, StringComparison.Ordinal))
{
if (type == typeof(float)) return (T)(object)float.NegativeInfinity;
if (type == typeof(double)) return (T)(object)double.NegativeInfinity;
throw new NotSupportedException(string.Format("Infinity not supported for type {0}", type.Name));
return type == typeof(float)
? (T)(object)float.NegativeInfinity
: type == typeof(double)
? (T)(object)double.NegativeInfinity
: throw new NotSupportedException(string.Format("Infinity not supported for type {0}", type.Name));
}
if (type == typeof(char) || type == typeof(char?))
{
@@ -328,12 +317,9 @@ namespace Orchard.ContentManagement
var underlyingType = Nullable.GetUnderlyingType(type) ?? type;
if (underlyingType.IsEnum)
{
return (T)Enum.Parse(underlyingType, value);
}
throw new NotSupportedException(string.Format("Could not handle type {0}", type.Name));
return underlyingType.IsEnum
? (T)Enum.Parse(underlyingType, value)
: throw new NotSupportedException(string.Format("Could not handle type {0}", type.Name));
}
/// <summary>

2
src/Orchard/Data/Repository.cs
View File

@@ -143,7 +143,7 @@ namespace Orchard.Data
var genericArgument = type.GetGenericArguments().First();
var genericType = typeof(List<>).MakeGenericType(new[] { genericArgument });
var listValues = ((IList)value);
var listValues = (IList)value;
values[index] = Activator.CreateInstance(genericType, new[] { listValues });
}

35
src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs
View File

@@ -46,10 +46,7 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy
private static string SafeName(string name)
{
if (string.IsNullOrWhiteSpace(name))
return string.Empty;
return name.Strip(UnsafeCharList).ToLowerInvariant();
return string.IsNullOrWhiteSpace(name) ? string.Empty : name.Strip(UnsafeCharList).ToLowerInvariant();
}
public static string GetAlternateShapeNameFromFileName(string fileName)
@@ -118,7 +115,7 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy
hit.fileVirtualPath,
shapeDescriptor => displayContext =>
{
var shape = ((dynamic)displayContext.Value);
var shape = (dynamic)displayContext.Value;
var output = displayContext.ViewContext.Writer;
ResourceDefinition resource = shape.Resource;
var url = GetResourceUrl(shape.Url, AddHash(hit.fileVirtualPath));
@@ -167,29 +164,19 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy
return null;
}
var encodedValue = HttpUtility.UrlEncode(value);
if (url.Contains("?"))
{
if (url.EndsWith("&"))
{
return string.Format("{0}{1}={2}", url, name, encodedValue);
}
else
{
return string.Format("{0}&{1}={2}", url, name, encodedValue);
}
}
else
{
return string.Format("{0}?{1}={2}", url, name, encodedValue);
}
return url.Contains("?")
? url.EndsWith("&")
? string.Format("{0}{1}={2}", url, name, encodedValue)
: string.Format("{0}&{1}={2}", url, name, encodedValue)
: string.Format("{0}?{1}={2}", url, name, encodedValue);
}
private string GetResourceUrl(string shapeUrl, string fileVirtualPath)
{
if (string.IsNullOrEmpty(shapeUrl)) return fileVirtualPath;
return GetPathFromRelativeUrl(shapeUrl).Equals(GetPathFromRelativeUrl(fileVirtualPath), StringComparison.InvariantCultureIgnoreCase) ?
shapeUrl : fileVirtualPath;
return string.IsNullOrEmpty(shapeUrl)
? fileVirtualPath
: GetPathFromRelativeUrl(shapeUrl).Equals(GetPathFromRelativeUrl(fileVirtualPath), StringComparison.InvariantCultureIgnoreCase)
? shapeUrl : fileVirtualPath;
}
private string GetPathFromRelativeUrl(string url)

16
src/Orchard/DisplayManagement/Shapes/Composite.cs
View File

@@ -89,12 +89,7 @@ namespace Orchard.DisplayManagement.Shapes
// try to access an existing member
var strinIndex = index as string;
if (strinIndex != null && TryGetMemberImpl(strinIndex, out result))
{
return true;
}
return base.TryGetIndex(binder, indexes, out result);
return strinIndex != null && TryGetMemberImpl(strinIndex, out result) ? true : base.TryGetIndex(binder, indexes, out result);
}
public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object value)
@@ -148,7 +143,7 @@ namespace Orchard.DisplayManagement.Shapes
public override int GetHashCode()
{
return (Properties != null ? Properties.GetHashCode() : 0);
return Properties != null ? Properties.GetHashCode() : 0;
}
#region InterfaceProxyBehavior
@@ -506,12 +501,7 @@ namespace Orchard.DisplayManagement.Shapes
public override bool Equals(object obj)
{
if (obj == null)
{
return true;
}
return ReferenceEquals(obj, Nil.Instance);
return obj == null ? true : ReferenceEquals(obj, Nil.Instance);
}
public override int GetHashCode()

2
src/Orchard/Environment/Configuration/ExtensionLocations.cs
View File

@@ -64,7 +64,7 @@ namespace Orchard.Environment.Configuration
if (index <= 0)
continue;
var moduleName = virtualPath.Substring(prefix.Length, index - prefix.Length);
return (string.IsNullOrEmpty(moduleName) ? null : moduleName);
return string.IsNullOrEmpty(moduleName) ? null : moduleName;
}
}
return null;

2
src/Orchard/Environment/ShellBuilders/CompositionStrategy.cs
View File

@@ -234,7 +234,7 @@ namespace Orchard.Environment.ShellBuilders
return ((type.Namespace ?? "").EndsWith(".Models") || (type.Namespace ?? "").EndsWith(".Records") || mapAsRecordAttr?.Enabled == true) &&
mapAsRecordAttr?.Enabled != false &&
type.GetProperty("Id") != null &&
(type.GetProperty("Id").GetAccessors()).All(x => x.IsVirtual) &&
type.GetProperty("Id").GetAccessors().All(x => x.IsVirtual) &&
!type.IsSealed &&
!type.IsAbstract &&
(!typeof(IContent).IsAssignableFrom(type) || typeof(ContentPartRecord).IsAssignableFrom(type));

2
src/Orchard/FileSystems/AppData/AppDataFolder.cs
View File

@@ -60,7 +60,7 @@ namespace Orchard.FileSystems.AppData
const string extension = "deleted";
for (int i = 0; i < 100; i++)
{
var newExtension = (i == 0 ? extension : string.Format("{0}{1}", extension, i));
var newExtension = i == 0 ? extension : string.Format("{0}{1}", extension, i);
var newFileName = Path.ChangeExtension(destinationFileName, newExtension);
try
{

4
src/Orchard/FileSystems/Dependencies/DefaultDependenciesFolder.cs
View File

@@ -67,7 +67,7 @@ namespace Orchard.FileSystems.Dependencies
private IEnumerable<DependencyDescriptor> ReadDependencies(string persistancePath)
{
Func<string, XName> ns = (name => XName.Get(name));
Func<string, XName> ns = name => XName.Get(name);
Func<XElement, string, string> elem = (e, name) => e.Element(ns(name)).Value;
if (!_appDataFolder.FileExists(persistancePath))
@@ -96,7 +96,7 @@ namespace Orchard.FileSystems.Dependencies
private void WriteDependencies(string persistancePath, IEnumerable<DependencyDescriptor> dependencies)
{
Func<string, XName> ns = (name => XName.Get(name));
Func<string, XName> ns = name => XName.Get(name);
var document = new XDocument();
document.Add(new XElement(ns("Dependencies")));

4
src/Orchard/FileSystems/Dependencies/DefaultExtensionDependenciesManager.cs
View File

@@ -91,7 +91,7 @@ namespace Orchard.FileSystems.Dependencies
private XDocument CreateDocument(IEnumerable<DependencyDescriptor> dependencies, Func<DependencyDescriptor, string> fileHashProvider)
{
Func<string, XName> ns = (name => XName.Get(name));
Func<string, XName> ns = name => XName.Get(name);
var elements = dependencies
.Where(dep => IsSupportedLoader(dep.LoaderName))
@@ -108,7 +108,7 @@ namespace Orchard.FileSystems.Dependencies
private IEnumerable<ActivatedExtensionDescriptor> ReadDescriptors(string persistancePath)
{
Func<string, XName> ns = (name => XName.Get(name));
Func<string, XName> ns = name => XName.Get(name);
Func<XElement, string, string> elem = (e, name) => e.Element(ns(name)).Value;
XDocument document = ReadDocument(persistancePath);

7
src/Orchard/FileSystems/Dependencies/DynamicModuleVirtualPathProvider.cs
View File

@@ -58,10 +58,7 @@ namespace Orchard.FileSystems.Dependencies
return null;
var moduleId = ModuleMatch(virtualPath, prefix);
if (moduleId == null)
return null;
return _extensionDependenciesManager.GetDescriptor(moduleId);
return moduleId == null ? null : _extensionDependenciesManager.GetDescriptor(moduleId);
}
private static string ModuleMatch(string virtualPath, string prefix)
@@ -71,7 +68,7 @@ namespace Orchard.FileSystems.Dependencies
return null;
var moduleId = virtualPath.Substring(prefix.Length, index - prefix.Length);
return (string.IsNullOrEmpty(moduleId) ? null : moduleId);
return string.IsNullOrEmpty(moduleId) ? null : moduleId;
}
private static string PrefixMatch(string virtualPath, params string[] prefixes)

4
src/Orchard/Localization/Services/LocalizationStreamParser.cs
View File

@@ -61,8 +61,8 @@ namespace Orchard.Localization.Services
string nextPoLine = reader.ReadLine() ?? "";
while (nextPoLine != null && (!nextPoLine.StartsWith("#") && !nextPoLine.StartsWith(MsgctxtScope) &&
!nextPoLine.StartsWith(MsgidScope) && !nextPoLine.StartsWith(MsgstrScope)))
while (nextPoLine != null && !nextPoLine.StartsWith("#") && !nextPoLine.StartsWith(MsgctxtScope) &&
!nextPoLine.StartsWith(MsgidScope) && !nextPoLine.StartsWith(MsgstrScope))
{
currentPoLine = string.Concat(currentPoLine, TrimQuote(nextPoLine));
nextPoLine = reader.ReadLine();

9
src/Orchard/Mvc/AntiForgery/AntiForgeryAuthorizationFilter.cs
View File

@@ -53,17 +53,14 @@ namespace Orchard.Mvc.AntiForgery
var currentModule = GetArea(context.RouteData);
return !string.IsNullOrEmpty(currentModule)
&& (_extensionManager.AvailableExtensions()
&& _extensionManager.AvailableExtensions()
.First(descriptor => string.Equals(descriptor.Id, currentModule, StringComparison.OrdinalIgnoreCase))
.AntiForgery.Equals("enabled", StringComparison.OrdinalIgnoreCase));
.AntiForgery.Equals("enabled", StringComparison.OrdinalIgnoreCase);
}
private static string GetArea(RouteData routeData)
{
if (routeData.Values.ContainsKey("area"))
return routeData.Values["area"] as string;
return routeData.DataTokens["area"] as string ?? "";
return routeData.Values.ContainsKey("area") ? routeData.Values["area"] as string : routeData.DataTokens["area"] as string ?? "";
}
private static bool ShouldValidateGet(AuthorizationContext context)

2
src/Orchard/Mvc/Html/FileRegistrationContext.cs
View File

@@ -101,7 +101,7 @@ namespace Orchard.Mvc.Html
{
unchecked
{
var result = (ContainerVirtualPath != null ? ContainerVirtualPath.GetHashCode() : 0);
var result = ContainerVirtualPath != null ? ContainerVirtualPath.GetHashCode() : 0;
result = (result * 397) ^ (FileName != null ? FileName.GetHashCode() : 0);
result = (result * 397) ^ (Condition != null ? Condition.GetHashCode() : 0);
return result;

2
src/Orchard/Mvc/Routes/HubRoute.cs
View File

@@ -105,7 +105,7 @@ namespace Orchard.Mvc.Routes
return 0;
}
if (string.IsNullOrEmpty(Name) && string.IsNullOrEmpty(other.Name) || Name == other.Name)
if ((string.IsNullOrEmpty(Name) && string.IsNullOrEmpty(other.Name)) || Name == other.Name)
{
return 0;
}

4
src/Orchard/Mvc/Routes/RoutePublisher.cs
View File

@@ -84,8 +84,8 @@ namespace Orchard.Mvc.Routes
{
object extensionId;
var route = routeDescriptor.Route as Route;
if (route.DataTokens != null && route.DataTokens.TryGetValue("area", out extensionId) ||
route.Defaults != null && route.Defaults.TryGetValue("area", out extensionId))
if ((route.DataTokens != null && route.DataTokens.TryGetValue("area", out extensionId)) ||
(route.Defaults != null && route.Defaults.TryGetValue("area", out extensionId)))
{
extensionDescriptor = _extensionManager.GetExtension(extensionId.ToString());
}

2
src/Orchard/Mvc/ViewEngines/Razor/IRazorCompilationEvents.cs
View File

@@ -179,7 +179,7 @@ namespace Orchard.Mvc.ViewEngines.Razor
return null;
var moduleName = virtualPath.Substring(prefix.Length, index - prefix.Length);
return (string.IsNullOrEmpty(moduleName) ? null : moduleName);
return string.IsNullOrEmpty(moduleName) ? null : moduleName;
}
private static string PrefixMatch(string virtualPath, params string[] prefixes)

4
src/Orchard/UI/Resources/RequireSettings.cs
View File

@@ -160,11 +160,11 @@ namespace Orchard.UI.Resources
public RequireSettings Combine(RequireSettings other)
{
var settings = (new RequireSettings
var settings = new RequireSettings
{
Name = Name,
Type = Type
}).AtLocation(Location).AtLocation(other.Location)
}.AtLocation(Location).AtLocation(other.Location)
.WithBasePath(BasePath).WithBasePath(other.BasePath)
.UseCdn(CdnMode).UseCdn(other.CdnMode)
.UseDebugMode(DebugMode).UseDebugMode(other.DebugMode)

2
src/Orchard/UI/Zones/ZoneHoldingBehavior.cs
View File

@@ -204,7 +204,7 @@ namespace Orchard.UI.Zones
{
unchecked
{
int hashCode = (_parent != null ? _parent.GetHashCode() : 0);
int hashCode = _parent != null ? _parent.GetHashCode() : 0;
hashCode = (hashCode * 397) ^ (_potentialZoneName != null ? _potentialZoneName.GetHashCode() : 0);
return hashCode;
}

4
src/Orchard/Utility/Extensions/StringExtensions.cs
View File

@@ -270,7 +270,7 @@ namespace Orchard.Utility.Extensions
public static bool IsSpace(this char c)
{
return (c == '\r' || c == '\n' || c == '\t' || c == '\f' || c == ' ');
return c == '\r' || c == '\n' || c == '\t' || c == '\f' || c == ' ';
}
public static string RemoveDiacritics(this string name)
@@ -287,7 +287,7 @@ namespace Orchard.Utility.Extensions
}
}
return (sb.ToString().Normalize(NormalizationForm.FormC));
return sb.ToString().Normalize(NormalizationForm.FormC);
}
public static string Strip(this string subject, params char[] stripped)

2
src/Orchard/Utility/Reflect.cs
View File

@@ -114,7 +114,7 @@ namespace Orchard.Utility
case ExpressionType.Call:
var callExpression = (MethodCallExpression)expression;
MethodInfo method = callExpression.Method;
bool isIndexer = (method.Name == "get_Item" && method.IsSpecialName);
bool isIndexer = method.Name == "get_Item" && method.IsSpecialName;
if (!isIndexer)
{
goto default;

2
src/Tools/MSBuild.Orchard.Tasks/ValidateExtensionProjectFiles.cs
View File

@@ -113,7 +113,7 @@ namespace MSBuild.Orchard.Tasks
foreach (var element in elements)
{
var filePath = (element.Attribute(Include) == null ? null : element.Attribute(Include).Value);
var filePath = element.Attribute(Include) == null ? null : element.Attribute(Include).Value;
bool isValid = IsValidExcludeFile(filePath);
if (!isValid)
{

2
src/Tools/Orchard/HostContext/CommandHostContextProvider.cs
View File

@@ -63,7 +63,7 @@ namespace Orchard.HostContext
if (context.DisplayUsageHelp)
return;
context.DisplayUsageHelp = (context.Arguments.Arguments.Any() && context.Arguments.ResponseFiles.Any());
context.DisplayUsageHelp = context.Arguments.Arguments.Any() && context.Arguments.ResponseFiles.Any();
if (context.DisplayUsageHelp)
{
_output.WriteLine("Incorrect syntax: Response files cannot be used in conjunction with commands");

4
src/Tools/Orchard/Parameters/CommandParametersParser.cs
View File

@@ -21,8 +21,8 @@ namespace Orchard.Parameters
if (arg[0] == '/')
{
int index = arg.IndexOf(':');
var switchName = (index < 0 ? arg.Substring(1) : arg.Substring(1, index - 1));
var switchValue = (index < 0 || index >= arg.Length ? string.Empty : arg.Substring(index + 1));
var switchName = index < 0 ? arg.Substring(1) : arg.Substring(1, index - 1);
var switchValue = index < 0 || index >= arg.Length ? string.Empty : arg.Substring(index + 1);
if (string.IsNullOrEmpty(switchName))
{