Skip to content

Commit faddfe3

Browse files
committed
Simplified some LINQ queries.
1 parent 54e05d4 commit faddfe3

File tree

8 files changed

+11
-12
lines changed

8 files changed

+11
-12
lines changed

AddressParser/AstBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private void VerifyResultStack()
163163
{
164164
if (resultStack.Count > 1)
165165
{
166-
var offset = resultStack.Skip(1).Where(o => o is OffsetOperation).FirstOrDefault() as OffsetOperation;
166+
var offset = resultStack.Skip(1).FirstOrDefault(o => o is OffsetOperation) as OffsetOperation;
167167
if (offset != null)
168168
{
169169
throw new ParseException($"Unexpected offset '{offset.Value}' found.");

CodeGenerator/CustomCodeGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static ICustomCodeGenerator GetGenerator(BaseNode node, Language language
5656
{
5757
Contract.Requires(node != null);
5858

59-
return generators.Where(c => c.CanGenerateCode(node, language)).FirstOrDefault();
59+
return generators.FirstOrDefault(c => c.CanGenerateCode(node, language));
6060
}
6161
}
6262
}

DataExchange/CustomNodeConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ public static ICustomNodeConverter GetReadConverter(XElement element)
9999
{
100100
Contract.Requires(element != null);
101101

102-
return converters.Where(c => c.CanHandleElement(element)).FirstOrDefault();
102+
return converters.FirstOrDefault(c => c.CanHandleElement(element));
103103
}
104104

105105
public static ICustomNodeConverter GetWriteConverter(BaseNode node)
106106
{
107107
Contract.Requires(node != null);
108108

109-
return converters.Where(c => c.CanHandleNode(node)).FirstOrDefault();
109+
return converters.FirstOrDefault(c => c.CanHandleNode(node));
110110
}
111111
}
112112
}

Forms/MainForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ internal void DeregisterNodeType(Type type)
561561
{
562562
Contract.Requires(type != null);
563563

564-
var item = toolStrip.Items.OfType<TypeToolStripButton>().Where(i => i.Value == type).FirstOrDefault();
564+
var item = toolStrip.Items.OfType<TypeToolStripButton>().FirstOrDefault(i => i.Value == type);
565565
if (item != null)
566566
{
567567
item.Click -= memoryTypeToolStripButton_Click;

Memory/RemoteProcess.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,7 @@ public Module GetModuleByName(string name)
453453
lock (modules)
454454
{
455455
return modules
456-
.Where(m => m.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase))
457-
.FirstOrDefault();
456+
.FirstOrDefault(m => m.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
458457
}
459458
}
460459

ReClassNetProject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private IEnumerable<ClassNode> GetClassReferences(ClassNode node)
7575
{
7676
Contract.Requires(node != null);
7777

78-
return classes.Where(c => c != node).Where(c => c.Descendants().Where(n => (n as BaseReferenceNode)?.InnerNode == node).Any());
78+
return classes.Where(c => c != node).Where(c => c.Descendants().Any(n => (n as BaseReferenceNode)?.InnerNode == node));
7979
}
8080

8181
public void Remove(ClassNode node)

UI/ClassNodeView.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public ClassNode SelectedClass
182182
selectedClass = value;
183183
if (selectedClass != null)
184184
{
185-
classesTreeView.SelectedNode = root.Nodes.Cast<TreeNode>().Where(n => n.Tag == selectedClass).FirstOrDefault();
185+
classesTreeView.SelectedNode = root.Nodes.Cast<TreeNode>().FirstOrDefault(n => n.Tag == selectedClass);
186186
}
187187

188188
SelectionChanged?.Invoke(this, selectedClass);
@@ -385,7 +385,7 @@ public void RemoveClass(ClassNode node)
385385
/// <returns>The found class tree node.</returns>
386386
private ClassTreeNode FindClassTreeNode(ClassNode node)
387387
{
388-
return root.Nodes.OfType<ClassTreeNode>().Where(t => t.ClassNode == node).FirstOrDefault();
388+
return root.Nodes.OfType<ClassTreeNode>().FirstOrDefault(t => t.ClassNode == node);
389389
}
390390
}
391391
}

UI/MemoryViewControl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ internal void DeregisterNodeType(Type type)
120120
{
121121
Contract.Requires(type != null);
122122

123-
var item = changeTypeToolStripMenuItem.DropDownItems.OfType<TypeToolStripMenuItem>().Where(i => i.Value == type).FirstOrDefault();
123+
var item = changeTypeToolStripMenuItem.DropDownItems.OfType<TypeToolStripMenuItem>().FirstOrDefault(i => i.Value == type);
124124
if (item != null)
125125
{
126126
item.Click -= memoryTypeToolStripMenuItem_Click;
@@ -267,7 +267,7 @@ protected override void OnMouseClick(MouseEventArgs e)
267267
}
268268
else
269269
{
270-
selectedNodes.Remove(selectedNodes.Where(c => c.Node == hitObject).FirstOrDefault());
270+
selectedNodes.Remove(selectedNodes.FirstOrDefault(c => c.Node == hitObject));
271271
}
272272

273273
OnSelectionChanged();

0 commit comments

Comments
 (0)