diff --git a/src/AddIns/Analysis/CodeQuality/Gui/Controls/VisibleMatrix.cs b/src/AddIns/Analysis/CodeQuality/Gui/Controls/VisibleMatrix.cs index 9ca89bf6c2..89d22f4fda 100644 --- a/src/AddIns/Analysis/CodeQuality/Gui/Controls/VisibleMatrix.cs +++ b/src/AddIns/Analysis/CodeQuality/Gui/Controls/VisibleMatrix.cs @@ -32,7 +32,7 @@ namespace ICSharpCode.CodeQuality.Gui var items = type == HeaderType.Columns ? headerColumns : headerRows; foreach (var item in items) { - var foundItem = visibleItems.Where(n => n.Equals(item.Value)).SingleOrDefault(); + var foundItem = visibleItems.SingleOrDefault(n => n.Equals(item.Value)); item.Visible = foundItem != null; } diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/ProfilerTestRunner.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/ProfilerTestRunner.cs index 42e13fdffd..f189bb7f90 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/ProfilerTestRunner.cs +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/ProfilerTestRunner.cs @@ -73,8 +73,7 @@ namespace ICSharpCode.Profiler.AddIn } if (selectedTests.Member == null) { - return content.Classes - .Where(c => c.FullyQualifiedName == selectedTests.Class.DotNetName).First().Methods + return content.Classes.First(c => c.FullyQualifiedName == selectedTests.Class.DotNetName).Methods .Where(m => m.Attributes.Any(a2 => a2.AttributeType.FullyQualifiedName == "NUnit.Framework.TestAttribute")) .Select(m2 => m2.FullyQualifiedName); } diff --git a/src/AddIns/Analysis/Profiler/Frontend/Controls/QueryView.xaml.cs b/src/AddIns/Analysis/Profiler/Frontend/Controls/QueryView.xaml.cs index d01394396a..d20d4b744c 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/Controls/QueryView.xaml.cs +++ b/src/AddIns/Analysis/Profiler/Frontend/Controls/QueryView.xaml.cs @@ -138,7 +138,7 @@ namespace ICSharpCode.Profiler.Controls CallTreeNodeViewModel GetViewModelFromPath(IEnumerable paths, SearchInfo info) { CallTreeNodeViewModel result = null; - var parent = list.Roots.Where(i => i.Node.Equals(info.ResultRoot)).FirstOrDefault(); + var parent = list.Roots.FirstOrDefault(i => i.Node.Equals(info.ResultRoot)); foreach (var path in paths) { var items = parent.Children; diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CodeManipulation.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CodeManipulation.cs index c26d91968b..e240e54f07 100644 --- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CodeManipulation.cs +++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CodeManipulation.cs @@ -219,8 +219,7 @@ namespace CSharpBinding var selectionStart = editor.Document.OffsetToPosition(editor.SelectionStart); var selectionEnd = editor.Document.OffsetToPosition(editor.SelectionStart + editor.SelectionLength); - Ast.INode currentNode = parsedCU.Children.Select( - n => EditorContext.FindInnermostNodeContainingSelection(n, selectionStart, selectionEnd)).Where(n => n != null).FirstOrDefault(); + Ast.INode currentNode = parsedCU.Children.Select(n => EditorContext.FindInnermostNodeContainingSelection(n, selectionStart, selectionEnd)).FirstOrDefault(n => n != null); if (currentNode == null) return null; if (!IsNodeTypeInteresting(currentNode, interestingNodeTypes)) { // ignore uninteresting nodes in the AST @@ -306,7 +305,7 @@ namespace CSharpBinding /// Selection ExtendSelectionToEndOfLineComments(IDocument document, Location selectionStart, Location selectionEnd, IEnumerable commentsBlankLines) { - var lineComment = commentsBlankLines.Where(c => c.StartPosition.Line == selectionEnd.Line && c.StartPosition >= selectionEnd).FirstOrDefault(); + var lineComment = commentsBlankLines.FirstOrDefault(c => c.StartPosition.Line == selectionEnd.Line && c.StartPosition >= selectionEnd); if (lineComment == null) { return null; } diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ResourceScript.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ResourceScript.cs index 5069986a9a..968f1cbb2c 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ResourceScript.cs +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ResourceScript.cs @@ -48,8 +48,7 @@ namespace ICSharpCode.CppBinding.Project } public void SetIcon(string resourceId, string newPath) { - ResourceIcon iconEntry = (ResourceIcon)Icons.Where( - icon => icon.ResourceID == resourceId).SingleOrDefault(); + ResourceIcon iconEntry = (ResourceIcon)Icons.SingleOrDefault(icon => icon.ResourceID == resourceId); if (iconEntry != null) iconEntry.Data = newPath; else diff --git a/src/AddIns/BackendBindings/WixBinding/Project/Src/WixDialog.cs b/src/AddIns/BackendBindings/WixBinding/Project/Src/WixDialog.cs index 2cdc4047ca..ade730f417 100644 --- a/src/AddIns/BackendBindings/WixBinding/Project/Src/WixDialog.cs +++ b/src/AddIns/BackendBindings/WixBinding/Project/Src/WixDialog.cs @@ -157,7 +157,7 @@ namespace ICSharpCode.WixBinding public Form CreateDialog(IComponentCreator componentCreator) { if (componentCreator == null) { - throw new ArgumentException("Cannot be null.", "componentCreator"); + throw new ArgumentNullException("componentCreator"); } Form dialog = CreateForm(componentCreator); diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs index 6ab91827e8..256b18155a 100644 --- a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs +++ b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs @@ -1021,7 +1021,7 @@ namespace ICSharpCode.XamlBinding static IEnumerable CreateEventCompletion(XamlCompletionContext context, IClass c) { - IMethod invoker = c.Methods.Where(method => method.Name == "Invoke").FirstOrDefault(); + IMethod invoker = c.Methods.FirstOrDefault(method => method.Name == "Invoke"); if (invoker != null && context.ActiveElement != null) { var item = context.ActiveElement; var evt = ResolveAttribute(context.Attribute.ToQualifiedName(), context) as IEvent; @@ -1324,14 +1324,7 @@ namespace ICSharpCode.XamlBinding string eventName = field.Name.Remove(field.Name.Length - "Event".Length); - IMethod method = c.Methods - .Where(m => - m.IsPublic && - m.IsStatic && - m.Parameters.Count == 2 && - (m.Name == "Add" + eventName + "Handler" || - m.Name == "Remove" + eventName + "Handler")) - .FirstOrDefault(); + IMethod method = c.Methods.FirstOrDefault(m => m.IsPublic && m.IsStatic && m.Parameters.Count == 2 && (m.Name == "Add" + eventName + "Handler" || m.Name == "Remove" + eventName + "Handler")); if (method == null) return null; @@ -1346,12 +1339,7 @@ namespace ICSharpCode.XamlBinding string propertyName = field.Name.Remove(field.Name.Length - "Property".Length); - IMethod method = c.Methods - .Where(m => - m.IsPublic && - m.IsStatic && - m.Name == "Get" + propertyName) - .FirstOrDefault(); + IMethod method = c.Methods.FirstOrDefault(m => m.IsPublic && m.IsStatic && m.Name == "Get" + propertyName); if (method == null) return null; diff --git a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewColumnHider.cs b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewColumnHider.cs index db1ed8f2ad..44d83edba1 100644 --- a/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewColumnHider.cs +++ b/src/AddIns/Debugger/Debugger.AddIn/Visualizers/PresentationBindings/GridViewColumnHider.cs @@ -91,7 +91,7 @@ namespace Debugger.AddIn.Visualizers private GridViewColumnWithVisibility findColumn(string header) { - return allColumns.Where(columnVis => columnVis.Header == header).First(); + return allColumns.First(columnVis => columnVis.Header == header); } void hideColumn(string header) diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/DatabaseObjects/Table.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/DatabaseObjects/Table.cs index 5716ef1ccb..2de0fdb58b 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/DatabaseObjects/Table.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.Core/DatabaseObjects/Table.cs @@ -79,7 +79,7 @@ namespace ICSharpCode.Data.Core.DatabaseObjects { get { - if (Items.Where(column => column.IsPrimaryKey).Count() > 1) + if (Items.Count(column => column.IsPrimaryKey) > 1) return true; else return false; diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/CSDLType/TypeBaseDesigner.xaml.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/CSDLType/TypeBaseDesigner.xaml.cs index 8b97b1d6ac..bf9a2d0f0e 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/CSDLType/TypeBaseDesigner.xaml.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/CSDLType/TypeBaseDesigner.xaml.cs @@ -85,7 +85,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.UI.UserControls.CSDLType { foreach (var relatedProperty in Designer.DesignerView.SelectMany(dv => dv.UIType.Properties).OfType().Where(uirp => uirp.RelatedType == UIType && !RelationsContenerByRelatedProperty.ContainsKey(uirp))) { - var otherType = Designer.Children.OfType().Where(td => td.UIType.Properties.Contains(relatedProperty)).FirstOrDefault(); + var otherType = Designer.Children.OfType().FirstOrDefault(td => td.UIType.Properties.Contains(relatedProperty)); if (otherType != null) otherType.DrawRelation(relatedProperty); } diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/DesignerCanvasPreview.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/DesignerCanvasPreview.cs index a3d8f631f9..08ad3f48a1 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/DesignerCanvasPreview.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core.UI/UserControls/DesignerCanvasPreview.cs @@ -93,7 +93,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.UI.UserControls get { if (_typebaseDesignerListView == null) - _typebaseDesignerListView = VisualTreeHelperUtil.GetControlsDecendant(Content.Children.OfType().Where(tbd => tbd.UIType.BusinessInstance == UIType.BusinessInstance).First()).First(); + _typebaseDesignerListView = VisualTreeHelperUtil.GetControlsDecendant(Content.Children.OfType().First(tbd => tbd.UIType.BusinessInstance == UIType.BusinessInstance)).First(); return _typebaseDesignerListView; } } diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/EDMObjects/CSDL/Type/EntityType.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/EDMObjects/CSDL/Type/EntityType.cs index 46766e3186..6d21aed2a0 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/EDMObjects/CSDL/Type/EntityType.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/EDMObjects/CSDL/Type/EntityType.cs @@ -301,7 +301,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.EDMObjects.CSDL.Type private void _navigationProperties_ItemRemoved(NavigationProperty navigationProperty) { _navigationProperties.ItemRemoved -= _navigationProperties_ItemRemoved; - var navigationProperty2 = navigationProperty.Association.PropertiesEnd.Where(pe => pe != navigationProperty).First(); + var navigationProperty2 = navigationProperty.Association.PropertiesEnd.First(pe => pe != navigationProperty); if (!navigationProperty2.IsDeleted) navigationProperty2.EntityType.NavigationProperties.Remove(navigationProperty2); _navigationProperties.ItemRemoved += _navigationProperties_ItemRemoved; diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/CSDLIO.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/CSDLIO.cs index 8e467ee0c0..735e4b3f36 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/CSDLIO.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/CSDLIO.cs @@ -120,7 +120,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.IO { var entityType = new EntityType { Name = typeName, BaseType = baseType }; SetBoolValueFromAttribute(entityTypeElement, "Abstract", isAbstract => entityType.Abstract = isAbstract); - var entitySetElement = entityContainerElement.Elements(XName.Get("EntitySet", csdlNamespace.NamespaceName)).Where(ese => GetName(ese.Attribute("EntityType").Value) == entityType.Name).FirstOrDefault(); + var entitySetElement = entityContainerElement.Elements(XName.Get("EntitySet", csdlNamespace.NamespaceName)).FirstOrDefault(ese => GetName(ese.Attribute("EntityType").Value) == entityType.Name); if (entitySetElement != null) { entityType.EntitySetName = entitySetElement.Attribute("Name").Value; @@ -149,7 +149,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.IO } else { - property = new ScalarProperty() { Name = name, IsKey = keyElement != null && keyElement.Elements(XName.Get("PropertyRef", csdlNamespace.NamespaceName)).Where(pr => pr.Attribute("Name").Value == name).Any(), Type = propertyType.Value }; + property = new ScalarProperty() { Name = name, IsKey = keyElement != null && keyElement.Elements(XName.Get("PropertyRef", csdlNamespace.NamespaceName)).Any(pr => pr.Attribute("Name").Value == name), Type = propertyType.Value }; var scalarProp = (ScalarProperty)property; SetBoolValueFromAttribute(propertyElement, "Nullable", nullable => scalarProp.Nullable = nullable); SetVisibilityValueFromAttribute(propertyElement, "SetterAccess", setterAccess => scalarProp.SetVisibility = setterAccess); diff --git a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/SSDLIO.cs b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/SSDLIO.cs index 23c326caa8..4243dcf458 100644 --- a/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/SSDLIO.cs +++ b/src/AddIns/DisplayBindings/Data/ICSharpCode.Data.EDMDesigner.Core/IO/SSDLIO.cs @@ -213,7 +213,7 @@ namespace ICSharpCode.Data.EDMDesigner.Core.IO foreach (var propertyElement in entityTypeElement.Elements(XName.Get("Property", ssdlNamespace.NamespaceName))) { var name = propertyElement.Attribute("Name").Value; - var property = new Property(entityType) { Name = name, Type = propertyElement.Attribute("Type").Value, IsKey = entityTypeElement.Element(XName.Get("Key", ssdlNamespace.NamespaceName)).Elements(XName.Get("PropertyRef", ssdlNamespace.NamespaceName)).Where(pr => pr.Attribute("Name").Value == name).Any() }; + var property = new Property(entityType) { Name = name, Type = propertyElement.Attribute("Type").Value, IsKey = entityTypeElement.Element(XName.Get("Key", ssdlNamespace.NamespaceName)).Elements(XName.Get("PropertyRef", ssdlNamespace.NamespaceName)).Any(pr => pr.Attribute("Name").Value == name) }; SetBoolValueFromAttribute(propertyElement, "Nullable", nullable => property.Nullable = nullable); SetIntValueFromAttribute(propertyElement, "MaxLength", maxLength => property.MaxLength = maxLength); SetBoolValueFromAttribute(propertyElement, "FixedLength", fixedLength => property.FixedLength = fixedLength); diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs index 44952fcbca..5aa39daf07 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.AddIn/Src/WpfViewContent.cs @@ -179,7 +179,7 @@ namespace ICSharpCode.WpfDesign.AddIn if (!propertyGridView.PropertyGrid.IsNameCorrect) return; // get the XAML file - OpenedFile fileName = this.Files.Where(f => f.FileName.ToString().EndsWith(".xaml")).FirstOrDefault(); + OpenedFile fileName = this.Files.FirstOrDefault(f => f.FileName.ToString().EndsWith(".xaml")); if (fileName == null) return; // parse the XAML file @@ -188,8 +188,7 @@ namespace ICSharpCode.WpfDesign.AddIn if (info.CompilationUnit.Classes.Count != 1) return; // rename the member - IMember member = info.CompilationUnit.Classes[0].AllMembers - .Where(m => m.Name == propertyGridView.PropertyGrid.OldName).FirstOrDefault(); + IMember member = info.CompilationUnit.Classes [0].AllMembers.FirstOrDefault(m => m.Name == propertyGridView.PropertyGrid.OldName); if (member != null) { FindReferencesAndRenameHelper.RenameMember(member, propertyGridView.PropertyGrid.Name); } diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml.cs index fe5fb0c8bd..1fc38c0ea3 100644 --- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml.cs +++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml.cs @@ -63,7 +63,7 @@ namespace ICSharpCode.WpfDesign.Designer.PropertyGrid protected override void OnMouseRightButtonUp(MouseButtonEventArgs e) { var ancestors = (e.OriginalSource as DependencyObject).GetVisualAncestors(); - Border row = ancestors.OfType().Where(b => b.Name == "uxPropertyNodeRow").FirstOrDefault(); + Border row = ancestors.OfType().FirstOrDefault(b => b.Name == "uxPropertyNodeRow"); if (row == null) return; PropertyNode node = row.DataContext as PropertyNode; diff --git a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs index 0d47ff46e0..fcd2801ce0 100644 --- a/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs +++ b/src/AddIns/Misc/UsageDataCollector/UsageDataCollector.AddIn/AnalyticsMonitor.cs @@ -151,7 +151,7 @@ namespace ICSharpCode.UsageDataCollector new UsageDataEnvironmentProperty { Name = "appVersion", Value = RevisionClass.Major + "." + RevisionClass.Minor + "." + RevisionClass.Build + "." + RevisionClass.Revision }, new UsageDataEnvironmentProperty { Name = "language", Value = ResourceService.Language }, new UsageDataEnvironmentProperty { Name = "culture", Value = CultureInfo.CurrentCulture.Name }, - new UsageDataEnvironmentProperty { Name = "userAddInCount", Value = AddInTree.AddIns.Where(a => !a.IsPreinstalled).Count().ToString() }, + new UsageDataEnvironmentProperty { Name = "userAddInCount", Value = AddInTree.AddIns.Count(a => !a.IsPreinstalled).ToString() }, new UsageDataEnvironmentProperty { Name = "branch", Value = BranchName }, new UsageDataEnvironmentProperty { Name = "commit", Value = CommitHash }, new UsageDataEnvironmentProperty { Name = "renderingTier", Value = (RenderCapability.Tier >> 16).ToString() } diff --git a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveWindowStateEvaluator.cs b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveWindowStateEvaluator.cs index bfcf7d965c..e2e797714a 100644 --- a/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveWindowStateEvaluator.cs +++ b/src/Main/Base/Project/Src/Internal/ConditionEvaluators/ActiveWindowStateEvaluator.cs @@ -9,6 +9,7 @@ using ICSharpCode.SharpDevelop.Gui; namespace ICSharpCode.SharpDevelop { + [Flags] public enum WindowState { None = 0, Untitled = 1, diff --git a/src/Main/Base/Project/Src/Project/MSBuildItemDefinitionGroup.cs b/src/Main/Base/Project/Src/Project/MSBuildItemDefinitionGroup.cs index 901ac88953..995d40601a 100644 --- a/src/Main/Base/Project/Src/Project/MSBuildItemDefinitionGroup.cs +++ b/src/Main/Base/Project/Src/Project/MSBuildItemDefinitionGroup.cs @@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project public MSBuildItemDefinitionGroup(MSBuildBasedProject project, string condition) { ProjectRootElement root = project.MSBuildProjectFile; - group = root.ItemDefinitionGroups.Where(item => item.Condition == condition).SingleOrDefault(); + group = root.ItemDefinitionGroups.SingleOrDefault(item => item.Condition == condition); if (group == null) { group = root.CreateItemDefinitionGroupElement(); @@ -61,11 +61,10 @@ namespace ICSharpCode.SharpDevelop.Project public string GetElementMetadata(string element, string name) { ProjectItemDefinitionElement elem; - elem = (ProjectItemDefinitionElement)group.Children.Where( - item => item is ProjectItemDefinitionElement && ((ProjectItemDefinitionElement)item).ItemType == element).SingleOrDefault(); + elem = (ProjectItemDefinitionElement)group.Children.SingleOrDefault(item => item is ProjectItemDefinitionElement && ((ProjectItemDefinitionElement)item).ItemType == element); if (elem == null) return null; ProjectMetadataElement metadataElement; - metadataElement = elem.Metadata.Where(item => item.Name == name).SingleOrDefault(); + metadataElement = elem.Metadata.SingleOrDefault(item => item.Name == name); if (metadataElement == null) return null; return metadataElement.Value; } @@ -79,12 +78,11 @@ namespace ICSharpCode.SharpDevelop.Project public void SetElementMetadata(string element, string name, string value) { ProjectItemDefinitionElement elem; - elem = (ProjectItemDefinitionElement)group.Children.Where( - item => item is ProjectItemDefinitionElement && ((ProjectItemDefinitionElement)item).ItemType == element).SingleOrDefault(); + elem = (ProjectItemDefinitionElement)group.Children.SingleOrDefault(item => item is ProjectItemDefinitionElement && ((ProjectItemDefinitionElement)item).ItemType == element); if (elem == null) elem = AddElement(element); ProjectMetadataElement metadataElement; - metadataElement = elem.Metadata.Where(item => item.Name == name).SingleOrDefault(); + metadataElement = elem.Metadata.SingleOrDefault(item => item.Name == name); if (metadataElement != null) metadataElement.Value = value; else diff --git a/src/Main/Base/Test/MemberLookupHelperTests.cs b/src/Main/Base/Test/MemberLookupHelperTests.cs index cfa344fa89..6461f9a90a 100644 --- a/src/Main/Base/Test/MemberLookupHelperTests.cs +++ b/src/Main/Base/Test/MemberLookupHelperTests.cs @@ -427,9 +427,9 @@ namespace ICSharpCode.SharpDevelop.Tests IClass form = swf.GetClass("System.Windows.Forms.PrintPreviewDialog", 0); IMethod[] methods = OverrideCompletionItemProvider.GetOverridableMethods(form); IProperty[] properties = OverrideCompletionItemProvider.GetOverridableProperties(form); - Assert.AreEqual(1, properties.Where(m=>m.Name=="AutoScroll").Count()); - Assert.AreEqual(1, properties.Where(m=>m.Name=="CanRaiseEvents").Count()); - Assert.AreEqual(1, methods.Where(m=>m.Name=="AdjustFormScrollbars").Count()); + Assert.AreEqual(1, properties.Count(m => m.Name == "AutoScroll")); + Assert.AreEqual(1, properties.Count(m => m.Name == "CanRaiseEvents")); + Assert.AreEqual(1, methods.Count(m => m.Name == "AdjustFormScrollbars")); } [Test]