diff --git a/src/Analyzers/VisualBasic/Analyzers/ValidateFormatString/VisualBasicValidateFormatStringDiagnosticAnalyzer.vb b/src/Analyzers/VisualBasic/Analyzers/ValidateFormatString/VisualBasicValidateFormatStringDiagnosticAnalyzer.vb index b5931640fccdf..1211ac01308b9 100644 --- a/src/Analyzers/VisualBasic/Analyzers/ValidateFormatString/VisualBasicValidateFormatStringDiagnosticAnalyzer.vb +++ b/src/Analyzers/VisualBasic/Analyzers/ValidateFormatString/VisualBasicValidateFormatStringDiagnosticAnalyzer.vb @@ -24,7 +24,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ValidateFormatString For Each argument In arguments Dim simpleArgumentSyntax = TryCast(argument, SimpleArgumentSyntax) - If Not simpleArgumentSyntax Is Nothing AndAlso simpleArgumentSyntax.NameColonEquals?.Name.Identifier.ValueText.Equals(searchArgumentName) Then + If simpleArgumentSyntax IsNot Nothing AndAlso simpleArgumentSyntax.NameColonEquals?.Name.Identifier.ValueText.Equals(searchArgumentName) Then Return argument End If Next diff --git a/src/Analyzers/VisualBasic/CodeFixes/AddAnonymousTypeMemberName/VisualBasicAddAnonymousTypeMemberNameCodeFixProvider.vb b/src/Analyzers/VisualBasic/CodeFixes/AddAnonymousTypeMemberName/VisualBasicAddAnonymousTypeMemberNameCodeFixProvider.vb index b71bd589e3b8b..07513f59ae8a9 100644 --- a/src/Analyzers/VisualBasic/CodeFixes/AddAnonymousTypeMemberName/VisualBasicAddAnonymousTypeMemberNameCodeFixProvider.vb +++ b/src/Analyzers/VisualBasic/CodeFixes/AddAnonymousTypeMemberName/VisualBasicAddAnonymousTypeMemberNameCodeFixProvider.vb @@ -28,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.AddAnonymousTypeMemberName ImmutableArray.Create(BC36556) Protected Overrides Function HasName(declarator As FieldInitializerSyntax) As Boolean - Return Not TypeOf declarator Is InferredFieldInitializerSyntax + Return TypeOf declarator IsNot InferredFieldInitializerSyntax End Function Protected Overrides Function GetExpression(declarator As FieldInitializerSyntax) As ExpressionSyntax diff --git a/src/Analyzers/VisualBasic/CodeFixes/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb b/src/Analyzers/VisualBasic/CodeFixes/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb index 677d27c679149..2a69484ac46c2 100644 --- a/src/Analyzers/VisualBasic/CodeFixes/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb +++ b/src/Analyzers/VisualBasic/CodeFixes/GenerateParameterizedMember/VisualBasicGenerateParameterizedMemberService.vb @@ -63,7 +63,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.GenerateMember.GenerateMethod Protected Overrides Function GetCapturedTypeParameters(cancellationToken As CancellationToken) As ImmutableArray(Of ITypeParameterSymbol) Dim result = New List(Of ITypeParameterSymbol)() - If Not Me.InvocationExpression.ArgumentList Is Nothing Then + If Me.InvocationExpression.ArgumentList IsNot Nothing Then For Each argument In Me.InvocationExpression.ArgumentList.Arguments Dim type = DetermineParameterType(argument, cancellationToken) type.GetReferencedTypeParameters(result) diff --git a/src/EditorFeatures/Test2/Expansion/AbstractExpansionTest.vb b/src/EditorFeatures/Test2/Expansion/AbstractExpansionTest.vb index dbd1782c5984a..bf180f3f0b201 100644 --- a/src/EditorFeatures/Test2/Expansion/AbstractExpansionTest.vb +++ b/src/EditorFeatures/Test2/Expansion/AbstractExpansionTest.vb @@ -56,7 +56,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Expansion End Function Private Shared Function GetExpressionSyntaxWithSameSpan(node As SyntaxNode, spanEnd As Integer) As SyntaxNode - While Not node Is Nothing And Not node.Parent Is Nothing And node.Parent.SpanStart = node.SpanStart + While node IsNot Nothing And node.Parent IsNot Nothing And node.Parent.SpanStart = node.SpanStart node = node.Parent If node.Span.End = spanEnd Then Exit While diff --git a/src/EditorFeatures/Test2/Simplification/AbstractSimplificationTests.vb b/src/EditorFeatures/Test2/Simplification/AbstractSimplificationTests.vb index 223273cfd4e09..5b1eb5edb3dcc 100644 --- a/src/EditorFeatures/Test2/Simplification/AbstractSimplificationTests.vb +++ b/src/EditorFeatures/Test2/Simplification/AbstractSimplificationTests.vb @@ -131,7 +131,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Simplification End Function Private Shared Function GetExpressionSyntaxWithSameSpan(node As SyntaxNode, spanEnd As Integer) As SyntaxNode - While Not node Is Nothing And Not node.Parent Is Nothing And node.Parent.SpanStart = node.SpanStart + While node IsNot Nothing And node.Parent IsNot Nothing And node.Parent.SpanStart = node.SpanStart node = node.Parent If node.Span.End = spanEnd Then Exit While diff --git a/src/EditorFeatures/TestUtilities2/Intellisense/TestState.vb b/src/EditorFeatures/TestUtilities2/Intellisense/TestState.vb index 7e18860b93d6e..bf3cf355128fe 100644 --- a/src/EditorFeatures/TestUtilities2/Intellisense/TestState.vb +++ b/src/EditorFeatures/TestUtilities2/Intellisense/TestState.vb @@ -515,7 +515,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.IntelliSense Public Async Function AssertSessionIsNothingOrNoCompletionItemLike(text As String) As Task Await WaitForAsynchronousOperationsAsync() Dim session = GetExportedValue(Of IAsyncCompletionBroker)().GetSession(TextView) - If Not session Is Nothing Then + If session IsNot Nothing Then Await AssertCompletionItemsDoNotContainAny(text) End If End Function diff --git a/src/EditorFeatures/VisualBasic/LineCommit/ContainingStatementInfo.vb b/src/EditorFeatures/VisualBasic/LineCommit/ContainingStatementInfo.vb index 7f22244e1e3f9..ea2e9e3cd8c64 100644 --- a/src/EditorFeatures/VisualBasic/LineCommit/ContainingStatementInfo.vb +++ b/src/EditorFeatures/VisualBasic/LineCommit/ContainingStatementInfo.vb @@ -108,7 +108,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit End If Dim containingStatement = token.GetAncestors(Of StatementSyntax) _ - .Where(Function(a) Not TypeOf a Is LambdaHeaderSyntax) _ + .Where(Function(a) TypeOf a IsNot LambdaHeaderSyntax) _ .FirstOrDefault() Dim containingTypeStatement = TryCast(containingStatement, TypeStatementSyntax) diff --git a/src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/BasicMoveTypeTestsBase.vb b/src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/BasicMoveTypeTestsBase.vb index f66698bdd9201..629faf6778e08 100644 --- a/src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/BasicMoveTypeTestsBase.vb +++ b/src/EditorFeatures/VisualBasicTest/CodeActions/MoveType/BasicMoveTypeTestsBase.vb @@ -32,7 +32,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings.M ) As Task Dim expectedText As String = Nothing - If Not expectedCode Is Nothing Then + If expectedCode IsNot Nothing Then expectedText = expectedCode.ConvertTestSourceTag() End If diff --git a/src/Features/VisualBasic/Portable/BraceCompletion/ParenthesisBraceCompletionService.vb b/src/Features/VisualBasic/Portable/BraceCompletion/ParenthesisBraceCompletionService.vb index 22b4bf4281d0a..a7f1c2e2bbef6 100644 --- a/src/Features/VisualBasic/Portable/BraceCompletion/ParenthesisBraceCompletionService.vb +++ b/src/Features/VisualBasic/Portable/BraceCompletion/ParenthesisBraceCompletionService.vb @@ -43,7 +43,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.BraceCompletion If skippedTriviaNode IsNot Nothing Then Dim skippedToken = skippedTriviaNode.ParentTrivia.Token ' These checks don't make any sense. Leaving them in place to avoid breaking something as part of this move. - If skippedToken.Kind <> SyntaxKind.CloseParenToken OrElse Not TypeOf skippedToken.Parent Is BinaryConditionalExpressionSyntax Then + If skippedToken.Kind <> SyntaxKind.CloseParenToken OrElse TypeOf skippedToken.Parent IsNot BinaryConditionalExpressionSyntax Then Return False End If End If diff --git a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/InternalsVisibleToCompletionProvider.vb b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/InternalsVisibleToCompletionProvider.vb index e351d7cb2ac3f..258fd572acd04 100644 --- a/src/Features/VisualBasic/Portable/Completion/CompletionProviders/InternalsVisibleToCompletionProvider.vb +++ b/src/Features/VisualBasic/Portable/Completion/CompletionProviders/InternalsVisibleToCompletionProvider.vb @@ -32,7 +32,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.Providers Protected Overrides Function GetAssemblyScopedAttributeSyntaxNodesOfDocument(documentRoot As SyntaxNode) As IImmutableList(Of SyntaxNode) Dim builder As ImmutableList(Of SyntaxNode).Builder = Nothing Dim compilationUnit = TryCast(documentRoot, CompilationUnitSyntax) - If Not compilationUnit Is Nothing Then + If compilationUnit IsNot Nothing Then For Each attributeStatement In compilationUnit.Attributes For Each attributeList In attributeStatement.AttributeLists builder = If(builder, ImmutableList.CreateBuilder(Of SyntaxNode)()) diff --git a/src/Features/VisualBasic/Portable/Completion/KeywordRecommenders/Declarations/ParameterModifiersKeywordRecommender.vb b/src/Features/VisualBasic/Portable/Completion/KeywordRecommenders/Declarations/ParameterModifiersKeywordRecommender.vb index 7ffab05a85afe..5bf3c2535c462 100644 --- a/src/Features/VisualBasic/Portable/Completion/KeywordRecommenders/Declarations/ParameterModifiersKeywordRecommender.vb +++ b/src/Features/VisualBasic/Portable/Completion/KeywordRecommenders/Declarations/ParameterModifiersKeywordRecommender.vb @@ -33,13 +33,13 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Completion.KeywordRecommenders.Decl End If ' Compute some basic properties of what is allowed at all in this context - Dim byRefAllowed = Not TypeOf methodDeclaration Is AccessorStatementSyntax AndAlso + Dim byRefAllowed = TypeOf methodDeclaration IsNot AccessorStatementSyntax AndAlso methodDeclaration.Kind <> SyntaxKind.PropertyStatement AndAlso methodDeclaration.Kind <> SyntaxKind.OperatorStatement - Dim optionalAndParamArrayAllowed = Not TypeOf methodDeclaration Is DelegateStatementSyntax AndAlso - Not TypeOf methodDeclaration Is LambdaHeaderSyntax AndAlso - Not TypeOf methodDeclaration Is AccessorStatementSyntax AndAlso + Dim optionalAndParamArrayAllowed = TypeOf methodDeclaration IsNot DelegateStatementSyntax AndAlso + TypeOf methodDeclaration IsNot LambdaHeaderSyntax AndAlso + TypeOf methodDeclaration IsNot AccessorStatementSyntax AndAlso methodDeclaration.Kind <> SyntaxKind.EventStatement AndAlso methodDeclaration.Kind <> SyntaxKind.OperatorStatement diff --git a/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.Analyzer.vb b/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.Analyzer.vb index 40c6bff0bd00a..564d60dc465d9 100644 --- a/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.Analyzer.vb +++ b/src/Features/VisualBasic/Portable/ExtractMethod/VisualBasicMethodExtractor.Analyzer.vb @@ -57,7 +57,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExtractMethod Return True End If - Return Not TypeOf methodBlock.BlockStatement Is SubNewStatementSyntax + Return TypeOf methodBlock.BlockStatement IsNot SubNewStatementSyntax End Function End Class End Class diff --git a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/AccessorDeclarationHighlighter.vb b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/AccessorDeclarationHighlighter.vb index 712f2e1368d08..3c48bae67dde6 100644 --- a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/AccessorDeclarationHighlighter.vb +++ b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/AccessorDeclarationHighlighter.vb @@ -21,7 +21,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting Protected Overloads Overrides Sub AddHighlights(node As SyntaxNode, highlights As List(Of TextSpan), cancellationToken As CancellationToken) Dim methodBlock = node.GetAncestor(Of MethodBlockBaseSyntax)() - If methodBlock Is Nothing OrElse Not TypeOf methodBlock.BlockStatement Is AccessorStatementSyntax Then + If methodBlock Is Nothing OrElse TypeOf methodBlock.BlockStatement IsNot AccessorStatementSyntax Then Return End If diff --git a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/ConstructorDeclarationHighlighter.vb b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/ConstructorDeclarationHighlighter.vb index b8ed2d1c20948..bd963d359da54 100644 --- a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/ConstructorDeclarationHighlighter.vb +++ b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/ConstructorDeclarationHighlighter.vb @@ -21,7 +21,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting Protected Overloads Overrides Sub AddHighlights(node As SyntaxNode, highlights As List(Of TextSpan), cancellationToken As CancellationToken) Dim methodBlock = node.GetAncestor(Of MethodBlockBaseSyntax)() - If methodBlock Is Nothing OrElse Not TypeOf methodBlock.BlockStatement Is SubNewStatementSyntax Then + If methodBlock Is Nothing OrElse TypeOf methodBlock.BlockStatement IsNot SubNewStatementSyntax Then Return End If diff --git a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/MethodDeclarationHighlighter.vb b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/MethodDeclarationHighlighter.vb index 3a42bb5fdb463..b488938c04c38 100644 --- a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/MethodDeclarationHighlighter.vb +++ b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/MethodDeclarationHighlighter.vb @@ -21,7 +21,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting Protected Overloads Overrides Sub AddHighlights(node As SyntaxNode, highlights As List(Of TextSpan), cancellationToken As CancellationToken) Dim methodBlock = node.GetAncestor(Of MethodBlockBaseSyntax)() - If methodBlock Is Nothing OrElse Not TypeOf methodBlock.BlockStatement Is MethodStatementSyntax Then + If methodBlock Is Nothing OrElse TypeOf methodBlock.BlockStatement IsNot MethodStatementSyntax Then Return End If diff --git a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/OperatorDeclarationHighlighter.vb b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/OperatorDeclarationHighlighter.vb index dc5290ce338e4..7d5cc5ce94507 100644 --- a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/OperatorDeclarationHighlighter.vb +++ b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/OperatorDeclarationHighlighter.vb @@ -21,7 +21,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting Protected Overloads Overrides Sub AddHighlights(node As SyntaxNode, highlights As List(Of TextSpan), cancellationToken As CancellationToken) Dim methodBlock = node.GetAncestor(Of MethodBlockBaseSyntax)() - If methodBlock Is Nothing OrElse Not TypeOf methodBlock.BlockStatement Is OperatorStatementSyntax Then + If methodBlock Is Nothing OrElse TypeOf methodBlock.BlockStatement IsNot OperatorStatementSyntax Then Return End If diff --git a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/TryBlockHighlighter.vb b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/TryBlockHighlighter.vb index 9f4e6ccf532b6..5c322aa006c3f 100644 --- a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/TryBlockHighlighter.vb +++ b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlighters/TryBlockHighlighter.vb @@ -64,7 +64,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting End If Dim child = childNodeOrToken.AsNode() - If Not TypeOf child Is TryBlockSyntax AndAlso Not TypeOf child Is LambdaExpressionSyntax Then + If TypeOf child IsNot TryBlockSyntax AndAlso TypeOf child IsNot LambdaExpressionSyntax Then HighlightRelatedStatements(child, highlights) End If Next diff --git a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlightingHelpers.vb b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlightingHelpers.vb index c87c04f3f3e7c..46660b010a6de 100644 --- a/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlightingHelpers.vb +++ b/src/Features/VisualBasic/Portable/Highlighting/KeywordHighlightingHelpers.vb @@ -34,8 +34,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting End With Else For Each child In node.ChildNodes() - If Not TypeOf child Is T AndAlso - Not TypeOf child Is LambdaExpressionSyntax Then + If TypeOf child IsNot T AndAlso + TypeOf child IsNot LambdaExpressionSyntax Then HighlightRelatedStatements(Of T)(child, highlights, blockKind, checkReturns) End If @@ -106,7 +106,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting End If For Each child In node.ChildNodes() - If Not TypeOf child Is LambdaExpressionSyntax Then + If TypeOf child IsNot LambdaExpressionSyntax Then HighlightRelatedAwaits(child, highlights, cancellationToken) End If Next @@ -119,7 +119,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.KeywordHighlighting End With Else For Each child In node.ChildNodes() - If Not TypeOf child Is LambdaExpressionSyntax Then + If TypeOf child IsNot LambdaExpressionSyntax Then HighlightRelatedYieldStatements(Of T)(child, highlights) End If Next diff --git a/src/Features/VisualBasicTest/Diagnostics/Suppression/SuppressionAllCodeTests.vb b/src/Features/VisualBasicTest/Diagnostics/Suppression/SuppressionAllCodeTests.vb index 3d5e494cae508..56ec53542f7ee 100644 --- a/src/Features/VisualBasicTest/Diagnostics/Suppression/SuppressionAllCodeTests.vb +++ b/src/Features/VisualBasicTest/Diagnostics/Suppression/SuppressionAllCodeTests.vb @@ -43,7 +43,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Suppre Return True End If - Return Not TypeOf n Is StatementSyntax + Return TypeOf n IsNot StatementSyntax End Function, verifier:=Function(t) t.IndexOf("SuppressMessage", StringComparison.Ordinal) >= 0) End Function diff --git a/src/VisualStudio/VisualBasic/Impl/CodeModel/MethodXML/MethodXmlBuilder.vb b/src/VisualStudio/VisualBasic/Impl/CodeModel/MethodXML/MethodXmlBuilder.vb index 61d95267fbe21..25ec13b0538f5 100644 --- a/src/VisualStudio/VisualBasic/Impl/CodeModel/MethodXML/MethodXmlBuilder.vb +++ b/src/VisualStudio/VisualBasic/Impl/CodeModel/MethodXML/MethodXmlBuilder.vb @@ -531,7 +531,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel.MethodXm Return False End If - If Not TypeOf constantValue.Value Is Integer Then + If TypeOf constantValue.Value IsNot Integer Then Return False End If @@ -547,7 +547,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel.MethodXm End Function Private Function TryGenerateSimpleArrayBound(argument As ArgumentSyntax) As Boolean - If Not TypeOf argument Is SimpleArgumentSyntax Then + If TypeOf argument IsNot SimpleArgumentSyntax Then Return False End If @@ -555,7 +555,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel.MethodXm End Function Private Function TryGenerateRangeArrayBound(argument As ArgumentSyntax) As Boolean - If Not TypeOf argument Is RangeArgumentSyntax Then + If TypeOf argument IsNot RangeArgumentSyntax Then Return False End If diff --git a/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.CodeModelEventCollector.vb b/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.CodeModelEventCollector.vb index 1eeec30edab43..e97cd9da76dfd 100644 --- a/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.CodeModelEventCollector.vb +++ b/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.CodeModelEventCollector.vb @@ -70,7 +70,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel Private Shared Function GetImportsClauses(importsStatements As SyntaxList(Of ImportsStatementSyntax)) As IReadOnlyList(Of ImportsClauseSyntax) Return importsStatements _ .SelectMany(Function(i) i.ImportsClauses) _ - .Where(Function(i) Not TypeOf i Is XmlNamespaceImportsClauseSyntax) _ + .Where(Function(i) TypeOf i IsNot XmlNamespaceImportsClauseSyntax) _ .ToArray() End Function diff --git a/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.vb b/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.vb index 42f2a2a2cba67..4804603202332 100644 --- a/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.vb +++ b/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.vb @@ -227,7 +227,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel End If Case SyntaxKind.EventStatement - If Not TypeOf node.Parent Is EventBlockSyntax Then + If TypeOf node.Parent IsNot EventBlockSyntax Then If scope = EnvDTE.vsCMElement.vsCMElementEvent Then Return True End If @@ -239,7 +239,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel End If Case SyntaxKind.PropertyStatement - If Not TypeOf node.Parent Is PropertyBlockSyntax Then + If TypeOf node.Parent IsNot PropertyBlockSyntax Then If scope = EnvDTE.vsCMElement.vsCMElementProperty Then Return True End If @@ -1528,7 +1528,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel If TypeOf member Is TypeBlockSyntax OrElse TypeOf member Is EnumBlockSyntax Then - If Not TypeOf member.Parent Is TypeBlockSyntax AndAlso + If TypeOf member.Parent IsNot TypeBlockSyntax AndAlso (newAccess = EnvDTE.vsCMAccess.vsCMAccessPrivate OrElse newAccess = EnvDTE.vsCMAccess.vsCMAccessProtected OrElse newAccess = EnvDTE.vsCMAccess.vsCMAccessProjectOrProtected) Then @@ -2084,7 +2084,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel Public Overrides Function ValidateFunctionKind(containerNode As SyntaxNode, kind As EnvDTE.vsCMFunction, name As String) As EnvDTE.vsCMFunction If kind = EnvDTE.vsCMFunction.vsCMFunctionSub Then - Return If(name = "New" AndAlso Not TypeOf containerNode Is InterfaceBlockSyntax, + Return If(name = "New" AndAlso TypeOf containerNode IsNot InterfaceBlockSyntax, EnvDTE.vsCMFunction.vsCMFunctionConstructor, kind) End If @@ -4163,9 +4163,9 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel End Function Public Overrides Function GetFunctionExtender(name As String, node As SyntaxNode, symbol As ISymbol) As Object - If Not TypeOf node Is MethodBlockBaseSyntax AndAlso - Not TypeOf node Is MethodStatementSyntax AndAlso - Not TypeOf symbol Is IMethodSymbol Then + If TypeOf node IsNot MethodBlockBaseSyntax AndAlso + TypeOf node IsNot MethodStatementSyntax AndAlso + TypeOf symbol IsNot IMethodSymbol Then Throw Exceptions.ThrowEUnexpected() End If @@ -4188,16 +4188,16 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel End Function Public Overrides Function GetPropertyExtender(name As String, node As SyntaxNode, symbol As ISymbol) As Object - If Not TypeOf node Is PropertyBlockSyntax AndAlso - Not TypeOf node Is PropertyStatementSyntax AndAlso - Not TypeOf symbol Is IPropertySymbol Then + If TypeOf node IsNot PropertyBlockSyntax AndAlso + TypeOf node IsNot PropertyStatementSyntax AndAlso + TypeOf symbol IsNot IPropertySymbol Then Throw Exceptions.ThrowEUnexpected() End If If StringComparer.OrdinalIgnoreCase.Equals(name, ExtenderNames.VBAutoPropertyExtender) Then Dim isAutoImplemented = TypeOf node Is PropertyStatementSyntax AndAlso - Not TypeOf node.Parent Is InterfaceBlockSyntax + TypeOf node.Parent IsNot InterfaceBlockSyntax Return AutoPropertyExtender.Create(isAutoImplemented) End If diff --git a/src/VisualStudio/VisualBasic/Impl/Help/VisualBasicHelpContextService.Visitor.vb b/src/VisualStudio/VisualBasic/Impl/Help/VisualBasicHelpContextService.Visitor.vb index c964dda4fc328..b2cadac5605b4 100644 --- a/src/VisualStudio/VisualBasic/Impl/Help/VisualBasicHelpContextService.Visitor.vb +++ b/src/VisualStudio/VisualBasic/Impl/Help/VisualBasicHelpContextService.Visitor.vb @@ -431,7 +431,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Help End Select If _isNotMetadata Then - If Not TypeOf node.Parent Is InheritsOrImplementsStatementSyntax Then + If TypeOf node.Parent IsNot InheritsOrImplementsStatementSyntax Then If TypeOf node.Parent Is DeclarationStatementSyntax OrElse TypeOf node.Parent Is FieldDeclarationSyntax Then Return End If diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Extensions/SyntaxNodeExtensions.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Extensions/SyntaxNodeExtensions.vb index 3cb98c6dd2d6a..9871ba0073b32 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Extensions/SyntaxNodeExtensions.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Extensions/SyntaxNodeExtensions.vb @@ -841,7 +841,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions Dim topMostExpression = node _ .AncestorsAndSelf() _ - .TakeWhile(Function(n) Not TypeOf n Is StatementSyntax) _ + .TakeWhile(Function(n) TypeOf n IsNot StatementSyntax) _ .OfType(Of ExpressionSyntax) _ .LastOrDefault() diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SemanticFacts/VisualBasicSemanticFacts.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SemanticFacts/VisualBasicSemanticFacts.vb index 4a4790a665427..540dba1f7d0b4 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SemanticFacts/VisualBasicSemanticFacts.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SemanticFacts/VisualBasicSemanticFacts.vb @@ -65,10 +65,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic Dim location = token.GetLocation() For Each ancestor In token.GetAncestors(Of SyntaxNode)() - If Not TypeOf ancestor Is AggregationRangeVariableSyntax AndAlso - Not TypeOf ancestor Is CollectionRangeVariableSyntax AndAlso - Not TypeOf ancestor Is ExpressionRangeVariableSyntax AndAlso - Not TypeOf ancestor Is InferredFieldInitializerSyntax Then + If TypeOf ancestor IsNot AggregationRangeVariableSyntax AndAlso + TypeOf ancestor IsNot CollectionRangeVariableSyntax AndAlso + TypeOf ancestor IsNot ExpressionRangeVariableSyntax AndAlso + TypeOf ancestor IsNot InferredFieldInitializerSyntax Then Dim symbol = semanticModel.GetDeclaredSymbol(ancestor, cancellationToken) diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxFacts.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxFacts.vb index 362500edd226b..f5a6fee82047e 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxFacts.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/VisualBasic/Services/SyntaxFacts/VisualBasicSyntaxFacts.vb @@ -692,19 +692,19 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageService Public Function GetContainingMemberDeclaration(root As SyntaxNode, position As Integer, Optional useFullSpan As Boolean = True) As SyntaxNode Implements ISyntaxFacts.GetContainingMemberDeclaration Dim isApplicableDeclaration = Function(node As SyntaxNode) - If TypeOf node Is MethodBlockBaseSyntax AndAlso Not TypeOf node.Parent Is PropertyBlockSyntax Then + If TypeOf node Is MethodBlockBaseSyntax AndAlso TypeOf node.Parent IsNot PropertyBlockSyntax Then Return True End If - If TypeOf node Is MethodBaseSyntax AndAlso Not TypeOf node.Parent Is MethodBlockBaseSyntax Then + If TypeOf node Is MethodBaseSyntax AndAlso TypeOf node.Parent IsNot MethodBlockBaseSyntax Then Return True End If - If TypeOf node Is PropertyStatementSyntax AndAlso Not TypeOf node.Parent Is PropertyBlockSyntax Then + If TypeOf node Is PropertyStatementSyntax AndAlso TypeOf node.Parent IsNot PropertyBlockSyntax Then Return True End If - If TypeOf node Is EventStatementSyntax AndAlso Not TypeOf node.Parent Is EventBlockSyntax Then + If TypeOf node Is EventStatementSyntax AndAlso TypeOf node.Parent IsNot EventBlockSyntax Then Return True End If @@ -725,11 +725,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageService Public Function GetContainingMethodDeclaration(root As SyntaxNode, position As Integer, Optional useFullSpan As Boolean = True) As SyntaxNode Implements ISyntaxFacts.GetContainingMethodDeclaration Dim isApplicableDeclaration = Function(node As SyntaxNode) - If TypeOf node Is MethodBlockBaseSyntax AndAlso Not TypeOf node.Parent Is PropertyBlockSyntax Then + If TypeOf node Is MethodBlockBaseSyntax AndAlso TypeOf node.Parent IsNot PropertyBlockSyntax Then Return True End If - If TypeOf node Is MethodBaseSyntax AndAlso Not TypeOf node.Parent Is MethodBlockBaseSyntax Then + If TypeOf node Is MethodBaseSyntax AndAlso TypeOf node.Parent IsNot MethodBlockBaseSyntax Then Return True End If @@ -770,23 +770,23 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.LanguageService ' like AccessorStatementSyntax and DelegateStatementSyntax that we never want to tread as method level ' members. - If TypeOf node Is MethodStatementSyntax AndAlso Not TypeOf node.Parent Is MethodBlockBaseSyntax Then + If TypeOf node Is MethodStatementSyntax AndAlso TypeOf node.Parent IsNot MethodBlockBaseSyntax Then Return True End If - If TypeOf node Is SubNewStatementSyntax AndAlso Not TypeOf node.Parent Is MethodBlockBaseSyntax Then + If TypeOf node Is SubNewStatementSyntax AndAlso TypeOf node.Parent IsNot MethodBlockBaseSyntax Then Return True End If - If TypeOf node Is OperatorStatementSyntax AndAlso Not TypeOf node.Parent Is MethodBlockBaseSyntax Then + If TypeOf node Is OperatorStatementSyntax AndAlso TypeOf node.Parent IsNot MethodBlockBaseSyntax Then Return True End If - If TypeOf node Is PropertyStatementSyntax AndAlso Not TypeOf node.Parent Is PropertyBlockSyntax Then + If TypeOf node Is PropertyStatementSyntax AndAlso TypeOf node.Parent IsNot PropertyBlockSyntax Then Return True End If - If TypeOf node Is EventStatementSyntax AndAlso Not TypeOf node.Parent Is EventBlockSyntax Then + If TypeOf node Is EventStatementSyntax AndAlso TypeOf node.Parent IsNot EventBlockSyntax Then Return True End If diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/CodeGeneration/ExpressionGenerator.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/CodeGeneration/ExpressionGenerator.vb index cf225e9b5861d..6141e1a971ad6 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/CodeGeneration/ExpressionGenerator.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/CodeGeneration/ExpressionGenerator.vb @@ -28,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGeneration SyntaxFactory.SeparatedList(typedConstant.Values.Select(Function(v) GenerateExpression(generator, v)))) End If Case TypedConstantKind.Type - If Not TypeOf typedConstant.Value Is ITypeSymbol Then + If TypeOf typedConstant.Value IsNot ITypeSymbol Then Return GenerateNothingLiteral() End If diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/CodeGeneration/NamespaceGenerator.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/CodeGeneration/NamespaceGenerator.vb index 8915c423b2d56..7dbb6d9ce1a28 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/CodeGeneration/NamespaceGenerator.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/CodeGeneration/NamespaceGenerator.vb @@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGeneration availableIndices As IList(Of Boolean), cancellationToken As CancellationToken) As CompilationUnitSyntax Dim declaration = GenerateNamespaceDeclaration(service, [namespace], options, cancellationToken) - If Not TypeOf declaration Is NamespaceBlockSyntax Then + If TypeOf declaration IsNot NamespaceBlockSyntax Then Throw New ArgumentException(WorkspaceExtensionsResources.Namespace_can_not_be_added_in_this_destination) End If @@ -33,7 +33,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGeneration availableIndices As IList(Of Boolean), cancellationToken As CancellationToken) As NamespaceBlockSyntax Dim declaration = GenerateNamespaceDeclaration(service, [namespace], options, cancellationToken) - If Not TypeOf declaration Is NamespaceBlockSyntax Then + If TypeOf declaration IsNot NamespaceBlockSyntax Then Throw New ArgumentException(WorkspaceExtensionsResources.Namespace_can_not_be_added_in_this_destination) End If diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ObjectCreationExpressionExtensions.vb b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ObjectCreationExpressionExtensions.vb index cfa61e90879bd..960352db235d5 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ObjectCreationExpressionExtensions.vb +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/VisualBasic/Extensions/ObjectCreationExpressionExtensions.vb @@ -25,7 +25,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Extensions End If If nextToken.IsKindOrHasMatchingText(SyntaxKind.DotToken) Then - If Not TypeOf objectCreationExpression.Type Is PredefinedTypeSyntax Then + If TypeOf objectCreationExpression.Type IsNot PredefinedTypeSyntax Then Return False End If End If diff --git a/src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/AddMissingTokensCodeCleanupProvider.vb b/src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/AddMissingTokensCodeCleanupProvider.vb index 5323ec7417111..f456bf60f08b5 100644 --- a/src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/AddMissingTokensCodeCleanupProvider.vb +++ b/src/Workspaces/VisualBasic/Portable/CodeCleanup/Providers/AddMissingTokensCodeCleanupProvider.vb @@ -141,9 +141,9 @@ Namespace Microsoft.CodeAnalysis.CodeCleanup.Providers Return newNode End If - If Not TypeOf node.Expression Is NameSyntax AndAlso - Not TypeOf node.Expression Is ParenthesizedExpressionSyntax AndAlso - Not TypeOf node.Expression Is MemberAccessExpressionSyntax Then + If TypeOf node.Expression IsNot NameSyntax AndAlso + TypeOf node.Expression IsNot ParenthesizedExpressionSyntax AndAlso + TypeOf node.Expression IsNot MemberAccessExpressionSyntax Then Return newNode End If diff --git a/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicSyntaxGenerator.vb b/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicSyntaxGenerator.vb index 0631af24ca037..8241c979880ef 100644 --- a/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicSyntaxGenerator.vb +++ b/src/Workspaces/VisualBasic/Portable/CodeGeneration/VisualBasicSyntaxGenerator.vb @@ -1446,7 +1446,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGeneration End Function Private Shared Function AsNamespaceMembers(declarations As IEnumerable(Of SyntaxNode)) As SyntaxList(Of StatementSyntax) - Return If(declarations Is Nothing, Nothing, SyntaxFactory.List(declarations.OfType(Of StatementSyntax)().Where(Function(s) Not TypeOf s Is ImportsStatementSyntax))) + Return If(declarations Is Nothing, Nothing, SyntaxFactory.List(declarations.OfType(Of StatementSyntax)().Where(Function(s) TypeOf s IsNot ImportsStatementSyntax))) End Function Public Overrides Function NamespaceImportDeclaration(name As SyntaxNode) As SyntaxNode diff --git a/src/Workspaces/VisualBasic/Portable/Formatting/DefaultOperationProvider.vb b/src/Workspaces/VisualBasic/Portable/Formatting/DefaultOperationProvider.vb index 49c635c13a72f..2b9d4e515011e 100644 --- a/src/Workspaces/VisualBasic/Portable/Formatting/DefaultOperationProvider.vb +++ b/src/Workspaces/VisualBasic/Portable/Formatting/DefaultOperationProvider.vb @@ -183,7 +183,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting If xmlDeclaration IsNot Nothing AndAlso xmlDeclaration.LessThanQuestionToken = currentToken AndAlso TypeOf xmlDeclaration.Parent Is XmlDocumentSyntax AndAlso - Not TypeOf xmlDeclaration.Parent.Parent Is XmlNodeSyntax Then + TypeOf xmlDeclaration.Parent.Parent IsNot XmlNodeSyntax Then Return True End If @@ -191,14 +191,14 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting If startTag IsNot Nothing AndAlso startTag.LessThanToken = currentToken AndAlso TypeOf startTag.Parent Is XmlElementSyntax AndAlso - Not TypeOf startTag.Parent.Parent Is XmlNodeSyntax Then + TypeOf startTag.Parent.Parent IsNot XmlNodeSyntax Then Return True End If Dim emptyTag = TryCast(currentToken.Parent, XmlEmptyElementSyntax) If emptyTag IsNot Nothing AndAlso emptyTag.LessThanToken = currentToken AndAlso - Not TypeOf emptyTag.Parent Is XmlNodeSyntax Then + TypeOf emptyTag.Parent IsNot XmlNodeSyntax Then Return True End If diff --git a/src/Workspaces/VisualBasic/Portable/Formatting/Rules/ElasticTriviaFormattingRule.vb b/src/Workspaces/VisualBasic/Portable/Formatting/Rules/ElasticTriviaFormattingRule.vb index eac504169c6df..c7fcde489bde7 100644 --- a/src/Workspaces/VisualBasic/Portable/Formatting/Rules/ElasticTriviaFormattingRule.vb +++ b/src/Workspaces/VisualBasic/Portable/Formatting/Rules/ElasticTriviaFormattingRule.vb @@ -201,7 +201,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting End If If AfterLastInheritsOrImplements(previousToken, currentToken) Then - If Not TypeOf currentToken.Parent Is EndBlockStatementSyntax Then + If TypeOf currentToken.Parent IsNot EndBlockStatementSyntax Then Return FormattingOperations.CreateAdjustNewLinesOperation(2, AdjustNewLinesOption.ForceLines) End If End If @@ -234,7 +234,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting End If ' current one is not import statement - If Not TypeOf token.Parent Is NameSyntax Then + If TypeOf token.Parent IsNot NameSyntax Then Return False End If diff --git a/src/Workspaces/VisualBasic/Portable/Formatting/Rules/NodeBasedFormattingRule.vb b/src/Workspaces/VisualBasic/Portable/Formatting/Rules/NodeBasedFormattingRule.vb index b429560d3d29e..d20f7fea78a44 100644 --- a/src/Workspaces/VisualBasic/Portable/Formatting/Rules/NodeBasedFormattingRule.vb +++ b/src/Workspaces/VisualBasic/Portable/Formatting/Rules/NodeBasedFormattingRule.vb @@ -226,7 +226,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting baseToken As SyntaxToken, startToken As SyntaxToken, endToken As SyntaxToken) - If Not TypeOf node.Parent Is XmlNodeSyntax Then + If TypeOf node.Parent IsNot XmlNodeSyntax Then SetAlignmentBlockOperation(operations, baseToken, startToken, endToken) End If @@ -241,12 +241,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting alignmentEndToken As SyntaxToken, indentationStartToken As SyntaxToken, indentationEndToken As SyntaxToken) - If Not TypeOf xmlNode.Parent Is XmlNodeSyntax Then + If TypeOf xmlNode.Parent IsNot XmlNodeSyntax Then SetAlignmentBlockOperation(operations, baseToken, alignmentStartToken, alignmentEndToken) End If ' if parent is not xml node - If Not TypeOf xmlNode.Parent Is XmlNodeSyntax Then + If TypeOf xmlNode.Parent IsNot XmlNodeSyntax Then AddIndentBlockOperation(operations, baseToken, indentationStartToken, indentationEndToken) Return End If diff --git a/src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationServiceRunner.vb b/src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationServiceRunner.vb index bcc0a31f389f2..842959d4c9c27 100644 --- a/src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationServiceRunner.vb +++ b/src/Workspaces/VisualBasic/Portable/Recommendations/VisualBasicRecommendationServiceRunner.vb @@ -368,7 +368,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Recommendations Return associatedSymbol.Kind <> SymbolKind.Event AndAlso associatedSymbol.Kind <> SymbolKind.Property End If ElseIf s.Kind = SymbolKind.NamedType AndAlso s.IsImplicitlyDeclared Then - Return Not TypeOf DirectCast(s, INamedTypeSymbol).AssociatedSymbol Is IEventSymbol + Return TypeOf DirectCast(s, INamedTypeSymbol).AssociatedSymbol IsNot IEventSymbol End If Return True diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicEscapingReducer.vb b/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicEscapingReducer.vb index 9646191cfa63f..4ec5796c97fd7 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicEscapingReducer.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicEscapingReducer.vb @@ -50,7 +50,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification ' Always escape keywords as identifier if they are not part of a qualified name or member access ' e.g. Class [Class] - If Not TypeOf (parent) Is ExpressionSyntax Then + If TypeOf (parent) IsNot ExpressionSyntax Then Return identifier Else ' always escape keywords on the left side of a dot diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicExtensionMethodReducer.vb b/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicExtensionMethodReducer.vb index 8bd16d2d385b1..24ee11bf608f1 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicExtensionMethodReducer.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicExtensionMethodReducer.vb @@ -37,7 +37,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification Dim memberAccess = DirectCast(invocationExpression.Expression, MemberAccessExpressionSyntax) Dim targetSymbol = semanticModel.GetSymbolInfo(memberAccess.Name, cancellationToken) - If (Not targetSymbol.Symbol Is Nothing) AndAlso targetSymbol.Symbol.Kind = SymbolKind.Method Then + If (targetSymbol.Symbol IsNot Nothing) AndAlso targetSymbol.Symbol.Kind = SymbolKind.Method Then Dim targetMethodSymbol = DirectCast(targetSymbol.Symbol, IMethodSymbol) If Not targetMethodSymbol.IsReducedExtension() Then Dim argumentList = invocationExpression.ArgumentList @@ -59,7 +59,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification candidateRewrittenNode, SpeculativeBindingOption.BindAsExpression).Symbol - If Not oldSymbol Is Nothing And Not newSymbol Is Nothing Then + If oldSymbol IsNot Nothing And newSymbol IsNot Nothing Then If newSymbol.Kind = SymbolKind.Method And oldSymbol.Equals(DirectCast(newSymbol, IMethodSymbol).GetConstructedReducedFrom()) Then rewrittenNode = candidateRewrittenNode End If diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicVariableDeclaratorReducer.vb b/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicVariableDeclaratorReducer.vb index 6e1271f8d602d..247431b559bac 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicVariableDeclaratorReducer.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/Reducers/VisualBasicVariableDeclaratorReducer.vb @@ -146,7 +146,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification Dim declaredSymbol = semanticModel.GetDeclaredSymbol(modifiedIdentifier) If declaredSymbol Is Nothing OrElse - (Not TypeOf declaredSymbol Is ILocalSymbol AndAlso Not TypeOf declaredSymbol Is IFieldSymbol) Then + (TypeOf declaredSymbol IsNot ILocalSymbol AndAlso TypeOf declaredSymbol IsNot IFieldSymbol) Then Return False End If diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/AbstractVisualBasicSimplifier.vb b/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/AbstractVisualBasicSimplifier.vb index 07a47d4bfdef6..20748ca737186 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/AbstractVisualBasicSimplifier.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/AbstractVisualBasicSimplifier.vb @@ -85,7 +85,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers Dim aliasTypeInfo = semanticModel.GetSpeculativeAliasInfo(node.SpanStart, aliasIdentifier, SpeculativeBindingOption.BindAsTypeOrNamespace) - If Not aliasTypeInfo Is Nothing Then + If aliasTypeInfo IsNot Nothing Then aliasReplacement = aliasTypeInfo Return ValidateAliasForTarget(aliasReplacement, semanticModel, node, symbol) End If @@ -103,7 +103,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers Return False End If - If symbol Is Nothing OrElse Not TypeOf (symbol) Is INamespaceOrTypeSymbol Then + If symbol Is Nothing OrElse TypeOf (symbol) IsNot INamespaceOrTypeSymbol Then Return False End If @@ -113,7 +113,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers Dim qualifiedName = DirectCast(node, QualifiedNameSyntax) If Not qualifiedName.Right.HasAnnotation(Simplifier.SpecialTypeAnnotation) Then Dim type = semanticModel.GetTypeInfo(node).Type - If Not type Is Nothing Then + If type IsNot Nothing Then Dim keywordKind = GetPredefinedKeywordKind(type.SpecialType) If keywordKind <> SyntaxKind.None Then preferAliasToQualifiedName = False diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/ExpressionSimplifier.vb b/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/ExpressionSimplifier.vb index a949101fa2470..5d59bc8eeecd9 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/ExpressionSimplifier.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/ExpressionSimplifier.vb @@ -198,7 +198,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers Dim qualifiedName = DirectCast(expression, QualifiedNameSyntax) Dim newLeft As ExpressionSyntax = Nothing If TrySimplifyMemberAccessOrQualifiedName(qualifiedName.Left, qualifiedName.Right, semanticModel, newLeft, issueSpan) Then - If Not TypeOf newLeft Is NameSyntax Then + If TypeOf newLeft IsNot NameSyntax Then Contract.Fail("QualifiedName Left = " + qualifiedName.Left.ToString() + " and QualifiedName Right = " + qualifiedName.Right.ToString() + " . Left is tried to be replaced with the PredefinedType " + replacementNode.ToString()) End If diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/NameSimplifier.vb b/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/NameSimplifier.vb index 6220d00a10197..ff296801f59ae 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/NameSimplifier.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/Simplifiers/NameSimplifier.vb @@ -51,7 +51,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers Return CanReplaceWithReducedName(name, replacementNode, semanticModel, cancellationToken) End If - If Not TypeOf symbol Is INamespaceOrTypeSymbol Then + If TypeOf symbol IsNot INamespaceOrTypeSymbol Then Return False End If Else @@ -313,7 +313,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification.Simplifiers Private Shared Function IsNonNameSyntaxInImportsDirective(expression As ExpressionSyntax, simplifiedNode As ExpressionSyntax) As Boolean Return TypeOf expression.Parent Is ImportsClauseSyntax AndAlso - Not TypeOf simplifiedNode Is NameSyntax + TypeOf simplifiedNode IsNot NameSyntax End Function Private Shared Function IsNullableTypeSyntaxLeftOfDotInMemberAccess(expression As ExpressionSyntax, simplifiedNode As ExpressionSyntax) As Boolean diff --git a/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb b/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb index 594def17346f4..ad535834eb03c 100644 --- a/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb +++ b/src/Workspaces/VisualBasic/Portable/Simplification/VisualBasicSimplificationService.Expander.vb @@ -208,7 +208,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification Dim memberAccess = DirectCast(node.Expression, MemberAccessExpressionSyntax) Dim targetSymbol = SimplificationHelpers.GetOriginalSymbolInfo(_semanticModel, memberAccess.Name) - If Not targetSymbol Is Nothing And targetSymbol.IsReducedExtension() AndAlso memberAccess.Expression IsNot Nothing Then + If targetSymbol IsNot Nothing And targetSymbol.IsReducedExtension() AndAlso memberAccess.Expression IsNot Nothing Then newInvocationExpression = RewriteExtensionMethodInvocation(node, newInvocationExpression, memberAccess.Expression, DirectCast(newInvocationExpression.Expression, MemberAccessExpressionSyntax).Expression, DirectCast(targetSymbol, IMethodSymbol)) End If End If @@ -235,7 +235,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification Dim binding = _semanticModel.GetSpeculativeSymbolInfo(originalNode.SpanStart, expression, SpeculativeBindingOption.BindAsExpression) - If (Not binding.Symbol Is Nothing) Then + If (binding.Symbol IsNot Nothing) Then Return expression End If @@ -613,7 +613,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Simplification ' do not complexify further for location where only simple names are allowed If (TypeOf (parent) Is FieldInitializerSyntax) OrElse - ((TypeOf (parent) Is DeclarationStatementSyntax) AndAlso Not TypeOf (parent) Is InheritsOrImplementsStatementSyntax) OrElse + ((TypeOf (parent) Is DeclarationStatementSyntax) AndAlso TypeOf (parent) IsNot InheritsOrImplementsStatementSyntax) OrElse (TypeOf (parent) Is MemberAccessExpressionSyntax AndAlso parent.Kind <> SyntaxKind.SimpleMemberAccessExpression) OrElse (parent.Kind = SyntaxKind.SimpleMemberAccessExpression AndAlso originalSimpleName.IsRightSideOfDot()) OrElse (parent.Kind = SyntaxKind.QualifiedName AndAlso originalSimpleName.IsRightSideOfQualifiedName()) Then