提交 0905634a 编写于 作者: C CyrusNajmabadi

Use patterns in more places.

上级 40f44bed
......@@ -1155,9 +1155,9 @@ private static long IntegralValue(object value)
return (long)value;
}
if (value is int)
if (value is int i)
{
return (int)value;
return i;
}
return 0;
......
......@@ -254,17 +254,17 @@ private bool CompareParameters(ParameterSyntax oldParameter, ParameterSyntax new
{
return CompareMethodDeclarations((BaseMethodDeclarationSyntax)oldMember, (BaseMethodDeclarationSyntax)newMember, newNodeParent, eventQueue);
}
else if (oldMember is BaseFieldDeclarationSyntax)
else if (oldMember is BaseFieldDeclarationSyntax baseField)
{
return CompareFieldDeclarations((BaseFieldDeclarationSyntax)oldMember, (BaseFieldDeclarationSyntax)newMember, newNodeParent, eventQueue);
return CompareFieldDeclarations(baseField, (BaseFieldDeclarationSyntax)newMember, newNodeParent, eventQueue);
}
else if (oldMember is BasePropertyDeclarationSyntax)
else if (oldMember is BasePropertyDeclarationSyntax baseProperty)
{
return ComparePropertyDeclarations((BasePropertyDeclarationSyntax)oldMember, (BasePropertyDeclarationSyntax)newMember, newNodeParent, eventQueue);
return ComparePropertyDeclarations(baseProperty, (BasePropertyDeclarationSyntax)newMember, newNodeParent, eventQueue);
}
else if (oldMember is EnumMemberDeclarationSyntax)
else if (oldMember is EnumMemberDeclarationSyntax enumMember)
{
return CompareEnumMemberDeclarations((EnumMemberDeclarationSyntax)oldMember, (EnumMemberDeclarationSyntax)newMember, newNodeParent, eventQueue);
return CompareEnumMemberDeclarations(enumMember, (EnumMemberDeclarationSyntax)newMember, newNodeParent, eventQueue);
}
throw new NotImplementedException();
......@@ -335,9 +335,8 @@ private bool CompareParameters(ParameterSyntax oldParameter, ParameterSyntax new
CodeModelEventType.Unknown,
eventQueue);
if (oldProperty is IndexerDeclarationSyntax)
if (oldProperty is IndexerDeclarationSyntax oldIndexer)
{
var oldIndexer = (IndexerDeclarationSyntax)oldProperty;
var newIndexer = (IndexerDeclarationSyntax)newProperty;
same &= CompareChildren(
CompareParameters,
......@@ -528,9 +527,8 @@ private bool CompareParameters(ParameterSyntax oldParameter, ParameterSyntax new
return false;
}
if (oldMember is BaseTypeDeclarationSyntax)
if (oldMember is BaseTypeDeclarationSyntax oldType)
{
var oldType = (BaseTypeDeclarationSyntax)oldMember;
var newType = (BaseTypeDeclarationSyntax)newMember;
var oldMembers = GetValidMembers(oldType);
......@@ -590,9 +588,8 @@ private bool CompareParameters(ParameterSyntax oldParameter, ParameterSyntax new
return same;
}
else if (oldMember is DelegateDeclarationSyntax)
else if (oldMember is DelegateDeclarationSyntax oldDelegate)
{
var oldDelegate = (DelegateDeclarationSyntax)oldMember;
var newDelegate = (DelegateDeclarationSyntax)newMember;
bool same = true;
......@@ -673,9 +670,9 @@ private bool CompareParameters(ParameterSyntax oldParameter, ParameterSyntax new
{
return CompareTypeDeclarations(oldNamespaceOrType, newNamespaceOrType, newNodeParent, eventQueue);
}
else if (oldNamespaceOrType is NamespaceDeclarationSyntax)
else if (oldNamespaceOrType is NamespaceDeclarationSyntax namespaceDecl)
{
return CompareNamespaceDeclarations((NamespaceDeclarationSyntax)oldNamespaceOrType, (NamespaceDeclarationSyntax)newNamespaceOrType, newNodeParent, eventQueue);
return CompareNamespaceDeclarations(namespaceDecl, (NamespaceDeclarationSyntax)newNamespaceOrType, newNodeParent, eventQueue);
}
return false;
......@@ -837,13 +834,13 @@ private bool CompareTypes(TypeSyntax oldType, TypeSyntax newType)
private TypeSyntax GetReturnType(BaseMethodDeclarationSyntax method)
{
if (method is MethodDeclarationSyntax)
if (method is MethodDeclarationSyntax methodDecl)
{
return ((MethodDeclarationSyntax)method).ReturnType;
return methodDecl.ReturnType;
}
else if (method is OperatorDeclarationSyntax)
else if (method is OperatorDeclarationSyntax operatorDecl)
{
return ((OperatorDeclarationSyntax)method).ReturnType;
return operatorDecl.ReturnType;
}
// TODO(DustinCa): What about conversion operators? How does the legacy code base handle those?
......@@ -868,23 +865,23 @@ protected override void EnqueueAddEvent(SyntaxNode node, SyntaxNode parent, Code
return;
}
if (node is BaseFieldDeclarationSyntax)
if (node is BaseFieldDeclarationSyntax baseField)
{
foreach (var variableDeclarator in ((BaseFieldDeclarationSyntax)node).Declaration.Variables)
foreach (var variableDeclarator in baseField.Declaration.Variables)
{
eventQueue.EnqueueAddEvent(variableDeclarator, parent);
}
}
else if (node is AttributeListSyntax)
else if (node is AttributeListSyntax attributeList)
{
foreach (var attribute in ((AttributeListSyntax)node).Attributes)
foreach (var attribute in attributeList.Attributes)
{
AddEventToEventQueueForAttributes(attribute, parent, eventQueue.EnqueueAddEvent);
}
}
else if (node is AttributeSyntax)
else if (node is AttributeSyntax attribute)
{
AddEventToEventQueueForAttributes((AttributeSyntax)node, parent, eventQueue.EnqueueAddEvent);
AddEventToEventQueueForAttributes(attribute, parent, eventQueue.EnqueueAddEvent);
}
else
{
......@@ -904,23 +901,23 @@ protected override void EnqueueChangeEvent(SyntaxNode node, SyntaxNode parent, C
return;
}
if (node is BaseFieldDeclarationSyntax)
if (node is BaseFieldDeclarationSyntax baseField)
{
foreach (var variableDeclarator in ((BaseFieldDeclarationSyntax)node).Declaration.Variables)
foreach (var variableDeclarator in baseField.Declaration.Variables)
{
eventQueue.EnqueueChangeEvent(variableDeclarator, parent, eventType);
}
}
else if (node is AttributeListSyntax)
else if (node is AttributeListSyntax attributeList)
{
foreach (var attribute in ((AttributeListSyntax)node).Attributes)
foreach (var attribute in attributeList.Attributes)
{
ChangeEventQueueForAttributes(attribute, parent, eventType, eventQueue);
}
}
else if (node is AttributeSyntax)
else if (node is AttributeSyntax attribute)
{
ChangeEventQueueForAttributes((AttributeSyntax)node, parent, eventType, eventQueue);
ChangeEventQueueForAttributes(attribute, parent, eventType, eventQueue);
}
else
{
......@@ -930,9 +927,9 @@ protected override void EnqueueChangeEvent(SyntaxNode node, SyntaxNode parent, C
private static void ChangeEventQueueForAttributes(AttributeSyntax attribute, SyntaxNode parent, CodeModelEventType eventType, CodeModelEventQueue eventQueue)
{
if (parent is BaseFieldDeclarationSyntax)
if (parent is BaseFieldDeclarationSyntax baseField)
{
foreach (var variableDeclarator in ((BaseFieldDeclarationSyntax)parent).Declaration.Variables)
foreach (var variableDeclarator in baseField.Declaration.Variables)
{
eventQueue.EnqueueChangeEvent(attribute, variableDeclarator, eventType);
}
......@@ -955,23 +952,23 @@ protected override void EnqueueRemoveEvent(SyntaxNode node, SyntaxNode parent, C
return;
}
if (node is BaseFieldDeclarationSyntax)
if (node is BaseFieldDeclarationSyntax baseField)
{
foreach (var variableDeclarator in ((BaseFieldDeclarationSyntax)node).Declaration.Variables)
foreach (var variableDeclarator in baseField.Declaration.Variables)
{
eventQueue.EnqueueRemoveEvent(variableDeclarator, parent);
}
}
else if (node is AttributeListSyntax)
else if (node is AttributeListSyntax attributeList)
{
foreach (var attribute in ((AttributeListSyntax)node).Attributes)
foreach (var attribute in attributeList.Attributes)
{
AddEventToEventQueueForAttributes(attribute, parent, eventQueue.EnqueueRemoveEvent);
}
}
else if (node is AttributeSyntax)
else if (node is AttributeSyntax attribute)
{
AddEventToEventQueueForAttributes((AttributeSyntax)node, parent, eventQueue.EnqueueRemoveEvent);
AddEventToEventQueueForAttributes(attribute, parent, eventQueue.EnqueueRemoveEvent);
}
else
{
......@@ -981,9 +978,9 @@ protected override void EnqueueRemoveEvent(SyntaxNode node, SyntaxNode parent, C
private void AddEventToEventQueueForAttributes(AttributeSyntax attribute, SyntaxNode parent, Action<SyntaxNode, SyntaxNode> enqueueAddOrRemoveEvent)
{
if (parent is BaseFieldDeclarationSyntax)
if (parent is BaseFieldDeclarationSyntax baseField)
{
foreach (var variableDeclarator in ((BaseFieldDeclarationSyntax)parent).Declaration.Variables)
foreach (var variableDeclarator in baseField.Declaration.Variables)
{
enqueueAddOrRemoveEvent(attribute, variableDeclarator);
}
......
......@@ -9,44 +9,44 @@ internal static class SyntaxNodeExtensions
{
public static bool TryGetAttributeLists(this SyntaxNode node, out SyntaxList<AttributeListSyntax> attributeLists)
{
if (node is CompilationUnitSyntax)
if (node is CompilationUnitSyntax compilationUnit)
{
attributeLists = ((CompilationUnitSyntax)node).AttributeLists;
attributeLists = compilationUnit.AttributeLists;
return true;
}
else if (node is BaseTypeDeclarationSyntax)
else if (node is BaseTypeDeclarationSyntax baseType)
{
attributeLists = ((BaseTypeDeclarationSyntax)node).AttributeLists;
attributeLists = baseType.AttributeLists;
return true;
}
else if (node is BaseMethodDeclarationSyntax)
else if (node is BaseMethodDeclarationSyntax baseMethod)
{
attributeLists = ((BaseMethodDeclarationSyntax)node).AttributeLists;
attributeLists = baseMethod.AttributeLists;
return true;
}
else if (node is BasePropertyDeclarationSyntax)
else if (node is BasePropertyDeclarationSyntax baseProperty)
{
attributeLists = ((BasePropertyDeclarationSyntax)node).AttributeLists;
attributeLists = baseProperty.AttributeLists;
return true;
}
else if (node is BaseFieldDeclarationSyntax)
else if (node is BaseFieldDeclarationSyntax baseField)
{
attributeLists = ((BaseFieldDeclarationSyntax)node).AttributeLists;
attributeLists = baseField.AttributeLists;
return true;
}
else if (node is DelegateDeclarationSyntax)
else if (node is DelegateDeclarationSyntax delegateDeclaration)
{
attributeLists = ((DelegateDeclarationSyntax)node).AttributeLists;
attributeLists = delegateDeclaration.AttributeLists;
return true;
}
else if (node is EnumMemberDeclarationSyntax)
else if (node is EnumMemberDeclarationSyntax enumMember)
{
attributeLists = ((EnumMemberDeclarationSyntax)node).AttributeLists;
attributeLists = enumMember.AttributeLists;
return true;
}
else if (node is ParameterSyntax)
else if (node is ParameterSyntax parameter)
{
attributeLists = ((ParameterSyntax)node).AttributeLists;
attributeLists = parameter.AttributeLists;
return true;
}
......
......@@ -112,46 +112,43 @@ private static void AddSubExpressionTerms(ExpressionSyntax expression, IList<str
// +, -, ++, --, !, etc.
//
// This is a valid expression if it doesn't have obvious side effects (i.e. ++, --)
if (expression is PrefixUnaryExpressionSyntax)
if (expression is PrefixUnaryExpressionSyntax prefixUnary)
{
AddPrefixUnaryExpressionTerms((PrefixUnaryExpressionSyntax)expression, terms, ref expressionType);
AddPrefixUnaryExpressionTerms(prefixUnary, terms, ref expressionType);
return;
}
if (expression is AwaitExpressionSyntax)
if (expression is AwaitExpressionSyntax awaitExpression)
{
AddAwaitExpressionTerms((AwaitExpressionSyntax)expression, terms, ref expressionType);
AddAwaitExpressionTerms(awaitExpression, terms, ref expressionType);
return;
}
if (expression is PostfixUnaryExpressionSyntax)
if (expression is PostfixUnaryExpressionSyntax postfixExpression)
{
AddPostfixUnaryExpressionTerms((PostfixUnaryExpressionSyntax)expression, terms, ref expressionType);
AddPostfixUnaryExpressionTerms(postfixExpression, terms, ref expressionType);
return;
}
if (expression is BinaryExpressionSyntax)
if (expression is BinaryExpressionSyntax binaryExpression)
{
var binaryExpression = (BinaryExpressionSyntax)expression;
AddBinaryExpressionTerms(expression, binaryExpression.Left, binaryExpression.Right, terms, ref expressionType);
return;
}
if (expression is AssignmentExpressionSyntax)
if (expression is AssignmentExpressionSyntax assignmentExpression)
{
var assignmentExpression = (AssignmentExpressionSyntax)expression;
AddBinaryExpressionTerms(expression, assignmentExpression.Left, assignmentExpression.Right, terms, ref expressionType);
return;
}
if (expression is ConditionalExpressionSyntax)
if (expression is ConditionalExpressionSyntax conditional)
{
AddConditionalExpressionTerms((ConditionalExpressionSyntax)expression, terms, ref expressionType);
AddConditionalExpressionTerms(conditional, terms, ref expressionType);
return;
}
var parenthesizedExpression = expression as ParenthesizedExpressionSyntax;
if (parenthesizedExpression != null)
if (expression is ParenthesizedExpressionSyntax parenthesizedExpression)
{
AddSubExpressionTerms(parenthesizedExpression.Expression, terms, ref expressionType);
}
......
......@@ -21,28 +21,27 @@ public void Send(params object[] keys)
foreach (var key in keys)
{
if (key is string)
if (key is string s)
{
var text = ((string)key)
.Replace("\r\n", "\r")
.Replace("\n", "\r");
var text = s.Replace("\r\n", "\r")
.Replace("\n", "\r");
foreach (var ch in text)
{
AddInputs(inputs, ch);
}
}
else if (key is char)
else if (key is char c)
{
AddInputs(inputs, (char)key);
AddInputs(inputs, c);
}
else if (key is VirtualKey)
else if (key is VirtualKey virtualKey)
{
AddInputs(inputs, (VirtualKey)key);
AddInputs(inputs, virtualKey);
}
else if (key is KeyPress)
else if (key is KeyPress keyPress)
{
AddInputs(inputs, (KeyPress)key);
AddInputs(inputs, keyPress);
}
else if (key == null)
{
......
......@@ -84,9 +84,9 @@ public IEnumerable<T> GetGlobalAssetsOfType<T>(CancellationToken cancellationTok
cancellationToken.ThrowIfCancellationRequested();
var value = asset.Value.Object;
if (value is T)
if (value is T tValue)
{
yield return (T)value;
yield return tValue;
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册