diff --git a/.editorconfig b/.editorconfig index b2c5d02ecaeae..36841783a663f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -225,7 +225,8 @@ dotnet_diagnostic.RS0037.severity = none # warning RS0005: Do not use generic CodeAction.Create to create CodeAction dotnet_diagnostic.RS0005.severity = none -[src/{Analyzers,CodeStyle,Features,Workspaces}/**/*.{cs,vb}] +[src/{Analyzers,CodeStyle,Features,Workspaces,EditorFeatures}/**/*.{cs,vb}] + # IDE0011: Add braces csharp_prefer_braces = when_multiline:warning # NOTE: We need the below severity entry for Add Braces due to https://github.com/dotnet/roslyn/issues/44201 @@ -266,4 +267,4 @@ dotnet_diagnostic.CA1822.severity = warning dotnet_diagnostic.IDE0007.severity = warning csharp_style_var_for_built_in_types = true:warning csharp_style_var_when_type_is_apparent = true:warning -csharp_style_var_elsewhere = true:warning +csharp_style_var_elsewhere = true:warning \ No newline at end of file diff --git a/NuGet.config b/NuGet.config index 4ebe4b090af05..f4f08d530c13f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,6 @@ - - diff --git a/eng/Versions.props b/eng/Versions.props index c72a9121b7a1f..24807bc01d808 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 3.7.0-3.20271.4 16.4.248 5.0.0-alpha1.19409.1 - 16.7.29 + 16.8.5 " - Return InsertEndTextAndUpdateCaretPosition(textView, subjectBuffer, state.CaretPosition, state.TokenToLeft.Span.End, endText, cancellationToken) + Return InsertEndTextAndUpdateCaretPosition(textView, state.CaretPosition, state.TokenToLeft.Span.End, endText, cancellationToken) End Using End Function @@ -407,7 +406,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.EndConstructGeneration Return False End If - Dim xmlStartElement = GetNodeFromToken(Of XmlElementStartTagSyntax)(state.SyntaxTree, state.TokenToLeft, expectedKind:=SyntaxKind.GreaterThanToken) + Dim xmlStartElement = GetNodeFromToken(Of XmlElementStartTagSyntax)(state.TokenToLeft, expectedKind:=SyntaxKind.GreaterThanToken) If xmlStartElement Is Nothing Then Return False End If @@ -423,7 +422,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.EndConstructGeneration End If Dim endTagText = "" - Return InsertEndTextAndUpdateCaretPosition(textView, subjectBuffer, state.CaretPosition, state.TokenToLeft.Span.End, endTagText, cancellationToken) + Return InsertEndTextAndUpdateCaretPosition(textView, state.CaretPosition, state.TokenToLeft.Span.End, endTagText, cancellationToken) End Using End Function @@ -434,7 +433,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.EndConstructGeneration Return False End If - Dim xmlEmbeddedExpression = GetNodeFromToken(Of XmlEmbeddedExpressionSyntax)(state.SyntaxTree, state.TokenToLeft, expectedKind:=SyntaxKind.LessThanPercentEqualsToken) + Dim xmlEmbeddedExpression = GetNodeFromToken(Of XmlEmbeddedExpressionSyntax)(state.TokenToLeft, expectedKind:=SyntaxKind.LessThanPercentEqualsToken) If xmlEmbeddedExpression Is Nothing Then Return False End If @@ -447,7 +446,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.EndConstructGeneration End If Dim endText = " %>" ' NOTE: two spaces are inserted. The caret will be moved between them - Return InsertEndTextAndUpdateCaretPosition(textView, subjectBuffer, state.CaretPosition, state.TokenToLeft.Span.End + 1, endText, cancellationToken) + Return InsertEndTextAndUpdateCaretPosition(textView, state.CaretPosition, state.TokenToLeft.Span.End + 1, endText, cancellationToken) End Using End Function @@ -458,7 +457,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.EndConstructGeneration Return False End If - Dim xmlProcessingInstruction = GetNodeFromToken(Of XmlProcessingInstructionSyntax)(state.SyntaxTree, state.TokenToLeft, expectedKind:=SyntaxKind.LessThanQuestionToken) + Dim xmlProcessingInstruction = GetNodeFromToken(Of XmlProcessingInstructionSyntax)(state.TokenToLeft, expectedKind:=SyntaxKind.LessThanQuestionToken) If xmlProcessingInstruction Is Nothing Then Return False End If @@ -475,7 +474,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.EndConstructGeneration End If Dim endText = "?>" - Return InsertEndTextAndUpdateCaretPosition(textView, subjectBuffer, state.CaretPosition, state.TokenToLeft.Span.End, endText, cancellationToken) + Return InsertEndTextAndUpdateCaretPosition(textView, state.CaretPosition, state.TokenToLeft.Span.End, endText, cancellationToken) End Using End Function diff --git a/src/EditorFeatures/VisualBasic/Highlighting/KeywordHighlighters/ForLoopBlockHighlighter.vb b/src/EditorFeatures/VisualBasic/Highlighting/KeywordHighlighters/ForLoopBlockHighlighter.vb index da73d000c6d07..749795317652e 100644 --- a/src/EditorFeatures/VisualBasic/Highlighting/KeywordHighlighters/ForLoopBlockHighlighter.vb +++ b/src/EditorFeatures/VisualBasic/Highlighting/KeywordHighlighters/ForLoopBlockHighlighter.vb @@ -53,7 +53,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.KeywordHighlighting End If End Sub - Private Function GetForBlockFromNode(node As SyntaxNode) As ForOrForEachBlockSyntax + Private Shared Function GetForBlockFromNode(node As SyntaxNode) As ForOrForEachBlockSyntax If node.IsIncorrectContinueStatement(SyntaxKind.ContinueForStatement) OrElse node.IsIncorrectExitStatement(SyntaxKind.ExitForStatement) Then Return Nothing @@ -79,7 +79,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.KeywordHighlighting ''' statement that is closing multiple loops, the Next statement is attached to the ''' innermost matching loop. ''' - Private Function GetNextStatementMatchingForBlock(forBlock As ForOrForEachBlockSyntax) As NextStatementSyntax + Private Shared Function GetNextStatementMatchingForBlock(forBlock As ForOrForEachBlockSyntax) As NextStatementSyntax Dim forBlockChild = forBlock While forBlockChild IsNot Nothing @@ -114,7 +114,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.KeywordHighlighting ''' innermost. Do not consider the actual names of the loop variables because highlighting ''' should work even if the wrong identifier names are listed. ''' - Private Function GetForBlocksMatchingNextStatement(nextStatement As NextStatementSyntax) As IEnumerable(Of ForOrForEachBlockSyntax) + Private Shared Function GetForBlocksMatchingNextStatement(nextStatement As NextStatementSyntax) As IEnumerable(Of ForOrForEachBlockSyntax) ' If there are 0 control variables, then one for block is closed by the Next statement Dim numExpectedForBlocksMatched = Math.Max(nextStatement.ControlVariables.Count(), 1) Return nextStatement.GetAncestors(Of ForOrForEachBlockSyntax).Take(numExpectedForBlocksMatched).Reverse() diff --git a/src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb b/src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb index 860f3734cc09c..a0c3ca9dea98c 100644 --- a/src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb +++ b/src/EditorFeatures/VisualBasic/LanguageServices/VisualBasicContentTypeLanguageService.vb @@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LanguageServices Friend Class VisualBasicContentTypeLanguageService Implements IContentTypeLanguageService - Private _contentTypeRegistry As IContentTypeRegistryService + Private ReadOnly _contentTypeRegistry As IContentTypeRegistryService diff --git a/src/EditorFeatures/VisualBasic/LineCommit/CommitBufferManager.vb b/src/EditorFeatures/VisualBasic/LineCommit/CommitBufferManager.vb index 91182221987c0..e6cdbf64e5006 100644 --- a/src/EditorFeatures/VisualBasic/LineCommit/CommitBufferManager.vb +++ b/src/EditorFeatures/VisualBasic/LineCommit/CommitBufferManager.vb @@ -171,7 +171,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit End If End Sub - Private Function TryComputeExpandedSpanToFormat(dirtySpan As SnapshotSpan, ByRef formattingInfo As FormattingInfo, cancellationToken As CancellationToken) As Boolean + Private Shared Function TryComputeExpandedSpanToFormat(dirtySpan As SnapshotSpan, ByRef formattingInfo As FormattingInfo, cancellationToken As CancellationToken) As Boolean Dim document = dirtySpan.Snapshot.GetOpenDocumentInCurrentContextWithChanges() If document Is Nothing Then Return False @@ -220,7 +220,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit Return True End Function - Public Function IsMovementBetweenStatements(oldPoint As SnapshotPoint, newPoint As SnapshotPoint, cancellationToken As CancellationToken) As Boolean + Public Shared Function IsMovementBetweenStatements(oldPoint As SnapshotPoint, newPoint As SnapshotPoint, cancellationToken As CancellationToken) As Boolean ' If they are the same line, then definitely no If oldPoint.GetContainingLine().LineNumber = newPoint.GetContainingLine().LineNumber Then Return False @@ -292,7 +292,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit End If End Sub - Private Async Function ForceComputeInternalsVisibleToAsync(document As Document, cancellationToken As CancellationToken) As Task + Private Shared Async Function ForceComputeInternalsVisibleToAsync(document As Document, cancellationToken As CancellationToken) As Task Dim project = document.Project Dim compilation = Await project.GetCompilationAsync(cancellationToken).ConfigureAwait(False) diff --git a/src/EditorFeatures/VisualBasic/LineCommit/CommitCommandHandler.vb b/src/EditorFeatures/VisualBasic/LineCommit/CommitCommandHandler.vb index 72fe3df062cb0..4b52bc55b7868 100644 --- a/src/EditorFeatures/VisualBasic/LineCommit/CommitCommandHandler.vb +++ b/src/EditorFeatures/VisualBasic/LineCommit/CommitCommandHandler.vb @@ -188,7 +188,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit Dim oldCaretPositionInCurrentSnapshot = oldCaretPositionInOldSnapshot.Value.CreateTrackingPoint(PointTrackingMode.Negative).GetPoint(subjectBuffer.CurrentSnapshot) Dim bufferManager = _bufferManagerFactory.CreateForBuffer(subjectBuffer) - If bufferManager.IsMovementBetweenStatements(oldCaretPositionInCurrentSnapshot, newCaretPosition.Value, cancellationToken) Then + If CommitBufferManager.IsMovementBetweenStatements(oldCaretPositionInCurrentSnapshot, newCaretPosition.Value, cancellationToken) Then Dim document = subjectBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges() If document Is Nothing Then Return False diff --git a/src/EditorFeatures/VisualBasic/LineCommit/CommitFormatter.vb b/src/EditorFeatures/VisualBasic/LineCommit/CommitFormatter.vb index a96e50a7e2991..5cbe1fcad4198 100644 --- a/src/EditorFeatures/VisualBasic/LineCommit/CommitFormatter.vb +++ b/src/EditorFeatures/VisualBasic/LineCommit/CommitFormatter.vb @@ -63,7 +63,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit End If Dim textSpanToFormat = spanToFormat.Span.ToTextSpan() - If AbortForDiagnostics(document, textSpanToFormat, cancellationToken) Then + If AbortForDiagnostics(document, cancellationToken) Then Return End If @@ -109,7 +109,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit End Using End Sub - Private Function AbortForDiagnostics(document As Document, textSpanToFormat As TextSpan, cancellationToken As CancellationToken) As Boolean + Private Shared Function AbortForDiagnostics(document As Document, cancellationToken As CancellationToken) As Boolean Const UnterminatedStringId = "BC30648" Dim tree = document.GetSyntaxTreeSynchronously(cancellationToken) @@ -123,7 +123,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit Return diagnostics.Any() End Function - Private Function GetCommitFormattingCleanupProvider( + Private Shared Function GetCommitFormattingCleanupProvider( document As Document, documentOptions As DocumentOptionSet, spanToFormat As SnapshotSpan, @@ -143,7 +143,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit Function(r, spans, w, c) Format(r, spans, w, documentOptions, rules, c)) End Function - Private Async Function FormatAsync(document As Document, spans As ImmutableArray(Of TextSpan), options As OptionSet, rules As IEnumerable(Of AbstractFormattingRule), cancellationToken As CancellationToken) As Task(Of Document) + Private Shared Async Function FormatAsync(document As Document, spans As ImmutableArray(Of TextSpan), options As OptionSet, rules As IEnumerable(Of AbstractFormattingRule), cancellationToken As CancellationToken) As Task(Of Document) ' if old text already exist, use fast path for formatting Dim oldText As SourceText = Nothing @@ -156,7 +156,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit Return Await Formatter.FormatAsync(document, spans, options, rules, cancellationToken).ConfigureAwait(False) End Function - Private Function Format(root As SyntaxNode, spans As ImmutableArray(Of TextSpan), workspace As Workspace, options As OptionSet, rules As IEnumerable(Of AbstractFormattingRule), cancellationToken As CancellationToken) As SyntaxNode + Private Shared Function Format(root As SyntaxNode, spans As ImmutableArray(Of TextSpan), workspace As Workspace, options As OptionSet, rules As IEnumerable(Of AbstractFormattingRule), cancellationToken As CancellationToken) As SyntaxNode ' if old text already exist, use fast path for formatting Dim oldText As SourceText = Nothing @@ -174,7 +174,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit Return Formatter.Format(root, spans, workspace, options, rules, cancellationToken) End Function - Private Function GetFormattingRules( + Private Shared Function GetFormattingRules( document As Document, documentOptions As DocumentOptionSet, spanToFormat As SnapshotSpan, @@ -236,7 +236,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit Return Formatter.GetDefaultFormattingRules(document) End Function - Private Function GetNumberOfIndentOperations(document As Document, + Private Shared Function GetNumberOfIndentOperations(document As Document, documentOptions As DocumentOptionSet, SyntaxTree As SyntaxTree, Span As SnapshotSpan, diff --git a/src/EditorFeatures/VisualBasic/LineCommit/CommitViewManager.vb b/src/EditorFeatures/VisualBasic/LineCommit/CommitViewManager.vb index 3bde8b7641c40..95b2d6884e4f5 100644 --- a/src/EditorFeatures/VisualBasic/LineCommit/CommitViewManager.vb +++ b/src/EditorFeatures/VisualBasic/LineCommit/CommitViewManager.vb @@ -66,7 +66,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit ' We're in the same snapshot. Are we on the same line? Dim commitBufferManager = _commitBufferManagerFactory.CreateForBuffer(newBuffer) - If commitBufferManager.IsMovementBetweenStatements(oldSnapshotPoint.Value, newSnapshotPoint.Value, waitContext.CancellationToken) Then + If CommitBufferManager.IsMovementBetweenStatements(oldSnapshotPoint.Value, newSnapshotPoint.Value, waitContext.CancellationToken) Then CommitBufferForCaretMovement(oldBuffer, e, waitContext.CancellationToken) End If End Sub) diff --git a/src/EditorFeatures/VisualBasic/LineCommit/ContainingStatementInfo.vb b/src/EditorFeatures/VisualBasic/LineCommit/ContainingStatementInfo.vb index ec2a5be83c0b2..7f22244e1e3f9 100644 --- a/src/EditorFeatures/VisualBasic/LineCommit/ContainingStatementInfo.vb +++ b/src/EditorFeatures/VisualBasic/LineCommit/ContainingStatementInfo.vb @@ -141,7 +141,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineCommit End If End Function - Private Function FindExpansionStatement(node As StatementSyntax) As StatementSyntax + Private Shared Function FindExpansionStatement(node As StatementSyntax) As StatementSyntax For Each ancestor In node.Ancestors() Dim matchingStatements = MatchingStatementsVisitor.Instance.Visit(ancestor) diff --git a/src/EditorFeatures/VisualBasic/LineSeparators/VisualBasicLineSeparatorService.vb b/src/EditorFeatures/VisualBasic/LineSeparators/VisualBasicLineSeparatorService.vb index 3a8ccbab175ce..04ab654c141d7 100644 --- a/src/EditorFeatures/VisualBasic/LineSeparators/VisualBasicLineSeparatorService.vb +++ b/src/EditorFeatures/VisualBasic/LineSeparators/VisualBasicLineSeparatorService.vb @@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineSeparators End Sub ''' Node types that are interesting for line separation. - Private Function IsSeparableBlock(nodeOrToken As SyntaxNodeOrToken) As Boolean + Private Shared Function IsSeparableBlock(nodeOrToken As SyntaxNodeOrToken) As Boolean If nodeOrToken.IsToken Then Return False End If @@ -64,26 +64,26 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineSeparators Dim typeBlock = TryCast(block, TypeBlockSyntax) If typeBlock IsNot Nothing Then - ProcessNodeList(syntaxTree, typeBlock.Members, spans, cancellationToken) + ProcessNodeList(typeBlock.Members, spans, cancellationToken) Continue For End If Dim enumBlock = TryCast(block, EnumBlockSyntax) If enumBlock IsNot Nothing Then - ProcessNodeList(syntaxTree, enumBlock.Members, spans, cancellationToken) + ProcessNodeList(enumBlock.Members, spans, cancellationToken) Continue For End If Dim nsBlock = TryCast(block, NamespaceBlockSyntax) If nsBlock IsNot Nothing Then - ProcessNodeList(syntaxTree, nsBlock.Members, spans, cancellationToken) + ProcessNodeList(nsBlock.Members, spans, cancellationToken) Continue For End If Dim progBlock = TryCast(block, CompilationUnitSyntax) If progBlock IsNot Nothing Then - ProcessImports(syntaxTree, progBlock.Imports, spans, cancellationToken) - ProcessNodeList(syntaxTree, progBlock.Members, spans, cancellationToken) + ProcessImports(progBlock.Imports, spans) + ProcessNodeList(progBlock.Members, spans, cancellationToken) End If Next @@ -95,7 +95,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineSeparators ''' If node is separable and not the first in its container => ensure separator before the node ''' last separable node in Program needs separator after it. ''' - Private Sub ProcessNodeList(Of T As SyntaxNode)(syntaxTree As SyntaxTree, children As SyntaxList(Of T), spans As List(Of TextSpan), token As CancellationToken) + Private Shared Sub ProcessNodeList(Of T As SyntaxNode)(children As SyntaxList(Of T), spans As List(Of TextSpan), token As CancellationToken) Contract.ThrowIfNull(spans) If children.Count = 0 Then @@ -112,9 +112,9 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineSeparators Else If Not seenSeparator Then Dim prev = children(i - 1) - spans.Add(GetLineSeparatorSpanForNode(syntaxTree, prev)) + spans.Add(GetLineSeparatorSpanForNode(prev)) End If - spans.Add(GetLineSeparatorSpanForNode(syntaxTree, cur)) + spans.Add(GetLineSeparatorSpanForNode(cur)) seenSeparator = True End If @@ -126,22 +126,22 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.LineSeparators If IsSeparableBlock(lastChild) Then If Not seenSeparator Then Dim nextToLast = children(children.Count - 2) - spans.Add(GetLineSeparatorSpanForNode(syntaxTree, nextToLast)) + spans.Add(GetLineSeparatorSpanForNode(nextToLast)) End If If lastChild.Parent.Kind = SyntaxKind.CompilationUnit Then - spans.Add(GetLineSeparatorSpanForNode(syntaxTree, lastChild)) + spans.Add(GetLineSeparatorSpanForNode(lastChild)) End If End If End Sub - Private Sub ProcessImports(syntaxTree As SyntaxTree, importsList As SyntaxList(Of ImportsStatementSyntax), spans As List(Of TextSpan), token As CancellationToken) + Private Shared Sub ProcessImports(importsList As SyntaxList(Of ImportsStatementSyntax), spans As List(Of TextSpan)) If importsList.Any() Then - spans.Add(GetLineSeparatorSpanForNode(syntaxTree, importsList.Last())) + spans.Add(GetLineSeparatorSpanForNode(importsList.Last())) End If End Sub - Private Function GetLineSeparatorSpanForNode(syntaxTree As SyntaxTree, node As SyntaxNode) As TextSpan + Private Shared Function GetLineSeparatorSpanForNode(node As SyntaxNode) As TextSpan Contract.ThrowIfNull(node) ' PERF: Reverse the list to only realize the last child diff --git a/src/EditorFeatures/VisualBasic/NavigationBar/VisualBasicNavigationBarItemService.vb b/src/EditorFeatures/VisualBasic/NavigationBar/VisualBasicNavigationBarItemService.vb index 59b95396cde43..bf925e51c348a 100644 --- a/src/EditorFeatures/VisualBasic/NavigationBar/VisualBasicNavigationBarItemService.vb +++ b/src/EditorFeatures/VisualBasic/NavigationBar/VisualBasicNavigationBarItemService.vb @@ -70,7 +70,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar Return TypeOf item IsNot AbstractGenerateCodeItem End Function - Private Function GetTypesAndDeclarationsInFile(semanticModel As SemanticModel, cancellationToken As CancellationToken) As IEnumerable(Of Tuple(Of INamedTypeSymbol, SyntaxNode)) + Private Shared Function GetTypesAndDeclarationsInFile(semanticModel As SemanticModel, cancellationToken As CancellationToken) As IEnumerable(Of Tuple(Of INamedTypeSymbol, SyntaxNode)) Try Dim typesAndDeclarations As New Dictionary(Of INamedTypeSymbol, SyntaxNode) Dim nodesToVisit As New Stack(Of SyntaxNode) @@ -131,8 +131,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar eventContainer:=Nothing, semanticModel:=semanticModel, workspaceSupportsDocumentChanges:=workspaceSupportsDocumentChanges, - symbolDeclarationService:=symbolDeclarationService, - cancellationToken:=cancellationToken) + symbolDeclarationService:=symbolDeclarationService) ' Add the ( Events) item only if it actually has things within it If typeEvents.ChildItems.Count > 0 Then @@ -151,8 +150,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar propertySymbol, semanticModel, workspaceSupportsDocumentChanges, - symbolDeclarationService, - cancellationToken)) + symbolDeclarationService)) End If Next End If @@ -161,7 +159,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar Return items End Function - Private Function CreateItemForEnum(type As INamedTypeSymbol, + Private Shared Function CreateItemForEnum(type As INamedTypeSymbol, typeSymbolIdIndex As Integer, tree As SyntaxTree, symbolDeclarationService As ISymbolDeclarationService, @@ -293,14 +291,13 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar ''' type of the eventContainer. ''' If this is an entry for a WithEvents member, the WithEvents ''' property itself. - Private Function CreateItemForEvents(containingType As INamedTypeSymbol, + Private Shared Function CreateItemForEvents(containingType As INamedTypeSymbol, position As Integer, eventType As ITypeSymbol, eventContainer As IPropertySymbol, semanticModel As SemanticModel, workspaceSupportsDocumentChanges As Boolean, - symbolDeclarationService As ISymbolDeclarationService, - cancellationToken As CancellationToken) As NavigationBarItem + symbolDeclarationService As ISymbolDeclarationService) As NavigationBarItem Dim rightHandMemberItems As New List(Of NavigationBarItem) @@ -330,7 +327,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar ' Generate an item for each event For Each e In accessibleEvents If eventToImplementingMethods.ContainsKey(e) Then - Dim methodSpans = GetSpansInDocument(eventToImplementingMethods(e), semanticModel.SyntaxTree, symbolDeclarationService, cancellationToken) + Dim methodSpans = GetSpansInDocument(eventToImplementingMethods(e), semanticModel.SyntaxTree, symbolDeclarationService) ' Dev11 arbitrarily will navigate to the last method that implements the event ' if more than one exists @@ -384,15 +381,15 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.NavigationBar End If End Function - Private Function GetSpansInDocument(symbol As ISymbol, tree As SyntaxTree, symbolDeclarationService As ISymbolDeclarationService, cancellationToken As CancellationToken) As IList(Of TextSpan) + Private Shared Function GetSpansInDocument(symbol As ISymbol, tree As SyntaxTree, symbolDeclarationService As ISymbolDeclarationService, cancellationToken As CancellationToken) As IList(Of TextSpan) If cancellationToken.IsCancellationRequested Then Return SpecializedCollections.EmptyList(Of TextSpan)() End If - Return GetSpansInDocument(SpecializedCollections.SingletonEnumerable(symbol), tree, symbolDeclarationService, cancellationToken) + Return GetSpansInDocument(SpecializedCollections.SingletonEnumerable(symbol), tree, symbolDeclarationService) End Function - Private Function GetSpansInDocument(list As IEnumerable(Of ISymbol), tree As SyntaxTree, symbolDeclarationService As ISymbolDeclarationService, cancellationToken As CancellationToken) As IList(Of TextSpan) + Private Shared Function GetSpansInDocument(list As IEnumerable(Of ISymbol), tree As SyntaxTree, symbolDeclarationService As ISymbolDeclarationService) As IList(Of TextSpan) Return list.SelectMany(AddressOf symbolDeclarationService.GetDeclarations) _ .Where(Function(r) r.SyntaxTree.Equals(tree)) _ .Select(Function(r) r.GetSyntax().FullSpan) _ diff --git a/src/EditorFeatures/VisualBasic/Utilities/CommandHandlers/AbstractImplementAbstractClassOrInterfaceCommandHandler.vb b/src/EditorFeatures/VisualBasic/Utilities/CommandHandlers/AbstractImplementAbstractClassOrInterfaceCommandHandler.vb index af1dc4e041c7f..71e34b2250c22 100644 --- a/src/EditorFeatures/VisualBasic/Utilities/CommandHandlers/AbstractImplementAbstractClassOrInterfaceCommandHandler.vb +++ b/src/EditorFeatures/VisualBasic/Utilities/CommandHandlers/AbstractImplementAbstractClassOrInterfaceCommandHandler.vb @@ -76,7 +76,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities.CommandHandlers Return True End Function - Private Function TryGenerateEndConstruct(args As ReturnKeyCommandArgs, cancellationToken As CancellationToken) As Boolean + Private Shared Function TryGenerateEndConstruct(args As ReturnKeyCommandArgs, cancellationToken As CancellationToken) As Boolean Dim textSnapshot = args.SubjectBuffer.CurrentSnapshot Dim document = textSnapshot.GetOpenDocumentInCurrentContextWithChanges() @@ -96,7 +96,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities.CommandHandlers Dim endConstructGenerationService = document.GetLanguageService(Of IEndConstructGenerationService)() - Dim applicable As Boolean = False Return endConstructGenerationService.TryDo(args.TextView, args.SubjectBuffer, vbLf(0), cancellationToken) End Function diff --git a/src/EditorFeatures/VisualBasic/Utilities/LineAdjustmentFormattingRule.vb b/src/EditorFeatures/VisualBasic/Utilities/LineAdjustmentFormattingRule.vb index 56e01e808a95d..b133dd7359b02 100644 --- a/src/EditorFeatures/VisualBasic/Utilities/LineAdjustmentFormattingRule.vb +++ b/src/EditorFeatures/VisualBasic/Utilities/LineAdjustmentFormattingRule.vb @@ -21,7 +21,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities Return nextOperation.Invoke(previousToken, currentToken) End If - Dim previous = CType(previousToken, SyntaxToken) Dim current = CType(currentToken, SyntaxToken) ' case: insert blank line in empty method body. diff --git a/src/EditorFeatures/VisualBasic/Utilities/NavigationPointHelpers.vb b/src/EditorFeatures/VisualBasic/Utilities/NavigationPointHelpers.vb index f939334a730f1..e2c27ec32c1ac 100644 --- a/src/EditorFeatures/VisualBasic/Utilities/NavigationPointHelpers.vb +++ b/src/EditorFeatures/VisualBasic/Utilities/NavigationPointHelpers.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities line = text.Lines.GetLineFromPosition(eventBlock.EventStatement.Span.End).LineNumber + 1 End If - Return GetNavigationPoint(text, indentSize, eventBlock.EventStatement, eventBlock.EndEventStatement, line) + Return GetNavigationPoint(text, indentSize, eventBlock.EventStatement, line) End Function Public Function GetNavigationPoint(text As SourceText, indentSize As Integer, methodBlock As MethodBlockBaseSyntax) As VirtualTreePoint @@ -28,7 +28,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities line = text.Lines.GetLineFromPosition(methodBlock.BlockStatement.Span.End).LineNumber + 1 End If - Return GetNavigationPoint(text, indentSize, methodBlock.BlockStatement, methodBlock.EndBlockStatement, line) + Return GetNavigationPoint(text, indentSize, methodBlock.BlockStatement, line) End Function Public Function GetHeaderStartPosition(eventBlock As EventBlockSyntax) As Integer @@ -48,7 +48,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities End Function ' TODO: this function conflates tab size and indent size. - Public Function GetNavigationPoint(text As SourceText, indentSize As Integer, beginStatement As StatementSyntax, endStatement As StatementSyntax, lineNumber As Integer) As VirtualTreePoint + Public Function GetNavigationPoint(text As SourceText, indentSize As Integer, beginStatement As StatementSyntax, lineNumber As Integer) As VirtualTreePoint Dim line = text.Lines(lineNumber) Dim nonWhitespaceOffset = line.GetFirstNonWhitespacePosition() diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb index b5e016eca5df9..134077a549d37 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBraceCompletionTests.vb @@ -92,12 +92,12 @@ End Class End Using End Sub - Friend Overloads Function CreateSession(code As XElement) As Holder + Friend Overloads Shared Function CreateSession(code As XElement) As Holder Return CreateSessionASync(code.NormalizedValue()) End Function - Friend Overloads Function CreateSessionASync(code As String) As Holder - Return CreateSession( + Friend Overloads Shared Function CreateSessionASync(code As String) As Holder + Return AbstractAutomaticBraceCompletionTests.CreateSession( TestWorkspace.CreateVisualBasic(code), BraceCompletionSessionProvider.CurlyBrace.OpenCharacter, BraceCompletionSessionProvider.CurlyBrace.CloseCharacter) End Function diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb index e065ba05f73ff..2d75bf87d3771 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticBracketCompletionTests.vb @@ -100,12 +100,12 @@ End Class End Using End Sub - Friend Overloads Function CreateSession(code As XElement) As Holder + Friend Overloads Shared Function CreateSession(code As XElement) As Holder Return CreateSession(code.NormalizedValue()) End Function - Friend Overloads Function CreateSession(code As String) As Holder - Return CreateSession( + Friend Overloads Shared Function CreateSession(code As String) As Holder + Return AbstractAutomaticBraceCompletionTests.CreateSession( TestWorkspace.CreateVisualBasic(code), BraceCompletionSessionProvider.Bracket.OpenCharacter, BraceCompletionSessionProvider.Bracket.CloseCharacter) End Function diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb index 2255dde702500..5bb1402e980cb 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolatedStringExpressionCompletionTests.vb @@ -66,12 +66,12 @@ End Class End Using End Sub - Friend Overloads Function CreateSession(code As XElement) As Holder + Friend Overloads Shared Function CreateSession(code As XElement) As Holder Return CreateSession(code.NormalizedValue()) End Function - Friend Overloads Function CreateSession(code As String) As Holder - Return CreateSession( + Friend Overloads Shared Function CreateSession(code As String) As Holder + Return AbstractAutomaticBraceCompletionTests.CreateSession( TestWorkspace.CreateVisualBasic(code), BraceCompletionSessionProvider.DoubleQuote.OpenCharacter, BraceCompletionSessionProvider.DoubleQuote.CloseCharacter) End Function diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb index ee4d259fad202..65bdaaa4e81a9 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticInterpolationCompletionTests.vb @@ -94,12 +94,12 @@ End Class End Using End Sub - Friend Overloads Function CreateSession(code As XElement) As Holder + Friend Overloads Shared Function CreateSession(code As XElement) As Holder Return CreateSession(code.NormalizedValue()) End Function - Friend Overloads Function CreateSession(code As String) As Holder - Return CreateSession( + Friend Overloads Shared Function CreateSession(code As String) As Holder + Return AbstractAutomaticBraceCompletionTests.CreateSession( TestWorkspace.CreateVisualBasic(code), BraceCompletionSessionProvider.CurlyBrace.OpenCharacter, BraceCompletionSessionProvider.CurlyBrace.CloseCharacter) End Function diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb index 88be50634279b..b8d26f59da24c 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticLessAndGreaterThanCompletionTests.vb @@ -107,12 +107,12 @@ End Class End Using End Sub - Friend Overloads Function CreateSession(code As XElement) As Holder + Friend Overloads Shared Function CreateSession(code As XElement) As Holder Return CreateSession(code.NormalizedValue()) End Function - Friend Overloads Function CreateSession(code As String) As Holder - Return CreateSession( + Friend Overloads Shared Function CreateSession(code As String) As Holder + Return AbstractAutomaticBraceCompletionTests.CreateSession( TestWorkspace.CreateVisualBasic(code), BraceCompletionSessionProvider.LessAndGreaterThan.OpenCharacter, BraceCompletionSessionProvider.LessAndGreaterThan.CloseCharacter) End Function diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb index 51c818fe93ab2..0a1513f371874 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticParenthesesCompletion.vb @@ -351,11 +351,11 @@ End Class End Using End Sub - Friend Overloads Function CreateSession(code As XElement) As Holder + Friend Overloads Shared Function CreateSession(code As XElement) As Holder Return CreateSession(code.NormalizedValue()) End Function - Friend Overloads Function CreateSession(code As String) As Holder + Friend Overloads Shared Function CreateSession(code As String) As Holder Return CreateSession( TestWorkspace.CreateVisualBasic(code), BraceCompletionSessionProvider.Parenthesis.OpenCharacter, BraceCompletionSessionProvider.Parenthesis.CloseCharacter) diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb index 7ed0b11603990..2b4a9d4e46017 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticCompletion/AutomaticStringLiteralCompletionTests.vb @@ -158,12 +158,12 @@ End Class End Using End Sub - Friend Overloads Function CreateSession(code As XElement) As Holder + Friend Overloads Shared Function CreateSession(code As XElement) As Holder Return CreateSession(code.NormalizedValue()) End Function - Friend Overloads Function CreateSession(code As String) As Holder - Return CreateSession( + Friend Overloads Shared Function CreateSession(code As String) As Holder + Return AbstractAutomaticBraceCompletionTests.CreateSession( TestWorkspace.CreateVisualBasic(code), BraceCompletionSessionProvider.DoubleQuote.OpenCharacter, BraceCompletionSessionProvider.DoubleQuote.CloseCharacter) End Function diff --git a/src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb b/src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb index 4eae650009d0c..884a0d78f7ad6 100644 --- a/src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb +++ b/src/EditorFeatures/VisualBasicTest/AutomaticEndConstructCorrection/AutomaticEndConstructCorrectorTests.vb @@ -341,7 +341,7 @@ End Class.Value Verify(code, "Get") End Sub - Private Sub VerifyContinuousEdits(codeWithMarker As String, + Private Shared Sub VerifyContinuousEdits(codeWithMarker As String, type As String, expectedStringGetter As Func(Of String, String), removeOriginalContent As Boolean, @@ -391,7 +391,7 @@ End Class.Value End Using End Sub - Private Sub Verify(codeWithMarker As String, keyword As String) + Private Shared Sub Verify(codeWithMarker As String, keyword As String) ' do this since xml value put only vbLf codeWithMarker = codeWithMarker.Replace(vbLf, vbCrLf) @@ -399,7 +399,7 @@ End Class.Value VerifyEnd(codeWithMarker, keyword) End Sub - Private Sub VerifyBegin(code As String, keyword As String, Optional expected As String = Nothing) + Private Shared Sub VerifyBegin(code As String, keyword As String, Optional expected As String = Nothing) Using workspace = TestWorkspace.CreateVisualBasic(code) Dim document = workspace.Documents.Single() @@ -408,11 +408,11 @@ End Class.Value Dim spanToReplace = selectedSpans.First() Dim spanToVerify = selectedSpans.Skip(1).Single() - Verify(workspace, document, keyword, expected, spanToReplace, spanToVerify) + Verify(document, keyword, expected, spanToReplace, spanToVerify) End Using End Sub - Private Sub VerifyEnd(code As String, keyword As String, Optional expected As String = Nothing) + Private Shared Sub VerifyEnd(code As String, keyword As String, Optional expected As String = Nothing) Using workspace = TestWorkspace.CreateVisualBasic(code) Dim document = workspace.Documents.Single() @@ -421,11 +421,11 @@ End Class.Value Dim spanToReplace = selectedSpans.Skip(1).Single() Dim spanToVerify = selectedSpans.First() - Verify(workspace, document, keyword, expected, spanToReplace, spanToVerify) + Verify(document, keyword, expected, spanToReplace, spanToVerify) End Using End Sub - Private Sub Verify(workspace As TestWorkspace, document As TestHostDocument, keyword As String, expected As String, spanToReplace As TextSpan, spanToVerify As TextSpan) + Private Shared Sub Verify(document As TestHostDocument, keyword As String, expected As String, spanToReplace As TextSpan, spanToVerify As TextSpan) Dim buffer = document.GetTextBuffer() Dim corrector = New AutomaticEndConstructCorrector(buffer, New TestWaitIndicator()) diff --git a/src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb b/src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb index 03dd358302235..53eceeb6438fc 100644 --- a/src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb +++ b/src/EditorFeatures/VisualBasicTest/BraceMatching/BraceHighlightingTests.vb @@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.BraceMatching <[UseExportProvider]> Public Class BraceHighlightingTests - Private Function Enumerable(Of t)(ParamArray array() As t) As IEnumerable(Of t) + Private Shared Function Enumerable(Of t)(ParamArray array() As t) As IEnumerable(Of t) Return array End Function diff --git a/src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb b/src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb index 815e4571cb4fe..3435ad3a48814 100644 --- a/src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb +++ b/src/EditorFeatures/VisualBasicTest/CaseCorrecting/CaseCorrectionServiceTests.vb @@ -14,7 +14,7 @@ Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CaseCorrecting <[UseExportProvider]> Public Class CaseCorrectionServiceTests - Private Async Function TestAsync(input As XElement, expected As XElement, Optional interProject As Boolean = False) As Tasks.Task + Private Shared Async Function TestAsync(input As XElement, expected As XElement, Optional interProject As Boolean = False) As Tasks.Task If (interProject) Then Await TestAsync(input, expected.NormalizedValue) Else @@ -22,7 +22,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CaseCorrecting End If End Function - Private Async Function TestAsync(input As String, expected As String) As Tasks.Task + Private Shared Async Function TestAsync(input As String, expected As String) As Tasks.Task Using workspace = TestWorkspace.CreateVisualBasic(input) Await TestAsync(expected, workspace) End Using @@ -46,7 +46,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CaseCorrecting Assert.Equal(expected, actual) End Function - Private Async Function TestAsync(input As XElement, expected As String) As Tasks.Task + Private Shared Async Function TestAsync(input As XElement, expected As String) As Tasks.Task Using workspace = TestWorkspace.Create(input) Await TestAsync(expected, workspace) End Using diff --git a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb index 3063d4f3166ab..b4154a7d76e86 100644 --- a/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb +++ b/src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb @@ -376,7 +376,7 @@ End Class]]>.NormalizedValue() Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode) End Function - Public Async Function TestAddParameter_Cascade_ToOverridingMethod_IncludeParamTags() As Task + Public Shared Async Function TestAddParameter_Cascade_ToOverridingMethod_IncludeParamTags() As Task Dim markup = .NormalizedValue() Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode) End Function - Public Async Function TestReorderParameters_Cascade_ToOverridingMethod_IncludeParamTags() As Task + Public Shared Async Function TestReorderParameters_Cascade_ToOverridingMethod_IncludeParamTags() As Task Dim markup = TestHost.InProcess} + {RemoteTestHostOptions.RemoteHostTest, host <> TestHost.InProcess} } End Function @@ -354,7 +349,7 @@ End Class.ConvertTestSourceTag() text, expected, options:=New OptionsCollection(GetLanguage()) From { {CodeStyleOptions2.QualifyFieldAccess, True, NotificationOption2.Error}, - {RemoteHostOptions.RemoteHostTest, host <> TestHost.InProcess} + {RemoteTestHostOptions.RemoteHostTest, host <> TestHost.InProcess} }) End Function @@ -650,7 +645,7 @@ End Class ", options:=New OptionsCollection(GetLanguage()) From { {CodeStyleOptions2.QualifyFieldAccess, True, NotificationOption2.Error}, - {RemoteHostOptions.RemoteHostTest, host <> TestHost.InProcess} + {RemoteTestHostOptions.RemoteHostTest, host <> TestHost.InProcess} }) End Function End Class diff --git a/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicToggleLineCommentTests.vb b/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicToggleLineCommentTests.vb index 4820ad681e33a..57f47416ad582 100644 --- a/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicToggleLineCommentTests.vb +++ b/src/EditorFeatures/VisualBasicTest/CommentSelection/VisualBasicToggleLineCommentTests.vb @@ -107,7 +107,7 @@ End Class ToggleCommentMultiple(markup, expected) End Sub - Private Function ReplaceLineEndings(markup As String) As String + Private Shared Function ReplaceLineEndings(markup As String) As String ' do this since xml value put only vbLf Return markup.Replace(vbLf, vbCrLf) End Function diff --git a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractContextTests.vb b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractContextTests.vb index 7b47fef37bb3d..ba5b83a082713 100644 --- a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractContextTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractContextTests.vb @@ -29,10 +29,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet Return CheckResultAsync(validLocation, position, tree) End Function - Private Function VerifyAsPositionAsync(text As String, position As Integer, validLocation As Boolean) As Task - Return VerifyAtPositionAsync(text, position, validLocation, "") - End Function - Private Function VerifyAtPosition_TypePartiallyWrittenAsync(text As String, position As Integer, validLocation As Boolean) As Threading.Tasks.Task Return VerifyAtPositionAsync(text, position, validLocation, "Str") End Function @@ -51,10 +47,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet Await CheckResultAsync(validLocation, position, tree) End Function - Private Function VerifyAtEndOfFileAsync(text As String, position As Integer, validLocation As Boolean) As Task - Return VerifyAtEndOfFileAsync(text, position, validLocation, "") - End Function - Private Function VerifyAtEndOfFile_TypePartiallyWrittenAsync(text As String, position As Integer, validLocation As Boolean) As Task Return VerifyAtEndOfFileAsync(text, position, validLocation, "Str") End Function @@ -67,7 +59,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet Return VerifyWorkerAsync(text, validLocation:=False) End Function - Protected Function AddInsideMethod(text As String) As String + Protected Shared Function AddInsideMethod(text As String) As String Return "Class C" & vbCrLf & " Function F()" & vbCrLf & " " & text & vbCrLf & @@ -75,7 +67,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet "End Class" End Function - Protected Function CreateContent(ParamArray contents As String()) As String + Protected Shared Function CreateContent(ParamArray contents As String()) As String Return String.Join(vbCrLf, contents) End Function End Class diff --git a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractVisualBasicCompletionProviderTests.vb b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractVisualBasicCompletionProviderTests.vb index 24093bed16258..30156333e15f3 100644 --- a/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractVisualBasicCompletionProviderTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Completion/CompletionProviders/AbstractVisualBasicCompletionProviderTests.vb @@ -96,7 +96,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet Return expectedItemOrNull.Substring(0, 1) End Function - Protected Function AddInsideMethod(text As String) As String + Protected Shared Function AddInsideMethod(text As String) As String Return "Class C" & vbCrLf & " Function F()" & vbCrLf & " " & text & vbCrLf & @@ -104,11 +104,11 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Completion.Complet "End Class" End Function - Protected Function CreateContent(ParamArray contents As String()) As String + Protected Shared Function CreateContent(ParamArray contents As String()) As String Return String.Join(vbCrLf, contents) End Function - Protected Function AddImportsStatement(importsStatement As String, text As String) As String + Protected Shared Function AddImportsStatement(importsStatement As String, text As String) As String Return importsStatement & vbCrLf & vbCrLf & text End Function diff --git a/src/EditorFeatures/VisualBasicTest/ConvertTupleToStruct/ConvertTupleToStructTests.vb b/src/EditorFeatures/VisualBasicTest/ConvertTupleToStruct/ConvertTupleToStructTests.vb index f02af922ff145..93082fbd6c1e9 100644 --- a/src/EditorFeatures/VisualBasicTest/ConvertTupleToStruct/ConvertTupleToStructTests.vb +++ b/src/EditorFeatures/VisualBasicTest/ConvertTupleToStruct/ConvertTupleToStructTests.vb @@ -7,15 +7,10 @@ Imports Microsoft.CodeAnalysis.CodeActions Imports Microsoft.CodeAnalysis.CodeRefactorings Imports Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings -Imports Microsoft.CodeAnalysis.Test.Utilities.RemoteHost +Imports Microsoft.CodeAnalysis.Remote.Testing Imports Microsoft.CodeAnalysis.VisualBasic.ConvertTupleToStruct Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ConvertTupleToStruct - Public Enum TestHost - InProcess - OutOfProcess - End Enum - Public Class ConvertTupleToStructTests Inherits AbstractVisualBasicCodeActionTest @@ -28,7 +23,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ConvertTupleToStru End Function Private Function GetTestOptions(host As TestHost) As OptionsCollection - Return [Option](RemoteHostOptions.RemoteHostTest, host <> TestHost.InProcess) + Return [Option](RemoteTestHostOptions.RemoteHostTest, host <> TestHost.InProcess) End Function #Region "update containing member tests" diff --git a/src/EditorFeatures/VisualBasicTest/Debugging/DataTipInfoGetterTests.vb b/src/EditorFeatures/VisualBasicTest/Debugging/DataTipInfoGetterTests.vb index 95b1f79d0b061..39ac09a6e07b2 100644 --- a/src/EditorFeatures/VisualBasicTest/Debugging/DataTipInfoGetterTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Debugging/DataTipInfoGetterTests.vb @@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging <[UseExportProvider]> Public Class DataTipInfoGetterTests - Private Async Function TestNoDataTipAsync(input As XElement) As Task + Private Shared Async Function TestNoDataTipAsync(input As XElement) As Task Dim parsedInput As String = Nothing Dim expectedPosition As Integer MarkupTestFile.GetPosition(input.NormalizedValue, parsedInput, expectedPosition) @@ -30,7 +30,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging End Function) End Function - Private Async Function TestAsync(input As XElement, Optional expectedText As String = Nothing) As Task + Private Shared Async Function TestAsync(input As XElement, Optional expectedText As String = Nothing) As Task Dim parsedInput As String = Nothing Dim expectedPosition As Integer Dim textSpan As TextSpan @@ -47,7 +47,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging End Function) End Function - Private Async Function TestSpanGetterAsync(parsedInput As String, position As Integer, continuation As Func(Of Document, Integer, Task)) As Task + Private Shared Async Function TestSpanGetterAsync(parsedInput As String, position As Integer, continuation As Func(Of Document, Integer, Task)) As Task Using workspace = TestWorkspace.CreateVisualBasic(parsedInput) Dim debugInfo = New VisualBasicLanguageDebugInfoService() Await continuation(workspace.CurrentSolution.Projects.First.Documents.First, position) diff --git a/src/EditorFeatures/VisualBasicTest/Debugging/LocationInfoGetterTests.vb b/src/EditorFeatures/VisualBasicTest/Debugging/LocationInfoGetterTests.vb index 85bdb09f6bda0..615488e6fbd64 100644 --- a/src/EditorFeatures/VisualBasicTest/Debugging/LocationInfoGetterTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Debugging/LocationInfoGetterTests.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging <[UseExportProvider]> Public Class LocationInfoGetterTests - Private Async Function TestAsync(text As String, expectedName As String, expectedLineOffset As Integer, Optional parseOptions As VisualBasicParseOptions = Nothing, Optional rootNamespace As String = Nothing) As Tasks.Task + Private Shared Async Function TestAsync(text As String, expectedName As String, expectedLineOffset As Integer, Optional parseOptions As VisualBasicParseOptions = Nothing, Optional rootNamespace As String = Nothing) As Tasks.Task Dim position As Integer MarkupTestFile.GetPosition(text, text, position) Dim compilationOptions = If(rootNamespace IsNot Nothing, New VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary, rootNamespace:=rootNamespace), Nothing) diff --git a/src/EditorFeatures/VisualBasicTest/Debugging/NameResolverTests.vb b/src/EditorFeatures/VisualBasicTest/Debugging/NameResolverTests.vb index c5ff71a21f8ff..16046c7d18854 100644 --- a/src/EditorFeatures/VisualBasicTest/Debugging/NameResolverTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Debugging/NameResolverTests.vb @@ -15,11 +15,11 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging <[UseExportProvider]> Public Class NameResolverTests - Private Function TestAsync(text As String, searchText As String, ParamArray expectedNames() As String) As Tasks.Task + Private Shared Function TestAsync(text As String, searchText As String, ParamArray expectedNames() As String) As Tasks.Task Return TestWithRootNamespaceAsync(Nothing, text, searchText, expectedNames) End Function - Private Async Function TestWithRootNamespaceAsync(rootNamespace As String, text As String, searchText As String, ParamArray expectedNames() As String) As Tasks.Task + Private Shared Async Function TestWithRootNamespaceAsync(rootNamespace As String, text As String, searchText As String, ParamArray expectedNames() As String) As Tasks.Task Dim compilationOptions = If(rootNamespace Is Nothing, Nothing, New VisualBasicCompilationOptions(OutputKind.DynamicallyLinkedLibrary, rootNamespace:=rootNamespace)) Using workspace = TestWorkspace.Create(LanguageNames.VisualBasic, compilationOptions, Nothing, text) diff --git a/src/EditorFeatures/VisualBasicTest/Debugging/ProximityExpressionsGetterTests.vb b/src/EditorFeatures/VisualBasicTest/Debugging/ProximityExpressionsGetterTests.vb index 8ab4e217ae51a..24abfe4ab1881 100644 --- a/src/EditorFeatures/VisualBasicTest/Debugging/ProximityExpressionsGetterTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Debugging/ProximityExpressionsGetterTests.vb @@ -36,7 +36,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging Return s_lazyTestFileContent End Function - Public Function GetTree() As SyntaxTree + Public Shared Function GetTree() As SyntaxTree Return SyntaxFactory.ParseSyntaxTree(GetTestFileContent()) End Function @@ -45,7 +45,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging ''' ProximityExpressionsGetterTests.Expressions.vb) The test file comes from the TestFiles ''' folder in this project. ''' - Public Async Function GenerateBaselineAsync() As Task + Public Shared Async Function GenerateBaselineAsync() As Task Using workspace = TestWorkspace.CreateVisualBasic(GetTestFileContent()) Dim languageDebugInfo = New VisualBasicLanguageDebugInfoService() @@ -143,7 +143,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging End Function - Private Async Function TestProximityExpressionsGetterAsync(markup As String, + Private Shared Async Function TestProximityExpressionsGetterAsync(markup As String, continuation As Func(Of VisualBasicProximityExpressionsService, Document, Integer, Task)) As Task Using workspace = TestWorkspace.CreateVisualBasic(markup) Dim testDocument = workspace.Documents.Single() @@ -156,7 +156,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging End Using End Function - Public Async Function TestTryDoAsync(input As String, + Public Shared Async Function TestTryDoAsync(input As String, ParamArray expectedTerms As String()) As Task Await TestProximityExpressionsGetterAsync(input, Async Function(getter, semanticSnapshot, point) @@ -170,7 +170,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Debugging End Function) End Function - Public Async Function TestIsValidAsync(input As String, expression As String, expectedValid As Boolean) As Task + Public Shared Async Function TestIsValidAsync(input As String, expression As String, expectedValid As Boolean) As Task Await TestProximityExpressionsGetterAsync(input, Async Function(getter, semanticSnapshot, point) Dim actualValid = Await getter.IsValidAsync(semanticSnapshot, point, expression, CancellationToken.None) @@ -221,7 +221,7 @@ End Module.Value, "local", True) Await TestIsValidAsync("class Class { void Method() { $$ int i; string local; } }", "local", False) End Function - Private Async Function TestLanguageDebugInfoTryGetProximityExpressionsAsync(input As String, expectedResults As IEnumerable(Of String), expectedResult As Boolean) As Task + Private Shared Async Function TestLanguageDebugInfoTryGetProximityExpressionsAsync(input As String) As Task Dim parsedInput As String = input Dim caretPosition As Integer MarkupTestFile.GetPosition(input, parsedInput, caretPosition) @@ -240,7 +240,7 @@ End Module.Value, "local", True) Public Async Function TestDebugInfo1() As Task - Await TestLanguageDebugInfoTryGetProximityExpressionsAsync("$$Module M : End Module", Array.Empty(Of String)(), False) + Await TestLanguageDebugInfoTryGetProximityExpressionsAsync("$$Module M : End Module") End Function diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests.vb index 487a629e2edc6..334633f8e844c 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests.vb @@ -7,8 +7,7 @@ Imports Microsoft.CodeAnalysis.CodeFixes Imports Microsoft.CodeAnalysis.Diagnostics Imports Microsoft.CodeAnalysis.Editing Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics -Imports Microsoft.CodeAnalysis.Remote -Imports Microsoft.CodeAnalysis.Test.Utilities.RemoteHost +Imports Microsoft.CodeAnalysis.Remote.Testing Imports Microsoft.CodeAnalysis.VisualBasic.AddImport Imports Microsoft.CodeAnalysis.VisualBasic.Diagnostics @@ -21,8 +20,8 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeActions.AddImp Optional index As Integer = 0, Optional priority As CodeActionPriority? = Nothing, Optional placeSystemFirst As Boolean = True) As Task - Await TestAsync(initialMarkup, expectedMarkup, index, priority, placeSystemFirst, outOfProcess:=False) - Await TestAsync(initialMarkup, expectedMarkup, index, priority, placeSystemFirst, outOfProcess:=True) + Await TestAsync(initialMarkup, expectedMarkup, index, priority, placeSystemFirst, TestHost.InProcess) + Await TestAsync(initialMarkup, expectedMarkup, index, priority, placeSystemFirst, TestHost.OutOfProcess) End Function Friend Overloads Async Function TestAsync(initialMarkup As String, @@ -30,12 +29,12 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeActions.AddImp index As Integer, priority As CodeActionPriority?, placeSystemFirst As Boolean, - outOfProcess As Boolean) As Task + testHost As TestHost) As Task Await TestInRegularAndScript1Async( initialMarkup, expectedMarkup, index, parameters:=New TestParameters( options:=[Option](GenerationOptions.PlaceSystemNamespaceFirst, placeSystemFirst), - runProviderOutOfProc:=outOfProcess, + testHost:=testHost, priority:=priority)) End Function End Class @@ -49,7 +48,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeActions.AddImp Friend Overrides Function CreateDiagnosticProviderAndFixer(workspace As Workspace, parameters As TestParameters) As (DiagnosticAnalyzer, CodeFixProvider) workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(workspace.Options _ - .WithChangedOption(RemoteHostOptions.RemoteHostTest, parameters.runProviderOutOfProc))) + .WithChangedOption(RemoteTestHostOptions.RemoteHostTest, parameters.testHost = TestHost.OutOfProcess))) Return MyBase.CreateDiagnosticProviderAndFixer(workspace, parameters) End Function diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests_NuGet.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests_NuGet.vb index 50caf5f3d78d1..dbdccb6cb4c14 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests_NuGet.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/AddImport/AddImportTests_NuGet.vb @@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeActions.AddImp Public Class AddImportNuGetTests Inherits AbstractAddImportTests - Const NugetOrgSource = "nuget.org" + Private Const NugetOrgSource = "nuget.org" Private Shared ReadOnly NugetPackageSources As ValueTask(Of ImmutableArray(Of PackageSource)?) = New ValueTask(Of ImmutableArray(Of PackageSource)?)(ImmutableArray.Create(New PackageSource(NugetOrgSource, "http://nuget.org"))) @@ -258,7 +258,7 @@ End Class", fixProviderData:=New ProviderData(installerServiceMock.Object, packa installerServiceMock.Verify() End Function - Private Function CreateSearchResult(packageName As String, typeName As String, nameParts As ImmutableArray(Of String)) As Task(Of IList(Of PackageWithTypeResult)) + Private Shared Function CreateSearchResult(packageName As String, typeName As String, nameParts As ImmutableArray(Of String)) As Task(Of IList(Of PackageWithTypeResult)) Return CreateSearchResult(New PackageWithTypeResult( packageName:=packageName, typeName:=typeName, @@ -267,11 +267,11 @@ End Class", fixProviderData:=New ProviderData(installerServiceMock.Object, packa containingNamespaceNames:=nameParts)) End Function - Private Function CreateSearchResult(ParamArray results As PackageWithTypeResult()) As Task(Of IList(Of PackageWithTypeResult)) + Private Shared Function CreateSearchResult(ParamArray results As PackageWithTypeResult()) As Task(Of IList(Of PackageWithTypeResult)) Return Task.FromResult(Of IList(Of PackageWithTypeResult))(ImmutableArray.Create(results)) End Function - Private Function CreateNameParts(ParamArray parts As String()) As ImmutableArray(Of String) + Private Shared Function CreateNameParts(ParamArray parts As String()) As ImmutableArray(Of String) Return parts.ToImmutableArray() End Function End Class diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/AliasAmbiguousType/AliasAmbiguousTypeTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/AliasAmbiguousType/AliasAmbiguousTypeTests.vb index 224ee89ba4b1e..c0e7686688f63 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/AliasAmbiguousType/AliasAmbiguousTypeTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/AliasAmbiguousType/AliasAmbiguousTypeTests.vb @@ -20,7 +20,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.AliasA Return FlattenActions(actions) End Function - Private Function GetAmbiguousDefinition(ByVal typeDefinion As String) As String + Private Shared Function GetAmbiguousDefinition(ByVal typeDefinion As String) As String Return $" Namespace N1 {typeDefinion} diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/DiagnosticAnalyzerDriver/DiagnosticAnalyzerDriverTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/DiagnosticAnalyzerDriver/DiagnosticAnalyzerDriverTests.vb index 7dbf5e70b41b8..46e55f86ecc9e 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/DiagnosticAnalyzerDriver/DiagnosticAnalyzerDriverTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/DiagnosticAnalyzerDriver/DiagnosticAnalyzerDriverTests.vb @@ -90,7 +90,7 @@ End Class AccessSupportedDiagnostics(analyzer) End Sub - Private Sub AccessSupportedDiagnostics(analyzer As DiagnosticAnalyzer) + Private Shared Sub AccessSupportedDiagnostics(analyzer As DiagnosticAnalyzer) Dim diagnosticService = New HostDiagnosticAnalyzers({New AnalyzerImageReference(ImmutableArray.Create(analyzer))}) diagnosticService.GetDiagnosticDescriptorsPerReference(New DiagnosticAnalyzerInfoCache()) End Sub diff --git a/src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionTests.vb b/src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionTests.vb index beee1d209d46f..2acaa44e7bb61 100644 --- a/src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Diagnostics/Suppression/SuppressionTests.vb @@ -17,9 +17,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics.Suppre Public MustInherit Class VisualBasicSuppressionTests Inherits AbstractSuppressionDiagnosticTest - Private ReadOnly _compilationOptions As CompilationOptions = - New VisualBasicCompilationOptions(OutputKind.ConsoleApplication).WithOptionInfer(True) - Protected Overrides Function GetScriptOptions() As ParseOptions Return TestOptions.Script End Function @@ -622,7 +619,7 @@ End Class]]> Private Class UserDiagnosticAnalyzer Inherits DiagnosticAnalyzer - Private _descriptor As New DiagnosticDescriptor("InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", DiagnosticSeverity.Info, isEnabledByDefault:=True) + Private ReadOnly _descriptor As New DiagnosticDescriptor("InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", DiagnosticSeverity.Info, isEnabledByDefault:=True) Public Overrides ReadOnly Property SupportedDiagnostics() As ImmutableArray(Of DiagnosticDescriptor) Get @@ -695,7 +692,7 @@ End Class]]> Private Class UserDiagnosticAnalyzer Inherits DiagnosticAnalyzer - Private _descriptor As New DiagnosticDescriptor("#$DiagnosticWithBadId", "DiagnosticWithBadId", "DiagnosticWithBadId", "DiagnosticWithBadId", DiagnosticSeverity.Info, isEnabledByDefault:=True) + Private ReadOnly _descriptor As New DiagnosticDescriptor("#$DiagnosticWithBadId", "DiagnosticWithBadId", "DiagnosticWithBadId", "DiagnosticWithBadId", DiagnosticSeverity.Info, isEnabledByDefault:=True) Public Overrides ReadOnly Property SupportedDiagnostics() As ImmutableArray(Of DiagnosticDescriptor) Get @@ -739,7 +736,7 @@ End Class]]> Private Class UserDiagnosticAnalyzer Inherits DiagnosticAnalyzer - Private _descriptor As New DiagnosticDescriptor("REm", "REm Title", "REm", "REm", DiagnosticSeverity.Warning, isEnabledByDefault:=True) + Private ReadOnly _descriptor As New DiagnosticDescriptor("REm", "REm Title", "REm", "REm", DiagnosticSeverity.Warning, isEnabledByDefault:=True) Public Overrides ReadOnly Property SupportedDiagnostics() As ImmutableArray(Of DiagnosticDescriptor) Get @@ -803,7 +800,7 @@ End Class]]> Private Class UserDiagnosticAnalyzer Inherits DiagnosticAnalyzer - Private _descriptor As New DiagnosticDescriptor("ErrorDiagnostic", "ErrorDiagnostic", "ErrorDiagnostic", "ErrorDiagnostic", DiagnosticSeverity.[Error], isEnabledByDefault:=True) + Private ReadOnly _descriptor As New DiagnosticDescriptor("ErrorDiagnostic", "ErrorDiagnostic", "ErrorDiagnostic", "ErrorDiagnostic", DiagnosticSeverity.[Error], isEnabledByDefault:=True) Public Overrides ReadOnly Property SupportedDiagnostics() As ImmutableArray(Of DiagnosticDescriptor) Get @@ -920,7 +917,7 @@ End Class]]> Private Class UserDiagnosticAnalyzer Inherits DiagnosticAnalyzer - Private _descriptor As New DiagnosticDescriptor("InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", DiagnosticSeverity.Info, isEnabledByDefault:=True) + Private ReadOnly _descriptor As New DiagnosticDescriptor("InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", DiagnosticSeverity.Info, isEnabledByDefault:=True) Public Overrides ReadOnly Property SupportedDiagnostics() As ImmutableArray(Of DiagnosticDescriptor) Get @@ -1635,7 +1632,7 @@ Imports System.Diagnostics.CodeAnalysis Private Class UserDiagnosticAnalyzer Inherits DiagnosticAnalyzer - Private _descriptor As New DiagnosticDescriptor("InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", DiagnosticSeverity.Info, isEnabledByDefault:=True) + Private ReadOnly _descriptor As New DiagnosticDescriptor("InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", "InfoDiagnostic", DiagnosticSeverity.Info, isEnabledByDefault:=True) Public Overrides ReadOnly Property SupportedDiagnostics() As ImmutableArray(Of DiagnosticDescriptor) Get diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/BreakpointSpansTests.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/BreakpointSpansTests.vb index 0d3b4b062b323..52231af1fa99f 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/BreakpointSpansTests.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/BreakpointSpansTests.vb @@ -14,27 +14,27 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests #Region "Helpers" - Private Sub TestSpan(markup As String) + Private Shared Sub TestSpan(markup As String) Test(markup, isMissing:=False, isLine:=False) End Sub - Private Sub TestSpan(markup As XElement) + Private Shared Sub TestSpan(markup As XElement) Test(markup.NormalizedValue, isMissing:=False, isLine:=False) End Sub - Private Sub TestMissing(markup As XElement) + Private Shared Sub TestMissing(markup As XElement) Test(markup.NormalizedValue, isMissing:=True, isLine:=False) End Sub - Private Sub TestLine(markup As XElement) + Private Shared Sub TestLine(markup As XElement) Test(markup.NormalizedValue, isMissing:=False, isLine:=True) End Sub - Private Sub TestAll(markup As XElement) + Private Shared Sub TestAll(markup As XElement) TestAll(markup.NormalizedValue) End Sub - Private Sub Test(markup As String, isMissing As Boolean, isLine As Boolean) + Private Shared Sub Test(markup As String, isMissing As Boolean, isLine As Boolean) Dim position As Integer? = Nothing Dim expectedSpan As TextSpan? = Nothing Dim source As String = Nothing @@ -64,7 +64,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests End If End Sub - Private Sub TestAll(markup As String) + Private Shared Sub TestAll(markup As String) Dim position As Integer = Nothing Dim expectedSpans As ImmutableArray(Of TextSpan) = Nothing Dim source As String = Nothing diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/EditingTestBase.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/EditingTestBase.vb index ab09731d9b290..4e4df960582de 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/EditingTestBase.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/EditingTestBase.vb @@ -38,7 +38,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests Return New SemanticEditDescription(kind, symbolProvider, Nothing, preserveLocalVariables) End Function - Private Shared Function ParseSource(source As String, Optional options As ParseOptions = Nothing) As SyntaxTree + Private Shared Function ParseSource(source As String) As SyntaxTree Return VisualBasicEditAndContinueTestHelpers.CreateInstance().ParseText(ActiveStatementsDescription.ClearTags(source)) End Function diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/Extensions.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/Extensions.vb index 87200932d774e..9d07d8df32aa6 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/Extensions.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/Extensions.vb @@ -22,7 +22,6 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests description.OldStatements, description.OldTrackingSpans, description.NewSpans, - description.OldRegions, description.NewRegions) End Sub diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb index acbe28f161e9a..d62b0f119eeb2 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/Helpers/VisualBasicEditAndContinueTestHelpers.vb @@ -33,7 +33,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EditAndContinue ImmutableArray.Create(TestReferences.NetFx.Minimal.mincorlib, TestReferences.NetFx.Minimal.minasync)) End Function - Sub New(fxReferences As ImmutableArray(Of PortableExecutableReference)) + Public Sub New(fxReferences As ImmutableArray(Of PortableExecutableReference)) _fxReferences = fxReferences End Sub diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/LineEditTests.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/LineEditTests.vb index 6f66b151b2ce7..42e21dbda16fb 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/LineEditTests.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/LineEditTests.vb @@ -10,11 +10,11 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests Public Class LineEditTests Inherits EditingTestBase - Private Function ToCode(element As XElement) As String + Private Shared Function ToCode(element As XElement) As String Return element.Value.Replace(vbLf, vbCrLf) End Function - Private Function ToCode(element As XCData) As String + Private Shared Function ToCode(element As XCData) As String Return element.Value.Replace(vbLf, vbCrLf) End Function diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/SyntaxUtilitiesTests.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/SyntaxUtilitiesTests.vb index 24a0763a9b032..aa17d8045fc92 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/SyntaxUtilitiesTests.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/SyntaxUtilitiesTests.vb @@ -9,7 +9,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EditAndContinue Public Class SyntaxUtilitiesTests - Private Sub VerifySyntaxMap(oldSource As String, newSource As String) + Private Shared Sub VerifySyntaxMap(oldSource As String, newSource As String) Dim oldRoot = SyntaxFactory.ParseSyntaxTree(oldSource).GetRoot() Dim newRoot = SyntaxFactory.ParseSyntaxTree(newSource).GetRoot() diff --git a/src/EditorFeatures/VisualBasicTest/EditAndContinue/VisualBasicEditAndContinueAnalyzerTests.vb b/src/EditorFeatures/VisualBasicTest/EditAndContinue/VisualBasicEditAndContinueAnalyzerTests.vb index 9b20dee4a8dea..d4d72d3b66f8a 100644 --- a/src/EditorFeatures/VisualBasicTest/EditAndContinue/VisualBasicEditAndContinueAnalyzerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/EditAndContinue/VisualBasicEditAndContinueAnalyzerTests.vb @@ -95,7 +95,9 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.EditAndContinue.UnitTests Dim span As TextSpan? Try span = VisualBasicEditAndContinueAnalyzer.TryGetDiagnosticSpanImpl(k, Nothing, EditKind.Update) +#Disable Warning IDE0059 ' Unnecessary assignment of a value - https://github.com/dotnet/roslyn/issues/45896 Catch e1 As NullReferenceException +#Enable Warning IDE0059 ' Unnecessary assignment of a value ' expected, we passed null node Continue For End Try diff --git a/src/EditorFeatures/VisualBasicTest/EmbeddedLanguages/ValidateRegexStringTests.vb b/src/EditorFeatures/VisualBasicTest/EmbeddedLanguages/ValidateRegexStringTests.vb index 9f11f82be3c7c..ebdee60a2c885 100644 --- a/src/EditorFeatures/VisualBasicTest/EmbeddedLanguages/ValidateRegexStringTests.vb +++ b/src/EditorFeatures/VisualBasicTest/EmbeddedLanguages/ValidateRegexStringTests.vb @@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EmbeddedLanguages Return (New VisualBasicRegexDiagnosticAnalyzer(), Nothing) End Function - Private Function OptionOn() As OptionsCollection + Private Shared Function OptionOn() As OptionsCollection Dim values = New OptionsCollection(LanguageNames.VisualBasic) values.Add(RegularExpressionsOptions.ReportInvalidRegexPatterns, True) Return values diff --git a/src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldTestState.vb b/src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldTestState.vb index 91d368bdc1a24..e1b3f0d9856ee 100644 --- a/src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldTestState.vb +++ b/src/EditorFeatures/VisualBasicTest/EncapsulateField/EncapsulateFieldTestState.vb @@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EncapsulateField Friend Class EncapsulateFieldTestState Implements IDisposable - Private _testDocument As TestHostDocument + Private ReadOnly _testDocument As TestHostDocument Public Workspace As TestWorkspace Public TargetDocument As Document diff --git a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructCommandHandlerTests.vb b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructCommandHandlerTests.vb index ccb7f5a2c5b85..2b2bc60c33988 100644 --- a/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructCommandHandlerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/EndConstructGeneration/EndConstructCommandHandlerTests.vb @@ -11,10 +11,10 @@ Imports Moq Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.EndConstructGeneration <[UseExportProvider]> Public Class EndConstructCommandHandlerTests - Private _endConstructServiceMock As New Mock(Of IEndConstructGenerationService)(MockBehavior.Strict) - Private _featureOptions As New Mock(Of IOptionService)(MockBehavior.Strict) - Private _textViewMock As New Mock(Of ITextView)(MockBehavior.Strict) - Private _textBufferMock As New Mock(Of ITextBuffer)(MockBehavior.Strict) + Private ReadOnly _endConstructServiceMock As New Mock(Of IEndConstructGenerationService)(MockBehavior.Strict) + Private ReadOnly _featureOptions As New Mock(Of IOptionService)(MockBehavior.Strict) + Private ReadOnly _textViewMock As New Mock(Of ITextView)(MockBehavior.Strict) + Private ReadOnly _textBufferMock As New Mock(Of ITextBuffer)(MockBehavior.Strict) #If False Then ' TODO(jasonmal): Figure out how to enable these tests. diff --git a/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb b/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb index 7a59f74bbdc3e..f708962fced45 100644 --- a/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Extensions/StatementSyntaxExtensionTests.vb @@ -10,14 +10,14 @@ Imports System.Threading Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Extensions Public Class StatementSyntaxExtensionTests - Private Sub TestStatementDeclarationWithPublicModifier(Of T As StatementSyntax)(node As T) + Private Shared Sub TestStatementDeclarationWithPublicModifier(Of T As StatementSyntax)(node As T) Dim modifierList = SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.PublicKeyword)) Dim newNode = DirectCast(node.WithModifiers(modifierList), T) Dim actual = newNode.GetModifiers().First().ToString() Assert.Equal("Public", actual) End Sub - Private Sub VerifyTokenName(Of T As DeclarationStatementSyntax)(code As String, expectedName As String) + Private Shared Sub VerifyTokenName(Of T As DeclarationStatementSyntax)(code As String, expectedName As String) Dim node = SyntaxFactory.ParseCompilationUnit(code).DescendantNodes.OfType(Of T).First() Dim actualNameToken = node.GetNameToken() Assert.Equal(expectedName, actualNameToken.ToString()) @@ -56,7 +56,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Extensions Assert.Equal("Byte", returnTypeName) End Sub - Private Sub TestTypeBlockWithPublicModifier(Of T As TypeBlockSyntax)(code As String) + Private Shared Sub TestTypeBlockWithPublicModifier(Of T As TypeBlockSyntax)(code As String) Dim node = SyntaxFactory.ParseCompilationUnit(code).Members.First() Dim modifierList = SyntaxFactory.TokenList(SyntaxFactory.Token(SyntaxKind.PublicKeyword)) Dim newNode = DirectCast(node.WithModifiers(modifierList), T) diff --git a/src/EditorFeatures/VisualBasicTest/Formatting/FormattingEngineTests_Venus.vb b/src/EditorFeatures/VisualBasicTest/Formatting/FormattingEngineTests_Venus.vb index 04296ede22ca6..0d30f9e38592b 100644 --- a/src/EditorFeatures/VisualBasicTest/Formatting/FormattingEngineTests_Venus.vb +++ b/src/EditorFeatures/VisualBasicTest/Formatting/FormattingEngineTests_Venus.vb @@ -244,7 +244,7 @@ End Module ''' Then asserts that the formatting on that span results in text that we'd expect. ''' ''' The rule has to be set up for each set of spans, currently we test just one - Private Async Function AssertFormatWithBaseIndentAfterReplacingLfToCrLfAsync(content As String, + Private Shared Async Function AssertFormatWithBaseIndentAfterReplacingLfToCrLfAsync(content As String, expected As String, baseIndentation As Integer) As Threading.Tasks.Task diff --git a/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb b/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb index 180b0ab5a50a6..605ba036afe8e 100644 --- a/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartIndenterTests.vb @@ -15,14 +15,14 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Formatting.Indenta Public Class SmartIndenterTests Inherits VisualBasicFormatterTestBase - Private Shared s_htmlMarkup As String = + Private Shared ReadOnly s_htmlMarkup As String = <html> <body> <%{|S1:|}%> </body> </html> .NormalizedValue - Private Shared s_baseIndentationOfNugget As Integer = 8 + Private Shared ReadOnly s_baseIndentationOfNugget As Integer = 8 Public Sub New(output As ITestOutputHelper) MyBase.New(output) @@ -2995,7 +2995,7 @@ end class" indentStyle:=FormattingOptions.IndentStyle.Smart) End sub - Private Sub AssertSmartIndentIndentationInProjection( + Private Shared Sub AssertSmartIndentIndentationInProjection( markup As String, expectedIndentation As Integer) Using workspace = TestWorkspace.CreateVisualBasic(markup) @@ -3018,7 +3018,7 @@ end class" End Sub ''' 0-based. The line number in code to get indentation for. - Private Sub AssertSmartIndent( + Private Shared Sub AssertSmartIndent( code As String, indentationLine As Integer, expectedIndentation As Integer?, Optional indentStyle As FormattingOptions.IndentStyle = FormattingOptions.IndentStyle.Smart) @@ -3027,7 +3027,7 @@ end class" End Sub ''' 0-based. The line number in code to get indentation for. - Private Sub AssertSmartIndent( + Private Shared Sub AssertSmartIndent( code As String, indentationLine As Integer, expectedIndentation As Integer?, useTabs As Boolean, diff --git a/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartTokenFormatter_FormatTokenTests.vb b/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartTokenFormatter_FormatTokenTests.vb index 545f5c5e36556..13f9f9c369a03 100644 --- a/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartTokenFormatter_FormatTokenTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Formatting/Indentation/SmartTokenFormatter_FormatTokenTests.vb @@ -169,11 +169,11 @@ End Class Await ExpectException_TestAsync(code, indentation:=0, indentStyle:=FormattingOptions.IndentStyle.None) End Function - Private Async Function ExpectException_TestAsync(codeWithMarkup As String, indentation As Integer, Optional indentStyle As FormattingOptions.IndentStyle = FormattingOptions.IndentStyle.Smart) As Task + Private Shared Async Function ExpectException_TestAsync(codeWithMarkup As String, indentation As Integer, Optional indentStyle As FormattingOptions.IndentStyle = FormattingOptions.IndentStyle.Smart) As Task Assert.NotNull(Await Record.ExceptionAsync(Function() TestAsync(codeWithMarkup, indentation, indentStyle:=indentStyle))) End Function - Private Async Function TestAsync(codeWithMarkup As String, indentation As Integer, Optional indentStyle As FormattingOptions.IndentStyle = FormattingOptions.IndentStyle.Smart) As Threading.Tasks.Task + Private Shared Async Function TestAsync(codeWithMarkup As String, indentation As Integer, Optional indentStyle As FormattingOptions.IndentStyle = FormattingOptions.IndentStyle.Smart) As Threading.Tasks.Task Dim code As String = Nothing Dim position As Integer = 0 MarkupTestFile.GetPosition(codeWithMarkup, code, position) diff --git a/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormatterTestBase.vb b/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormatterTestBase.vb index 93ff0eb085c46..cce0104326d0e 100644 --- a/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormatterTestBase.vb +++ b/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormatterTestBase.vb @@ -31,7 +31,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Formatting Return SyntaxFactory.ParseCompilationUnit(expected) End Function - Protected Async Function AssertFormatSpanAsync(content As String, expected As String, Optional baseIndentation As Integer? = Nothing, Optional span As TextSpan = Nothing) As Tasks.Task + Protected Shared Async Function AssertFormatSpanAsync(content As String, expected As String, Optional baseIndentation As Integer? = Nothing, Optional span As TextSpan = Nothing) As Tasks.Task Using workspace = TestWorkspace.CreateVisualBasic(content) Dim hostdoc = workspace.Documents.First() diff --git a/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormattingEngineTests.vb b/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormattingEngineTests.vb index aaaaf4093d9fa..029de3c8778f4 100644 --- a/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormattingEngineTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Formatting/VisualBasicFormattingEngineTests.vb @@ -14,7 +14,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Formatting MyBase.New(output) End Sub - Private Function SeparateImportDirectiveGroups() As Dictionary(Of OptionKey, Object) + Private Shared Function SeparateImportDirectiveGroups() As Dictionary(Of OptionKey, Object) Return New Dictionary(Of OptionKey, Object) From { {New OptionKey(GenerationOptions.SeparateImportDirectiveGroups, LanguageNames.VisualBasic), True} } diff --git a/src/EditorFeatures/VisualBasicTest/GoToAdjacentMember/VisualBasicGoToAdjacentMemberTests.vb b/src/EditorFeatures/VisualBasicTest/GoToAdjacentMember/VisualBasicGoToAdjacentMemberTests.vb index 0807742b30f0f..4a94bcfb33b89 100644 --- a/src/EditorFeatures/VisualBasicTest/GoToAdjacentMember/VisualBasicGoToAdjacentMemberTests.vb +++ b/src/EditorFeatures/VisualBasicTest/GoToAdjacentMember/VisualBasicGoToAdjacentMemberTests.vb @@ -191,7 +191,7 @@ End Class" Await AssertNavigatedAsync(code, next:=True) End Function - Shared Operator +(left As VisualBasicGoToAdjacentMemberTests, right As VisualBasicGoToAdjacentMemberTests) As VisualBasicGoToAdjacentMemberTests + Public Shared Operator +(left As VisualBasicGoToAdjacentMemberTests, right As VisualBasicGoToAdjacentMemberTests) As VisualBasicGoToAdjacentMemberTests Throw New System.NotImplementedException() End Operator diff --git a/src/EditorFeatures/VisualBasicTest/ImplementAbstractClass/ImplementAbstractClassCommandHandlerTests.vb b/src/EditorFeatures/VisualBasicTest/ImplementAbstractClass/ImplementAbstractClassCommandHandlerTests.vb index 425a6671831d7..9b63d6da704a7 100644 --- a/src/EditorFeatures/VisualBasicTest/ImplementAbstractClass/ImplementAbstractClassCommandHandlerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/ImplementAbstractClass/ImplementAbstractClassCommandHandlerTests.vb @@ -192,13 +192,13 @@ End Class Sub(x, y) AssertEx.AssertEqualToleratingWhitespaceDifferences(x, y)) End Sub - Private Sub Test(code As XElement, expectedText As XElement, nextHandler As Action, assertion As Action(Of String, String)) + Private Shared Sub Test(code As XElement, expectedText As XElement, nextHandler As Action, assertion As Action(Of String, String)) Using workspace = GetWorkspace(code) Test(workspace, expectedText, nextHandler, assertion) End Using End Sub - Private Sub Test(workspace As TestWorkspace, expectedText As XElement, nextHandler As Action, assertion As Action(Of String, String)) + Private Shared Sub Test(workspace As TestWorkspace, expectedText As XElement, nextHandler As Action, assertion As Action(Of String, String)) Dim document = workspace.Documents.Single() Dim view = document.GetTextView() Dim cursorPosition = document.CursorPosition.Value @@ -215,7 +215,7 @@ End Class assertion(expectedText.NormalizedValue, text) End Sub - Private Function GetWorkspace(code As XElement) As TestWorkspace + Private Shared Function GetWorkspace(code As XElement) As TestWorkspace Return TestWorkspace.Create( diff --git a/src/EditorFeatures/VisualBasicTest/ImplementInterface/ImplementInterfaceCommandHandlerTests.vb b/src/EditorFeatures/VisualBasicTest/ImplementInterface/ImplementInterfaceCommandHandlerTests.vb index a63debf43691b..897822e411a2e 100644 --- a/src/EditorFeatures/VisualBasicTest/ImplementInterface/ImplementInterfaceCommandHandlerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/ImplementInterface/ImplementInterfaceCommandHandlerTests.vb @@ -18,7 +18,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ImplementInterface <[UseExportProvider]> Public Class ImplementInterfaceCommandHandlerTests - Private Sub Test(code As XElement, expectedText As XElement, nextHandler As Action(Of IWpfTextView, TestWorkspace), assertion As Action(Of String, String, IWpfTextView)) + Private Shared Sub Test(code As XElement, expectedText As XElement, nextHandler As Action(Of IWpfTextView, TestWorkspace), assertion As Action(Of String, String, IWpfTextView)) Using workspace = GetWorkspace(code.NormalizedValue) Dim commandHandler = MoveCaretAndCreateCommandHandler(workspace) Dim view = workspace.Documents.Single().GetTextView() @@ -40,7 +40,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ImplementInterface Return New ImplementInterfaceCommandHandler(workspace.GetService(Of IEditorOperationsFactoryService)) End Function - Private Function GetWorkspace(code As String) As TestWorkspace + Private Shared Function GetWorkspace(code As String) As TestWorkspace Return TestWorkspace.Create( diff --git a/src/EditorFeatures/VisualBasicTest/InvertIf/InvertMultiLineIfTests.vb b/src/EditorFeatures/VisualBasicTest/InvertIf/InvertMultiLineIfTests.vb index e0719e3a695cd..eb73f9e90e198 100644 --- a/src/EditorFeatures/VisualBasicTest/InvertIf/InvertMultiLineIfTests.vb +++ b/src/EditorFeatures/VisualBasicTest/InvertIf/InvertMultiLineIfTests.vb @@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.InvertIf Await TestInRegularAndScriptAsync(CreateTreeText(initial), CreateTreeText(expected)) End Function - Function CreateTreeText(initial As String) As String + Public Shared Function CreateTreeText(initial As String) As String Return " Module Module1 Sub Main() diff --git a/src/EditorFeatures/VisualBasicTest/InvertIf/InvertSingleLineIfTests.vb b/src/EditorFeatures/VisualBasicTest/InvertIf/InvertSingleLineIfTests.vb index dc5c4c95b3422..c160c1f57a7b9 100644 --- a/src/EditorFeatures/VisualBasicTest/InvertIf/InvertSingleLineIfTests.vb +++ b/src/EditorFeatures/VisualBasicTest/InvertIf/InvertSingleLineIfTests.vb @@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.InvertIf Await TestInRegularAndScriptAsync(CreateTreeText(initial), CreateTreeText(expected)) End Function - Function CreateTreeText(initial As String) As String + Public Shared Function CreateTreeText(initial As String) As String Return " Module Module1 Sub Main() diff --git a/src/EditorFeatures/VisualBasicTest/LineCommit/CommitOnEnterTests.vb b/src/EditorFeatures/VisualBasicTest/LineCommit/CommitOnEnterTests.vb index c12e5fc99317a..ff8ef50ff5547 100644 --- a/src/EditorFeatures/VisualBasicTest/LineCommit/CommitOnEnterTests.vb +++ b/src/EditorFeatures/VisualBasicTest/LineCommit/CommitOnEnterTests.vb @@ -369,7 +369,7 @@ End Module AssertCommitsStatement(test, expectCommit:=False) End Sub - Private Sub AssertCommitsStatement(test As XElement, expectCommit As Boolean, Optional usedSemantics As Boolean = True) + Private Shared Sub AssertCommitsStatement(test As XElement, expectCommit As Boolean, Optional usedSemantics As Boolean = True) Using testData = CommitTestData.Create(test) Dim lineNumber = testData.View.Caret.Position.BufferPosition.GetContainingLine().LineNumber testData.CommandHandler.ExecuteCommand(New ReturnKeyCommandArgs(testData.View, testData.Buffer), Sub() testData.EditorOperations.InsertNewLine(), TestCommandExecutionContext.Create()) diff --git a/src/EditorFeatures/VisualBasicTest/LineSeparators/LineSeparatorTests.vb b/src/EditorFeatures/VisualBasicTest/LineSeparators/LineSeparatorTests.vb index 0ad5b9c8d419e..871551b8b7031 100644 --- a/src/EditorFeatures/VisualBasicTest/LineSeparators/LineSeparatorTests.vb +++ b/src/EditorFeatures/VisualBasicTest/LineSeparators/LineSeparatorTests.vb @@ -274,7 +274,7 @@ End Class") End Class") End Function - Private Async Function AssertTagsAsync(spans As IEnumerable(Of TextSpan), content As String) As Tasks.Task + Private Shared Async Function AssertTagsAsync(spans As IEnumerable(Of TextSpan), content As String) As Tasks.Task Dim tags = Await GetSpansForAsync(content) Assert.Equal(spans.Count(), tags.Count()) @@ -285,7 +285,7 @@ End Class") Next End Function - Private Async Function GetSpansForAsync(content As String) As Tasks.Task(Of IEnumerable(Of TextSpan)) + Private Shared Async Function GetSpansForAsync(content As String) As Tasks.Task(Of IEnumerable(Of TextSpan)) Using workspace = TestWorkspace.CreateVisualBasic(content) Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id) Dim service = Assert.IsType(Of VisualBasicLineSeparatorService)(workspace.Services.GetLanguageServices(LanguageNames.VisualBasic).GetService(Of ILineSeparatorService)()) diff --git a/src/EditorFeatures/VisualBasicTest/Organizing/AbstractOrganizerTests.vb b/src/EditorFeatures/VisualBasicTest/Organizing/AbstractOrganizerTests.vb index 570d888b53008..c1608ab413a0b 100644 --- a/src/EditorFeatures/VisualBasicTest/Organizing/AbstractOrganizerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Organizing/AbstractOrganizerTests.vb @@ -12,7 +12,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Organizing <[UseExportProvider]> Public MustInherit Class AbstractOrganizerTests - Protected Async Function CheckAsync(initial As XElement, final As XElement) As System.Threading.Tasks.Task + Protected Shared Async Function CheckAsync(initial As XElement, final As XElement) As System.Threading.Tasks.Task Using workspace = TestWorkspace.CreateVisualBasic(initial.NormalizedValue) Dim document = workspace.CurrentSolution.GetDocument(workspace.Documents.First().Id) Dim newRoot = Await (Await OrganizingService.OrganizeAsync(document)).GetSyntaxRootAsync() diff --git a/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb b/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb index f25ff75d024e9..6c5d91b17b6da 100644 --- a/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb +++ b/src/EditorFeatures/VisualBasicTest/QuickInfo/SemanticQuickInfoSourceTests.vb @@ -17,7 +17,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.QuickInfo Return TestWithReferencesAsync(markup, Array.Empty(Of String)(), expectedResults) End Function - Protected Async Function TestSharedAsync(workspace As TestWorkspace, position As Integer, ParamArray expectedResults() As Action(Of QuickInfoItem)) As Task + Protected Shared Async Function TestSharedAsync(workspace As TestWorkspace, position As Integer, ParamArray expectedResults() As Action(Of QuickInfoItem)) As Task Dim service = workspace.Services _ .GetLanguageServices(LanguageNames.VisualBasic) _ .GetService(Of QuickInfoService) @@ -37,7 +37,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.QuickInfo End If End Function - Private Async Function TestSharedAsync(workspace As TestWorkspace, service As QuickInfoService, position As Integer, expectedResults() As Action(Of QuickInfoItem)) As Task + Private Shared Async Function TestSharedAsync(workspace As TestWorkspace, service As QuickInfoService, position As Integer, expectedResults() As Action(Of QuickInfoItem)) As Task Dim info = Await service.GetQuickInfoAsync( workspace.CurrentSolution.Projects.First().Documents.First(), position, cancellationToken:=CancellationToken.None) @@ -53,13 +53,13 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.QuickInfo End If End Function - Private Async Function TestFromXmlAsync(markup As String, ParamArray expectedResults As Action(Of QuickInfoItem)()) As Task + Private Shared Async Function TestFromXmlAsync(markup As String, ParamArray expectedResults As Action(Of QuickInfoItem)()) As Task Using workspace = TestWorkspace.Create(markup) Await TestSharedAsync(workspace, workspace.Documents.First().CursorPosition.Value, expectedResults) End Using End Function - Private Async Function TestWithReferencesAsync(markup As String, metadataReferences As String(), ParamArray expectedResults() As Action(Of QuickInfoItem)) As Task + Private Shared Async Function TestWithReferencesAsync(markup As String, metadataReferences As String(), ParamArray expectedResults() As Action(Of QuickInfoItem)) As Task Dim code As String = Nothing Dim position As Integer = Nothing MarkupTestFile.GetPosition(markup, code, position) diff --git a/src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/EndBlockKeywordRecommenderTests.vb b/src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/EndBlockKeywordRecommenderTests.vb index 9ec0821473109..5dc78cc243984 100644 --- a/src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/EndBlockKeywordRecommenderTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/EndBlockKeywordRecommenderTests.vb @@ -224,6 +224,7 @@ End |, "Function", "Sub") + Public Async Function EndFunctionDoesNotSuggestEndSubTest() As Task Await VerifyRecommendationsMissingAsync(Function Goo() |, "End Sub") diff --git a/src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/ModifierKeywordRecommenderTests.InsideNamespaceDeclaration.vb b/src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/ModifierKeywordRecommenderTests.InsideNamespaceDeclaration.vb index 9abd6dc98d5cf..3ef48e28da1b3 100644 --- a/src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/ModifierKeywordRecommenderTests.InsideNamespaceDeclaration.vb +++ b/src/EditorFeatures/VisualBasicTest/Recommendations/Declarations/ModifierKeywordRecommenderTests.InsideNamespaceDeclaration.vb @@ -8,7 +8,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.De ''' ''' Declarations outside of any namespace in the file are considered to be in the project's root namespace ''' - Private Async Function VerifyContainsAsync(ParamArray recommendations As String()) As Task + Private Shared Async Function VerifyContainsAsync(ParamArray recommendations As String()) As Task Await VerifyRecommendationsContainAsync(|, recommendations) Await VerifyRecommendationsContainAsync(|, recommendations) Await VerifyRecommendationsContainAsync( @@ -19,7 +19,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.De ''' ''' Declarations outside of any namespace in the file are considered to be in the project's root namespace ''' - Private Async Function VerifyMissingAsync(ParamArray recommendations As String()) As Task + Private Shared Async Function VerifyMissingAsync(ParamArray recommendations As String()) As Task Await VerifyRecommendationsMissingAsync(|, recommendations) Await VerifyRecommendationsMissingAsync(|, recommendations) Await VerifyRecommendationsMissingAsync( diff --git a/src/EditorFeatures/VisualBasicTest/Recommendations/EventHandling/RaiseEventKeywordRecommenderTests.vb b/src/EditorFeatures/VisualBasicTest/Recommendations/EventHandling/RaiseEventKeywordRecommenderTests.vb index ec8dcc11edf12..ee30f1d21b140 100644 --- a/src/EditorFeatures/VisualBasicTest/Recommendations/EventHandling/RaiseEventKeywordRecommenderTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Recommendations/EventHandling/RaiseEventKeywordRecommenderTests.vb @@ -4,6 +4,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.EventHandling Public Class RaiseEventKeywordRecommenderTests + Public Async Function RaiseEventInCustomEventTest() As Task @@ -17,6 +18,7 @@ End Class Await VerifyRecommendationsContainAsync(code, "RaiseEvent") End Function + Public Async Function RaiseEventInSingleLineLambdaTest() As Task diff --git a/src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/CastOperatorsKeywordRecommenderTests.vb b/src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/CastOperatorsKeywordRecommenderTests.vb index 8aa37da90ab8e..d4900e797718e 100644 --- a/src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/CastOperatorsKeywordRecommenderTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/CastOperatorsKeywordRecommenderTests.vb @@ -6,7 +6,7 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Completion.KeywordRecommenders.Expres Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Expressions Public Class CastOperatorsKeywordRecommenderTests - Private ReadOnly Property AllTypeConversionOperatorKeywords As String() + Private Shared ReadOnly Property AllTypeConversionOperatorKeywords As String() Get Dim keywords As New List(Of String) From {"CType", "DirectCast", "TryCast"} diff --git a/src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/KeyKeywordRecommenderTests.vb b/src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/KeyKeywordRecommenderTests.vb index d04540bfddc5f..378b34f3ba741 100644 --- a/src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/KeyKeywordRecommenderTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Recommendations/Expressions/KeyKeywordRecommenderTests.vb @@ -10,6 +10,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.Ex Await VerifyRecommendationsMissingAsync(|, "Key") End Function + Public Async Function KeyNotAfterArrayInitializerSquiggleTest() As Task Await VerifyRecommendationsMissingAsync(Dim x = {|, "Key") diff --git a/src/EditorFeatures/VisualBasicTest/Recommendations/OnErrorStatements/ErrorKeywordRecommenderTests.vb b/src/EditorFeatures/VisualBasicTest/Recommendations/OnErrorStatements/ErrorKeywordRecommenderTests.vb index 820b507afddd6..ea1bef1ccfba8 100644 --- a/src/EditorFeatures/VisualBasicTest/Recommendations/OnErrorStatements/ErrorKeywordRecommenderTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Recommendations/OnErrorStatements/ErrorKeywordRecommenderTests.vb @@ -17,6 +17,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Recommendations.On Await VerifyRecommendationsContainAsync(|, "Error") End Function + Public Async Function ErrorStatementInLambdaTest() As Task diff --git a/src/EditorFeatures/VisualBasicTest/SignatureHelp/AbstractVisualBasicSignatureHelpProviderTests.vb b/src/EditorFeatures/VisualBasicTest/SignatureHelp/AbstractVisualBasicSignatureHelpProviderTests.vb index ca7a3311690c7..aa3830d4e5e78 100644 --- a/src/EditorFeatures/VisualBasicTest/SignatureHelp/AbstractVisualBasicSignatureHelpProviderTests.vb +++ b/src/EditorFeatures/VisualBasicTest/SignatureHelp/AbstractVisualBasicSignatureHelpProviderTests.vb @@ -31,14 +31,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SignatureHelp End If End Function - Protected Overrides Sub VerifyTriggerCharacters(expectedTriggerCharacters() As Char, unexpectedTriggerCharacters() As Char, Optional sourceCodeKind As Microsoft.CodeAnalysis.SourceCodeKind? = Nothing) - If (sourceCodeKind.HasValue) Then - MyBase.VerifyTriggerCharacters(expectedTriggerCharacters, unexpectedTriggerCharacters, sourceCodeKind) - Else - MyBase.VerifyTriggerCharacters(expectedTriggerCharacters, unexpectedTriggerCharacters, Microsoft.CodeAnalysis.SourceCodeKind.Regular) - End If - End Sub - Protected Overrides Function CreateExperimentalParseOptions() As ParseOptions ' There are no experimental features at this time. Return New VisualBasicParseOptions() diff --git a/src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb b/src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb index 6a3deafaa227b..ecd7eb03cbc20 100644 --- a/src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Squiggles/ErrorSquiggleProducerTests.vb @@ -22,11 +22,9 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Squiggles <[UseExportProvider]> Public Class ErrorSquiggleProducerTests - Private _producer As New DiagnosticTagProducer(Of DiagnosticsSquiggleTaggerProvider) - - Private Async Function ProduceSquiggles(content As String) As Task(Of ImmutableArray(Of ITagSpan(Of IErrorTag))) + Private Shared Async Function ProduceSquiggles(content As String) As Task(Of ImmutableArray(Of ITagSpan(Of IErrorTag))) Using workspace = TestWorkspace.CreateVisualBasic(content) - Return (Await _producer.GetDiagnosticsAndErrorSpans(workspace)).Item2 + Return (Await DiagnosticTagProducer(Of DiagnosticsSquiggleTaggerProvider).GetDiagnosticsAndErrorSpans(workspace)).Item2 End Using End Function @@ -69,7 +67,7 @@ End Class") End Sub End Class") - Dim diagnosticsAndSpans = Await _producer.GetDiagnosticsAndErrorSpans(workspace) + Dim diagnosticsAndSpans = Await DiagnosticTagProducer(Of DiagnosticsSquiggleTaggerProvider).GetDiagnosticsAndErrorSpans(workspace) Dim spans = diagnosticsAndSpans.Item1.Zip(diagnosticsAndSpans.Item2, Function(diagostic, span) (diagostic, span)).OrderBy(Function(s) s.span.Span.Span.Start).ToImmutableArray() Assert.Equal(1, spans.Count()) @@ -123,7 +121,7 @@ End Class" options.Add(preferIntrinsicPredefinedTypeOption, preferIntrinsicPredefinedTypeOptionValue) workspace.ApplyOptions(options) - Dim diagnosticsAndSpans = Await _producer.GetDiagnosticsAndErrorSpans(workspace, analyzerMap) + Dim diagnosticsAndSpans = Await DiagnosticTagProducer(Of DiagnosticsSquiggleTaggerProvider).GetDiagnosticsAndErrorSpans(workspace, analyzerMap) Dim spans = diagnosticsAndSpans.Item1.Zip(diagnosticsAndSpans.Item2, Function(diagostic, span) (diagostic, span)).OrderBy(Function(s) s.span.Span.Span.Start).ToImmutableArray() Assert.Equal(2, spans.Length) diff --git a/src/EditorFeatures/VisualBasicTest/SymbolId/SymbolKeyCompilationsTests.vb b/src/EditorFeatures/VisualBasicTest/SymbolId/SymbolKeyCompilationsTests.vb index c09431a8aee0f..ddcd6a0aee906 100644 --- a/src/EditorFeatures/VisualBasicTest/SymbolId/SymbolKeyCompilationsTests.vb +++ b/src/EditorFeatures/VisualBasicTest/SymbolId/SymbolKeyCompilationsTests.vb @@ -117,7 +117,7 @@ End Namespace Dim sym1 = origlist(i) Dim sym2 = newlist(i) - AssertSymbolsIdsEqual(sym2, sym1, comp1, SymbolIdComparison.None, expectEqual:=False) + AssertSymbolsIdsEqual(sym2, sym1, SymbolIdComparison.None, expectEqual:=False) Dim resolvedSymbol = ResolveSymbol(sym2, comp1, SymbolIdComparison.None) ' ignored Assert.NotNull(resolvedSymbol) Assert.Equal(sym1, resolvedSymbol) @@ -226,7 +226,7 @@ End Class Dim sym1 = comp1.SourceModule.GlobalNamespace.GetMembers("C").FirstOrDefault() Dim sym2 = comp2.SourceModule.GlobalNamespace.GetMembers("C").FirstOrDefault() - AssertSymbolsIdsEqual(sym2, sym1, comp1, SymbolIdComparison.IgnoreCase, expectEqual:=False) + AssertSymbolsIdsEqual(sym2, sym1, SymbolIdComparison.IgnoreCase, expectEqual:=False) Assert.Null(ResolveSymbol(sym2, comp1, SymbolIdComparison.IgnoreCase)) ' ignore asm id ResolveAndVerifySymbol(sym2, sym1, comp1, SymbolIdComparison.IgnoreCase Or SymbolIdComparison.IgnoreAssemblyIds) @@ -261,21 +261,21 @@ End Class Dim sym1 As ISymbol = comp1.Assembly Dim sym2 As ISymbol = comp2.Assembly - AssertSymbolsIdsEqual(sym2, sym1, comp1, SymbolIdComparison.IgnoreCase, False) + AssertSymbolsIdsEqual(sym2, sym1, SymbolIdComparison.IgnoreCase, False) Assert.Null(ResolveSymbol(sym2, comp1, SymbolIdComparison.IgnoreCase)) ' ignore asm id ' Same ID - AssertSymbolsIdsEqual(sym2, sym1, comp1, SymbolIdComparison.IgnoreAssemblyIds) + AssertSymbolsIdsEqual(sym2, sym1, SymbolIdComparison.IgnoreAssemblyIds) ' but can NOT resolve Assert.Null(ResolveSymbol(sym2, comp1, SymbolIdComparison.IgnoreCase Or SymbolIdComparison.IgnoreAssemblyIds)) sym1 = comp1.Assembly.Modules(0) sym2 = comp2.Assembly.Modules(0) - AssertSymbolsIdsEqual(sym2, sym1, comp1, SymbolIdComparison.IgnoreCase, False) + AssertSymbolsIdsEqual(sym2, sym1, SymbolIdComparison.IgnoreCase, False) Assert.Null(ResolveSymbol(sym2, comp1, SymbolIdComparison.IgnoreCase)) - AssertSymbolsIdsEqual(sym2, sym1, comp1, SymbolIdComparison.IgnoreAssemblyIds) + AssertSymbolsIdsEqual(sym2, sym1, SymbolIdComparison.IgnoreAssemblyIds) Assert.Null(ResolveSymbol(sym2, comp1, SymbolIdComparison.IgnoreAssemblyIds)) End Sub diff --git a/src/EditorFeatures/VisualBasicTest/SymbolId/SymbolKeyTestBase.vb b/src/EditorFeatures/VisualBasicTest/SymbolId/SymbolKeyTestBase.vb index db110089e2252..417b098991897 100644 --- a/src/EditorFeatures/VisualBasicTest/SymbolId/SymbolKeyTestBase.vb +++ b/src/EditorFeatures/VisualBasicTest/SymbolId/SymbolKeyTestBase.vb @@ -29,7 +29,9 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SymbolId #Region "Verification" +#Disable Warning IDE0060 ' Remove unused parameter - https://github.com/dotnet/roslyn/issues/45894 Friend Shared Sub ResolveAndVerifySymbolList(newSymbols As IEnumerable(Of ISymbol), newCompilation As Compilation, originalSymbols As IEnumerable(Of ISymbol), originalCompilation As Compilation) +#Enable Warning IDE0060 ' Remove unused parameter Dim newlist = newSymbols.OrderBy(Function(s) s.Name).ToList() Dim origlist = originalSymbols.OrderBy(Function(s) s.Name).ToList() @@ -60,7 +62,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SymbolId Friend Shared Sub ResolveAndVerifySymbol(symbol1 As ISymbol, symbol2 As ISymbol, compilation2 As Compilation, Optional comparison As SymbolIdComparison = SymbolIdComparison.IgnoreCase) - AssertSymbolsIdsEqual(symbol1, symbol2, compilation2, comparison) + AssertSymbolsIdsEqual(symbol1, symbol2, comparison) Dim resolvedSymbol = ResolveSymbol(symbol1, compilation2, comparison) Assert.NotNull(resolvedSymbol) @@ -82,7 +84,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SymbolId Return symInfo.Symbol End Function - Friend Shared Sub AssertSymbolsIdsEqual(symbol1 As ISymbol, symbol2 As ISymbol, compilation2 As Compilation, comparison As SymbolIdComparison, Optional expectEqual As Boolean = True) + Friend Shared Sub AssertSymbolsIdsEqual(symbol1 As ISymbol, symbol2 As ISymbol, comparison As SymbolIdComparison, Optional expectEqual As Boolean = True) Dim sid1 = SymbolKey.Create(symbol1, CancellationToken.None) Dim sid2 = SymbolKey.Create(symbol2, CancellationToken.None) @@ -220,7 +222,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SymbolId End Class Friend Class LocalSymbolDumper - Private _comp As VisualBasicCompilation + Private ReadOnly _comp As VisualBasicCompilation Public Sub New(comp As VisualBasicCompilation) Me._comp = comp End Sub @@ -269,7 +271,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SymbolId End Sub - Private Sub GetLocalAndType(df As DataFlowAnalysis, list As List(Of ISymbol)) + Private Shared Sub GetLocalAndType(df As DataFlowAnalysis, list As List(Of ISymbol)) ' add local symbols to list For Each v As ISymbol In df.VariablesDeclared list.Add(v) @@ -280,7 +282,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SymbolId Next End Sub - Private Sub GetLabelSymbols(body As MethodBlockSyntax, model As SemanticModel, list As List(Of ISymbol)) + Private Shared Sub GetLabelSymbols(body As MethodBlockSyntax, model As SemanticModel, list As List(Of ISymbol)) Dim labels = body.DescendantNodes().OfType(Of LabelStatementSyntax)() For Each lb As LabelStatementSyntax In labels Dim sym = model.GetDeclaredSymbol(lb) @@ -290,7 +292,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SymbolId ' VB has not SwitchLabel; it's CaseStatement End Sub - Private Sub GetAnonymousTypeAndFuncSymbols(body As MethodBlockSyntax, model As SemanticModel, list As List(Of ISymbol)) + Private Shared Sub GetAnonymousTypeAndFuncSymbols(body As MethodBlockSyntax, model As SemanticModel, list As List(Of ISymbol)) Dim exprs As IEnumerable(Of ExpressionSyntax), tmp As IEnumerable(Of ExpressionSyntax) exprs = body.DescendantNodes().OfType(Of AnonymousObjectCreationExpressionSyntax)() @@ -304,7 +306,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SymbolId Next End Sub - Private Sub GetAnonymousExprSymbols(expr As ExpressionSyntax, model As SemanticModel, list As List(Of ISymbol)) + Private Shared Sub GetAnonymousExprSymbols(expr As ExpressionSyntax, model As SemanticModel, list As List(Of ISymbol)) Dim kind = expr.Kind If kind <> SyntaxKind.AnonymousObjectCreationExpression AndAlso diff --git a/src/EditorFeatures/VisualBasicTest/TypeInferrer/TypeInferrerTests.vb b/src/EditorFeatures/VisualBasicTest/TypeInferrer/TypeInferrerTests.vb index 02396552bb687..6c57dc318008f 100644 --- a/src/EditorFeatures/VisualBasicTest/TypeInferrer/TypeInferrerTests.vb +++ b/src/EditorFeatures/VisualBasicTest/TypeInferrer/TypeInferrerTests.vb @@ -48,7 +48,7 @@ End Class.Value.Replace("$", text) Await TestAsync(text, expectedType, mode) End Function - Private Function FindExpressionSyntaxFromSpan(root As SyntaxNode, textSpan As TextSpan) As ExpressionSyntax + Private Shared Function FindExpressionSyntaxFromSpan(root As SyntaxNode, textSpan As TextSpan) As ExpressionSyntax Dim token = root.FindToken(textSpan.Start) Dim currentNode = token.Parent While currentNode IsNot Nothing diff --git a/src/EditorFeatures/VisualBasicTest/Wrapping/BinaryExpressionWrappingTests.vb b/src/EditorFeatures/VisualBasicTest/Wrapping/BinaryExpressionWrappingTests.vb index e58489dfb30c0..c7c78513f5689 100644 --- a/src/EditorFeatures/VisualBasicTest/Wrapping/BinaryExpressionWrappingTests.vb +++ b/src/EditorFeatures/VisualBasicTest/Wrapping/BinaryExpressionWrappingTests.vb @@ -23,16 +23,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Wrapping CodeStyleOptions2.OperatorPlacementWhenWrapping, OperatorPlacementWhenWrappingPreference.BeginningOfLine) - Private Function TestEndOfLine(markup As String, expected As String) As Task - Return TestInRegularAndScript1Async(markup, expected, parameters:=New TestParameters( - options:=EndOfLine)) - End Function - - Private Function TestBeginningOfLine(markup As String, expected As String) As Task - Return TestInRegularAndScript1Async(markup, expected, parameters:=New TestParameters( - options:=BeginningOfLine)) - End Function - Public Async Function TestMissingWithSyntaxError() As Task Await TestMissingAsync( diff --git a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceWorkspace.cs b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceWorkspace.cs index 92db103c2339e..dce4b643bce97 100644 --- a/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceWorkspace.cs +++ b/src/Features/Core/Portable/MetadataAsSource/MetadataAsSourceWorkspace.cs @@ -13,7 +13,7 @@ internal class MetadataAsSourceWorkspace : Workspace public readonly MetadataAsSourceFileService FileService; public MetadataAsSourceWorkspace(MetadataAsSourceFileService fileService, HostServices hostServices) - : base(hostServices, "MetadataAsSource") + : base(hostServices, WorkspaceKind.MetadataAsSource) { this.FileService = fileService; } diff --git a/src/Interactive/Host/Microsoft.CodeAnalysis.InteractiveHost.csproj b/src/Interactive/Host/Microsoft.CodeAnalysis.InteractiveHost.csproj index a70a96b953ab2..d9452d758c2af 100644 --- a/src/Interactive/Host/Microsoft.CodeAnalysis.InteractiveHost.csproj +++ b/src/Interactive/Host/Microsoft.CodeAnalysis.InteractiveHost.csproj @@ -19,6 +19,7 @@ global,Scripting + diff --git a/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveCommandHandler.cs b/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveCommandHandler.cs index f27be691ccaea..6f35e54389493 100644 --- a/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveCommandHandler.cs +++ b/src/VisualStudio/CSharp/Impl/Interactive/CSharpInteractiveCommandHandler.cs @@ -30,9 +30,8 @@ public CSharpInteractiveCommandHandler( ISendToInteractiveSubmissionProvider sendToInteractiveSubmissionProvider, IContentTypeRegistryService contentTypeRegistryService, IEditorOptionsFactoryService editorOptionsFactoryService, - IEditorOperationsFactoryService editorOperationsFactoryService, - IWaitIndicator waitIndicator) - : base(contentTypeRegistryService, editorOptionsFactoryService, editorOperationsFactoryService, waitIndicator) + IEditorOperationsFactoryService editorOperationsFactoryService) + : base(contentTypeRegistryService, editorOptionsFactoryService, editorOperationsFactoryService) { _interactiveWindowProvider = interactiveWindowProvider; _sendToInteractiveSubmissionProvider = sendToInteractiveSubmissionProvider; diff --git a/src/VisualStudio/CSharp/Test/DesignerAttribute/DesignerAttributeServiceTests.cs b/src/VisualStudio/CSharp/Test/DesignerAttribute/DesignerAttributeServiceTests.cs index f84e65c06074e..7cc33e2665424 100644 --- a/src/VisualStudio/CSharp/Test/DesignerAttribute/DesignerAttributeServiceTests.cs +++ b/src/VisualStudio/CSharp/Test/DesignerAttribute/DesignerAttributeServiceTests.cs @@ -9,7 +9,6 @@ using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Shared.Extensions; using Microsoft.CodeAnalysis.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities.RemoteHost; using Roslyn.Utilities; using Xunit; diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/InteractiveWindowCommandHandlerTestState.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/InteractiveWindowCommandHandlerTestState.cs index 420da90673350..e0183a8acb7a3 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/InteractiveWindowCommandHandlerTestState.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/InteractiveWindowCommandHandlerTestState.cs @@ -48,8 +48,7 @@ public InteractiveWindowCommandHandlerTestState(ExportProvider exportProvider, X GetExportedValue(), GetExportedValue(), GetExportedValue(), - GetExportedValue(), - TestWaitIndicator.Default); + GetExportedValue()); } public static InteractiveWindowCommandHandlerTestState CreateTestState(ExportProvider exportProvider, string markup) diff --git a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestInteractiveCommandHandler.cs b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestInteractiveCommandHandler.cs index 810303c475191..1c573723a840d 100644 --- a/src/VisualStudio/CSharp/Test/Interactive/Commands/TestInteractiveCommandHandler.cs +++ b/src/VisualStudio/CSharp/Test/Interactive/Commands/TestInteractiveCommandHandler.cs @@ -22,9 +22,8 @@ public TestInteractiveCommandHandler( ISendToInteractiveSubmissionProvider sendToInteractiveSubmissionProvider, IContentTypeRegistryService contentTypeRegistryService, IEditorOptionsFactoryService editorOptionsFactoryService, - IEditorOperationsFactoryService editorOperationsFactoryService, - IWaitIndicator waitIndicator) - : base(contentTypeRegistryService, editorOptionsFactoryService, editorOperationsFactoryService, waitIndicator) + IEditorOperationsFactoryService editorOperationsFactoryService) + : base(contentTypeRegistryService, editorOptionsFactoryService, editorOperationsFactoryService) { _interactiveWindow = interactiveWindow; _sendToInteractiveSubmissionProvider = sendToInteractiveSubmissionProvider; diff --git a/src/VisualStudio/Core/Def/ExternalAccess/UnitTesting/Api/UnitTestingRemoteHostOptionsAccessor.cs b/src/VisualStudio/Core/Def/ExternalAccess/UnitTesting/Api/UnitTestingRemoteHostOptionsAccessor.cs index 8b487154346b5..491aa271c50b4 100644 --- a/src/VisualStudio/Core/Def/ExternalAccess/UnitTesting/Api/UnitTestingRemoteHostOptionsAccessor.cs +++ b/src/VisualStudio/Core/Def/ExternalAccess/UnitTesting/Api/UnitTestingRemoteHostOptionsAccessor.cs @@ -9,6 +9,10 @@ namespace Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Api { internal static class UnitTestingRemoteHostOptionsAccessor { - public static Option OOP64Bit => RemoteHostOptions.OOP64Bit; + private const string LocalRegistryPath = @"Roslyn\Internal\RemoteServices\"; + + public static Option OOP64Bit => new Option( + nameof(RemoteHostOptions), nameof(OOP64Bit), defaultValue: false, + storageLocations: new LocalUserProfileStorageLocation(LocalRegistryPath + nameof(OOP64Bit))); } } diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs index b79e166696873..ea6e5f5392d39 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.OpenFileTracker.cs @@ -335,7 +335,7 @@ private void TryClosingDocumentsForMoniker(string moniker) /// public void QueueCheckForFilesBeingOpen(ImmutableArray newFileNames) { - _foregroundAffinitization.ThisCanBeCalledOnAnyThread(); + ForegroundThreadAffinitizedObject.ThisCanBeCalledOnAnyThread(); var shouldStartTask = false; diff --git a/src/VisualStudio/Core/Test.Next/Mocks/SimpleAssetSource.cs b/src/VisualStudio/Core/Test.Next/Mocks/SimpleAssetSource.cs index 69277866ffdf8..40acf2fc4ea0a 100644 --- a/src/VisualStudio/Core/Test.Next/Mocks/SimpleAssetSource.cs +++ b/src/VisualStudio/Core/Test.Next/Mocks/SimpleAssetSource.cs @@ -11,7 +11,7 @@ using Microsoft.CodeAnalysis.Serialization; using Roslyn.Utilities; -namespace Microsoft.CodeAnalysis.Remote.Shared +namespace Microsoft.CodeAnalysis.Remote.Testing { /// /// provide asset from given map at the creation diff --git a/src/VisualStudio/Core/Test.Next/Mocks/TestHostServices.cs b/src/VisualStudio/Core/Test.Next/Mocks/TestHostServices.cs index 38d93885de359..3d1911d3705fe 100644 --- a/src/VisualStudio/Core/Test.Next/Mocks/TestHostServices.cs +++ b/src/VisualStudio/Core/Test.Next/Mocks/TestHostServices.cs @@ -4,8 +4,8 @@ using Microsoft.CodeAnalysis.Editor.UnitTests; using Microsoft.CodeAnalysis.Host; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Test.Utilities; -using Microsoft.CodeAnalysis.Test.Utilities.RemoteHost; using Microsoft.VisualStudio.Composition; using Microsoft.VisualStudio.LanguageServices; diff --git a/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs b/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs index 1ddf2e69ca35e..dca4f2c5f8b47 100644 --- a/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs +++ b/src/VisualStudio/Core/Test.Next/Remote/RemoteHostClientServiceFactoryTests.cs @@ -3,27 +3,17 @@ // See the LICENSE file in the project root for more information. using System; -using System.Collections.Generic; -using System.Collections.Immutable; using System.IO; -using System.Linq; using System.Reflection; using System.Threading; using System.Threading.Tasks; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Diagnostics; -using Microsoft.CodeAnalysis.Editor.Shared.Utilities; -using Microsoft.CodeAnalysis.Execution; -using Microsoft.CodeAnalysis.ExternalAccess.UnitTesting.Api; -using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Remote; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Shared.TestHooks; -using Microsoft.CodeAnalysis.SolutionCrawler; using Microsoft.CodeAnalysis.SymbolSearch; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.LanguageServices.Remote; -using Roslyn.Test.Utilities.Remote; -using Roslyn.Utilities; using Roslyn.VisualStudio.Next.UnitTests.Mocks; using Xunit; @@ -40,7 +30,7 @@ public async Task UpdaterService() var options = workspace.CurrentSolution.Options .WithChangedOption(RemoteHostOptions.SolutionChecksumMonitorBackOffTimeSpanInMS, 1) - .WithChangedOption(Microsoft.CodeAnalysis.Test.Utilities.RemoteHost.RemoteHostOptions.RemoteHostTest, true); + .WithChangedOption(RemoteTestHostOptions.RemoteHostTest, true); workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(options)); @@ -74,7 +64,7 @@ public async Task TestSessionWithNoSolution() using var workspace = new AdhocWorkspace(TestHostServices.CreateHostServices()); var options = workspace.CurrentSolution.Options - .WithChangedOption(Microsoft.CodeAnalysis.Test.Utilities.RemoteHost.RemoteHostOptions.RemoteHostTest, true); + .WithChangedOption(RemoteTestHostOptions.RemoteHostTest, true); workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(options)); diff --git a/src/VisualStudio/Core/Test.Next/Services/AssetProviderTests.cs b/src/VisualStudio/Core/Test.Next/Services/AssetProviderTests.cs index 6acace97ae2cb..544cf524dc417 100644 --- a/src/VisualStudio/Core/Test.Next/Services/AssetProviderTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/AssetProviderTests.cs @@ -11,12 +11,10 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Remote; -using Microsoft.CodeAnalysis.Remote.DebugUtil; -using Microsoft.CodeAnalysis.Remote.Shared; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Serialization; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Utilities; -using Roslyn.VisualStudio.Next.UnitTests.Mocks; using Xunit; namespace Roslyn.VisualStudio.Next.UnitTests.Remote diff --git a/src/VisualStudio/Core/Test.Next/Services/AssetStorageTests.cs b/src/VisualStudio/Core/Test.Next/Services/AssetStorageTests.cs index 8811f57db60ad..fb2ce7785bacd 100644 --- a/src/VisualStudio/Core/Test.Next/Services/AssetStorageTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/AssetStorageTests.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Remote; -using Microsoft.CodeAnalysis.Remote.Shared; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Serialization; using Microsoft.CodeAnalysis.Test.Utilities; using Xunit; diff --git a/src/VisualStudio/Core/Test.Next/Services/LanguageServiceTests.cs b/src/VisualStudio/Core/Test.Next/Services/LanguageServiceTests.cs index 2f0f05d4eec92..a86bd97ada1ae 100644 --- a/src/VisualStudio/Core/Test.Next/Services/LanguageServiceTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/LanguageServiceTests.cs @@ -12,11 +12,11 @@ using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.PooledObjects; using Microsoft.CodeAnalysis.Remote; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.VisualStudio.LanguageServer.Protocol; using Microsoft.VisualStudio.Threading; using Newtonsoft.Json.Linq; -using Roslyn.Test.Utilities.Remote; using StreamJsonRpc; using Xunit; diff --git a/src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs b/src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs index efe824e803721..5aaa02f422a4b 100644 --- a/src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/ServiceHubServicesTests.cs @@ -16,8 +16,7 @@ using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Remote; -using Microsoft.CodeAnalysis.Remote.DebugUtil; -using Microsoft.CodeAnalysis.Remote.Shared; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Serialization; using Microsoft.CodeAnalysis.Test.Utilities; using Microsoft.CodeAnalysis.Text; @@ -25,7 +24,6 @@ using Microsoft.CodeAnalysis.UnitTests; using Nerdbank; using Roslyn.Test.Utilities; -using Roslyn.Test.Utilities.Remote; using Roslyn.Utilities; using Roslyn.VisualStudio.Next.UnitTests.Mocks; using Xunit; diff --git a/src/VisualStudio/Core/Test.Next/Services/SolutionServiceTests.cs b/src/VisualStudio/Core/Test.Next/Services/SolutionServiceTests.cs index de84c1732778b..6cb43e455f423 100644 --- a/src/VisualStudio/Core/Test.Next/Services/SolutionServiceTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/SolutionServiceTests.cs @@ -11,8 +11,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Remote; -using Microsoft.CodeAnalysis.Remote.DebugUtil; -using Microsoft.CodeAnalysis.Remote.Shared; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Serialization; using Microsoft.CodeAnalysis.SolutionCrawler; using Microsoft.CodeAnalysis.Test.Utilities; diff --git a/src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs b/src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs index f22969086ec14..f79845548f6e5 100644 --- a/src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/VisualStudioDiagnosticAnalyzerExecutorTests.cs @@ -17,8 +17,8 @@ using Microsoft.CodeAnalysis.Diagnostics.EngineV2; using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces; using Microsoft.CodeAnalysis.Execution; -using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Remote; +using Microsoft.CodeAnalysis.Remote.Testing; using Microsoft.CodeAnalysis.Serialization; using Microsoft.CodeAnalysis.Shared.TestHooks; using Microsoft.CodeAnalysis.SolutionCrawler; @@ -26,7 +26,6 @@ using Microsoft.CodeAnalysis.Text; using Microsoft.CodeAnalysis.VisualBasic.UseNullPropagation; using Microsoft.CodeAnalysis.Workspaces.Diagnostics; -using Microsoft.VisualStudio.LanguageServices.Remote; using Roslyn.Test.Utilities; using Roslyn.Utilities; using Roslyn.VisualStudio.Next.UnitTests.Mocks; @@ -175,7 +174,7 @@ void Method() var options = workspace.Options .WithChangedOption(CSharpCodeStyleOptions.VarWhenTypeIsApparent, new CodeStyleOption(false, NotificationOption.Suggestion)) - .WithChangedOption(Microsoft.CodeAnalysis.Test.Utilities.RemoteHost.RemoteHostOptions.RemoteHostTest, true); + .WithChangedOption(RemoteTestHostOptions.RemoteHostTest, true); workspace.TryApplyChanges(workspace.CurrentSolution.WithOptions(options).WithAnalyzerReferences(new[] { analyzerReference })); diff --git a/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.NodeLocator.vb b/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.NodeLocator.vb index db8b30c95c27d..fd6cb3648d4f8 100644 --- a/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.NodeLocator.vb +++ b/src/VisualStudio/VisualBasic/Impl/CodeModel/VisualBasicCodeModelService.NodeLocator.vb @@ -346,7 +346,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel End If If part = EnvDTE.vsCMPart.vsCMPartNavigate Then - Return NavigationPointHelpers.GetNavigationPoint(text, GetTabSize(options), typeBlock.BlockStatement, typeBlock.EndBlockStatement, statementLine.LineNumber + 1) + Return NavigationPointHelpers.GetNavigationPoint(text, GetTabSize(options), typeBlock.BlockStatement, statementLine.LineNumber + 1) End If Case Else @@ -417,7 +417,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel End If If part = EnvDTE.vsCMPart.vsCMPartNavigate Then - Return NavigationPointHelpers.GetNavigationPoint(text, GetTabSize(options), enumBlock.EnumStatement, enumBlock.EndEnumStatement, statementLine.LineNumber + 1) + Return NavigationPointHelpers.GetNavigationPoint(text, GetTabSize(options), enumBlock.EnumStatement, statementLine.LineNumber + 1) End If Case Else @@ -1007,7 +1007,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.CodeModel lineNumber = text.Lines.IndexOf(colonTrivia.Value.SpanStart) End If - Return NavigationPointHelpers.GetNavigationPoint(text, GetTabSize(options), namespaceBlock.NamespaceStatement, namespaceBlock.EndNamespaceStatement, lineNumber) + Return NavigationPointHelpers.GetNavigationPoint(text, GetTabSize(options), namespaceBlock.NamespaceStatement, lineNumber) Case EnvDTE.vsCMPart.vsCMPartBody, EnvDTE.vsCMPart.vsCMPartBodyWithDelimiter diff --git a/src/Workspaces/Remote/Core/Services/SolutionCreator.cs b/src/Workspaces/Remote/Core/Services/SolutionCreator.cs index 53c441c1b3f23..183853c96c39c 100644 --- a/src/Workspaces/Remote/Core/Services/SolutionCreator.cs +++ b/src/Workspaces/Remote/Core/Services/SolutionCreator.cs @@ -18,10 +18,6 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.ErrorReporting; -#if DEBUG -using Microsoft.CodeAnalysis.Remote.DebugUtil; -#endif - namespace Microsoft.CodeAnalysis.Remote { /// diff --git a/src/Workspaces/Remote/Core/TestUtils.cs b/src/Workspaces/Remote/Core/TestUtils.cs index 9727cbf2a5b1c..099a67df36523 100644 --- a/src/Workspaces/Remote/Core/TestUtils.cs +++ b/src/Workspaces/Remote/Core/TestUtils.cs @@ -14,7 +14,7 @@ using Microsoft.CodeAnalysis.Internal.Log; #endif -namespace Microsoft.CodeAnalysis.Remote.DebugUtil +namespace Microsoft.CodeAnalysis.Remote { internal static class TestUtils { diff --git a/src/Workspaces/VisualBasic/Portable/CaseCorrection/VisualBasicCaseCorrectionService.Rewriter.vb b/src/Workspaces/VisualBasic/Portable/CaseCorrection/VisualBasicCaseCorrectionService.Rewriter.vb index 7fa2b6d275ec2..c616b6e755e9c 100644 --- a/src/Workspaces/VisualBasic/Portable/CaseCorrection/VisualBasicCaseCorrectionService.Rewriter.vb +++ b/src/Workspaces/VisualBasic/Portable/CaseCorrection/VisualBasicCaseCorrectionService.Rewriter.vb @@ -124,6 +124,12 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CaseCorrection Return CaseCorrectIdentifierIfNamesDiffer(token, newToken, otherPartParam, namesMustBeEqualIgnoringCase:=True) End If End If + Else + ' Named tuple expression + Dim nameColonEquals = TryCast(token.Parent?.Parent, NameColonEqualsSyntax) + If nameColonEquals IsNot Nothing AndAlso TypeOf nameColonEquals.Parent?.Parent Is TupleExpressionSyntax Then + Return newToken + End If End If End If End If diff --git a/src/Workspaces/VisualBasicTest/CaseCorrection/CaseCorrectionTests.vb b/src/Workspaces/VisualBasicTest/CaseCorrection/CaseCorrectionTests.vb new file mode 100644 index 0000000000000..d534ea8e7e008 --- /dev/null +++ b/src/Workspaces/VisualBasicTest/CaseCorrection/CaseCorrectionTests.vb @@ -0,0 +1,36 @@ +' Licensed to the .NET Foundation under one or more agreements. +' The .NET Foundation licenses this file to you under the MIT license. +' See the LICENSE file in the project root for more information. + +Imports Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions +Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.Text +Imports Microsoft.CodeAnalysis.VisualBasic +Imports Microsoft.CodeAnalysis.VisualBasic.Syntax +Imports Roslyn.Test.Utilities +Imports Xunit + +Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.CaseCorrection + Public Class CaseCorrectionTests + Inherits VisualBasicCaseCorrectionTestBase + + + + Public Async Function NamedTupleIdentifier() As Task + Dim code = Class C + Sub NamedTupleCasing(value1 As Integer) + Dim a = (Value1:=Value1, Value2:=2) + End Sub +End Class + + Dim expected = Class C + Sub NamedTupleCasing(value1 As Integer) + Dim a = (Value1:=value1, Value2:=2) + End Sub +End Class + + Await AssertCaseCorrectAsync(code.Value, expected.Value) + End Function + + End Class +End Namespace diff --git a/src/Workspaces/VisualBasicTest/CaseCorrection/VisualBasicCaseCorrectionTestBase.vb b/src/Workspaces/VisualBasicTest/CaseCorrection/VisualBasicCaseCorrectionTestBase.vb new file mode 100644 index 0000000000000..80f7febcf7b0c --- /dev/null +++ b/src/Workspaces/VisualBasicTest/CaseCorrection/VisualBasicCaseCorrectionTestBase.vb @@ -0,0 +1,27 @@ +' Licensed to the .NET Foundation under one or more agreements. +' The .NET Foundation licenses this file to you under the MIT license. +' See the LICENSE file in the project root for more information. + +Imports Microsoft.CodeAnalysis.CaseCorrection +Imports Microsoft.CodeAnalysis.Test.Utilities +Imports Microsoft.CodeAnalysis.Text +Imports Roslyn.Test.Utilities + +Namespace Microsoft.CodeAnalysis.VisualBasic.UnitTests.CaseCorrection + + Public Class VisualBasicCaseCorrectionTestBase + + Protected Shared Async Function AssertCaseCorrectAsync(code As String, expected As String) As Task + Using workspace = New AdhocWorkspace() + Dim project = workspace.CurrentSolution.AddProject("Project", "Project.dll", LanguageNames.VisualBasic) + Dim document = project.AddDocument("Document", SourceText.From(code)) + + Dim newNode = Await CaseCorrector.CaseCorrectAsync(document, New TextSpan(0, code.Length)) + Dim actual = Await newNode.GetTextAsync() + + AssertEx.EqualOrDiff(expected, actual.ToString()) + End Using + End Function + + End Class +End Namespace